Compare commits

...

9 Commits

Author SHA1 Message Date
DESKTOP-999R8N3\CJY 03cfdaeb9f - 메인화면 속도 표시 안되는 버그 수정
- Modbus 없는 항목 추가
2025-03-04 10:54:00 +09:00
DESKTOP-999R8N3\CJY f0e27f4ba5 - 부팅 시, 메인보드 카운트 값이 LCD 값보다 클 경우에만 LCD 카운트 값을 보드 카운트 값으로 변경하도록 수정 2024-09-23 15:41:29 +09:00
DESKTOP-999R8N3\CJY 66045b3716 - Program.cs : 에러창 바로 띄우게 수정
- (버그수정)품목명 20byte 제한하도록 수정
 - (버그수정)기능설정 Backup 누르면 파일 리스트 모두 백업되게 수정
 - (버그수정)품목명 표시되는 부분 버그 수정(Transfer_22_Modbus_Read_TCP, RTU)
2024-08-09 15:04:54 +09:00
DESKTOP-999R8N3\CJY 9f3b2fad32 - Modbus 데이터 변환 시 품목명에 변환 불가능한 특수문자 있을 경우 '품번_Name'으로 전송하도록 수정 2024-08-07 10:16:53 +09:00
DESKTOP-999R8N3\CJY b3d6e14374 폴더명 ITC81DB_0H -> ITC81DB_2H로 변경 2024-08-07 09:59:00 +09:00
DESKTOP-999R8N3\CJY 59cfc5895d - (버그수정) 로그인 미사용 시, Submenu - 선별기설정 지연시간/동작시간 변경 안되는 버그 수정
- (버그수정) 초기 Log 파일 생성 추가
 - (버그수정) 소거 시 메인화면 갱신 안되는 버그 수정
2024-03-26 16:44:12 +09:00
DESKTOP-999R8N3\CJY 170202d17a - Client
1. Stream 사용으로 회귀(정지 시 Disconnect, 운전시/판정시 Connect 시도)
   2. 운전 시 Disconnect 되었을 경우, Timer를 통해 Connect 시도
 - Modbus
   Modbus 업데이트 화면 변경(label 색상 검정)
   소거 시 메인화면 갱신 안되는 버그 수정
 - 시리얼통신/이더넷통신 진입 시 Addon 화면 Off된 상태로 진입하도록 변경
2024-02-22 10:23:23 +09:00
DESKTOP-999R8N3\CJY 219b73f615 - SmartX Framework V3.2.4 적용
- Printer - Test Send 버튼 눌렀을 때 현재 중량 전송
   자리수 미세 조정
 - 재전송 기능 OFF 후 사용
   고속형은 재전송 카운트가 올라가지 않기 때문에 그 부분 수정함
 - 랜덤모드 사용 안하므로 일부 문제의 소지가 있는 부분 삭제(추후 확인해야함)
2024-02-15 09:29:45 +09:00
DESKTOP-999R8N3\CJY ea9816f05f - Printer - Test Send 버튼 눌렀을 때 현재 중량 전송
자리수 미세 조정
 - 재전송 기능 OFF 후 사용
   고속형은 재전송 카운트가 올라가지 않기 때문에 그 부분 수정함
