..
This commit is contained in:
@@ -267,7 +267,15 @@ namespace AR
|
||||
FG_PORTL_ITEMON,
|
||||
FG_PORTR_ITEMON,
|
||||
|
||||
/// <summary>
|
||||
/// 사용자가 바코드 확인 또는 정보를 편집하는 창
|
||||
/// </summary>
|
||||
FG_WAIT_LOADERINFO,
|
||||
|
||||
/// <summary>
|
||||
/// SID정보가 복수가 검출되었을때 사용자가 선택하는 창
|
||||
/// </summary>
|
||||
FG_WAIT_INFOSELECT,
|
||||
/// <summary>
|
||||
/// 작업시작화면
|
||||
/// </summary>
|
||||
@@ -284,7 +292,6 @@ namespace AR
|
||||
FG_USERSTEP,
|
||||
FG_MINSPACE,
|
||||
FG_DEBUG,
|
||||
//RUN_INIT,
|
||||
|
||||
VS_DETECT_REEL_L,
|
||||
VS_DETECT_REEL_R,
|
||||
@@ -301,8 +308,8 @@ namespace AR
|
||||
PrePick_ReelIDOld,
|
||||
PrePick_ReelIDTarget,
|
||||
JOB_CUSTOMER_CODE,
|
||||
//JOB_BYPASS_SID,
|
||||
//JOB_TYPE,
|
||||
MULTISID_QUERY,
|
||||
MULTISID_FIELDS,
|
||||
}
|
||||
|
||||
public enum eVarTime
|
||||
|
||||
@@ -10,25 +10,7 @@ using System.Windows.Forms;
|
||||
|
||||
namespace AR
|
||||
{
|
||||
public class UserSetting : arUtil.Setting
|
||||
{
|
||||
public string customerlist { get; set; }
|
||||
public UserSetting()
|
||||
{
|
||||
|
||||
}
|
||||
public override void AfterLoad()
|
||||
{
|
||||
//throw new NotImplementedException();
|
||||
|
||||
}
|
||||
public override void AfterSave()
|
||||
{
|
||||
//throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
public class CommonSetting : arUtil.Setting
|
||||
public class CommonSetting : Setting
|
||||
{
|
||||
|
||||
public string WebAPI_R1 { get; set; }
|
||||
@@ -279,11 +261,10 @@ namespace AR
|
||||
public Boolean Enable_PickerCylinder { get; set; }
|
||||
|
||||
|
||||
public string GetPathData()
|
||||
public string GetDataPath()
|
||||
{
|
||||
var path = AppDomain.CurrentDomain.BaseDirectory;
|
||||
if (String.IsNullOrWhiteSpace(Path_Data)) return System.IO.Path.Combine(path, "SaveData");
|
||||
else return Path_Data;
|
||||
var di = new System.IO.DirectoryInfo(this.Path_Data);
|
||||
return di.FullName;
|
||||
}
|
||||
|
||||
[Category("Function"), DisplayName("라벨QR코드검증"), Description("부착된 라벨의 QR코드를 인쇄데이터와 검증 합니다"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
@@ -330,18 +311,13 @@ namespace AR
|
||||
public int HostPortL { get; set; }
|
||||
[Category("Vision"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
public int HostPortR { get; set; }
|
||||
[Category("Vision"), DisplayName("Camera Left Filename"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
[Category("Vision"), DisplayName("Camera Filename"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
public string CameraLFile { get; set; }
|
||||
//[Category("Vision"), DisplayName("Camera Right Filename"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
//public string CameraRFile { get; set; }
|
||||
|
||||
|
||||
[Category("Vision"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
public float AngleOffsetL { get; set; }
|
||||
[Category("Vision"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
public float AngleOffsetR { get; set; }
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#region "Count Reset Setting"
|
||||
@@ -612,13 +588,11 @@ namespace AR
|
||||
if (Language.isEmpty()) Language = "Kor";
|
||||
//if (Password_Setup.isEmpty()) Password_Setup = "0000";
|
||||
|
||||
if (Path_Data == "")
|
||||
Path_Data = System.IO.Path.Combine(currentpath, "SaveData");
|
||||
|
||||
if (Path_Data == "") Path_Data = @".\SaveData";
|
||||
try
|
||||
{
|
||||
if (System.IO.Directory.Exists(Path_Data) == false)
|
||||
System.IO.Directory.CreateDirectory(Path_Data);
|
||||
if (System.IO.Directory.Exists(GetDataPath()) == false)
|
||||
System.IO.Directory.CreateDirectory(GetDataPath());
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
||||
78
Handler/Sub/Setting/CounterSetting.cs
Normal file
78
Handler/Sub/Setting/CounterSetting.cs
Normal file
@@ -0,0 +1,78 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace AR
|
||||
{
|
||||
public class CounterSetting : Setting
|
||||
{
|
||||
public int seq { get; set; }
|
||||
public string DateStr { get; set; }
|
||||
|
||||
|
||||
|
||||
public void ClearP()
|
||||
{
|
||||
CountV0 = CountV1 = CountV2 = CountE = CountP0 = CountP1 = CountP2 = CountPrintL = CountPrintR = 0;
|
||||
this.Save();
|
||||
}
|
||||
|
||||
public void ClearDay()
|
||||
{
|
||||
DateStr = string.Empty;
|
||||
CountDP0 = CountDP1 = CountDP2 = CountDP3 = CountDP4 = 0;
|
||||
this.Save();
|
||||
}
|
||||
|
||||
public int CountD
|
||||
{
|
||||
get
|
||||
{
|
||||
return CountDP0 + CountDP1 + CountDP2 + CountDP3 + CountDP4;
|
||||
}
|
||||
}
|
||||
public int Count
|
||||
{
|
||||
get
|
||||
{
|
||||
return CountP0 + CountP1 + CountP2 + CountPrintL + CountPrintR;
|
||||
}
|
||||
}
|
||||
|
||||
public int CountDP0 { get; set; }
|
||||
public int CountDP1 { get; set; }
|
||||
public int CountDP2 { get; set; }
|
||||
public int CountDP3 { get; set; }
|
||||
public int CountDP4 { get; set; }
|
||||
|
||||
|
||||
|
||||
|
||||
//메인카운터
|
||||
public int CountP0 { get; set; }
|
||||
public int CountP1 { get; set; }
|
||||
public int CountP2 { get; set; }
|
||||
public int CountPrintL { get; set; }
|
||||
public int CountPrintR { get; set; }
|
||||
public int CountE { get; set; }
|
||||
public int CountV0 { get; set; }
|
||||
public int CountV1 { get; set; }
|
||||
public int CountV2 { get; set; }
|
||||
|
||||
|
||||
public CounterSetting()
|
||||
{
|
||||
this.filename = AR.UTIL.CurrentPath + "counter.xml";
|
||||
}
|
||||
public override void AfterLoad()
|
||||
{
|
||||
//if (CountReset == null) CountReset = DateTime.Parse("1982-11-23");
|
||||
}
|
||||
public override void AfterSave()
|
||||
{
|
||||
//throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,8 @@ namespace AR
|
||||
{
|
||||
public static class SETTING
|
||||
{
|
||||
public static SystemSetting System;
|
||||
public static CounterSetting Counter;
|
||||
public static CommonSetting Data;
|
||||
public static UserSetting User;
|
||||
public static Boolean isInit { get; private set; } = false;
|
||||
@@ -14,15 +16,18 @@ namespace AR
|
||||
Data.Load();
|
||||
if (User == null) User = new UserSetting();
|
||||
User.Load();
|
||||
|
||||
if (System == null) System = new SystemSetting();
|
||||
System.Load();
|
||||
if (Counter == null) Counter = new CounterSetting();
|
||||
Counter.Load();
|
||||
isInit = true;
|
||||
|
||||
|
||||
}
|
||||
public static void Save()
|
||||
{
|
||||
Data.Save();
|
||||
User.Save();
|
||||
System.Save();
|
||||
Counter.Save();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -34,13 +34,9 @@
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="arCommUtil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<Reference Include="arCommUtil">
|
||||
<HintPath>..\..\DLL\arCommUtil.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ArSetting.Net4">
|
||||
<HintPath>..\..\DLL\ArSetting.Net4.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
@@ -54,8 +50,11 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Common.cs" />
|
||||
<Compile Include="CounterSetting.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="SETTING.cs" />
|
||||
<Compile Include="System_Setting.cs" />
|
||||
<Compile Include="UserSetting.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
63
Handler/Sub/Setting/System_Setting.cs
Normal file
63
Handler/Sub/Setting/System_Setting.cs
Normal file
@@ -0,0 +1,63 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace AR
|
||||
{
|
||||
|
||||
public class SystemSetting : Setting
|
||||
{
|
||||
public int SaftySensor_Threshold { get; set; }
|
||||
|
||||
#region "System Setting"
|
||||
public int MotaxisCount { get; set; }
|
||||
#endregion
|
||||
|
||||
#region "Signal Reverse"
|
||||
|
||||
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_Emgergency { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_ButtonAir { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_DoorF { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_DoorR { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_AirCheck { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_PortLimitUp { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_PortLimitDn { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_PortDetect0Up { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_PortDetect1Up { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_PortDetect2Up { get; set; }
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_PickerSafe { get; set; }
|
||||
|
||||
[Category("Signal Reverse")]
|
||||
public Boolean ReverseSIG_ExtConvReady { get; set; }
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
public SystemSetting()
|
||||
{
|
||||
this.filename = UTIL.CurrentPath + "system.xml";
|
||||
}
|
||||
public override void AfterLoad()
|
||||
{
|
||||
MotaxisCount = 7;
|
||||
}
|
||||
public override void AfterSave()
|
||||
{
|
||||
//throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
72
Handler/Sub/Setting/UserSetting.cs
Normal file
72
Handler/Sub/Setting/UserSetting.cs
Normal file
@@ -0,0 +1,72 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.ComponentModel;
|
||||
|
||||
|
||||
namespace AR
|
||||
{
|
||||
public class UserSetting : Setting
|
||||
{
|
||||
public string customerlist { get; set; }
|
||||
public Boolean Option_QtyUpdate1 { get; set; }
|
||||
public Boolean Option_PartUpdate { get; set; }
|
||||
public Boolean Option_printforce1 { get; set; }
|
||||
public Boolean Option_Confirm1 { get; set; }
|
||||
public Boolean Option_AutoConfirm { get; set; }
|
||||
public Boolean Option_vname { get; set; }
|
||||
public Boolean Option_FixPrint1 { get; set; }
|
||||
public string Option_PrintPos1 { get; set; }
|
||||
public Boolean Option_SidConv { get; set; }
|
||||
|
||||
//public Boolean Option_QtyUpdate3 { get; set; }
|
||||
//public Boolean Option_printforce3 { get; set; }
|
||||
//public Boolean Option_Confirm3 { get; set; }
|
||||
//public Boolean Option_FixPrint3 { get; set; }
|
||||
//public string Option_PrintPos3 { get; set; }
|
||||
|
||||
public string LastJobUnP11 { get; set; }
|
||||
public string LastJobUnP12 { get; set; }
|
||||
public string LastJobUnP21 { get; set; }
|
||||
public string LastJobUnP22 { get; set; }
|
||||
public string LastJobUnP31 { get; set; }
|
||||
public string LastJobUnP32 { get; set; }
|
||||
public string LastJobUnP41 { get; set; }
|
||||
public string LastJobUnP42 { get; set; }
|
||||
|
||||
|
||||
public string LastLot { get; set; }
|
||||
public string LastAltag { get; set; }
|
||||
public string LastModelM { get; set; }
|
||||
public string LastModelV { get; set; }
|
||||
|
||||
public string LastMC { get; set; }
|
||||
|
||||
public int jobtype { get; set; }
|
||||
public int scantype { get; set; }
|
||||
public bool useConv { get; set; }
|
||||
public UserSetting()
|
||||
{
|
||||
this.filename = AppDomain.CurrentDomain.BaseDirectory + "UserSet.xml";
|
||||
}
|
||||
|
||||
public override void AfterLoad()
|
||||
{
|
||||
|
||||
if (LastJobUnP11.isEmpty()) LastJobUnP11 = "AUTO";
|
||||
if (LastJobUnP12.isEmpty()) LastJobUnP12 = "AUTO";
|
||||
if (LastJobUnP21.isEmpty()) LastJobUnP21 = "AUTO";
|
||||
if (LastJobUnP22.isEmpty()) LastJobUnP22 = "AUTO";
|
||||
if (LastJobUnP31.isEmpty()) LastJobUnP31 = "AUTO";
|
||||
if (LastJobUnP32.isEmpty()) LastJobUnP32 = "AUTO";
|
||||
if (LastJobUnP41.isEmpty()) LastJobUnP41 = "AUTO";
|
||||
if (LastJobUnP42.isEmpty()) LastJobUnP42 = "AUTO";
|
||||
|
||||
}
|
||||
public override void AfterSave()
|
||||
{
|
||||
//throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>StdLabelPrint</RootNamespace>
|
||||
<AssemblyName>StdLabelPrint</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<Deterministic>true</Deterministic>
|
||||
<TargetFrameworkProfile />
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>arFrame.Control</RootNamespace>
|
||||
<AssemblyName>arFrameControl</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
Reference in New Issue
Block a user