Merge branch 'OTSRelease3_0' into zjx

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.Designer.cs

@@ -34,8 +34,8 @@
             this.TSSaveAs = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.TSLoad = new System.Windows.Forms.ToolStripButton();
-            this.PropGrid = new SourceGrid.Grid();
             this.toolStripButton_refresh = new System.Windows.Forms.ToolStripButton();
+            this.PropGrid = new SourceGrid.Grid();
             this.TSGridTitle.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -103,6 +103,17 @@
             this.TSLoad.Visible = false;
             this.TSLoad.Click += new System.EventHandler(this.TSLoad_Click);
             // 
+            // toolStripButton_refresh
+            // 
+            this.toolStripButton_refresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton_refresh.Enabled = false;
+            this.toolStripButton_refresh.Image = global::OTSMeasureApp.Properties.Resources.Recover16;
+            this.toolStripButton_refresh.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton_refresh.Name = "toolStripButton_refresh";
+            this.toolStripButton_refresh.Size = new System.Drawing.Size(28, 23);
+            this.toolStripButton_refresh.Text = "toolStripButton1";
+            this.toolStripButton_refresh.Click += new System.EventHandler(this.toolStripButton_refresh_Click);
+            // 
             // PropGrid
             // 
             this.PropGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -119,16 +130,6 @@
             this.PropGrid.ToolTipText = "";
             this.PropGrid.Click += new System.EventHandler(this.PropGrid_Click_1);
             // 
-            // toolStripButton_refresh
-            // 
-            this.toolStripButton_refresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton_refresh.Image = global::OTSMeasureApp.Properties.Resources.Recover16;
-            this.toolStripButton_refresh.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton_refresh.Name = "toolStripButton_refresh";
-            this.toolStripButton_refresh.Size = new System.Drawing.Size(28, 23);
-            this.toolStripButton_refresh.Text = "toolStripButton1";
-            this.toolStripButton_refresh.Click += new System.EventHandler(this.toolStripButton_refresh_Click);
-            // 
             // OTSPropertyWindow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -162,6 +163,6 @@
         public SourceGrid.Grid PropGrid;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         public System.Windows.Forms.ToolStripButton TSLoad;
-        private System.Windows.Forms.ToolStripButton toolStripButton_refresh;
+        public System.Windows.Forms.ToolStripButton toolStripButton_refresh;
     }
 }

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -62,6 +62,7 @@ namespace OTSMeasureApp
                     PropGrid.Rows.ShowRow(i);
                 }
             }
+            toolStripButton_refresh.Enabled = true;
             PropGrid.Refresh();
             PropGrid.Invalidate();
         }

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.resx

@@ -134,32 +134,32 @@
   <data name="TSEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="TSSaveAs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -658,6 +658,8 @@ namespace OTSMeasureApp
                 m_SamplepaceWindow.DeleteWorkSample(sDeleteWSampleName);
                 
                 m_SPropertyWindows.PropGrid.Hide();
+                m_SPropertyWindows.toolStripButton_refresh.Enabled = false;
+                m_SPropertyWindows.TSSaveAs.Enabled = false;
                 m_SolutionWindows.treeView1.Nodes.Clear();
                 m_MessureStatuWindow.HideXRayTable();
 

OTSPartA_STDEditor/UI/Form_Main.cs

@@ -45,6 +45,8 @@ namespace OTSPartA_STDEditor
         public bool IsModified { set; get; }
         public bool Isoldversion { set; get; }
 
+
+        public static readonly string[] ColorGroup = { "#FFB6C1", "#FFC0CB", "#DC143C", "#FFF0F5", "#DB7093", "#FF69B4", "#FF1493", "#C71585", "#DA70D6", "#D8BFD8", "#DDA0DD", "#EE82EE", "#FF00FF", "#8B008B", "#800080", "#BA55D3", "#9400D3", "#9932CC", "#4B0082", "#8A2BE2", "#9370DB","#7B68EE" };
         public Form_Main()
         {
             InitializeComponent();
@@ -82,7 +84,7 @@ namespace OTSPartA_STDEditor
                     if (m_importStandardLibraryTypeSelection.SelectEvent == "expression")
                     {
                         int STDId = AddSTDDictionaryItem();
-                        m_STDRuleslist.AddNewRow(STDId, "NewClassify", Color.Gray);
+                        m_STDRuleslist.AddNewRow(STDId, "NewClassify", Attributes.colorHx16toRGB(STDDictionary[STDId].Color));
                     }
                 }
             }
@@ -922,8 +924,8 @@ namespace OTSPartA_STDEditor
             new_STDdata.Expression = "false";
             new_STDdata.KeyElementList = "";
             new_STDdata.SubElementList = "";
-
-            new_STDdata.Color = colorRGBtoHx16(Color.Gray.R, Color.Gray.G, Color.Gray.B);
+            Random random = new Random();
+            new_STDdata.Color = ColorGroup[random.Next(ColorGroup.Length)];
 
             int STDId = 40000;
 

OTSPartA_STDEditor/UI/STDRuleslist.cs

@@ -180,7 +180,7 @@ namespace OTSPartA_STDEditor
                             m_MainForm.SaveDataOfSelRule(i, j);
 
                             int STDId = m_MainForm.AddSTDDictionaryItem();
-                            AddNewRow(STDId, "NewRuleName", Color.Gray);
+                            AddNewRow(STDId, "NewRuleName", Attributes.colorHx16toRGB(m_MainForm.STDDictionary[STDId].Color));
                             m_MainForm.m_SubMidWindow.m_ComparativeLibrary.MakeCheckboxUnchecked();
                 //        }
                 //    }
@@ -189,7 +189,7 @@ namespace OTSPartA_STDEditor
             else
             {
                 int STDId = m_MainForm.AddSTDDictionaryItem();
-                AddNewRow(STDId, "NewRuleName", Color.Gray);
+                AddNewRow(STDId, "NewRuleName", Attributes.colorHx16toRGB(m_MainForm.STDDictionary[STDId].Color));
                 m_MainForm.m_SubMidWindow.m_ComparativeLibrary.MakeCheckboxUnchecked();
             }
             //SetOrderButtonsStatus();