2024-02-13 14:20:34 +09:00
268 changed files with 4071 additions and 3758 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -1,80 +0,0 @@
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ResolveAssemblyReference.cache
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterEquipEngineer.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlCenterInforSystem3.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlBottomConfiguration.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlBottomEquipment.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlBottomInformation.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlBottomSystem.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterBasicHelp.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterBasicTime.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterBasicProduct.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterBasicDataStatistics.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlBottomBasic.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterConfiEthernet.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterConfiHelp.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterConfiOptionBoard.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterConfiSerial.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterEquipFunctionSetting.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterEquipHelp.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterEquipInitialize.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterEquipUpdate.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterEquipUser.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterEquipUserGroupEditor.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterInforAS.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterInforHelp.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterInforSystem.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlCenterInforSystem2.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterSystemCalibration.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterSystemExternalOutput.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterSystemHelp.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterSystemIOTest.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterSystemSorterSetting.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterSystemBLDCMotorSetting.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlConfiEthernetLocalIP.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlConfiSerialBarcode.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlConfiSerialHitachi.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlConfiSerialMarkoPrint.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlConfiSerialUserDefine.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlConfiOptionBoard1.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlConfiOptionBoard2.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlMainDisplayAlarm.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlMainDisplayFeedback.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlMainDisplayStopDataStatistics.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlMainDisplayMenu.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlMainDisplayStart.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlMainDisplayStartList.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlMainDisplayStartGraph.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlMainDisplayWeightBigScreen.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlMainDisplayWeightSmall.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.DialogForms.DialogFormLogOn.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.DialogForms.DialogFormPasswordKeyPad1.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.DialogForms.DialogFormMessage.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.DialogForms.DialogFormNumKeyPad.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.DialogForms.DialogFormPasswordKeyPad.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.DialogForms.DialogFormProductList.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.DialogForms.DialogFormYesNo.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Forms.FormMain.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Forms.FormMainDisplay.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Forms.FormMenu.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_2H.Properties.Resources.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_2H.csproj.GenerateResource.Cache
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\bin\Release\ITC81DB_2H.exe
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\bin\Release\ITC81DB_2H.pdb
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\bin\Release\ITC81DB_2H_ImageDll.dll
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\bin\Release\SmartX_IEC1000.dll
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\bin\Release\SmartXCommon.dll
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\bin\Release\ITC81DB_2H_ImageDll.pdb
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_2H.exe
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_2H.pdb
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterSystemAutoZero.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlMainDisplayModbus.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\bin\Release\InModbus.dll
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlConfiModbus.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterSystemJudgment.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterLogHistory.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlBottomLog.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterLogHelp.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterLogInspection.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterLogOthers.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.Controls.ControlCenterEquipMyPage.resources
D:\Laboratory\ITC81DB_2H\ITC81DB_0H\obj\Release\ITC81DB_0H.ControlConfiMULTiJET.resources

