no message

67dc124b · Sasa Jankov · c6585ac0 · 67dc124b · 67dc124b · 67dc124b
Commit 67dc124b authored Dec 04, 2020 by Sasa Jankov
15 changed files
--- a/Win32/Debug/MlekaraCB.exe
+++ b/Win32/Debug/MlekaraCB.exe
--- a/Win32/Debug/MlekaraCB.ilc
+++ b/Win32/Debug/MlekaraCB.ilc
--- a/Win32/Debug/MlekaraCB.ild
+++ b/Win32/Debug/MlekaraCB.ild
--- a/Win32/Debug/MlekaraCB.ilf
+++ b/Win32/Debug/MlekaraCB.ilf
--- a/Win32/Debug/MlekaraCB.ils
+++ b/Win32/Debug/MlekaraCB.ils
--- a/Win32/Debug/MlekaraCB.map
+++ b/Win32/Debug/MlekaraCB.map
 Start Length Name Class
- 0001:00401000 00000ADB4H _TEXT                  CODE
+ 0001:00401000 00000ADF8H _TEXT                  CODE
 0002:0040C000 0000038B4H _DATA                  DATA
 0003:0040F8B4 0000001C0H _BSS                   BSS
 0004:00000000 00000009CH _TLS                   TLS
--- a/Win32/Debug/MlekaraCB.pch
+++ b/Win32/Debug/MlekaraCB.pch
--- a/Win32/Debug/MlekaraCB.pdi
+++ b/Win32/Debug/MlekaraCB.pdi
@@ -67,6 +67,8 @@ dbexpress190.bpl
 dbrtl190.bpl
 rtl190.bpl
 fqb190.bpl
+bcbsmp190.bpl
+bcbie190.bpl
 dxSkinsdxBarPainterRS19.bpl
 dxRibbonRS19.bpl
 dxPScxCommonRS19.bpl

--- a/Win32/Debug/MlekaraCB.tds
+++ b/Win32/Debug/MlekaraCB.tds
--- a/Win32/Debug/MlekaraMain.obj
+++ b/Win32/Debug/MlekaraMain.obj
--- a/Win32/Debug/dbDm.obj
+++ b/Win32/Debug/dbDm.obj
--- a/__history/MlekaraMain.dfm.~32~
+++ b/__history/MlekaraMain.dfm.~32~
 object MainForm: TMainForm
  Left = 0
  Top = 0
-  Caption = 'MainForm'
+  Caption = 'Merenje temperature'
-  ClientHeight = 638
+  ClientHeight = 657
-  ClientWidth = 1364
+  ClientWidth = 1489
  Color = clBtnFace
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
@@ -11,20 +11,21 @@ object MainForm: TMainForm
  Font.Name = 'Tahoma'
  Font.Style = []
  OldCreateOrder = False
+  OnCreate = FormCreate
  OnShow = FormShow
  PixelsPerInch = 96
  TextHeight = 13
  object cxPageControl1: TcxPageControl
    Left = 0
    Top = 0
-    Width = 1364
+    Width = 1489
-    Height = 638
+    Height = 657
    Align = alClient
    TabOrder = 0
-    Properties.ActivePage = cxTabSheet2
+    Properties.ActivePage = cxTabSheet1
    Properties.CustomButtons.Buttons = <>
-    ClientRectBottom = 638
+    ClientRectBottom = 657
-    ClientRectRight = 1364
+    ClientRectRight = 1489
    ClientRectTop = 24
    object cxTabSheet1: TcxTabSheet
      Caption = 'Glavna'
@@ -32,8 +33,8 @@ object MainForm: TMainForm
      object cxGrid1: TcxGrid
        Left = 0
        Top = 0
-        Width = 1364
+        Width = 1489
-        Height = 264
+        Height = 283
        Align = alClient
        TabOrder = 0
        object cxGrid1DBChartView1: TcxGridDBChartView
@@ -57,12 +58,12 @@ object MainForm: TMainForm
      end
      object cxGroupBox1: TcxGroupBox
        Left = 0
-        Top = 264
+        Top = 283
        Align = alBottom
        Alignment = alCenterCenter
        TabOrder = 1
        Height = 350
-        Width = 1364
+        Width = 1489
        object cxGrid5: TcxGrid
          Left = 2
          Top = 2
@@ -70,6 +71,8 @@ object MainForm: TMainForm
          Height = 346
          Align = alLeft
          TabOrder = 0
+          ExplicitLeft = 3
+          ExplicitTop = 6
          object cxGrid5DBChartView1: TcxGridDBChartView
            DataController.DataSource = db.DataSource1
            DiagramColumn.Active = True
@@ -196,7 +199,7 @@ object MainForm: TMainForm
        Alignment = alCenterCenter
        TabOrder = 0
        Transparent = True
-        Height = 614
+        Height = 633
        Width = 297
        object cxDBTextEdit1: TcxDBTextEdit
          Left = 16
@@ -241,25 +244,39 @@ object MainForm: TMainForm
          Height = 55
          Width = 293
          object btSave: TcxButton
-            Left = 137
+            Left = 98
            Top = 2
-            Width = 136
+            Width = 96
            Height = 51
            Align = alLeft
            Caption = 'Snimi'
            TabOrder = 0
            OnClick = btSaveClick
+            ExplicitLeft = 72
+            ExplicitTop = 1
          end
          object btNew: TcxButton
            Left = 2
            Top = 2
-            Width = 135
+            Width = 96
            Height = 51
            Align = alLeft
            Caption = 'Novi'
            TabOrder = 1
            OnClick = btNewClick
          end
+          object cxButton3: TcxButton
+            Left = 194
+            Top = 2
+            Width = 96
+            Height = 51
+            Align = alLeft
+            Caption = 'Pregled'
+            TabOrder = 2
+            OnClick = cxButton3Click
+            ExplicitLeft = 177
+            ExplicitTop = 1
+          end
        end
        object cxLabel4: TcxLabel
          Left = 16
@@ -335,6 +352,20 @@ object MainForm: TMainForm
          TabOrder = 11
          Width = 105
        end
+        object cxDBLookupComboBox1: TcxDBLookupComboBox
+          Left = 16
+          Top = 302
+          DataBinding.DataField = 'id_uredjaja'
+          DataBinding.DataSource = db.dsArtikli
+          Properties.KeyFieldNames = 'id'
+          Properties.ListColumns = <
+            item
+              FieldName = 'id'
+            end>
+          Properties.ListSource = db.dsUredjaj
+          TabOrder = 12
+          Width = 88
+        end
      end
      object cxGroupBox3: TcxGroupBox
        Left = 297
@@ -342,8 +373,8 @@ object MainForm: TMainForm
        Align = alClient
        Alignment = alCenterCenter
        TabOrder = 1
-        Height = 614
+        Height = 633
-        Width = 1067
+        Width = 1192
        object cxGroupBox5: TcxGroupBox
          Left = 2
          Top = 2
@@ -351,11 +382,11 @@ object MainForm: TMainForm
          Alignment = alCenterCenter
          TabOrder = 0
          Height = 271
-          Width = 1063
+          Width = 1188
          object cxGrid6: TcxGrid
            Left = 2
            Top = 2
-            Width = 1059
+            Width = 1184
            Height = 267
            Align = alClient
            TabOrder = 0
@@ -390,6 +421,12 @@ object MainForm: TMainForm
              object cxGrid6DBTableView1do: TcxGridDBColumn
                DataBinding.FieldName = 'do'
              end
+              object cxGrid6DBTableView1id_uredjaja: TcxGridDBColumn
+                DataBinding.FieldName = 'id_uredjaja'
+              end
+              object cxGrid6DBTableView1zadata_temperatura: TcxGridDBColumn
+                DataBinding.FieldName = 'zadata_temperatura'
+              end
            end
            object cxGrid6Level1: TcxGridLevel
              GridView = cxGrid6DBTableView1
@@ -403,13 +440,13 @@ object MainForm: TMainForm
          Alignment = alCenterCenter
          Style.BorderStyle = ebsNone
          TabOrder = 1
-          Height = 339
+          Height = 358
          Width = 679
          object cxGrid7: TcxGrid
            Left = 2
            Top = 41
            Width = 535
-            Height = 296
+            Height = 315
            Align = alLeft
            TabOrder = 0
            object cxGrid7DBChartView1: TcxGridDBChartView
