Icarus 2.5e2 :

- ricompilazione con cambio versione.

Icarus/CurrMachiningPanel/CurrMachining.vb

@@ -274,7 +274,7 @@ Public Class CurrMachiningCathegory
       ' verifico dipendenze tra parametri
       Select Case m_Type
          Case Cathegories.LINK
-            For Each Param In {MachiningParam.Params.LINKTYPE, MachiningParam.Params.LEADIN}
+            For Each Param In {MachiningParam.Params.LINKTYPE, MachiningParam.Params.LEADIN, MachiningParam.Params.LEADOUT}
                Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
                MachiningParam.ManageDependencyParam()
             Next

Icarus/FilledSolidPanel/FilledSolidPanelVM.vb

@@ -35,6 +35,10 @@ Public Class FilledSolidPanelVM
          Return m_SelFilledSolid
       End Get
       Set(value As FilledSolidEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelFilledSolid))
+            Return
+         End If
          m_SelFilledSolid = value
          EgtDeselectAll()
          If Not IsNothing(value) Then
@@ -349,6 +353,8 @@ Public Class FilledSolidPanelVM
             NotifyPropertyChanged(NameOf(bRotate_IsChecked))
             Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.AUXSOLIDPARAM)
             NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
+            ' disattivo interfaccia
+            ManageInterface(False)
          Else
             NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
          End If
@@ -358,6 +364,8 @@ Public Class FilledSolidPanelVM
       m_bMachParam_IsChecked = False
       NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
       NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
+      ' riattivo interfaccia
+      ManageInterface(True)
    End Sub
 
    Public ReadOnly Property Compo_Visibility As Visibility
@@ -366,11 +374,17 @@ Public Class FilledSolidPanelVM
       End Get
    End Property
 
+   Private m_FilledSolidList_IsEnabled As Boolean = False
    Public ReadOnly Property FilledSolidList_IsEnabled As Boolean
       Get
-         Return Not m_bMachParam_IsChecked
+         Return If(m_FilledSolidList.Count > 0, m_FilledSolidList_IsEnabled, False)
       End Get
    End Property
+   Friend Sub SetFilledSolidListIsEnabled(bValue As Boolean)
+      m_FilledSolidList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
+   End Sub
+
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -388,6 +402,8 @@ Public Class FilledSolidPanelVM
       End Get
    End Property
 
+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"
 
    Public ReadOnly Property Import_ToolTip As String
@@ -571,6 +587,8 @@ Public Class FilledSolidPanelVM
          SelFilledSolid = m_FilledSolidList(0)
          NotifyPropertyChanged(NameOf(SelFilledSolid))
       End If
+      ' attivo lista filled solid
+      SetFilledSolidListIsEnabled(True)
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
 
@@ -606,8 +624,13 @@ Public Class FilledSolidPanelVM
             EgtSelectObj(m_SelFilledSolid.nCurveId)
          Case FilledSolidSelectionTypes.EXTRUSION
             ' creo layer per estrusione
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelFilledSolid.nCurveId)
          Case FilledSolidSelectionTypes.BOTH
@@ -615,6 +638,8 @@ Public Class FilledSolidPanelVM
             EgtSelectObj(m_SelFilledSolid.nExtrusionId)
       End Select
       EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
       Return True
    End Function
 
@@ -624,6 +649,7 @@ Public Class FilledSolidPanelVM
    End Sub
 
    Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
       Select Case command
          Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
             ' leggo altezza estrusione
@@ -663,6 +689,10 @@ Public Class FilledSolidPanelVM
             ' Imposto flag di ricalcolo slice
             EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Select
+      ' se non ho creato percorso riabilito interfaccia
+      If Not m_bIsCreatingPath Then
+         ManageInterface(True)
+      End If
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
@@ -733,6 +763,9 @@ Public Class FilledSolidPanelVM
             If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
                m_bIsCreatingExtrusion = True
                Map.refControllerInputPanelVM.IsChecked = True
+               If Not EgtCurveIsClosed(nNewEntityId) Then
+                  m_bEscOnLine2P = True
+               End If
             Else
                ' cancello layer
                EgtErase(nNewExtrusionLayerId)
