diff --git a/Icarus/Constants/ConstMachIni.vb b/Icarus/Constants/ConstMachIni.vb index a33c9ce..220b391 100644 --- a/Icarus/Constants/ConstMachIni.vb +++ b/Icarus/Constants/ConstMachIni.vb @@ -1,6 +1,7 @@ Public Module ConstMachIni - Public Const MACH_INI_FILE_NAME As String = "MachData.ini" + Public Const S_GENERAL As String = "General" + Public Const K_GEN_STD_VIEW As String = "StandardView" Public Const S_MACHINING As String = "Machining" Public Const K_MACH_INITSCRIPT As String = "InitScript" diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb index 0e1ecd1..b6d0516 100644 --- a/Icarus/SceneHost/MySceneHostVM.vb +++ b/Icarus/SceneHost/MySceneHostVM.vb @@ -1,4 +1,5 @@ Imports System.IO +Imports System.Windows.Forms.VisualStyles.VisualStyleElement Imports EgtUILib Imports EgtWPFLib5 Imports Microsoft.Win32 @@ -1142,6 +1143,10 @@ Public Class MySceneHostVM "Please select another material!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning) End If End If + ' aggiorno punto di vista e griglia + EgtSetView( CurrentMachine.nStandardView, False) + EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY()) + EgtZoom(ZM.ALL, False) ' leggo pezzi Map.refTopPanelVM.PartList.Clear() Dim bProjectToRecalc As Boolean = False @@ -1200,7 +1205,7 @@ Public Class MySceneHostVM ' imposto modalita' modifica Map.refTopPanelVM.SelPage = Pages.MODIFY - EgtZoom(ZM.ALL) + EgtDraw() MainScene.SetStatusNull() End Sub diff --git a/Icarus/SecondaryWindow/SecondaryWindowVM.vb b/Icarus/SecondaryWindow/SecondaryWindowVM.vb index d00254e..4e68ece 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowVM.vb +++ b/Icarus/SecondaryWindow/SecondaryWindowVM.vb @@ -97,7 +97,7 @@ Public Class SecondaryWindowVM ' imposto SnapPoint Map.refMyStatusBarVM.SetSnapPointType(Map.refSceneHostVM.SnapType) Map.refMyStatusBarVM.SetMeasureUnit(EgtUiUnitsAreMM) - EgtSetView(VT.ISO_SW, False) + EgtSetView(CurrentMachine.nStandardView, False) ' provo a caricare progetto da linea di comando If Not ProcessCommandLine() Then ' altrimenti creo nuovo progetto di partenza diff --git a/Icarus/SimulationPanel/SimulationPanelVM.vb b/Icarus/SimulationPanel/SimulationPanelVM.vb index ee58007..d197c8b 100644 --- a/Icarus/SimulationPanel/SimulationPanelVM.vb +++ b/Icarus/SimulationPanel/SimulationPanelVM.vb @@ -88,7 +88,7 @@ Public Class SimulationPanelVM UpdateUI() 'Cambio la vista della scena EgtGetGenericView(m_dPrevAngVertDegView, m_dPrevAngHorizDegView) - EgtSetView(VT.ISO_SW, False) + EgtSetView(CurrentMachine.nStandardView, False) EgtSetMachineLook(MySimul.GetMachLook()) ' Nascondo griglia EgtSetGridShow(False, False) diff --git a/Icarus/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb index f85b9cc..04ef26f 100644 --- a/Icarus/SliceManager/SliceManagerVM.vb +++ b/Icarus/SliceManager/SliceManagerVM.vb @@ -870,7 +870,7 @@ Public Class SliceManagerVM Dim nCurrAngVertDeg As Integer = 0 Dim nCurrAngHorizDeg As Integer = 0 EgtGetGenericView(nCurrAngVertDeg, nCurrAngHorizDeg) - EgtSetView(VT.ISO_SW, False) + EgtSetView(CurrentMachine.nStandardView, False) SetTableVisibility(False) EgtZoom(ZM.ALL, False) 'EgtExportSvg(GDB_ID.ROOT, sPreviewImagePath) diff --git a/Icarus/Utility/CurrentMachine.vb b/Icarus/Utility/CurrentMachine.vb index d5e0b02..fb47939 100644 --- a/Icarus/Utility/CurrentMachine.vb +++ b/Icarus/Utility/CurrentMachine.vb @@ -87,6 +87,14 @@ Public Module CurrentMachine End Get End Property + ' direzione di vista standard + Private m_nStandardView As VT = VT.ISO_SW + Public ReadOnly Property nStandardView As VT + Get + Return m_nStandardView + End Get + End Property + #Region "Init" Sub InitCurrentMachine(sMachinesRootDir As String, sMachineName As String) @@ -107,6 +115,21 @@ Public Module CurrentMachine m_sMaterialFilePath = sMachinesRootDir & "\" & sMachineName & "\Materials\Materials.ini" ' leggo altezza massima estrusione impostata su macchina m_dSlicingMaxHeight = GetPrivateProfileDouble(S_MACH_PRINTING3D, K_MAX_HEIGHT, 900, m_sMachIniFile) + ' leggo direzione di vista standard + Dim sView As String = "" + GetPrivateProfileString( S_GENERAL, K_GEN_STD_VIEW, "", sView, m_sMachIniFile) + Select sView + Case "SW" + m_nStandardView = VT.ISO_SW + Case "SE" + m_nStandardView = VT.ISO_SE + Case "NE" + m_nStandardView = VT.ISO_NE + Case "NW" + m_nStandardView = VT.ISO_NW + Case Else + m_nStandardView = VT.ISO_SW + End Select ' Disabilito segnalazione modificato Dim DisableMgr As New DisableModifiedMgr ' recupero box macchina