@@ -419,6 +456,9 @@ object MainForm: TMainForm
              DiagramLine.Legend.Border = lbSingle
              DiagramLine.Legend.Orientation = cpoHorizontal
              DiagramLine.Legend.Position = cppLeft
+              DiagramLine.AxisCategory.Title.Text = 'Merenje temperature'
+              DiagramLine.Values.HotSpotSize = 7
+              DiagramLine.Values.LineWidth = 3
              Title.Alignment = cpaCenter
              Title.Text = 'Vreme merenje u satima'
              Title.Position = cppBottom
@@ -522,236 +562,114 @@ object MainForm: TMainForm
          end
        end
        object cxGroupBox7: TcxGroupBox
-          Left = 681
+          Left = 694
          Top = 273
-          Align = alLeft
+          Align = alRight
          Alignment = alCenterCenter
+          Style.BorderStyle = ebsNone
          TabOrder = 2
-          Height = 339
+          Height = 358
-          Width = 399
+          Width = 496
-        end
+          object cxGrid8: TcxGrid
-      end
+            Left = 2
-    end
+            Top = 41
-  end
+            Width = 492
-  object cxDBLookupComboBox1: TcxDBLookupComboBox
+            Height = 315
-    Left = 16
+            Align = alClient
-    Top = 326
+            TabOrder = 0
-    DataBinding.DataField = 'id_uredjaja'
+            object cxGrid8DBChartView1: TcxGridDBChartView
-    DataBinding.DataSource = db.dsArtikli
+              DataController.DataSource = db.dsStampa
-    Properties.KeyFieldNames = 'id'
+              DiagramLine.Active = True
-    Properties.ListColumns = <
+              DiagramLine.Legend.Alignment = cpaStart
-      item
+              DiagramLine.Legend.Border = lbSingle
-        FieldName = 'id'
+              DiagramLine.Legend.KeyBorder = lbSingle
-      end>
+              DiagramLine.Legend.Position = cppLeft
-    Properties.ListSource = db.dsUredjaj
+              DiagramLine.AxisCategory.Title.Text = 'Naslov'
-    TabOrder = 1
+              DiagramLine.Values.LineWidth = 3
-    Width = 88
+              Title.Alignment = cpaCenter
-  end
+              Title.Position = cppTop
-  object print: TfrxReport
+              ToolBox.Border = tbNone
-    Version = '4.15'
+              ToolBox.Position = tpBottom
-    DotMatrixReport = False
+              object cxGrid8DBChartView1DataGroup1: TcxGridDBChartDataGroup
-    IniFile = '\Software\Fast Reports'
+                DataBinding.FieldName = 'vreme'
-    PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick]
+              end
-    PreviewOptions.Zoom = 1.000000000000000000
+              object cxGrid8DBChartView1Series1: TcxGridDBChartSeries
-    PrintOptions.Printer = 'Default'
+                DataBinding.FieldName = 't'
-    PrintOptions.PrintOnSheet = 0
+              end
-    ReportOptions.CreateDate = 44160.809089050930000000
+            end
-    ReportOptions.LastChange = 44160.809089050930000000
+            object cxGrid8Level1: TcxGridLevel
-    ScriptLanguage = 'PascalScript'
+              GridView = cxGrid8DBChartView1
-    ScriptText.Strings = (
+            end
-      ''
+          end
-      'begin'
+          object cxGroupBox9: TcxGroupBox
-      ''
+            Left = 2
-      'end.')
+            Top = 2
-    Left = 928
+            Align = alTop
-    Top = 120
+            Alignment = alCenterCenter
-    Datasets = <
+            Style.BorderStyle = ebsNone
-      item
+            TabOrder = 1
-        DataSet = frxDBArtikal
+            Height = 39
-        DataSetName = 'frxArtikal'
+            Width = 492
-      end>
+            object cxButton2: TcxButton
-    Variables = <>
+              Left = 376
-    Style = <
+              Top = 2
-      item
+              Width = 114
-        Name = 'Title'
+              Height = 35
-        Color = clGray
+              Align = alRight
-        Font.Charset = DEFAULT_CHARSET
+              Caption = 'Stampaj'
-        Font.Color = clWhite
+              TabOrder = 0
-        Font.Height = -16
+              Font.Charset = DEFAULT_CHARSET
-        Font.Name = 'Arial'
+              Font.Color = clWindowText
-        Font.Style = [fsBold]
+              Font.Height = -11
-      end
+              Font.Name = 'Tahoma'
-      item
+              Font.Style = [fsBold]
-        Name = 'Header'
+              ParentFont = False
-        Color = clNone
+              OnClick = cxButton2Click
-        Font.Charset = DEFAULT_CHARSET
+            end
-        Font.Color = clMaroon
+          end
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Group header'
-        Color = 16053492
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clMaroon
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Data'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = []
-      end
-      item
-        Name = 'Group footer'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Header line'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = []
-        Frame.Typ = [ftBottom]
-        Frame.Width = 2.000000000000000000
-      end>
-    object Data: TfrxDataPage
-      Height = 1000.000000000000000000
-      Width = 1000.000000000000000000
-    end
-    object Page1: TfrxReportPage
-      PaperWidth = 215.900000000000000000
-      PaperHeight = 279.400000000000000000
-      PaperSize = 1
-      LeftMargin = 10.000000000000000000
-      RightMargin = 10.000000000000000000
-      TopMargin = 10.000000000000000000
-      BottomMargin = 10.000000000000000000
-      object ReportTitle1: TfrxReportTitle
-        Height = 26.456710000000000000
-        Top = 18.897650000000000000
-        Width = 740.787880000000000000
-        object Memo1: TfrxMemoView
-          Align = baWidth
-          Width = 740.787880000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          Color = clGray
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWhite
-          Font.Height = -16
-          Font.Name = 'Arial'
-          Font.Style = [fsBold]
-          HAlign = haCenter
-          Memo.UTF8W = (
-            'Report')
-          ParentFont = False
-          Style = 'Title'
-          VAlign = vaCenter
-        end
-      end
-      object PageHeader1: TfrxPageHeader
-        Height = 22.677180000000000000
-        Top = 68.031540000000000000
-        Width = 740.787880000000000000
-        object Memo2: TfrxMemoView
-          Width = 740.787401574803200000
-          Height = 22.677180000000000000
-          ShowHint = False
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWindowText
-          Font.Height = -13
-          Font.Name = 'Arial'
-          Font.Style = []
-          Frame.Typ = [ftBottom]
-          Frame.Width = 2.000000000000000000
-          ParentFont = False
-          Style = 'Header line'
-        end
-      end
-      object MasterData1: TfrxMasterData
-        Height = 18.897650000000000000
-        Top = 151.181200000000000000
-        Width = 740.787880000000000000
-        DataSet = frxDBArtikal
-        DataSetName = 'frxArtikal'
-        RowCount = 0
-      end
-      object PageFooter1: TfrxPageFooter
-        Height = 26.456710000000000000
-        Top = 230.551330000000000000
-        Width = 740.787880000000000000
-        object Memo3: TfrxMemoView
-          Align = baWidth
-          Width = 740.787880000000000000
-          ShowHint = False
-          Frame.Typ = [ftTop]
-          Frame.Width = 2.000000000000000000
-        end
-        object Memo4: TfrxMemoView
-          Top = 1.000000000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          AutoWidth = True
-          Memo.UTF8W = (
-            '[Date] [Time]')
-        end
-        object Memo5: TfrxMemoView
-          Align = baRight
-          Left = 665.197280000000000000
-          Top = 1.000000000000000000
-          Width = 75.590600000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          HAlign = haRight
-          Memo.UTF8W = (
-            'Page [Page#]')
        end
      end
    end
  end
-  object frxDBDPrint: TfrxDBDataset
-    UserName = 'frxDiag'
-    CloseDataSource = False
-    FieldAliases.Strings = (
-      'temperatura=temperatura'
-      'vreme=vreme')
-    DataSource = db.dsStampa
-    BCDToCurrency = False
-    Left = 928
-    Top = 176
-  end
-  object frxDBArtikal: TfrxDBDataset
-    UserName = 'frxArtikal'
-    CloseDataSource = False
-    DataSource = db.dsArtikli
-    BCDToCurrency = False
-    Left = 936
-    Top = 232
-  end
  object dxComponentPrinter1: TdxComponentPrinter
    CurrentLink = dxComponentPrinter1Link1
