Compare commits

..

No commits in common. "f332fa6bdd56a9bd0bcb8f11093d66586c16e770" and "799738686ae39c748295437571eed931187a7208" have entirely different histories.

16 changed files with 9 additions and 96 deletions

Binary file not shown.

View File

@ -9,7 +9,6 @@ using System.Windows.Forms;
using INT63DC_6CH.DialogForms; using INT63DC_6CH.DialogForms;
using INT63DC_ImageDll; using INT63DC_ImageDll;
using INT63DC_6CH.In_UserManager;
namespace INT63DC_6CH.Forms namespace INT63DC_6CH.Forms
{ {
@ -313,20 +312,10 @@ namespace INT63DC_6CH.Forms
this.ParentForm.SystemConfig.WeightLimitIgnoreCount = int.Parse(this.labelWeightLimitIgnoreCount.Text.ToString()); this.ParentForm.SystemConfig.WeightLimitIgnoreCount = int.Parse(this.labelWeightLimitIgnoreCount.Text.ToString());
// 로그인 // 로그인
if (this.ParentForm.SystemConfig.IsOptPart11 == true) if (this.buttonLogin.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
this.ParentForm.SystemConfig.IsLogin = true; this.ParentForm.SystemConfig.IsLogin = true;
else else
{ this.ParentForm.SystemConfig.IsLogin = false;
if (this.buttonLogin.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
this.ParentForm.SystemConfig.IsLogin = true;
else
{
this.ParentForm.SystemConfig.IsLogin = false;
// Delete user list
UserManager.UserManager_UserAllDel();
}
}
// 개별 NG // 개별 NG
if (this.buttonEachNG.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) if (this.buttonEachNG.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)

View File

@ -8,7 +8,6 @@ using System.IO;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using INT63DC_ImageDll; using INT63DC_ImageDll;
using INT63DC_6CH.In_UserManager;
namespace INT63DC_6CH.Forms namespace INT63DC_6CH.Forms
{ {
@ -97,14 +96,12 @@ namespace INT63DC_6CH.Forms
this.progressBarResetBar.Value = 0; this.progressBarResetBar.Value = 0;
//this.ParentForm.TransferData(CommunicationCommand.Initialization, CommunicationID.MainBoard); //this.ParentForm.TransferData(CommunicationCommand.Initialization, CommunicationID.MainBoard);
this.progressBarResetBar.Value += 20; this.progressBarResetBar.Value += 25;
//this.ResetConfigurationFile(); //this.ResetConfigurationFile();
this.ResetProductFile(); this.ResetProductFile();
this.progressBarResetBar.Value += 20; this.progressBarResetBar.Value += 25;
this.ResetJudgmentSetFile(); this.ResetJudgmentSetFile();
this.progressBarResetBar.Value += 20; this.progressBarResetBar.Value += 25;
this.ResetUserListFile();
this.progressBarResetBar.Value += 20;
this.ResetCountFile(); this.ResetCountFile();
this.progressBarResetBar.Value = 100; this.progressBarResetBar.Value = 100;
@ -341,10 +338,6 @@ namespace INT63DC_6CH.Forms
this.ParentForm.smartFileIO.WriteStructure_End(); this.ParentForm.smartFileIO.WriteStructure_End();
this.ParentForm.smartFileIO.Close(); this.ParentForm.smartFileIO.Close();
} }
private void ResetUserListFile()
{
UserManager.UserManager_UserAllDel();
}
#endregion #endregion
#region Override Member #region Override Member

View File

@ -13,8 +13,6 @@ using System.Windows.Forms;
using SmartX; using SmartX;
using INT63DC_ImageDll; using INT63DC_ImageDll;
using INT63DC_6CH.DialogForms; using INT63DC_6CH.DialogForms;
using INT63DC_6CH.In_UserManager;
using INT63DC_6CH.In_Encryption;
namespace INT63DC_6CH.Forms namespace INT63DC_6CH.Forms
{ {
@ -302,11 +300,6 @@ namespace INT63DC_6CH.Forms
public void DisplayRefresh() public void DisplayRefresh()
{ {
if (this.ParentForm.SystemConfig.IsLogin == true)
UserManager.UserManager_GetVersion();
if (this.ParentForm.SystemConfig.IsOptPart11 == true)
Encryption.AesEncryption_GetVersion();
this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormInformation; this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormInformation;
this.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1500_ProgramVersion, ""); this.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1500_ProgramVersion, "");
} }

View File

@ -350,9 +350,6 @@ namespace INT63DC_6CH.Forms
this.CurrentComRespone = new CommunicationRespone(); this.CurrentComRespone = new CommunicationRespone();
this.CurrentDataViewerFilter = new DataViewerFilter(); this.CurrentDataViewerFilter = new DataViewerFilter();
this.ListDllUserName = new List<string>();
this.ListDllUserName.Clear();
// SystemFile 폴더 생성 // SystemFile 폴더 생성
if (Directory.Exists(this.PathSystemFileFolder) == false) if (Directory.Exists(this.PathSystemFileFolder) == false)
Directory.CreateDirectory(this.PathSystemFileFolder); Directory.CreateDirectory(this.PathSystemFileFolder);
@ -2002,6 +1999,7 @@ namespace INT63DC_6CH.Forms
// bool // bool
this.SystemConfig.IsDataBackup = structItem.IsDataBackup; this.SystemConfig.IsDataBackup = structItem.IsDataBackup;
// bool // bool
this.SystemConfig.IsDataBackup = structItem.IsDataBackup; this.SystemConfig.IsDataBackup = structItem.IsDataBackup;
this.SystemConfig.IsEachNG = structItem.IsEachNG; this.SystemConfig.IsEachNG = structItem.IsEachNG;

View File

@ -708,10 +708,7 @@ namespace INT63DC_6CH.Forms
{ {
#region 데이터백업 #region 데이터백업
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormDataBackup); ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormDataBackup);
if (this.ParentForm.SystemConfig.IsOptPart11 == true) this.ParentForm.ChildFormDataBackup.DisplayRefresh();
this.ParentForm.ChildFormDataBackup_Part11.DisplayRefresh();
else
this.ParentForm.ChildFormDataBackup.DisplayRefresh();
#endregion #endregion
} }
else if (button == this.buttonSysConfig) else if (button == this.buttonSysConfig)
@ -818,13 +815,6 @@ namespace INT63DC_6CH.Forms
this.ParentForm.ChildFormCommunication.DisplayRefresh(); this.ParentForm.ChildFormCommunication.DisplayRefresh();
#endregion #endregion
} }
else if (button == this.buttonDataViewer)
{
#region 데이터뷰어
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormDataViewer);
this.ParentForm.ChildFormDataViewer.DisplayRefresh();
#endregion
}
} }
private void buttonFunction_Click(object sender, EventArgs e) private void buttonFunction_Click(object sender, EventArgs e)
{ {

View File

@ -10,7 +10,6 @@ using System.Windows.Forms;
using SmartX; using SmartX;
using INT63DC_ImageDll; using INT63DC_ImageDll;
using INT63DC_6CH.DialogForms; using INT63DC_6CH.DialogForms;
using INT63DC_6CH.In_UserManager;
namespace INT63DC_6CH.Forms namespace INT63DC_6CH.Forms
{ {
@ -159,14 +158,6 @@ namespace INT63DC_6CH.Forms
this.buttonDataStatistics.ButtonDown(); this.buttonDataStatistics.ButtonDown();
else else
this.buttonDataStatistics.ButtonUp(); this.buttonDataStatistics.ButtonUp();
// Part 11 사용 유무
if (this.ParentForm.SystemConfig.IsOptPart11 == true)
this.buttonPart11.ButtonDown();
else
this.buttonPart11.ButtonUp();
this.buttonSave.Visible = false;
} }
public void DisplayRefresh() public void DisplayRefresh()
@ -195,23 +186,6 @@ namespace INT63DC_6CH.Forms
else else
this.ParentForm.SystemConfig.IsOptDataStatistics = false; this.ParentForm.SystemConfig.IsOptDataStatistics = false;
// Part11 기능 사용 유무
if (this.buttonPart11.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{
this.ParentForm.SystemConfig.IsOptPart11 = true;
this.ParentForm.SystemConfig.IsLogin = true;
this.ParentForm.SystemConfig.IsDataBackup = true;
}
else
{
this.ParentForm.SystemConfig.IsOptPart11 = false;
this.ParentForm.SystemConfig.IsLogin = false;
this.ParentForm.SystemConfig.IsDataBackup = false;
// Delete user list
UserManager.UserManager_UserAllDel();
}
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
this.smartGroupBox1.Enabled = false; this.smartGroupBox1.Enabled = false;
@ -234,24 +208,7 @@ namespace INT63DC_6CH.Forms
} }
private void buttonPart11_Click(object sender, EventArgs e) private void buttonPart11_Click(object sender, EventArgs e)
{ {
if (this.buttonPart11.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{
this.ParentForm.CurrentUserPasswordType.SetDefinedPassword(OptionPassword.Part11);
DialogFormPasswordKeyPad pass = new DialogFormPasswordKeyPad(this.ParentForm.SystemConfig.Language, this.ParentForm.CurrentUserPasswordType, 8);
if (pass.ShowDialog() == DialogResult.OK)
{
this.buttonPart11.ButtonDown();
this.buttonDataStatistics.ButtonDown();
}
else
{
this.buttonPart11.ButtonUp();
this.buttonDataStatistics.ButtonUp();
}
}
if (this.buttonSave.Visible == false)
this.buttonSave.Visible = true;
} }
#endregion #endregion
} }

View File

@ -50,11 +50,11 @@
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />
<Reference Include="SmartXCommon, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SmartXCommon, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll</HintPath> <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll</HintPath>
</Reference> </Reference>
<Reference Include="SmartX_IEC1000, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SmartX_IEC1000, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll</HintPath> <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

View File

@ -19,10 +19,3 @@ D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.Resource.resour
D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.csproj.GenerateResource.Cache D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.csproj.GenerateResource.Cache
D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.dll D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.dll
D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.pdb D:\Git\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.pdb
D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\bin\Release\INT63DC_ImageDll.dll
D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\bin\Release\INT63DC_ImageDll.pdb
D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\ResolveAssemblyReference.cache
D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.Resource.resources
D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.csproj.GenerateResource.Cache
D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.dll
D:\Laboratory\INT63DC_6CH\INT63DC_ImageDll\obj\Release\INT63DC_ImageDll.pdb