@@ -757,6 +790,13 @@ Public Class FilledSolidPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
+            ManageInterface(True)
+         End If
       End If
    End Sub
 
@@ -792,6 +832,18 @@ Public Class FilledSolidPanelVM
       Return nFilledSolidIndex + 1
    End Function
 
+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
+      SetFilledSolidListIsEnabled(bValue)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -815,7 +867,9 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub Import(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.InsertFilledSolid()
+      ManageInterface(True)
    End Sub
 
 #End Region ' Import
@@ -839,6 +893,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
       If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
@@ -887,6 +942,7 @@ Public Class FilledSolidPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelFilledSolid))
       End If
+      SetFilledSolidListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete
@@ -1171,6 +1227,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1195,6 +1252,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -1311,6 +1369,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneObj(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       ' salvo selezione precedente e deseleziono altri oggetti
       m_PrevSelObjs.Clear()
       Dim nSelObjId As Integer = EgtGetFirstSelectedObj()

Icarus/InstrumentPanel/InstrumentPanelV.xaml

@@ -3,6 +3,7 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:sys="clr-namespace:System;assembly=mscorlib"
             xmlns:local="clr-namespace:Icarus"
+            IsEnabled="{Binding InstrumentPanel_IsEnabled}"
             Orientation="Horizontal">
 
    <local:CheckedImageToggleButton ToolTip="{Binding GetDist_ToolTip}"

Icarus/MachiningDb/Machining.vb

@@ -838,7 +838,7 @@ Public Class NumericMachiningParam
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_POSTFLOWDELAY, 0)
                m_bIsLen = False
             Case Params.SCREWBACK
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 0)
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 45)
                m_bIsLen = False
             Case Params.RIBSOVERLAP
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSOVERLAP, 0)

Icarus/MainWindow/MainWindowM.vb

@@ -195,8 +195,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5583, 2504, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5583, 2504, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5583, 2505, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5583, 2505, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

Icarus/MainWindow/MainWindowVM.vb

@@ -148,7 +148,7 @@ Public Class MainWindowVM
    End Sub
 
    Private Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
-      If Map.refSliceManagerVM.bCalculating Then
+      If Map.refSliceManagerVM.bCalculating OrElse Map.refSliceManagerVM.bCalcSolid Then
          Map.refSliceManagerVM.ProcessEvents(nProg, nPause)
       End If
       If Not IsNothing(Map.refImportLoadingWndVM) Then

Icarus/My Project/AssemblyInfo.vb

@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.4.2")>
-<Assembly: AssemblyFileVersion("2.5.4.2")>
+<Assembly: AssemblyVersion("2.5.5.2")>
+<Assembly: AssemblyFileVersion("2.5.5.2")>

Icarus/Project/ProjectV.xaml

@@ -2,7 +2,9 @@
            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:PrintApp="clr-namespace:Icarus">
-
+   <DockPanel.Resources>
+      <PrintApp:VisibilityToRowConverter x:Key="VisibilityToRowConverter"/>
+   </DockPanel.Resources>
    <Grid DockPanel.Dock="Top">
       <PrintApp:TopPanelV Grid.Column="1"
                           DataContext="{StaticResource TopPanelVM }"/>
@@ -27,12 +29,27 @@
                                         DataContext="{StaticResource SliderManagerVM}"
                                         HorizontalAlignment="Stretch"/>
       <!--StatusBar -->
-      <PrintApp:ControllerInputPanelV Grid.Row="1"
+      <Grid Grid.RowSpan="2"
+            Grid.ColumnSpan="2">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="67"/>
+         </Grid.RowDefinitions>
+         <PrintApp:MessagePanelV Grid.Row="{Binding DataContext.Message_Visibility, ElementName=ControllerInputPanelV, Converter={StaticResource VisibilityToRowConverter}}"
+                                 Grid.ColumnSpan="2"
+                                 DataContext="{StaticResource StatusBarVM}"/>
+         <PrintApp:ControllerInputPanelV x:Name="ControllerInputPanelV" Grid.Row="2"
+                                         Grid.ColumnSpan="2"
+                                         DataContext="{StaticResource ControllerInputPanelVM}"/>
+      </Grid>
+
+      <!--<PrintApp:ControllerInputPanelV Grid.Row="1"
                                       Grid.ColumnSpan="2"
                                       DataContext="{StaticResource ControllerInputPanelVM}"/>
       <PrintApp:MessagePanelV Grid.Row="1"
                               Grid.ColumnSpan="2"
