시스템 시간 표시 수정
							parent
							
								
									ae9ab217db
								
							
						
					
					
						commit
						4fc663c33b
					
				|  | @ -354,8 +354,8 @@ namespace INT_PT002.Controls | ||||||
| 
 | 
 | ||||||
|         private void buttonTimeSetting_Click(object sender, EventArgs e) |         private void buttonTimeSetting_Click(object sender, EventArgs e) | ||||||
|         { |         { | ||||||
|             if (this.ParentForm.ParentForm.smartTimerSystem.IsStart == true) |             if (this.ParentForm.ParentForm.timerSystem.Enabled == true) | ||||||
|                 this.ParentForm.ParentForm.smartTimerSystem.Stop(); |                 this.ParentForm.ParentForm.timerSystem.Enabled = false; | ||||||
|             this.buttonSave.Visible = true; |             this.buttonSave.Visible = true; | ||||||
|         } |         } | ||||||
|         private void buttonSave_Click(object sender, EventArgs e) |         private void buttonSave_Click(object sender, EventArgs e) | ||||||
|  | @ -373,7 +373,7 @@ namespace INT_PT002.Controls | ||||||
|             } |             } | ||||||
| 
 | 
 | ||||||
|             this.ParentForm.ParentForm.SetCurrentTime(time); |             this.ParentForm.ParentForm.SetCurrentTime(time); | ||||||
|             this.ParentForm.ParentForm.smartTimerSystem.Start(); |             this.ParentForm.ParentForm.timerSystem.Enabled = true; | ||||||
|             this.buttonSave.Visible = false; |             this.buttonSave.Visible = false; | ||||||
|         } |         } | ||||||
|         #endregion |         #endregion | ||||||
|  |  | ||||||
|  | @ -39,7 +39,7 @@ | ||||||
|             this.smartModbus = new SmartX.SmartModbus(); |             this.smartModbus = new SmartX.SmartModbus(); | ||||||
|             this.smartTCPMultiServer = new SmartX.SmartTCPMultiServer(this.components); |             this.smartTCPMultiServer = new SmartX.SmartTCPMultiServer(this.components); | ||||||
|             this.timerClientTryConnect = new System.Windows.Forms.Timer(); |             this.timerClientTryConnect = new System.Windows.Forms.Timer(); | ||||||
|             this.smartTimerSystem = new SmartX.SmartTimer(); |             this.timerSystem = new System.Windows.Forms.Timer(); | ||||||
|             this.SuspendLayout(); |             this.SuspendLayout(); | ||||||
|             //  |             //  | ||||||
|             // smartForm1 |             // smartForm1 | ||||||
|  | @ -118,14 +118,10 @@ | ||||||
|             this.timerClientTryConnect.Interval = 2000; |             this.timerClientTryConnect.Interval = 2000; | ||||||
|             this.timerClientTryConnect.Tick += new System.EventHandler(this.timerClientTryConnect_Tick); |             this.timerClientTryConnect.Tick += new System.EventHandler(this.timerClientTryConnect_Tick); | ||||||
|             //  |             //  | ||||||
|             // smartTimerSystem |             // timerSystem | ||||||
|             //  |             //  | ||||||
|             this.smartTimerSystem.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter; |             this.timerSystem.Interval = 1000; | ||||||
|             this.smartTimerSystem.Interval = 1000; |             this.timerSystem.Tick += new System.EventHandler(this.timerSystem_Tick); | ||||||
|             this.smartTimerSystem.IntervalSeries = null; |  | ||||||
|             this.smartTimerSystem.TimeCount = ((long)(1000000)); |  | ||||||
|             this.smartTimerSystem.TimeFormStringSeparator = ":"; |  | ||||||
|             this.smartTimerSystem.Tick += new System.EventHandler(this.smartTimerSystem_Tick); |  | ||||||
|             //  |             //  | ||||||
|             // FormMain |             // FormMain | ||||||
|             //  |             //  | ||||||
|  | @ -152,7 +148,7 @@ | ||||||
|         private System.Windows.Forms.Timer timerClientTryConnect; |         private System.Windows.Forms.Timer timerClientTryConnect; | ||||||
|         public SmartX.SmartConfigs smartConfigs; |         public SmartX.SmartConfigs smartConfigs; | ||||||
|         public SmartX.SmartTCPMultiServer smartTCPMultiServer; |         public SmartX.SmartTCPMultiServer smartTCPMultiServer; | ||||||
|         public SmartX.SmartTimer smartTimerSystem; |         public System.Windows.Forms.Timer timerSystem; | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | @ -917,8 +917,8 @@ namespace INT_PT002.Forms | ||||||
|             #region Test 용 통신 로그 |             #region Test 용 통신 로그 | ||||||
|             fullPath = this.PathDataBackupFolder + "Communicationlog.txt"; |             fullPath = this.PathDataBackupFolder + "Communicationlog.txt"; | ||||||
|             this.smartFileCommunicationLog.FilePathName = fullPath; |             this.smartFileCommunicationLog.FilePathName = fullPath; | ||||||
|             this.smartFileCommunicationLog.Open(); |             //this.smartFileCommunicationLog.Open(); | ||||||
|             this.IsCommunicationLogOpen = true; |             //this.IsCommunicationLogOpen = true; | ||||||
|             #endregion |             #endregion | ||||||
|         } |         } | ||||||
|         public void CloseSmartUartLink() |         public void CloseSmartUartLink() | ||||||
|  | @ -4133,7 +4133,7 @@ namespace INT_PT002.Forms | ||||||
|             this.timerUserList.Enabled = true; |             this.timerUserList.Enabled = true; | ||||||
| 
 | 
 | ||||||
|             // System Timer |             // System Timer | ||||||
|             this.smartTimerSystem.Start(); |             this.timerSystem.Enabled = true; | ||||||
| 
 | 
 | ||||||
|             this.ModbusOpen(); |             this.ModbusOpen(); | ||||||
|         } |         } | ||||||
|  | @ -4309,7 +4309,7 @@ namespace INT_PT002.Forms | ||||||
|             this.DelegateTimerTryConnect(false); |             this.DelegateTimerTryConnect(false); | ||||||
|             this.EthernetClientConnect(); |             this.EthernetClientConnect(); | ||||||
|         } |         } | ||||||
|         private void smartTimerSystem_Tick(object sender, EventArgs e) |         private void timerSystem_Tick(object sender, EventArgs e) | ||||||
|         { |         { | ||||||
|             DateTime time = DateTime.Now; |             DateTime time = DateTime.Now; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -233,7 +233,7 @@ | ||||||
|   <metadata name="timerClientTryConnect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |   <metadata name="timerClientTryConnect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||||
|     <value>1047, 17</value> |     <value>1047, 17</value> | ||||||
|   </metadata> |   </metadata> | ||||||
|   <metadata name="smartTimerSystem.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |   <metadata name="timerSystem.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||||
|     <value>17, 56</value> |     <value>17, 56</value> | ||||||
|   </metadata> |   </metadata> | ||||||
|   <metadata name="$this.FormFactorShadowProperty" xml:space="preserve"> |   <metadata name="$this.FormFactorShadowProperty" xml:space="preserve"> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue