diff --git a/Icarus/Constants/ConstIni.vb b/Icarus/Constants/ConstIni.vb index 93ec491..1aed02d 100644 --- a/Icarus/Constants/ConstIni.vb +++ b/Icarus/Constants/ConstIni.vb @@ -85,7 +85,7 @@ Public Module ConstIni Public Const K_CUSTOMCOLORS As String = "CustomColors" 'Public Const S_GRID As String = "Grid" - Public Const K_SHOWGRID As String = "ShowGrid" + 'Public Const K_SHOWGRID As String = "ShowGrid" 'Public Const K_SHOWFRAME As String = "ShowFrame" 'Public Const K_SNAPSTEP As String = "SnapStep" 'Public Const K_SNAPSTEPINCH As String = "SnapStepInch" diff --git a/Icarus/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb index e7afcbe..c0e9847 100644 --- a/Icarus/MainWindow/MainWindowVM.vb +++ b/Icarus/MainWindow/MainWindowVM.vb @@ -287,9 +287,9 @@ Public Class MainWindowVM ' salvo modo di visualizzazione WriteMainPrivateProfileString(S_SCENE, K_SHOWMODE, EgtGetShowMode().ToString()) ' Salvo stato visualizzazione direzione curve - WriteMainPrivateProfileString(S_SCENE, K_CURVEDIR, If(EgtGetShowCurveDirection(), 1, 0).ToString()) + WriteMainPrivateProfileString(S_SCENE, K_CURVEDIR, If(EgtGetShowCurveDirection(), "1", "0")) ' Salvo stato visualizzazione griglia - WriteMainPrivateProfileString(S_GRID, K_SHOWGRID, If(Map.refMyStatusBarVM.bGridVisibility, 1, 0).ToString()) + WriteMainPrivateProfileString(S_GRID, K_SHOWGRID, If(Map.refMyStatusBarVM.bGridVisibility, "1", "0")) ' Termino il Model m_MainWindowM.Close() ' Termino il programma diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb index 7c8e5b2..309ac0b 100644 --- a/Icarus/SceneHost/MySceneHostVM.vb +++ b/Icarus/SceneHost/MySceneHostVM.vb @@ -193,7 +193,7 @@ Public Class MySceneHostVM ' imposto visualizzazione riferimento globale EgtSetGlobFrameShow(True) ' imposto i dati della griglia - Dim bGridVisibility As Boolean = GetMainPrivateProfileInt(S_GRID, K_SHOWGRID, 1) <> 0 + Dim bGridVisibility As Boolean = (GetMainPrivateProfileInt(S_GRID, K_SHOWGRID, 1) <> 0) Dim dSnapStepMm As Double = GetMainPrivateProfileDouble(S_GRID, K_SNAPSTEP, 10) Dim dSnapStepInch As Double = GetMainPrivateProfileDouble(S_GRID, K_SNAPSTEPINCH, 10) Dim nMinLineSStep As Integer = GetMainPrivateProfileInt(S_GRID, K_MINLINESSTEP, 1) @@ -214,10 +214,10 @@ Public Class MySceneHostVM ' imposto tipo coordinate MainScene.SetGridCursorPos(True) ' visualizzazione avanzata dei triangoli costituenti le superfici - Dim bShowTriaAdv As Boolean = GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0 + Dim bShowTriaAdv As Boolean = (GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0) EgtSetShowTriaAdv(bShowTriaAdv) ' visualizzazione direzione curve - Dim bShowCurveDirection As Boolean = GetMainPrivateProfileInt(S_SCENE, K_CURVEDIR, 0) <> 0 + Dim bShowCurveDirection As Boolean = (GetMainPrivateProfileInt(S_SCENE, K_CURVEDIR, 0) <> 0) EgtSetShowCurveDirection(bShowCurveDirection) ' tipo visualizzazione per Zmap Dim nShowZmap As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWZMAP, 1) @@ -843,11 +843,16 @@ Public Class MySceneHostVM If Not bOk Then MessageBox.Show(Application.Current.MainWindow, EgtMsg(10002), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error on new file - Error End If + Map.refTopPanelVM.PartList.Clear() Map.refTopPanelVM.SetSelModifyMode(ModifyModes.NULL) Map.refSliceManagerVM.UpdateTimeAndMass() Map.refSliderManagerVM.RefreshSlider(0, 0) Map.refSliderManagerVM.SetLayerIndexToMax() + + ' resetto calcolo solidi + Map.refViewLayerManagerVM.ResetSolid() + EgtZoom(ZM.ALL) MainScene.SetStatusNull() End Sub diff --git a/Icarus/SecondaryWindow/SecondaryWindowVM.vb b/Icarus/SecondaryWindow/SecondaryWindowVM.vb index 500a4cb..6e030cf 100644 --- a/Icarus/SecondaryWindow/SecondaryWindowVM.vb +++ b/Icarus/SecondaryWindow/SecondaryWindowVM.vb @@ -83,10 +83,10 @@ Public Class SecondaryWindowVM End Sub Private Sub SplashScreenTimer_Tick() - If m_WaitAfterRender > 2 Then + If m_WaitAfterRender > 1 Then ' chiudo SplashScreen Map.refSplashScreen.Close() - ElseIf m_WaitAfterRender >= 1 Then + ElseIf m_WaitAfterRender > 0 Then m_WaitAfterRender += 1 End If End Sub diff --git a/Icarus/StatusBar/MyStatusBarVM.vb b/Icarus/StatusBar/MyStatusBarVM.vb index ebaf89e..8262818 100644 --- a/Icarus/StatusBar/MyStatusBarVM.vb +++ b/Icarus/StatusBar/MyStatusBarVM.vb @@ -51,8 +51,8 @@ Public Class MyStatusBarVM ' modo di visualizzazione Dim nShowMode As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWMODE, SM.SHADING) Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM)) - ' visualizzazione avanzata dei triangoli costituenti le superfici - Map.refShowPanelVM.CurveDirIsChecked = EgtGetShowTriaAdv() + ' visualizzazione freccia direzione su curve + Map.refShowPanelVM.CurveDirIsChecked = EgtGetShowCurveDirection() End Sub Friend Overloads Sub SetSnapPointType(sSnapPntType As SP) diff --git a/Icarus/ViewLayerManager/ViewLayerManagerVM.vb b/Icarus/ViewLayerManager/ViewLayerManagerVM.vb index 9670c19..edde313 100644 --- a/Icarus/ViewLayerManager/ViewLayerManagerVM.vb +++ b/Icarus/ViewLayerManager/ViewLayerManagerVM.vb @@ -52,9 +52,12 @@ Public Class ViewLayerManagerVM If Not IsNothing(ViewLayerSolid) Then ViewLayerSolid.bIsVisible = False If Map.refTopPanelVM.SelPage = Pages.MODIFY Then - WriteMainPrivateProfileString(S_VIEWLAYER, K_SLC_SOLIDSLICE, 0) + WriteMainPrivateProfileString(S_VIEWLAYER, K_SLC_SOLIDSLICE, "0") ElseIf Map.refTopPanelVM.SelPage = Pages.SLICE Then - WriteMainPrivateProfileString(S_VIEWLAYER, K_MOD_SOLIDSLICE, 0) + WriteMainPrivateProfileString(S_VIEWLAYER, K_MOD_SOLIDSLICE, "0") + ElseIf Map.refTopPanelVM.SelPage = Pages.NULL then + WriteMainPrivateProfileString(S_VIEWLAYER, K_MOD_SOLIDSLICE, "0") + WriteMainPrivateProfileString(S_VIEWLAYER, K_SLC_SOLIDSLICE, "0") End If End If End Sub