-                              DataContext="{StaticResource StatusBarVM}"/>
+                              DataContext="{StaticResource StatusBarVM}"/>-->
       <PrintApp:ShowPanelV Grid.Column="2"
                            Grid.Row="1"
                            DataContext="{StaticResource ShowPanelVM}"/>

Icarus/Project/ProjectVM.vb

@@ -3,6 +3,7 @@ Imports EgtWPFLib5
 Imports EgtUILib
 Imports System.Collections.ObjectModel
 Imports System.IO
+Imports System.Globalization
 
 Public Class ProjectVM
    Inherits VMBase
@@ -28,3 +29,15 @@ Public Class ProjectVM
 
 End Class
 
+Public Class VisibilityToRowConverter
+   Implements IValueConverter
+
+   Public Function Convert(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.Convert
+      If IsNothing(value) Then Return 2
+      Return If(value = Visibility.Visible, 1, 2)
+   End Function
+
+   Public Function ConvertBack(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New System.NotImplementedException()
+   End Function
+End Class

Icarus/RibPanel/RibPanelVM.vb

@@ -42,6 +42,10 @@ Public Class RibPanelVM
          Return m_SelRib
       End Get
       Set(value As RibEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refRibPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelRib))
+            Return
+         End If
          m_SelRib = value
          EgtDeselectAll()
          If Not IsNothing(value) Then
@@ -374,6 +378,8 @@ Public Class RibPanelVM
             NotifyPropertyChanged(NameOf(bRotate_IsChecked))
             Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.RIBPARAM)
             NotifyPropertyChanged(NameOf(RibList_IsEnabled))
+            ' disattivo interfaccia
+            ManageInterface(False)
          Else
             NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
          End If
@@ -383,6 +389,8 @@ Public Class RibPanelVM
       m_bMachParam_IsChecked = False
       NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
       NotifyPropertyChanged(NameOf(RibList_IsEnabled))
+      ' riattivo interfaccia
+      ManageInterface(True)
    End Sub
 
    Public ReadOnly Property Compo_Visibility As Visibility
@@ -391,11 +399,17 @@ Public Class RibPanelVM
       End Get
    End Property
 
+   Private m_RibList_IsEnabled As Boolean = False
    Public ReadOnly Property RibList_IsEnabled As Boolean
       Get
-         Return Not m_bMachParam_IsChecked
+         Return If(m_RibList.Count > 0, m_RibList_IsEnabled, False)
       End Get
    End Property
+   Friend Sub SetRibListIsEnabled(bValue As Boolean)
+      m_RibList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(RibList_IsEnabled))
+   End Sub
+
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -413,6 +427,8 @@ Public Class RibPanelVM
       End Get
    End Property
 
+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"
 
    Public ReadOnly Property Import_ToolTip As String
@@ -596,6 +612,8 @@ Public Class RibPanelVM
          SelRib = m_RibList(0)
          NotifyPropertyChanged(NameOf(SelRib))
       End If
+      ' abilito lista ribs
+      SetRibListIsEnabled(True)
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
 
@@ -631,8 +649,13 @@ Public Class RibPanelVM
             EgtSelectObj(m_SelRib.nCurveId)
          Case RibSelectionTypes.EXTRUSION
             ' creo layer per estrusione
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelRib.nCurveId)
          Case RibSelectionTypes.BOTH
@@ -640,6 +663,8 @@ Public Class RibPanelVM
             EgtSelectObj(m_SelRib.nExtrusionId)
       End Select
       EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
       Return True
    End Function
 
@@ -649,6 +674,7 @@ Public Class RibPanelVM
    End Sub
 
    Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
       Select Case command
          Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
             ' leggo altezza estrusione