+    PrintTitle = 'Merenje temperature'
    Version = 0
-    Left = 784
+    Left = 568
-    Top = 152
+    Top = 424
    object dxComponentPrinter1Link1: TdxCustomContainerReportLink
      Active = True
      Component = cxGroupBox6
      PrinterPage.DMPaper = 9
      PrinterPage.Footer = 200
+      PrinterPage.GrayShading = True
+      PrinterPage.Header = 200
+      PrinterPage.Margins.Bottom = 500
+      PrinterPage.Margins.Left = 500
+      PrinterPage.Margins.Right = 500
+      PrinterPage.Margins.Top = 500
+      PrinterPage.PageSize.X = 8300
+      PrinterPage.PageSize.Y = 11700
+      PrinterPage._dxMeasurementUnits_ = 0
+      PrinterPage._dxLastMU_ = 1
+      ReportDocument.CreationDate = 44165.456728900460000000
+      BuiltInReportLink = True
+      HiddenComponents = {}
+      ExcludedComponents = {}
+      AggregatedReportLinks = {}
+    end
+  end
+  object dxComponentPrinter2: TdxComponentPrinter
+    CurrentLink = dxComponentPrinter2Link1
+    Version = 0
+    Left = 1208
+    Top = 419
+    object dxComponentPrinter2Link1: TdxCustomContainerReportLink
+      Active = True
+      Component = cxGroupBox7
+      PrinterPage.DMPaper = 9
+      PrinterPage.Footer = 200
+      PrinterPage.GrayShading = True
      PrinterPage.Header = 200
      PrinterPage.Margins.Bottom = 500
      PrinterPage.Margins.Left = 500
@@ -761,7 +679,7 @@ object MainForm: TMainForm
      PrinterPage.PageSize.Y = 11700
      PrinterPage._dxMeasurementUnits_ = 0
      PrinterPage._dxLastMU_ = 1
-      ReportDocument.CreationDate = 44161.412318703700000000
+      ReportDocument.CreationDate = 44165.456728969900000000
      BuiltInReportLink = True
      HiddenComponents = {}
      ExcludedComponents = {}

--- a/__history/MlekaraMain.dfm.~35~
+++ b/__history/MlekaraMain.dfm.~35~
 object MainForm: TMainForm
  Left = 0
  Top = 0
-  Caption = 'MainForm'
+  Caption = 'Merenje temperature'
  ClientHeight = 657
  ClientWidth = 1489
  Color = clBtnFace
@@ -11,6 +11,7 @@ object MainForm: TMainForm
  Font.Name = 'Tahoma'
  Font.Style = []
  OldCreateOrder = False
+  OnCreate = FormCreate
  OnShow = FormShow
  PixelsPerInch = 96
  TextHeight = 13
@@ -23,16 +24,12 @@ object MainForm: TMainForm
    TabOrder = 0
    Properties.ActivePage = cxTabSheet2
    Properties.CustomButtons.Buttons = <>
-    ExplicitWidth = 1364
-    ExplicitHeight = 638
    ClientRectBottom = 657
    ClientRectRight = 1489
    ClientRectTop = 24
    object cxTabSheet1: TcxTabSheet
      Caption = 'Glavna'
      ImageIndex = 0
-      ExplicitWidth = 1364
-      ExplicitHeight = 614
      object cxGrid1: TcxGrid
        Left = 0
        Top = 0
@@ -40,8 +37,6 @@ object MainForm: TMainForm
        Height = 283
        Align = alClient
        TabOrder = 0
-        ExplicitWidth = 1364
-        ExplicitHeight = 264
        object cxGrid1DBChartView1: TcxGridDBChartView
          DataController.DataSource = db.dsMlekara
          DiagramColumn.Active = True
@@ -67,8 +62,6 @@ object MainForm: TMainForm
        Align = alBottom
        Alignment = alCenterCenter
        TabOrder = 1
-        ExplicitTop = 264
-        ExplicitWidth = 1364
        Height = 350
        Width = 1489
        object cxGrid5: TcxGrid
@@ -197,8 +190,6 @@ object MainForm: TMainForm
    object cxTabSheet2: TcxTabSheet
      Caption = 'Stampa'
      ImageIndex = 1
-      ExplicitWidth = 1364
-      ExplicitHeight = 614
      object cxGroupBox2: TcxGroupBox
        Left = 0
        Top = 0
@@ -206,7 +197,6 @@ object MainForm: TMainForm
        Alignment = alCenterCenter
        TabOrder = 0
        Transparent = True
-        ExplicitHeight = 614
        Height = 633
        Width = 297
        object cxDBTextEdit1: TcxDBTextEdit
@@ -252,9 +242,9 @@ object MainForm: TMainForm
          Height = 55
          Width = 293
          object btSave: TcxButton
-            Left = 137
+            Left = 98
            Top = 2
-            Width = 136
+            Width = 96
            Height = 51
            Align = alLeft
            Caption = 'Snimi'
@@ -264,13 +254,23 @@ object MainForm: TMainForm
          object btNew: TcxButton
            Left = 2
            Top = 2
-            Width = 135
+            Width = 96
            Height = 51
            Align = alLeft
            Caption = 'Novi'
            TabOrder = 1
            OnClick = btNewClick
          end
+          object cxButton3: TcxButton
+            Left = 194
+            Top = 2
+            Width = 96
+            Height = 51
+            Align = alLeft
+            Caption = 'Pregled'
+            TabOrder = 2
+            OnClick = cxButton3Click
+          end
        end
        object cxLabel4: TcxLabel
          Left = 16
@@ -346,6 +346,20 @@ object MainForm: TMainForm
          TabOrder = 11
          Width = 105
        end
+        object cxDBLookupComboBox1: TcxDBLookupComboBox
+          Left = 16
+          Top = 302
+          DataBinding.DataField = 'id_uredjaja'
+          DataBinding.DataSource = db.dsArtikli
+          Properties.KeyFieldNames = 'id'
+          Properties.ListColumns = <
+            item
+              FieldName = 'id'
+            end>
+          Properties.ListSource = db.dsUredjaj
+          TabOrder = 12
+          Width = 88
+        end
      end
      object cxGroupBox3: TcxGroupBox
        Left = 297
@@ -353,8 +367,6 @@ object MainForm: TMainForm
        Align = alClient
        Alignment = alCenterCenter
        TabOrder = 1
-        ExplicitWidth = 1067
-        ExplicitHeight = 614
        Height = 633
        Width = 1192
        object cxGroupBox5: TcxGroupBox
@@ -363,7 +375,6 @@ object MainForm: TMainForm
          Align = alTop
          Alignment = alCenterCenter
          TabOrder = 0
-          ExplicitWidth = 1063
          Height = 271
          Width = 1188
          object cxGrid6: TcxGrid
@@ -373,7 +384,6 @@ object MainForm: TMainForm
            Height = 267
            Align = alClient
            TabOrder = 0
-            ExplicitWidth = 1059
            object cxGrid6DBTableView1: TcxGridDBTableView
              Navigator.Buttons.CustomButtons = <>
              DataController.DataSource = db.dsArtikli
@@ -424,7 +434,6 @@ object MainForm: TMainForm
          Alignment = alCenterCenter
          Style.BorderStyle = ebsNone
          TabOrder = 1
-          ExplicitHeight = 339
          Height = 358
          Width = 679
          object cxGrid7: TcxGrid
@@ -434,7 +443,6 @@ object MainForm: TMainForm
            Height = 315
            Align = alLeft
            TabOrder = 0
-            ExplicitHeight = 296
            object cxGrid7DBChartView1: TcxGridDBChartView
              DataController.DataSource = db.dsStampa
              DiagramLine.Active = True
@@ -442,6 +450,10 @@ object MainForm: TMainForm
              DiagramLine.Legend.Border = lbSingle
              DiagramLine.Legend.Orientation = cpoHorizontal
              DiagramLine.Legend.Position = cppLeft
+              DiagramLine.AxisCategory.Title.Text = 'Merenje temperature'
+              DiagramLine.Values.HotSpotSize = 7
+              DiagramLine.Values.LineWidth = 5
+              DiagramLine.Values.Stacking = vs100Percent
              Title.Alignment = cpaCenter
              Title.Text = 'Vreme merenje u satima'
              Title.Position = cppBottom
@@ -549,234 +561,110 @@ object MainForm: TMainForm
          Top = 273
          Align = alRight
          Alignment = alCenterCenter
