diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index 868f45e..cb6340f 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -159,6 +159,11 @@ MaterialDbV.xaml + + ModifyPartPanelV.xaml + + + MachineBox.xaml @@ -343,6 +348,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -623,6 +632,7 @@ + IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR64.exe diff --git a/Icarus/ImportPanel/ImportPanelV.xaml b/Icarus/ImportPanel/ImportPanelV.xaml index 0677b1d..8c9dd96 100644 --- a/Icarus/ImportPanel/ImportPanelV.xaml +++ b/Icarus/ImportPanel/ImportPanelV.xaml @@ -14,7 +14,7 @@ - @@ -70,7 +70,7 @@ - diff --git a/Icarus/ImportPanel/ImportPanelVM.vb b/Icarus/ImportPanel/ImportPanelVM.vb index 4b5b7e6..0a40424 100644 --- a/Icarus/ImportPanel/ImportPanelVM.vb +++ b/Icarus/ImportPanel/ImportPanelVM.vb @@ -238,6 +238,7 @@ Public Class ImportPanelVM Dim nShellNumberLayerId As Integer = GDB_ID.NULL Dim nAuxSolidsLayerId As Integer = GDB_ID.NULL Dim nMachStartLayerId As Integer = GDB_ID.NULL + Dim nOthersLayerId As Integer = GDB_ID.NULL For Each ImportLayer In ImportPart.LayerList Select Case ImportLayer.Type Case ImportLayer.LayerType.PRINT_SOLID @@ -322,7 +323,7 @@ Public Class ImportPanelVM EgtSetColor(GeomEntity.nId, c3LightBlue) Next Case ImportLayer.LayerType.OTHERS - Dim nOthersLayerId As Integer = EgtCreateGroup(nPartId) + nOthersLayerId = EgtCreateGroup(nPartId) EgtSetName(nOthersLayerId, LAY_OTHERS) For Each GeomEntity In ImportLayer.EntityList EgtRelocateGlob(GeomEntity.nId, nOthersLayerId, GDB_POS.LAST_SON) @@ -371,7 +372,7 @@ Public Class ImportPanelVM EgtGetInfo(m_nImportedPartId, FILE_PATH, sFilePath) EgtSetInfo(nPartId, FILE_PATH, sFilePath) EgtSetInfo(nPartId, "PartOnTable", 1) - Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, PrintSolidEntity.nId, nOriginalPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, sFilePath) + Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, PrintSolidEntity.nId, nOriginalPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath) Map.refTopPanelVM.PartList.Add(NewPart) Next End If diff --git a/Icarus/LeftPanel/LeftPanelV.xaml b/Icarus/LeftPanel/LeftPanelV.xaml index 81d4ae5..acfcd48 100644 --- a/Icarus/LeftPanel/LeftPanelV.xaml +++ b/Icarus/LeftPanel/LeftPanelV.xaml @@ -36,7 +36,7 @@ +