@@ -688,6 +714,10 @@ Public Class RibPanelVM
             ' Imposto flag di ricalcolo slice
             EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Select
+      ' se non ho creato percorso riabilito interfaccia
+      If Not m_bIsCreatingPath Then
+         ManageInterface(True)
+      End If
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
@@ -754,9 +784,10 @@ Public Class RibPanelVM
             EgtSelectObj(nNewEntityId)
             If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
                m_bIsCreatingExtrusion = True
+               If Not EgtCurveIsClosed(nNewEntityId) Then
+                  m_bEscOnLine2P = True
+               End If
             Else
-               ' cancello layer
-               'EgtErase(nNewRibLayerId)
                EgtErase(nNewExtrusionLayerId)
             End If
          End If
@@ -779,6 +810,13 @@ Public Class RibPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
+            ManageInterface(True)
+         End If
       End If
    End Sub
 
@@ -814,6 +852,18 @@ Public Class RibPanelVM
       Return nRibIndex + 1
    End Function
 
+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
+      SetRibListIsEnabled(bValue)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -837,7 +887,9 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub Import(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.InsertRib()
+      ManageInterface(True)
    End Sub
 
 #End Region ' Import
@@ -861,6 +913,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
       If nNewRibLayerId = GDB_ID.NULL Then nNewRibLayerId = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewRibLayerId, LAY_NEWRIB)
@@ -905,10 +958,11 @@ Public Class RibPanelVM
          Else
             SelRib = Nothing
             m_bEdit_IsChecked = False
-            NotifyPropertyChanged(NameOf( bEdit_IsChecked))
+            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
          End If
          NotifyPropertyChanged(NameOf(SelRib))
       End If
+      SetRibListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete
@@ -1192,6 +1246,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1216,6 +1271,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -1332,6 +1388,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneObj(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       ' salvo selezione precedente e deseleziono altri oggetti
       m_PrevSelObjs.Clear()
       Dim nSelObjId As Integer = EgtGetFirstSelectedObj()

Icarus/RibParamPanel/RibParamPanelVM.vb

@@ -135,6 +135,8 @@ Public Class RibParamPanelVM
             Map.refSliceManagerVM.UpdateDimensions()
          End If
       End If
+      ' riattivo lista ribs
+      Map.refRibPanelVM.SetRibListIsEnabled(False)
       ' ripristino modalita' standard
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
       Map.refRibPanelVM.ResetMachParamIsChecked()

Icarus/SceneHost/MySceneHostVM.vb

@@ -274,8 +274,6 @@ Public Class MySceneHostVM
       bOk = MainController.OpenProject(sFilePath, False)
       ' Imposto stato gestione mouse diretto della scena a nessuno
       MainScene.SetStatusNull()
-      ' imposto modalita' import
-      Map.refTopPanelVM.SelPage = Pages.NULL
       Return bOk
    End Function
 

Icarus/ShellNumberPanel/ShellNumberPanelVM.vb

@@ -40,6 +40,10 @@ Public Class ShellNumberPanelVM
          Return m_SelShellNumber
       End Get
       Set(value As ShellNumberEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelShellNumber))
+            Return
+         End If
          m_SelShellNumber = value
          EgtDeselectAll()
          If Not IsNothing(value) Then
@@ -354,6 +358,8 @@ Public Class ShellNumberPanelVM
             NotifyPropertyChanged(NameOf(bRotate_IsChecked))
             Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.SHELLNUMBERPARAM)
             NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
+            ' disattivo interfaccia
+            ManageInterface(False)
          Else
             NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
          End If
@@ -363,6 +369,8 @@ Public Class ShellNumberPanelVM
       m_bMachParam_IsChecked = False
       NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
       NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
+      ' riattivo interfaccia
+      ManageInterface(True)
    End Sub
 
    Public ReadOnly Property Compo_Visibility As Visibility
@@ -371,11 +379,17 @@ Public Class ShellNumberPanelVM
       End Get
    End Property
 
+   Private m_ShellNumberList_IsEnabled As Boolean = False
    Public ReadOnly Property ShellNumberList_IsEnabled As Boolean
       Get