+          Style.BorderStyle = ebsNone
          TabOrder = 2
-          ExplicitLeft = 681
-          ExplicitHeight = 339
          Height = 358
          Width = 496
+          object cxGrid8: TcxGrid
+            Left = 2
+            Top = 41
+            Width = 492
+            Height = 315
+            Align = alClient
+            TabOrder = 0
+            object cxGrid8DBChartView1: TcxGridDBChartView
+              DataController.DataSource = db.dsStampa
+              DiagramLine.Active = True
+              DiagramLine.Legend.Alignment = cpaStart
+              DiagramLine.Legend.Border = lbSingle
+              DiagramLine.Legend.KeyBorder = lbSingle
+              DiagramLine.Legend.Position = cppLeft
+              DiagramLine.AxisCategory.Title.Text = 'Naslov'
+              DiagramLine.Values.LineWidth = 3
+              Title.Alignment = cpaCenter
+              Title.Position = cppTop
+              ToolBox.Border = tbNone
+              ToolBox.Position = tpBottom
+              object cxGrid8DBChartView1DataGroup1: TcxGridDBChartDataGroup
+                DataBinding.FieldName = 'vreme'
+              end
+              object cxGrid8DBChartView1Series1: TcxGridDBChartSeries
+                DataBinding.FieldName = 't'
+              end
+            end
+            object cxGrid8Level1: TcxGridLevel
+              GridView = cxGrid8DBChartView1
+            end
+          end
+          object cxGroupBox9: TcxGroupBox
+            Left = 2
+            Top = 2
+            Align = alTop
+            Alignment = alCenterCenter
+            Style.BorderStyle = ebsNone
+            TabOrder = 1
+            Height = 39
+            Width = 492
+            object cxButton2: TcxButton
+              Left = 376
+              Top = 2
+              Width = 114
+              Height = 35
+              Align = alRight
+              Caption = 'Stampaj'
+              TabOrder = 0
+              Font.Charset = DEFAULT_CHARSET
+              Font.Color = clWindowText
+              Font.Height = -11
+              Font.Name = 'Tahoma'
+              Font.Style = [fsBold]
+              ParentFont = False
+              OnClick = cxButton2Click
+            end
+          end
        end
      end
    end
  end
-  object cxDBLookupComboBox1: TcxDBLookupComboBox
-    Left = 16
-    Top = 326
-    DataBinding.DataField = 'id_uredjaja'
-    DataBinding.DataSource = db.dsArtikli
-    Properties.KeyFieldNames = 'id'
-    Properties.ListColumns = <
-      item
-        FieldName = 'id'
-      end>
-    Properties.ListSource = db.dsUredjaj
-    TabOrder = 1
-    Width = 88
-  end
-  object print: TfrxReport
-    Version = '4.15'
-    DotMatrixReport = False
-    IniFile = '\Software\Fast Reports'
-    PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick]
-    PreviewOptions.Zoom = 1.000000000000000000
-    PrintOptions.Printer = 'Default'
-    PrintOptions.PrintOnSheet = 0
-    ReportOptions.CreateDate = 44160.809089050930000000
-    ReportOptions.LastChange = 44160.809089050930000000
-    ScriptLanguage = 'PascalScript'
-    ScriptText.Strings = (
-      ''
-      'begin'
-      ''
-      'end.')
-    Left = 928
-    Top = 120
-    Datasets = <
-      item
-        DataSet = frxDBArtikal
-        DataSetName = 'frxArtikal'
-      end>
-    Variables = <>
-    Style = <
-      item
-        Name = 'Title'
-        Color = clGray
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWhite
-        Font.Height = -16
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Header'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clMaroon
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Group header'
-        Color = 16053492
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clMaroon
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Data'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = []
-      end
-      item
-        Name = 'Group footer'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Header line'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = []
-        Frame.Typ = [ftBottom]
-        Frame.Width = 2.000000000000000000
-      end>
-    object Data: TfrxDataPage
-      Height = 1000.000000000000000000
-      Width = 1000.000000000000000000
-    end
-    object Page1: TfrxReportPage
-      PaperWidth = 215.900000000000000000
-      PaperHeight = 279.400000000000000000
-      PaperSize = 1
-      LeftMargin = 10.000000000000000000
-      RightMargin = 10.000000000000000000
-      TopMargin = 10.000000000000000000
-      BottomMargin = 10.000000000000000000
-      object ReportTitle1: TfrxReportTitle
-        Height = 26.456710000000000000
-        Top = 18.897650000000000000
-        Width = 740.787880000000000000
-        object Memo1: TfrxMemoView
-          Align = baWidth
-          Width = 740.787880000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          Color = clGray
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWhite
-          Font.Height = -16
-          Font.Name = 'Arial'
-          Font.Style = [fsBold]
-          HAlign = haCenter
-          Memo.UTF8W = (
-            'Report')
-          ParentFont = False
-          Style = 'Title'
-          VAlign = vaCenter
-        end
-      end
-      object PageHeader1: TfrxPageHeader
-        Height = 22.677180000000000000
-        Top = 68.031540000000000000
-        Width = 740.787880000000000000
-        object Memo2: TfrxMemoView
-          Width = 740.787401574803200000
-          Height = 22.677180000000000000
-          ShowHint = False
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWindowText
-          Font.Height = -13
-          Font.Name = 'Arial'
-          Font.Style = []
-          Frame.Typ = [ftBottom]
-          Frame.Width = 2.000000000000000000
-          ParentFont = False
-          Style = 'Header line'
-        end
-      end
-      object MasterData1: TfrxMasterData
-        Height = 18.897650000000000000
-        Top = 151.181200000000000000
-        Width = 740.787880000000000000
-        DataSet = frxDBArtikal
-        DataSetName = 'frxArtikal'
-        RowCount = 0
-      end
-      object PageFooter1: TfrxPageFooter
-        Height = 26.456710000000000000
-        Top = 230.551330000000000000
-        Width = 740.787880000000000000
-        object Memo3: TfrxMemoView
-          Align = baWidth
-          Width = 740.787880000000000000
-          ShowHint = False
-          Frame.Typ = [ftTop]
-          Frame.Width = 2.000000000000000000
-        end
-        object Memo4: TfrxMemoView
-          Top = 1.000000000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          AutoWidth = True
-          Memo.UTF8W = (
-            '[Date] [Time]')
-        end
-        object Memo5: TfrxMemoView
-          Align = baRight
-          Left = 665.197280000000000000
-          Top = 1.000000000000000000
-          Width = 75.590600000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          HAlign = haRight
-          Memo.UTF8W = (
-            'Page [Page#]')
-        end
-      end
-    end
-  end
-  object frxDBDPrint: TfrxDBDataset
-    UserName = 'frxDiag'
-    CloseDataSource = False
-    FieldAliases.Strings = (
-      'temperatura=temperatura'
-      'vreme=vreme')
-    DataSource = db.dsStampa
-    BCDToCurrency = False
-    Left = 928
-    Top = 176
-  end
-  object frxDBArtikal: TfrxDBDataset
-    UserName = 'frxArtikal'
-    CloseDataSource = False
-    DataSource = db.dsArtikli
-    BCDToCurrency = False
-    Left = 936
-    Top = 232
-  end
  object dxComponentPrinter1: TdxComponentPrinter
    CurrentLink = dxComponentPrinter1Link1
+    PrintTitle = 'Merenje temperature'
    Version = 0
-    Left = 784
+    Left = 568
-    Top = 152
+    Top = 424
    object dxComponentPrinter1Link1: TdxCustomContainerReportLink
      Active = True
      Component = cxGroupBox6
      PrinterPage.DMPaper = 9
      PrinterPage.Footer = 200
+      PrinterPage.GrayShading = True
+      PrinterPage.Header = 200
+      PrinterPage.Margins.Bottom = 500
+      PrinterPage.Margins.Left = 500
+      PrinterPage.Margins.Right = 500
+      PrinterPage.Margins.Top = 500
+      PrinterPage.PageSize.X = 8300
+      PrinterPage.PageSize.Y = 11700
+      PrinterPage._dxMeasurementUnits_ = 0
+      PrinterPage._dxLastMU_ = 1
+      ReportDocument.CreationDate = 44169.438355590280000000
+      BuiltInReportLink = True
+      HiddenComponents = {}
+      ExcludedComponents = {}
+      AggregatedReportLinks = {}
+    end
+  end
+  object dxComponentPrinter2: TdxComponentPrinter
+    CurrentLink = dxComponentPrinter2Link1
+    Version = 0
+    Left = 1208
+    Top = 419
+    object dxComponentPrinter2Link1: TdxCustomContainerReportLink
+      Active = True
+      Component = cxGroupBox7
+      PrinterPage.DMPaper = 9
+      PrinterPage.Footer = 200
+      PrinterPage.GrayShading = True
      PrinterPage.Header = 200
      PrinterPage.Margins.Bottom = 500
      PrinterPage.Margins.Left = 500
