From 60ecebf9ffb1995cca7cc53ff34fcc700678e483 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Tue, 10 Jan 2023 11:22:26 +0100 Subject: [PATCH] - export aggiornato con dialogo dedicato --- Icarus/SceneHost/MySceneHostVM.vb | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb index 0b2a2e6..ed9af8d 100644 --- a/Icarus/SceneHost/MySceneHostVM.vb +++ b/Icarus/SceneHost/MySceneHostVM.vb @@ -501,7 +501,19 @@ Public Class MySceneHostVM End Sub Public Overrides Sub ExportProject() - MainController.ExportProject(Path.ChangeExtension(MainController.GetCurrFile(), "dxf")) + ' Reset controller e scena + MainController.ResetStatus() + 'Assegnazione nome file con dialogo + Dim SaveFileDialog As New SaveFileDialog With { + .Title = "Export", + .Filter = "Stereolithography (*.stl)|*.stl" & + "|3D Manufacturing format (*.3mf)|*.3mf", + .FilterIndex = 0, + .FileName = Path.ChangeExtension(MainController.GetCurrFile(), "stl") + } + Dim DialogResult As Boolean? = SaveFileDialog.ShowDialog + If IsNothing(DialogResult) OrElse Not DialogResult Then Return + MainController.ExportProject(SaveFileDialog.FileName, False) End Sub Friend Shadows Sub ExecScript(sFilePath As String) @@ -884,7 +896,7 @@ Public Class MySceneHostVM ' leggo materiale e macchina Dim nTabPartId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, TABLE) If nTabPartId <> GDB_ID.NULL Then - Dim sMachineName As String = "" +Dim sMachineName As String = "" if Not EgtGetInfo(nTabPartId, KEY_MACHINE_NAME, sMachineName) Then sMachineName = "Cms-Kreator" Dim ProjectMachine As Machine = Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = sMachineName) If Not IsNothing(ProjectMachine) Then @@ -1254,7 +1266,7 @@ Public Class MySceneHostVM EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel) Dim nId As Integer = EgtGetFirstObjInSelWin() While nId <> GDB_ID.NULL - ' Se per Griglia da faccia di oggetto +' Se per Griglia da faccia di oggetto If Map.refStartMachPanelVM.bCPlaneObj_IsActive Then If EgtGetType( nId) = GDB_TY.SRF_MESH Then m_nIdToSel = nId @@ -1299,7 +1311,7 @@ Public Class MySceneHostVM End Sub Friend Sub StartMach_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) - ' Se eseguito drag +' Se eseguito drag If Not m_bDragToStart Then ' Se selezione da eseguire @@ -1380,7 +1392,7 @@ Public Class MySceneHostVM End Sub Friend Sub Rib_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) - ' Se eseguito drag +' Se eseguito drag If Not m_bDragToStart Then ' Se selezione da eseguire @@ -1462,10 +1474,10 @@ Public Class MySceneHostVM End Sub Friend Sub ShellNumber_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) - ' Se eseguito drag - If Not m_bDragToStart Then +' Se eseguito drag +If Not m_bDragToStart Then - ' Se selezione da eseguire +' Se selezione da eseguire ElseIf m_nIdToSel <> GDB_ID.NULL Then If Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then ' eseguo comando