-         Return Not m_bMachParam_IsChecked
+         Return If(m_ShellNumberList.Count > 0, m_ShellNumberList_IsEnabled, False)
       End Get
    End Property
+   Friend Sub SetShellNumberListIsEnabled(bValue As Boolean)
+      m_ShellNumberList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
+   End Sub
+
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -393,6 +407,8 @@ Public Class ShellNumberPanelVM
       End Get
    End Property
 
+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"
 
    Public ReadOnly Property Import_ToolTip As String
@@ -576,6 +592,8 @@ Public Class ShellNumberPanelVM
          SelShellNumber = m_ShellNumberList(0)
          NotifyPropertyChanged(NameOf(SelShellNumber))
       End If
+      ' abilito lista shell number
+      SetShellNumberListIsEnabled(True)
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
 
@@ -611,8 +629,13 @@ Public Class ShellNumberPanelVM
             EgtSelectObj(m_SelShellNumber.nCurveId)
          Case ShellNumberSelectionTypes.EXTRUSION
             ' creo layer per estrusione
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelShellNumber.nCurveId)
          Case ShellNumberSelectionTypes.BOTH
@@ -620,6 +643,8 @@ Public Class ShellNumberPanelVM
             EgtSelectObj(m_SelShellNumber.nExtrusionId)
       End Select
       EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
       Return True
    End Function
 
@@ -629,6 +654,7 @@ Public Class ShellNumberPanelVM
    End Sub
 
    Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
       Select Case command
          Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
             ' leggo altezza estrusione
@@ -668,6 +694,10 @@ Public Class ShellNumberPanelVM
             ' Imposto flag di ricalcolo slice
             EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Select
+      ' se non ho creato percorso riabilito interfaccia
+      If Not m_bIsCreatingPath Then
+         ManageInterface(True)
+      End If
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
@@ -738,6 +768,9 @@ Public Class ShellNumberPanelVM
             If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
                m_bIsCreatingExtrusion = True
                Map.refControllerInputPanelVM.IsChecked = True
+               If Not EgtCurveIsClosed(nNewEntityId) Then
+                  m_bEscOnLine2P = True
+               End If
             Else
                ' cancello layer
                EgtErase(nNewExtrusionLayerId)
@@ -762,6 +795,13 @@ Public Class ShellNumberPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
+            ManageInterface(True)
+         End If
       End If
    End Sub
 
@@ -797,6 +837,19 @@ Public Class ShellNumberPanelVM
       Return nShellNumberIndex + 1
    End Function
 
+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
+      SetShellNumberListIsEnabled(bValue)
+   End Sub
+
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -820,7 +873,9 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub Import(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.InsertShellNumber()
+      ManageInterface(True)
    End Sub
 
 #End Region ' Import
@@ -844,6 +899,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
       If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
@@ -892,6 +948,7 @@ Public Class ShellNumberPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelShellNumber))
       End If
+      SetShellNumberListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete
@@ -1176,6 +1233,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1200,6 +1258,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -1316,6 +1375,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneObj(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       ' salvo selezione precedente e deseleziono altri oggetti
       m_PrevSelObjs.Clear()
       Dim nSelObjId As Integer = EgtGetFirstSelectedObj()

Icarus/SliceManager/SliceManagerVM.vb

@@ -44,6 +44,11 @@ Public Class SliceManagerVM
    Private m_bCalcTFS As Boolean = False
    Private m_bGenerate As Boolean = False
    Private m_bCalcSolid As Boolean = False
+   Friend ReadOnly Property bCalcSolid As Boolean
+      Get
+         Return m_bCalcSolid
+      End Get
+   End Property
    Friend Sub SetCalcSolid(value As Boolean)
       m_bCalcSolid = value
    End Sub
@@ -526,6 +531,8 @@ Public Class SliceManagerVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Slice()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refStartMachPanelVM.bCPlaneObj_IsActive OrElse Map.refRibPanelVM.bCPlaneObj_IsActive OrElse
+         Map.refShellNumberPanelVM.bCPlaneObj_IsActive OrElse Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then Return
       If m_bCalculating Then Return
       m_bCalculating = True
       If IsNothing(Map.refTopPanelVM.SelPart) Then

Icarus/StartMachPanel/StartMachPanelV.xaml

@@ -28,6 +28,7 @@
              ItemsSource="{Binding StartList}"
              SelectedItem="{Binding SelStart}"
              DisplayMemberPath="ghName"
+             IsEnabled="{Binding StartList_IsEnabled}"
              Style="{StaticResource LeftPanel_ComboBox}"/>
    <!-- Add Button -->
    <ToggleButton x:Name="AddBtn"

Icarus/StartMachPanel/StartMachPanelVM.vb

@@ -35,6 +35,10 @@ Public Class StartMachPanelVM
          Return m_SelStart
       End Get
       Set(value As StartEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refStartMachPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelStart))