@@ -786,7 +674,7 @@ object MainForm: TMainForm
      PrinterPage.PageSize.Y = 11700
      PrinterPage._dxMeasurementUnits_ = 0
      PrinterPage._dxLastMU_ = 1
-      ReportDocument.CreationDate = 44161.412318703700000000
+      ReportDocument.CreationDate = 44169.438355787040000000
      BuiltInReportLink = True
      HiddenComponents = {}
      ExcludedComponents = {}

--- a/__history/MlekaraMain.dfm.~34~
+++ b/__history/MlekaraMain.dfm.~34~
 object MainForm: TMainForm
  Left = 0
  Top = 0
-  Caption = 'MainForm'
+  Caption = 'Merenje temperature'
  ClientHeight = 657
-  ClientWidth = 1501
+  ClientWidth = 1489
  Color = clBtnFace
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
@@ -11,37 +11,32 @@ object MainForm: TMainForm
  Font.Name = 'Tahoma'
  Font.Style = []
  OldCreateOrder = False
+  OnCreate = FormCreate
  OnShow = FormShow
  PixelsPerInch = 96
  TextHeight = 13
  object cxPageControl1: TcxPageControl
    Left = 0
    Top = 0
-    Width = 1501
+    Width = 1489
    Height = 657
    Align = alClient
    TabOrder = 0
-    Properties.ActivePage = cxTabSheet2
+    Properties.ActivePage = cxTabSheet1
    Properties.CustomButtons.Buttons = <>
-    ExplicitWidth = 1364
-    ExplicitHeight = 638
    ClientRectBottom = 657
-    ClientRectRight = 1501
+    ClientRectRight = 1489
    ClientRectTop = 24
    object cxTabSheet1: TcxTabSheet
      Caption = 'Glavna'
      ImageIndex = 0
-      ExplicitWidth = 1364
-      ExplicitHeight = 614
      object cxGrid1: TcxGrid
        Left = 0
        Top = 0
-        Width = 1501
+        Width = 1489
        Height = 283
        Align = alClient
        TabOrder = 0
-        ExplicitWidth = 1364
-        ExplicitHeight = 264
        object cxGrid1DBChartView1: TcxGridDBChartView
          DataController.DataSource = db.dsMlekara
          DiagramColumn.Active = True
@@ -67,10 +62,8 @@ object MainForm: TMainForm
        Align = alBottom
        Alignment = alCenterCenter
        TabOrder = 1
-        ExplicitTop = 264
-        ExplicitWidth = 1364
        Height = 350
-        Width = 1501
+        Width = 1489
        object cxGrid5: TcxGrid
          Left = 2
          Top = 2
@@ -78,6 +71,8 @@ object MainForm: TMainForm
          Height = 346
          Align = alLeft
          TabOrder = 0
+          ExplicitLeft = 3
+          ExplicitTop = 6
          object cxGrid5DBChartView1: TcxGridDBChartView
            DataController.DataSource = db.DataSource1
            DiagramColumn.Active = True
@@ -197,8 +192,6 @@ object MainForm: TMainForm
    object cxTabSheet2: TcxTabSheet
      Caption = 'Stampa'
      ImageIndex = 1
-      ExplicitWidth = 1364
-      ExplicitHeight = 614
      object cxGroupBox2: TcxGroupBox
        Left = 0
        Top = 0
@@ -206,7 +199,6 @@ object MainForm: TMainForm
        Alignment = alCenterCenter
        TabOrder = 0
        Transparent = True
-        ExplicitHeight = 614
        Height = 633
        Width = 297
        object cxDBTextEdit1: TcxDBTextEdit
@@ -252,25 +244,39 @@ object MainForm: TMainForm
          Height = 55
          Width = 293
          object btSave: TcxButton
-            Left = 137
+            Left = 98
            Top = 2
-            Width = 136
+            Width = 96
            Height = 51
            Align = alLeft
            Caption = 'Snimi'
            TabOrder = 0
            OnClick = btSaveClick
+            ExplicitLeft = 72
+            ExplicitTop = 1
          end
          object btNew: TcxButton
            Left = 2
            Top = 2
-            Width = 135
+            Width = 96
            Height = 51
            Align = alLeft
            Caption = 'Novi'
            TabOrder = 1
            OnClick = btNewClick
          end
+          object cxButton3: TcxButton
+            Left = 194
+            Top = 2
+            Width = 96
+            Height = 51
+            Align = alLeft
+            Caption = 'Pregled'
+            TabOrder = 2
+            OnClick = cxButton3Click
+            ExplicitLeft = 177
+            ExplicitTop = 1
+          end
        end
        object cxLabel4: TcxLabel
          Left = 16
@@ -346,6 +352,20 @@ object MainForm: TMainForm
          TabOrder = 11
          Width = 105
        end
+        object cxDBLookupComboBox1: TcxDBLookupComboBox
+          Left = 16
+          Top = 302
+          DataBinding.DataField = 'id_uredjaja'
+          DataBinding.DataSource = db.dsArtikli
+          Properties.KeyFieldNames = 'id'
+          Properties.ListColumns = <
+            item
+              FieldName = 'id'
+            end>
+          Properties.ListSource = db.dsUredjaj
+          TabOrder = 12
+          Width = 88
+        end
      end
      object cxGroupBox3: TcxGroupBox
        Left = 297
@@ -353,27 +373,23 @@ object MainForm: TMainForm
        Align = alClient
        Alignment = alCenterCenter
        TabOrder = 1
-        ExplicitWidth = 1067
-        ExplicitHeight = 614
        Height = 633
-        Width = 1204
+        Width = 1192
        object cxGroupBox5: TcxGroupBox
          Left = 2
          Top = 2
          Align = alTop
          Alignment = alCenterCenter
          TabOrder = 0
-          ExplicitWidth = 1063
          Height = 271
-          Width = 1200
+          Width = 1188
          object cxGrid6: TcxGrid
            Left = 2
            Top = 2
-            Width = 1196
+            Width = 1184
            Height = 267
            Align = alClient
            TabOrder = 0
-            ExplicitWidth = 1059
            object cxGrid6DBTableView1: TcxGridDBTableView
              Navigator.Buttons.CustomButtons = <>
              DataController.DataSource = db.dsArtikli
@@ -424,7 +440,6 @@ object MainForm: TMainForm
          Alignment = alCenterCenter
          Style.BorderStyle = ebsNone
          TabOrder = 1
-          ExplicitHeight = 339
          Height = 358
          Width = 679
          object cxGrid7: TcxGrid
@@ -434,7 +449,6 @@ object MainForm: TMainForm
            Height = 315
            Align = alLeft
            TabOrder = 0
-            ExplicitHeight = 296
            object cxGrid7DBChartView1: TcxGridDBChartView
              DataController.DataSource = db.dsStampa
              DiagramLine.Active = True
@@ -442,6 +456,9 @@ object MainForm: TMainForm
              DiagramLine.Legend.Border = lbSingle
              DiagramLine.Legend.Orientation = cpoHorizontal
              DiagramLine.Legend.Position = cppLeft
+              DiagramLine.AxisCategory.Title.Text = 'Merenje temperature'
+              DiagramLine.Values.HotSpotSize = 7
+              DiagramLine.Values.LineWidth = 3
              Title.Alignment = cpaCenter
              Title.Text = 'Vreme merenje u satima'
              Title.Position = cppBottom
@@ -545,238 +562,114 @@ object MainForm: TMainForm
          end
        end
        object cxGroupBox7: TcxGroupBox
-          Left = 706
+          Left = 694
          Top = 273
          Align = alRight
          Alignment = alCenterCenter
+          Style.BorderStyle = ebsNone
          TabOrder = 2
-          ExplicitLeft = 681
-          ExplicitHeight = 339
          Height = 358
          Width = 496
+          object cxGrid8: TcxGrid
+            Left = 2
+            Top = 41
+            Width = 492
+            Height = 315
+            Align = alClient
+            TabOrder = 0
+            object cxGrid8DBChartView1: TcxGridDBChartView
+              DataController.DataSource = db.dsStampa
+              DiagramLine.Active = True
+              DiagramLine.Legend.Alignment = cpaStart
+              DiagramLine.Legend.Border = lbSingle
+              DiagramLine.Legend.KeyBorder = lbSingle
+              DiagramLine.Legend.Position = cppLeft
+              DiagramLine.AxisCategory.Title.Text = 'Naslov'
+              DiagramLine.Values.LineWidth = 3
+              Title.Alignment = cpaCenter
+              Title.Position = cppTop
+              ToolBox.Border = tbNone
+              ToolBox.Position = tpBottom
+              object cxGrid8DBChartView1DataGroup1: TcxGridDBChartDataGroup
+                DataBinding.FieldName = 'vreme'
+              end
+              object cxGrid8DBChartView1Series1: TcxGridDBChartSeries
+                DataBinding.FieldName = 't'
+              end
+            end
+            object cxGrid8Level1: TcxGridLevel
+              GridView = cxGrid8DBChartView1
+            end
+          end
+          object cxGroupBox9: TcxGroupBox
+            Left = 2
+            Top = 2
+            Align = alTop
+            Alignment = alCenterCenter
+            Style.BorderStyle = ebsNone
+            TabOrder = 1
+            Height = 39
+            Width = 492
+            object cxButton2: TcxButton
+              Left = 376
+              Top = 2
+              Width = 114
+              Height = 35
+              Align = alRight
+              Caption = 'Stampaj'
+              TabOrder = 0
+              Font.Charset = DEFAULT_CHARSET
+              Font.Color = clWindowText
+              Font.Height = -11
+              Font.Name = 'Tahoma'
+              Font.Style = [fsBold]
+              ParentFont = False
+              OnClick = cxButton2Click
+            end
+          end
        end
      end
    end
  end
-  object cxDBLookupComboBox1: TcxDBLookupComboBox
-    Left = 16
-    Top = 326
-    DataBinding.DataField = 'id_uredjaja'
-    DataBinding.DataSource = db.dsArtikli
-    Properties.KeyFieldNames = 'id'
-    Properties.ListColumns = <
-      item
-        FieldName = 'id'
-      end>
-    Properties.ListSource = db.dsUredjaj
-    TabOrder = 1
-    Width = 88
-  end
-  object print: TfrxReport
-    Version = '4.15'
-    DotMatrixReport = False
-    IniFile = '\Software\Fast Reports'
-    PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick]
-    PreviewOptions.Zoom = 1.000000000000000000
-    PrintOptions.Printer = 'Default'
-    PrintOptions.PrintOnSheet = 0
-    ReportOptions.CreateDate = 44160.809089050930000000
-    ReportOptions.LastChange = 44160.809089050930000000
-    ScriptLanguage = 'PascalScript'
-    ScriptText.Strings = (
-      ''
-      'begin'
-      ''
-      'end.')
-    Left = 928
-    Top = 120
-    Datasets = <
-      item
-        DataSet = frxDBArtikal
-        DataSetName = 'frxArtikal'
-      end>
-    Variables = <>
-    Style = <
-      item
-        Name = 'Title'
-        Color = clGray
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWhite
-        Font.Height = -16
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Header'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clMaroon
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Group header'
-        Color = 16053492
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clMaroon
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Data'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = []
-      end
-      item
-        Name = 'Group footer'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Header line'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = []
-        Frame.Typ = [ftBottom]
-        Frame.Width = 2.000000000000000000
-      end>
-    object Data: TfrxDataPage
-      Height = 1000.000000000000000000
-      Width = 1000.000000000000000000
-    end
-    object Page1: TfrxReportPage
-      PaperWidth = 215.900000000000000000
-      PaperHeight = 279.400000000000000000
-      PaperSize = 1
-      LeftMargin = 10.000000000000000000
-      RightMargin = 10.000000000000000000
-      TopMargin = 10.000000000000000000
-      BottomMargin = 10.000000000000000000
-      object ReportTitle1: TfrxReportTitle
-        Height = 26.456710000000000000
-        Top = 18.897650000000000000
-        Width = 740.787880000000000000
-        object Memo1: TfrxMemoView
-          Align = baWidth
-          Width = 740.787880000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          Color = clGray
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWhite
-          Font.Height = -16
-          Font.Name = 'Arial'
-          Font.Style = [fsBold]
-          HAlign = haCenter
-          Memo.UTF8W = (
-            'Report')
-          ParentFont = False
-          Style = 'Title'
-          VAlign = vaCenter
-        end
-      end
-      object PageHeader1: TfrxPageHeader
-        Height = 22.677180000000000000
-        Top = 68.031540000000000000
-        Width = 740.787880000000000000
-        object Memo2: TfrxMemoView
-          Width = 740.787401574803200000
-          Height = 22.677180000000000000
-          ShowHint = False
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWindowText
-          Font.Height = -13
-          Font.Name = 'Arial'
-          Font.Style = []
-          Frame.Typ = [ftBottom]
-          Frame.Width = 2.000000000000000000
-          ParentFont = False
-          Style = 'Header line'
-        end
-      end
-      object MasterData1: TfrxMasterData
-        Height = 18.897650000000000000
-        Top = 151.181200000000000000
-        Width = 740.787880000000000000
-        DataSet = frxDBArtikal
-        DataSetName = 'frxArtikal'
-        RowCount = 0
-      end
-      object PageFooter1: TfrxPageFooter
-        Height = 26.456710000000000000
-        Top = 230.551330000000000000
-        Width = 740.787880000000000000
-        object Memo3: TfrxMemoView
-          Align = baWidth
-          Width = 740.787880000000000000
-          ShowHint = False
-          Frame.Typ = [ftTop]
-          Frame.Width = 2.000000000000000000
-        end
-        object Memo4: TfrxMemoView
-          Top = 1.000000000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          AutoWidth = True
-          Memo.UTF8W = (
-            '[Date] [Time]')
-        end
-        object Memo5: TfrxMemoView
-          Align = baRight
-          Left = 665.197280000000000000
-          Top = 1.000000000000000000
-          Width = 75.590600000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          HAlign = haRight
-          Memo.UTF8W = (
-            'Page [Page#]')
-        end
-      end
-    end
-  end
-  object frxDBDPrint: TfrxDBDataset
-    UserName = 'frxDiag'
-    CloseDataSource = False
-    FieldAliases.Strings = (
-      'temperatura=temperatura'
-      'vreme=vreme')
-    DataSource = db.dsStampa
-    BCDToCurrency = False
-    Left = 928
-    Top = 176
-  end
-  object frxDBArtikal: TfrxDBDataset
-    UserName = 'frxArtikal'
-    CloseDataSource = False
-    DataSource = db.dsArtikli
-    BCDToCurrency = False
-    Left = 936
-    Top = 232
-  end
  object dxComponentPrinter1: TdxComponentPrinter
    CurrentLink = dxComponentPrinter1Link1
+    PrintTitle = 'Merenje temperature'
    Version = 0
-    Left = 784
+    Left = 568
-    Top = 152
+    Top = 424
    object dxComponentPrinter1Link1: TdxCustomContainerReportLink
      Active = True
      Component = cxGroupBox6
      PrinterPage.DMPaper = 9
      PrinterPage.Footer = 200
+      PrinterPage.GrayShading = True
+      PrinterPage.Header = 200
+      PrinterPage.Margins.Bottom = 500
+      PrinterPage.Margins.Left = 500
+      PrinterPage.Margins.Right = 500
+      PrinterPage.Margins.Top = 500
+      PrinterPage.PageSize.X = 8300
+      PrinterPage.PageSize.Y = 11700
+      PrinterPage._dxMeasurementUnits_ = 0
+      PrinterPage._dxLastMU_ = 1
+      ReportDocument.CreationDate = 44165.456728900460000000
+      BuiltInReportLink = True
+      HiddenComponents = {}
+      ExcludedComponents = {}
+      AggregatedReportLinks = {}
+    end
+  end
+  object dxComponentPrinter2: TdxComponentPrinter
+    CurrentLink = dxComponentPrinter2Link1
+    Version = 0
+    Left = 1208
+    Top = 419
+    object dxComponentPrinter2Link1: TdxCustomContainerReportLink
+      Active = True
+      Component = cxGroupBox7
+      PrinterPage.DMPaper = 9
+      PrinterPage.Footer = 200
+      PrinterPage.GrayShading = True
      PrinterPage.Header = 200
      PrinterPage.Margins.Bottom = 500
      PrinterPage.Margins.Left = 500