View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008 # Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ITC81DB_2H_ImageDll", "ITC81DB_ImageDll\ITC81DB_ImageDll\ITC81DB_2H_ImageDll.csproj", "{501CC4ED-3B74-4189-8FD5-29F990358D21}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ITC81DB_2H_ImageDll", "ITC81DB_ImageDll\ITC81DB_ImageDll\ITC81DB_2H_ImageDll.csproj", "{501CC4ED-3B74-4189-8FD5-29F990358D21}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ITC81DB_2H", "ITC81DB_0H\ITC81DB_2H.csproj", "{F3AC32D4-8DAC-4F4D-AD52-2610D6237DD5}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ITC81DB_2H", "ITC81DB_2H\ITC81DB_2H.csproj", "{F3AC32D4-8DAC-4F4D-AD52-2610D6237DD5}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlBottomBasic partial class ControlBottomBasic
{ {

View File

@ -9,10 +9,10 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlBottomBasic : UserControl public partial class ControlBottomBasic : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlBottomConfiguration partial class ControlBottomConfiguration
{ {

View File

@ -9,10 +9,10 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlBottomConfiguration : UserControl public partial class ControlBottomConfiguration : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlBottomEquipment partial class ControlBottomEquipment
{ {

View File

@ -9,12 +9,12 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlBottomEquipment : UserControl public partial class ControlBottomEquipment : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlBottomInformation partial class ControlBottomInformation
{ {

View File

@ -9,10 +9,10 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlBottomInformation : UserControl public partial class ControlBottomInformation : UserControl
{ {

View File

@ -9,10 +9,10 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlBottomLog : UserControl public partial class ControlBottomLog : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlBottomLog partial class ControlBottomLog
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlBottomSystem partial class ControlBottomSystem
{ {

View File

@ -9,10 +9,10 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlBottomSystem : UserControl public partial class ControlBottomSystem : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterBasicDataStatistics partial class ControlCenterBasicDataStatistics
{ {

View File

@ -12,12 +12,12 @@ using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterBasicDataStatistics : UserControl public partial class ControlCenterBasicDataStatistics : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterBasicHelp partial class ControlCenterBasicHelp
{ {

View File

@ -7,12 +7,12 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using SmartX; using SmartX;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterBasicHelp : UserControl public partial class ControlCenterBasicHelp : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterBasicProduct partial class ControlCenterBasicProduct
{ {

View File

@ -8,12 +8,12 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterBasicProduct : UserControl public partial class ControlCenterBasicProduct : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterBasicTime partial class ControlCenterBasicTime
{ {
@ -49,7 +49,7 @@
this.label1.BackColor = System.Drawing.Color.Black; this.label1.BackColor = System.Drawing.Color.Black;
this.label1.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.label1.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold);
this.label1.ForeColor = System.Drawing.Color.White; this.label1.ForeColor = System.Drawing.Color.White;
this.label1.Location = new System.Drawing.Point(266, 243); this.label1.Location = new System.Drawing.Point(265, 246);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(23, 56); this.label1.Size = new System.Drawing.Size(23, 56);
this.label1.Text = "-"; this.label1.Text = "-";
@ -60,7 +60,7 @@
this.label4.BackColor = System.Drawing.Color.Black; this.label4.BackColor = System.Drawing.Color.Black;
this.label4.Font = new System.Drawing.Font("Arial", 30F, System.Drawing.FontStyle.Bold); this.label4.Font = new System.Drawing.Font("Arial", 30F, System.Drawing.FontStyle.Bold);
this.label4.ForeColor = System.Drawing.Color.White; this.label4.ForeColor = System.Drawing.Color.White;
this.label4.Location = new System.Drawing.Point(570, 235); this.label4.Location = new System.Drawing.Point(570, 239);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(23, 56); this.label4.Size = new System.Drawing.Size(23, 56);
this.label4.Text = ":"; this.label4.Text = ":";
@ -71,7 +71,7 @@
this.label3.BackColor = System.Drawing.Color.Black; this.label3.BackColor = System.Drawing.Color.Black;
this.label3.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); this.label3.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold);
this.label3.ForeColor = System.Drawing.Color.White; this.label3.ForeColor = System.Drawing.Color.White;
this.label3.Location = new System.Drawing.Point(355, 243); this.label3.Location = new System.Drawing.Point(355, 246);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(23, 56); this.label3.Size = new System.Drawing.Size(23, 56);
this.label3.Text = "-"; this.label3.Text = "-";
@ -130,7 +130,7 @@
this.upDownYear.LayoutStyle = SmartX.SmartUpDown.LAYOUTSTYPES.CUSTOM; this.upDownYear.LayoutStyle = SmartX.SmartUpDown.LAYOUTSTYPES.CUSTOM;
this.upDownYear.Location = new System.Drawing.Point(150, 148); this.upDownYear.Location = new System.Drawing.Point(150, 148);
this.upDownYear.MaxValue = ((long)(2100)); this.upDownYear.MaxValue = ((long)(2100));
this.upDownYear.MinValue = ((long)(2010)); this.upDownYear.MinValue = ((long)(2020));
this.upDownYear.Name = "upDownYear"; this.upDownYear.Name = "upDownYear";
this.upDownYear.RepeatInterval = 200; this.upDownYear.RepeatInterval = 200;
this.upDownYear.RepeatIntervalAccelerate = null; this.upDownYear.RepeatIntervalAccelerate = null;
@ -140,11 +140,12 @@
this.upDownYear.StepValue = 1; this.upDownYear.StepValue = 1;
this.upDownYear.TabIndex = 97; this.upDownYear.TabIndex = 97;
this.upDownYear.TextColor = System.Drawing.Color.White; this.upDownYear.TextColor = System.Drawing.Color.White;
this.upDownYear.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Right; this.upDownYear.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
this.upDownYear.TextLabelBoundaryLine = true;
this.upDownYear.TextLabelHeight = 30; this.upDownYear.TextLabelHeight = 30;
this.upDownYear.TextLabelWidth = 80; this.upDownYear.TextLabelWidth = 80;
this.upDownYear.TextLocation = new System.Drawing.Point(-40, 90); this.upDownYear.TextLocation = new System.Drawing.Point(20, 97);
this.upDownYear.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top; this.upDownYear.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Middle;
this.upDownYear.TxtValue = "0000"; this.upDownYear.TxtValue = "0000";
this.upDownYear.Value = ((long)(0)); this.upDownYear.Value = ((long)(0));
this.upDownYear.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click); this.upDownYear.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click);
@ -214,10 +215,11 @@
this.upDownMinute.TabIndex = 96; this.upDownMinute.TabIndex = 96;
this.upDownMinute.TextColor = System.Drawing.Color.White; this.upDownMinute.TextColor = System.Drawing.Color.White;
this.upDownMinute.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle; this.upDownMinute.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
this.upDownMinute.TextLabelBoundaryLine = true;
this.upDownMinute.TextLabelHeight = 15; this.upDownMinute.TextLabelHeight = 15;
this.upDownMinute.TextLabelWidth = 80; this.upDownMinute.TextLabelWidth = 80;
this.upDownMinute.TextLocation = new System.Drawing.Point(-15, 90); this.upDownMinute.TextLocation = new System.Drawing.Point(3, 105);
this.upDownMinute.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top; this.upDownMinute.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Middle;
this.upDownMinute.TxtValue = "00"; this.upDownMinute.TxtValue = "00";
this.upDownMinute.Value = ((long)(0)); this.upDownMinute.Value = ((long)(0));
this.upDownMinute.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click); this.upDownMinute.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click);
@ -287,10 +289,11 @@
this.upDownHour.TabIndex = 95; this.upDownHour.TabIndex = 95;
this.upDownHour.TextColor = System.Drawing.Color.White; this.upDownHour.TextColor = System.Drawing.Color.White;
this.upDownHour.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle; this.upDownHour.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
this.upDownHour.TextLabelBoundaryLine = true;
this.upDownHour.TextLabelHeight = 15; this.upDownHour.TextLabelHeight = 15;
this.upDownHour.TextLabelWidth = 80; this.upDownHour.TextLabelWidth = 80;
this.upDownHour.TextLocation = new System.Drawing.Point(-15, 90); this.upDownHour.TextLocation = new System.Drawing.Point(3, 105);
this.upDownHour.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top; this.upDownHour.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Middle;
this.upDownHour.TxtValue = "00"; this.upDownHour.TxtValue = "00";
this.upDownHour.Value = ((long)(0)); this.upDownHour.Value = ((long)(0));
this.upDownHour.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click); this.upDownHour.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click);
@ -360,10 +363,11 @@
this.upDownDate.TabIndex = 94; this.upDownDate.TabIndex = 94;
this.upDownDate.TextColor = System.Drawing.Color.White; this.upDownDate.TextColor = System.Drawing.Color.White;
this.upDownDate.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle; this.upDownDate.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
this.upDownDate.TextLabelBoundaryLine = true;
this.upDownDate.TextLabelHeight = 15; this.upDownDate.TextLabelHeight = 15;
this.upDownDate.TextLabelWidth = 80; this.upDownDate.TextLabelWidth = 80;
this.upDownDate.TextLocation = new System.Drawing.Point(-15, 90); this.upDownDate.TextLocation = new System.Drawing.Point(3, 105);
this.upDownDate.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top; this.upDownDate.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Middle;
this.upDownDate.TxtValue = "00"; this.upDownDate.TxtValue = "00";
this.upDownDate.Value = ((long)(0)); this.upDownDate.Value = ((long)(0));
this.upDownDate.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click); this.upDownDate.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click);
@ -433,10 +437,11 @@
this.upDownMonth.TabIndex = 93; this.upDownMonth.TabIndex = 93;
this.upDownMonth.TextColor = System.Drawing.Color.White; this.upDownMonth.TextColor = System.Drawing.Color.White;
this.upDownMonth.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle; this.upDownMonth.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
this.upDownMonth.TextLabelBoundaryLine = true;
this.upDownMonth.TextLabelHeight = 15; this.upDownMonth.TextLabelHeight = 15;
this.upDownMonth.TextLabelWidth = 80; this.upDownMonth.TextLabelWidth = 80;
this.upDownMonth.TextLocation = new System.Drawing.Point(-15, 90); this.upDownMonth.TextLocation = new System.Drawing.Point(3, 105);
this.upDownMonth.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top; this.upDownMonth.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Middle;
this.upDownMonth.TxtValue = "00"; this.upDownMonth.TxtValue = "00";
this.upDownMonth.Value = ((long)(0)); this.upDownMonth.Value = ((long)(0));
this.upDownMonth.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click); this.upDownMonth.OnIncButClick += new System.EventHandler(this.buttonTimeSetting_Click);

View File

@ -7,11 +7,11 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterBasicTime : UserControl public partial class ControlCenterBasicTime : UserControl
{ {

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterConfiEthernet partial class ControlCenterConfiEthernet
{ {

View File

@ -11,11 +11,11 @@ using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterConfiEthernet : UserControl public partial class ControlCenterConfiEthernet : UserControl
{ {
@ -641,7 +641,9 @@ namespace ITC81DB_0H.Controls
#region Printer #region Printer
sb.Append("0001"); sb.Append("0001");
sb.Append(" Pass"); sb.Append(" Pass");
sb.Append(" " + Helper.StringToDecimalPlaces("1234", this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); sb.Append(this.ParentForm.ParentForm.PadLeft(9, Helper.DoubleToString
(this.ParentForm.ParentForm.CurrentWeightData.Weight, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)));
sb.Append(" ");
sb.Append("1234567890"); sb.Append("1234567890");
#endregion #endregion
break; break;
@ -1020,6 +1022,19 @@ namespace ITC81DB_0H.Controls
byteArray[11] = Helper.ChecksumCalculator(byteArray); byteArray[11] = Helper.ChecksumCalculator(byteArray);
#endregion #endregion
break; break;
case (int)Define.E_CommMode.f22_Modbus:
#region Modbus TCP(16. Write Multiple Registers)
if (this.ParentForm.ParentForm.SystemConfig3.IsModbus == true)
{
if (this.ParentForm.ParentForm.SystemConfig2.ModbusTCPSelectFunction == (int)Define.E_ModbusFunction._16_WriteMultipleRegister)
{
byte[] sendData = this.ParentForm.ParentForm.Modbus.MakeTCPSendAllData(this.ParentForm.ParentForm.Transfer_22_Modbus_Write(), this.ParentForm.ParentForm.SystemConfig2.ModbusTCPStartAddress);
this.ParentForm.ParentForm.EthernetWeightDataForModbus(sendData);
}
}
#endregion
break;
case 23: case 23:
#region STD2 #region STD2
sb.Append((char)0x02); sb.Append((char)0x02);

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterConfiHelp partial class ControlCenterConfiHelp
{ {

View File

@ -8,11 +8,11 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterConfiHelp : UserControl public partial class ControlCenterConfiHelp : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterConfiOptionBoard partial class ControlCenterConfiOptionBoard
{ {

View File

@ -8,10 +8,10 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterConfiOptionBoard : UserControl public partial class ControlCenterConfiOptionBoard : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterConfiSerial partial class ControlCenterConfiSerial
{ {

View File

@ -11,12 +11,12 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterConfiSerial : UserControl public partial class ControlCenterConfiSerial : UserControl
{ {
@ -1038,7 +1038,9 @@ namespace ITC81DB_0H.Controls
#region Printer #region Printer
sb.Append("0001"); sb.Append("0001");
sb.Append(" Pass"); sb.Append(" Pass");
sb.Append(" " + Helper.StringToDecimalPlaces("1234", this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); sb.Append(this.ParentForm.ParentForm.PadLeft(9, Helper.DoubleToString
(this.ParentForm.ParentForm.CurrentWeightData.Weight, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)));
sb.Append(" ");
sb.Append("1234567890"); sb.Append("1234567890");
#endregion #endregion
break; break;

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterEquipEngineer partial class ControlCenterEquipEngineer
{ {

View File

@ -10,14 +10,14 @@ using System.Drawing.Imaging;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using System.Threading; using System.Threading;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterEquipEngineer : UserControl public partial class ControlCenterEquipEngineer : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterEquipFunctionSetting partial class ControlCenterEquipFunctionSetting
{ {

View File

@ -10,15 +10,15 @@ using System.Drawing.Imaging;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using System.Threading; using System.Threading;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
using System.IO; using System.IO;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterEquipFunctionSetting : UserControl public partial class ControlCenterEquipFunctionSetting : UserControl
{ {
@ -536,8 +536,7 @@ namespace ITC81DB_0H.Controls
foreach (FileInfo file in files) foreach (FileInfo file in files)
{ {
if (file.Name.EndsWith(".txt") == true || file.Name.EndsWith(".jpg") == true) this.listBoxDataList.Items.Add(file.Name);
this.listBoxDataList.Items.Add(file.Name);
} }
this.labelFileCount1.Text = this.listBoxDataList.Items.Count.ToString(); this.labelFileCount1.Text = this.listBoxDataList.Items.Count.ToString();
@ -679,13 +678,17 @@ namespace ITC81DB_0H.Controls
} }
else else
{ {
after = this.labelEquipmentID.Text = myKeyPad.StringValue; if (int.Parse(this.labelEquipmentID.Text) != myKeyPad.IntValue)
{
this.ParentForm.ParentForm.Update30000ModbusItem();
after = this.labelEquipmentID.Text = myKeyPad.StringValue;
this.ParentForm.ParentForm.SystemConfig1.EquipmentID = myKeyPad.IntValue; this.ParentForm.ParentForm.SystemConfig1.EquipmentID = myKeyPad.IntValue;
this.ParentForm.ParentForm.SaveSystemConfigurationFile1(this.ParentForm.ParentForm.SystemConfig1); this.ParentForm.ParentForm.SaveSystemConfigurationFile1(this.ParentForm.ParentForm.SystemConfig1);
if (before != after) if (before != after)
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.EquipmentID, "", before, after); this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.EquipmentID, "", before, after);
}
} }
} }
} }
@ -819,10 +822,10 @@ namespace ITC81DB_0H.Controls
this.ParentForm.ParentForm.ChildFormMainDisplay.MainLineGraph.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainLineGraph.InitializeDesign();
this.ParentForm.ParentForm.ChildFormMainDisplay.MainList.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainList.InitializeDesign();
this.ParentForm.ParentForm.ChildFormMainDisplay.MainDataStatistics.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainDataStatistics.InitializeDesign();
this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayWeightBigScreen.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightBigScreen.InitializeDesign();
this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayWeightSmall.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightSmall.InitializeDesign();
this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.InitializeDesign();
this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayModbus.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainModbus.InitializeDesign();
Thread.Sleep(50); Thread.Sleep(50);
this.ParentForm.ParentForm.ChildFormMenu.CenterBasicDataStatistics.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMenu.CenterBasicDataStatistics.InitializeDesign();
@ -1115,22 +1118,10 @@ namespace ITC81DB_0H.Controls
foreach (FileInfo file in files) foreach (FileInfo file in files)
{ {
if (file.Name.Contains("Exception") == false) this.FileCopy(file, filePath + file.Name);
{
if (file.Name.EndsWith(".txt") == true || file.Name.EndsWith(".jpg") == true)
{
this.FileCopy(file, filePath + file.Name);
this.listBoxDataList.Items.Remove(file.Name); this.listBoxDataList.Items.Remove(file.Name);
file.Delete(); file.Delete();
}
//else if (file.Name.Contains("Checklog") == true)
//{
// this.FileCopy(file, filePath + file.Name);
// file.Delete();
//}
}
} }
this.labelFileCount1.Text = this.listBoxDataList.Items.Count.ToString(); this.labelFileCount1.Text = this.listBoxDataList.Items.Count.ToString();

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterEquipHelp partial class ControlCenterEquipHelp
{ {

View File

@ -7,13 +7,13 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using SmartX; using SmartX;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterEquipHelp : UserControl public partial class ControlCenterEquipHelp : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterEquipInitialize partial class ControlCenterEquipInitialize
{ {
@ -81,7 +81,7 @@
this.buttonMainBoard.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); this.buttonMainBoard.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold);
this.buttonMainBoard.GroupID = 0; this.buttonMainBoard.GroupID = 0;
this.buttonMainBoard.InitVisible = true; this.buttonMainBoard.InitVisible = true;
this.buttonMainBoard.Location = new System.Drawing.Point(255, 298); this.buttonMainBoard.Location = new System.Drawing.Point(460, 298);
this.buttonMainBoard.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonMainBoard.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonMainBoard.Name = "buttonMainBoard"; this.buttonMainBoard.Name = "buttonMainBoard";
this.buttonMainBoard.NestedClickEventPrevent = false; this.buttonMainBoard.NestedClickEventPrevent = false;
@ -237,7 +237,7 @@
this.buttonLcd.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); this.buttonLcd.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold);
this.buttonLcd.GroupID = 0; this.buttonLcd.GroupID = 0;
this.buttonLcd.InitVisible = true; this.buttonLcd.InitVisible = true;
this.buttonLcd.Location = new System.Drawing.Point(461, 298); this.buttonLcd.Location = new System.Drawing.Point(255, 298);
this.buttonLcd.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonLcd.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonLcd.Name = "buttonLcd"; this.buttonLcd.Name = "buttonLcd";
this.buttonLcd.NestedClickEventPrevent = false; this.buttonLcd.NestedClickEventPrevent = false;

View File

@ -8,13 +8,13 @@ using System.IO;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterEquipInitialize : UserControl public partial class ControlCenterEquipInitialize : UserControl
{ {

View File

@ -8,13 +8,13 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.IO; using System.IO;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterEquipMyPage : UserControl public partial class ControlCenterEquipMyPage : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterEquipMyPage partial class ControlCenterEquipMyPage
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterEquipUpdate partial class ControlCenterEquipUpdate
{ {

View File

@ -9,12 +9,12 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterEquipUpdate : UserControl public partial class ControlCenterEquipUpdate : UserControl
{ {

View File

@ -8,14 +8,14 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Threading; using System.Threading;
using ITC81DB_0H.Controls; using ITC81DB_2H.Controls;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterEquipUser : UserControl public partial class ControlCenterEquipUser : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterEquipUser partial class ControlCenterEquipUser
{ {

View File

@ -7,14 +7,14 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using SmartX; using SmartX;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterEquipUserGroupEditor : UserControl public partial class ControlCenterEquipUserGroupEditor : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterEquipUserGroupEditor partial class ControlCenterEquipUserGroupEditor
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterInforAS partial class ControlCenterInforAS
{ {

View File

@ -8,11 +8,11 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.IO; using System.IO;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterInforAS : UserControl public partial class ControlCenterInforAS : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterInforHelp partial class ControlCenterInforHelp
{ {

View File

@ -7,12 +7,12 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using SmartX; using SmartX;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterInforHelp : UserControl public partial class ControlCenterInforHelp : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterInforSystem partial class ControlCenterInforSystem
{ {

View File

@ -7,14 +7,14 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using ITC81DB_0H.Part11_UserManager; using ITC81DB_2H.Part11_UserManager;
using ITC81DB_0H.Part11_Encryption; using ITC81DB_2H.Part11_Encryption;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterInforSystem : UserControl public partial class ControlCenterInforSystem : UserControl
{ {
@ -95,6 +95,21 @@ namespace ITC81DB_0H.Controls
this.labelControlVer.Text = version; this.labelControlVer.Text = version;
} }
private void ServiceList()
{
//if (this.ParentForm.ParentForm.SystemConfig3.IsModbus == true)
// this.labelServiceList.Text += "Modbus";
//if (this.ParentForm.ParentForm.SystemConfig3.IsPart11 == true)
//{
// if (this.labelServiceList.Text.Length != 0)
// this.labelServiceList.Text += ", ";
// this.labelServiceList.Text += "Part11";
//}
//if (this.labelServiceList.Text == "")
// this.labelTitleService.Visible = false;
}
public void DisplayHiddenMenu(bool bValue) public void DisplayHiddenMenu(bool bValue)
{ {
this.buttonNext.Visible = bValue; this.buttonNext.Visible = bValue;

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H namespace ITC81DB_2H
{ {
partial class ControlCenterInforSystem2 partial class ControlCenterInforSystem2
{ {

View File

@ -8,11 +8,11 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H namespace ITC81DB_2H
{ {
public partial class ControlCenterInforSystem2 : UserControl public partial class ControlCenterInforSystem2 : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H namespace ITC81DB_2H
{ {
partial class ControlCenterInforSystem3 partial class ControlCenterInforSystem3
{ {

View File

@ -9,11 +9,11 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H namespace ITC81DB_2H
{ {
public partial class ControlCenterInforSystem3 : UserControl public partial class ControlCenterInforSystem3 : UserControl
{ {

View File

@ -7,12 +7,12 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
using SmartX; using SmartX;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterLogHelp : UserControl public partial class ControlCenterLogHelp : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterLogHelp partial class ControlCenterLogHelp
{ {

View File

@ -12,12 +12,12 @@ using System.Threading;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterLogHistory : UserControl public partial class ControlCenterLogHistory : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterLogHistory partial class ControlCenterLogHistory
{ {

View File

@ -12,12 +12,12 @@ using System.Threading;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterLogInspection : UserControl public partial class ControlCenterLogInspection : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterLogInspection partial class ControlCenterLogInspection
{ {

View File

@ -12,12 +12,12 @@ using System.Threading;
using SmartX; using SmartX;
using ITC81DB_0H.Forms; using ITC81DB_2H.Forms;
using ITC81DB_0H.DialogForms; using ITC81DB_2H.DialogForms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_2H.Datastore; using ITC81DB_2H.Datastore;
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
public partial class ControlCenterLogOthers : UserControl public partial class ControlCenterLogOthers : UserControl
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterLogOthers partial class ControlCenterLogOthers
{ {

View File

@ -1,4 +1,4 @@
namespace ITC81DB_0H.Controls namespace ITC81DB_2H.Controls
{ {
partial class ControlCenterSystemBLDCMotorSetting partial class ControlCenterSystemBLDCMotorSetting
{ {

Some files were not shown because too many files have changed in this diff Show More