+            Return
+         End If
          m_SelStart = value
          EgtDeselectAll()
          If Not IsNothing(value) Then
@@ -293,6 +297,18 @@ Public Class StartMachPanelVM
       End Get
    End Property
 
+   Private m_StartList_IsEnabled As Boolean = False
+   Public ReadOnly Property StartList_IsEnabled As Boolean
+      Get
+         Return If(m_StartList.Count > 0, m_StartList_IsEnabled, False)
+      End Get
+   End Property
+   Friend Sub SetStartListIsEnabled(bValue As Boolean)
+      m_StartList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(StartList_IsEnabled))
+   End Sub
+
+
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -304,6 +320,8 @@ Public Class StartMachPanelVM
       End Get
    End Property
 
+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"
 
    Public ReadOnly Property Point_ToolTip As String
@@ -458,6 +476,8 @@ Public Class StartMachPanelVM
          SelStart = m_StartList(0)
          NotifyPropertyChanged(NameOf(SelStart))
       End If
+      ' abilito lista start mach
+      SetStartListIsEnabled(True)
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
 
@@ -481,16 +501,33 @@ Public Class StartMachPanelVM
       ' seleziono percorso corrente
       EgtDeselectAll()
       EgtSelectObj(m_SelStart.nId)
+      EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
       Return True
    End Function
 
    Friend Sub UpdateUI()
       ' se attiva operazione in piu' passaggi, esco
       If Map.refSceneHostVM.MainController.GetContinue() Then Return
-      Dim NewEntity As StartEntity = Nothing
-      ' se finita creazione curva (è stata chiusa)
+   End Sub
+
+   Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
+      Select Case command
+         Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE,
+              Controller.CMD.MOVE, Controller.CMD.ROTATE
+            ' Imposto flag di ricalcolo slice
+            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+      End Select
+      ' riabilito interfaccia
+      ManageInterface(True)
+      ' se finita creazione curva
       If bIsCreatingPath Then
          m_bIsCreatingPath = False
+         Dim NewEntity As StartEntity = Nothing
          Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
          Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewStartLayerId)
          Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
@@ -503,37 +540,22 @@ Public Class StartMachPanelVM
                   NewEntityType = StartMachTypes.COMPO
             End Select
             EgtSetName(nNewEntityId, START_GEOM)
-            ' coloro l'entita' di rosso
-            Dim c3Red As Color3d
-            c3Red.FromColor(System.Drawing.Color.Red)
-            EgtSetColor(nNewEntityId, c3Red)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
             ' lo sposto nel layer degli start
             EgtRelocateGlob(nNewEntityId, m_nStartMachLayerId, GDB_POS.LAST_SON)
             ' lo aggiungo alla lista
             NewEntity = New StartEntity(nNewEntityId, NewEntityType)
             m_StartList.Add(NewEntity)
-            ' cancello layer di disegno
-            EgtErase(nNewStartLayerId)
+            ' lo seleziono
+            SelStart = NewEntity
+            NotifyPropertyChanged(NameOf(SelStart))
          End If
+         ' cancello layer di disegno
+         EgtErase(nNewStartLayerId)
       End If
       ' aggiorno posizione
       RefreshPos()