@@ -786,7 +679,7 @@ object MainForm: TMainForm
      PrinterPage.PageSize.Y = 11700
      PrinterPage._dxMeasurementUnits_ = 0
      PrinterPage._dxLastMU_ = 1
-      ReportDocument.CreationDate = 44161.412318703700000000
+      ReportDocument.CreationDate = 44165.456728969900000000
      BuiltInReportLink = True
      HiddenComponents = {}
      ExcludedComponents = {}

--- a/__history/MlekaraMain.dfm.~33~
+++ b/__history/MlekaraMain.dfm.~33~
 object MainForm: TMainForm
  Left = 0
  Top = 0
-  Caption = 'MainForm'
+  Caption = 'Merenje temperature'
-  ClientHeight = 638
+  ClientHeight = 657
-  ClientWidth = 1364
+  ClientWidth = 1489
  Color = clBtnFace
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
@@ -11,20 +11,21 @@ object MainForm: TMainForm
  Font.Name = 'Tahoma'
  Font.Style = []
  OldCreateOrder = False
+  OnCreate = FormCreate
  OnShow = FormShow
  PixelsPerInch = 96
  TextHeight = 13
  object cxPageControl1: TcxPageControl
    Left = 0
    Top = 0
-    Width = 1364
+    Width = 1489
-    Height = 638
+    Height = 657
    Align = alClient
    TabOrder = 0
    Properties.ActivePage = cxTabSheet2
    Properties.CustomButtons.Buttons = <>
-    ClientRectBottom = 638
+    ClientRectBottom = 657
-    ClientRectRight = 1364
+    ClientRectRight = 1489
    ClientRectTop = 24
    object cxTabSheet1: TcxTabSheet
      Caption = 'Glavna'
@@ -32,8 +33,8 @@ object MainForm: TMainForm
      object cxGrid1: TcxGrid
        Left = 0
        Top = 0
-        Width = 1364
+        Width = 1489
-        Height = 264
+        Height = 283
        Align = alClient
        TabOrder = 0
        object cxGrid1DBChartView1: TcxGridDBChartView
@@ -57,12 +58,12 @@ object MainForm: TMainForm
      end
      object cxGroupBox1: TcxGroupBox
        Left = 0
-        Top = 264
+        Top = 283
        Align = alBottom
        Alignment = alCenterCenter
        TabOrder = 1
        Height = 350
-        Width = 1364
+        Width = 1489
        object cxGrid5: TcxGrid
          Left = 2
          Top = 2
@@ -196,7 +197,7 @@ object MainForm: TMainForm
        Alignment = alCenterCenter
        TabOrder = 0
        Transparent = True
-        Height = 614
+        Height = 633
        Width = 297
        object cxDBTextEdit1: TcxDBTextEdit
          Left = 16
@@ -241,9 +242,9 @@ object MainForm: TMainForm
          Height = 55
          Width = 293
          object btSave: TcxButton
-            Left = 137
+            Left = 98
            Top = 2
-            Width = 136
+            Width = 96
            Height = 51
            Align = alLeft
            Caption = 'Snimi'
@@ -253,13 +254,23 @@ object MainForm: TMainForm
          object btNew: TcxButton
            Left = 2
            Top = 2
-            Width = 135
+            Width = 96
            Height = 51
            Align = alLeft
            Caption = 'Novi'
            TabOrder = 1
            OnClick = btNewClick
          end
+          object cxButton3: TcxButton
+            Left = 194
+            Top = 2
+            Width = 96
+            Height = 51
+            Align = alLeft
+            Caption = 'Pregled'
+            TabOrder = 2
+            OnClick = cxButton3Click
+          end
        end
        object cxLabel4: TcxLabel
          Left = 16
@@ -335,6 +346,20 @@ object MainForm: TMainForm
          TabOrder = 11
          Width = 105
        end
+        object cxDBLookupComboBox1: TcxDBLookupComboBox
+          Left = 16
+          Top = 302
+          DataBinding.DataField = 'id_uredjaja'
+          DataBinding.DataSource = db.dsArtikli
+          Properties.KeyFieldNames = 'id'
+          Properties.ListColumns = <
+            item
+              FieldName = 'id'
+            end>
+          Properties.ListSource = db.dsUredjaj
+          TabOrder = 12
+          Width = 88
+        end
      end
      object cxGroupBox3: TcxGroupBox
        Left = 297
@@ -342,8 +367,8 @@ object MainForm: TMainForm
        Align = alClient
        Alignment = alCenterCenter
        TabOrder = 1
-        Height = 614
+        Height = 633
-        Width = 1067
+        Width = 1192
        object cxGroupBox5: TcxGroupBox
          Left = 2
          Top = 2
@@ -351,11 +376,11 @@ object MainForm: TMainForm
          Alignment = alCenterCenter
          TabOrder = 0
          Height = 271
-          Width = 1063
+          Width = 1188
          object cxGrid6: TcxGrid
            Left = 2
            Top = 2
-            Width = 1059
+            Width = 1184
            Height = 267
            Align = alClient
            TabOrder = 0
@@ -409,13 +434,13 @@ object MainForm: TMainForm
          Alignment = alCenterCenter
          Style.BorderStyle = ebsNone
          TabOrder = 1
-          Height = 339
+          Height = 358
          Width = 679
          object cxGrid7: TcxGrid
            Left = 2
            Top = 41
            Width = 535
-            Height = 296
+            Height = 315
            Align = alLeft
            TabOrder = 0
            object cxGrid7DBChartView1: TcxGridDBChartView
@@ -425,10 +450,14 @@ object MainForm: TMainForm
              DiagramLine.Legend.Border = lbSingle
              DiagramLine.Legend.Orientation = cpoHorizontal
              DiagramLine.Legend.Position = cppLeft
+              DiagramLine.AxisCategory.Title.Text = 'Merenje temperature'
+              DiagramLine.Values.HotSpotSize = 7
+              DiagramLine.Values.LineWidth = 3
              Title.Alignment = cpaCenter
              Title.Text = 'Vreme merenje u satima'
              Title.Position = cppBottom
              ToolBox.Position = tpBottom
+              ToolBox.Visible = tvNever
              object cxGrid7DBChartView1DataGroup1: TcxGridDBChartDataGroup
                DataBinding.FieldName = 'vreme'
              end
@@ -528,236 +557,114 @@ object MainForm: TMainForm
          end
        end
        object cxGroupBox7: TcxGroupBox
-          Left = 681
+          Left = 694
          Top = 273
-          Align = alLeft
+          Align = alRight
          Alignment = alCenterCenter
+          Style.BorderStyle = ebsNone
          TabOrder = 2
