diff --git a/.vs/marking_gui.slnx/FileContentIndex/0f300553-b2b1-487e-84ab-a8db20762c77.vsidx b/.vs/marking_gui.slnx/FileContentIndex/0f300553-b2b1-487e-84ab-a8db20762c77.vsidx deleted file mode 100644 index fff53dc..0000000 Binary files a/.vs/marking_gui.slnx/FileContentIndex/0f300553-b2b1-487e-84ab-a8db20762c77.vsidx and /dev/null differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/162264f1-2546-4ef0-9673-9650abefef99.vsidx b/.vs/marking_gui.slnx/FileContentIndex/162264f1-2546-4ef0-9673-9650abefef99.vsidx deleted file mode 100644 index 2b1fade..0000000 Binary files a/.vs/marking_gui.slnx/FileContentIndex/162264f1-2546-4ef0-9673-9650abefef99.vsidx and /dev/null differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/2b3efbed-7f8f-4cce-ac73-0752c9498731.vsidx b/.vs/marking_gui.slnx/FileContentIndex/2b3efbed-7f8f-4cce-ac73-0752c9498731.vsidx deleted file mode 100644 index c08741d..0000000 Binary files a/.vs/marking_gui.slnx/FileContentIndex/2b3efbed-7f8f-4cce-ac73-0752c9498731.vsidx and /dev/null differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/4e3dbeba-e08b-43de-be8a-fe9195aea94a.vsidx b/.vs/marking_gui.slnx/FileContentIndex/4e3dbeba-e08b-43de-be8a-fe9195aea94a.vsidx new file mode 100644 index 0000000..c403b3f Binary files /dev/null and b/.vs/marking_gui.slnx/FileContentIndex/4e3dbeba-e08b-43de-be8a-fe9195aea94a.vsidx differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/9a507dce-807b-4786-8496-a7266205d746.vsidx b/.vs/marking_gui.slnx/FileContentIndex/9a507dce-807b-4786-8496-a7266205d746.vsidx deleted file mode 100644 index 25722b2..0000000 Binary files a/.vs/marking_gui.slnx/FileContentIndex/9a507dce-807b-4786-8496-a7266205d746.vsidx and /dev/null differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/b2cdd851-fde6-4ff7-8960-15b7403933fa.vsidx b/.vs/marking_gui.slnx/FileContentIndex/b2cdd851-fde6-4ff7-8960-15b7403933fa.vsidx new file mode 100644 index 0000000..c403b3f Binary files /dev/null and b/.vs/marking_gui.slnx/FileContentIndex/b2cdd851-fde6-4ff7-8960-15b7403933fa.vsidx differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/b9adc68c-0602-473b-92e8-cab09444cfae.vsidx b/.vs/marking_gui.slnx/FileContentIndex/b9adc68c-0602-473b-92e8-cab09444cfae.vsidx new file mode 100644 index 0000000..c403b3f Binary files /dev/null and b/.vs/marking_gui.slnx/FileContentIndex/b9adc68c-0602-473b-92e8-cab09444cfae.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 new file mode 100644 index 0000000..9278940 Binary files /dev/null and b/.vs/marking_gui.slnx/FileContentIndex/dbd6c12d-68ab-4590-b0c7-f0747a0fdc95.vsidx 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 new file mode 100644 index 0000000..c403b3f Binary files /dev/null and b/.vs/marking_gui.slnx/FileContentIndex/e996ace7-7fba-4157-879f-74d3faae8720.vsidx differ diff --git a/.vs/marking_gui.slnx/FileContentIndex/fd87be81-02e0-4660-95e1-727749e9f7c2.vsidx b/.vs/marking_gui.slnx/FileContentIndex/fd87be81-02e0-4660-95e1-727749e9f7c2.vsidx deleted file mode 100644 index 7282c0c..0000000 Binary files a/.vs/marking_gui.slnx/FileContentIndex/fd87be81-02e0-4660-95e1-727749e9f7c2.vsidx and /dev/null differ diff --git a/.vs/marking_gui.slnx/v18/.suo b/.vs/marking_gui.slnx/v18/.suo index d9b9ea9..f632b7a 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 fa5131d..eb0aec2 100644 --- a/.vs/marking_gui.slnx/v18/DocumentLayout.backup.json +++ b/.vs/marking_gui.slnx/v18/DocumentLayout.backup.json @@ -1,13 +1,20 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\", + "WorkspaceRootPath": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\", "Documents": [ { - "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}", + "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}", "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\\COMPUTER1\\Desktop\\mobi\\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\\wjddn\\desktop\\amosense\\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}", "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}" } ], @@ -18,15 +25,40 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 2, "Children": [ + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "StartupLoginWindow.xaml", + "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", + "RelativeDocumentMoniker": "marking_gui\\StartupLoginWindow.xaml", + "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\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": "" + }, + { + "$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", + "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", + "RelativeToolTip": "..\\AMO_Housing\\MainWindow.xaml.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-06-08T00:52:55.21Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 0, "Title": "MainWindow.xaml", - "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml", + "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml", "RelativeDocumentMoniker": "marking_gui\\MainWindow.xaml", - "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml", + "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\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", @@ -34,11 +66,11 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 3, "Title": "MainWindow.xaml.cs", - "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml.cs", + "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml.cs", "RelativeDocumentMoniker": "marking_gui\\MainWindow.xaml.cs", - "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml.cs", + "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\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 fa5131d..eb0aec2 100644 --- a/.vs/marking_gui.slnx/v18/DocumentLayout.json +++ b/.vs/marking_gui.slnx/v18/DocumentLayout.json @@ -1,13 +1,20 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\", + "WorkspaceRootPath": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\", "Documents": [ { - "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}", + "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}", "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\\COMPUTER1\\Desktop\\mobi\\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\\wjddn\\desktop\\amosense\\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}", "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}" } ], @@ -18,15 +25,40 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 2, "Children": [ + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "StartupLoginWindow.xaml", + "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\StartupLoginWindow.xaml", + "RelativeDocumentMoniker": "marking_gui\\StartupLoginWindow.xaml", + "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\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": "" + }, + { + "$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", + "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\AMO_Housing\\MainWindow.xaml.cs", + "RelativeToolTip": "..\\AMO_Housing\\MainWindow.xaml.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-06-08T00:52:55.21Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 0, "Title": "MainWindow.xaml", - "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml", + "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml", "RelativeDocumentMoniker": "marking_gui\\MainWindow.xaml", - "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml", + "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\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", @@ -34,11 +66,11 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 3, "Title": "MainWindow.xaml.cs", - "DocumentMoniker": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml.cs", + "DocumentMoniker": "C:\\Users\\wjddn\\Desktop\\amosense\\marking_gui\\marking_gui\\MainWindow.xaml.cs", "RelativeDocumentMoniker": "marking_gui\\MainWindow.xaml.cs", - "ToolTip": "C:\\Users\\COMPUTER1\\Desktop\\mobi\\marking_gui\\marking_gui\\MainWindow.xaml.cs", + "ToolTip": "C:\\Users\\wjddn\\Desktop\\amosense\\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/marking_gui/App.xaml b/marking_gui/App.xaml index 6b26e8c..1a45965 100644 --- a/marking_gui/App.xaml +++ b/marking_gui/App.xaml @@ -3,6 +3,54 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:marking_gui"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/marking_gui/StartupLoginWindow.xaml b/marking_gui/StartupLoginWindow.xaml index e3efbfa..b5e7d02 100644 --- a/marking_gui/StartupLoginWindow.xaml +++ b/marking_gui/StartupLoginWindow.xaml @@ -1,138 +1,508 @@ + + Title="Marking HMI Login" + Width="760" + Height="760" + MinWidth="560" + MinHeight="620" + WindowStartupLocation="CenterScreen" + Background="{StaticResource HmiScreenBackgroundBrush}" + UseLayoutRounding="True" + SnapsToDevicePixels="True"> + - - + + - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - -