diff --git a/.vs/marking_gui.slnx/FileContentIndex/b2cdd851-fde6-4ff7-8960-15b7403933fa.vsidx b/.vs/marking_gui.slnx/FileContentIndex/0eaf846b-d4b9-4caf-a370-de061ce0320c.vsidx similarity index 100% rename from .vs/marking_gui.slnx/FileContentIndex/b2cdd851-fde6-4ff7-8960-15b7403933fa.vsidx rename to .vs/marking_gui.slnx/FileContentIndex/0eaf846b-d4b9-4caf-a370-de061ce0320c.vsidx diff --git a/.vs/marking_gui.slnx/FileContentIndex/b9adc68c-0602-473b-92e8-cab09444cfae.vsidx b/.vs/marking_gui.slnx/FileContentIndex/5aec86f5-6062-4241-89fe-a2d7cacc7094.vsidx similarity index 100% rename from .vs/marking_gui.slnx/FileContentIndex/b9adc68c-0602-473b-92e8-cab09444cfae.vsidx rename to .vs/marking_gui.slnx/FileContentIndex/5aec86f5-6062-4241-89fe-a2d7cacc7094.vsidx diff --git a/.vs/marking_gui.slnx/FileContentIndex/a26e37eb-5b6f-417f-8426-dfd11cf0e629.vsidx b/.vs/marking_gui.slnx/FileContentIndex/a26e37eb-5b6f-417f-8426-dfd11cf0e629.vsidx new file mode 100644 index 0000000..f298f97 Binary files /dev/null and b/.vs/marking_gui.slnx/FileContentIndex/a26e37eb-5b6f-417f-8426-dfd11cf0e629.vsidx differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/dbd6c12d-68ab-4590-b0c7-f0747a0fdc95.vsidx b/.vs/marking_gui.slnx/FileContentIndex/dbd6c12d-68ab-4590-b0c7-f0747a0fdc95.vsidx deleted file mode 100644 index 9278940..0000000 Binary files a/.vs/marking_gui.slnx/FileContentIndex/dbd6c12d-68ab-4590-b0c7-f0747a0fdc95.vsidx and /dev/null differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/e996ace7-7fba-4157-879f-74d3faae8720.vsidx b/.vs/marking_gui.slnx/FileContentIndex/e996ace7-7fba-4157-879f-74d3faae8720.vsidx deleted file mode 100644 index c403b3f..0000000 Binary files a/.vs/marking_gui.slnx/FileContentIndex/e996ace7-7fba-4157-879f-74d3faae8720.vsidx and /dev/null differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/e9aaf3b7-f547-4846-9bb0-c8cac36ad7c4.vsidx b/.vs/marking_gui.slnx/FileContentIndex/e9aaf3b7-f547-4846-9bb0-c8cac36ad7c4.vsidx new file mode 100644 index 0000000..ec4dd9a Binary files /dev/null and b/.vs/marking_gui.slnx/FileContentIndex/e9aaf3b7-f547-4846-9bb0-c8cac36ad7c4.vsidx differ diff --git a/.vs/marking_gui.slnx/v18/.suo b/.vs/marking_gui.slnx/v18/.suo index f632b7a..656e907 100644 Binary files a/.vs/marking_gui.slnx/v18/.suo and b/.vs/marking_gui.slnx/v18/.suo differ diff --git a/.vs/marking_gui.slnx/v18/DocumentLayout.backup.json b/.vs/marking_gui.slnx/v18/DocumentLayout.backup.json index eb0aec2..159f9eb 100644 --- a/.vs/marking_gui.slnx/v18/DocumentLayout.backup.json +++ b/.vs/marking_gui.slnx/v18/DocumentLayout.backup.json @@ -1,20 +1,20 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\", + "WorkspaceRootPath": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|c:\\users\\wjddn\\desktop\\amosense\\marking_gui\\marking_gui\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|c:\\users\\computer1\\desktop\\mobi\\marking_gui\\marking_gui\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", "RelativeMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|solutionrelative:marking_gui\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { - "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|c:\\users\\wjddn\\desktop\\amosense\\marking_gui\\marking_gui\\startuploginwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\startuploginwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", "RelativeMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|solutionrelative:marking_gui\\startuploginwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|solutionrelative:marking_gui\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], @@ -31,34 +31,32 @@ "$type": "Document", "DocumentIndex": 1, "Title": "StartupLoginWindow.xaml", - "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", + "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", "RelativeDocumentMoniker": "marking_gui\\StartupLoginWindow.xaml", - "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", + "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", "RelativeToolTip": "marking_gui\\StartupLoginWindow.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2026-06-08T01:06:29.984Z", - "EditorCaption": "" + "WhenOpened": "2026-06-08T01:06:29.984Z" }, { "$type": "Document", "DocumentIndex": 2, "Title": "MainWindow.xaml.cs", "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", - "RelativeDocumentMoniker": "..\\AMO_Housing\\MainWindow.xaml.cs", + "RelativeDocumentMoniker": "..\\..\\..\\..\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", - "RelativeToolTip": "..\\AMO_Housing\\MainWindow.xaml.cs", + "RelativeToolTip": "..\\..\\..\\..\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2026-06-08T00:52:55.21Z", - "EditorCaption": "" + "WhenOpened": "2026-06-08T00:52:55.21Z" }, { "$type": "Document", "DocumentIndex": 0, "Title": "MainWindow.xaml", - "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml", + "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml", "RelativeDocumentMoniker": "marking_gui\\MainWindow.xaml", - "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml", + "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml", "RelativeToolTip": "marking_gui\\MainWindow.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "WhenOpened": "2026-06-05T02:08:02.816Z", @@ -68,9 +66,9 @@ "$type": "Document", "DocumentIndex": 3, "Title": "MainWindow.xaml.cs", - "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml.cs", + "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml.cs", "RelativeDocumentMoniker": "marking_gui\\MainWindow.xaml.cs", - "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml.cs", + "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml.cs", "RelativeToolTip": "marking_gui\\MainWindow.xaml.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "00000000-0000-0000-0000-000000000000.000000|iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADKSURBVDhP7ZMhDoNAEEX/VlStqMYwJ\u002BgFegguwB1AIsC1ZhWKE3AVkj3DojCEBIOumZqWLENoSVPZl6zYPz8/k5ldQHC\u002BWbbtyFLfjW1HDvOGbTuyMYaJiIui2AxUYd5wN92ljvB0RHe9KCLiKIqglEJZlkr6VvgdAAARMQAkScJpmm52MiNnQEQ8DMO\u002BEGPMqviag3\u002BkZ\u002BZt8Yn0HPzLN/wDfh2gtYZzbnOVzjkOgmChLd52XddcVRX6vvflGa01sixDHMef/8ReHgD\u002BXy4W5TMHAAAAAElFTkSuQmCC", diff --git a/.vs/marking_gui.slnx/v18/DocumentLayout.json b/.vs/marking_gui.slnx/v18/DocumentLayout.json index eb0aec2..159f9eb 100644 --- a/.vs/marking_gui.slnx/v18/DocumentLayout.json +++ b/.vs/marking_gui.slnx/v18/DocumentLayout.json @@ -1,20 +1,20 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\", + "WorkspaceRootPath": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|c:\\users\\wjddn\\desktop\\amosense\\marking_gui\\marking_gui\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|c:\\users\\computer1\\desktop\\mobi\\marking_gui\\marking_gui\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", "RelativeMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|solutionrelative:marking_gui\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { - "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|c:\\users\\wjddn\\desktop\\amosense\\marking_gui\\marking_gui\\startuploginwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\startuploginwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", "RelativeMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|solutionrelative:marking_gui\\startuploginwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{9E96D5BE-9375-4ED3-82DE-F200F83EBC2F}|marking_gui\\marking_gui.csproj|solutionrelative:marking_gui\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], @@ -31,34 +31,32 @@ "$type": "Document", "DocumentIndex": 1, "Title": "StartupLoginWindow.xaml", - "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", + "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", "RelativeDocumentMoniker": "marking_gui\\StartupLoginWindow.xaml", - "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", + "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", "RelativeToolTip": "marking_gui\\StartupLoginWindow.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2026-06-08T01:06:29.984Z", - "EditorCaption": "" + "WhenOpened": "2026-06-08T01:06:29.984Z" }, { "$type": "Document", "DocumentIndex": 2, "Title": "MainWindow.xaml.cs", "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", - "RelativeDocumentMoniker": "..\\AMO_Housing\\MainWindow.xaml.cs", + "RelativeDocumentMoniker": "..\\..\\..\\..\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", - "RelativeToolTip": "..\\AMO_Housing\\MainWindow.xaml.cs", + "RelativeToolTip": "..\\..\\..\\..\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2026-06-08T00:52:55.21Z", - "EditorCaption": "" + "WhenOpened": "2026-06-08T00:52:55.21Z" }, { "$type": "Document", "DocumentIndex": 0, "Title": "MainWindow.xaml", - "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml", + "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml", "RelativeDocumentMoniker": "marking_gui\\MainWindow.xaml", - "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml", + "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml", "RelativeToolTip": "marking_gui\\MainWindow.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "WhenOpened": "2026-06-05T02:08:02.816Z", @@ -68,9 +66,9 @@ "$type": "Document", "DocumentIndex": 3, "Title": "MainWindow.xaml.cs", - "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml.cs", + "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml.cs", "RelativeDocumentMoniker": "marking_gui\\MainWindow.xaml.cs", - "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml.cs", + "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml.cs", "RelativeToolTip": "marking_gui\\MainWindow.xaml.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "00000000-0000-0000-0000-000000000000.000000|iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADKSURBVDhP7ZMhDoNAEEX/VlStqMYwJ\u002BgFegguwB1AIsC1ZhWKE3AVkj3DojCEBIOumZqWLENoSVPZl6zYPz8/k5ldQHC\u002BWbbtyFLfjW1HDvOGbTuyMYaJiIui2AxUYd5wN92ljvB0RHe9KCLiKIqglEJZlkr6VvgdAAARMQAkScJpmm52MiNnQEQ8DMO\u002BEGPMqviag3\u002BkZ\u002BZt8Yn0HPzLN/wDfh2gtYZzbnOVzjkOgmChLd52XddcVRX6vvflGa01sixDHMef/8ReHgD\u002BXy4W5TMHAAAAAElFTkSuQmCC", diff --git a/build_log.txt b/build_log.txt new file mode 100644 index 0000000..c31dc28 Binary files /dev/null and b/build_log.txt differ diff --git a/marking_gui/App.xaml.cs b/marking_gui/App.xaml.cs index 289ff5b..8231783 100644 --- a/marking_gui/App.xaml.cs +++ b/marking_gui/App.xaml.cs @@ -17,23 +17,8 @@ namespace marking_gui { base.OnStartup(e); - // 로그인 창이 닫힐 때 앱이 자동 종료되는 것을 방지하기 위해 ExplicitShutdown으로 설정 - ShutdownMode = ShutdownMode.OnExplicitShutdown; - - var loginWindow = new Housing.Login.StartupLoginWindow(); - if (loginWindow.ShowDialog() == true) - { - var loginResult = loginWindow.Result; - var mainWindow = new MainWindow(loginResult); - - // 메인 창이 닫힐 때 앱이 정상 종료되도록 기본 모드로 원복 - ShutdownMode = ShutdownMode.OnLastWindowClose; - mainWindow.Show(); - } - else - { - Shutdown(); - } + var mainWindow = new MainWindow(); + mainWindow.Show(); } } } diff --git a/marking_gui/MainWindow.xaml b/marking_gui/MainWindow.xaml index 18bbfd4..7af935a 100644 --- a/marking_gui/MainWindow.xaml +++ b/marking_gui/MainWindow.xaml @@ -7,7 +7,8 @@ mc:Ignorable="d" Title="양산형 테스트 기기 모니터링 시스템" Height="700" Width="900" MinWidth="900" MinHeight="700" WindowState="Maximized" - WindowStartupLocation="CenterScreen" Background="#F3F4F6"> + WindowStartupLocation="CenterScreen" Background="#F3F4F6" + ContentRendered="Window_ContentRendered"> + + + @@ -102,11 +135,13 @@ - + + - - + + +