diff --git a/Cs_HMI/AGVCSharp.sln b/Cs_HMI/AGVCSharp.sln index 730eb4b..3403360 100644 --- a/Cs_HMI/AGVCSharp.sln +++ b/Cs_HMI/AGVCSharp.sln @@ -35,10 +35,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Narumi", "TestProject\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arCommUtil", "SubProject\CommUtil\arCommUtil.csproj", "{14E8C9A5-013E-49BA-B435-FFFFFF7DD623}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AGV4", "Project\AGV4.csproj", "{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ENIGProtocol", "SubProject\EnigProtocol\enigprotocol\ENIGProtocol.csproj", "{BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4", "Project\AGV4.csproj", "{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -211,18 +211,6 @@ Global {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|x64.Build.0 = Release|Any CPU {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|x86.ActiveCfg = Release|x86 {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|x86.Build.0 = Release|x86 - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x64.ActiveCfg = Debug|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x64.Build.0 = Debug|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x86.ActiveCfg = Debug|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x86.Build.0 = Debug|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|Any CPU.Build.0 = Release|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x64.ActiveCfg = Release|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x64.Build.0 = Release|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x86.ActiveCfg = Release|Any CPU - {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x86.Build.0 = Release|Any CPU {BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -235,6 +223,18 @@ Global {BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Release|x64.Build.0 = Release|Any CPU {BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Release|x86.ActiveCfg = Release|Any CPU {BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Release|x86.Build.0 = Release|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x64.ActiveCfg = Debug|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x64.Build.0 = Debug|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x86.ActiveCfg = Debug|x86 + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x86.Build.0 = Debug|x86 + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|Any CPU.Build.0 = Release|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x64.ActiveCfg = Release|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x64.Build.0 = Release|Any CPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x86.ActiveCfg = Release|x86 + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Cs_HMI/Project/AGV4.csproj b/Cs_HMI/Project/AGV4.csproj index 7107566..6f0ffc8 100644 --- a/Cs_HMI/Project/AGV4.csproj +++ b/Cs_HMI/Project/AGV4.csproj @@ -1,63 +1,556 @@  - + + + Debug + AnyCPU + {D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38} WinExe - net8.0-windows - enable - true - enable - x64 - S:\Amkor\AGV4 - true - true + Project + Amkor + v4.8 + 512 + win-x86 + 게시\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + False + False + False + OnBuildSuccess + False + False + False + obj\$(Configuration)\ + + + + x86 + true + Full + False + ..\..\..\..\..\Amkor\AGV4\ + DEBUG;TRACE + prompt + 4 + false + IDE1006 + + + AnyCPU + pdbonly + true + ..\..\..\ManualMapEditor\ + TRACE + prompt + 4 + false + + + icons8-split-64.ico + + + LocalIntranet + + + false + + + + true + ..\..\..\..\Amkor\OTP2DReading\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + false + + + bin\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + false + + + Project + False + obj\ + + + 4194304 + False + Auto - - - - - - - - - - - - - - - True - True - Settings.settings - - - - - - PreserveNewest - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - PreserveNewest - - - - - - ..\DLL\arCommUtil.dll + + False + C:\Program Files (x86)\Microsoft SDKs\Speech\v11.0\Assembly\Microsoft.Speech.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + True + + + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + + + ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll + True + True + + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + + + + + + + + ..\DLL\Winsock Orcas.dll - - - - - + + + + Component + + + CtlAuto.cs + + + Component + + + CtlPos.cs + + + + + + DataSet1.xsd + + + True + True + DataSet1.xsd + + + + + + Form + + + fCounter.cs + + + Form + + + fUpdateForm.cs + + + Form + + + fLog.cs + + + Form + + + fJobSelect.cs + + + Form + + + fSystem.cs + + + Form + + + Form + + + fVolume.cs + + + Form + + + fMessageWindow.cs + + + Form + + + fTouchKey.cs + + + Form + + + fTouchKeyFull.cs + + + Form + + + fTouchNumDot.cs + + + Form + + + fPassword.cs + + + Form + + + fErrorException.cs + + + Form + + + fMain.cs + + + + + + + + + + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + + + Form + + + fBms.cs + + + Form + + + fAuto.cs + + + Form + + + fAgv.cs + + + Form + + + fFlag.cs + + + Form + + + fIO.cs + + + Form + + + fSetup.cs + + + Form + + + fManual.cs + + + fCounter.cs + + + fUpdateForm.cs + + + fLog.cs + + + fJobSelect.cs + + + fSystem.cs + + + fVolume.cs + + + fMessageWindow.cs + + + fTouchKey.cs + + + fTouchKeyFull.cs + + + fTouchNumDot.cs + + + fPassword.cs + + + fErrorException.cs + + + fMain.cs + Designer + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + fBms.cs + + + fAuto.cs + + + fAgv.cs + + + fFlag.cs + + + fIO.cs + + + fSetup.cs + + + fManual.cs + + + + DataSet1.xsd + + + Designer + MSDataSetGenerator + DataSet1.Designer.cs + + + DataSet1.xsd + Designer + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4%28x86 및 x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 4.5 + true + + + + + {bbc9bccf-6262-4355-9cc2-37ff678ac499} + StateMachine + + + {8cb883c0-99c3-4dd4-b017-f9b92010a806} + agvControl + + + {8bae0eac-3d25-402f-9a65-2ba1ecfe28b7} + NARUMI + + + {f31c242c-1b15-4518-9733-48558499fe4b} + arControl + + + {a16c9667-5241-4313-888e-548375f85d29} + arFrameControl + + + {7a94c30c-6772-4f71-bf9c-0df071a1bc70} + BMS + + + {14e8c9a5-013e-49ba-b435-efefc77dd623} + CommData + + + {14e8c9a5-013e-49ba-b435-ffffff7dd623} + arCommUtil + + + {bcfd982a-c7bf-42ef-b0d3-0648b0ec5234} + ENIGProtocol + + + + + + rem xcopy "$(TargetDir)*.exe" "\\192.168.1.80\Amkor\AGV2" /Y +rem xcopy "$(TargetDir)*.dll" "\\192.168.1.80\Amkor\AGV2" /Y + \ No newline at end of file diff --git a/Cs_HMI/Project/AGV4.csproj.bak b/Cs_HMI/Project/AGV4.csproj.bak new file mode 100644 index 0000000..7107566 --- /dev/null +++ b/Cs_HMI/Project/AGV4.csproj.bak @@ -0,0 +1,63 @@ + + + + WinExe + net8.0-windows + enable + true + enable + x64 + S:\Amkor\AGV4 + true + true + + + + + + + + + + + + + + + + + True + True + Settings.settings + + + + + + PreserveNewest + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + PreserveNewest + + + + + + ..\DLL\arCommUtil.dll + + + ..\DLL\Winsock Orcas.dll + + + + + + + + + + \ No newline at end of file diff --git a/Cs_HMI/Project/Device/Xbee.cs b/Cs_HMI/Project/Device/Xbee.cs index ea0f38d..da8decb 100644 --- a/Cs_HMI/Project/Device/Xbee.cs +++ b/Cs_HMI/Project/Device/Xbee.cs @@ -59,7 +59,7 @@ namespace Project.Device { try { - this.Open(); + base.Open(); return true; } catch (Exception ex) diff --git a/Cs_HMI/Project/Dialog/fSystem.cs b/Cs_HMI/Project/Dialog/fSystem.cs index 83347d3..fa05ab7 100644 --- a/Cs_HMI/Project/Dialog/fSystem.cs +++ b/Cs_HMI/Project/Dialog/fSystem.cs @@ -117,7 +117,7 @@ namespace Project.Dialog private void arLabel5_Click(object sender, EventArgs e) { //현재 폴더에서 dll 과, amkor.exe 파일을 압축한다 - var path = new System.IO.DirectoryInfo( AppDomain.CurrentDomain.BaseDirectory); + var path = new System.IO.DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory); var files_dll = path.GetFiles("*.dll"); var file_exe = System.IO.Path.Combine(path.FullName, "amkor.exe"); if(System.IO.File.Exists(file_exe)==false) @@ -125,20 +125,26 @@ namespace Project.Dialog Util.MsgE("실행파일 amkor.exe 가 없습니다."); return; } - var zipfile = new ZipArchive(new MemoryStream(), ZipArchiveMode.Create); - zipfile.CreateEntryFromFile(file_exe, "amkor.exe"); - foreach (var filedll in files_dll) - zipfile.CreateEntryFromFile(filedll.FullName, filedll.Name); var veri = Application.ProductVersion.Split('.'); - var newfilename = "Patch_AGV_" + veri[0] + veri[1]+ veri[2] + "_" + - veri[3] + ".zip"; - var entry = zipfile.CreateEntry(newfilename); - using (var entryStream = entry.Open()) - using (var fileStream = new FileStream(newfilename, FileMode.Open)) - { - fileStream.CopyTo(entryStream); - } + var newfilename = "Patch_AGV_" + veri[0] + veri[1] + veri[2] + "_" + veri[3] + ".zip"; + + // 임시 폴더 생성 + var tempDir = Path.Combine(Path.GetTempPath(), "PatchTemp"); + if (Directory.Exists(tempDir)) + Directory.Delete(tempDir, true); + Directory.CreateDirectory(tempDir); + + // 파일 복사 + File.Copy(file_exe, Path.Combine(tempDir, "amkor.exe")); + foreach (var filedll in files_dll) + File.Copy(filedll.FullName, Path.Combine(tempDir, filedll.Name)); + + // 압축 파일 생성 + ZipFile.CreateFromDirectory(tempDir, newfilename); + + // 임시 폴더 삭제 + Directory.Delete(tempDir, true); Util.MsgI("다음 패치 파일이 생성됨\n" + newfilename); } diff --git a/Cs_HMI/Project/PUB.cs b/Cs_HMI/Project/PUB.cs index 45b5905..ca6e081 100644 --- a/Cs_HMI/Project/PUB.cs +++ b/Cs_HMI/Project/PUB.cs @@ -4,11 +4,14 @@ using System.Net; using System.Management; using System.Data; using AR; -using System.Speech.Synthesis; using System.Media; using System.Runtime.InteropServices; -using Microsoft.Data.SqlClient; using System.Windows.Forms; +using System; +using Microsoft.Speech.Synthesis; +using System.Threading.Tasks; +using System.Data.SqlClient; +using System.Linq; namespace Project { @@ -185,11 +188,7 @@ namespace Project public static void init() { - // 전역 예외 처리기 등록 - Application.ThreadException += Application_ThreadException; - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - Application.ApplicationExit += Application_ApplicationExit; - + Result = new CResult(); //state machine @@ -243,46 +242,7 @@ namespace Project else PUB.PatchVersion = string.Empty; } - private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) - { - try - { - string errorMessage = $"Thread Exception: {e.Exception.Message}\nStack Trace: {e.Exception.StackTrace}"; - log.AddE(errorMessage); - MessageBox.Show($"프로그램 오류가 발생했습니다.\n{errorMessage}", "오류", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - catch - { - // 로깅 실패 시 무시 - } - } - - private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) - { - try - { - Exception ex = e.ExceptionObject as Exception; - string errorMessage = $"Unhandled Exception: {ex?.Message}\nStack Trace: {ex?.StackTrace}"; - log.AddE(errorMessage); - MessageBox.Show($"프로그램 오류가 발생했습니다.\n{errorMessage}", "오류", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - catch - { - // 로깅 실패 시 무시 - } - } - - private static void Application_ApplicationExit(object sender, EventArgs e) - { - try - { - log.Add("프로그램 종료", "Application_ApplicationExit 이벤트 발생"); - } - catch - { - // 로깅 실패 시 무시 - } - } + public static Boolean CheckManualChargeMode(bool Prompt = true ) { diff --git a/Cs_HMI/Project/Project.sln b/Cs_HMI/Project/Project.sln deleted file mode 100644 index 68cd577..0000000 --- a/Cs_HMI/Project/Project.sln +++ /dev/null @@ -1,36 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.2.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4 - Backup", "AGV4 - Backup.csproj", "{5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4", "AGV4.csproj", "{6D0CF7CE-1916-3231-E152-64E6C2B57D2B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4.net8", "AGV4.net8.csproj", "{FD3A068E-BC6F-1C35-9239-C435C411B769}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Release|Any CPU.Build.0 = Release|Any CPU - {6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Release|Any CPU.Build.0 = Release|Any CPU - {FD3A068E-BC6F-1C35-9239-C435C411B769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD3A068E-BC6F-1C35-9239-C435C411B769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD3A068E-BC6F-1C35-9239-C435C411B769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD3A068E-BC6F-1C35-9239-C435C411B769}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {31175F6D-6217-4F37-BF84-FA16ACCCBAC0} - EndGlobalSection -EndGlobal diff --git a/Cs_HMI/Project/Properties/AssemblyInfo.cs b/Cs_HMI/Project/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..3b9c3ae --- /dev/null +++ b/Cs_HMI/Project/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 +// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 +// 이러한 특성 값을 변경하세요. +[assembly: AssemblyTitle("(OTP) 2D Reading System")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Amkor K4")] +[assembly: AssemblyProduct("(OTP) 2D Reading System")] +[assembly: AssemblyCopyright("Copyright ©Amkor-EET 2020")] +[assembly: AssemblyTrademark("EET")] +[assembly: AssemblyCulture("")] + +// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 +// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면 +// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요. +[assembly: ComVisible(false)] + +// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다. +[assembly: Guid("65f3e762-800c-772e-862f-b444642ec59f")] + +// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. +// +// 주 버전 +// 부 버전 +// 빌드 번호 +// 수정 버전 +// +// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 +// 지정되도록 할 수 있습니다. +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("25.01.10.1030")] +[assembly: AssemblyFileVersion("25.01.10.1030")] diff --git a/Cs_HMI/Project/ViewForm/fAuto.Designer.cs b/Cs_HMI/Project/ViewForm/fAuto.Designer.cs index a20230a..1a918a8 100644 --- a/Cs_HMI/Project/ViewForm/fAuto.Designer.cs +++ b/Cs_HMI/Project/ViewForm/fAuto.Designer.cs @@ -1,4 +1,8 @@ -namespace Project.ViewForm +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace Project.ViewForm { partial class fAuto { diff --git a/Cs_HMI/Project/ViewForm/fAuto.cs b/Cs_HMI/Project/ViewForm/fAuto.cs index c24d6de..a3bfed7 100644 --- a/Cs_HMI/Project/ViewForm/fAuto.cs +++ b/Cs_HMI/Project/ViewForm/fAuto.cs @@ -10,13 +10,12 @@ using System.Windows.Forms; using Project.StateMachine; using COMM; using AR; -using Microsoft.IdentityModel.Tokens; namespace Project.ViewForm { public partial class fAuto : Form { - AGVMapControl.MapControl mapctl; + AGVControl.MapControl mapctl; public fAuto() { InitializeComponent(); @@ -27,7 +26,7 @@ namespace Project.ViewForm this.ctlAuto1.Scean = CtlAuto.eScean.Progress; else this.ctlAuto1.Scean = CtlAuto.eScean.Normal; - this.mapctl = new AGVMapControl.MapControl(); + this.mapctl = new AGVControl.MapControl(); this.mapctl.Dock = DockStyle.Fill; this.mapctl.Visible = true; this.mapctl.Font = this.panel1.Font; @@ -43,8 +42,28 @@ namespace Project.ViewForm this.timer1.Start(); PUB.AGV.DataReceive += AGV_DataReceive; - var fn = new System.IO.FileInfo( AR.UTIL.CurrentPath+ "\\sample.route"); - if (fn.Exists) this.mapctl.LoadFromFile(fn.FullName); + //auto load + var path = new System.IO.DirectoryInfo("route"); + if (path.Exists == false) path.Create(); + var files = path.GetFiles("*.route"); + var fn = string.Empty; + if (files.Any() == false) + { + fn = AR.UTIL.MakePath("sample.route"); + } + else if (files.Count() == 1) + { + fn = files.First().FullName; + } + if(fn.isEmpty()==false) + { + var fi = new System.IO.FileInfo(AR.UTIL.CurrentPath + "\\sample.route"); + if (fi.Exists) + { + PUB.log.Add($"autoload : {fi.FullName}"); + this.mapctl.LoadFromFile(fi.FullName); + } + } } private void AGV_DataReceive(object sender, arDev.Narumi.DataEventArgs e) { diff --git a/Cs_HMI/Project/app.config b/Cs_HMI/Project/app.config index 547c6c9..5b6a276 100644 --- a/Cs_HMI/Project/app.config +++ b/Cs_HMI/Project/app.config @@ -1,14 +1,13 @@ - +
-
+
- + @@ -26,4 +25,13 @@ asdf - + + + + + + + + + + diff --git a/Cs_HMI/Project/fMain.Designer.cs b/Cs_HMI/Project/fMain.Designer.cs index d0e0db0..52b3266 100644 --- a/Cs_HMI/Project/fMain.Designer.cs +++ b/Cs_HMI/Project/fMain.Designer.cs @@ -1,4 +1,7 @@ -namespace Project +using System.Drawing; +using System.Windows.Forms; + +namespace Project { partial class fMain { diff --git a/Cs_HMI/Project/packages.config b/Cs_HMI/Project/packages.config index 5712595..1187d29 100644 --- a/Cs_HMI/Project/packages.config +++ b/Cs_HMI/Project/packages.config @@ -1,4 +1,10 @@  - + + + + + + + \ No newline at end of file diff --git a/Cs_HMI/SubProject/AGVMapControl/MapControl.Designer.cs b/Cs_HMI/SubProject/AGVControl/MapControl.Designer.cs similarity index 94% rename from Cs_HMI/SubProject/AGVMapControl/MapControl.Designer.cs rename to Cs_HMI/SubProject/AGVControl/MapControl.Designer.cs index 9625998..81b5ff3 100644 --- a/Cs_HMI/SubProject/AGVMapControl/MapControl.Designer.cs +++ b/Cs_HMI/SubProject/AGVControl/MapControl.Designer.cs @@ -1,4 +1,4 @@ -namespace AGVMapControl +namespace AGVControl { partial class MapControl { diff --git a/Cs_HMI/SubProject/AGVMapControl/MapControl.cs b/Cs_HMI/SubProject/AGVControl/MapControl.cs similarity index 97% rename from Cs_HMI/SubProject/AGVMapControl/MapControl.cs rename to Cs_HMI/SubProject/AGVControl/MapControl.cs index e48c6f1..83c46e3 100644 --- a/Cs_HMI/SubProject/AGVMapControl/MapControl.cs +++ b/Cs_HMI/SubProject/AGVControl/MapControl.cs @@ -1,11 +1,15 @@ -using System.Collections.Immutable; +using System; +using System.Collections.Generic; +using System.Drawing; using System.Drawing.Design; using System.Drawing.Drawing2D; +using System.IO; +using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; -using AGVMapControl.Models; +using AGVControl.Models; -namespace AGVMapControl +namespace AGVControl { public partial class MapControl : Control { diff --git a/Cs_HMI/SubProject/AGVMapControl/MapControl.resx b/Cs_HMI/SubProject/AGVControl/MapControl.resx similarity index 100% rename from Cs_HMI/SubProject/AGVMapControl/MapControl.resx rename to Cs_HMI/SubProject/AGVControl/MapControl.resx diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/AGV.cs b/Cs_HMI/SubProject/AGVControl/Models/AGV.cs similarity index 94% rename from Cs_HMI/SubProject/AGVMapControl/Models/AGV.cs rename to Cs_HMI/SubProject/AGVControl/Models/AGV.cs index 8fba0a4..cc25d3b 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/AGV.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/AGV.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Collections.Generic; using System.Linq; -namespace AGVMapControl.Models +namespace AGVControl.Models { public class AGV { diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/CustomLine.cs b/Cs_HMI/SubProject/AGVControl/Models/CustomLine.cs similarity index 88% rename from Cs_HMI/SubProject/AGVMapControl/Models/CustomLine.cs rename to Cs_HMI/SubProject/AGVControl/Models/CustomLine.cs index 73b348d..1f00452 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/CustomLine.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/CustomLine.cs @@ -2,7 +2,7 @@ using System.Drawing; using System; -namespace AGVMapControl.Models +namespace AGVControl.Models { public class CustomLine { diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/MagnetLine.cs b/Cs_HMI/SubProject/AGVControl/Models/MagnetLine.cs similarity index 94% rename from Cs_HMI/SubProject/AGVMapControl/Models/MagnetLine.cs rename to Cs_HMI/SubProject/AGVControl/Models/MagnetLine.cs index f731a93..37e3808 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/MagnetLine.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/MagnetLine.cs @@ -2,7 +2,7 @@ using System.Drawing; using System; using System.Collections.Generic; -namespace AGVMapControl.Models +namespace AGVControl.Models { public class MagnetLine { diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/MapData.cs b/Cs_HMI/SubProject/AGVControl/Models/MapData.cs similarity index 92% rename from Cs_HMI/SubProject/AGVMapControl/Models/MapData.cs rename to Cs_HMI/SubProject/AGVControl/Models/MapData.cs index e32bf12..1eecbb3 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/MapData.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/MapData.cs @@ -1,7 +1,7 @@ using System.Drawing; using System; using System.Collections.Generic; -namespace AGVMapControl.Models +namespace AGVControl.Models { public class MapData { diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/MapElements.cs b/Cs_HMI/SubProject/AGVControl/Models/MapElements.cs similarity index 79% rename from Cs_HMI/SubProject/AGVMapControl/Models/MapElements.cs rename to Cs_HMI/SubProject/AGVControl/Models/MapElements.cs index 2157d90..ca60db6 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/MapElements.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/MapElements.cs @@ -2,7 +2,7 @@ using System.Drawing; using System; using System.Collections.Generic; -namespace AGVMapControl.Models +namespace AGVControl.Models { public enum BranchDirection { diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/MapText.cs b/Cs_HMI/SubProject/AGVControl/Models/MapText.cs similarity index 91% rename from Cs_HMI/SubProject/AGVMapControl/Models/MapText.cs rename to Cs_HMI/SubProject/AGVControl/Models/MapText.cs index 1404242..33be61c 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/MapText.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/MapText.cs @@ -1,7 +1,7 @@ using System.Drawing; using System; using System.Collections.Generic; -namespace AGVMapControl.Models +namespace AGVControl.Models { public class MapText { diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/RFIDLine.cs b/Cs_HMI/SubProject/AGVControl/Models/RFIDLine.cs similarity index 96% rename from Cs_HMI/SubProject/AGVMapControl/Models/RFIDLine.cs rename to Cs_HMI/SubProject/AGVControl/Models/RFIDLine.cs index 3337cde..b72f3b7 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/RFIDLine.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/RFIDLine.cs @@ -2,7 +2,7 @@ using System.Drawing; using System; using System.Collections.Generic; -namespace AGVMapControl.Models +namespace AGVControl.Models { public class RFIDLine { diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/RFIDPoint.cs b/Cs_HMI/SubProject/AGVControl/Models/RFIDPoint.cs similarity index 91% rename from Cs_HMI/SubProject/AGVMapControl/Models/RFIDPoint.cs rename to Cs_HMI/SubProject/AGVControl/Models/RFIDPoint.cs index 5939805..e16153a 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/RFIDPoint.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/RFIDPoint.cs @@ -1,7 +1,7 @@ using System.Drawing; using System; using System.Collections.Generic; -namespace AGVMapControl.Models +namespace AGVControl.Models { public class RFIDPoint { diff --git a/Cs_HMI/SubProject/AGVMapControl/Models/ToolBarItem.cs b/Cs_HMI/SubProject/AGVControl/Models/ToolBarItem.cs similarity index 91% rename from Cs_HMI/SubProject/AGVMapControl/Models/ToolBarItem.cs rename to Cs_HMI/SubProject/AGVControl/Models/ToolBarItem.cs index 235b67c..e01eb4b 100644 --- a/Cs_HMI/SubProject/AGVMapControl/Models/ToolBarItem.cs +++ b/Cs_HMI/SubProject/AGVControl/Models/ToolBarItem.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Collections.Generic; using System.Linq; -namespace AGVMapControl.Models +namespace AGVControl.Models { public class ToolBarItem { diff --git a/Cs_HMI/SubProject/AGVControl/agvControl.csproj b/Cs_HMI/SubProject/AGVControl/agvControl.csproj index fc19cbd..5b08323 100644 --- a/Cs_HMI/SubProject/AGVControl/agvControl.csproj +++ b/Cs_HMI/SubProject/AGVControl/agvControl.csproj @@ -9,7 +9,7 @@ Properties AGVControl AGVControl - v4.0 + v4.8 512 true @@ -57,6 +57,21 @@ GuideSensor.cs + + Component + + + MapControl.cs + + + + + + + + + + Component @@ -77,5 +92,16 @@ ValueSelect.cs + + + MapControl.cs + + + + + {14e8c9a5-013e-49ba-b435-ffffff7dd623} + arCommUtil + + \ No newline at end of file diff --git a/Cs_HMI/SubProject/AGVMapControl/AGVMapControl.csproj b/Cs_HMI/SubProject/AGVMapControl/AGVMapControl.csproj deleted file mode 100644 index 0da287e..0000000 --- a/Cs_HMI/SubProject/AGVMapControl/AGVMapControl.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net8.0-windows - enable - true - enable - - - - - ..\..\DLL\arCommUtil.dll - - - -