界面调整1024X768

SO852.txt

+分辨率改为1024X768

source/ACSingleStore/FrmBase.cs

@@ -44,7 +44,7 @@ namespace OnlineStore.ACSingleStore
             }
             return str;
         }
-        internal static string GetCodeNum(string codeName = "RC-SISO-ACSingleStore")
+        internal static string GetCodeNum(string codeName = "SO852-ACSingleStore")
         {
             byte[] byteArray = System.Text.Encoding.ASCII.GetBytes(codeName);
             string result = "";

source/ACSingleStore/FrmStoreBox.cs

@@ -170,8 +170,22 @@ namespace OnlineStore.ACSingleStore
             }
             LanguageProcess();
             LanguagePro();
-            tabControl1.TabPages.Remove(tabPage3);
-            richTextBox1.Visible = false;
+           
+            tabControl1.TabPages.Remove(tabPage2);
+
+            bool showLog = true;
+            if (showLog)
+            {
+                richTextBox1.Visible = true;
+                chbIsDebug.Checked = true;
+            }
+            else
+            {
+                chbIsDebug.Checked = false;
+                richTextBox1.Visible = false ;
+                tabControl1.TabPages.Remove(tabPage3);
+            } 
+           
             //    this.tabControl1.TabPages.Remove(tabPage3);
             //      groupCode.Visible = false;
         }

source/ACSingleStore/positionTool/FrmPositionTool.Designer.cs

@@ -88,7 +88,7 @@
             this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox6.Location = new System.Drawing.Point(6, 5);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(1008, 707);
+            this.groupBox6.Size = new System.Drawing.Size(992, 707);
             this.groupBox6.TabIndex = 250;
             this.groupBox6.TabStop = false;
             // 
@@ -499,7 +499,7 @@
             // btnExit
             // 
             this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnExit.Location = new System.Drawing.Point(838, 665);
+            this.btnExit.Location = new System.Drawing.Point(822, 665);
             this.btnExit.Name = "btnExit";
             this.btnExit.Size = new System.Drawing.Size(132, 36);
             this.btnExit.TabIndex = 281;
@@ -510,7 +510,7 @@
             // btnClear
             // 
             this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClear.Location = new System.Drawing.Point(691, 665);
+            this.btnClear.Location = new System.Drawing.Point(675, 665);
             this.btnClear.Name = "btnClear";
             this.btnClear.Size = new System.Drawing.Size(132, 36);
             this.btnClear.TabIndex = 106;
@@ -526,7 +526,7 @@
             this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.richTextBox1.Location = new System.Drawing.Point(473, 20);
             this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(526, 642);
+            this.richTextBox1.Size = new System.Drawing.Size(510, 642);
             this.richTextBox1.TabIndex = 105;
             this.richTextBox1.Text = "";
             // 
@@ -539,7 +539,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1020, 719);
+            this.ClientSize = new System.Drawing.Size(1004, 719);
             this.Controls.Add(this.groupBox6);
             this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Name = "FrmPositionTool";

source/ACSingleStore/resource/language.resource

@@ -321,4 +321,5 @@ FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_T
 Y11,设备照明开,Equipment lighting on
 FrmIOStatus_btnCDLed_Text,关闭设备照明,Turn off equipment lighting
 FrmIOStatus_btnDevideLed_Text,打开设备照明,Turn on equipment lighting
-FrmStoreBox_chbOpenLog_Text,显示日志,Open Log
\ No newline at end of file
+FrmStoreBox_chbOpenLog_Text,显示日志,Open Log
+FrmStoreBox_tabPage7_Text,  设备状态  ,  Machine state  
\ No newline at end of file

source/ACSingleStore/useControl/AxisMoveControl.cs

@@ -182,11 +182,13 @@ namespace OnlineStore.ACPackingStore
             {
                 txtServoStatue.Text = "✘";
             }
-            ReadA(BoxBean.Config.Middle_Axis, lblActual1, lblTargetP1, txtMiddleTarget, axis_1_Alarm);
-            ReadA(BoxBean.Config.UpDown_Axis, lblActual2, lblTargetP2, txtUpdownTarget, axis_2_Alarm);
-            ReadA(BoxBean.Config.InOut_Axis, lblActual3, lblTargetP3, txtInoutTarget, axis_3_Alarm);
-            ReadA(BoxBean.Config.Comp_Axis, lblActual4, lblTargetP4, txt4Target, axis_4_Alarm);
-
+            if (groupBox1.Visible)
+            {
+                ReadA(BoxBean.Config.Middle_Axis, lblActual1, lblTargetP1, txtMiddleTarget, axis_1_Alarm);
+                ReadA(BoxBean.Config.UpDown_Axis, lblActual2, lblTargetP2, txtUpdownTarget, axis_2_Alarm);
+                ReadA(BoxBean.Config.InOut_Axis, lblActual3, lblTargetP3, txtInoutTarget, axis_3_Alarm);
+                ReadA(BoxBean.Config.Comp_Axis, lblActual4, lblTargetP4, txt4Target, axis_4_Alarm);
+            }
         }
         private void ReadA(ConfigMoveAxis axis, TextBox lblActual, TextBox lblTarget, TextBox lblT, IOStatusControl sta)
         {
@@ -250,10 +252,6 @@ namespace OnlineStore.ACPackingStore
             moveAxis.TargetPosition = targetPosition;
             ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
         }
-
-        private void groupAxis_Enter(object sender, EventArgs e)
-        {
-
-        }
+         
     }
 }

source/ACSingleStore/记录.txt

-            //                机器状态 顶灯显示 
+20210222新建分支 SO852-ACSingleStore-SISO，基于RCDL-ACSingleStore-SISO，主要修改显示器分辨率1024X768
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            //                机器状态 顶灯显示 
             //                                              绿 黄  红
             //机器复位中                             闪 灭   灭
             //机器待机中                             亮 灭   灭

墨西哥料仓.txt

-SISO料仓9台
-datalogic版本，增加照明DO，门打开时自动打开照明。
-DIDO定义修改。
\ No newline at end of file