[성현모] 온도 그래프, 버전 셀렉트 기능 추가

CPXV2 TRA JSON/SystemX.Product.CP.TRA/DataManager/DMTestSummary.cs

@@ -262,13 +262,13 @@ namespace SystemX.Product.TRA.DataManager
             }
 
             //PK 키 지정
-            DataColumn[] keys1 = new DataColumn[1];
+            //DataColumn[] keys1 = new DataColumn[1];
-            keys1[0] = new DataColumn();
+            //keys1[0] = new DataColumn();
-            keys1[0] = dtResult.Columns["StepID"];
+            //keys1[0] = dtResult.Columns["StepID"];
 
-            dtResult.PrimaryKey = keys1;
+            //dtResult.PrimaryKey = keys1;
 
-            return dtResult;
+            return dtHistVersionTL;
         }
 
         public DataTable RefineStepVersion(DataTable dtTestlist, SelectedDataCollection data)

CPXV2 TRA JSON/SystemX.Product.CP.TRA/MainForm.Designer.cs

@@ -135,6 +135,8 @@
             this.tabbedView = new DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(this.components);
             this.documentManager = new DevExpress.XtraBars.Docking2010.DocumentManager(this.components);
             this.timerProc = new System.Windows.Forms.Timer(this.components);
+            this.barEditItemStepVersion = new DevExpress.XtraBars.BarEditItem();
+            this.repositoryItemTextEdit8 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
             ((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
@@ -167,6 +169,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.accordionControl)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedView)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.documentManager)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEdit8)).BeginInit();
             this.SuspendLayout();
             // 
             // ribbonControl
@@ -215,10 +218,11 @@
             this.barCheckItemFullScan,
             this.barEditItemProgress,
             this.barCheckItem1,
-            this.barCheckItemLongTerm});
+            this.barCheckItemLongTerm,
+            this.barEditItemStepVersion});
             this.ribbonControl.Location = new System.Drawing.Point(0, 0);
             this.ribbonControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.ribbonControl.MaxItemId = 92;
+            this.ribbonControl.MaxItemId = 93;
             this.ribbonControl.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always;
             this.ribbonControl.Name = "ribbonControl";
             this.ribbonControl.OptionsMenuMinWidth = 440;
@@ -245,10 +249,11 @@
             this.repositoryItemCheckEdit1,
             this.repositoryItemTextEdit7,
             this.repositoryItemCheckEdit2,
-            this.repositoryItemProgressBar1});
+            this.repositoryItemProgressBar1,
+            this.repositoryItemTextEdit8});
             this.ribbonControl.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013;
             this.ribbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
-            this.ribbonControl.Size = new System.Drawing.Size(1485, 237);
+            this.ribbonControl.Size = new System.Drawing.Size(1485, 160);
             this.ribbonControl.StatusBar = this.ribbonStatusBar;
             this.ribbonControl.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
             // 
@@ -792,6 +797,7 @@
             this.ribbonPageGroup2.ItemLinks.Add(this.barEditItemParentInfo);
             this.ribbonPageGroup2.ItemLinks.Add(this.barEditItemDTBegin);
             this.ribbonPageGroup2.ItemLinks.Add(this.barEditItemDTEnd);
+            this.ribbonPageGroup2.ItemLinks.Add(this.barEditItemStepVersion);
             this.ribbonPageGroup2.Name = "ribbonPageGroup2";
             this.ribbonPageGroup2.Text = "Selected Data Collection";
             // 
@@ -907,11 +913,11 @@
             // ribbonStatusBar
             // 
             this.ribbonStatusBar.ItemLinks.Add(this.barStaticItem1);
-            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 747);
+            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 759);
             this.ribbonStatusBar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ribbonStatusBar.Name = "ribbonStatusBar";
             this.ribbonStatusBar.Ribbon = this.ribbonControl;
-            this.ribbonStatusBar.Size = new System.Drawing.Size(1485, 36);
+            this.ribbonStatusBar.Size = new System.Drawing.Size(1485, 24);
             // 
             // dockManager
             // 
@@ -931,12 +937,12 @@
             // 
             // hideContainerLeft
             // 
-            this.hideContainerLeft.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
+            this.hideContainerLeft.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.hideContainerLeft.Controls.Add(this.dockPanel);
             this.hideContainerLeft.Dock = System.Windows.Forms.DockStyle.Left;
-            this.hideContainerLeft.Location = new System.Drawing.Point(0, 237);
+            this.hideContainerLeft.Location = new System.Drawing.Point(0, 160);
             this.hideContainerLeft.Name = "hideContainerLeft";
-            this.hideContainerLeft.Size = new System.Drawing.Size(32, 510);
+            this.hideContainerLeft.Size = new System.Drawing.Size(22, 599);
             // 
             // dockPanel
             // 
@@ -1019,10 +1025,23 @@
             this.timerProc.Enabled = true;
             this.timerProc.Tick += new System.EventHandler(this.timerProc_Tick);
             // 
+            // barEditItemStepVersion
+            // 
+            this.barEditItemStepVersion.Caption = "Step Version:";
+            this.barEditItemStepVersion.Edit = this.repositoryItemTextEdit8;
+            this.barEditItemStepVersion.EditWidth = 160;
+            this.barEditItemStepVersion.Id = 92;
+            this.barEditItemStepVersion.Name = "barEditItemStepVersion";
+            // 
+            // repositoryItemTextEdit8
+            // 
+            this.repositoryItemTextEdit8.AutoHeight = false;
+            this.repositoryItemTextEdit8.Name = "repositoryItemTextEdit8";
+            // 
             // MainForm
             // 
             this.Appearance.Options.UseFont = true;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.Zoom;
             this.BackgroundImageStore = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImageStore")));
@@ -1075,6 +1094,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.accordionControl)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedView)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.documentManager)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEdit8)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1165,5 +1185,7 @@
         private System.Windows.Forms.Timer timerProc;
         private DevExpress.XtraBars.BarCheckItem barCheckItem1;
         private DevExpress.XtraBars.BarCheckItem barCheckItemLongTerm;
+        private DevExpress.XtraBars.BarEditItem barEditItemStepVersion;
+        private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit8;
     }
 }

CPXV2 TRA JSON/SystemX.Product.CP.TRA/MainForm.cs

@@ -1340,6 +1340,7 @@ namespace SystemX.Product.CP.TRA
             SelectAccordianElement(view.ViewID);
 
             view.ViewData(eCurrentView, SelectedDetailData);
+            barEditItemStepVersion.EditValue = $"{SelectedDetailData.StepVersion}";
 
             view.OnDetailSelect -= SetDetailTestDataView;
             view.OnDetailSelect += SetDetailTestDataView;
@@ -1491,7 +1492,14 @@ namespace SystemX.Product.CP.TRA
                 view.OnStepSelect += SetTestTrendDataView;
 
                 if (baseView.ContentsType == eContents.TestHistory)
+                {
+                    if(Int32.TryParse(barEditItemStepVersion.EditValue.ToString(), out var value))
+                    {
+                        view.ViewData(SelectedDetailData, (baseView as UcTRATestHistHost).DataResult, value);
+                    }
+                    else
                         view.ViewData(SelectedDetailData, (baseView as UcTRATestHistHost).DataResult);
+                }                    
             });
         }
 

CPXV2 TRA JSON/SystemX.Product.CP.TRA/Properties/licenses.licx

@@ -0,0 +1,10 @@
+DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v22.2, Version=22.2.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

CPXV2 TRA JSON/SystemX.Product.CP.TRA/UIControl/UcTRAStepTrend.cs

@@ -301,7 +301,13 @@ namespace SystemX.Product.TRA.UIControl
                             continue;
                         }
 
-                        if (string.IsNullOrEmpty(row.MeasValStr) == true)
+                        if (dtRowTestlistSpec.ItemArray[9].ToString() == "TEMPCELSIUS")
+                        {
+                            row.MeasVal = Convert.ToDecimal($"{row.Message.Split('_')[1]}");
+                            row.MeasValStr = $"{row.Message.Split('_')[1]}";
+                            row.Message = string.Empty;
+                        }
+                        else if (string.IsNullOrEmpty(row.MeasValStr) == true)
                         {
                             if (//!string.IsNullOrEmpty(row.MeasValStr) ||
                                 //!string.IsNullOrEmpty(row.Message) ||
@@ -559,7 +565,7 @@ namespace SystemX.Product.TRA.UIControl
         {
             string strDim = dtRowTestlist[DMTestDetail.eColTestlist.Dim.ToString()].ToString();
 
-            if (NoChartDispSpec.Contains(strDim))
+            if (data.MO != "TEMPCELSIUS" && NoChartDispSpec.Contains(strDim))
                 return null;
 
             bool bIsGlobal = (Convert.ToInt32(dtRowTestlist[DMTestDetail.eColTestlist.IsGlobal.ToString()])) > 0 ? true : false;
@@ -608,7 +614,7 @@ namespace SystemX.Product.TRA.UIControl
 
                 elemUnit.Result = strResult == "NG" || strResult == "ERROR" ? eResultType.NG : strResult == "OK" ? eResultType.OK : eResultType.NONE;
 
-                if (bOKDataOnly && elemUnit.Result != eResultType.OK)
+                if (bOKDataOnly && data.MO != "TEMPCELSIUS" && elemUnit.Result != eResultType.OK)
                     continue;
 
                 resultUnit.DataElements.Add(elemUnit);

CPXV2 TRA JSON/SystemX.Product.CP.TRA/UIControl/UcTRASummaryTestResult.cs

@@ -86,7 +86,7 @@ namespace SystemX.Product.TRA.UIControl
             DataManager = new DMTestSummary(SelectView, DBController, dtStart);
         }      
 
-        public void ViewData(SelectedDataCollection data, DataTable DataList)
+        public void ViewData(SelectedDataCollection data, DataTable DataList, int stepVersion = -1)
         {
             if (data == null)
                 return;
@@ -109,7 +109,7 @@ namespace SystemX.Product.TRA.UIControl
 
             try
             {
-                ShowProperties(data);
+                data.StepVersion = stepVersion.ToString();
 
                 SelectedData = data;
                 DTTestLogList = DataList;
@@ -122,7 +122,12 @@ namespace SystemX.Product.TRA.UIControl
                     string strGetStepVersion = dr[eColList.StepVersion.ToString()].ToString();
                     int nCurStepVersion = int.MinValue;
 
-                    if (int.TryParse(strGetStepVersion, out nCurStepVersion) == false)
+                    if (stepVersion > -1)
+                    {
+                        nGetStepVersion = stepVersion;
+                        ShowProperties(data);
+                    }
+                    else if (int.TryParse(strGetStepVersion, out nCurStepVersion) == false)
                     {
                         bOptionNewStepVersionBase = true;