diff --git a/.vs/ProjectEvaluation/measurement_machine.metadata.v9.bin b/.vs/ProjectEvaluation/measurement_machine.metadata.v9.bin deleted file mode 100644 index 49c06cd..0000000 Binary files a/.vs/ProjectEvaluation/measurement_machine.metadata.v9.bin and /dev/null differ diff --git a/.vs/ProjectEvaluation/measurement_machine.projects.v9.bin b/.vs/ProjectEvaluation/measurement_machine.projects.v9.bin deleted file mode 100644 index 08548e6..0000000 Binary files a/.vs/ProjectEvaluation/measurement_machine.projects.v9.bin and /dev/null differ diff --git a/.vs/ProjectEvaluation/measurement_machine.strings.v9.bin b/.vs/ProjectEvaluation/measurement_machine.strings.v9.bin deleted file mode 100644 index 2745667..0000000 Binary files a/.vs/ProjectEvaluation/measurement_machine.strings.v9.bin and /dev/null differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 3171e6f..e8364bf 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -3,6 +3,6 @@ "", "\\measurement_machine" ], - "SelectedNode": "\\measurement_machine\\MainWindow.xaml", + "SelectedNode": "\\measurement_machine.sln", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/measurement_machine.slnx/FileContentIndex/3aa69213-037c-4f16-89d8-a460a46df3df.vsidx b/.vs/measurement_machine.slnx/FileContentIndex/3aa69213-037c-4f16-89d8-a460a46df3df.vsidx deleted file mode 100644 index ab2fb0b..0000000 Binary files a/.vs/measurement_machine.slnx/FileContentIndex/3aa69213-037c-4f16-89d8-a460a46df3df.vsidx and /dev/null differ diff --git a/.vs/measurement_machine.slnx/FileContentIndex/7a57c229-12c0-4b34-ab37-917b43b9fdf9.vsidx b/.vs/measurement_machine.slnx/FileContentIndex/7a57c229-12c0-4b34-ab37-917b43b9fdf9.vsidx new file mode 100644 index 0000000..c403b3f Binary files /dev/null and b/.vs/measurement_machine.slnx/FileContentIndex/7a57c229-12c0-4b34-ab37-917b43b9fdf9.vsidx differ diff --git a/.vs/measurement_machine.slnx/FileContentIndex/de14b12d-8bcf-4257-8ce5-1f2eb7d3a803.vsidx b/.vs/measurement_machine.slnx/FileContentIndex/de14b12d-8bcf-4257-8ce5-1f2eb7d3a803.vsidx new file mode 100644 index 0000000..f320e18 Binary files /dev/null and b/.vs/measurement_machine.slnx/FileContentIndex/de14b12d-8bcf-4257-8ce5-1f2eb7d3a803.vsidx differ diff --git a/.vs/measurement_machine.slnx/v18/.wsuo b/.vs/measurement_machine.slnx/v18/.wsuo index 7b6daa8..70e9b0b 100644 Binary files a/.vs/measurement_machine.slnx/v18/.wsuo and b/.vs/measurement_machine.slnx/v18/.wsuo differ diff --git a/.vs/measurement_machine.slnx/v18/DocumentLayout.backup.json b/.vs/measurement_machine.slnx/v18/DocumentLayout.backup.json new file mode 100644 index 0000000..4b47f4d --- /dev/null +++ b/.vs/measurement_machine.slnx/v18/DocumentLayout.backup.json @@ -0,0 +1,12 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [] + } + ] +} \ No newline at end of file diff --git a/.vs/measurement_machine.slnx/v18/DocumentLayout.json b/.vs/measurement_machine.slnx/v18/DocumentLayout.json index 4b47f4d..fbfc614 100644 --- a/.vs/measurement_machine.slnx/v18/DocumentLayout.json +++ b/.vs/measurement_machine.slnx/v18/DocumentLayout.json @@ -1,6 +1,6 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\", + "WorkspaceRootPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\", "Documents": [], "DocumentGroupContainers": [ { diff --git a/.vs/measurement_machine/CopilotIndices/18.3.511.5503/CodeChunks.db b/.vs/measurement_machine/CopilotIndices/18.3.511.5503/CodeChunks.db index 37de6cb..76cf651 100644 Binary files a/.vs/measurement_machine/CopilotIndices/18.3.511.5503/CodeChunks.db and b/.vs/measurement_machine/CopilotIndices/18.3.511.5503/CodeChunks.db differ diff --git a/.vs/measurement_machine/CopilotIndices/18.3.511.5503/SemanticSymbols.db b/.vs/measurement_machine/CopilotIndices/18.3.511.5503/SemanticSymbols.db index 04fe925..c273dc7 100644 Binary files a/.vs/measurement_machine/CopilotIndices/18.3.511.5503/SemanticSymbols.db and b/.vs/measurement_machine/CopilotIndices/18.3.511.5503/SemanticSymbols.db differ diff --git a/.vs/measurement_machine/DesignTimeBuild/.dtbcache.v2 b/.vs/measurement_machine/DesignTimeBuild/.dtbcache.v2 index 128dd7a..2616d61 100644 Binary files a/.vs/measurement_machine/DesignTimeBuild/.dtbcache.v2 and b/.vs/measurement_machine/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/measurement_machine/FileContentIndex/05d3ee53-f3cd-4cd2-bcce-7ace9550b90e.vsidx b/.vs/measurement_machine/FileContentIndex/05d3ee53-f3cd-4cd2-bcce-7ace9550b90e.vsidx new file mode 100644 index 0000000..da8998e Binary files /dev/null and b/.vs/measurement_machine/FileContentIndex/05d3ee53-f3cd-4cd2-bcce-7ace9550b90e.vsidx differ diff --git a/.vs/measurement_machine/FileContentIndex/a02fb6d6-c205-4607-b473-62e3ad485be6.vsidx b/.vs/measurement_machine/FileContentIndex/a02fb6d6-c205-4607-b473-62e3ad485be6.vsidx new file mode 100644 index 0000000..c403b3f Binary files /dev/null and b/.vs/measurement_machine/FileContentIndex/a02fb6d6-c205-4607-b473-62e3ad485be6.vsidx differ diff --git a/.vs/measurement_machine/FileContentIndex/cdb3af08-d936-4a28-bcd5-2b2c123200b6.vsidx b/.vs/measurement_machine/FileContentIndex/cdb3af08-d936-4a28-bcd5-2b2c123200b6.vsidx new file mode 100644 index 0000000..ea8f8d6 Binary files /dev/null and b/.vs/measurement_machine/FileContentIndex/cdb3af08-d936-4a28-bcd5-2b2c123200b6.vsidx differ diff --git a/.vs/measurement_machine/FileContentIndex/dc900abc-a79b-4671-860f-138945b53682.vsidx b/.vs/measurement_machine/FileContentIndex/dc900abc-a79b-4671-860f-138945b53682.vsidx deleted file mode 100644 index 2891823..0000000 Binary files a/.vs/measurement_machine/FileContentIndex/dc900abc-a79b-4671-860f-138945b53682.vsidx and /dev/null differ diff --git a/.vs/measurement_machine/FileContentIndex/fd8367d8-d06e-4b28-bc68-0f02faef4170.vsidx b/.vs/measurement_machine/FileContentIndex/fd8367d8-d06e-4b28-bc68-0f02faef4170.vsidx new file mode 100644 index 0000000..7fc456a Binary files /dev/null and b/.vs/measurement_machine/FileContentIndex/fd8367d8-d06e-4b28-bc68-0f02faef4170.vsidx differ diff --git a/.vs/measurement_machine/copilot-chat/d5ee0965/sessions/1c04782e-9b48-4fec-8b5c-41a63c31d220 b/.vs/measurement_machine/copilot-chat/d5ee0965/sessions/1c04782e-9b48-4fec-8b5c-41a63c31d220 new file mode 100644 index 0000000..f20f9b1 Binary files /dev/null and b/.vs/measurement_machine/copilot-chat/d5ee0965/sessions/1c04782e-9b48-4fec-8b5c-41a63c31d220 differ diff --git a/.vs/measurement_machine/copilot-chat/d5ee0965/sessions/3855087b-1afd-46c1-a47e-f9169d88b96f b/.vs/measurement_machine/copilot-chat/d5ee0965/sessions/3855087b-1afd-46c1-a47e-f9169d88b96f new file mode 100644 index 0000000..a7e6437 Binary files /dev/null and b/.vs/measurement_machine/copilot-chat/d5ee0965/sessions/3855087b-1afd-46c1-a47e-f9169d88b96f differ diff --git a/.vs/measurement_machine/v18/.futdcache.v2 b/.vs/measurement_machine/v18/.futdcache.v2 index e7c1a5a..758bf89 100644 Binary files a/.vs/measurement_machine/v18/.futdcache.v2 and b/.vs/measurement_machine/v18/.futdcache.v2 differ diff --git a/.vs/measurement_machine/v18/.suo b/.vs/measurement_machine/v18/.suo index 0751a13..8cf3c3e 100644 Binary files a/.vs/measurement_machine/v18/.suo and b/.vs/measurement_machine/v18/.suo differ diff --git a/.vs/measurement_machine/v18/DocumentLayout.backup.json b/.vs/measurement_machine/v18/DocumentLayout.backup.json index ae0df38..69a62dc 100644 --- a/.vs/measurement_machine/v18/DocumentLayout.backup.json +++ b/.vs/measurement_machine/v18/DocumentLayout.backup.json @@ -1,38 +1,38 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\", + "WorkspaceRootPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\excelxmlstorageservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\excelxmlstorageservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\persistencemodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\persistencemodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\persistencemodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\persistencemodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\service\\mitutoyoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\mitutoyoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\inspectionhistoryitem.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\inspectionhistoryitem.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\service\\inspectionservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\inspectionservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\service\\inspectionexcelservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\inspectionexcelservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\excelxmlstorageservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\excelxmlstorageservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\service\\serialdeviceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\serialdeviceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\service\\serialdeviceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\serialdeviceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -42,17 +42,17 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 5, "Children": [ { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "MainWindow.xaml.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", "RelativeDocumentMoniker": "measurement_machine\\MainWindow.xaml.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", - "RelativeToolTip": "measurement_machine\\MainWindow.xaml.cs", - "ViewState": "AgIAAOQDAAAAAAAAAAAAAPkDAAAnAAAAAAAAAA==", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs*", + "RelativeToolTip": "measurement_machine\\MainWindow.xaml.cs*", + "ViewState": "AgIAAMkAAAAAAAAAAAApwOQAAAA1AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2026-03-06T01:52:08.403Z", "IsPinned": true, @@ -60,93 +60,93 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 4, + "Title": "InspectionExcelService.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\Service\\InspectionExcelService.cs", + "RelativeDocumentMoniker": "measurement_machine\\Service\\InspectionExcelService.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\Service\\InspectionExcelService.cs", + "RelativeToolTip": "measurement_machine\\Service\\InspectionExcelService.cs", + "ViewState": "AgIAACgAAAAAAAAAAAAiwFEAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-03-07T18:47:12.051Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "InspectionHistoryItem.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\InspectionHistoryItem.cs", + "RelativeDocumentMoniker": "measurement_machine\\InspectionHistoryItem.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\InspectionHistoryItem.cs", + "RelativeToolTip": "measurement_machine\\InspectionHistoryItem.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-03-07T18:45:56.595Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "measurement_machine", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "RelativeDocumentMoniker": "measurement_machine\\measurement_machine.csproj", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "RelativeToolTip": "measurement_machine\\measurement_machine.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAABCAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2026-03-07T18:07:15.623Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, "Title": "MainWindow.xaml", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\MainWindow.xaml", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml", "RelativeDocumentMoniker": "measurement_machine\\MainWindow.xaml", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\MainWindow.xaml*", - "RelativeToolTip": "measurement_machine\\MainWindow.xaml*", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml", + "RelativeToolTip": "measurement_machine\\MainWindow.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "WhenOpened": "2026-03-06T01:52:08.165Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 0, "Title": "ExcelXmlStorageService.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\ExcelXmlStorageService.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\ExcelXmlStorageService.cs", "RelativeDocumentMoniker": "measurement_machine\\ExcelXmlStorageService.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\ExcelXmlStorageService.cs", - "RelativeToolTip": "measurement_machine\\ExcelXmlStorageService.cs", - "ViewState": "AgIAAMQAAAAAAAAAAAAAAOcAAAABAAAAAAAAAA==", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\ExcelXmlStorageService.cs*", + "RelativeToolTip": "measurement_machine\\ExcelXmlStorageService.cs*", + "ViewState": "AgIAAAAAAAAAAAAAAAAAACAAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2026-03-06T07:45:07.587Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "PersistenceModel.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\PersistenceModel.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\PersistenceModel.cs", "RelativeDocumentMoniker": "measurement_machine\\PersistenceModel.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\PersistenceModel.cs", - "RelativeToolTip": "measurement_machine\\PersistenceModel.cs", - "ViewState": "AgIAAA4AAAAAAAAAAAAuwDEAAAABAAAAAAAAAA==", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\PersistenceModel.cs*", + "RelativeToolTip": "measurement_machine\\PersistenceModel.cs*", + "ViewState": "AgIAAAAAAAAAAAAAAAAiwCgAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2026-03-06T07:44:44.102Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 7, "Title": "SerialDeviceService.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\SerialDeviceService.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\Service\\SerialDeviceService.cs", "RelativeDocumentMoniker": "measurement_machine\\Service\\SerialDeviceService.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\SerialDeviceService.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\Service\\SerialDeviceService.cs", "RelativeToolTip": "measurement_machine\\Service\\SerialDeviceService.cs", - "ViewState": "AgIAAFIAAAAAAAAAAAAAAHUAAAABAAAAAAAAAA==", + "ViewState": "AgIAAE4AAAAAAAAAAAAmwHUAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2026-03-06T04:50:06.535Z", "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 7, - "Title": "measurement_machine", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\measurement_machine.csproj", - "RelativeDocumentMoniker": "measurement_machine\\measurement_machine.csproj", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\measurement_machine.csproj", - "RelativeToolTip": "measurement_machine\\measurement_machine.csproj", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2026-03-06T02:36:25.215Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, - "Title": "MitutoyoService.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\MitutoyoService.cs", - "RelativeDocumentMoniker": "measurement_machine\\Service\\MitutoyoService.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\MitutoyoService.cs", - "RelativeToolTip": "measurement_machine\\Service\\MitutoyoService.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2026-03-06T04:50:36.844Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "InspectionService.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\InspectionService.cs", - "RelativeDocumentMoniker": "measurement_machine\\Service\\InspectionService.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\InspectionService.cs", - "RelativeToolTip": "measurement_machine\\Service\\InspectionService.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2026-03-06T04:50:45.32Z", - "EditorCaption": "" } ] } diff --git a/.vs/measurement_machine/v18/DocumentLayout.json b/.vs/measurement_machine/v18/DocumentLayout.json index 5c7f64c..0150166 100644 --- a/.vs/measurement_machine/v18/DocumentLayout.json +++ b/.vs/measurement_machine/v18/DocumentLayout.json @@ -1,38 +1,38 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\", + "WorkspaceRootPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\excelxmlstorageservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\excelxmlstorageservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\persistencemodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\persistencemodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\persistencemodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\persistencemodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\mainwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\service\\mitutoyoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\mitutoyoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\inspectionhistoryitem.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\inspectionhistoryitem.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\service\\inspectionservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\inspectionservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\service\\inspectionexcelservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\inspectionexcelservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\excelxmlstorageservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\excelxmlstorageservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\service\\serialdeviceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\serialdeviceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { - "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\temp\\desktop\\measurment_machine\\measurement_machine\\measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", - "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + "AbsoluteMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|c:\\users\\guseo\\desktop\\measurement_machine\\measurement_machine\\service\\serialdeviceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5C022D76-A875-4D2C-8133-1B7715D84C23}|measurement_machine\\measurement_machine.csproj|solutionrelative:measurement_machine\\service\\serialdeviceservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -42,17 +42,17 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 4, "Children": [ { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "MainWindow.xaml.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", "RelativeDocumentMoniker": "measurement_machine\\MainWindow.xaml.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", "RelativeToolTip": "measurement_machine\\MainWindow.xaml.cs", - "ViewState": "AgIAAOQDAAAAAAAAAAAAAPkDAAAnAAAAAAAAAA==", + "ViewState": "AgIAAMkAAAAAAAAAAAApwOQAAAA1AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2026-03-06T01:52:08.403Z", "IsPinned": true, @@ -60,11 +60,37 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 3, + "Title": "InspectionHistoryItem.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\InspectionHistoryItem.cs", + "RelativeDocumentMoniker": "measurement_machine\\InspectionHistoryItem.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\InspectionHistoryItem.cs", + "RelativeToolTip": "measurement_machine\\InspectionHistoryItem.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-03-07T18:45:56.595Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "measurement_machine", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "RelativeDocumentMoniker": "measurement_machine\\measurement_machine.csproj", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "RelativeToolTip": "measurement_machine\\measurement_machine.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAABCAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2026-03-07T18:07:15.623Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, "Title": "MainWindow.xaml", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\MainWindow.xaml", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml", "RelativeDocumentMoniker": "measurement_machine\\MainWindow.xaml", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\MainWindow.xaml", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml", "RelativeToolTip": "measurement_machine\\MainWindow.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "WhenOpened": "2026-03-06T01:52:08.165Z", @@ -72,81 +98,55 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 0, "Title": "ExcelXmlStorageService.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\ExcelXmlStorageService.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\ExcelXmlStorageService.cs", "RelativeDocumentMoniker": "measurement_machine\\ExcelXmlStorageService.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\ExcelXmlStorageService.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\ExcelXmlStorageService.cs", "RelativeToolTip": "measurement_machine\\ExcelXmlStorageService.cs", - "ViewState": "AgIAAMQAAAAAAAAAAAAAAOcAAAABAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAACAAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2026-03-06T07:45:07.587Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 4, + "Title": "InspectionExcelService.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\Service\\InspectionExcelService.cs", + "RelativeDocumentMoniker": "measurement_machine\\Service\\InspectionExcelService.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\Service\\InspectionExcelService.cs", + "RelativeToolTip": "measurement_machine\\Service\\InspectionExcelService.cs", + "ViewState": "AgIAACgAAAAAAAAAAAAiwFEAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-03-07T18:47:12.051Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, "Title": "PersistenceModel.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\PersistenceModel.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\PersistenceModel.cs", "RelativeDocumentMoniker": "measurement_machine\\PersistenceModel.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\PersistenceModel.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\PersistenceModel.cs", "RelativeToolTip": "measurement_machine\\PersistenceModel.cs", - "ViewState": "AgIAAA4AAAAAAAAAAAAuwDEAAAABAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAiwCgAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2026-03-06T07:44:44.102Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 7, "Title": "SerialDeviceService.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\SerialDeviceService.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\Service\\SerialDeviceService.cs", "RelativeDocumentMoniker": "measurement_machine\\Service\\SerialDeviceService.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\SerialDeviceService.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\Service\\SerialDeviceService.cs", "RelativeToolTip": "measurement_machine\\Service\\SerialDeviceService.cs", - "ViewState": "AgIAAFIAAAAAAAAAAAAAAHUAAAABAAAAAAAAAA==", + "ViewState": "AgIAAE4AAAAAAAAAAAAmwHUAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2026-03-06T04:50:06.535Z", "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 7, - "Title": "measurement_machine", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\measurement_machine.csproj", - "RelativeDocumentMoniker": "measurement_machine\\measurement_machine.csproj", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\measurement_machine.csproj", - "RelativeToolTip": "measurement_machine\\measurement_machine.csproj", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2026-03-06T02:36:25.215Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, - "Title": "MitutoyoService.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\MitutoyoService.cs", - "RelativeDocumentMoniker": "measurement_machine\\Service\\MitutoyoService.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\MitutoyoService.cs", - "RelativeToolTip": "measurement_machine\\Service\\MitutoyoService.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2026-03-06T04:50:36.844Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "InspectionService.cs", - "DocumentMoniker": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\InspectionService.cs", - "RelativeDocumentMoniker": "measurement_machine\\Service\\InspectionService.cs", - "ToolTip": "C:\\Users\\temp\\Desktop\\measurment_machine\\measurement_machine\\measurement_machine\\Service\\InspectionService.cs", - "RelativeToolTip": "measurement_machine\\Service\\InspectionService.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2026-03-06T04:50:45.32Z", - "EditorCaption": "" } ] } diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index bf53b9d..490a37a 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/1B4B5B66A0DBCBB2CB00D5511949115C b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/1B4B5B66A0DBCBB2CB00D5511949115C new file mode 100644 index 0000000..1feddb3 --- /dev/null +++ b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/1B4B5B66A0DBCBB2CB00D5511949115C @@ -0,0 +1,25 @@ + + + + WinExe + net8.0-windows + enable + enable + true + + + + + + + + + + Never + + + Never + + + + diff --git a/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/22CA0118911B1621753C3C543D885449 b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/22CA0118911B1621753C3C543D885449 new file mode 100644 index 0000000..52645ab --- /dev/null +++ b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/22CA0118911B1621753C3C543D885449 @@ -0,0 +1,29 @@ + + + + WinExe + net8.0-windows + enable + enable + true + + + + + + + + + + + + + + Never + + + Never + + + + diff --git a/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/56E5EBCF7FA869744A9C6D71875214C4 b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/56E5EBCF7FA869744A9C6D71875214C4 new file mode 100644 index 0000000..1feddb3 --- /dev/null +++ b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/56E5EBCF7FA869744A9C6D71875214C4 @@ -0,0 +1,25 @@ + + + + WinExe + net8.0-windows + enable + enable + true + + + + + + + + + + Never + + + Never + + + + diff --git a/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/65BD20E167047923D1110EB46BCE6657 b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/65BD20E167047923D1110EB46BCE6657 new file mode 100644 index 0000000..2dc494a --- /dev/null +++ b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/65BD20E167047923D1110EB46BCE6657 @@ -0,0 +1,29 @@ + + + + WinExe + net8.0-windows + enable + enable + true + + + + + + + + + + + + + + Never + + + Never + + + + diff --git a/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/CE9CB4E3361CC135E40EA50F44D481DA b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/CE9CB4E3361CC135E40EA50F44D481DA new file mode 100644 index 0000000..14c4c01 --- /dev/null +++ b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/CE9CB4E3361CC135E40EA50F44D481DA @@ -0,0 +1,29 @@ + + + + WinExe + net8.0-windows + enable + enable + true + + + + + + + + + + + + + + Never + + + Never + + + + diff --git a/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/E7BE507F2DFBEDC9FFE15A7EDB04BDA7 b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/E7BE507F2DFBEDC9FFE15A7EDB04BDA7 new file mode 100644 index 0000000..2dc494a --- /dev/null +++ b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/E7BE507F2DFBEDC9FFE15A7EDB04BDA7 @@ -0,0 +1,29 @@ + + + + WinExe + net8.0-windows + enable + enable + true + + + + + + + + + + + + + + Never + + + Never + + + + diff --git a/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/F9FCB2550EDAA81D1A324E64BC9D96EA b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/F9FCB2550EDAA81D1A324E64BC9D96EA new file mode 100644 index 0000000..14c4c01 --- /dev/null +++ b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/0CB8C0DA40273B4889AAFCA5D8F3C732/F9FCB2550EDAA81D1A324E64BC9D96EA @@ -0,0 +1,29 @@ + + + + WinExe + net8.0-windows + enable + enable + true + + + + + + + + + + + + + + Never + + + Never + + + + diff --git a/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/state.mpack b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/state.mpack new file mode 100644 index 0000000..37545e6 Binary files /dev/null and b/measurement_machine/.vs/CopilotSnapshots/7E5E72466E5E824E96B7334AC190756C/state.mpack differ diff --git a/measurement_machine/.vs/VSWorkspaceState.json b/measurement_machine/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..0ef1ead --- /dev/null +++ b/measurement_machine/.vs/VSWorkspaceState.json @@ -0,0 +1,8 @@ +{ + "ExpandedNodes": [ + "", + "\\Service" + ], + "SelectedNode": "\\MainWindow.xaml.cs", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/measurement_machine/.vs/measurement_machine.slnx/FileContentIndex/1dbfaef2-0106-4cad-80f1-9b5e9bbae1b6.vsidx b/measurement_machine/.vs/measurement_machine.slnx/FileContentIndex/1dbfaef2-0106-4cad-80f1-9b5e9bbae1b6.vsidx new file mode 100644 index 0000000..2949502 Binary files /dev/null and b/measurement_machine/.vs/measurement_machine.slnx/FileContentIndex/1dbfaef2-0106-4cad-80f1-9b5e9bbae1b6.vsidx differ diff --git a/measurement_machine/.vs/measurement_machine.slnx/FileContentIndex/38ce4d46-4904-42c9-a621-e5b2818c29cf.vsidx b/measurement_machine/.vs/measurement_machine.slnx/FileContentIndex/38ce4d46-4904-42c9-a621-e5b2818c29cf.vsidx new file mode 100644 index 0000000..7ade287 Binary files /dev/null and b/measurement_machine/.vs/measurement_machine.slnx/FileContentIndex/38ce4d46-4904-42c9-a621-e5b2818c29cf.vsidx differ diff --git a/measurement_machine/.vs/measurement_machine.slnx/copilot-chat/d5ee0965/sessions/46725e7e-5e6e-4e82-96b7-334ac190756c b/measurement_machine/.vs/measurement_machine.slnx/copilot-chat/d5ee0965/sessions/46725e7e-5e6e-4e82-96b7-334ac190756c new file mode 100644 index 0000000..2f437db Binary files /dev/null and b/measurement_machine/.vs/measurement_machine.slnx/copilot-chat/d5ee0965/sessions/46725e7e-5e6e-4e82-96b7-334ac190756c differ diff --git a/measurement_machine/.vs/measurement_machine.slnx/v18/.wsuo b/measurement_machine/.vs/measurement_machine.slnx/v18/.wsuo new file mode 100644 index 0000000..da1c767 Binary files /dev/null and b/measurement_machine/.vs/measurement_machine.slnx/v18/.wsuo differ diff --git a/measurement_machine/.vs/measurement_machine.slnx/v18/DocumentLayout.backup.json b/measurement_machine/.vs/measurement_machine.slnx/v18/DocumentLayout.backup.json new file mode 100644 index 0000000..3ee8f6a --- /dev/null +++ b/measurement_machine/.vs/measurement_machine.slnx/v18/DocumentLayout.backup.json @@ -0,0 +1,37 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:MainWindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 0, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "MainWindow.xaml.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", + "RelativeDocumentMoniker": "MainWindow.xaml.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", + "RelativeToolTip": "MainWindow.xaml.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-03-07T17:06:44.11Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/measurement_machine/.vs/measurement_machine.slnx/v18/DocumentLayout.json b/measurement_machine/.vs/measurement_machine.slnx/v18/DocumentLayout.json new file mode 100644 index 0000000..bd0f887 --- /dev/null +++ b/measurement_machine/.vs/measurement_machine.slnx/v18/DocumentLayout.json @@ -0,0 +1,54 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:MainWindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:measurement_machine.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 1, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "measurement_machine.csproj", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "RelativeDocumentMoniker": "measurement_machine.csproj", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "RelativeToolTip": "measurement_machine.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2026-03-07T17:11:43.714Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "MainWindow.xaml.cs", + "DocumentMoniker": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", + "RelativeDocumentMoniker": "MainWindow.xaml.cs", + "ToolTip": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\MainWindow.xaml.cs", + "RelativeToolTip": "MainWindow.xaml.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAiAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2026-03-07T17:06:44.11Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/measurement_machine/.vs/measurement_machine/CopilotIndices/18.4.89.4080/CodeChunks.db b/measurement_machine/.vs/measurement_machine/CopilotIndices/18.4.89.4080/CodeChunks.db new file mode 100644 index 0000000..f7203fd Binary files /dev/null and b/measurement_machine/.vs/measurement_machine/CopilotIndices/18.4.89.4080/CodeChunks.db differ diff --git a/measurement_machine/.vs/measurement_machine/CopilotIndices/18.4.89.4080/SemanticSymbols.db b/measurement_machine/.vs/measurement_machine/CopilotIndices/18.4.89.4080/SemanticSymbols.db new file mode 100644 index 0000000..bd038ec Binary files /dev/null and b/measurement_machine/.vs/measurement_machine/CopilotIndices/18.4.89.4080/SemanticSymbols.db differ diff --git a/measurement_machine/.vs/slnx.sqlite b/measurement_machine/.vs/slnx.sqlite new file mode 100644 index 0000000..383b9b0 Binary files /dev/null and b/measurement_machine/.vs/slnx.sqlite differ diff --git a/measurement_machine/ExcelXmlStorageService.cs b/measurement_machine/ExcelXmlStorageService.cs index 4db13f6..4af6280 100644 --- a/measurement_machine/ExcelXmlStorageService.cs +++ b/measurement_machine/ExcelXmlStorageService.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Globalization; using System.IO; -using System.Linq; -using System.Security; -using System.Xml.Linq; +using System.Xml.Serialization; namespace measurement_machine { @@ -12,69 +8,16 @@ namespace measurement_machine { public static void Save(InspectionConfigModel model, string filePath) { - Directory.CreateDirectory(Path.GetDirectoryName(filePath)!); + if (model == null) + throw new ArgumentNullException(nameof(model)); - XNamespace ss = "urn:schemas-microsoft-com:office:spreadsheet"; + string? dir = Path.GetDirectoryName(filePath); + if (!string.IsNullOrWhiteSpace(dir)) + Directory.CreateDirectory(dir); - var workbook = - new XElement("Workbook", - new XAttribute(XNamespace.Xmlns + "ss", ss), - - new XElement("Worksheet", - new XAttribute(ss + "Name", "Settings"), - new XElement("Table", - Row(ss, "Section", "Key", "Value"), - Row(ss, "Controller", "PortName", model.ControllerPortName), - Row(ss, "Controller", "BaudRate", model.ControllerBaudRate.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Controller", "StartCommand", model.ControllerStartCommand), - Row(ss, "Controller", "StopCommand", model.ControllerStopCommand), - - Row(ss, "Left", "PortName", model.LeftPortName), - Row(ss, "Left", "BaudRate", model.LeftBaudRate.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Left", "ReadCommand", model.LeftReadCommand), - - Row(ss, "Right", "PortName", model.RightPortName), - Row(ss, "Right", "BaudRate", model.RightBaudRate.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Right", "ReadCommand", model.RightReadCommand), - - Row(ss, "Spec", "LeftMinSpec", model.LeftMinSpec.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Spec", "LeftMaxSpec", model.LeftMaxSpec.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Spec", "RightMinSpec", model.RightMinSpec.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Spec", "RightMaxSpec", model.RightMaxSpec.ToString(CultureInfo.InvariantCulture)), - - Row(ss, "Timing", "RelayIdleMs", model.RelayIdleMs.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Timing", "MeasurementTimeoutMs", model.MeasurementTimeoutMs.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Timing", "ResultHoldMs", model.ResultHoldMs.ToString(CultureInfo.InvariantCulture)), - - Row(ss, "Count", "OkCount", model.OkCount.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Count", "NgCount", model.NgCount.ToString(CultureInfo.InvariantCulture)), - Row(ss, "Count", "TotalCount", model.TotalCount.ToString(CultureInfo.InvariantCulture)), - - Row(ss, "Persistence", "SaveFilePath", model.SaveFilePath) - ) - ), - - new XElement("Worksheet", - new XAttribute(ss + "Name", "History"), - new XElement("Table", - Row(ss, "Timestamp", "LeftValue", "RightValue", "Result", "Reason", "ElapsedMs", "LeftRaw", "RightRaw"), - (model.History ?? new List()) - .Select(x => Row( - ss, - x.Timestamp.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture), - x.LeftValue?.ToString(CultureInfo.InvariantCulture) ?? "", - x.RightValue?.ToString(CultureInfo.InvariantCulture) ?? "", - x.Result, - x.Reason, - x.ElapsedMs.ToString(CultureInfo.InvariantCulture), - x.LeftRaw, - x.RightRaw)) - ) - ) - ); - - var doc = new XDocument(new XDeclaration("1.0", "utf-8", "yes"), workbook); - doc.Save(filePath); + var serializer = new XmlSerializer(typeof(InspectionConfigModel)); + using var fs = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None); + serializer.Serialize(fs, model); } public static InspectionConfigModel? Load(string filePath) @@ -82,151 +25,9 @@ namespace measurement_machine if (!File.Exists(filePath)) return null; - var doc = XDocument.Load(filePath); - XNamespace ss = "urn:schemas-microsoft-com:office:spreadsheet"; - - var model = new InspectionConfigModel(); - - var worksheets = doc.Descendants("Worksheet").ToList(); - var settingsSheet = worksheets.FirstOrDefault(x => (string?)x.Attribute(ss + "Name") == "Settings"); - var historySheet = worksheets.FirstOrDefault(x => (string?)x.Attribute(ss + "Name") == "History"); - - if (settingsSheet != null) - { - var rows = settingsSheet.Descendants("Row").Skip(1).ToList(); - - foreach (var row in rows) - { - var cells = row.Descendants("Cell") - .Select(c => c.Descendants("Data").FirstOrDefault()?.Value ?? "") - .ToList(); - - if (cells.Count < 3) - continue; - - string section = cells[0]; - string key = cells[1]; - string value = cells[2]; - - ApplySetting(model, section, key, value); - } - } - - if (historySheet != null) - { - var rows = historySheet.Descendants("Row").Skip(1).ToList(); - - foreach (var row in rows) - { - var cells = row.Descendants("Cell") - .Select(c => c.Descendants("Data").FirstOrDefault()?.Value ?? "") - .ToList(); - - if (cells.Count < 8) - continue; - - model.History.Add(new InspectionHistoryItem - { - Timestamp = DateTime.TryParse(cells[0], out var dt) ? dt : DateTime.MinValue, - LeftValue = TryParseNullableDouble(cells[1]), - RightValue = TryParseNullableDouble(cells[2]), - Result = cells[3], - Reason = cells[4], - ElapsedMs = int.TryParse(cells[5], out var ms) ? ms : 0, - LeftRaw = cells[6], - RightRaw = cells[7] - }); - } - } - - return model; - } - - private static void ApplySetting(InspectionConfigModel model, string section, string key, string value) - { - switch (section) - { - case "Controller": - if (key == "PortName") model.ControllerPortName = value; - else if (key == "BaudRate") model.ControllerBaudRate = ParseInt(value, 9600); - else if (key == "StartCommand") model.ControllerStartCommand = value; - else if (key == "StopCommand") model.ControllerStopCommand = value; - break; - - case "Left": - if (key == "PortName") model.LeftPortName = value; - else if (key == "BaudRate") model.LeftBaudRate = ParseInt(value, 9600); - else if (key == "ReadCommand") model.LeftReadCommand = value; - break; - - case "Right": - if (key == "PortName") model.RightPortName = value; - else if (key == "BaudRate") model.RightBaudRate = ParseInt(value, 9600); - else if (key == "ReadCommand") model.RightReadCommand = value; - break; - - case "Spec": - if (key == "LeftMinSpec") model.LeftMinSpec = ParseDouble(value, 0); - else if (key == "LeftMaxSpec") model.LeftMaxSpec = ParseDouble(value, 100); - else if (key == "RightMinSpec") model.RightMinSpec = ParseDouble(value, 0); - else if (key == "RightMaxSpec") model.RightMaxSpec = ParseDouble(value, 100); - break; - - case "Timing": - if (key == "RelayIdleMs") model.RelayIdleMs = ParseInt(value, 100); - else if (key == "MeasurementTimeoutMs") model.MeasurementTimeoutMs = ParseInt(value, 1000); - else if (key == "ResultHoldMs") model.ResultHoldMs = ParseInt(value, 100); - break; - - case "Count": - if (key == "OkCount") model.OkCount = ParseInt(value, 0); - else if (key == "NgCount") model.NgCount = ParseInt(value, 0); - else if (key == "TotalCount") model.TotalCount = ParseInt(value, 0); - break; - - case "Persistence": - if (key == "SaveFilePath") model.SaveFilePath = value; - break; - } - } - - private static XElement Row(XNamespace ss, params string[] values) - { - return new XElement("Row", - values.Select(v => - new XElement("Cell", - new XElement("Data", - new XAttribute(ss + "Type", "String"), - Escape(v))))); - } - - private static string Escape(string text) - { - return SecurityElement.Escape(text) ?? ""; - } - - private static int ParseInt(string text, int fallback) - { - return int.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out var value) - ? value - : fallback; - } - - private static double ParseDouble(string text, double fallback) - { - return double.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out var value) - ? value - : fallback; - } - - private static double? TryParseNullableDouble(string text) - { - if (string.IsNullOrWhiteSpace(text)) - return null; - - return double.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out var value) - ? value - : null; + var serializer = new XmlSerializer(typeof(InspectionConfigModel)); + using var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read); + return serializer.Deserialize(fs) as InspectionConfigModel; } } } \ No newline at end of file diff --git a/measurement_machine/InspectionHistoryItem.cs b/measurement_machine/InspectionHistoryItem.cs new file mode 100644 index 0000000..cfcb594 --- /dev/null +++ b/measurement_machine/InspectionHistoryItem.cs @@ -0,0 +1,13 @@ +using System; + +namespace measurement_machine +{ + public sealed class InspectionHistoryItem + { + public DateTime Timestamp { get; set; } = DateTime.Now; + public double? LeftValue { get; set; } + public double? RightValue { get; set; } + public string Result { get; set; } = ""; + public string Reason { get; set; } = ""; + } +} \ No newline at end of file diff --git a/measurement_machine/MainWindow.xaml.cs b/measurement_machine/MainWindow.xaml.cs index 0793470..d643d5b 100644 --- a/measurement_machine/MainWindow.xaml.cs +++ b/measurement_machine/MainWindow.xaml.cs @@ -13,25 +13,8 @@ namespace measurement_machine { public partial class MainWindow : Window { - private enum InspectionState - { - Idle, - WaitingRelay, - TriggeringMeasurement, - WaitingMeasurement, - Judging, - ResultHold, - Error - } - - private readonly DispatcherTimer _timer = new(); - private readonly DispatcherTimer _stateTimer = new(); - - private DateTime _startTime; - private DateTime _stateEnteredAt; - private DateTime _cycleStartedAt; - - private bool _isInspecting; + private readonly DispatcherTimer _clockTimer = new(); + private readonly DispatcherTimer _inspectionLoopTimer = new(); private readonly SerialDeviceService _controllerSerialService = new(); private readonly SerialDeviceService _leftSerialService = new(); @@ -39,6 +22,10 @@ namespace measurement_machine private readonly List _baudRates = new() { 9600, 115200 }; + private DateTime _startTime; + private bool _isInspecting; + private bool _cycleInProgress; + private string _controllerPortName = ""; private int _controllerBaudRate = 9600; private string _controllerStartCommand = ""; @@ -59,27 +46,28 @@ namespace measurement_machine private int _relayIdleMs = 100; private int _measurementTimeoutMs = 1000; - private int _resultHoldMs = 100; + private int _resultHoldMs = 1000; + private string _savePath = measurement_machine.Service.InspectionExcelService.GetRootFolder(); private int _okCount; private int _ngCount; private int _totalCount; - private string _lastLeftRaw = ""; - private string _lastRightRaw = ""; - - private bool _leftReceived; - private bool _rightReceived; - - private double? _lastLeftValue; - private double? _lastRightValue; + private double? _leftValue; + private double? _rightValue; - private string _saveFilePath = - Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data", "inspection_settings.xml"); - - private InspectionState _inspectionState = InspectionState.Idle; + private string SettingsFilePath + { + get + { + string rootPath = string.IsNullOrWhiteSpace(_savePath) + ? measurement_machine.Service.InspectionExcelService.GetRootFolder() + : _savePath; - private readonly List _history = new(); + string metadataFolder = Path.Combine(rootPath, "MEADATA"); + return Path.Combine(metadataFolder, "inspection_settings.xml"); + } + } public MainWindow() { @@ -87,16 +75,12 @@ namespace measurement_machine _startTime = DateTime.Now; - _timer.Interval = TimeSpan.FromSeconds(1); - _timer.Tick += Timer_Tick; - _timer.Start(); + _clockTimer.Interval = TimeSpan.FromSeconds(1); + _clockTimer.Tick += ClockTimer_Tick; + _clockTimer.Start(); - _stateTimer.Interval = TimeSpan.FromMilliseconds(50); - _stateTimer.Tick += StateTimer_Tick; - _stateTimer.Start(); - - InitializeSettingUi(); - RefreshAvailablePorts(); + _inspectionLoopTimer.Interval = TimeSpan.FromMilliseconds(300); + _inspectionLoopTimer.Tick += InspectionLoopTimer_Tick; _leftSerialService.DataReceived += OnLeftSerialDataReceived; _rightSerialService.DataReceived += OnRightSerialDataReceived; @@ -105,8 +89,10 @@ namespace measurement_machine _leftSerialService.ErrorOccurred += OnSerialErrorOccurred; _rightSerialService.ErrorOccurred += OnSerialErrorOccurred; - ShowSettingsTab("CONTROLLER"); + InitializeSettingUi(); + RefreshAvailablePorts(); LoadSavedConfiguration(); + ShowSettingsTab("CONTROLLER"); SetIdleUi(); } @@ -132,8 +118,8 @@ namespace measurement_machine RelayIdleTextBox.Text = "100"; MeasurementTimeoutTextBox.Text = "1000"; - ResultHoldTextBox.Text = "100"; - SavePathTextBox.Text = _saveFilePath; + ResultHoldTextBox.Text = "1000"; + SavePathTextBox.Text = measurement_machine.Service.InspectionExcelService.GetRootFolder(); UserConfigStatusTextBlock.Text = "---"; SettingsStatusTextBlock.Text = "---"; @@ -143,7 +129,7 @@ namespace measurement_machine { try { - var loaded = ExcelXmlStorageService.Load(_saveFilePath); + var loaded = ExcelXmlStorageService.Load(SettingsFilePath); if (loaded == null) return; @@ -168,19 +154,12 @@ namespace measurement_machine _relayIdleMs = loaded.RelayIdleMs; _measurementTimeoutMs = loaded.MeasurementTimeoutMs; _resultHoldMs = loaded.ResultHoldMs; + _savePath = loaded.SaveFilePath ?? ""; _okCount = loaded.OkCount; _ngCount = loaded.NgCount; _totalCount = loaded.TotalCount; - _saveFilePath = string.IsNullOrWhiteSpace(loaded.SaveFilePath) - ? _saveFilePath - : loaded.SaveFilePath; - - _history.Clear(); - if (loaded.History != null) - _history.AddRange(loaded.History); - ApplyConfigToUi(); UpdateCountUi(); @@ -188,7 +167,7 @@ namespace measurement_machine } catch (Exception ex) { - Debug.WriteLine($"[LOAD CONFIG ERROR] {ex.Message}"); + Debug.WriteLine($"[LOAD ERROR] {ex.Message}"); SettingsStatusTextBlock.Text = "저장된 설정 불러오기 실패"; } } @@ -197,14 +176,9 @@ namespace measurement_machine { RefreshAvailablePorts(); - if (!string.IsNullOrWhiteSpace(_controllerPortName)) - ControllerPortComboBox.SelectedItem = _controllerPortName; - - if (!string.IsNullOrWhiteSpace(_leftPortName)) - LeftPortComboBox.SelectedItem = _leftPortName; - - if (!string.IsNullOrWhiteSpace(_rightPortName)) - RightPortComboBox.SelectedItem = _rightPortName; + ControllerPortComboBox.SelectedItem = _controllerPortName; + LeftPortComboBox.SelectedItem = _leftPortName; + RightPortComboBox.SelectedItem = _rightPortName; ControllerBaudComboBox.SelectedItem = _controllerBaudRate; LeftBaudComboBox.SelectedItem = _leftBaudRate; @@ -220,10 +194,12 @@ namespace measurement_machine RightMinSpecTextBox.Text = _rightMinSpec.ToString("F2", CultureInfo.InvariantCulture); RightMaxSpecTextBox.Text = _rightMaxSpec.ToString("F2", CultureInfo.InvariantCulture); - RelayIdleTextBox.Text = _relayIdleMs.ToString(CultureInfo.InvariantCulture); - MeasurementTimeoutTextBox.Text = _measurementTimeoutMs.ToString(CultureInfo.InvariantCulture); - ResultHoldTextBox.Text = _resultHoldMs.ToString(CultureInfo.InvariantCulture); - SavePathTextBox.Text = _saveFilePath; + RelayIdleTextBox.Text = _relayIdleMs.ToString(); + MeasurementTimeoutTextBox.Text = _measurementTimeoutMs.ToString(); + ResultHoldTextBox.Text = _resultHoldMs.ToString(); + SavePathTextBox.Text = string.IsNullOrWhiteSpace(_savePath) + ? measurement_machine.Service.InspectionExcelService.GetRootFolder() + : _savePath; UserConfigStatusTextBlock.Text = $"Left: {_leftMinSpec:F2} ~ {_leftMaxSpec:F2} mm\n" + @@ -231,12 +207,12 @@ namespace measurement_machine $"Relay: {_relayIdleMs} ms\n" + $"Timeout: {_measurementTimeoutMs} ms\n" + $"Hold: {_resultHoldMs} ms"; + + _inspectionLoopTimer.Interval = TimeSpan.FromMilliseconds(300); } private void SaveAllConfiguration() { - Directory.CreateDirectory(Path.GetDirectoryName(_saveFilePath)!); - var model = new InspectionConfigModel { ControllerPortName = _controllerPortName, @@ -260,16 +236,15 @@ namespace measurement_machine RelayIdleMs = _relayIdleMs, MeasurementTimeoutMs = _measurementTimeoutMs, ResultHoldMs = _resultHoldMs, + SaveFilePath = _savePath, OkCount = _okCount, NgCount = _ngCount, TotalCount = _totalCount, - - SaveFilePath = _saveFilePath, - History = new List(_history) + SavedAt = DateTime.Now }; - ExcelXmlStorageService.Save(model, _saveFilePath); + ExcelXmlStorageService.Save(model, SettingsFilePath); } private void RefreshAvailablePorts() @@ -284,18 +259,12 @@ namespace measurement_machine { if (string.IsNullOrWhiteSpace(_controllerPortName)) ControllerPortComboBox.SelectedIndex = 0; - else - ControllerPortComboBox.SelectedItem = _controllerPortName; if (string.IsNullOrWhiteSpace(_leftPortName)) LeftPortComboBox.SelectedIndex = 0; - else - LeftPortComboBox.SelectedItem = _leftPortName; if (string.IsNullOrWhiteSpace(_rightPortName)) RightPortComboBox.SelectedIndex = ports.Length > 1 ? 1 : 0; - else - RightPortComboBox.SelectedItem = _rightPortName; } SettingsStatusTextBlock.Text = ports.Length > 0 @@ -303,133 +272,282 @@ namespace measurement_machine : "연결된 COM 포트 없음"; } - private void Timer_Tick(object? sender, EventArgs e) + private void ClockTimer_Tick(object? sender, EventArgs e) { if (!_isInspecting) return; - var elapsed = DateTime.Now - _startTime; - ElapsedTimeTextBlock.Text = elapsed.ToString(@"h\:mm\:ss"); + ElapsedTimeTextBlock.Text = (DateTime.Now - _startTime).ToString(@"h\:mm\:ss"); } - private void StateTimer_Tick(object? sender, EventArgs e) + private void InspectionLoopTimer_Tick(object? sender, EventArgs e) { - if (!_isInspecting) + if (!_isInspecting || _cycleInProgress) return; + _cycleInProgress = true; + BeginMeasurementCycle(); + } + + private async void BeginMeasurementCycle() + { try { - switch (_inspectionState) + SetStatusIndicator("검사진행"); + ResultTextBlock.Text = "검사진행"; + ResultTextBlock.Foreground = Brushes.DarkGoldenrod; + + _leftValue = null; + _rightValue = null; + + await System.Threading.Tasks.Task.Delay(_relayIdleMs); + + if (_controllerSerialService.IsOpen && !string.IsNullOrWhiteSpace(_controllerStartCommand)) + { + _controllerSerialService.WriteLine(_controllerStartCommand); + } + + if (_leftSerialService.IsOpen && !string.IsNullOrWhiteSpace(_leftReadCommand)) + { + _leftSerialService.WriteLine(_leftReadCommand); + } + + if (_rightSerialService.IsOpen && !string.IsNullOrWhiteSpace(_rightReadCommand)) { - case InspectionState.WaitingRelay: - if (ElapsedStateMs() >= _relayIdleMs) - { - TransitionTo(InspectionState.TriggeringMeasurement); - } - break; - - case InspectionState.TriggeringMeasurement: - BeginMeasurementCycle(); - TransitionTo(InspectionState.WaitingMeasurement); - break; - - case InspectionState.WaitingMeasurement: - if (_leftReceived && _rightReceived) - { - TransitionTo(InspectionState.Judging); - } - else if (ElapsedStateMs() >= _measurementTimeoutMs) - { - TransitionTo(InspectionState.Judging); - } - break; - - case InspectionState.Judging: - EvaluateInspectionResultAndCount(); - TransitionTo(InspectionState.ResultHold); - break; - - case InspectionState.ResultHold: - if (ElapsedStateMs() >= _resultHoldMs) - { - PrepareNextCycle(); - TransitionTo(InspectionState.WaitingRelay); - } - break; + _rightSerialService.WriteLine(_rightReadCommand); } + + await System.Threading.Tasks.Task.Delay(_measurementTimeoutMs); + + EvaluateInspectionResult(); + + await System.Threading.Tasks.Task.Delay(_resultHoldMs); } catch (Exception ex) { - Debug.WriteLine($"[STATE ERROR] {ex.Message}"); - ResultTextBlock.Text = "상태오류"; + Debug.WriteLine($"[CYCLE ERROR] {ex.Message}"); + ResultTextBlock.Text = "오류"; ResultTextBlock.Foreground = Brushes.Red; - SetStatusIndicator("오류"); - _inspectionState = InspectionState.Error; + SetStatusIndicator("대기"); + } + finally + { + _cycleInProgress = false; } } - private void TransitionTo(InspectionState nextState) + private void EvaluateInspectionResult() { - _inspectionState = nextState; - _stateEnteredAt = DateTime.Now; + bool leftOk = _leftValue.HasValue && + _leftValue.Value >= _leftMinSpec && + _leftValue.Value <= _leftMaxSpec; - switch (_inspectionState) + bool rightOk = _rightValue.HasValue && + _rightValue.Value >= _rightMinSpec && + _rightValue.Value <= _rightMaxSpec; + + if (!_leftValue.HasValue || !_rightValue.HasValue) { - case InspectionState.WaitingRelay: - case InspectionState.TriggeringMeasurement: - case InspectionState.WaitingMeasurement: - ResultTextBlock.Text = "검사진행"; - ResultTextBlock.Foreground = Brushes.DarkGoldenrod; - SetStatusIndicator("검사진행"); - break; + ResultTextBlock.Text = "측정대기"; + ResultTextBlock.Foreground = Brushes.Black; + SetStatusIndicator("검사진행"); + return; + } + + _totalCount++; + + string excelResult; + string reason; + + if (leftOk && rightOk) + { + _okCount++; + ResultTextBlock.Text = "완료"; + ResultTextBlock.Foreground = Brushes.DarkGreen; + SetStatusIndicator("완료"); + + excelResult = "PASS"; + reason = "OK"; + } + else + { + _ngCount++; + ResultTextBlock.Text = "불량"; + ResultTextBlock.Foreground = Brushes.Red; + SetStatusIndicator("대기"); + + excelResult = "불량항목"; + + if (!leftOk && !rightOk) + reason = "LEFT/RIGHT SPEC NG"; + else if (!leftOk) + reason = "LEFT SPEC NG"; + else + reason = "RIGHT SPEC NG"; } - Debug.WriteLine($"[STATE] -> {_inspectionState}"); + UpdateCountUi(); + SaveAllConfiguration(); + + var historyItem = new InspectionHistoryItem + { + Timestamp = DateTime.Now, + LeftValue = _leftValue, + RightValue = _rightValue, + Result = excelResult, + Reason = reason + }; + + measurement_machine.Service.InspectionExcelService.AppendResult( + historyItem, + string.IsNullOrWhiteSpace(_savePath) + ? measurement_machine.Service.InspectionExcelService.GetRootFolder() + : _savePath); } - private int ElapsedStateMs() + private void UpdateCountUi() { - return (int)(DateTime.Now - _stateEnteredAt).TotalMilliseconds; + CurrentCountTextBlock.Text = _okCount.ToString(CultureInfo.InvariantCulture); + DefectCountTextBlock.Text = _ngCount.ToString(CultureInfo.InvariantCulture); + TotalCountTextBlock.Text = _totalCount.ToString(CultureInfo.InvariantCulture); } - private void HelpButton_Click(object sender, RoutedEventArgs e) + private void OnLeftSerialDataReceived(string rawData) { - MessageBox.Show("도움말 기능은 추후 연결 예정입니다.", "도움말", - MessageBoxButton.OK, MessageBoxImage.Information); + Dispatcher.Invoke(() => + { + Debug.WriteLine($"[LEFT RX] {rawData}"); + + if (TryExtractNumber(rawData, out double value)) + { + _leftValue = value; + LeftDimensionTextBlock.Text = value.ToString("F2", CultureInfo.InvariantCulture); + } + }); } - private void SettingsButton_Click(object sender, RoutedEventArgs e) + private void OnRightSerialDataReceived(string rawData) { - MainScreenGrid.Visibility = Visibility.Collapsed; - SettingsScreenGrid.Visibility = Visibility.Visible; + Dispatcher.Invoke(() => + { + Debug.WriteLine($"[RIGHT RX] {rawData}"); + + if (TryExtractNumber(rawData, out double value)) + { + _rightValue = value; + RightDimensionTextBlock.Text = value.ToString("F2", CultureInfo.InvariantCulture); + } + }); } - private void BackToMainButton_Click(object sender, RoutedEventArgs e) + private void OnSerialErrorOccurred(string message) { - SettingsScreenGrid.Visibility = Visibility.Collapsed; - MainScreenGrid.Visibility = Visibility.Visible; + Dispatcher.Invoke(() => + { + Debug.WriteLine($"[SERIAL ERROR] {message}"); + ResultTextBlock.Text = "통신오류"; + ResultTextBlock.Foreground = Brushes.Red; + SetStatusIndicator("대기"); + }); } - private void ControllerTabButton_Click(object sender, RoutedEventArgs e) + private bool TryExtractNumber(string raw, out double value) { - ShowSettingsTab("CONTROLLER"); + value = 0; + + if (string.IsNullOrWhiteSpace(raw)) + return false; + + var match = Regex.Match(raw, @"-?\d+(\.\d+)?"); + if (!match.Success) + return false; + + return double.TryParse(match.Value, NumberStyles.Float, CultureInfo.InvariantCulture, out value) + || double.TryParse(match.Value, out value); } - private void LeftMeasureTabButton_Click(object sender, RoutedEventArgs e) + private double ParseDouble(string text, string fieldName) { - ShowSettingsTab("LEFT"); + if (!double.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out double value) && + !double.TryParse(text, out value)) + { + throw new Exception($"{fieldName} 값이 올바르지 않습니다."); + } + + return value; } - private void RightMeasureTabButton_Click(object sender, RoutedEventArgs e) + private int ParseInt(string text, string fieldName) { - ShowSettingsTab("RIGHT"); + if (!int.TryParse(text, out int value)) + { + throw new Exception($"{fieldName} 값이 올바르지 않습니다."); + } + + return value; } - private void UserTabButton_Click(object sender, RoutedEventArgs e) + private void SetIdleUi() { - ShowSettingsTab("USER"); + _isInspecting = false; + _cycleInProgress = false; + + LeftDimensionTextBlock.Text = "0.00"; + RightDimensionTextBlock.Text = "0.00"; + ResultTextBlock.Text = "대기"; + ResultTextBlock.Foreground = Brushes.Black; + ElapsedTimeTextBlock.Text = "0:00:00"; + + UpdateCountUi(); + SetStatusIndicator("대기"); + } + + private void SetStatusIndicator(string state) + { + IdleStatusBorder.Opacity = 0.45; + InspectingStatusBorder.Opacity = 0.45; + CompletedStatusBorder.Opacity = 0.45; + + switch (state) + { + case "대기": + IdleStatusBorder.Opacity = 1.0; + break; + case "검사진행": + InspectingStatusBorder.Opacity = 1.0; + break; + case "완료": + CompletedStatusBorder.Opacity = 1.0; + break; + default: + IdleStatusBorder.Opacity = 1.0; + break; + } + } + + private void HelpButton_Click(object sender, RoutedEventArgs e) + { + MessageBox.Show("도움말 기능은 추후 연결 예정입니다.", "도움말", + MessageBoxButton.OK, MessageBoxImage.Information); + } + + private void SettingsButton_Click(object sender, RoutedEventArgs e) + { + MainScreenGrid.Visibility = Visibility.Collapsed; + SettingsScreenGrid.Visibility = Visibility.Visible; + } + + private void BackToMainButton_Click(object sender, RoutedEventArgs e) + { + SettingsScreenGrid.Visibility = Visibility.Collapsed; + MainScreenGrid.Visibility = Visibility.Visible; } + private void ControllerTabButton_Click(object sender, RoutedEventArgs e) => ShowSettingsTab("CONTROLLER"); + private void LeftMeasureTabButton_Click(object sender, RoutedEventArgs e) => ShowSettingsTab("LEFT"); + private void RightMeasureTabButton_Click(object sender, RoutedEventArgs e) => ShowSettingsTab("RIGHT"); + private void UserTabButton_Click(object sender, RoutedEventArgs e) => ShowSettingsTab("USER"); + private void ShowSettingsTab(string tabName) { ControllerTabGrid.Visibility = Visibility.Collapsed; @@ -448,17 +566,14 @@ namespace measurement_machine ControllerTabGrid.Visibility = Visibility.Visible; ControllerTabButton.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#EAEAEA")); break; - case "LEFT": LeftMeasureTabGrid.Visibility = Visibility.Visible; LeftTabButton.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#EAEAEA")); break; - case "RIGHT": RightMeasureTabGrid.Visibility = Visibility.Visible; RightTabButton.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#EAEAEA")); break; - case "USER": UserTabGrid.Visibility = Visibility.Visible; UserTabButton.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#EAEAEA")); @@ -486,9 +601,8 @@ namespace measurement_machine _controllerStopCommand = ControllerStopCommandTextBox.Text?.Trim() ?? ""; SaveAllConfiguration(); - SettingsStatusTextBlock.Text = - $"컨트롤러 설정 저장 완료\n{_controllerPortName} / {_controllerBaudRate}\nSTART={_controllerStartCommand}\nSTOP={_controllerStopCommand}"; + $"컨트롤러 설정 저장 완료\n{_controllerPortName} / {_controllerBaudRate}"; } private void SaveLeftConfigButton_Click(object sender, RoutedEventArgs e) @@ -505,9 +619,8 @@ namespace measurement_machine _leftReadCommand = LeftReadCommandTextBox.Text?.Trim() ?? ""; SaveAllConfiguration(); - SettingsStatusTextBlock.Text = - $"좌측 설정 저장 완료\n{_leftPortName} / {_leftBaudRate}\nREAD={_leftReadCommand}"; + $"좌측 설정 저장 완료\n{_leftPortName} / {_leftBaudRate}"; } private void SaveRightConfigButton_Click(object sender, RoutedEventArgs e) @@ -524,9 +637,8 @@ namespace measurement_machine _rightReadCommand = RightReadCommandTextBox.Text?.Trim() ?? ""; SaveAllConfiguration(); - SettingsStatusTextBlock.Text = - $"우측 설정 저장 완료\n{_rightPortName} / {_rightBaudRate}\nREAD={_rightReadCommand}"; + $"우측 설정 저장 완료\n{_rightPortName} / {_rightBaudRate}"; } private void SaveUserConfigButton_Click(object sender, RoutedEventArgs e) @@ -541,6 +653,7 @@ namespace measurement_machine _relayIdleMs = ParseInt(RelayIdleTextBox.Text, "Relay Idle Time"); _measurementTimeoutMs = ParseInt(MeasurementTimeoutTextBox.Text, "Measurement Timeout"); _resultHoldMs = ParseInt(ResultHoldTextBox.Text, "Result Hold Time"); + _savePath = SavePathTextBox.Text?.Trim() ?? ""; if (_leftMinSpec > _leftMaxSpec) throw new Exception("좌측 치수 기준값에서 Min이 Max보다 클 수 없습니다."); @@ -548,9 +661,17 @@ namespace measurement_machine if (_rightMinSpec > _rightMaxSpec) throw new Exception("우측 치수 기준값에서 Min이 Max보다 클 수 없습니다."); - var requestedPath = SavePathTextBox.Text?.Trim() ?? ""; - if (!string.IsNullOrWhiteSpace(requestedPath)) - _saveFilePath = requestedPath; + if (string.IsNullOrWhiteSpace(_savePath)) + _savePath = measurement_machine.Service.InspectionExcelService.GetRootFolder(); + + // 루트 폴더 생성 + Directory.CreateDirectory(_savePath); + + // 설정 폴더 생성 + Directory.CreateDirectory(Path.Combine(_savePath, "MEADATA")); + + // 결과 루트 폴더 생성 + Directory.CreateDirectory(Path.Combine(_savePath, "data")); SaveAllConfiguration(); @@ -563,102 +684,68 @@ namespace measurement_machine } catch (Exception ex) { - MessageBox.Show(ex.Message, "USER 설정", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show(ex.Message, "USER 설정", + MessageBoxButton.OK, MessageBoxImage.Error); } } private void TestControllerPortButton_Click(object sender, RoutedEventArgs e) { - try - { - if (ControllerPortComboBox.SelectedItem == null) - { - MessageBox.Show("컨트롤 보드 COM 포트를 선택하세요.", "포트 테스트", - MessageBoxButton.OK, MessageBoxImage.Warning); - return; - } - - string port = ControllerPortComboBox.SelectedItem.ToString() ?? ""; - int baud = (int)(ControllerBaudComboBox.SelectedItem ?? 9600); - - using var test = new SerialDeviceService(); - test.Open(port, baud); - test.Close(); - - SettingsStatusTextBlock.Text = $"컨트롤러 포트 테스트 성공\n{port} / {baud}"; - } - catch (Exception ex) - { - SettingsStatusTextBlock.Text = "컨트롤러 포트 테스트 실패"; - MessageBox.Show(ex.Message, "컨트롤러 포트 테스트", - MessageBoxButton.OK, MessageBoxImage.Error); - } + TestPort(ControllerPortComboBox, ControllerBaudComboBox, "컨트롤러"); } private void TestLeftPortButton_Click(object sender, RoutedEventArgs e) { - try - { - if (LeftPortComboBox.SelectedItem == null) - { - MessageBox.Show("좌측 COM 포트를 선택하세요.", "포트 테스트", - MessageBoxButton.OK, MessageBoxImage.Warning); - return; - } - - string port = LeftPortComboBox.SelectedItem.ToString() ?? ""; - int baud = (int)(LeftBaudComboBox.SelectedItem ?? 9600); - - using var test = new SerialDeviceService(); - test.Open(port, baud); - test.Close(); - - SettingsStatusTextBlock.Text = $"좌측 포트 테스트 성공\n{port} / {baud}"; - } - catch (Exception ex) - { - SettingsStatusTextBlock.Text = "좌측 포트 테스트 실패"; - MessageBox.Show(ex.Message, "좌측 포트 테스트", - MessageBoxButton.OK, MessageBoxImage.Error); - } + TestPort(LeftPortComboBox, LeftBaudComboBox, "좌측"); } private void TestRightPortButton_Click(object sender, RoutedEventArgs e) + { + TestPort(RightPortComboBox, RightBaudComboBox, "우측"); + } + + private void TestPort(System.Windows.Controls.ComboBox portComboBox, + System.Windows.Controls.ComboBox baudComboBox, + string title) { try { - if (RightPortComboBox.SelectedItem == null) + if (portComboBox.SelectedItem == null) { - MessageBox.Show("우측 COM 포트를 선택하세요.", "포트 테스트", + MessageBox.Show($"{title} COM 포트를 선택하세요.", "포트 테스트", MessageBoxButton.OK, MessageBoxImage.Warning); return; } - string port = RightPortComboBox.SelectedItem.ToString() ?? ""; - int baud = (int)(RightBaudComboBox.SelectedItem ?? 9600); + string port = portComboBox.SelectedItem.ToString() ?? ""; + int baud = (int)(baudComboBox.SelectedItem ?? 9600); using var test = new SerialDeviceService(); test.Open(port, baud); test.Close(); - SettingsStatusTextBlock.Text = $"우측 포트 테스트 성공\n{port} / {baud}"; + SettingsStatusTextBlock.Text = $"{title} 포트 테스트 성공\n{port} / {baud}"; } catch (Exception ex) { - SettingsStatusTextBlock.Text = "우측 포트 테스트 실패"; - MessageBox.Show(ex.Message, "우측 포트 테스트", + SettingsStatusTextBlock.Text = $"{title} 포트 테스트 실패"; + MessageBox.Show(ex.Message, $"{title} 포트 테스트", MessageBoxButton.OK, MessageBoxImage.Error); } } private void ResetButton_Click(object sender, RoutedEventArgs e) { - StopInspection(); + if (_isInspecting) + { + MessageBox.Show("검사 진행 중에는 초기화할 수 없습니다.", "안내", + MessageBoxButton.OK, MessageBoxImage.Warning); + return; + } _okCount = 0; _ngCount = 0; _totalCount = 0; - _history.Clear(); UpdateCountUi(); SaveAllConfiguration(); @@ -689,7 +776,7 @@ namespace measurement_machine if (string.IsNullOrWhiteSpace(_leftPortName) || string.IsNullOrWhiteSpace(_rightPortName)) { - MessageBox.Show("설정 화면에서 좌측/우측 치수 설정을 먼저 저장하세요.", + MessageBox.Show("설정 화면에서 좌측/우측 설정을 먼저 저장하세요.", "설정 필요", MessageBoxButton.OK, MessageBoxImage.Warning); return; } @@ -705,15 +792,15 @@ namespace measurement_machine _rightSerialService.DiscardInBuffer(); _isInspecting = true; + _cycleInProgress = false; _startTime = DateTime.Now; ElapsedTimeTextBlock.Text = "0:00:00"; - PrepareNextCycle(); - TransitionTo(InspectionState.WaitingRelay); + _inspectionLoopTimer.Start(); - Debug.WriteLine($"[CONTROLLER OPEN] {_controllerPortName} {_controllerBaudRate}"); - Debug.WriteLine($"[LEFT OPEN] {_leftPortName} {_leftBaudRate}"); - Debug.WriteLine($"[RIGHT OPEN] {_rightPortName} {_rightBaudRate}"); + ResultTextBlock.Text = "검사진행"; + ResultTextBlock.Foreground = Brushes.DarkGoldenrod; + SetStatusIndicator("검사진행"); } catch (Exception ex) { @@ -722,11 +809,9 @@ namespace measurement_machine _rightSerialService.Close(); _isInspecting = false; - _inspectionState = InspectionState.Error; - ResultTextBlock.Text = "오류"; ResultTextBlock.Foreground = Brushes.Red; - SetStatusIndicator("오류"); + SetStatusIndicator("대기"); MessageBox.Show(ex.Message, "통신 시작 실패", MessageBoxButton.OK, MessageBoxImage.Error); @@ -740,6 +825,8 @@ namespace measurement_machine try { + _inspectionLoopTimer.Stop(); + if (_controllerSerialService.IsOpen && !string.IsNullOrWhiteSpace(_controllerStopCommand)) { _controllerSerialService.WriteLine(_controllerStopCommand); @@ -750,267 +837,25 @@ namespace measurement_machine _rightSerialService.Close(); _isInspecting = false; - _inspectionState = InspectionState.Idle; + _cycleInProgress = false; ResultTextBlock.Text = "대기"; ResultTextBlock.Foreground = Brushes.Black; SetStatusIndicator("대기"); SaveAllConfiguration(); - - Debug.WriteLine("[CLOSE] 검사 종료"); } catch (Exception ex) { ResultTextBlock.Text = "오류"; ResultTextBlock.Foreground = Brushes.Red; - SetStatusIndicator("오류"); + SetStatusIndicator("대기"); MessageBox.Show(ex.Message, "검사 종료 실패", MessageBoxButton.OK, MessageBoxImage.Error); } } - private void BeginMeasurementCycle() - { - _cycleStartedAt = DateTime.Now; - _leftReceived = false; - _rightReceived = false; - _lastLeftValue = null; - _lastRightValue = null; - _lastLeftRaw = ""; - _lastRightRaw = ""; - - if (_controllerSerialService.IsOpen && !string.IsNullOrWhiteSpace(_controllerStartCommand)) - { - _controllerSerialService.WriteLine(_controllerStartCommand); - } - - if (_leftSerialService.IsOpen && !string.IsNullOrWhiteSpace(_leftReadCommand)) - { - _leftSerialService.WriteLine(_leftReadCommand); - } - - if (_rightSerialService.IsOpen && !string.IsNullOrWhiteSpace(_rightReadCommand)) - { - _rightSerialService.WriteLine(_rightReadCommand); - } - - Debug.WriteLine("[CYCLE] measurement command sent"); - } - - private void PrepareNextCycle() - { - _leftReceived = false; - _rightReceived = false; - _lastLeftValue = null; - _lastRightValue = null; - _lastLeftRaw = ""; - _lastRightRaw = ""; - } - - private void OnLeftSerialDataReceived(string rawData) - { - Dispatcher.Invoke(() => - { - Debug.WriteLine($"[LEFT RX] {rawData}"); - _lastLeftRaw = rawData; - - if (TryExtractNumber(rawData, out double value)) - { - _lastLeftValue = value; - _leftReceived = true; - LeftDimensionTextBlock.Text = value.ToString("F2", CultureInfo.InvariantCulture); - } - }); - } - - private void OnRightSerialDataReceived(string rawData) - { - Dispatcher.Invoke(() => - { - Debug.WriteLine($"[RIGHT RX] {rawData}"); - _lastRightRaw = rawData; - - if (TryExtractNumber(rawData, out double value)) - { - _lastRightValue = value; - _rightReceived = true; - RightDimensionTextBlock.Text = value.ToString("F2", CultureInfo.InvariantCulture); - } - }); - } - - private void OnSerialErrorOccurred(string message) - { - Dispatcher.Invoke(() => - { - Debug.WriteLine($"[SERIAL ERROR] {message}"); - ResultTextBlock.Text = "통신오류"; - ResultTextBlock.Foreground = Brushes.Red; - SetStatusIndicator("오류"); - _inspectionState = InspectionState.Error; - }); - } - - private void EvaluateInspectionResultAndCount() - { - bool leftTimeout = !_leftReceived || !_lastLeftValue.HasValue; - bool rightTimeout = !_rightReceived || !_lastRightValue.HasValue; - - bool leftOk = !leftTimeout && - _lastLeftValue!.Value >= _leftMinSpec && - _lastLeftValue!.Value <= _leftMaxSpec; - - bool rightOk = !rightTimeout && - _lastRightValue!.Value >= _rightMinSpec && - _lastRightValue!.Value <= _rightMaxSpec; - - string reason; - bool isOk; - - if (leftTimeout || rightTimeout) - { - isOk = false; - reason = $"TIMEOUT (L={_leftReceived}, R={_rightReceived})"; - ResultTextBlock.Text = "타임아웃"; - ResultTextBlock.Foreground = Brushes.Red; - SetStatusIndicator("오류"); - } - else if (leftOk && rightOk) - { - isOk = true; - reason = "OK"; - ResultTextBlock.Text = "완료"; - ResultTextBlock.Foreground = Brushes.DarkGreen; - SetStatusIndicator("완료"); - } - else - { - isOk = false; - - if (!leftOk && !rightOk) - reason = "LEFT/RIGHT SPEC NG"; - else if (!leftOk) - reason = "LEFT SPEC NG"; - else - reason = "RIGHT SPEC NG"; - - ResultTextBlock.Text = "불량"; - ResultTextBlock.Foreground = Brushes.Red; - SetStatusIndicator("오류"); - } - - _totalCount++; - - if (isOk) - _okCount++; - else - _ngCount++; - - UpdateCountUi(); - - _history.Add(new InspectionHistoryItem - { - Timestamp = DateTime.Now, - LeftValue = _lastLeftValue, - RightValue = _lastRightValue, - Result = isOk ? "OK" : "NG", - Reason = reason, - ElapsedMs = (int)(DateTime.Now - _cycleStartedAt).TotalMilliseconds, - LeftRaw = _lastLeftRaw, - RightRaw = _lastRightRaw - }); - - SaveAllConfiguration(); - - Debug.WriteLine($"[RESULT] {reason}"); - } - - private void UpdateCountUi() - { - CurrentCountTextBlock.Text = _okCount.ToString(CultureInfo.InvariantCulture); - DefectCountTextBlock.Text = _ngCount.ToString(CultureInfo.InvariantCulture); - TotalCountTextBlock.Text = _totalCount.ToString(CultureInfo.InvariantCulture); - } - - private bool TryExtractNumber(string raw, out double value) - { - value = 0; - - if (string.IsNullOrWhiteSpace(raw)) - return false; - - var match = Regex.Match(raw, @"-?\d+(\.\d+)?"); - if (!match.Success) - return false; - - return double.TryParse(match.Value, NumberStyles.Float, CultureInfo.InvariantCulture, out value) - || double.TryParse(match.Value, out value); - } - - private double ParseDouble(string text, string fieldName) - { - if (!double.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out double value) && - !double.TryParse(text, out value)) - { - throw new Exception($"{fieldName} 값이 올바르지 않습니다."); - } - - return value; - } - - private int ParseInt(string text, string fieldName) - { - if (!int.TryParse(text, out int value)) - { - throw new Exception($"{fieldName} 값이 올바르지 않습니다."); - } - - return value; - } - - private void SetIdleUi() - { - _isInspecting = false; - _inspectionState = InspectionState.Idle; - - LeftDimensionTextBlock.Text = "0.00"; - RightDimensionTextBlock.Text = "0.00"; - ResultTextBlock.Text = "대기"; - ResultTextBlock.Foreground = Brushes.Black; - ElapsedTimeTextBlock.Text = "0:00:00"; - - UpdateCountUi(); - SetStatusIndicator("대기"); - } - - private void SetStatusIndicator(string state) - { - IdleStatusBorder.Opacity = 0.45; - InspectingStatusBorder.Opacity = 0.45; - CompletedStatusBorder.Opacity = 0.45; - - switch (state) - { - case "대기": - IdleStatusBorder.Opacity = 1.0; - break; - - case "검사진행": - InspectingStatusBorder.Opacity = 1.0; - break; - - case "완료": - CompletedStatusBorder.Opacity = 1.0; - break; - - default: - IdleStatusBorder.Opacity = 1.0; - break; - } - } - protected override void OnClosed(EventArgs e) { try @@ -1019,9 +864,9 @@ namespace measurement_machine } catch { - // ignore } + _inspectionLoopTimer.Stop(); _controllerSerialService.Close(); _leftSerialService.Close(); _rightSerialService.Close(); diff --git a/measurement_machine/PersistenceModel.cs b/measurement_machine/PersistenceModel.cs index ad47ccc..c81f45d 100644 --- a/measurement_machine/PersistenceModel.cs +++ b/measurement_machine/PersistenceModel.cs @@ -18,33 +18,24 @@ namespace measurement_machine public int RightBaudRate { get; set; } = 9600; public string RightReadCommand { get; set; } = ""; - public double LeftMinSpec { get; set; } - public double LeftMaxSpec { get; set; } - public double RightMinSpec { get; set; } - public double RightMaxSpec { get; set; } + public double LeftMinSpec { get; set; } = 0.00; + public double LeftMaxSpec { get; set; } = 100.00; + public double RightMinSpec { get; set; } = 0.00; + public double RightMaxSpec { get; set; } = 100.00; public int RelayIdleMs { get; set; } = 100; public int MeasurementTimeoutMs { get; set; } = 1000; public int ResultHoldMs { get; set; } = 100; - public int OkCount { get; set; } - public int NgCount { get; set; } - public int TotalCount { get; set; } + public int OkCount { get; set; } = 0; + public int NgCount { get; set; } = 0; + public int TotalCount { get; set; } = 0; - public string SaveFilePath { get; set; } = ""; + // 루트 폴더로 저장 + public string SaveFilePath { get; set; } = @"C:\WMEADATA"; public List History { get; set; } = new(); - } - public sealed class InspectionHistoryItem - { - public DateTime Timestamp { get; set; } - public double? LeftValue { get; set; } - public double? RightValue { get; set; } - public string Result { get; set; } = ""; - public string Reason { get; set; } = ""; - public int ElapsedMs { get; set; } - public string LeftRaw { get; set; } = ""; - public string RightRaw { get; set; } = ""; + public DateTime SavedAt { get; set; } = DateTime.Now; } } \ No newline at end of file diff --git a/measurement_machine/Service/InspectionExcelService.cs b/measurement_machine/Service/InspectionExcelService.cs new file mode 100644 index 0000000..953e2d4 --- /dev/null +++ b/measurement_machine/Service/InspectionExcelService.cs @@ -0,0 +1,82 @@ +using System; +using System.Globalization; +using System.IO; +using ClosedXML.Excel; + +namespace measurement_machine.Service +{ + public static class InspectionExcelService + { + public static string GetRootFolder() + { + return @"C:\WMEADATA"; + } + + public static string GetMetadataFolder(string rootFolder) + { + return Path.Combine(rootFolder, "MEADATA"); + } + + public static string GetConfigFilePath(string rootFolder) + { + return Path.Combine(GetMetadataFolder(rootFolder), "inspection_settings.xml"); + } + + public static string GetDailyResultFolder(string rootFolder, DateTime timestamp) + { + string monthFolder = timestamp.ToString("yyyy-MM", CultureInfo.InvariantCulture); + string dayFolder = timestamp.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture); + + return Path.Combine(rootFolder, "data", monthFolder, dayFolder); + } + + public static string GetDailyResultFilePath(string rootFolder, DateTime timestamp) + { + string folder = GetDailyResultFolder(rootFolder, timestamp); + string fileName = timestamp.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture) + ".xlsx"; + return Path.Combine(folder, fileName); + } + + public static void AppendResult(InspectionHistoryItem item, string rootFolder) + { + string filePath = GetDailyResultFilePath(rootFolder, item.Timestamp); + string folder = Path.GetDirectoryName(filePath)!; + + Directory.CreateDirectory(folder); + + using var workbook = File.Exists(filePath) + ? new XLWorkbook(filePath) + : CreateWorkbook(); + + var ws = workbook.Worksheet("검사결과"); + + int nextRow = ws.LastRowUsed()?.RowNumber() + 1 ?? 2; + + ws.Cell(nextRow, 1).Value = nextRow - 1; + ws.Cell(nextRow, 2).Value = item.LeftValue.HasValue ? item.LeftValue.Value : 0.0; + ws.Cell(nextRow, 3).Value = item.RightValue.HasValue ? item.RightValue.Value : 0.0; + ws.Cell(nextRow, 4).Value = item.Result; + ws.Cell(nextRow, 5).Value = item.Reason; + + workbook.SaveAs(filePath); + } + + private static XLWorkbook CreateWorkbook() + { + var workbook = new XLWorkbook(); + var ws = workbook.Worksheets.Add("검사결과"); + + ws.Cell(1, 1).Value = "번호"; + ws.Cell(1, 2).Value = "좌측치수"; + ws.Cell(1, 3).Value = "우측치수"; + ws.Cell(1, 4).Value = "판정결과"; + ws.Cell(1, 5).Value = "불량항목"; + + ws.Range(1, 1, 1, 5).Style.Font.Bold = true; + ws.Range(1, 1, 1, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Columns(1, 5).AdjustToContents(); + + return workbook; + } + } +} \ No newline at end of file diff --git a/measurement_machine/bin/Debug/net8.0-windows/ClosedXML.Parser.dll b/measurement_machine/bin/Debug/net8.0-windows/ClosedXML.Parser.dll new file mode 100644 index 0000000..52ce71a Binary files /dev/null and b/measurement_machine/bin/Debug/net8.0-windows/ClosedXML.Parser.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/ClosedXML.dll b/measurement_machine/bin/Debug/net8.0-windows/ClosedXML.dll new file mode 100644 index 0000000..b50347b Binary files /dev/null and b/measurement_machine/bin/Debug/net8.0-windows/ClosedXML.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/Data/inspection_settings.xml b/measurement_machine/bin/Debug/net8.0-windows/Data/inspection_settings.xml index 772c77f..9d21628 100644 --- a/measurement_machine/bin/Debug/net8.0-windows/Data/inspection_settings.xml +++ b/measurement_machine/bin/Debug/net8.0-windows/Data/inspection_settings.xml @@ -1,279 +1,25 @@ - - - - - - - Section - - - Key - - - Value - - - - - Controller - - - PortName - - - - - - - - Controller - - - BaudRate - - - 9600 - - - - - Controller - - - StartCommand - - - - - - - - Controller - - - StopCommand - - - - - - - - Left - - - PortName - - - - - - - - Left - - - BaudRate - - - 9600 - - - - - Left - - - ReadCommand - - - - - - - - Right - - - PortName - - - - - - - - Right - - - BaudRate - - - 9600 - - - - - Right - - - ReadCommand - - - - - - - - Spec - - - LeftMinSpec - - - 0 - - - - - Spec - - - LeftMaxSpec - - - 100 - - - - - Spec - - - RightMinSpec - - - 0 - - - - - Spec - - - RightMaxSpec - - - 100 - - - - - Timing - - - RelayIdleMs - - - 100 - - - - - Timing - - - MeasurementTimeoutMs - - - 1000 - - - - - Timing - - - ResultHoldMs - - - 100 - - - - - Count - - - OkCount - - - 0 - - - - - Count - - - NgCount - - - 0 - - - - - Count - - - TotalCount - - - 0 - - - - - Persistence - - - SaveFilePath - - - C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\Data\inspection_settings.xml - - -
-
- - - - - Timestamp - - - LeftValue - - - RightValue - - - Result - - - Reason - - - ElapsedMs - - - LeftRaw - - - RightRaw - - -
-
-
\ No newline at end of file + + + + 9600 + + + + 9600 + + + 9600 + + 0 + 100 + 0 + 100 + 100 + 1000 + 1000 + C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\Data + 0 + 0 + 0 + 2026-03-08T03:27:13.0810113+09:00 + \ No newline at end of file diff --git a/measurement_machine/bin/Debug/net8.0-windows/DocumentFormat.OpenXml.Framework.dll b/measurement_machine/bin/Debug/net8.0-windows/DocumentFormat.OpenXml.Framework.dll new file mode 100644 index 0000000..895c615 Binary files /dev/null and b/measurement_machine/bin/Debug/net8.0-windows/DocumentFormat.OpenXml.Framework.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/DocumentFormat.OpenXml.dll b/measurement_machine/bin/Debug/net8.0-windows/DocumentFormat.OpenXml.dll new file mode 100644 index 0000000..dbc29d1 Binary files /dev/null and b/measurement_machine/bin/Debug/net8.0-windows/DocumentFormat.OpenXml.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/ExcelNumberFormat.dll b/measurement_machine/bin/Debug/net8.0-windows/ExcelNumberFormat.dll new file mode 100644 index 0000000..aaf7bf8 Binary files /dev/null and b/measurement_machine/bin/Debug/net8.0-windows/ExcelNumberFormat.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/RBush.dll b/measurement_machine/bin/Debug/net8.0-windows/RBush.dll new file mode 100644 index 0000000..c1cec38 Binary files /dev/null and b/measurement_machine/bin/Debug/net8.0-windows/RBush.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/SixLabors.Fonts.dll b/measurement_machine/bin/Debug/net8.0-windows/SixLabors.Fonts.dll new file mode 100644 index 0000000..281d8a7 Binary files /dev/null and b/measurement_machine/bin/Debug/net8.0-windows/SixLabors.Fonts.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/System.IO.Packaging.dll b/measurement_machine/bin/Debug/net8.0-windows/System.IO.Packaging.dll new file mode 100644 index 0000000..eb95db7 Binary files /dev/null and b/measurement_machine/bin/Debug/net8.0-windows/System.IO.Packaging.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.deps.json b/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.deps.json index d6d90e1..f671e54 100644 --- a/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.deps.json +++ b/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.deps.json @@ -8,12 +8,74 @@ ".NETCoreApp,Version=v8.0": { "measurement_machine/1.0.0": { "dependencies": { + "ClosedXML": "0.105.0", "System.IO.Ports": "10.0.3" }, "runtime": { "measurement_machine.dll": {} } }, + "ClosedXML/0.105.0": { + "dependencies": { + "ClosedXML.Parser": "2.0.0", + "DocumentFormat.OpenXml": "3.1.1", + "ExcelNumberFormat": "1.1.0", + "RBush.Signed": "4.0.0", + "SixLabors.Fonts": "1.0.0" + }, + "runtime": { + "lib/netstandard2.1/ClosedXML.dll": { + "assemblyVersion": "0.105.0.0", + "fileVersion": "0.105.0.0" + } + } + }, + "ClosedXML.Parser/2.0.0": { + "runtime": { + "lib/netstandard2.1/ClosedXML.Parser.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "DocumentFormat.OpenXml/3.1.1": { + "dependencies": { + "DocumentFormat.OpenXml.Framework": "3.1.1" + }, + "runtime": { + "lib/net8.0/DocumentFormat.OpenXml.dll": { + "assemblyVersion": "3.1.1.0", + "fileVersion": "3.1.1.0" + } + } + }, + "DocumentFormat.OpenXml.Framework/3.1.1": { + "dependencies": { + "System.IO.Packaging": "8.0.1" + }, + "runtime": { + "lib/net8.0/DocumentFormat.OpenXml.Framework.dll": { + "assemblyVersion": "3.1.1.0", + "fileVersion": "3.1.1.0" + } + } + }, + "ExcelNumberFormat/1.1.0": { + "runtime": { + "lib/netstandard2.0/ExcelNumberFormat.dll": { + "assemblyVersion": "1.1.0.0", + "fileVersion": "1.1.0.0" + } + } + }, + "RBush.Signed/4.0.0": { + "runtime": { + "lib/net8.0/RBush.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.0.0.0" + } + } + }, "runtime.android-arm.runtime.native.System.IO.Ports/10.0.3": { "runtimeTargets": { "runtimes/android-arm/native/libSystem.IO.Ports.Native.so": { @@ -178,6 +240,22 @@ } } }, + "SixLabors.Fonts/1.0.0": { + "runtime": { + "lib/netcoreapp3.1/SixLabors.Fonts.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "System.IO.Packaging/8.0.1": { + "runtime": { + "lib/net8.0/System.IO.Packaging.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.1024.46610" + } + } + }, "System.IO.Ports/10.0.3": { "dependencies": { "runtime.native.System.IO.Ports": "10.0.3" @@ -211,6 +289,48 @@ "serviceable": false, "sha512": "" }, + "ClosedXML/0.105.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-U0hAdnYyPvF7TqHMFloxrS7pmozab79tFFF4c/bgPtqeelUs7ILpUd3r3c7C0a/DXsUZb3k1n4Pf7Q2LMyMQOg==", + "path": "closedxml/0.105.0", + "hashPath": "closedxml.0.105.0.nupkg.sha512" + }, + "ClosedXML.Parser/2.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ngTqjYreDYNytG1W5d3ewHsw0ukmmrgV7EKnS4/40rXoYZGt07jrBvo+N+GxT49rcageUMUiprV0jYT4nwVBHQ==", + "path": "closedxml.parser/2.0.0", + "hashPath": "closedxml.parser.2.0.0.nupkg.sha512" + }, + "DocumentFormat.OpenXml/3.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2z9QBzeTLNNKWM9SaOSDMegfQk/7hDuElOsmF77pKZMkFRP/GHA/W/4yOAQD9kn15N/FsFxHn3QVYkatuZghiA==", + "path": "documentformat.openxml/3.1.1", + "hashPath": "documentformat.openxml.3.1.1.nupkg.sha512" + }, + "DocumentFormat.OpenXml.Framework/3.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-6APEp/ElZV58S/4v8mf4Ke3ONEDORs64MqdD64Z7wWpcHANB9oovQsGIwtqjnKihulOj7T0a6IxHIHOfMqKOng==", + "path": "documentformat.openxml.framework/3.1.1", + "hashPath": "documentformat.openxml.framework.3.1.1.nupkg.sha512" + }, + "ExcelNumberFormat/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-R3BVHPs9O+RkExbZYTGT0+9HLbi8ZrNij1Yziyw6znd3J7P3uoIR07uwTLGOogtz1p6+0sna66eBoXu7tBiVQA==", + "path": "excelnumberformat/1.1.0", + "hashPath": "excelnumberformat.1.1.0.nupkg.sha512" + }, + "RBush.Signed/4.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-aP5KQxL5RnFNGW1f0euYVBfCatkLw5iEzMRJcXKq8LWWP4Cp3+qoSq1tDDL2vvJ2rM0ychmVMa2VaEKLS6uX4w==", + "path": "rbush.signed/4.0.0", + "hashPath": "rbush.signed.4.0.0.nupkg.sha512" + }, "runtime.android-arm.runtime.native.System.IO.Ports/10.0.3": { "type": "package", "serviceable": true, @@ -330,6 +450,20 @@ "path": "runtime.osx-x64.runtime.native.system.io.ports/10.0.3", "hashPath": "runtime.osx-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512" }, + "SixLabors.Fonts/1.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-LFQsCZlV0xlUyXAOMUo5kkSl+8zAQXXbbdwWchtk0B4o7zotZhQsQOcJUELGHdfPfm/xDAsz6hONAuV25bJaAg==", + "path": "sixlabors.fonts/1.0.0", + "hashPath": "sixlabors.fonts.1.0.0.nupkg.sha512" + }, + "System.IO.Packaging/8.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-KYkIOAvPexQOLDxPO2g0BVoWInnQhPpkFzRqvNrNrMhVT6kqhVr0zEb6KCHlptLFukxnZrjuMVAnxK7pOGUYrw==", + "path": "system.io.packaging/8.0.1", + "hashPath": "system.io.packaging.8.0.1.nupkg.sha512" + }, "System.IO.Ports/10.0.3": { "type": "package", "serviceable": true, diff --git a/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.dll b/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.dll index f01caaa..6c13307 100644 Binary files a/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.dll and b/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.dll differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.exe b/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.exe index af5cbc6..68df936 100644 Binary files a/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.exe and b/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.exe differ diff --git a/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.pdb b/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.pdb index 67630c8..26d31c3 100644 Binary files a/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.pdb and b/measurement_machine/bin/Debug/net8.0-windows/measurement_machine.pdb differ diff --git a/measurement_machine/measurement_machine.csproj b/measurement_machine/measurement_machine.csproj index 14c4c01..ab02fdf 100644 --- a/measurement_machine/measurement_machine.csproj +++ b/measurement_machine/measurement_machine.csproj @@ -14,7 +14,8 @@ - + + diff --git a/measurement_machine/obj/Debug/net8.0-windows/App.g.cs b/measurement_machine/obj/Debug/net8.0-windows/App.g.cs index fc04547..dc0bd17 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/App.g.cs +++ b/measurement_machine/obj/Debug/net8.0-windows/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "41C38BB7CEE04CFFF7F7EE1B20E542E446EC3536" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ADF116FA07A429694B2A5B51049D24F3D2BFE740" //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. diff --git a/measurement_machine/obj/Debug/net8.0-windows/App.g.i.cs b/measurement_machine/obj/Debug/net8.0-windows/App.g.i.cs index fc04547..dc0bd17 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/App.g.i.cs +++ b/measurement_machine/obj/Debug/net8.0-windows/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "41C38BB7CEE04CFFF7F7EE1B20E542E446EC3536" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ADF116FA07A429694B2A5B51049D24F3D2BFE740" //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. diff --git a/measurement_machine/obj/Debug/net8.0-windows/MainWindow.g.cs b/measurement_machine/obj/Debug/net8.0-windows/MainWindow.g.cs index ccc3c75..7a92b2a 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/MainWindow.g.cs +++ b/measurement_machine/obj/Debug/net8.0-windows/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0F81E2B7C39DA72EF75D38B78EF4FB2F74DDC42A" +#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8A159A743A1A920CE70D4235910EFD3AA48434D6" //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. diff --git a/measurement_machine/obj/Debug/net8.0-windows/MainWindow.g.i.cs b/measurement_machine/obj/Debug/net8.0-windows/MainWindow.g.i.cs index 9858ca4..7a92b2a 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/MainWindow.g.i.cs +++ b/measurement_machine/obj/Debug/net8.0-windows/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5C3B300E7BBDDCAC4598DDBFF09B325352CC6DEA" +#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8A159A743A1A920CE70D4235910EFD3AA48434D6" //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. @@ -372,7 +372,7 @@ namespace measurement_machine { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/measurement_machine;V1.0.0.0;component/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/measurement_machine;component/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/measurement_machine/obj/Debug/net8.0-windows/apphost.exe b/measurement_machine/obj/Debug/net8.0-windows/apphost.exe index af5cbc6..68df936 100644 Binary files a/measurement_machine/obj/Debug/net8.0-windows/apphost.exe and b/measurement_machine/obj/Debug/net8.0-windows/apphost.exe differ diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.AssemblyInfo.cs b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.AssemblyInfo.cs index 8d51b41..a679256 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.AssemblyInfo.cs +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.AssemblyInfo.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // -// 이 코드는 도구를 사용하여 생성되었습니다. -// 런타임 버전:4.0.30319.42000 +// This code was generated by a tool. // -// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 -// 이러한 변경 내용이 손실됩니다. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -14,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("measurement_machine")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ff85fe6e53dcfb83b0303a9e6a2ea881a2101623")] [assembly: System.Reflection.AssemblyProductAttribute("measurement_machine")] [assembly: System.Reflection.AssemblyTitleAttribute("measurement_machine")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.AssemblyInfoInputs.cache b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.AssemblyInfoInputs.cache index cad30cc..3079526 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.AssemblyInfoInputs.cache +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.AssemblyInfoInputs.cache @@ -1 +1 @@ -b0db9ff87219401292410d85c2ca76705ffe5cef24c27945b817f2e4e91eb498 +222c10d2a1836ea988422f58a3b59c326ae24bab935d2fb0dc628c60e0256d9a diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.GeneratedMSBuildEditorConfig.editorconfig b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.GeneratedMSBuildEditorConfig.editorconfig index 8129190..68c1189 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.GeneratedMSBuildEditorConfig.editorconfig +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.GeneratedMSBuildEditorConfig.editorconfig @@ -10,7 +10,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = measurement_machine -build_property.ProjectDir = C:\Users\temp\Desktop\measurement_machine\measurement_machine\ +build_property.ProjectDir = C:\Users\guseo\Desktop\measurement_machine\measurement_machine\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.CsWinRTUseWindowsUIXamlProjections = false diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.assets.cache b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.assets.cache index d91457d..866263f 100644 Binary files a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.assets.cache and b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.assets.cache differ diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.AssemblyReference.cache b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.AssemblyReference.cache index 73010cf..7dc50cc 100644 Binary files a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.AssemblyReference.cache and b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.AssemblyReference.cache differ diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.CoreCompileInputs.cache b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.CoreCompileInputs.cache index b23e8a9..41c2d1a 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.CoreCompileInputs.cache +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -93086bed2897f2529af6c088ddac86eac96e6168306771229e53da84b4cc0b10 +fed85a36ed65270aca7a3d9c027c06e85a5fecbca424b8c87ea5dc42194f938b diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.FileListAbsolute.txt b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.FileListAbsolute.txt index db95d39..fea82ac 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.FileListAbsolute.txt +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.csproj.FileListAbsolute.txt @@ -38,3 +38,51 @@ C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\win\lib\net8.0\System.IO.Ports.dll C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.csproj.AssemblyReference.cache C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurem.762993FF.Up2Date +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\refint\measurement_machine.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.pdb +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\MainWindow.baml +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\MainWindow.g.cs +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\App.g.cs +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine_MarkupCompile.cache +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.g.resources +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.AssemblyInfoInputs.cache +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.AssemblyInfo.cs +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.csproj.CoreCompileInputs.cache +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\measurement_machine.exe +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\measurement_machine.deps.json +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\measurement_machine.runtimeconfig.json +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\measurement_machine.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\measurement_machine.pdb +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\System.IO.Ports.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\android-arm\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\android-arm64\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\android-x64\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\android-x86\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\linux-arm\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\linux-arm64\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\linux-bionic-arm64\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\linux-bionic-x64\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\linux-musl-arm\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\linux-musl-arm64\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\linux-musl-x64\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\linux-x64\native\libSystem.IO.Ports.Native.so +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\maccatalyst-arm64\native\libSystem.IO.Ports.Native.dylib +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\maccatalyst-x64\native\libSystem.IO.Ports.Native.dylib +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\osx-arm64\native\libSystem.IO.Ports.Native.dylib +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\osx-x64\native\libSystem.IO.Ports.Native.dylib +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.csproj.AssemblyReference.cache +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurem.762993FF.Up2Date +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\measurement_machine.genruntimeconfig.cache +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\ref\measurement_machine.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\unix\lib\net8.0\System.IO.Ports.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\runtimes\win\lib\net8.0\System.IO.Ports.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\ClosedXML.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\ClosedXML.Parser.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\DocumentFormat.OpenXml.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\DocumentFormat.OpenXml.Framework.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\ExcelNumberFormat.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\RBush.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\SixLabors.Fonts.dll +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\bin\Debug\net8.0-windows\System.IO.Packaging.dll diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.designer.deps.json b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.designer.deps.json index 122430f..7c734ac 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.designer.deps.json +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.designer.deps.json @@ -6,6 +6,67 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { + "ClosedXML/0.105.0": { + "dependencies": { + "ClosedXML.Parser": "2.0.0", + "DocumentFormat.OpenXml": "3.1.1", + "ExcelNumberFormat": "1.1.0", + "RBush.Signed": "4.0.0", + "SixLabors.Fonts": "1.0.0" + }, + "runtime": { + "lib/netstandard2.1/ClosedXML.dll": { + "assemblyVersion": "0.105.0.0", + "fileVersion": "0.105.0.0" + } + } + }, + "ClosedXML.Parser/2.0.0": { + "runtime": { + "lib/netstandard2.1/ClosedXML.Parser.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "DocumentFormat.OpenXml/3.1.1": { + "dependencies": { + "DocumentFormat.OpenXml.Framework": "3.1.1" + }, + "runtime": { + "lib/net8.0/DocumentFormat.OpenXml.dll": { + "assemblyVersion": "3.1.1.0", + "fileVersion": "3.1.1.0" + } + } + }, + "DocumentFormat.OpenXml.Framework/3.1.1": { + "dependencies": { + "System.IO.Packaging": "8.0.1" + }, + "runtime": { + "lib/net8.0/DocumentFormat.OpenXml.Framework.dll": { + "assemblyVersion": "3.1.1.0", + "fileVersion": "3.1.1.0" + } + } + }, + "ExcelNumberFormat/1.1.0": { + "runtime": { + "lib/netstandard2.0/ExcelNumberFormat.dll": { + "assemblyVersion": "1.1.0.0", + "fileVersion": "1.1.0.0" + } + } + }, + "RBush.Signed/4.0.0": { + "runtime": { + "lib/net8.0/RBush.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.0.0.0" + } + } + }, "runtime.android-arm.runtime.native.System.IO.Ports/10.0.3": { "runtimeTargets": { "runtimes/android-arm/native/libSystem.IO.Ports.Native.so": { @@ -170,6 +231,22 @@ } } }, + "SixLabors.Fonts/1.0.0": { + "runtime": { + "lib/netcoreapp3.1/SixLabors.Fonts.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "System.IO.Packaging/8.0.1": { + "runtime": { + "lib/net8.0/System.IO.Packaging.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.0.1024.46610" + } + } + }, "System.IO.Ports/10.0.3": { "dependencies": { "runtime.native.System.IO.Ports": "10.0.3" @@ -198,6 +275,48 @@ } }, "libraries": { + "ClosedXML/0.105.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-U0hAdnYyPvF7TqHMFloxrS7pmozab79tFFF4c/bgPtqeelUs7ILpUd3r3c7C0a/DXsUZb3k1n4Pf7Q2LMyMQOg==", + "path": "closedxml/0.105.0", + "hashPath": "closedxml.0.105.0.nupkg.sha512" + }, + "ClosedXML.Parser/2.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ngTqjYreDYNytG1W5d3ewHsw0ukmmrgV7EKnS4/40rXoYZGt07jrBvo+N+GxT49rcageUMUiprV0jYT4nwVBHQ==", + "path": "closedxml.parser/2.0.0", + "hashPath": "closedxml.parser.2.0.0.nupkg.sha512" + }, + "DocumentFormat.OpenXml/3.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2z9QBzeTLNNKWM9SaOSDMegfQk/7hDuElOsmF77pKZMkFRP/GHA/W/4yOAQD9kn15N/FsFxHn3QVYkatuZghiA==", + "path": "documentformat.openxml/3.1.1", + "hashPath": "documentformat.openxml.3.1.1.nupkg.sha512" + }, + "DocumentFormat.OpenXml.Framework/3.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-6APEp/ElZV58S/4v8mf4Ke3ONEDORs64MqdD64Z7wWpcHANB9oovQsGIwtqjnKihulOj7T0a6IxHIHOfMqKOng==", + "path": "documentformat.openxml.framework/3.1.1", + "hashPath": "documentformat.openxml.framework.3.1.1.nupkg.sha512" + }, + "ExcelNumberFormat/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-R3BVHPs9O+RkExbZYTGT0+9HLbi8ZrNij1Yziyw6znd3J7P3uoIR07uwTLGOogtz1p6+0sna66eBoXu7tBiVQA==", + "path": "excelnumberformat/1.1.0", + "hashPath": "excelnumberformat.1.1.0.nupkg.sha512" + }, + "RBush.Signed/4.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-aP5KQxL5RnFNGW1f0euYVBfCatkLw5iEzMRJcXKq8LWWP4Cp3+qoSq1tDDL2vvJ2rM0ychmVMa2VaEKLS6uX4w==", + "path": "rbush.signed/4.0.0", + "hashPath": "rbush.signed.4.0.0.nupkg.sha512" + }, "runtime.android-arm.runtime.native.System.IO.Ports/10.0.3": { "type": "package", "serviceable": true, @@ -317,6 +436,20 @@ "path": "runtime.osx-x64.runtime.native.system.io.ports/10.0.3", "hashPath": "runtime.osx-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512" }, + "SixLabors.Fonts/1.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-LFQsCZlV0xlUyXAOMUo5kkSl+8zAQXXbbdwWchtk0B4o7zotZhQsQOcJUELGHdfPfm/xDAsz6hONAuV25bJaAg==", + "path": "sixlabors.fonts/1.0.0", + "hashPath": "sixlabors.fonts.1.0.0.nupkg.sha512" + }, + "System.IO.Packaging/8.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-KYkIOAvPexQOLDxPO2g0BVoWInnQhPpkFzRqvNrNrMhVT6kqhVr0zEb6KCHlptLFukxnZrjuMVAnxK7pOGUYrw==", + "path": "system.io.packaging/8.0.1", + "hashPath": "system.io.packaging.8.0.1.nupkg.sha512" + }, "System.IO.Ports/10.0.3": { "type": "package", "serviceable": true, diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.designer.runtimeconfig.json b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.designer.runtimeconfig.json index 38b88ae..677287e 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.designer.runtimeconfig.json +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.designer.runtimeconfig.json @@ -12,8 +12,8 @@ } ], "additionalProbingPaths": [ - "C:\\Users\\temp\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\temp\\.nuget\\packages", + "C:\\Users\\guseo\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\guseo\\.nuget\\packages", "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configProperties": { diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.dll b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.dll index f01caaa..6c13307 100644 Binary files a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.dll and b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.dll differ diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.genruntimeconfig.cache b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.genruntimeconfig.cache index a81cb09..b51781e 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.genruntimeconfig.cache +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.genruntimeconfig.cache @@ -1 +1 @@ -0ae1e7fb465fdc6f61ad22bed7eb6c0abf237e1121b1845a66cdb4a73cd607c9 +6a8393d4a22f705b1585ebb3ce8bf883e6a92dddb9c8cea98dd46338a4f96cf2 diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.pdb b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.pdb index 67630c8..26d31c3 100644 Binary files a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.pdb and b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine.pdb differ diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine_MarkupCompile.cache b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine_MarkupCompile.cache index 69da28e..1b1d527 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine_MarkupCompile.cache +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\ +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\ measurement_machine none false TRACE;DEBUG;NET;NET8_0;NETCOREAPP;WINDOWS;WINDOWS7_0;NET5_0_OR_GREATER;NET6_0_OR_GREATER;NET7_0_OR_GREATER;NET8_0_OR_GREATER;NETCOREAPP3_0_OR_GREATER;NETCOREAPP3_1_OR_GREATER;WINDOWS7_0_OR_GREATER -C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\App.xaml +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\App.xaml 11407045341 -9-1156738426 -199668304077 +11406979381 +206932012319 MainWindow.xaml; False diff --git a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine_MarkupCompile.i.cache b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine_MarkupCompile.i.cache index 65b9b9b..9822097 100644 --- a/measurement_machine/obj/Debug/net8.0-windows/measurement_machine_MarkupCompile.i.cache +++ b/measurement_machine/obj/Debug/net8.0-windows/measurement_machine_MarkupCompile.i.cache @@ -4,16 +4,16 @@ winexe C# .cs -C:\Users\temp\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\ +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Debug\net8.0-windows\ measurement_machine none false TRACE;DEBUG;NET;NET8_0;NETCOREAPP;WINDOWS;WINDOWS7_0;NET5_0_OR_GREATER;NET6_0_OR_GREATER;NET7_0_OR_GREATER;NET8_0_OR_GREATER;NETCOREAPP3_0_OR_GREATER;NETCOREAPP3_1_OR_GREATER;WINDOWS7_0_OR_GREATER -C:\Users\temp\Desktop\measurement_machine\measurement_machine\App.xaml +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\App.xaml 11407045341 -11-1901813622 -199668304077 +13-338095815 +206932012319 MainWindow.xaml; False diff --git a/measurement_machine/obj/Debug/net8.0-windows/ref/measurement_machine.dll b/measurement_machine/obj/Debug/net8.0-windows/ref/measurement_machine.dll index 01568c9..4c3e156 100644 Binary files a/measurement_machine/obj/Debug/net8.0-windows/ref/measurement_machine.dll and b/measurement_machine/obj/Debug/net8.0-windows/ref/measurement_machine.dll differ diff --git a/measurement_machine/obj/Debug/net8.0-windows/refint/measurement_machine.dll b/measurement_machine/obj/Debug/net8.0-windows/refint/measurement_machine.dll index 01568c9..4c3e156 100644 Binary files a/measurement_machine/obj/Debug/net8.0-windows/refint/measurement_machine.dll and b/measurement_machine/obj/Debug/net8.0-windows/refint/measurement_machine.dll differ diff --git a/measurement_machine/obj/Release/net8.0-windows/App.g.cs b/measurement_machine/obj/Release/net8.0-windows/App.g.cs index fc04547..dc0bd17 100644 --- a/measurement_machine/obj/Release/net8.0-windows/App.g.cs +++ b/measurement_machine/obj/Release/net8.0-windows/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "41C38BB7CEE04CFFF7F7EE1B20E542E446EC3536" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ADF116FA07A429694B2A5B51049D24F3D2BFE740" //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. diff --git a/measurement_machine/obj/Release/net8.0-windows/MainWindow.baml b/measurement_machine/obj/Release/net8.0-windows/MainWindow.baml index 2a478b9..a03c702 100644 Binary files a/measurement_machine/obj/Release/net8.0-windows/MainWindow.baml and b/measurement_machine/obj/Release/net8.0-windows/MainWindow.baml differ diff --git a/measurement_machine/obj/Release/net8.0-windows/MainWindow.g.cs b/measurement_machine/obj/Release/net8.0-windows/MainWindow.g.cs index 9607e69..7a92b2a 100644 --- a/measurement_machine/obj/Release/net8.0-windows/MainWindow.g.cs +++ b/measurement_machine/obj/Release/net8.0-windows/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FB8480F6A08A31356DD937121E59E5A75669DA46" +#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8A159A743A1A920CE70D4235910EFD3AA48434D6" //------------------------------------------------------------------------------ // // 이 코드는 도구를 사용하여 생성되었습니다. @@ -177,7 +177,7 @@ namespace measurement_machine { #line hidden - #line 474 "..\..\..\MainWindow.xaml" + #line 476 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox ControllerPortComboBox; @@ -185,7 +185,7 @@ namespace measurement_machine { #line hidden - #line 491 "..\..\..\MainWindow.xaml" + #line 493 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox ControllerBaudComboBox; @@ -193,7 +193,23 @@ namespace measurement_machine { #line hidden - #line 541 "..\..\..\MainWindow.xaml" + #line 510 "..\..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBox ControllerStartCommandTextBox; + + #line default + #line hidden + + + #line 520 "..\..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBox ControllerStopCommandTextBox; + + #line default + #line hidden + + + #line 563 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock SettingsStatusTextBlock; @@ -201,7 +217,7 @@ namespace measurement_machine { #line hidden - #line 552 "..\..\..\MainWindow.xaml" + #line 574 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid LeftMeasureTabGrid; @@ -209,7 +225,7 @@ namespace measurement_machine { #line hidden - #line 586 "..\..\..\MainWindow.xaml" + #line 609 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox LeftPortComboBox; @@ -217,7 +233,7 @@ namespace measurement_machine { #line hidden - #line 603 "..\..\..\MainWindow.xaml" + #line 626 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox LeftBaudComboBox; @@ -225,7 +241,15 @@ namespace measurement_machine { #line hidden - #line 664 "..\..\..\MainWindow.xaml" + #line 643 "..\..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBox LeftReadCommandTextBox; + + #line default + #line hidden + + + #line 697 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid RightMeasureTabGrid; @@ -233,7 +257,7 @@ namespace measurement_machine { #line hidden - #line 698 "..\..\..\MainWindow.xaml" + #line 732 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox RightPortComboBox; @@ -241,7 +265,7 @@ namespace measurement_machine { #line hidden - #line 715 "..\..\..\MainWindow.xaml" + #line 749 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox RightBaudComboBox; @@ -249,7 +273,15 @@ namespace measurement_machine { #line hidden - #line 776 "..\..\..\MainWindow.xaml" + #line 766 "..\..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBox RightReadCommandTextBox; + + #line default + #line hidden + + + #line 820 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid UserTabGrid; @@ -257,7 +289,7 @@ namespace measurement_machine { #line hidden - #line 813 "..\..\..\MainWindow.xaml" + #line 858 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox LeftMinSpecTextBox; @@ -265,7 +297,7 @@ namespace measurement_machine { #line hidden - #line 822 "..\..\..\MainWindow.xaml" + #line 867 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox LeftMaxSpecTextBox; @@ -273,7 +305,7 @@ namespace measurement_machine { #line hidden - #line 831 "..\..\..\MainWindow.xaml" + #line 876 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox RightMinSpecTextBox; @@ -281,7 +313,7 @@ namespace measurement_machine { #line hidden - #line 840 "..\..\..\MainWindow.xaml" + #line 885 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox RightMaxSpecTextBox; @@ -289,7 +321,7 @@ namespace measurement_machine { #line hidden - #line 849 "..\..\..\MainWindow.xaml" + #line 894 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox RelayIdleTextBox; @@ -297,15 +329,31 @@ namespace measurement_machine { #line hidden - #line 858 "..\..\..\MainWindow.xaml" + #line 903 "..\..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBox MeasurementTimeoutTextBox; + + #line default + #line hidden + + + #line 912 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBox MeasurementIdleTextBox; + internal System.Windows.Controls.TextBox ResultHoldTextBox; #line default #line hidden - #line 901 "..\..\..\MainWindow.xaml" + #line 921 "..\..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBox SavePathTextBox; + + #line default + #line hidden + + + #line 964 "..\..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock UserConfigStatusTextBlock; @@ -462,7 +510,7 @@ namespace measurement_machine { return; case 24: - #line 484 "..\..\..\MainWindow.xaml" + #line 486 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.RefreshPortsButton_Click); #line default @@ -473,140 +521,158 @@ namespace measurement_machine { return; case 26: - #line 501 "..\..\..\MainWindow.xaml" + #line 503 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.TestControllerPortButton_Click); #line default #line hidden return; case 27: + this.ControllerStartCommandTextBox = ((System.Windows.Controls.TextBox)(target)); + return; + case 28: + this.ControllerStopCommandTextBox = ((System.Windows.Controls.TextBox)(target)); + return; + case 29: - #line 530 "..\..\..\MainWindow.xaml" + #line 552 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveControllerConfigButton_Click); #line default #line hidden return; - case 28: + case 30: this.SettingsStatusTextBlock = ((System.Windows.Controls.TextBlock)(target)); return; - case 29: + case 31: this.LeftMeasureTabGrid = ((System.Windows.Controls.Grid)(target)); return; - case 30: + case 32: this.LeftPortComboBox = ((System.Windows.Controls.ComboBox)(target)); return; - case 31: + case 33: - #line 596 "..\..\..\MainWindow.xaml" + #line 619 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.RefreshPortsButton_Click); #line default #line hidden return; - case 32: + case 34: this.LeftBaudComboBox = ((System.Windows.Controls.ComboBox)(target)); return; - case 33: + case 35: - #line 613 "..\..\..\MainWindow.xaml" + #line 636 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.TestLeftPortButton_Click); #line default #line hidden return; - case 34: + case 36: + this.LeftReadCommandTextBox = ((System.Windows.Controls.TextBox)(target)); + return; + case 37: - #line 642 "..\..\..\MainWindow.xaml" + #line 675 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveLeftConfigButton_Click); #line default #line hidden return; - case 35: + case 38: - #line 657 "..\..\..\MainWindow.xaml" + #line 690 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.TestLeftPortButton_Click); #line default #line hidden return; - case 36: + case 39: this.RightMeasureTabGrid = ((System.Windows.Controls.Grid)(target)); return; - case 37: + case 40: this.RightPortComboBox = ((System.Windows.Controls.ComboBox)(target)); return; - case 38: + case 41: - #line 708 "..\..\..\MainWindow.xaml" + #line 742 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.RefreshPortsButton_Click); #line default #line hidden return; - case 39: + case 42: this.RightBaudComboBox = ((System.Windows.Controls.ComboBox)(target)); return; - case 40: + case 43: - #line 725 "..\..\..\MainWindow.xaml" + #line 759 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.TestRightPortButton_Click); #line default #line hidden return; - case 41: + case 44: + this.RightReadCommandTextBox = ((System.Windows.Controls.TextBox)(target)); + return; + case 45: - #line 754 "..\..\..\MainWindow.xaml" + #line 798 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveRightConfigButton_Click); #line default #line hidden return; - case 42: + case 46: - #line 769 "..\..\..\MainWindow.xaml" + #line 813 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.TestRightPortButton_Click); #line default #line hidden return; - case 43: + case 47: this.UserTabGrid = ((System.Windows.Controls.Grid)(target)); return; - case 44: + case 48: this.LeftMinSpecTextBox = ((System.Windows.Controls.TextBox)(target)); return; - case 45: + case 49: this.LeftMaxSpecTextBox = ((System.Windows.Controls.TextBox)(target)); return; - case 46: + case 50: this.RightMinSpecTextBox = ((System.Windows.Controls.TextBox)(target)); return; - case 47: + case 51: this.RightMaxSpecTextBox = ((System.Windows.Controls.TextBox)(target)); return; - case 48: + case 52: this.RelayIdleTextBox = ((System.Windows.Controls.TextBox)(target)); return; - case 49: - this.MeasurementIdleTextBox = ((System.Windows.Controls.TextBox)(target)); + case 53: + this.MeasurementTimeoutTextBox = ((System.Windows.Controls.TextBox)(target)); return; - case 50: + case 54: + this.ResultHoldTextBox = ((System.Windows.Controls.TextBox)(target)); + return; + case 55: + this.SavePathTextBox = ((System.Windows.Controls.TextBox)(target)); + return; + case 56: - #line 890 "..\..\..\MainWindow.xaml" + #line 953 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveUserConfigButton_Click); #line default #line hidden return; - case 51: + case 57: this.UserConfigStatusTextBlock = ((System.Windows.Controls.TextBlock)(target)); return; - case 52: + case 58: - #line 922 "..\..\..\MainWindow.xaml" + #line 985 "..\..\..\MainWindow.xaml" ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.BackToMainButton_Click); #line default diff --git a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.AssemblyInfo.cs b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.AssemblyInfo.cs index 124958c..c7adcc9 100644 --- a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.AssemblyInfo.cs +++ b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("measurement_machine")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ff85fe6e53dcfb83b0303a9e6a2ea881a2101623")] [assembly: System.Reflection.AssemblyProductAttribute("measurement_machine")] [assembly: System.Reflection.AssemblyTitleAttribute("measurement_machine")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.AssemblyInfoInputs.cache b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.AssemblyInfoInputs.cache index 371d4bc..dd8301d 100644 --- a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.AssemblyInfoInputs.cache +++ b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.AssemblyInfoInputs.cache @@ -1 +1 @@ -50d08954ec4935562cbc582a8ae1e0a9c8d238d2911c8c546651302f43939738 +a682d1b47a24a2994a81f21472fe44089fe6683ec909c5d7786cd4090d77653a diff --git a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.GeneratedMSBuildEditorConfig.editorconfig b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.GeneratedMSBuildEditorConfig.editorconfig index 13facdb..68c1189 100644 --- a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.GeneratedMSBuildEditorConfig.editorconfig +++ b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.GeneratedMSBuildEditorConfig.editorconfig @@ -10,7 +10,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = measurement_machine -build_property.ProjectDir = C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\ +build_property.ProjectDir = C:\Users\guseo\Desktop\measurement_machine\measurement_machine\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.CsWinRTUseWindowsUIXamlProjections = false diff --git a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.assets.cache b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.assets.cache index 6321e87..c823119 100644 Binary files a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.assets.cache and b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.assets.cache differ diff --git a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.csproj.AssemblyReference.cache b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.csproj.AssemblyReference.cache index 73010cf..6f87ee9 100644 Binary files a/measurement_machine/obj/Release/net8.0-windows/measurement_machine.csproj.AssemblyReference.cache and b/measurement_machine/obj/Release/net8.0-windows/measurement_machine.csproj.AssemblyReference.cache differ diff --git a/measurement_machine/obj/Release/net8.0-windows/measurement_machine_MarkupCompile.cache b/measurement_machine/obj/Release/net8.0-windows/measurement_machine_MarkupCompile.cache index 477434b..3131330 100644 --- a/measurement_machine/obj/Release/net8.0-windows/measurement_machine_MarkupCompile.cache +++ b/measurement_machine/obj/Release/net8.0-windows/measurement_machine_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\obj\Release\net8.0-windows\ +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\obj\Release\net8.0-windows\ measurement_machine none false TRACE;RELEASE;NET;NET8_0;NETCOREAPP;WINDOWS;WINDOWS7_0;NET5_0_OR_GREATER;NET6_0_OR_GREATER;NET7_0_OR_GREATER;NET8_0_OR_GREATER;NETCOREAPP3_0_OR_GREATER;NETCOREAPP3_1_OR_GREATER;WINDOWS7_0_OR_GREATER -C:\Users\temp\Desktop\measurment_machine\measurement_machine\measurement_machine\App.xaml +C:\Users\guseo\Desktop\measurement_machine\measurement_machine\App.xaml 11407045341 9-1357389785 -199668304077 +1992126064815 MainWindow.xaml; False diff --git a/measurement_machine/obj/measurement_machine.csproj.nuget.dgspec.json b/measurement_machine/obj/measurement_machine.csproj.nuget.dgspec.json index 4e94553..ca01f4b 100644 --- a/measurement_machine/obj/measurement_machine.csproj.nuget.dgspec.json +++ b/measurement_machine/obj/measurement_machine.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj": {} + "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj": {} }, "projects": { - "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj": { + "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "projectUniqueName": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", "projectName": "measurement_machine", - "projectPath": "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", - "packagesPath": "C:\\Users\\temp\\.nuget\\packages\\", - "outputPath": "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\obj\\", + "projectPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "packagesPath": "C:\\Users\\guseo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\temp\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\guseo\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -51,6 +51,10 @@ "net8.0-windows7.0": { "targetAlias": "net8.0-windows", "dependencies": { + "ClosedXML": { + "target": "Package", + "version": "[0.105.0, )" + }, "System.IO.Ports": { "target": "Package", "version": "[10.0.3, )" @@ -75,305 +79,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.103/PortableRuntimeIdentifierGraph.json", - "packagesToPrune": { - "Microsoft.CSharp": "(, 4.7.32767]", - "Microsoft.VisualBasic": "(, 10.3.32767]", - "Microsoft.Win32.Primitives": "(, 4.3.32767]", - "Microsoft.Win32.Registry": "(, 5.0.32767]", - "Microsoft.Win32.Registry.AccessControl": "(, 8.0.32767]", - "Microsoft.Win32.SystemEvents": "(, 8.0.32767]", - "runtime.any.System.Collections": "(, 4.3.32767]", - "runtime.any.System.Diagnostics.Tools": "(, 4.3.32767]", - "runtime.any.System.Diagnostics.Tracing": "(, 4.3.32767]", - "runtime.any.System.Globalization": "(, 4.3.32767]", - "runtime.any.System.Globalization.Calendars": "(, 4.3.32767]", - "runtime.any.System.IO": "(, 4.3.32767]", - "runtime.any.System.Reflection": "(, 4.3.32767]", - "runtime.any.System.Reflection.Extensions": "(, 4.3.32767]", - "runtime.any.System.Reflection.Primitives": "(, 4.3.32767]", - "runtime.any.System.Resources.ResourceManager": "(, 4.3.32767]", - "runtime.any.System.Runtime": "(, 4.3.32767]", - "runtime.any.System.Runtime.Handles": "(, 4.3.32767]", - "runtime.any.System.Runtime.InteropServices": "(, 4.3.32767]", - "runtime.any.System.Text.Encoding": "(, 4.3.32767]", - "runtime.any.System.Text.Encoding.Extensions": "(, 4.3.32767]", - "runtime.any.System.Threading.Tasks": "(, 4.3.32767]", - "runtime.any.System.Threading.Timer": "(, 4.3.32767]", - "runtime.aot.System.Collections": "(, 4.3.32767]", - "runtime.aot.System.Diagnostics.Tools": "(, 4.3.32767]", - "runtime.aot.System.Diagnostics.Tracing": "(, 4.3.32767]", - "runtime.aot.System.Globalization": "(, 4.3.32767]", - "runtime.aot.System.Globalization.Calendars": "(, 4.3.32767]", - "runtime.aot.System.IO": "(, 4.3.32767]", - "runtime.aot.System.Reflection": "(, 4.3.32767]", - "runtime.aot.System.Reflection.Extensions": "(, 4.3.32767]", - "runtime.aot.System.Reflection.Primitives": "(, 4.3.32767]", - "runtime.aot.System.Resources.ResourceManager": "(, 4.3.32767]", - "runtime.aot.System.Runtime": "(, 4.3.32767]", - "runtime.aot.System.Runtime.Handles": "(, 4.3.32767]", - "runtime.aot.System.Runtime.InteropServices": "(, 4.3.32767]", - "runtime.aot.System.Text.Encoding": "(, 4.3.32767]", - "runtime.aot.System.Text.Encoding.Extensions": "(, 4.3.32767]", - "runtime.aot.System.Threading.Tasks": "(, 4.3.32767]", - "runtime.aot.System.Threading.Timer": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.native.System.Security.Cryptography.Apple": "(, 4.3.32767]", - "runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.unix.Microsoft.Win32.Primitives": "(, 4.3.32767]", - "runtime.unix.System.Console": "(, 4.3.32767]", - "runtime.unix.System.Diagnostics.Debug": "(, 4.3.32767]", - "runtime.unix.System.IO.FileSystem": "(, 4.3.32767]", - "runtime.unix.System.Net.Primitives": "(, 4.3.32767]", - "runtime.unix.System.Net.Sockets": "(, 4.3.32767]", - "runtime.unix.System.Private.Uri": "(, 4.3.32767]", - "runtime.unix.System.Runtime.Extensions": "(, 4.3.32767]", - "runtime.win.Microsoft.Win32.Primitives": "(, 4.3.32767]", - "runtime.win.System.Console": "(, 4.3.32767]", - "runtime.win.System.Diagnostics.Debug": "(, 4.3.32767]", - "runtime.win.System.IO.FileSystem": "(, 4.3.32767]", - "runtime.win.System.Net.Primitives": "(, 4.3.32767]", - "runtime.win.System.Net.Sockets": "(, 4.3.32767]", - "runtime.win.System.Runtime.Extensions": "(, 4.3.32767]", - "runtime.win10-arm-aot.runtime.native.System.IO.Compression": "(, 4.0.32767]", - "runtime.win10-arm64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.win10-x64-aot.runtime.native.System.IO.Compression": "(, 4.0.32767]", - "runtime.win10-x86-aot.runtime.native.System.IO.Compression": "(, 4.0.32767]", - "runtime.win7-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.win7-x86.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.win7.System.Private.Uri": "(, 4.3.32767]", - "runtime.win8-arm.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "System.AppContext": "(, 4.3.32767]", - "System.Buffers": "(, 4.6.32767]", - "System.CodeDom": "(, 8.0.32767]", - "System.Collections": "(, 4.3.32767]", - "System.Collections.Concurrent": "(, 4.3.32767]", - "System.Collections.Immutable": "(, 8.0.32767]", - "System.Collections.NonGeneric": "(, 4.3.32767]", - "System.Collections.Specialized": "(, 4.3.32767]", - "System.ComponentModel": "(, 4.3.32767]", - "System.ComponentModel.Annotations": "(, 5.0.32767]", - "System.ComponentModel.EventBasedAsync": "(, 4.3.32767]", - "System.ComponentModel.Primitives": "(, 4.3.32767]", - "System.ComponentModel.TypeConverter": "(, 4.3.32767]", - "System.Configuration.ConfigurationManager": "(, 8.0.32767]", - "System.Console": "(, 4.3.32767]", - "System.Data.Common": "(, 4.3.32767]", - "System.Data.DataSetExtensions": "(, 4.5.32767]", - "System.Diagnostics.Contracts": "(, 4.3.32767]", - "System.Diagnostics.Debug": "(, 4.3.32767]", - "System.Diagnostics.DiagnosticSource": "(, 8.0.32767]", - "System.Diagnostics.EventLog": "(, 8.0.32767]", - "System.Diagnostics.FileVersionInfo": "(, 4.3.32767]", - "System.Diagnostics.PerformanceCounter": "(, 8.0.32767]", - "System.Diagnostics.Process": "(, 4.3.32767]", - "System.Diagnostics.StackTrace": "(, 4.3.32767]", - "System.Diagnostics.TextWriterTraceListener": "(, 4.3.32767]", - "System.Diagnostics.Tools": "(, 4.3.32767]", - "System.Diagnostics.TraceSource": "(, 4.3.32767]", - "System.Diagnostics.Tracing": "(, 4.3.32767]", - "System.DirectoryServices": "(, 8.0.32767]", - "System.Drawing.Common": "(, 8.0.32767]", - "System.Drawing.Primitives": "(, 4.3.32767]", - "System.Dynamic.Runtime": "(, 4.3.32767]", - "System.Formats.Asn1": "(, 8.0.32767]", - "System.Globalization": "(, 4.3.32767]", - "System.Globalization.Calendars": "(, 4.3.32767]", - "System.Globalization.Extensions": "(, 4.3.32767]", - "System.IO": "(, 4.3.32767]", - "System.IO.Compression": "(, 4.3.32767]", - "System.IO.Compression.ZipFile": "(, 4.3.32767]", - "System.IO.FileSystem": "(, 4.3.32767]", - "System.IO.FileSystem.AccessControl": "(, 5.0.32767]", - "System.IO.FileSystem.DriveInfo": "(, 4.3.32767]", - "System.IO.FileSystem.Primitives": "(, 4.3.32767]", - "System.IO.FileSystem.Watcher": "(, 4.3.32767]", - "System.IO.IsolatedStorage": "(, 4.3.32767]", - "System.IO.MemoryMappedFiles": "(, 4.3.32767]", - "System.IO.Packaging": "(, 8.0.32767]", - "System.IO.Pipes": "(, 4.3.32767]", - "System.IO.Pipes.AccessControl": "(, 4.6.32767]", - "System.IO.UnmanagedMemoryStream": "(, 4.3.32767]", - "System.Linq": "(, 4.3.32767]", - "System.Linq.Expressions": "(, 4.3.32767]", - "System.Linq.Parallel": "(, 4.3.32767]", - "System.Linq.Queryable": "(, 4.3.32767]", - "System.Memory": "(, 4.6.32767]", - "System.Net.Http": "(, 4.3.32767]", - "System.Net.Http.Json": "(, 8.0.32767]", - "System.Net.NameResolution": "(, 4.3.32767]", - "System.Net.NetworkInformation": "(, 4.3.32767]", - "System.Net.Ping": "(, 4.3.32767]", - "System.Net.Primitives": "(, 4.3.32767]", - "System.Net.Requests": "(, 4.3.32767]", - "System.Net.Security": "(, 4.3.32767]", - "System.Net.Sockets": "(, 4.3.32767]", - "System.Net.WebHeaderCollection": "(, 4.3.32767]", - "System.Net.WebSockets": "(, 4.3.32767]", - "System.Net.WebSockets.Client": "(, 4.3.32767]", - "System.Numerics.Vectors": "(, 4.6.32767]", - "System.ObjectModel": "(, 4.3.32767]", - "System.Private.DataContractSerialization": "(, 4.3.32767]", - "System.Private.Uri": "(, 4.3.32767]", - "System.Reflection": "(, 4.3.32767]", - "System.Reflection.DispatchProxy": "(, 4.8.32767]", - "System.Reflection.Emit": "(, 4.7.32767]", - "System.Reflection.Emit.ILGeneration": "(, 4.7.32767]", - "System.Reflection.Emit.Lightweight": "(, 4.7.32767]", - "System.Reflection.Extensions": "(, 4.3.32767]", - "System.Reflection.Metadata": "(, 8.0.32767]", - "System.Reflection.Primitives": "(, 4.3.32767]", - "System.Reflection.TypeExtensions": "(, 4.7.32767]", - "System.Resources.Extensions": "(, 8.0.32767]", - "System.Resources.Reader": "(, 4.3.32767]", - "System.Resources.ResourceManager": "(, 4.3.32767]", - "System.Resources.Writer": "(, 4.3.32767]", - "System.Runtime": "(, 4.3.32767]", - "System.Runtime.CompilerServices.Unsafe": "(, 6.1.32767]", - "System.Runtime.CompilerServices.VisualC": "(, 4.3.32767]", - "System.Runtime.Extensions": "(, 4.3.32767]", - "System.Runtime.Handles": "(, 4.3.32767]", - "System.Runtime.InteropServices": "(, 4.3.32767]", - "System.Runtime.InteropServices.RuntimeInformation": "(, 4.3.32767]", - "System.Runtime.Loader": "(, 4.3.32767]", - "System.Runtime.Numerics": "(, 4.3.32767]", - "System.Runtime.Serialization.Formatters": "(, 4.3.32767]", - "System.Runtime.Serialization.Json": "(, 4.3.32767]", - "System.Runtime.Serialization.Primitives": "(, 4.3.32767]", - "System.Runtime.Serialization.Xml": "(, 4.3.32767]", - "System.Security.AccessControl": "(, 6.0.32767]", - "System.Security.Claims": "(, 4.3.32767]", - "System.Security.Cryptography.Algorithms": "(, 4.3.32767]", - "System.Security.Cryptography.Cng": "(, 4.6.32767]", - "System.Security.Cryptography.Csp": "(, 4.3.32767]", - "System.Security.Cryptography.Encoding": "(, 4.3.32767]", - "System.Security.Cryptography.OpenSsl": "(, 5.0.32767]", - "System.Security.Cryptography.Pkcs": "(, 8.0.32767]", - "System.Security.Cryptography.Primitives": "(, 4.3.32767]", - "System.Security.Cryptography.ProtectedData": "(, 8.0.32767]", - "System.Security.Cryptography.X509Certificates": "(, 4.3.32767]", - "System.Security.Cryptography.Xml": "(, 8.0.32767]", - "System.Security.Permissions": "(, 8.0.32767]", - "System.Security.Principal": "(, 4.3.32767]", - "System.Security.Principal.Windows": "(, 5.0.32767]", - "System.Security.SecureString": "(, 4.3.32767]", - "System.Text.Encoding": "(, 4.3.32767]", - "System.Text.Encoding.CodePages": "(, 8.0.32767]", - "System.Text.Encoding.Extensions": "(, 4.3.32767]", - "System.Text.Encodings.Web": "(, 8.0.32767]", - "System.Text.Json": "(, 8.0.32767]", - "System.Text.RegularExpressions": "(, 4.3.32767]", - "System.Threading": "(, 4.3.32767]", - "System.Threading.AccessControl": "(, 8.0.32767]", - "System.Threading.Channels": "(, 8.0.32767]", - "System.Threading.Overlapped": "(, 4.3.32767]", - "System.Threading.Tasks": "(, 4.3.32767]", - "System.Threading.Tasks.Dataflow": "(, 8.0.32767]", - "System.Threading.Tasks.Extensions": "(, 4.6.32767]", - "System.Threading.Tasks.Parallel": "(, 4.3.32767]", - "System.Threading.Thread": "(, 4.3.32767]", - "System.Threading.ThreadPool": "(, 4.3.32767]", - "System.Threading.Timer": "(, 4.3.32767]", - "System.ValueTuple": "(, 4.6.32767]", - "System.Windows.Extensions": "(, 8.0.32767]", - "System.Xml.ReaderWriter": "(, 4.3.32767]", - "System.Xml.XDocument": "(, 4.3.32767]", - "System.Xml.XmlDocument": "(, 4.3.32767]", - "System.Xml.XmlSerializer": "(, 4.3.32767]", - "System.Xml.XPath": "(, 4.3.32767]", - "System.Xml.XPath.XDocument": "(, 4.3.32767]" - } + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.103/PortableRuntimeIdentifierGraph.json" } } } diff --git a/measurement_machine/obj/measurement_machine.csproj.nuget.g.props b/measurement_machine/obj/measurement_machine.csproj.nuget.g.props index 4b66787..4ae295d 100644 --- a/measurement_machine/obj/measurement_machine.csproj.nuget.g.props +++ b/measurement_machine/obj/measurement_machine.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\temp\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\guseo\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.14.1 + 7.0.0 - + \ No newline at end of file diff --git a/measurement_machine/obj/project.assets.json b/measurement_machine/obj/project.assets.json index 20c3a12..dceead1 100644 --- a/measurement_machine/obj/project.assets.json +++ b/measurement_machine/obj/project.assets.json @@ -2,6 +2,97 @@ "version": 3, "targets": { "net8.0-windows7.0": { + "ClosedXML/0.105.0": { + "type": "package", + "dependencies": { + "ClosedXML.Parser": "2.0.0", + "DocumentFormat.OpenXml": "[3.1.1, 4.0.0)", + "ExcelNumberFormat": "1.1.0", + "RBush.Signed": "4.0.0", + "SixLabors.Fonts": "1.0.0" + }, + "compile": { + "lib/netstandard2.1/ClosedXML.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/netstandard2.1/ClosedXML.dll": { + "related": ".pdb;.xml" + } + } + }, + "ClosedXML.Parser/2.0.0": { + "type": "package", + "compile": { + "lib/netstandard2.1/ClosedXML.Parser.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.1/ClosedXML.Parser.dll": { + "related": ".xml" + } + } + }, + "DocumentFormat.OpenXml/3.1.1": { + "type": "package", + "dependencies": { + "DocumentFormat.OpenXml.Framework": "3.1.1" + }, + "compile": { + "lib/net8.0/DocumentFormat.OpenXml.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/DocumentFormat.OpenXml.dll": { + "related": ".xml" + } + } + }, + "DocumentFormat.OpenXml.Framework/3.1.1": { + "type": "package", + "dependencies": { + "System.IO.Packaging": "8.0.1" + }, + "compile": { + "lib/net8.0/DocumentFormat.OpenXml.Framework.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/DocumentFormat.OpenXml.Framework.dll": { + "related": ".xml" + } + } + }, + "ExcelNumberFormat/1.1.0": { + "type": "package", + "compile": { + "lib/netstandard2.0/ExcelNumberFormat.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/ExcelNumberFormat.dll": { + "related": ".xml" + } + } + }, + "RBush.Signed/4.0.0": { + "type": "package", + "compile": { + "lib/net8.0/RBush.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/RBush.dll": { + "related": ".xml" + } + } + }, "runtime.android-arm.runtime.native.System.IO.Ports/10.0.3": { "type": "package", "runtimeTargets": { @@ -1127,6 +1218,35 @@ } } }, + "SixLabors.Fonts/1.0.0": { + "type": "package", + "compile": { + "lib/netcoreapp3.1/SixLabors.Fonts.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netcoreapp3.1/SixLabors.Fonts.dll": { + "related": ".xml" + } + } + }, + "System.IO.Packaging/8.0.1": { + "type": "package", + "compile": { + "lib/net8.0/System.IO.Packaging.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/System.IO.Packaging.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "System.IO.Ports/10.0.3": { "type": "package", "dependencies": { @@ -1159,6 +1279,124 @@ } }, "libraries": { + "ClosedXML/0.105.0": { + "sha512": "U0hAdnYyPvF7TqHMFloxrS7pmozab79tFFF4c/bgPtqeelUs7ILpUd3r3c7C0a/DXsUZb3k1n4Pf7Q2LMyMQOg==", + "type": "package", + "path": "closedxml/0.105.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "closedxml.0.105.0.nupkg.sha512", + "closedxml.nuspec", + "lib/netstandard2.0/ClosedXML.dll", + "lib/netstandard2.0/ClosedXML.pdb", + "lib/netstandard2.0/ClosedXML.xml", + "lib/netstandard2.1/ClosedXML.dll", + "lib/netstandard2.1/ClosedXML.pdb", + "lib/netstandard2.1/ClosedXML.xml", + "nuget-logo.png" + ] + }, + "ClosedXML.Parser/2.0.0": { + "sha512": "ngTqjYreDYNytG1W5d3ewHsw0ukmmrgV7EKnS4/40rXoYZGt07jrBvo+N+GxT49rcageUMUiprV0jYT4nwVBHQ==", + "type": "package", + "path": "closedxml.parser/2.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "README.md", + "closedxml.parser.2.0.0.nupkg.sha512", + "closedxml.parser.nuspec", + "lib/netstandard2.0/ClosedXML.Parser.dll", + "lib/netstandard2.0/ClosedXML.Parser.xml", + "lib/netstandard2.1/ClosedXML.Parser.dll", + "lib/netstandard2.1/ClosedXML.Parser.xml" + ] + }, + "DocumentFormat.OpenXml/3.1.1": { + "sha512": "2z9QBzeTLNNKWM9SaOSDMegfQk/7hDuElOsmF77pKZMkFRP/GHA/W/4yOAQD9kn15N/FsFxHn3QVYkatuZghiA==", + "type": "package", + "path": "documentformat.openxml/3.1.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "README.md", + "documentformat.openxml.3.1.1.nupkg.sha512", + "documentformat.openxml.nuspec", + "icon.png", + "lib/net35/DocumentFormat.OpenXml.dll", + "lib/net35/DocumentFormat.OpenXml.xml", + "lib/net40/DocumentFormat.OpenXml.dll", + "lib/net40/DocumentFormat.OpenXml.xml", + "lib/net46/DocumentFormat.OpenXml.dll", + "lib/net46/DocumentFormat.OpenXml.xml", + "lib/net8.0/DocumentFormat.OpenXml.dll", + "lib/net8.0/DocumentFormat.OpenXml.xml", + "lib/netstandard2.0/DocumentFormat.OpenXml.dll", + "lib/netstandard2.0/DocumentFormat.OpenXml.xml" + ] + }, + "DocumentFormat.OpenXml.Framework/3.1.1": { + "sha512": "6APEp/ElZV58S/4v8mf4Ke3ONEDORs64MqdD64Z7wWpcHANB9oovQsGIwtqjnKihulOj7T0a6IxHIHOfMqKOng==", + "type": "package", + "path": "documentformat.openxml.framework/3.1.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "README.md", + "documentformat.openxml.framework.3.1.1.nupkg.sha512", + "documentformat.openxml.framework.nuspec", + "icon.png", + "lib/net35/DocumentFormat.OpenXml.Framework.dll", + "lib/net35/DocumentFormat.OpenXml.Framework.xml", + "lib/net40/DocumentFormat.OpenXml.Framework.dll", + "lib/net40/DocumentFormat.OpenXml.Framework.xml", + "lib/net46/DocumentFormat.OpenXml.Framework.dll", + "lib/net46/DocumentFormat.OpenXml.Framework.xml", + "lib/net6.0/DocumentFormat.OpenXml.Framework.dll", + "lib/net6.0/DocumentFormat.OpenXml.Framework.xml", + "lib/net8.0/DocumentFormat.OpenXml.Framework.dll", + "lib/net8.0/DocumentFormat.OpenXml.Framework.xml", + "lib/netstandard2.0/DocumentFormat.OpenXml.Framework.dll", + "lib/netstandard2.0/DocumentFormat.OpenXml.Framework.xml" + ] + }, + "ExcelNumberFormat/1.1.0": { + "sha512": "R3BVHPs9O+RkExbZYTGT0+9HLbi8ZrNij1Yziyw6znd3J7P3uoIR07uwTLGOogtz1p6+0sna66eBoXu7tBiVQA==", + "type": "package", + "path": "excelnumberformat/1.1.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "excelnumberformat.1.1.0.nupkg.sha512", + "excelnumberformat.nuspec", + "icon.png", + "lib/net20/ExcelNumberFormat.dll", + "lib/net20/ExcelNumberFormat.xml", + "lib/netstandard1.0/ExcelNumberFormat.dll", + "lib/netstandard1.0/ExcelNumberFormat.xml", + "lib/netstandard2.0/ExcelNumberFormat.dll", + "lib/netstandard2.0/ExcelNumberFormat.xml" + ] + }, + "RBush.Signed/4.0.0": { + "sha512": "aP5KQxL5RnFNGW1f0euYVBfCatkLw5iEzMRJcXKq8LWWP4Cp3+qoSq1tDDL2vvJ2rM0ychmVMa2VaEKLS6uX4w==", + "type": "package", + "path": "rbush.signed/4.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/net47/RBush.dll", + "lib/net47/RBush.xml", + "lib/net8.0/RBush.dll", + "lib/net8.0/RBush.xml", + "lib/netstandard2.0/RBush.dll", + "lib/netstandard2.0/RBush.xml", + "rbush.signed.4.0.0.nupkg.sha512", + "rbush.signed.nuspec", + "readme.md" + ] + }, "runtime.android-arm.runtime.native.System.IO.Ports/10.0.3": { "sha512": "6W4qZX0X7FF+PHM9Kaa5ZsTLcGJAzCU7FB4Tjy1vTg2rUIEjDqijWTtpz8vY6gBzZaG+tD0/EKUyGnfq6d/d/Q==", "type": "package", @@ -1670,6 +1908,53 @@ "useSharedDesignerContext.txt" ] }, + "SixLabors.Fonts/1.0.0": { + "sha512": "LFQsCZlV0xlUyXAOMUo5kkSl+8zAQXXbbdwWchtk0B4o7zotZhQsQOcJUELGHdfPfm/xDAsz6hONAuV25bJaAg==", + "type": "package", + "path": "sixlabors.fonts/1.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/netcoreapp3.1/SixLabors.Fonts.dll", + "lib/netcoreapp3.1/SixLabors.Fonts.xml", + "lib/netstandard2.0/SixLabors.Fonts.dll", + "lib/netstandard2.0/SixLabors.Fonts.xml", + "lib/netstandard2.1/SixLabors.Fonts.dll", + "lib/netstandard2.1/SixLabors.Fonts.xml", + "sixlabors.fonts.1.0.0.nupkg.sha512", + "sixlabors.fonts.128.png", + "sixlabors.fonts.nuspec" + ] + }, + "System.IO.Packaging/8.0.1": { + "sha512": "KYkIOAvPexQOLDxPO2g0BVoWInnQhPpkFzRqvNrNrMhVT6kqhVr0zEb6KCHlptLFukxnZrjuMVAnxK7pOGUYrw==", + "type": "package", + "path": "system.io.packaging/8.0.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/System.IO.Packaging.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/System.IO.Packaging.targets", + "lib/net462/System.IO.Packaging.dll", + "lib/net462/System.IO.Packaging.xml", + "lib/net6.0/System.IO.Packaging.dll", + "lib/net6.0/System.IO.Packaging.xml", + "lib/net7.0/System.IO.Packaging.dll", + "lib/net7.0/System.IO.Packaging.xml", + "lib/net8.0/System.IO.Packaging.dll", + "lib/net8.0/System.IO.Packaging.xml", + "lib/netstandard2.0/System.IO.Packaging.dll", + "lib/netstandard2.0/System.IO.Packaging.xml", + "system.io.packaging.8.0.1.nupkg.sha512", + "system.io.packaging.nuspec", + "useSharedDesignerContext.txt" + ] + }, "System.IO.Ports/10.0.3": { "sha512": "Zs04mZ/dQtaFQ+hpQNDtijBs+6aM9j2fQPp8zNZTfh8DboVNNv7Sw6gH00hT+PVcAhEozlfT+n59Svm6Ug8ROA==", "type": "package", @@ -1714,27 +1999,28 @@ }, "projectFileDependencyGroups": { "net8.0-windows7.0": [ + "ClosedXML >= 0.105.0", "System.IO.Ports >= 10.0.3" ] }, "packageFolders": { - "C:\\Users\\temp\\.nuget\\packages\\": {}, + "C:\\Users\\guseo\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "projectUniqueName": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", "projectName": "measurement_machine", - "projectPath": "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", - "packagesPath": "C:\\Users\\temp\\.nuget\\packages\\", - "outputPath": "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\obj\\", + "projectPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "packagesPath": "C:\\Users\\guseo\\.nuget\\packages\\", + "outputPath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\temp\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\guseo\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -1768,6 +2054,10 @@ "net8.0-windows7.0": { "targetAlias": "net8.0-windows", "dependencies": { + "ClosedXML": { + "target": "Package", + "version": "[0.105.0, )" + }, "System.IO.Ports": { "target": "Package", "version": "[10.0.3, )" @@ -1792,305 +2082,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.103/PortableRuntimeIdentifierGraph.json", - "packagesToPrune": { - "Microsoft.CSharp": "(, 4.7.32767]", - "Microsoft.VisualBasic": "(, 10.3.32767]", - "Microsoft.Win32.Primitives": "(, 4.3.32767]", - "Microsoft.Win32.Registry": "(, 5.0.32767]", - "Microsoft.Win32.Registry.AccessControl": "(, 8.0.32767]", - "Microsoft.Win32.SystemEvents": "(, 8.0.32767]", - "runtime.any.System.Collections": "(, 4.3.32767]", - "runtime.any.System.Diagnostics.Tools": "(, 4.3.32767]", - "runtime.any.System.Diagnostics.Tracing": "(, 4.3.32767]", - "runtime.any.System.Globalization": "(, 4.3.32767]", - "runtime.any.System.Globalization.Calendars": "(, 4.3.32767]", - "runtime.any.System.IO": "(, 4.3.32767]", - "runtime.any.System.Reflection": "(, 4.3.32767]", - "runtime.any.System.Reflection.Extensions": "(, 4.3.32767]", - "runtime.any.System.Reflection.Primitives": "(, 4.3.32767]", - "runtime.any.System.Resources.ResourceManager": "(, 4.3.32767]", - "runtime.any.System.Runtime": "(, 4.3.32767]", - "runtime.any.System.Runtime.Handles": "(, 4.3.32767]", - "runtime.any.System.Runtime.InteropServices": "(, 4.3.32767]", - "runtime.any.System.Text.Encoding": "(, 4.3.32767]", - "runtime.any.System.Text.Encoding.Extensions": "(, 4.3.32767]", - "runtime.any.System.Threading.Tasks": "(, 4.3.32767]", - "runtime.any.System.Threading.Timer": "(, 4.3.32767]", - "runtime.aot.System.Collections": "(, 4.3.32767]", - "runtime.aot.System.Diagnostics.Tools": "(, 4.3.32767]", - "runtime.aot.System.Diagnostics.Tracing": "(, 4.3.32767]", - "runtime.aot.System.Globalization": "(, 4.3.32767]", - "runtime.aot.System.Globalization.Calendars": "(, 4.3.32767]", - "runtime.aot.System.IO": "(, 4.3.32767]", - "runtime.aot.System.Reflection": "(, 4.3.32767]", - "runtime.aot.System.Reflection.Extensions": "(, 4.3.32767]", - "runtime.aot.System.Reflection.Primitives": "(, 4.3.32767]", - "runtime.aot.System.Resources.ResourceManager": "(, 4.3.32767]", - "runtime.aot.System.Runtime": "(, 4.3.32767]", - "runtime.aot.System.Runtime.Handles": "(, 4.3.32767]", - "runtime.aot.System.Runtime.InteropServices": "(, 4.3.32767]", - "runtime.aot.System.Text.Encoding": "(, 4.3.32767]", - "runtime.aot.System.Text.Encoding.Extensions": "(, 4.3.32767]", - "runtime.aot.System.Threading.Tasks": "(, 4.3.32767]", - "runtime.aot.System.Threading.Timer": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.native.System.Security.Cryptography.Apple": "(, 4.3.32767]", - "runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "(, 4.3.32767]", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.Net.Http": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.Net.Security": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography": "(, 4.3.32767]", - "runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "(, 4.3.32767]", - "runtime.unix.Microsoft.Win32.Primitives": "(, 4.3.32767]", - "runtime.unix.System.Console": "(, 4.3.32767]", - "runtime.unix.System.Diagnostics.Debug": "(, 4.3.32767]", - "runtime.unix.System.IO.FileSystem": "(, 4.3.32767]", - "runtime.unix.System.Net.Primitives": "(, 4.3.32767]", - "runtime.unix.System.Net.Sockets": "(, 4.3.32767]", - "runtime.unix.System.Private.Uri": "(, 4.3.32767]", - "runtime.unix.System.Runtime.Extensions": "(, 4.3.32767]", - "runtime.win.Microsoft.Win32.Primitives": "(, 4.3.32767]", - "runtime.win.System.Console": "(, 4.3.32767]", - "runtime.win.System.Diagnostics.Debug": "(, 4.3.32767]", - "runtime.win.System.IO.FileSystem": "(, 4.3.32767]", - "runtime.win.System.Net.Primitives": "(, 4.3.32767]", - "runtime.win.System.Net.Sockets": "(, 4.3.32767]", - "runtime.win.System.Runtime.Extensions": "(, 4.3.32767]", - "runtime.win10-arm-aot.runtime.native.System.IO.Compression": "(, 4.0.32767]", - "runtime.win10-arm64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.win10-x64-aot.runtime.native.System.IO.Compression": "(, 4.0.32767]", - "runtime.win10-x86-aot.runtime.native.System.IO.Compression": "(, 4.0.32767]", - "runtime.win7-x64.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.win7-x86.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "runtime.win7.System.Private.Uri": "(, 4.3.32767]", - "runtime.win8-arm.runtime.native.System.IO.Compression": "(, 4.3.32767]", - "System.AppContext": "(, 4.3.32767]", - "System.Buffers": "(, 4.6.32767]", - "System.CodeDom": "(, 8.0.32767]", - "System.Collections": "(, 4.3.32767]", - "System.Collections.Concurrent": "(, 4.3.32767]", - "System.Collections.Immutable": "(, 8.0.32767]", - "System.Collections.NonGeneric": "(, 4.3.32767]", - "System.Collections.Specialized": "(, 4.3.32767]", - "System.ComponentModel": "(, 4.3.32767]", - "System.ComponentModel.Annotations": "(, 5.0.32767]", - "System.ComponentModel.EventBasedAsync": "(, 4.3.32767]", - "System.ComponentModel.Primitives": "(, 4.3.32767]", - "System.ComponentModel.TypeConverter": "(, 4.3.32767]", - "System.Configuration.ConfigurationManager": "(, 8.0.32767]", - "System.Console": "(, 4.3.32767]", - "System.Data.Common": "(, 4.3.32767]", - "System.Data.DataSetExtensions": "(, 4.5.32767]", - "System.Diagnostics.Contracts": "(, 4.3.32767]", - "System.Diagnostics.Debug": "(, 4.3.32767]", - "System.Diagnostics.DiagnosticSource": "(, 8.0.32767]", - "System.Diagnostics.EventLog": "(, 8.0.32767]", - "System.Diagnostics.FileVersionInfo": "(, 4.3.32767]", - "System.Diagnostics.PerformanceCounter": "(, 8.0.32767]", - "System.Diagnostics.Process": "(, 4.3.32767]", - "System.Diagnostics.StackTrace": "(, 4.3.32767]", - "System.Diagnostics.TextWriterTraceListener": "(, 4.3.32767]", - "System.Diagnostics.Tools": "(, 4.3.32767]", - "System.Diagnostics.TraceSource": "(, 4.3.32767]", - "System.Diagnostics.Tracing": "(, 4.3.32767]", - "System.DirectoryServices": "(, 8.0.32767]", - "System.Drawing.Common": "(, 8.0.32767]", - "System.Drawing.Primitives": "(, 4.3.32767]", - "System.Dynamic.Runtime": "(, 4.3.32767]", - "System.Formats.Asn1": "(, 8.0.32767]", - "System.Globalization": "(, 4.3.32767]", - "System.Globalization.Calendars": "(, 4.3.32767]", - "System.Globalization.Extensions": "(, 4.3.32767]", - "System.IO": "(, 4.3.32767]", - "System.IO.Compression": "(, 4.3.32767]", - "System.IO.Compression.ZipFile": "(, 4.3.32767]", - "System.IO.FileSystem": "(, 4.3.32767]", - "System.IO.FileSystem.AccessControl": "(, 5.0.32767]", - "System.IO.FileSystem.DriveInfo": "(, 4.3.32767]", - "System.IO.FileSystem.Primitives": "(, 4.3.32767]", - "System.IO.FileSystem.Watcher": "(, 4.3.32767]", - "System.IO.IsolatedStorage": "(, 4.3.32767]", - "System.IO.MemoryMappedFiles": "(, 4.3.32767]", - "System.IO.Packaging": "(, 8.0.32767]", - "System.IO.Pipes": "(, 4.3.32767]", - "System.IO.Pipes.AccessControl": "(, 4.6.32767]", - "System.IO.UnmanagedMemoryStream": "(, 4.3.32767]", - "System.Linq": "(, 4.3.32767]", - "System.Linq.Expressions": "(, 4.3.32767]", - "System.Linq.Parallel": "(, 4.3.32767]", - "System.Linq.Queryable": "(, 4.3.32767]", - "System.Memory": "(, 4.6.32767]", - "System.Net.Http": "(, 4.3.32767]", - "System.Net.Http.Json": "(, 8.0.32767]", - "System.Net.NameResolution": "(, 4.3.32767]", - "System.Net.NetworkInformation": "(, 4.3.32767]", - "System.Net.Ping": "(, 4.3.32767]", - "System.Net.Primitives": "(, 4.3.32767]", - "System.Net.Requests": "(, 4.3.32767]", - "System.Net.Security": "(, 4.3.32767]", - "System.Net.Sockets": "(, 4.3.32767]", - "System.Net.WebHeaderCollection": "(, 4.3.32767]", - "System.Net.WebSockets": "(, 4.3.32767]", - "System.Net.WebSockets.Client": "(, 4.3.32767]", - "System.Numerics.Vectors": "(, 4.6.32767]", - "System.ObjectModel": "(, 4.3.32767]", - "System.Private.DataContractSerialization": "(, 4.3.32767]", - "System.Private.Uri": "(, 4.3.32767]", - "System.Reflection": "(, 4.3.32767]", - "System.Reflection.DispatchProxy": "(, 4.8.32767]", - "System.Reflection.Emit": "(, 4.7.32767]", - "System.Reflection.Emit.ILGeneration": "(, 4.7.32767]", - "System.Reflection.Emit.Lightweight": "(, 4.7.32767]", - "System.Reflection.Extensions": "(, 4.3.32767]", - "System.Reflection.Metadata": "(, 8.0.32767]", - "System.Reflection.Primitives": "(, 4.3.32767]", - "System.Reflection.TypeExtensions": "(, 4.7.32767]", - "System.Resources.Extensions": "(, 8.0.32767]", - "System.Resources.Reader": "(, 4.3.32767]", - "System.Resources.ResourceManager": "(, 4.3.32767]", - "System.Resources.Writer": "(, 4.3.32767]", - "System.Runtime": "(, 4.3.32767]", - "System.Runtime.CompilerServices.Unsafe": "(, 6.1.32767]", - "System.Runtime.CompilerServices.VisualC": "(, 4.3.32767]", - "System.Runtime.Extensions": "(, 4.3.32767]", - "System.Runtime.Handles": "(, 4.3.32767]", - "System.Runtime.InteropServices": "(, 4.3.32767]", - "System.Runtime.InteropServices.RuntimeInformation": "(, 4.3.32767]", - "System.Runtime.Loader": "(, 4.3.32767]", - "System.Runtime.Numerics": "(, 4.3.32767]", - "System.Runtime.Serialization.Formatters": "(, 4.3.32767]", - "System.Runtime.Serialization.Json": "(, 4.3.32767]", - "System.Runtime.Serialization.Primitives": "(, 4.3.32767]", - "System.Runtime.Serialization.Xml": "(, 4.3.32767]", - "System.Security.AccessControl": "(, 6.0.32767]", - "System.Security.Claims": "(, 4.3.32767]", - "System.Security.Cryptography.Algorithms": "(, 4.3.32767]", - "System.Security.Cryptography.Cng": "(, 4.6.32767]", - "System.Security.Cryptography.Csp": "(, 4.3.32767]", - "System.Security.Cryptography.Encoding": "(, 4.3.32767]", - "System.Security.Cryptography.OpenSsl": "(, 5.0.32767]", - "System.Security.Cryptography.Pkcs": "(, 8.0.32767]", - "System.Security.Cryptography.Primitives": "(, 4.3.32767]", - "System.Security.Cryptography.ProtectedData": "(, 8.0.32767]", - "System.Security.Cryptography.X509Certificates": "(, 4.3.32767]", - "System.Security.Cryptography.Xml": "(, 8.0.32767]", - "System.Security.Permissions": "(, 8.0.32767]", - "System.Security.Principal": "(, 4.3.32767]", - "System.Security.Principal.Windows": "(, 5.0.32767]", - "System.Security.SecureString": "(, 4.3.32767]", - "System.Text.Encoding": "(, 4.3.32767]", - "System.Text.Encoding.CodePages": "(, 8.0.32767]", - "System.Text.Encoding.Extensions": "(, 4.3.32767]", - "System.Text.Encodings.Web": "(, 8.0.32767]", - "System.Text.Json": "(, 8.0.32767]", - "System.Text.RegularExpressions": "(, 4.3.32767]", - "System.Threading": "(, 4.3.32767]", - "System.Threading.AccessControl": "(, 8.0.32767]", - "System.Threading.Channels": "(, 8.0.32767]", - "System.Threading.Overlapped": "(, 4.3.32767]", - "System.Threading.Tasks": "(, 4.3.32767]", - "System.Threading.Tasks.Dataflow": "(, 8.0.32767]", - "System.Threading.Tasks.Extensions": "(, 4.6.32767]", - "System.Threading.Tasks.Parallel": "(, 4.3.32767]", - "System.Threading.Thread": "(, 4.3.32767]", - "System.Threading.ThreadPool": "(, 4.3.32767]", - "System.Threading.Timer": "(, 4.3.32767]", - "System.ValueTuple": "(, 4.6.32767]", - "System.Windows.Extensions": "(, 8.0.32767]", - "System.Xml.ReaderWriter": "(, 4.3.32767]", - "System.Xml.XDocument": "(, 4.3.32767]", - "System.Xml.XmlDocument": "(, 4.3.32767]", - "System.Xml.XmlSerializer": "(, 4.3.32767]", - "System.Xml.XPath": "(, 4.3.32767]", - "System.Xml.XPath.XDocument": "(, 4.3.32767]" - } + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.103/PortableRuntimeIdentifierGraph.json" } } } diff --git a/measurement_machine/obj/project.nuget.cache b/measurement_machine/obj/project.nuget.cache index 44bf666..0a3f5be 100644 --- a/measurement_machine/obj/project.nuget.cache +++ b/measurement_machine/obj/project.nuget.cache @@ -1,27 +1,35 @@ { "version": 2, - "dgSpecHash": "upi+k8C1GFw=", + "dgSpecHash": "FvfQgPBB2bo=", "success": true, - "projectFilePath": "C:\\Users\\temp\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", + "projectFilePath": "C:\\Users\\guseo\\Desktop\\measurement_machine\\measurement_machine\\measurement_machine.csproj", "expectedPackageFiles": [ - "C:\\Users\\temp\\.nuget\\packages\\runtime.android-arm.runtime.native.system.io.ports\\10.0.3\\runtime.android-arm.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.android-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.android-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.android-x64.runtime.native.system.io.ports\\10.0.3\\runtime.android-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.android-x86.runtime.native.system.io.ports\\10.0.3\\runtime.android-x86.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\10.0.3\\runtime.linux-arm.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.linux-bionic-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-bionic-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.linux-bionic-x64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-bionic-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.linux-musl-arm.runtime.native.system.io.ports\\10.0.3\\runtime.linux-musl-arm.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.linux-musl-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-musl-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.linux-musl-x64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-musl-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.maccatalyst-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.maccatalyst-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.maccatalyst-x64.runtime.native.system.io.ports\\10.0.3\\runtime.maccatalyst-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.native.system.io.ports\\10.0.3\\runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.osx-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\10.0.3\\runtime.osx-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", - "C:\\Users\\temp\\.nuget\\packages\\system.io.ports\\10.0.3\\system.io.ports.10.0.3.nupkg.sha512" + "C:\\Users\\guseo\\.nuget\\packages\\closedxml\\0.105.0\\closedxml.0.105.0.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\closedxml.parser\\2.0.0\\closedxml.parser.2.0.0.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\documentformat.openxml\\3.1.1\\documentformat.openxml.3.1.1.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\documentformat.openxml.framework\\3.1.1\\documentformat.openxml.framework.3.1.1.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\excelnumberformat\\1.1.0\\excelnumberformat.1.1.0.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\rbush.signed\\4.0.0\\rbush.signed.4.0.0.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.android-arm.runtime.native.system.io.ports\\10.0.3\\runtime.android-arm.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.android-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.android-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.android-x64.runtime.native.system.io.ports\\10.0.3\\runtime.android-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.android-x86.runtime.native.system.io.ports\\10.0.3\\runtime.android-x86.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\10.0.3\\runtime.linux-arm.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.linux-bionic-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-bionic-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.linux-bionic-x64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-bionic-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.linux-musl-arm.runtime.native.system.io.ports\\10.0.3\\runtime.linux-musl-arm.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.linux-musl-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-musl-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.linux-musl-x64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-musl-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\10.0.3\\runtime.linux-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.maccatalyst-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.maccatalyst-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.maccatalyst-x64.runtime.native.system.io.ports\\10.0.3\\runtime.maccatalyst-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.native.system.io.ports\\10.0.3\\runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\10.0.3\\runtime.osx-arm64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\10.0.3\\runtime.osx-x64.runtime.native.system.io.ports.10.0.3.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\sixlabors.fonts\\1.0.0\\sixlabors.fonts.1.0.0.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\system.io.packaging\\8.0.1\\system.io.packaging.8.0.1.nupkg.sha512", + "C:\\Users\\guseo\\.nuget\\packages\\system.io.ports\\10.0.3\\system.io.ports.10.0.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file