-          Height = 339
+          Height = 358
-          Width = 399
+          Width = 496
-        end
+          object cxGrid8: TcxGrid
-      end
+            Left = 2
-    end
+            Top = 41
-  end
+            Width = 492
-  object cxDBLookupComboBox1: TcxDBLookupComboBox
+            Height = 315
-    Left = 16
+            Align = alClient
-    Top = 326
+            TabOrder = 0
-    DataBinding.DataField = 'id_uredjaja'
+            object cxGrid8DBChartView1: TcxGridDBChartView
-    DataBinding.DataSource = db.dsArtikli
+              DataController.DataSource = db.dsStampa
-    Properties.KeyFieldNames = 'id'
+              DiagramLine.Active = True
-    Properties.ListColumns = <
+              DiagramLine.Legend.Alignment = cpaStart
-      item
+              DiagramLine.Legend.Border = lbSingle
-        FieldName = 'id'
+              DiagramLine.Legend.KeyBorder = lbSingle
-      end>
+              DiagramLine.Legend.Position = cppLeft
-    Properties.ListSource = db.dsUredjaj
+              DiagramLine.AxisCategory.Title.Text = 'Naslov'
-    TabOrder = 1
+              DiagramLine.Values.LineWidth = 3
-    Width = 88
+              Title.Alignment = cpaCenter
-  end
+              Title.Position = cppTop
-  object print: TfrxReport
+              ToolBox.Border = tbNone
-    Version = '4.15'
+              ToolBox.Position = tpBottom
-    DotMatrixReport = False
+              object cxGrid8DBChartView1DataGroup1: TcxGridDBChartDataGroup
-    IniFile = '\Software\Fast Reports'
+                DataBinding.FieldName = 'vreme'
-    PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick]
+              end
-    PreviewOptions.Zoom = 1.000000000000000000
+              object cxGrid8DBChartView1Series1: TcxGridDBChartSeries
-    PrintOptions.Printer = 'Default'
+                DataBinding.FieldName = 't'
-    PrintOptions.PrintOnSheet = 0
+              end
-    ReportOptions.CreateDate = 44160.809089050930000000
+            end
-    ReportOptions.LastChange = 44160.809089050930000000
+            object cxGrid8Level1: TcxGridLevel
-    ScriptLanguage = 'PascalScript'
+              GridView = cxGrid8DBChartView1
-    ScriptText.Strings = (
+            end
-      ''
+          end
-      'begin'
+          object cxGroupBox9: TcxGroupBox
-      ''
+            Left = 2
-      'end.')
+            Top = 2
-    Left = 928
+            Align = alTop
-    Top = 120
+            Alignment = alCenterCenter
-    Datasets = <
+            Style.BorderStyle = ebsNone
-      item
+            TabOrder = 1
-        DataSet = frxDBArtikal
+            Height = 39
-        DataSetName = 'frxArtikal'
+            Width = 492
-      end>
+            object cxButton2: TcxButton
-    Variables = <>
+              Left = 376
-    Style = <
+              Top = 2
-      item
+              Width = 114
-        Name = 'Title'
+              Height = 35
-        Color = clGray
+              Align = alRight
-        Font.Charset = DEFAULT_CHARSET
+              Caption = 'Stampaj'
-        Font.Color = clWhite
+              TabOrder = 0
-        Font.Height = -16
+              Font.Charset = DEFAULT_CHARSET
-        Font.Name = 'Arial'
+              Font.Color = clWindowText
-        Font.Style = [fsBold]
+              Font.Height = -11
-      end
+              Font.Name = 'Tahoma'
-      item
+              Font.Style = [fsBold]
-        Name = 'Header'
+              ParentFont = False
-        Color = clNone
+              OnClick = cxButton2Click
-        Font.Charset = DEFAULT_CHARSET
+            end
-        Font.Color = clMaroon
+          end
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Group header'
-        Color = 16053492
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clMaroon
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Data'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = []
-      end
-      item
-        Name = 'Group footer'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = [fsBold]
-      end
-      item
-        Name = 'Header line'
-        Color = clNone
-        Font.Charset = DEFAULT_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -13
-        Font.Name = 'Arial'
-        Font.Style = []
-        Frame.Typ = [ftBottom]
-        Frame.Width = 2.000000000000000000
-      end>
-    object Data: TfrxDataPage
-      Height = 1000.000000000000000000
-      Width = 1000.000000000000000000
-    end
-    object Page1: TfrxReportPage
-      PaperWidth = 215.900000000000000000
-      PaperHeight = 279.400000000000000000
-      PaperSize = 1
-      LeftMargin = 10.000000000000000000
-      RightMargin = 10.000000000000000000
-      TopMargin = 10.000000000000000000
-      BottomMargin = 10.000000000000000000
-      object ReportTitle1: TfrxReportTitle
-        Height = 26.456710000000000000
-        Top = 18.897650000000000000
-        Width = 740.787880000000000000
-        object Memo1: TfrxMemoView
-          Align = baWidth
-          Width = 740.787880000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          Color = clGray
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWhite
-          Font.Height = -16
-          Font.Name = 'Arial'
-          Font.Style = [fsBold]
-          HAlign = haCenter
-          Memo.UTF8W = (
-            'Report')
-          ParentFont = False
-          Style = 'Title'
-          VAlign = vaCenter
-        end
-      end
-      object PageHeader1: TfrxPageHeader
-        Height = 22.677180000000000000
-        Top = 68.031540000000000000
-        Width = 740.787880000000000000
-        object Memo2: TfrxMemoView
-          Width = 740.787401574803200000
-          Height = 22.677180000000000000
-          ShowHint = False
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWindowText
-          Font.Height = -13
-          Font.Name = 'Arial'
-          Font.Style = []
-          Frame.Typ = [ftBottom]
-          Frame.Width = 2.000000000000000000
-          ParentFont = False
-          Style = 'Header line'
-        end
-      end
-      object MasterData1: TfrxMasterData
-        Height = 18.897650000000000000
-        Top = 151.181200000000000000
-        Width = 740.787880000000000000
-        DataSet = frxDBArtikal
-        DataSetName = 'frxArtikal'
-        RowCount = 0
-      end
-      object PageFooter1: TfrxPageFooter
-        Height = 26.456710000000000000
-        Top = 230.551330000000000000
-        Width = 740.787880000000000000
-        object Memo3: TfrxMemoView
-          Align = baWidth
-          Width = 740.787880000000000000
-          ShowHint = False
-          Frame.Typ = [ftTop]
-          Frame.Width = 2.000000000000000000
-        end
-        object Memo4: TfrxMemoView
-          Top = 1.000000000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          AutoWidth = True
-          Memo.UTF8W = (
-            '[Date] [Time]')
-        end
-        object Memo5: TfrxMemoView
-          Align = baRight
-          Left = 665.197280000000000000
-          Top = 1.000000000000000000
-          Width = 75.590600000000000000
-          Height = 22.677180000000000000
-          ShowHint = False
-          HAlign = haRight
-          Memo.UTF8W = (
-            'Page [Page#]')
        end
      end
    end
  end
-  object frxDBDPrint: TfrxDBDataset
-    UserName = 'frxDiag'
-    CloseDataSource = False
-    FieldAliases.Strings = (
-      'temperatura=temperatura'
-      'vreme=vreme')
-    DataSource = db.dsStampa
-    BCDToCurrency = False
-    Left = 928
-    Top = 176
-  end
-  object frxDBArtikal: TfrxDBDataset
-    UserName = 'frxArtikal'
-    CloseDataSource = False
-    DataSource = db.dsArtikli
-    BCDToCurrency = False
-    Left = 936
-    Top = 232
-  end
  object dxComponentPrinter1: TdxComponentPrinter
    CurrentLink = dxComponentPrinter1Link1
+    PrintTitle = 'Merenje temperature'
    Version = 0
-    Left = 784
+    Left = 568
-    Top = 152
+    Top = 424
    object dxComponentPrinter1Link1: TdxCustomContainerReportLink
      Active = True
      Component = cxGroupBox6
      PrinterPage.DMPaper = 9
      PrinterPage.Footer = 200
+      PrinterPage.GrayShading = True
+      PrinterPage.Header = 200
+      PrinterPage.Margins.Bottom = 500
+      PrinterPage.Margins.Left = 500
+      PrinterPage.Margins.Right = 500
+      PrinterPage.Margins.Top = 500
+      PrinterPage.PageSize.X = 8300
+      PrinterPage.PageSize.Y = 11700
+      PrinterPage._dxMeasurementUnits_ = 0
+      PrinterPage._dxLastMU_ = 1
+      ReportDocument.CreationDate = 44169.443391157410000000
+      BuiltInReportLink = True
+      HiddenComponents = {}
+      ExcludedComponents = {}
+      AggregatedReportLinks = {}
+    end
+  end
+  object dxComponentPrinter2: TdxComponentPrinter
+    CurrentLink = dxComponentPrinter2Link1
+    Version = 0
+    Left = 1208
+    Top = 419
+    object dxComponentPrinter2Link1: TdxCustomContainerReportLink
+      Active = True
+      Component = cxGroupBox7
+      PrinterPage.DMPaper = 9
+      PrinterPage.Footer = 200
+      PrinterPage.GrayShading = True
      PrinterPage.Header = 200
      PrinterPage.Margins.Bottom = 500
      PrinterPage.Margins.Left = 500
@@ -767,7 +674,7 @@ object MainForm: TMainForm
      PrinterPage.PageSize.Y = 11700
      PrinterPage._dxMeasurementUnits_ = 0
      PrinterPage._dxLastMU_ = 1
-      ReportDocument.CreationDate = 44161.412318703700000000
+      ReportDocument.CreationDate = 44169.443391388890000000
      BuiltInReportLink = True
      HiddenComponents = {}
      ExcludedComponents = {}