-      ' se aggiunta entita'
-      If Not IsNothing(NewEntity) Then
-         SelStart = NewEntity
-         NotifyPropertyChanged(NameOf(SelStart))
-      End If
-      ' rimetto la selezione scena a null
-      Map.refSceneHostVM.MainScene.SetStatusNull()
-   End Sub
-
-   Friend Sub OnExecCmdEnd(command As Controller.CMD)
-      Select Case command
-         Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE,
-              Controller.CMD.MOVE, Controller.CMD.ROTATE
-            ' Imposto flag di ricalcolo slice
-            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
-      End Select
    End Sub
 
    Friend Sub OnKeyDown(Key As Forms.Keys)
@@ -550,6 +572,12 @@ Public Class StartMachPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            ManageInterface(True)
+         End If
       End If
    End Sub
 
@@ -565,6 +593,18 @@ Public Class StartMachPanelVM
       End If
    End Sub
 
+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
+      SetStartListIsEnabled(bValue)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -588,13 +628,13 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub Point(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup( m_nPartId, LAY_NEWSTART)
+      ManageInterface(False)
+      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
       If nNewStartLayerId = GDB_ID.NULL Then
          nNewStartLayerId = EgtCreateGroup(m_nPartId)
          EgtSetName(nNewStartLayerId, LAY_NEWSTART)
       End If
       EgtSetCurrPartLayer(m_nPartId, nNewStartLayerId)
-      'InitCommand(True)
       If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.POINT) Then
          m_bIsCreatingPath = True
       End If
@@ -621,7 +661,8 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup( m_nPartId, LAY_NEWSTART)
+      ManageInterface(False)
+      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
       If nNewStartLayerId = GDB_ID.NULL Then
          nNewStartLayerId = EgtCreateGroup(m_nPartId)
          EgtSetName(nNewStartLayerId, LAY_NEWSTART)
@@ -888,6 +929,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -912,6 +954,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -952,6 +995,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneObj(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       ' salvo selezione precedente e deseleziono altri oggetti
       m_PrevSelObjs.Clear()
       Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -1012,6 +1056,7 @@ Public Class StartMachPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelStart))
       End If
+      SetStartListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete

Icarus/TSFEditor/TFSEditorVM.vb

@@ -337,7 +337,7 @@ Public Class TFSEditorVM
 
    Public ReadOnly Property Seconds_Msg As String
       Get
-         Return "s"
+         Return "min:s"
       End Get
    End Property
 

Icarus/TopPanel/TopPanelV.xaml

@@ -58,7 +58,7 @@
       <ToggleButton x:Name="ModifyBtn"
                     Grid.Column="2"
                     Grid.Row="1"          
-                    Content="{Binding SelectedItem.sName, ElementName=ModifyModeListBox}"
+                    Content="{Binding SelModifyModeName}"
                     IsChecked="{Binding bModify_IsChecked}"  
                     Margin="2.5,0,2.5,0"
                     Style="{StaticResource TopPanel_Modify_ToggleButton}">

Icarus/TopPanel/TopPanelVM.vb

@@ -121,6 +121,7 @@ Public Class TopPanelVM
             Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.NULL)
             NotifyPropertyChanged(NameOf(SelModifyMode))
          End If
+         NotifyPropertyChanged(NameOf(SelModifyModeName))
          ' chiudo il popup
          SetModifyIsChecked(False)
       End Set
@@ -128,8 +129,15 @@ Public Class TopPanelVM
    Friend Sub SetSelModifyMode(ModifyMode As ModifyModes)
       SelModifyMode = m_ModifyModeList.FirstOrDefault(Function(x) x.ModifyMode = ModifyMode)
       NotifyPropertyChanged(NameOf(SelModifyMode))
+      NotifyPropertyChanged(NameOf(SelModifyModeName))
    End Sub
 
+   Public ReadOnly Property SelModifyModeName As String
+      Get
+         Return If(Not IsNothing(m_SelModifyMode) AndAlso m_SelModifyMode.ModifyMode <> ModifyModes.NULL, m_SelModifyMode.sName, "Modify")
+      End Get
+   End Property
+
    Private m_bModify_IsChecked As Boolean
    Public Property bModify_IsChecked As Boolean
       Get