diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb index 81204a8..69f4636 100644 --- a/Icarus/Constants/Const3dPrint.vb +++ b/Icarus/Constants/Const3dPrint.vb @@ -3,7 +3,6 @@ Public Const TABLE = "Table" Public Const TABLE_OUTLINE = "TableOutline" Public Const PART = "Part" - Public Const ORIGINAL_SOLID = "OriginalSolid" Public Const PRINT_SOLID = "PrintSolid" Public Const LAY_MACH_START = "MachStart" Public Const LAY_REFERENCE = "Frame" @@ -151,5 +150,7 @@ Public Const KEY_ISOFILE_PATH = "IsoFilePath" Public Const FILE_PATH = "FilePath" + Public Const PART_NAME = "PartName" + Public Const ENTITY_NAME = "EntityName" End Module diff --git a/Icarus/Constants/ConstIni.vb b/Icarus/Constants/ConstIni.vb index c0cd3a9..2042fb3 100644 --- a/Icarus/Constants/ConstIni.vb +++ b/Icarus/Constants/ConstIni.vb @@ -111,6 +111,7 @@ Public Module ConstIni Public Const K_CURRMATERIAL As String = "CurrMaterial" Public Const K_CURRMACHINING As String = "CurrMachining" Public Const K_VIEWSLIDER As String = "ViewSlider" + Public Const K_IMPORTCURREXTENSION As String = "ImportCurrExtension" Public Const S_MRUFILES As String = "MruFiles" Public Const S_MRUIMPORTFILES As String = "MruImportFiles" diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index 6dae7de..f42ff59 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -123,11 +123,6 @@ DispositionPanelV.xaml - - ImportPanelV.xaml - - - InstrumentPanelV.xaml @@ -154,16 +149,16 @@ MachSaveInDbWindowV.xaml + + ManagePartPanelV.xaml + + + MaterialDbV.xaml - - ModifyPartPanelV.xaml - - - MachineBox.xaml @@ -304,10 +299,6 @@ MSBuild:Compile Designer - - Designer - MSBuild:Compile - MSBuild:Compile Designer @@ -348,14 +339,14 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + Designer MSBuild:Compile - - MSBuild:Compile - Designer - MSBuild:Compile Designer diff --git a/Icarus/LeftPanel/LeftPanelV.xaml b/Icarus/LeftPanel/LeftPanelV.xaml index acfcd48..d96e2dd 100644 --- a/Icarus/LeftPanel/LeftPanelV.xaml +++ b/Icarus/LeftPanel/LeftPanelV.xaml @@ -15,7 +15,8 @@ - + + @@ -36,7 +37,8 @@