From 4132e8684d729072b7fea498b46484e7b8311ab1 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Thu, 29 Sep 2022 09:57:11 +0200
Subject: [PATCH] - Introdotto calcolo separato dei solidi - Spostati file
 CurrMachining - Introdotto slider custom - Introdotti flag di modifica
 separati per slice ed operazioni successive - Gestito calcolo  dei solidi
 separato dal resto - Gestito bottone from import su reference - Aggiornato
 logo - Migliorata gestione dell'interazione con la scena nelle modifiche
 grafiche( rib, start mach, ...) - Introdotta gestione grid da oggetto -
 Gestiti percorsi chiusi e con cap end in ShellNumber

---
 Icarus/Constants/Const3dPrint.vb              |   5 +-
 .../CurrMachining.vb                          |  28 +-
 .../CurrMachiningPanelV.xaml                  |   2 +-
 .../CurrMachiningPanelV.xaml.vb               |   0
 .../CurrMachiningPanelVM.vb                   |   0
 Icarus/Icarus.vbproj                          |  17 +-
 .../Machining.vb                              |   9 +-
 Icarus/MachiningDb/MachiningDbV.xaml          |   2 +-
 Icarus/MainWindow/MainWindowVM.vb             |  61 +-
 Icarus/ReferencePanel/ReferencePanelV.xaml    |  15 +-
 Icarus/Resources/Icarus - Copy.ico            | Bin 0 -> 4404 bytes
 Icarus/Resources/Icarus.ico                   | Bin 4404 -> 34494 bytes
 Icarus/RibPanel/RibPanelVM.vb                 |  45 +-
 Icarus/RibParamPanel/RibParamPanelV.xaml      |   2 +-
 Icarus/RibParamPanel/RibParamPanelVM.vb       |  70 +-
 Icarus/SceneHost/MySceneHostVM.vb             |  34 +-
 Icarus/SceneHost/MySceneHostVM.vb.bak         | 655 ------------------
 Icarus/ShellNumberPanel/ShellNumberPanelVM.vb |  94 ++-
 .../ShellNumberParamPanelV.xaml               |   2 +-
 .../ShellNumberParamPanelVM.vb                |  14 +-
 Icarus/ShowValueSlider/ShowValueSlider.xaml   |   4 +
 .../ShowValueSlider/ShowValueSlider.xaml.vb   |  26 +
 Icarus/SliceManager/SliceManagerVM.vb         |  81 ++-
 Icarus/SliderManager/LayerIndexSliderV.xaml   |   5 +-
 Icarus/SliderManager/SliderManagerVM.vb       |  32 +
 Icarus/StartMachPanel/StartMachPanelVM.vb     |  75 +-
 Icarus/StatusBar/StatusBarV.xaml              |   5 +
 Icarus/TSFEditor/TFSEditorVM.vb               |   6 +-
 Icarus/TopPanel/TopPanelVM.vb                 |   1 -
 Icarus/Utility/Dictionary.xaml                |  58 +-
 Icarus/Utility/LuaExec.vb                     |  15 +
 Icarus/ViewLayerManager/ViewLayerManagerVM.vb |  41 +-
 Icarus/ViewPanel/ViewPanelV.xaml              |   7 +-
 Icarus/ViewPanel/ViewPanelVM.vb               |  24 +
 34 files changed, 569 insertions(+), 866 deletions(-)
 rename Icarus/{MachiningManager => CurrMachiningPanel}/CurrMachining.vb (98%)
 rename Icarus/{MachiningManager => CurrMachiningPanel}/CurrMachiningPanelV.xaml (99%)
 rename Icarus/{MachiningManager => CurrMachiningPanel}/CurrMachiningPanelV.xaml.vb (100%)
 rename Icarus/{MachiningManager => CurrMachiningPanel}/CurrMachiningPanelVM.vb (100%)
 rename Icarus/{MachiningManager => MachiningDb}/Machining.vb (99%)
 create mode 100644 Icarus/Resources/Icarus - Copy.ico
 delete mode 100644 Icarus/SceneHost/MySceneHostVM.vb.bak
 create mode 100644 Icarus/ShowValueSlider/ShowValueSlider.xaml
 create mode 100644 Icarus/ShowValueSlider/ShowValueSlider.xaml.vb

diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb
index 1f3158f..618be44 100644
--- a/Icarus/Constants/Const3dPrint.vb
+++ b/Icarus/Constants/Const3dPrint.vb
@@ -18,6 +18,8 @@
    Public Const VIEWPARAMS = "ViewParams"
    Public Const IMPORTED_SOLID = "ImportedSolid"
    Public Const RESULT_READ_PROG = "ResultReadProg"
+   Public Const KEY_CALC_SOLIDS = "CalcSolids"
+   Public Const KEY_HAS_SOLIDS = "Solids"
 
 
    ' parametri calcolo tempi, F ed S
@@ -60,7 +62,8 @@
    Public Const MAT_ORIG = "Orig"
 
    ' parametri Lavorazione
-   Public Const MAC_TO_RECALC = "ToRecalc"
+   Public Const MAC_TORECALC_SLICE = "ToRecalcSlice"
+   Public Const MAC_TORECALC_GENERATE = "ToRecalcGenerate"
    Public Const MAC_GUID = "GUID"
    Public Const MAC_NAME = "Name"
    Public Const MAC_SLICING45 = "Slicing45"
diff --git a/Icarus/MachiningManager/CurrMachining.vb b/Icarus/CurrMachiningPanel/CurrMachining.vb
similarity index 98%
rename from Icarus/MachiningManager/CurrMachining.vb
rename to Icarus/CurrMachiningPanel/CurrMachining.vb
index 1c7a7d7..e4971a2 100644
--- a/Icarus/MachiningManager/CurrMachining.vb
+++ b/Icarus/CurrMachiningPanel/CurrMachining.vb
@@ -27,7 +27,7 @@ Public Class CurrMachining
       End Get
    End Property
 
-   Public ReadOnly Property sCurrStrandH As String
+   Public ReadOnly Property dCurrStrandH As Double
       Get
          Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.STRANDH)
          If Not IsNothing(StrandH) Then
@@ -37,12 +37,22 @@ Public Class CurrMachining
          End If
       End Get
    End Property
+   Public ReadOnly Property sCurrStrandH As String
+      Get
+         Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.STRANDH)
+         If Not IsNothing(StrandH) Then
+            Return StrandH.sValue
+         Else
+            Return False
+         End If
+      End Get
+   End Property
 
    Public ReadOnly Property sCurrStrandW As String
       Get
          Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.STRANDW)
          If Not IsNothing(StrandH) Then
-            Return StrandH.dValue
+            Return StrandH.sValue
          Else
             Return False
          End If
@@ -53,7 +63,7 @@ Public Class CurrMachining
       Get
          Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.STRANDCOUNT)
          If Not IsNothing(StrandH) Then
-            Return StrandH.dValue
+            Return StrandH.sValue
          Else
             Return False
          End If
@@ -64,7 +74,7 @@ Public Class CurrMachining
       Get
          Dim StrandH As CurrNumericMachiningParam = m_CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.OFFSET)
          If Not IsNothing(StrandH) Then
-            Return StrandH.dValue
+            Return StrandH.sValue
          Else
             Return False
          End If
@@ -157,8 +167,8 @@ Public Class CurrMachining
       For Each Cathegory As CurrMachiningCathegory In m_CathegoryList
          Cathegory.WriteCurrParamInPart(nPartId)
       Next
-      ' Imposto flag 
-      EgtSetInfo(nPartId, MAC_TO_RECALC, True)
+      ' Imposto flag di ricalcolo slice
+      EgtSetInfo(nPartId, MAC_TORECALC_SLICE, True)
    End Sub
 
 #End Region    ' METHODS
@@ -267,7 +277,7 @@ End Class
 Public Class CurrNumericMachiningParam
    Inherits NumericMachiningParam
 
-   Public Overrides Property dValue As String
+   Public Overrides Property sValue As String
       Get
          Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
       End Get
@@ -277,7 +287,7 @@ Public Class CurrNumericMachiningParam
          Else
             m_dValue = value
          End If
-         NotifyPropertyChanged(NameOf(dValue))
+         NotifyPropertyChanged(NameOf(sValue))
          NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
       End Set
    End Property
@@ -575,7 +585,7 @@ Public Class CurrNumericMachiningParam
 
    Public Sub ResetParamCmd()
       m_dValue = DbParam.dOrigValue
-      NotifyPropertyChanged(NameOf(dValue))
+      NotifyPropertyChanged(NameOf(sValue))
       NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
    End Sub
 
diff --git a/Icarus/MachiningManager/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
similarity index 99%
rename from Icarus/MachiningManager/CurrMachiningPanelV.xaml
rename to Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
index ac72a16..116945f 100644
--- a/Icarus/MachiningManager/CurrMachiningPanelV.xaml
+++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
@@ -41,7 +41,7 @@
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding sName}"/>
                                     <TextBox Grid.Column="1"
-                                             Text="{Binding dValue}"/>
+                                             Text="{Binding sValue}"/>
                                     <Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
diff --git a/Icarus/MachiningManager/CurrMachiningPanelV.xaml.vb b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml.vb
similarity index 100%
rename from Icarus/MachiningManager/CurrMachiningPanelV.xaml.vb
rename to Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml.vb
diff --git a/Icarus/MachiningManager/CurrMachiningPanelVM.vb b/Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb
similarity index 100%
rename from Icarus/MachiningManager/CurrMachiningPanelVM.vb
rename to Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb
diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj
index 0a0a95b..a9bd016 100644
--- a/Icarus/Icarus.vbproj
+++ b/Icarus/Icarus.vbproj
@@ -140,12 +140,12 @@
       <DependentUpon>MachiningDbV.xaml</DependentUpon>
     </Compile>
     <Compile Include="MachiningDb\MachiningDbVM.vb" />
-    <Compile Include="MachiningManager\CurrMachining.vb" />
-    <Compile Include="MachiningManager\CurrMachiningPanelV.xaml.vb">
+    <Compile Include="CurrMachiningPanel\CurrMachining.vb" />
+    <Compile Include="CurrMachiningPanel\CurrMachiningPanelV.xaml.vb">
       <DependentUpon>CurrMachiningPanelV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MachiningManager\CurrMachiningPanelVM.vb" />
-    <Compile Include="MachiningManager\Machining.vb" />
+    <Compile Include="CurrMachiningPanel\CurrMachiningPanelVM.vb" />
+    <Compile Include="MachiningDb\Machining.vb" />
     <Compile Include="MachSaveInDbWnd\MachSaveInDbWindowV.xaml.vb">
       <DependentUpon>MachSaveInDbWindowV.xaml</DependentUpon>
     </Compile>
@@ -198,6 +198,9 @@
     <Compile Include="ShowPanel\ShowPanelV.xaml.vb">
       <DependentUpon>ShowPanelV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ShowValueSlider\ShowValueSlider.xaml.vb">
+      <DependentUpon>ShowValueSlider.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SimulationPanel\MachineAxis.vb" />
     <Compile Include="SimulationPanel\MySimulation.vb" />
     <Compile Include="SimulationPanel\SimulationPanelV.xaml.vb">
@@ -295,7 +298,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="MachiningManager\CurrMachiningPanelV.xaml">
+    <Page Include="CurrMachiningPanel\CurrMachiningPanelV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -367,6 +370,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="ShowValueSlider\ShowValueSlider.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SimulationPanel\SimulationPanelV.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
diff --git a/Icarus/MachiningManager/Machining.vb b/Icarus/MachiningDb/Machining.vb
similarity index 99%
rename from Icarus/MachiningManager/Machining.vb
rename to Icarus/MachiningDb/Machining.vb
index 5e167c0..e57f029 100644
--- a/Icarus/MachiningManager/Machining.vb
+++ b/Icarus/MachiningDb/Machining.vb
@@ -619,7 +619,12 @@ Public Class NumericMachiningParam
    Protected m_bIsLen As Boolean = False
 
    Protected m_dValue As Double
-   Public Overridable Property dValue As String
+   Public ReadOnly Property dValue As Double
+      Get
+         Return m_dValue
+      End Get
+   End Property
+   Public Overridable Property sValue As String
       Get
          Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
       End Get
@@ -629,7 +634,7 @@ Public Class NumericMachiningParam
          Else
             m_dValue = value
          End If
-         NotifyPropertyChanged(NameOf(dValue))
+         NotifyPropertyChanged(NameOf(sValue))
       End Set
    End Property
 
diff --git a/Icarus/MachiningDb/MachiningDbV.xaml b/Icarus/MachiningDb/MachiningDbV.xaml
index 013e1dd..077db9b 100644
--- a/Icarus/MachiningDb/MachiningDbV.xaml
+++ b/Icarus/MachiningDb/MachiningDbV.xaml
@@ -82,7 +82,7 @@
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding sName}"/>
                                     <TextBox Grid.Column="1"
-                                                           Text="{Binding dValue}"/>
+                                                           Text="{Binding sValue}"/>
                                     <!--<Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
diff --git a/Icarus/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb
index f9cff71..e706e68 100644
--- a/Icarus/MainWindow/MainWindowVM.vb
+++ b/Icarus/MainWindow/MainWindowVM.vb
@@ -187,38 +187,57 @@ Public Class MainWindowVM
       If PressedKey = Key.Escape Then
          ' resetto sempre input box a meno che non sia nelle ribs e stia creando il percorso
          If Not (Not IsNothing(Map.refTopPanelVM.SelPage) AndAlso Map.refTopPanelVM.SelPage = Pages.MODIFY AndAlso
-            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS AndAlso
-            Map.refRibPanelVM.bIsCreatingPath) Then
+            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso
+            ((Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS AndAlso Map.refRibPanelVM.bIsCreatingPath) OrElse
+            (Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.SHELLNUMBER AndAlso Map.refShellNumberPanelVM.bIsCreatingPath))) Then
             Map.refControllerInputPanelVM.ResetInputBox()
          End If
          If Not IsNothing(Map.refTopPanelVM.SelPage) AndAlso Map.refTopPanelVM.SelPage = Pages.MODIFY AndAlso
-            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS Then
+            Not IsNothing(Map.refTopPanelVM.SelModifyMode) Then
             Dim nNewExtrusionLayerId As Integer = GDB_ID.NULL
-            ' cancello eventuali layer di modifica
-            If Not IsNothing(Map.refTopPanelVM.SelPart) AndAlso Not Map.refRibPanelVM.bIsCreatingPath Then
-               nNewExtrusionLayerId = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWEXTRUSION)
-               If nNewExtrusionLayerId <> GDB_ID.NULL Then
-                  EgtErase(nNewExtrusionLayerId)
+            If Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS Then
+               ' cancello eventuali layer di modifica
+               If Not IsNothing(Map.refTopPanelVM.SelPart) AndAlso Not Map.refRibPanelVM.bIsCreatingPath Then
+                  nNewExtrusionLayerId = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWEXTRUSION)
+                  If nNewExtrusionLayerId <> GDB_ID.NULL Then
+                     EgtErase(nNewExtrusionLayerId)
+                  End If
+                  Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWRIB)
+                  If nNewRibLayerId <> GDB_ID.NULL Then
+                     EgtErase(nNewRibLayerId)
+                  End If
                End If
-               Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWRIB)
-               If nNewRibLayerId <> GDB_ID.NULL Then
-                  EgtErase(nNewRibLayerId)
+               ' annullo trasparenza attivata durante edit rib
+               If Not IsNothing(Map.refRibPanelVM.SelRib) Then
+                  EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
+               End If
+            ElseIf Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.SHELLNUMBER Then
+               ' cancello eventuali layer di modifica
+               If Not IsNothing(Map.refTopPanelVM.SelPart) AndAlso Not Map.refShellNumberPanelVM.bIsCreatingPath Then
+                  nNewExtrusionLayerId = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWEXTRUSION)
+                  If nNewExtrusionLayerId <> GDB_ID.NULL Then
+                     EgtErase(nNewExtrusionLayerId)
+                  End If
+                  Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWRIB)
+                  If nNewRibLayerId <> GDB_ID.NULL Then
+                     EgtErase(nNewRibLayerId)
+                  End If
+               End If
+               ' annullo trasparenza attivata durante edit rib
+               If Not IsNothing(Map.refShellNumberPanelVM.SelShellNumber) Then
+                  EgtSetAlpha(Map.refShellNumberPanelVM.SelShellNumber.nExtrusionId, 100)
                End If
-            End If
-            ' annullo trasparenza attivata durante edit rib
-            If Not IsNothing(Map.refRibPanelVM.SelRib) Then
-               EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
             End If
          End If
          ' reset Azione corrente
          Map.refSceneHostVM.MainController.ResetStatus()
-            ' se misura attiva, la disattivo
-            If Map.refInstrumentPanelVM.GetDistIsChecked Then
-               Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
-            End If
-            ' pulisco output
-            Map.refMyStatusBarVM.ClearOutputMessage()
+         ' se misura attiva, la disattivo
+         If Map.refInstrumentPanelVM.GetDistIsChecked Then
+            Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
          End If
+         ' pulisco output
+         Map.refMyStatusBarVM.ClearOutputMessage()
+      End If
    End Sub
 
    '   Friend m_ManagingSupervisorStop As Boolean = False
diff --git a/Icarus/ReferencePanel/ReferencePanelV.xaml b/Icarus/ReferencePanel/ReferencePanelV.xaml
index bb3ba43..affdb8b 100644
--- a/Icarus/ReferencePanel/ReferencePanelV.xaml
+++ b/Icarus/ReferencePanel/ReferencePanelV.xaml
@@ -8,7 +8,10 @@
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
          <ListBox ItemsSource="{Binding ReferenceList}"
-                  SelectedItem="{Binding ghSelReference}">
+                  SelectedItem="{Binding ghSelReference}"
+                  BorderThickness="0"
+                  Margin="0"
+                  Padding="0">
             <ListBox.ItemsPanel>
                <ItemsPanelTemplate>
                   <UniformGrid Rows="3"/>
@@ -30,14 +33,16 @@
                   <RadioButton Content="{Binding sText}"
                                IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                FontSize="40"
+                               GroupName="ReferenceRadio"
                                Style="{StaticResource OptionPanel_NestingToggleButton}"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
-         <Button Grid.Row="1"
-                 Content="From Import"
-                 Command="{Binding FromImport_Command}"
-                 Style="{StaticResource LeftPanel_TextButton}"/>
+         <RadioButton Grid.Row="1"
+                      Content="From Import"
+                      IsChecked="{Binding FromImport_IsChecked}"
+                      GroupName="ReferenceRadio"
+                      Style="{StaticResource OptionPanel_ToggleButton}"/>
       </Grid>
    </Border> 
 </UserControl>
diff --git a/Icarus/Resources/Icarus - Copy.ico b/Icarus/Resources/Icarus - Copy.ico
new file mode 100644
index 0000000000000000000000000000000000000000..0047dc56454913a28a86b1251cd919553de7617d
GIT binary patch
literal 4404
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

literal 0
HcmV?d00001

diff --git a/Icarus/Resources/Icarus.ico b/Icarus/Resources/Icarus.ico
index 0047dc56454913a28a86b1251cd919553de7617d..f50fa0ca482b33e4e18ce5a0fc1457f079527526 100644
GIT binary patch
literal 34494
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
XqrJE-^e)7D;^>T~Vd)FYPmJ~dt<vN2

literal 4404
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

diff --git a/Icarus/RibPanel/RibPanelVM.vb b/Icarus/RibPanel/RibPanelVM.vb
index edf7bd3..e7625eb 100644
--- a/Icarus/RibPanel/RibPanelVM.vb
+++ b/Icarus/RibPanel/RibPanelVM.vb
@@ -80,6 +80,8 @@ Public Class RibPanelVM
          Else
             NotifyPropertyChanged(NameOf(sXPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -107,6 +109,8 @@ Public Class RibPanelVM
          Else
             NotifyPropertyChanged(NameOf(sYPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -134,6 +138,8 @@ Public Class RibPanelVM
          Else
             NotifyPropertyChanged(NameOf(sZPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -185,6 +191,8 @@ Public Class RibPanelVM
          Else
             m_sRotAngle = value
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -194,7 +202,7 @@ Public Class RibPanelVM
          Return m_bAdd_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bAdd_IsChecked = value
             If value Then
                m_bEdit_IsChecked = False
@@ -216,7 +224,7 @@ Public Class RibPanelVM
          Return m_bEdit_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bEdit_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -240,7 +248,7 @@ Public Class RibPanelVM
          Return m_bGrid_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bGrid_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -262,7 +270,7 @@ Public Class RibPanelVM
          Return m_bMove_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bMove_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -286,7 +294,7 @@ Public Class RibPanelVM
          Return m_bRotate_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bRotate_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -310,7 +318,7 @@ Public Class RibPanelVM
          Return m_bMachParam_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
+         If Not IsNothing(m_SelRib) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
             m_bMachParam_IsChecked = True
             m_bAdd_IsChecked = False
             m_bEdit_IsChecked = False
@@ -594,6 +602,12 @@ Public Class RibPanelVM
          ' cancello layer di disegno
          EgtErase(nNewRibLayerId)
       End If
+      Select Case command
+         Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE, Controller.CMD.EXTRUDE,
+              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)
@@ -642,6 +656,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Import(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.InsertRib()
    End Sub
 
@@ -665,6 +680,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Dim nNewRibLayerId As Integer = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewRibLayerId, LAY_NEWRIB)
       EgtSetCurrPartLayer(m_nPartId, nNewRibLayerId)
@@ -688,6 +704,7 @@ Public Class RibPanelVM
    End Property
 
    Public Sub Delete()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       If IsNothing(SelRib) Then Return
       Dim bOk As Boolean = False
       Select Case m_SelRib.Type
@@ -731,6 +748,7 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub ModifyCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(RibSelectionTypes.CURVE)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
    End Sub
@@ -755,6 +773,7 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub AddPointCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(RibSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
@@ -783,6 +802,7 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(RibSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
@@ -811,6 +831,7 @@ Public Class RibPanelVM
    ''' Execute the Extrude.  This method is invoked by the ExtrudeCommand.
    ''' </summary>
    Public Sub Extrude(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(RibSelectionTypes.EXTRUSION)
       If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
          m_bIsCreatingExtrusion = True
@@ -837,6 +858,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -861,6 +883,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneFront.  This method is invoked by the CPlaneFrontCommand.
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -885,6 +908,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneRight.  This method is invoked by the CPlaneRightCommand.
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -909,6 +933,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneBack.  This method is invoked by the CPlaneBackCommand.
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -933,6 +958,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneLeft.  This method is invoked by the CPlaneLeftCommand.
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -957,6 +983,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneBottom.  This method is invoked by the CPlaneBottomCommand.
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -981,6 +1008,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneElevation.  This method is invoked by the CPlaneElevationCommand.
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1004,6 +1032,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneOrigin.  This method is invoked by the CPlaneOriginCommand.
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -1027,6 +1056,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneRotate.  This method is invoked by the CPlaneRotateCommand.
    ''' </summary>
    Public Sub CPlaneRotate(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE)
       Else
@@ -1054,6 +1084,7 @@ Public Class RibPanelVM
    ''' Execute the CPlane3P.  This method is invoked by the CPlane3PCommand.
    ''' </summary>
    Public Sub CPlane3P(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_3P)
    End Sub
 
@@ -1077,6 +1108,7 @@ Public Class RibPanelVM
    ''' Execute the CPlanePerpObj.  This method is invoked by the CPlanePerpObjCommand.
    ''' </summary>
    Public Sub CPlanePerpObj(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE)
    End Sub
 
@@ -1100,6 +1132,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneObj.  This method is invoked by the CPlaneObjCommand.
    ''' </summary>
    Public Sub CPlaneObj(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
    End Sub
 
diff --git a/Icarus/RibParamPanel/RibParamPanelV.xaml b/Icarus/RibParamPanel/RibParamPanelV.xaml
index 470520d..fa2d9a6 100644
--- a/Icarus/RibParamPanel/RibParamPanelV.xaml
+++ b/Icarus/RibParamPanel/RibParamPanelV.xaml
@@ -32,7 +32,7 @@
                            </Grid.ColumnDefinitions>
                            <TextBlock Text="{Binding sName}"/>
                            <TextBox Grid.Column="1"
-                                                   Text="{Binding dValue}"/>
+                                                   Text="{Binding sValue}"/>
                            <Button Grid.Column="2"
                                     Content="R"
                                     Command="{Binding ResetParam_Command}"
diff --git a/Icarus/RibParamPanel/RibParamPanelVM.vb b/Icarus/RibParamPanel/RibParamPanelVM.vb
index 6e8e6ba..3e67d98 100644
--- a/Icarus/RibParamPanel/RibParamPanelVM.vb
+++ b/Icarus/RibParamPanel/RibParamPanelVM.vb
@@ -68,28 +68,20 @@ Public Class RibParamPanelVM
    End Sub
 
    Friend Sub WriteParamsInRib(nRibId As Integer)
+      ' se parametri modificati
+      Dim bModified As Boolean = False
       For Each Param As RibNumericMachiningParam In m_MachiningParamList
+         If Param.bIsModified AndAlso Not bModified Then bModified = True
          Param.WriteParamInRib(nRibId)
       Next
+      If bModified Then
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+      End If
    End Sub
 
 #End Region    ' METHODS
 
-
-
-   'Friend Sub UpdateIsModified()
-   '   m_bIsModified = m_CathegoryList.Any(Function(x) x.MachiningParamList.Any(Function(y) y.bIsModified))
-   'End Sub
-
-   'Sub New()
-   '   m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.RIBS, nIndex))
-   '   For Each Cathegory In m_CathegoryList
-   '      For Each MachiningParam In Cathegory.MachiningParamList
-   '         AddHandler MachiningParam.PropertyChanged, AddressOf OnMachiningParamPropertyChanged
-   '      Next
-   '   Next
-   'End Sub
-
 #Region "COMMANDS"
 
 #Region "Ok"
@@ -144,51 +136,10 @@ Public Class RibParamPanelVM
 
 End Class
 
-'Public Class RibMachiningCathegory
-'   Inherits MachiningCathegory
-
-'   Sub New(Type As Cathegories, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean)
-'      m_Type = Type
-'      Select Case m_Type
-'         Case Cathegories.RIBS
-'            m_sName = "Ribs"
-'            m_MachiningParamList = New List(Of MachiningParam)({New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb),
-'                                                                New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb)})
-'      End Select
-'   End Sub
-
-'   Friend Sub SaveCurrParams()
-'      For Each Param In m_MachiningParamList
-'         Param.SaveParam()
-'      Next
-'   End Sub
-
-'   Friend Sub ResetCurrParams()
-'      For Each Param In m_MachiningParamList
-'         Param.ResetParam()
-'      Next
-'   End Sub
-
-'   Friend Sub WriteCurrParamInPart(nPartId As Integer)
-'      For Each Param In m_MachiningParamList
-'         Param.WriteParamInPart(nPartId)
-'      Next
-'   End Sub
-
-'End Class
-
 Public Class RibNumericMachiningParam
    Inherits NumericMachiningParam
 
-   Public Overrides Property dValue As String
+   Public Overrides Property sValue As String
       Get
          Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
       End Get
@@ -198,7 +149,7 @@ Public Class RibNumericMachiningParam
          Else
             m_dValue = value
          End If
-         NotifyPropertyChanged(NameOf(dValue))
+         NotifyPropertyChanged(NameOf(sValue))
          NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
       End Set
    End Property
@@ -267,6 +218,7 @@ Public Class RibNumericMachiningParam
       m_dOrigValue = m_dValue
       If Not bReadFromPart Then
          m_dValue = m_dPartValue
+         m_dOrigValue = m_dPartValue
       End If
    End Sub
 
@@ -364,7 +316,7 @@ Public Class RibNumericMachiningParam
 
    Public Sub ResetParamCmd()
       m_dValue = m_dPartValue
-      NotifyPropertyChanged(NameOf(dValue))
+      NotifyPropertyChanged(NameOf(sValue))
       NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
    End Sub
 
diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb
index dd03b15..5777909 100644
--- a/Icarus/SceneHost/MySceneHostVM.vb
+++ b/Icarus/SceneHost/MySceneHostVM.vb
@@ -401,6 +401,8 @@ Public Class MySceneHostVM
          ' seleziono ultima rib
          Map.refRibPanelVM.SelLastRib()
          EgtDraw()
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End If
    End Sub
 
@@ -441,7 +443,7 @@ Public Class MySceneHostVM
                   If EntityType = GDB_TY.CRV_LINE OrElse EntityType = GDB_TY.CRV_ARC Then
                      nNewShellNumberId = EgtCreateCurveCompo(Map.refTopPanelVM.SelPart.nPartId, nNewEntityId, False)
                   Else
-                     ' lo copio nel layer dei rib
+                     ' lo copio nel layer dei shellnumber
                      nNewShellNumberId = EgtCopy(nNewEntityId, Map.refShellNumberPanelVM.nShellNumberLayerId, GDB_POS.LAST_SON)
                   End If
                   EgtSetName(nNewShellNumberId, RIB_CURVE)
@@ -471,6 +473,8 @@ Public Class MySceneHostVM
          ' seleziono ultima rib
          Map.refShellNumberPanelVM.SelLastShellNumber()
          EgtDraw()
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End If
    End Sub
 
@@ -781,6 +785,7 @@ Public Class MySceneHostVM
             Case ModifyModes.STARTMACH
             Case ModifyModes.RIBS
             Case ModifyModes.SHELLNUMBER
+               Map.refShellNumberPanelVM.OnKeyDown(e.KeyData)
             Case ModifyModes.AUXSOLIDS
          End Select
       End If
@@ -870,9 +875,16 @@ Public Class MySceneHostVM
          Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nPrintPartId, nOriginalPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, sFilePath)
          Map.refTopPanelVM.PartList.Add(NewPart)
          Dim bPartToRecalc As Boolean = False
-         EgtGetInfo(nPartId, MAC_TO_RECALC, bPartToRecalc)
+         EgtGetInfo(nPartId, MAC_TORECALC_SLICE, bPartToRecalc)
          If bPartToRecalc AndAlso Not bProjectToRecalc Then bProjectToRecalc = True
+         ' Disabilito segnalazione modificato
+         Dim DisableMgr As New DisableModifiedMgr
+         ' setto i solidi non calcolati
+         EgtSetInfo(nPartId, KEY_CALC_SOLIDS, 0)
+         EgtSetInfo(nPartId, KEY_HAS_SOLIDS, 0)
          nPartId = EgtGetNextPart(nPartId)
+         ' Ripristino stato segnalazione modifica
+         DisableMgr.ReEnable()
       End While
 
       ' se non e' da ricalcolare, recupero tempo e massa
@@ -999,6 +1011,7 @@ Public Class MySceneHostVM
             Case ModifyModes.DISPOSITION
             Case ModifyModes.REFERENCE
             Case ModifyModes.STARTMACH
+               Map.refStartMachPanelVM.OnExecCmdEnd(command)
             Case ModifyModes.RIBS
                Map.refRibPanelVM.OnExecCmdEnd(command)
             Case ModifyModes.SHELLNUMBER
@@ -1249,8 +1262,21 @@ Public Class MySceneHostVM
       If Not m_bDragToStart Then
          ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
-         ' Eseguo la selezione
-         Map.refShellNumberPanelVM.SelStartFromId(m_nIdToSel)
+         If Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
+            ' eseguo la selezione
+            EgtSelectObj(m_nIdToSel)
+            ' eseguo comando
+            Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
+            Map.refShellNumberPanelVM.ResetCPlaneObjIsActive()
+            ' ripristino selezioni precedenti
+            For Each Id In Map.refShellNumberPanelVM.PrevSelObjs
+               EgtSelectObj(Id)
+            Next
+            Map.refControllerInputPanelVM.ResetInputBox()
+         Else
+            ' eseguo la selezione
+            Map.refShellNumberPanelVM.SelStartFromId(m_nIdToSel)
+         End If
       End If
       ' Reset
       m_bDrag = False
diff --git a/Icarus/SceneHost/MySceneHostVM.vb.bak b/Icarus/SceneHost/MySceneHostVM.vb.bak
deleted file mode 100644
index b07847b..0000000
--- a/Icarus/SceneHost/MySceneHostVM.vb.bak
+++ /dev/null
@@ -1,655 +0,0 @@
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MySceneHostVM
-   Inherits EgtWPFLib5.SceneHostVM
-
-   Friend m_bIsFocused As Boolean
-   Friend Sub SetIsFocused(bValue As Boolean)
-      m_bIsFocused = bValue
-   End Sub
-
-   ' Identificativi per pezzo da selezionare/deselezionare
-   Private m_nIdToSel As Integer = GDB_ID.NULL
-   Private m_nIdToDesel As Integer = GDB_ID.NULL
-   ' Dati movimento
-   Private m_dMaxStep As Double = 0
-   ' Dati per Drag
-   Private m_nRestRadius As Integer = 5
-   Private m_bDrag As Boolean = False
-   Private m_bDragToStart As Boolean = False
-   Private m_bVerify As Boolean = False
-   Private m_bFromParking As Boolean = False
-   Private m_bDragging As Boolean = False
-   Private m_locPrev As System.Drawing.Point
-   Private m_ptPrev As Point3d
-   Private m_vtTotMove As Vector3d
-   Private m_dSnapDist As Double = 0
-
-
-   Private bReducedCut As Boolean = False
-   Private m_bMagnetic As Boolean
-
-#Region "CONSTRUCTOR"
-
-   Sub New()
-      MyBase.New()
-      AddHandler MainController.OnNewProject, AddressOf OnNewProject
-      AddHandler MainController.OnOpenProject, AddressOf OnOpenProject
-      AddHandler MainController.OnSavingProject, AddressOf OnSavingProject
-      AddHandler MainController.OnSavedProject, AddressOf OnSavedProject
-      AddHandler MainController.OnImportingProject, AddressOf OnImportingProject
-      AddHandler MainController.OnImportedProject, AddressOf OnImportedProject
-      AddHandler MainController.PrepareInputBox, AddressOf PrepareInputBox
-      AddHandler MainController.SetInputBoxText, AddressOf SetInputBoxText
-      AddHandler MainController.SetInputBoxCheck, AddressOf SetInputBoxCheck
-      AddHandler MainController.AddInputBoxCombo, AddressOf AddInputBoxCombo
-      AddHandler MainController.UpdateUI, AddressOf UpdateUI
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Overrides Sub InitScene()
-      InitSceneEvents()
-      ' Inizializzazione Scena
-      PreInitializeScene()
-      ' Se tutto bene
-      If MainScene.Init() And Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT._3DPRINT) Then
-         PostInitializeScene()
-         ' Imposto stato gestione mouse diretto della scena a nessuno
-         MainScene.SetStatusNull()
-         EgtSetCurrentContext(MainScene.GetCtx())
-         ' inizializzo gestore travi e pareti
-         EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
-         ' inizializzo gestore lavorazioni
-         EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
-         Return
-      End If
-      ' Problemi
-      ' Se manca la chiave
-      If Map.refMainWindowVM.MainWindowM.nKeyLevel = -1 Or Map.refMainWindowVM.MainWindowM.nKeyLevel = -2 Then
-         EgtOutLog("Missing Dongle")
-         ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
-         MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-         ' Altrimenti manca la licenza
-      Else
-         EgtOutLog("Problems with Licence")
-         ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
-         If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
-            ' Apro dialogo per richiesta file licenza
-            Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
-               .DefaultExt = ".lic",
-               .Filter = "Licences (.lic)|*.lic",
-               .CheckFileExists = True,
-               .ValidateNames = True
-            }
-            If LicDlg.ShowDialog() = True Then
-               ' Recupero il direttorio del file
-               Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
-               ' Se il file non è già nel direttorio di configurazione lo copio
-               If Not String.Equals(Path.GetFullPath(sDir), Path.GetFullPath(Map.refMainWindowVM.MainWindowM.sConfigDir), StringComparison.OrdinalIgnoreCase) Then
-                  Try
-                     File.Copy(LicDlg.FileName, Path.Combine(Map.refMainWindowVM.MainWindowM.sConfigDir, LicDlg.SafeFileName), True)
-                  Catch ex As Exception
-                  End Try
-               End If
-               ' Imposto il nuovo file di licenza nell'Ini
-               WriteMainPrivateProfileString(S_GENERAL, K_LICENCE, LicDlg.SafeFileName)
-            End If
-         End If
-      End If
-      ' Chiudo il programma
-      End
-   End Sub
-
-   Public Overrides Sub InitSceneEvents()
-      AddHandler MainScene.OnCursorPos, AddressOf OnCursorPos
-      AddHandler MainScene.OnMouseSetObjFilterForSelect, AddressOf OnMouseSetObjFilterForSelect
-      AddHandler MainScene.OnMouseSelectedAll, AddressOf OnMouseSelectedAll
-      AddHandler MainScene.OnMouseDeselectedAll, AddressOf OnMouseDeselectedAll
-      AddHandler MainScene.OnMouseDownScene, AddressOf OnMouseDownScene
-      AddHandler MainScene.OnMouseMoveScene, AddressOf OnMouseMoveScene
-      AddHandler MainScene.OnMouseUpScene, AddressOf OnMouseUpScene
-      AddHandler MainScene.OnMouseSelectedObj, AddressOf OnMouseSelectedObj
-      AddHandler MainScene.OnMouseSelectedPart, AddressOf OnMouseSelectedPart
-      AddHandler MainScene.OnMouseSelectedLayer, AddressOf OnMouseSelectedLayer
-      AddHandler MainScene.OnMouseSelectedPath, AddressOf OnMouseSelectedPath
-      AddHandler MainScene.OnMousePointFromSelection, AddressOf OnMousePointFromSelection
-      AddHandler MainScene.OnMouseDone, AddressOf OnMouseDone
-      AddHandler MainScene.OnMouseSelectedPoint, AddressOf OnMouseSelectedPoint
-      AddHandler MainScene.OnMouseSelectedDir, AddressOf OnMouseSelectedDir
-      AddHandler MainScene.OnMouseMoveSelPoint, AddressOf OnMouseMoveSelPoint
-      AddHandler MainScene.OnShowDistance, AddressOf OnShowDistance
-      AddHandler MainScene.KeyDown, AddressOf OnKeyDown
-      AddHandler MainScene.OnCloseGetDist, AddressOf OnCloseGetDist
-      AddHandler MainScene.OnChangedSnapPointType, AddressOf OnChangedSnapPointType
-   End Sub
-
-   Private Sub PreInitializeScene()
-      ' imposto colore di default
-      Dim DefColor As New Color3d(0, 0, 0)
-      GetMainPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
-      MainScene.SetDefaultMaterial(DefColor)
-      ' imposto colori sfondo
-      Dim BackTopColor As New Color3d(192, 192, 192)
-      GetMainPrivateProfileColor(S_SCENE, K_BACKTOP, BackTopColor)
-      Dim BackBotColor As New Color3d(BackTopColor)
-      GetMainPrivateProfileColor(S_SCENE, K_BACKBOTTOM, BackBotColor)
-      MainScene.SetViewBackground(BackTopColor, BackBotColor)
-      ' imposto colore di evidenziazione
-      Dim MarkColor As New Color3d(255, 255, 0)
-      GetMainPrivateProfileColor(S_SCENE, K_MARK, MarkColor)
-      MainScene.SetMarkMaterial(MarkColor)
-      ' imposto colore per superfici selezionate
-      Dim SelSurfColor As New Color3d(255, 255, 192)
-      GetMainPrivateProfileColor(S_SCENE, K_SELSURF, SelSurfColor)
-      MainScene.SetSelSurfMaterial(SelSurfColor)
-      ' imposto tipo e colore del rettangolo di zoom
-      Dim bOutline As Boolean = True
-      Dim ZwColor As New Color3d(0, 0, 0)
-      GetMainPrivateProfileZoomWin(S_SCENE, K_ZOOMWIN, bOutline, ZwColor)
-      MainScene.SetZoomWinAttribs(bOutline, ZwColor)
-      ' imposto colore della linea di distanza
-      Dim DstLnColor As New Color3d(255, 0, 0)
-      GetMainPrivateProfileColor(S_SCENE, K_DISTLINE, DstLnColor)
-      MainScene.SetDistLineMaterial(DstLnColor)
-      ' imposto parametri OpenGL
-      Dim nDriver As Integer = GetMainPrivateProfileInt(S_OPENGL, K_DRIVER, 3)
-      Dim b2Buff As Boolean = (GetMainPrivateProfileInt(S_OPENGL, K_DOUBLEBUFFER, 1) <> 0)
-      Dim nColorBits As Integer = GetMainPrivateProfileInt(S_OPENGL, K_COLORBITS, 32)
-      Dim nDepthBits As Integer = GetMainPrivateProfileInt(S_OPENGL, K_DEPTHBITS, 32)
-      MainScene.SetViewAttributes(nDriver, b2Buff, nColorBits, nDepthBits)
-   End Sub
-
-   Private Sub PostInitializeScene()
-      ' Impostazioni Controller
-      MainController.SetScene(MainScene)
-      ' imposto tipo coordinate
-      MainScene.SetGridCursorPos(True)
-      ' 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
-      Dim bShowTriaAdv As Boolean = (GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
-      EgtSetShowTriaAdv(bShowTriaAdv)
-      ' tipo visualizzazione per Zmap
-      Dim nShowZmap As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWZMAP, 1)
-      EgtSetShowZmap(DirectCast(nShowZmap, ZSM), False)
-      ' dimensione lineare max in pixel delle textures
-      Dim nTxrMaxLinPix As Integer = GetMainPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096)
-      EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
-      ' tipo snap point
-      MainScene.SetSnapPointType(SP.PT_SKETCH)
-      ' visualizzazione assemblato
-      Dim nShowBuilding As Boolean = GetMainPrivateProfileInt(S_SCENE, K_SHOWBUILDING, 0) <> 0
-      '''Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding)
-      ' nascondo input box
-      '''Map.refFreeContourInputVM.ResetInputBox()
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "ProjectManager"
-
-   Public Overrides Sub NewProject()
-      EgtSetCurrentContext(MainScene.GetCtx())
-      Dim bOk As Boolean = MainController.NewProject()
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub OpenProject(sFilePath As String)
-      EgtSetCurrentContext(MainScene.GetCtx())
-      Dim bOk As Boolean = False
-      If String.IsNullOrEmpty(sFilePath) Then
-         ' Recupero cartella dell'ultimo progetto aperto
-         Dim sDir As String = MainController.GetCurrFile()
-         If String.IsNullOrWhiteSpace(sDir) Then
-            GetMainPrivateProfileString(S_MRUFILES, K_FILE, "", sDir)
-         End If
-         If Not String.IsNullOrWhiteSpace(sDir) Then
-            sDir = Path.GetDirectoryName(sDir)
-         End If
-         bOk = MainController.OpenProject(sDir)
-      Else
-         bOk = MainController.OpenProject(sFilePath, False)
-      End If
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub SaveProject()
-      MyBase.SaveProject()
-      ' Imposto stato gestione mouse diretto della scena a nessuno
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub SaveAsProject()
-      MyBase.SaveAsProject()
-      ' Imposto stato gestione mouse diretto della scena a nessuno
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub ImportProject()
-      Dim sDir As String = String.Empty
-      GetMainPrivateProfileString(S_MRUIMPORT, K_FILE & "1", "", sDir)
-      If Not String.IsNullOrWhiteSpace(sDir) Then
-         sDir = Path.GetDirectoryName(sDir)
-      End If
-      sDir.TrimEnd("\"c)
-      MainController.ImportProject(sDir)
-      ' Imposto stato gestione mouse diretto della scena a nessuno
-      MainScene.SetStatusNull()
-   End Sub
-
-   Friend Sub PreExecScript(bScriptInMru As Boolean)
-      'm_bScriptInMru = bScriptInMru
-   End Sub
-
-   Friend Sub ExecScript(sFilePath As String)
-      If String.IsNullOrEmpty(sFilePath) Then
-         Dim sDir As String = String.Empty
-         'GetMainPrivateProfileString(S_GENERAL, K_LASTLUADIR, "", sDir)
-         MainController.Exec(sDir)
-      Else
-         MainController.Exec(sFilePath, False)
-      End If
-      Dim bMachiningMode As Boolean = EgtGetCurrMachGroup() <> GDB_ID.NULL
-      If Not bMachiningMode And EgtGetCurrLayer() = GDB_ID.NULL Then
-         Dim nCurrPart As Integer = EgtGetCurrPart()
-         If nCurrPart = GDB_ID.NULL Or Not EgtSetCurrPartLayer(nCurrPart, EgtGetFirstLayer(nCurrPart, True)) Then
-            EgtResetCurrPartLayer()
-         End If
-      End If
-   End Sub
-
-#End Region    ' ProjectManager
-
-#Region "SCENE EVENTS"
-
-   Private Sub OnCursorPos(ByVal sender As Object, ByVal sCursorPos As String)
-      Map.refMyStatusBarVM.SetCurrPos(sCursorPos)
-   End Sub
-
-   Private Sub OnMouseSetObjFilterForSelect(sender As Object, bZeroDim As Boolean, bCurve As Boolean,
-                                            bSurf As Boolean, bVolume As Boolean, bExtra As Boolean)
-   End Sub
-
-   Private Sub OnMouseSelectedAll(ByVal sender As Object, bOnlyVisble As Boolean)
-   End Sub
-
-   Private Sub OnMouseDeselectedAll(ByVal sender As Object)
-   End Sub
-
-   Private Sub OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
-      If e.Button = Forms.MouseButtons.Middle Then Return
-      If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
-      Basic_OnMouseDownScene(sender, e)
-      'Select Case Map.refMainMenuVM.SelPage
-      '   Case Pages.VIEW
-      '      If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
-      '         If Map.refFreeContourManagerVM.bIsActive Then Return
-      '         If Map.refShowBeamPanelVM.bShowAll Then
-      '            View_Part_OnMouseDownScene(sender, e)
-      '         Else
-      '            View_Feature_OnMouseDownScene(sender, e)
-      '         End If
-      '      End If
-      '   Case Pages.MACHINING
-      '      If Not IsNothing(Map.refMachGroupPanelVM) AndAlso Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
-      '         Dim SelectedMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
-      '         If EgtGetCurrMachGroup() = GDB_ID.NULL Then Return
-      '         If SelectedMachGroup.nType = BWType.BEAM Then
-      '            Beam_OnMouseDownScene(sender, e)
-      '         ElseIf SelectedMachGroup.nType = BWType.WALL Then
-      '            Wall_OnMouseDownScene(sender, e)
-      '         End If
-      '      End If
-      'End Select
-   End Sub
-
-   Private Sub OnMouseMoveScene(sender As Object, e As Forms.MouseEventArgs)
-      If e.Button = Forms.MouseButtons.Middle Then Return
-      If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
-      Basic_OnMouseMoveScene(sender, e)
-      'Select Case Map.refMainMenuVM.SelPage
-      '   Case Pages.VIEW
-      '      If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
-      '         If Map.refFreeContourManagerVM.bIsActive Then Return
-      '         If Map.refShowBeamPanelVM.bShowAll Then
-      '            View_Part_OnMouseMoveScene(sender, e)
-      '         Else
-      '            View_Feature_OnMouseMoveScene(sender, e)
-      '         End If
-      '      End If
-      '   Case Pages.MACHINING
-      '      If Not IsNothing(Map.refMachGroupPanelVM) AndAlso Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
-      '         Dim SelectedMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
-      '         If EgtGetCurrMachGroup() = GDB_ID.NULL Then Return
-      '         If SelectedMachGroup.nType = BWType.BEAM Then
-      '            Beam_OnMouseMoveScene(sender, e)
-      '         ElseIf SelectedMachGroup.nType = BWType.WALL Then
-      '            Wall_OnMouseMoveScene(sender, e)
-      '         End If
-      '      End If
-      'End Select
-   End Sub
-
-   Private Sub OnMouseUpScene(sender As Object, e As Forms.MouseEventArgs)
-      If e.Button = Forms.MouseButtons.Middle Then Return
-      If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
-      Basic_OnMouseUpScene(sender, e)
-      'Select Case Map.refMainMenuVM.SelPage
-      '   Case Pages.VIEW
-      '      If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
-      '         If Map.refFreeContourManagerVM.bIsActive Then Return
-      '         If Map.refShowBeamPanelVM.bShowAll Then
-      '            View_Part_OnMouseUpScene(sender, e)
-      '         Else
-      '            View_Feature_OnMouseUpScene(sender, e)
-      '         End If
-      '      End If
-      '   Case Pages.MACHINING
-      '      If Not IsNothing(Map.refMachGroupPanelVM) AndAlso Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
-      '         Dim SelectedMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
-      '         If EgtGetCurrMachGroup() = GDB_ID.NULL Then Return
-      '         If SelectedMachGroup.nType = BWType.BEAM Then
-      '            Beam_OnMouseUpScene(sender, e)
-      '         ElseIf SelectedMachGroup.nType = BWType.WALL Then
-      '            Wall_OnMouseUpScene(sender, e)
-      '         End If
-      '      End If
-      'End Select
-   End Sub
-
-   Private Sub OnMouseSelectedObj(ByVal sender As Object, ByVal nId As Integer, ByVal bLast As Boolean)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   ' se sto editando testo angoli
-      '   If Map.refFreeContourManagerVM.bIsModifyingTextAngle Then
-      '      ' passo testo selezionato
-      '      Map.refFreeContourManagerVM.TextAngleSelected(nId)
-      '   End If
-      '   MainController.MouseSelectedObj(nId, bLast)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedPart(ByVal sender As Object, ByVal nId As Integer)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.MouseSelectedPart(nId)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedLayer(ByVal sender As Object, ByVal nId As Integer)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.MouseSelectedLayer(nId)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedPath(ByVal sender As Object, ByVal nId As Integer, ByVal bHaltOnFork As Boolean)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.MouseSelectedPath(nId, bHaltOnFork)
-      'End If
-   End Sub
-
-   Private Sub OnMousePointFromSelection(ByVal sender As Object, ByVal nId As Integer, ByVal PtP As Point3d, ByVal nAux As Integer)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.SetPointFromSelection(nId, PtP, nAux)
-      'End If
-   End Sub
-
-   Private Sub OnMouseDone(ByVal sender As Object)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.Done(Map.refFreeContourInputVM.Text)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedPoint(ByVal sender As Object, ByVal PtP As Point3d, ByVal nSep As SEP, ByVal nId As Integer)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   Dim bDone As Boolean = (Keyboard.Modifiers And ModifierKeys.Control) <> ModifierKeys.Control
-      '   MainController.MouseSelectedPoint(PtP, nSep, nId, bDone)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedDir(ByVal sender As Object, ByVal VtDir As Vector3d)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.SetLastVector3d(VtDir)
-      'End If
-   End Sub
-
-   Private Sub OnMouseMoveSelPoint(ByVal sender As Object, ByVal PtP As Point3d)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.MouseMoveInSelectionPoint(PtP)
-      'End If
-   End Sub
-
-   Private Sub OnShowDistance(ByVal sender As Object, ByVal sDistance As String)
-      Map.refMyStatusBarVM.SetOutputMessage(sDistance)
-   End Sub
-
-   Private Sub OnKeyDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.KeyEventArgs)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   ' Con DEL eseguo cancellazione delle entità selezionate
-      '   If e.KeyData = System.Windows.Forms.Keys.Delete Then
-      '      MainController.SetLastInteger(GDB_ID.SEL)
-      '      MainController.ExecuteCommand(Controller.CMD.DELETE)
-      '      ' Con SPAZIO ripeto l'ultimo comando
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.Space Then
-      '      MainController.RepeatLastCommand()
-      '      ' Con 'A' e in modalità continuazione, forzo il passaggio ad arco
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.A And MainController.GetContinue() Then
-      '      MainController.ContinueArcPDP()
-      '      ' Con 'L'  e in modalità continuazione, forzo il passaggio a retta
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.L And MainController.GetContinue() Then
-      '      MainController.ContinueLine2P()
-      '      ' Con 'V' cambio lo stato del check
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.V Then
-      '      Map.refFreeContourInputVM.ChangeInputBoxCheck()
-      '   End If
-      'End If
-   End Sub
-
-   Private Sub OnCloseGetDist(sender As System.Object)
-      Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
-   End Sub
-
-   Friend Sub OnChangedSnapPointType(ByVal sender As Object, ByVal nSpType As SP, ByVal bUser As Boolean)
-      If Not IsNothing(Map.refMyStatusBarVM) Then Map.refMyStatusBarVM.SetSnapPointType(nSpType)
-   End Sub
-
-#End Region    ' SCENE EVENTS
-
-#Region "CONTROLLER EVENTS"
-
-   Private Sub OnNewProject(sender As Object, bOk As Boolean)
-      EgtZoom(ZM.ALL)
-      If Not bOk Then
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10002), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Error on new file  - Error
-      End If
-      MainScene.SetStatusNull()
-   End Sub
-
-   Private Sub OnOpenProject(sender As Object, sFile As String, bOk As Boolean)
-      EgtZoom(ZM.ALL)
-      WriteMainPrivateProfileString(S_GENERAL, K_LASTNGEDIR, Path.GetDirectoryName(sFile))
-      If bOk Then
-         Map.refProjManagerVM.MruFiles.Add(sFile)
-      Else
-         Map.refProjManagerVM.MruFiles.Remove(sFile)
-         Dim sMsg As String
-         If My.Computer.FileSystem.FileExists(sFile) Then
-            sMsg = EgtMsg(10003) & " '" & sFile & "'"            'Error opening file
-         Else
-            sMsg = EgtMsg(10009) & " '" & sFile & "'"            'Missing file
-         End If
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-      End If
-      MainScene.SetStatusNull()
-   End Sub
-
-   Private Sub OnSavingProject(ByVal sender As Object, sFile As String)
-   End Sub
-
-   Private Sub OnSavedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
-      WriteMainPrivateProfileString(S_GENERAL, K_LASTNGEDIR, Path.GetDirectoryName(sFile))
-      If bOk Then
-         Map.refProjManagerVM.MruFiles.Add(sFile)
-      Else
-         Map.refProjManagerVM.MruFiles.Remove(sFile)
-         Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'"            'Error saving file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
-      End If
-   End Sub
-
-   Private Sub OnImportingProject(sender As Object, nType As Integer, ByRef nFlag As Integer)
-      If nType <> FT.NULL Then
-         If nType = FT.CNC Then
-            nFlag = GetMainPrivateProfileInt(S_IMPORT, K_CNCFLAG, EIC_FL.NONE)
-         Else
-            nFlag = 0
-         End If
-         ' Abilito progress e bottone stop
-         Map.refMyStatusBarVM.StartLoading("", True)
-      Else
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
-      End If
-   End Sub
-
-   Private Sub OnImportedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
-      EgtZoom(ZM.ALL)
-      ' Disabilito progress e bottone stop
-      Map.refMyStatusBarVM.EndLoading("")
-      ' Salvo path
-      WriteMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, Path.GetDirectoryName(sFile))
-      ' Segnalo eventuale errore
-      If Not bOk Then
-         Dim sMsg As String = EgtMsg(10006) & " '" & sFile & "'"            'Error importing file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
-      End If
-      MainScene.SetStatusNull()
-   End Sub
-
-   Private Sub PrepareInputBox(ByVal sTitle As String, ByVal sLabel As String, ByVal sCheckLabel As String,
-                                 ByVal bShowCombo As Boolean, ByVal bShowBtn As Boolean)
-      'Map.refFreeContourInputVM.PrepareInputBox(sTitle, sLabel, sCheckLabel, bShowCombo, bShowBtn)
-   End Sub
-
-   Private Sub SetInputBoxText(ByVal sText As String)
-      'Map.refFreeContourInputVM.SetInputBoxText(sText)
-   End Sub
-
-   Private Sub SetInputBoxCheck(ByVal bCheck As Boolean)
-      'Map.refFreeContourInputVM.SetInputBoxCheck(bCheck)
-   End Sub
-
-   Private Sub AddInputBoxCombo(ByVal sText As String, ByVal bSelected As Boolean)
-      'Map.refFreeContourInputVM.AddInputBoxCombo(sText, bSelected)
-   End Sub
-
-   Private Sub UpdateUI(ByVal sender As Object, ByVal bReloadUI As Boolean)
-      '' pulisco input e relativi messaggi
-      'Map.refFreeContourInputVM.ResetInputBox()
-      If MainController.GetContinue() Then
-         Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(399))      ' Continue : 'L' with line, 'A' with arc
-      Else
-         Map.refMyStatusBarVM.ClearOutputMessage()
-      End If
-   End Sub
-
-#End Region    ' CONTROLLER EVENTS
-
-#Region "Part"
-
-   Friend Sub Basic_OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
-      ' Verifico se selezionato indicativo di pezzo
-      EgtSetObjFilterForSelWin(True, True, True, True, True)
-      Dim nSel As Integer
-      EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
-      Dim nId As Integer = EgtGetFirstObjInSelWin()
-      While nId <> GDB_ID.NULL
-         ' Recupero l'identificativo del pezzo cui appartiene
-         Dim nPartId As Integer = EgtGetParent(EgtGetParent(nId))
-         Dim bFound As Boolean = False
-         If EgtIsPart(nPartId) Then bFound = True
-         If Not bFound Then
-            nId = EgtGetNextObjInSelWin()
-            Continue While
-         End If
-         Dim nStat As Integer = GDB_ST.ON_
-         EgtGetStatus(nPartId, nStat)
-         ' Se già selezionato
-         If nStat = GDB_ST.SEL Then
-            ' Memorizzo Id da deselezionare
-            m_nIdToDesel = nPartId
-         Else
-            ' Memorizzo Id da selezionare
-            m_nIdToSel = nPartId
-         End If
-         Exit While
-         nId = EgtGetNextObjInSelWin()
-      End While
-      ' Dati per drag
-      m_bDragToStart = True
-   End Sub
-
-   Friend Sub Basic_OnMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
-      ' Se drag non abilitato o già in esecuzione, esco
-      If Not m_bDragToStart Then Return
-      ' Se primo movimento di drag, verifico di aver superato la soglia di movimento in pixel
-      If m_bDragToStart Then
-         If Math.Abs(e.Location.X - m_locPrev.X) < m_nRestRadius And
-            Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
-            Return
-         End If
-         m_bDragToStart = False
-      End If
-   End Sub
-
-   Friend Sub Basic_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
-      ' Se eseguito drag
-      If Not m_bDragToStart Then
-         ' Se selezione da eseguire
-      ElseIf m_nIdToSel <> GDB_ID.NULL Then
-         ' Se pezzo da selezionare non è già selezionato
-         'If EgtIsSelectedObj(m_nIdToSel) Then
-         ' Eseguo la selezione
-         EgtDeselectAll()
-         EgtSelectPartObjs(m_nIdToSel)
-         'EgtSelectObj(m_nIdToSel)
-         'EgtSetMark(m_nIdToSel)
-         'End If
-         'If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId <> m_nIdToSel Then
-         '      ' Eseguo la selezione
-         '      For Each BTLPart In Map.refProjectVM.BTLStructureVM.BTLPartVMList
-         '         If BTLPart.nPartId = m_nIdToSel Then
-         '            BTLPart.SetIsSelected(True)
-         '         ElseIf BTLPart.IsSelected Then
-         '            BTLPart.SetIsSelected(False)
-         '         End If
-         '      Next
-         '   End If
-      End If
-      ' Reset
-      m_bDrag = False
-      m_nIdToSel = GDB_ID.NULL
-      m_nIdToDesel = GDB_ID.NULL
-      EgtDraw()
-   End Sub
-
-#End Region       ' Part
-
-End Class
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
index 846da85..41ee11e 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
@@ -80,6 +80,8 @@ Public Class ShellNumberPanelVM
          Else
             NotifyPropertyChanged(NameOf(sXPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -107,6 +109,8 @@ Public Class ShellNumberPanelVM
          Else
             NotifyPropertyChanged(NameOf(sYPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -134,6 +138,8 @@ Public Class ShellNumberPanelVM
          Else
             NotifyPropertyChanged(NameOf(sZPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -185,6 +191,8 @@ Public Class ShellNumberPanelVM
          Else
             m_sRotAngle = value
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -194,7 +202,7 @@ Public Class ShellNumberPanelVM
          Return m_bAdd_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bAdd_IsChecked = value
             If value Then
                m_bEdit_IsChecked = False
@@ -216,7 +224,7 @@ Public Class ShellNumberPanelVM
          Return m_bEdit_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked Then
+         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bEdit_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -240,7 +248,7 @@ Public Class ShellNumberPanelVM
          Return m_bGrid_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bGrid_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -262,7 +270,7 @@ Public Class ShellNumberPanelVM
          Return m_bMove_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked Then
+         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bMove_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -286,7 +294,7 @@ Public Class ShellNumberPanelVM
          Return m_bRotate_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked Then
+         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bRotate_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -310,7 +318,7 @@ Public Class ShellNumberPanelVM
          Return m_bMachParam_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelShellNumber) AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
+         If Not IsNothing(m_SelShellNumber) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
             m_bMachParam_IsChecked = True
             m_bAdd_IsChecked = False
             m_bEdit_IsChecked = False
@@ -517,7 +525,7 @@ Public Class ShellNumberPanelVM
             EgtDraw()
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
-         Case Controller.CMD.GRID_ELEVATION, Controller.CMD.GRID_3P, Controller.CMD.GRID_ORIGIN, Controller.CMD.GRID_PERPCURVE, Controller.CMD.GRID_ROTATE, Controller.CMD.GRID_ROTATE3D
+         Case Controller.CMD.GRID_ELEVATION, Controller.CMD.GRID_3P, Controller.CMD.GRID_ORIGIN, Controller.CMD.GRID_PERPCURVE, Controller.CMD.GRID_ROTATE, Controller.CMD.GRID_ROTATE3D, Controller.CMD.GRID_OBJ
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
       End Select
@@ -563,6 +571,9 @@ Public Class ShellNumberPanelVM
          Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewRibLayerId)
          Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
          If NewGeomType = GDB_TY.CRV_COMPO Then
+            If Not EgtCurveIsClosed(nNewEntityId) Then
+               EgtCloseCurveCompo(nNewEntityId)
+            End If
             EgtSetName(nNewEntityId, RIB_CURVE)
             ' coloro l'entita' di verde
             Dim c3LightBlue As Color3d
@@ -585,20 +596,37 @@ Public Class ShellNumberPanelVM
             EgtSelectObj(nNewEntityId)
             If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
                m_bIsCreatingExtrusion = True
+               Map.refControllerInputPanelVM.IsChecked = True
             Else
                ' cancello layer
-               'EgtErase(nNewRibLayerId)
                EgtErase(nNewExtrusionLayerId)
             End If
          End If
          ' cancello layer di disegno
          EgtErase(nNewRibLayerId)
       End If
+      Select Case command
+         Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE, Controller.CMD.EXTRUDE,
+              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)
       If Key = Forms.Keys.Escape Then
-
+         ' se attiva, disattivo griglia su oggetto
+         If m_bCPlaneObj_IsActive Then
+            m_bCPlaneObj_IsActive = False
+            ResetCPlaneObjIsActive()
+            ' ripristino selezioni precedenti
+            For Each Id In Map.refShellNumberPanelVM.PrevSelObjs
+               EgtSelectObj(Id)
+            Next
+            EgtDraw()
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+         End If
       End If
    End Sub
 
@@ -642,6 +670,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Import(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.InsertShellNumber()
    End Sub
 
@@ -665,6 +694,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Dim nNewShellNumberLayerId As Integer = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
       EgtSetCurrPartLayer(m_nPartId, nNewShellNumberLayerId)
@@ -688,6 +718,7 @@ Public Class ShellNumberPanelVM
    End Property
 
    Public Sub Delete()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       If IsNothing(SelShellNumber) Then Return
       Dim bOk As Boolean = False
       Select Case m_SelShellNumber.Type
@@ -731,6 +762,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub ModifyCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(ShellNumberSelectionTypes.CURVE)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
    End Sub
@@ -755,6 +787,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub AddPointCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(ShellNumberSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
@@ -783,6 +816,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(ShellNumberSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
@@ -811,9 +845,11 @@ Public Class ShellNumberPanelVM
    ''' Execute the Extrude.  This method is invoked by the ExtrudeCommand.
    ''' </summary>
    Public Sub Extrude(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(ShellNumberSelectionTypes.EXTRUSION)
       If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
          m_bIsCreatingExtrusion = True
+         Map.refControllerInputPanelVM.IsChecked = True
       End If
    End Sub
 
@@ -837,6 +873,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -861,6 +898,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneFront.  This method is invoked by the CPlaneFrontCommand.
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -885,6 +923,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneRight.  This method is invoked by the CPlaneRightCommand.
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -909,6 +948,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneBack.  This method is invoked by the CPlaneBackCommand.
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -933,6 +973,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneLeft.  This method is invoked by the CPlaneLeftCommand.
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -957,6 +998,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneBottom.  This method is invoked by the CPlaneBottomCommand.
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -981,6 +1023,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneElevation.  This method is invoked by the CPlaneElevationCommand.
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1004,6 +1047,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneOrigin.  This method is invoked by the CPlaneOriginCommand.
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -1027,6 +1071,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneRotate.  This method is invoked by the CPlaneRotateCommand.
    ''' </summary>
    Public Sub CPlaneRotate(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE)
       Else
@@ -1054,6 +1099,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlane3P.  This method is invoked by the CPlane3PCommand.
    ''' </summary>
    Public Sub CPlane3P(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_3P)
    End Sub
 
@@ -1077,6 +1123,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlanePerpObj.  This method is invoked by the CPlanePerpObjCommand.
    ''' </summary>
    Public Sub CPlanePerpObj(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE)
    End Sub
 
@@ -1084,6 +1131,22 @@ Public Class ShellNumberPanelVM
 
 #Region "CPlaneObj"
 
+   Private m_bCPlaneObj_IsActive As Boolean = False
+   Friend ReadOnly Property bCPlaneObj_IsActive As Boolean
+      Get
+         Return m_bCPlaneObj_IsActive
+      End Get
+   End Property
+   Friend Sub ResetCPlaneObjIsActive()
+      m_bCPlaneObj_IsActive = False
+   End Sub
+   Private m_PrevSelObjs As New List(Of Integer)
+   Friend ReadOnly Property PrevSelObjs As List(Of Integer)
+      Get
+         Return m_PrevSelObjs
+      End Get
+   End Property
+
    ''' <summary>
    ''' Returns a command that do CPlanepObj.
    ''' </summary>
@@ -1100,7 +1163,16 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneObj.  This method is invoked by the CPlaneObjCommand.
    ''' </summary>
    Public Sub CPlaneObj(ByVal param As Object)
-      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      ' salvo selezione precedente e deseleziono altri oggetti
+      Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
+      While nSelObjId <> GDB_ID.NULL
+         m_PrevSelObjs.Add(nSelObjId)
+         nSelObjId = EgtGetNextSelectedObj()
+      End While
+      EgtDeselectAll()
+      m_bCPlaneObj_IsActive = True
+      Map.refControllerInputPanelVM.PrepareInputBox("Grid from Selection", "Select the face of the object where to place the grid", "", False, False)
    End Sub
 
 #End Region ' CPlaneObj
@@ -1117,6 +1189,7 @@ Public Class ShellNumberPanelVM
    End Property
 
    Public Sub DragMove()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(ShellNumberSelectionTypes.BOTH)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE)
    End Sub
@@ -1135,6 +1208,7 @@ Public Class ShellNumberPanelVM
    End Property
 
    Public Sub DragRotate()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand(ShellNumberSelectionTypes.BOTH)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.ROTATE)
    End Sub
diff --git a/Icarus/ShellNumberParamPanel/ShellNumberParamPanelV.xaml b/Icarus/ShellNumberParamPanel/ShellNumberParamPanelV.xaml
index 7b7c987..06d3f21 100644
--- a/Icarus/ShellNumberParamPanel/ShellNumberParamPanelV.xaml
+++ b/Icarus/ShellNumberParamPanel/ShellNumberParamPanelV.xaml
@@ -32,7 +32,7 @@
                            </Grid.ColumnDefinitions>
                            <TextBlock Text="{Binding sName}"/>
                            <TextBox Grid.Column="1"
-                                                   Text="{Binding dValue}"/>
+                                                   Text="{Binding sValue}"/>
                            <Button Grid.Column="2"
                                     Content="R"
                                     Command="{Binding ResetParam_Command}"
diff --git a/Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb b/Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb
index 21bfe4c..70544c1 100644
--- a/Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb
+++ b/Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb
@@ -62,9 +62,16 @@ Public Class ShellNumberParamPanelVM
    End Sub
 
    Friend Sub WriteParamsInShellNumber(nRibId As Integer)
+      ' se parametri modificati
+      Dim bModified As Boolean = False
       For Each Param As ShellNumberNumericMachiningParam In m_MachiningParamList
+         If Param.bIsModified AndAlso Not bModified Then bModified = True
          Param.WriteParamInShellNumber(nRibId)
       Next
+      If bModified Then
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+      End If
    End Sub
 
 #End Region    ' METHODS
@@ -126,7 +133,7 @@ End Class
 Public Class ShellNumberNumericMachiningParam
    Inherits NumericMachiningParam
 
-   Public Overrides Property dValue As String
+   Public Overrides Property sValue As String
       Get
          Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
       End Get
@@ -136,7 +143,7 @@ Public Class ShellNumberNumericMachiningParam
          Else
             m_dValue = value
          End If
-         NotifyPropertyChanged(NameOf(dValue))
+         NotifyPropertyChanged(NameOf(sValue))
          NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
       End Set
    End Property
@@ -181,6 +188,7 @@ Public Class ShellNumberNumericMachiningParam
       m_dOrigValue = m_dValue
       If Not bReadFromPart Then
          m_dValue = m_dPartValue
+         m_dOrigValue = m_dPartValue
       End If
    End Sub
 
@@ -242,7 +250,7 @@ Public Class ShellNumberNumericMachiningParam
 
    Public Sub ResetParamCmd()
       m_dValue = m_dPartValue
-      NotifyPropertyChanged(NameOf(dValue))
+      NotifyPropertyChanged(NameOf(sValue))
       NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
    End Sub
 
diff --git a/Icarus/ShowValueSlider/ShowValueSlider.xaml b/Icarus/ShowValueSlider/ShowValueSlider.xaml
new file mode 100644
index 0000000..5b1099f
--- /dev/null
+++ b/Icarus/ShowValueSlider/ShowValueSlider.xaml
@@ -0,0 +1,4 @@
+<Slider x:Class="ShowValueSlider"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</Slider>
diff --git a/Icarus/ShowValueSlider/ShowValueSlider.xaml.vb b/Icarus/ShowValueSlider/ShowValueSlider.xaml.vb
new file mode 100644
index 0000000..f1a9bfc
--- /dev/null
+++ b/Icarus/ShowValueSlider/ShowValueSlider.xaml.vb
@@ -0,0 +1,26 @@
+Public Class ShowValueSlider
+
+   Public Shared ReadOnly ShowValueProperty As DependencyProperty = DependencyProperty.Register("ShowValue", GetType(String), GetType(ShowValueSlider), New FrameworkPropertyMetadata(""))
+
+   Public Shadows Property ShowValue As String
+      Get
+         Return CStr(MyBase.GetValue(ShowValueProperty))
+      End Get
+      Set(value As String)
+         MyBase.SetValue(ShowValueProperty, value)
+      End Set
+   End Property
+
+   Public Shared ReadOnly ShowMaximumProperty As DependencyProperty = DependencyProperty.Register("ShowMaximum", GetType(String), GetType(ShowValueSlider), New FrameworkPropertyMetadata(""))
+
+   Public Shadows Property ShowMaximum As String
+      Get
+         Return CStr(MyBase.GetValue(ShowMaximumProperty))
+      End Get
+      Set(value As String)
+         MyBase.SetValue(ShowMaximumProperty, value)
+      End Set
+   End Property
+
+
+End Class
diff --git a/Icarus/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb
index d4e3c8a..e805088 100644
--- a/Icarus/SliceManager/SliceManagerVM.vb
+++ b/Icarus/SliceManager/SliceManagerVM.vb
@@ -8,10 +8,10 @@ Public Class SliceManagerVM
 
    Private Enum CalcSteps As Integer
       NULL = 0
-      SLICE1 = 1
-      SLICE2 = 2
-      SLICE3 = 3
-      SLICE4 = 4
+      SLICING = 1
+      CALC_PATHS = 2
+      CALC_TOOLPATHS = 3
+      CALC_SOLIDS = 4
       CALCTSF = 5
       GENERATE = 6
    End Enum
@@ -29,9 +29,13 @@ Public Class SliceManagerVM
    ' Funzioni di callback per output in interfaccia da LUA
    Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
 
-   Private m_bSlice As Boolean = True
-   Private m_bCalcTFS As Boolean = True
-   Private m_bGenerate As Boolean = True
+   Private m_bSlice As Boolean = False
+   Private m_bCalcTFS As Boolean = False
+   Private m_bGenerate As Boolean = False
+   Private m_bCalcSolid As Boolean = False
+   Friend Sub SetCalcSolid(value As Boolean)
+      m_bCalcSolid = value
+   End Sub
 
    Private m_SliceManagerState As CalcSteps
 
@@ -40,16 +44,16 @@ Public Class SliceManagerVM
    Public ReadOnly Property sLoadingText As String
       Get
          Select Case m_SliceManagerState
-            Case CalcSteps.SLICE1
-               Return "Calculating 1..."
-            Case CalcSteps.SLICE2
-               Return "Calculating 2..."
-            Case CalcSteps.SLICE3
+            Case CalcSteps.SLICING
                Return "Slicing..."
-            Case CalcSteps.SLICE4
+            Case CalcSteps.CALC_PATHS
+               Return "Calculating Paths..."
+            Case CalcSteps.CALC_TOOLPATHS
+               Return "Calculating Toolpaths..."
+            Case CalcSteps.CALC_SOLIDS
                Return "Calculating Solids..."
             Case CalcSteps.CALCTSF
-               Return "Calculating Feed e Speed..."
+               Return "Calculating Feed & Speed..."
             Case CalcSteps.GENERATE
                Return "Generating..."
          End Select
@@ -93,7 +97,7 @@ Public Class SliceManagerVM
          m_Loading_Visibility = value
       End Set
    End Property
-   Private Sub SetLoadingVisibility(bIsVisible As Boolean)
+   Friend Sub SetLoadingVisibility(bIsVisible As Boolean)
       m_Loading_Visibility = If(bIsVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(Loading_Visibility))
    End Sub
@@ -203,27 +207,30 @@ Public Class SliceManagerVM
          Dim dGenerateMax As Double = If(m_bSlice, 5, 30)
          Dim dMainProgress As Double = 0
          If m_bSlice Then
-            If m_SliceManagerState > CalcSteps.SLICE1 Then
+            If m_SliceManagerState > CalcSteps.SLICING Then
                dMainProgress += 10
-            ElseIf m_SliceManagerState = CalcSteps.SLICE1 Then
+            ElseIf m_SliceManagerState = CalcSteps.SLICING Then
                dMainProgress += 10 / 100 * dPartialProgress
             End If
-            If m_SliceManagerState > CalcSteps.SLICE2 Then
+            If m_SliceManagerState > CalcSteps.CALC_PATHS Then
                dMainProgress += 10
-            ElseIf m_SliceManagerState = CalcSteps.SLICE2 Then
+            ElseIf m_SliceManagerState = CalcSteps.CALC_PATHS Then
                dMainProgress += 10 / 100 * dPartialProgress
             End If
-            If m_SliceManagerState > CalcSteps.SLICE3 Then
+            If m_SliceManagerState > CalcSteps.CALC_TOOLPATHS Then
                dMainProgress += 10
-            ElseIf m_SliceManagerState = CalcSteps.SLICE3 Then
+            ElseIf m_SliceManagerState = CalcSteps.CALC_TOOLPATHS Then
                dMainProgress += 10 / 100 * dPartialProgress
             End If
-            If m_SliceManagerState > CalcSteps.SLICE4 Then
+            If m_SliceManagerState > CalcSteps.CALC_SOLIDS Then
                dMainProgress += 50
-            ElseIf m_SliceManagerState = CalcSteps.SLICE4 Then
+            ElseIf m_SliceManagerState = CalcSteps.CALC_SOLIDS Then
                dMainProgress += 50 / 100 * dPartialProgress
             End If
          End If
+         If m_bCalcSolid Then
+            dMainProgress += dPartialProgress
+         End If
          If m_bCalcTFS Then
             If m_SliceManagerState > CalcSteps.CALCTSF Then
                dMainProgress += dCalcTSFMax
@@ -273,19 +280,30 @@ Public Class SliceManagerVM
       Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(False)
       ' verifico se eseguire slice
       Dim bOk As Boolean = True
-      Dim bToRecalc As Boolean = False
+      Dim bToRecalcSlice As Boolean = False
+      Dim bToRecalcTFS As Boolean = False
       If m_bSlice Then
          Dim nPartId As Integer = EgtGetFirstPart()
          While nPartId <> GDB_ID.NULL
             Dim bTemp As Boolean = False
-            If EgtGetInfo(nPartId, MAC_TO_RECALC, bTemp) AndAlso bTemp Then
-               bToRecalc = True
-               Exit While
+            If EgtGetInfo(nPartId, MAC_TORECALC_SLICE, bTemp) AndAlso bTemp Then
+               bToRecalcSlice = True
+            End If
+            If EgtGetInfo(nPartId, MAC_TORECALC_GENERATE, bTemp) AndAlso bTemp Then
+               bToRecalcTFS = True
             End If
             nPartId = EgtGetNextPart(nPartId)
          End While
       End If
-      If Not bToRecalc Then m_bSlice = False
+      If bToRecalcSlice Then
+         m_bSlice = True
+         m_bCalcTFS = True
+         m_bGenerate = True
+      Else
+         m_bSlice = False
+         m_bCalcTFS = bToRecalcTFS
+         m_bGenerate = bToRecalcTFS
+      End If
       ' aggiorno dati macchina
       If m_bCalcTFS Then Map.refTFSEditorVM.UpdateSpeedMinMax()
       ' eseguo calcolo slicing, toolpath e solidi
@@ -295,7 +313,7 @@ Public Class SliceManagerVM
          Dim nPartId As Integer = EgtGetFirstPart()
          While nPartId <> GDB_ID.NULL
             ' eseguo rimozione flag
-            EgtRemoveInfo(nPartId, MAC_TO_RECALC)
+            EgtRemoveInfo(nPartId, MAC_TORECALC_SLICE)
             nPartId = EgtGetNextPart(nPartId)
          End While
       End If
@@ -335,6 +353,9 @@ Public Class SliceManagerVM
       Map.refProjManagerVM.SetProjCmdIsEnabled(True)
       Map.refTopPanelVM.SetTopPanelIsEnabled(True)
       Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
+      m_bSlice = False
+      m_bCalcTFS = False
+      m_bGenerate = False
       Return bOk
    End Function
 
@@ -429,10 +450,12 @@ Public Class SliceManagerVM
       m_bCalculating = True
       If IsNothing(Map.refTopPanelVM.SelPart) Then
          MessageBox.Show("No parts to slice!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         m_bCalculating = False
          Return
       End If
       If IsNothing(Map.refTopPanelVM.SelMachining) Then
          MessageBox.Show("No print parameters set!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         m_bCalculating = False
          Return
       End If
       ' esco da altre pagine
diff --git a/Icarus/SliderManager/LayerIndexSliderV.xaml b/Icarus/SliderManager/LayerIndexSliderV.xaml
index ff5f02c..d8bd877 100644
--- a/Icarus/SliderManager/LayerIndexSliderV.xaml
+++ b/Icarus/SliderManager/LayerIndexSliderV.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="LayerIndexSliderV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Icarus="clr-namespace:Icarus"
              Visibility="{Binding LayerIndex_Visibility}">
    <Grid VerticalAlignment="Center">
       <Grid.RowDefinitions>
@@ -15,12 +16,14 @@
                 ItemsSource="{Binding ViewSliderList}"
                 SelectedIndex="{Binding ghSelViewSlider}"
                 Width="100"/>
-      <Slider Grid.Row="3"
+      <Icarus:ShowValueSlider Grid.Row="3"
               Orientation="Vertical"
               Height="400"
               Value="{Binding nLayerIndex}"
               Minimum="{Binding nLayerIndex_Minimum}"
               Maximum="{Binding nLayerIndex_Maximum}"
+              ShowValue="{Binding ghShowValue}"
+              ShowMaximum="{Binding ghShowMaximum}"
               HorizontalAlignment="Right"
               Style="{StaticResource LayerIndex_Slider}"/>
    </Grid>
diff --git a/Icarus/SliderManager/SliderManagerVM.vb b/Icarus/SliderManager/SliderManagerVM.vb
index 1a3f297..54b8308 100644
--- a/Icarus/SliderManager/SliderManagerVM.vb
+++ b/Icarus/SliderManager/SliderManagerVM.vb
@@ -51,10 +51,41 @@ Public Class SliderManagerVM
                End If
                m_nLayerIndex = value
          End Select
+         NotifyPropertyChanged(NameOf(ghShowValue))
          EgtDraw()
       End Set
    End Property
 
+   Public ReadOnly Property ghShowValue As String
+      Get
+         Dim dH As Double = 0
+         If Not IsNothing(Map.refTopPanelVM.CurrMachining) Then
+            If Map.refTopPanelVM.CurrMachining.bCurrSlicing45 Then
+               Return m_nLayerIndex
+            Else
+               Return m_nLayerIndex & " (" & DoubleToString(m_nLayerIndex * Map.refTopPanelVM.CurrMachining.dCurrStrandH, 0) & "mm)"
+            End If
+         Else
+            Return m_nLayerIndex
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property ghShowMaximum As String
+      Get
+         Dim dH As Double = 0
+         If Not IsNothing(Map.refTopPanelVM.CurrMachining) Then
+            If Map.refTopPanelVM.CurrMachining.bCurrSlicing45 Then
+               Return m_nLayerIndex_Maximum
+            Else
+               Return m_nLayerIndex_Maximum & " (" & DoubleToString(m_nLayerIndex_Maximum * Map.refTopPanelVM.CurrMachining.dCurrStrandH, 0) & "mm)"
+            End If
+         Else
+            Return m_nLayerIndex_Maximum
+         End If
+      End Get
+   End Property
+
    Private m_dLayerAdvancement As Double
    Public Property dLayerAdvancement As Double
       Get
@@ -185,6 +216,7 @@ Public Class SliderManagerVM
       m_nLayerIndex_Maximum = nMax
       NotifyPropertyChanged(NameOf(nLayerIndex_Minimum))
       NotifyPropertyChanged(NameOf(nLayerIndex_Maximum))
+      NotifyPropertyChanged(NameOf(ghShowMaximum))
       nLayerIndex = m_nLayerIndex
    End Sub
 
diff --git a/Icarus/StartMachPanel/StartMachPanelVM.vb b/Icarus/StartMachPanel/StartMachPanelVM.vb
index c3e0f3f..06f6435 100644
--- a/Icarus/StartMachPanel/StartMachPanelVM.vb
+++ b/Icarus/StartMachPanel/StartMachPanelVM.vb
@@ -71,6 +71,8 @@ Public Class StartMachPanelVM
          Else
             NotifyPropertyChanged(NameOf(sXPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -95,6 +97,8 @@ Public Class StartMachPanelVM
          Else
             NotifyPropertyChanged(NameOf(sYPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -119,6 +123,8 @@ Public Class StartMachPanelVM
          Else
             NotifyPropertyChanged(NameOf(sZPos))
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -166,6 +172,8 @@ Public Class StartMachPanelVM
          Else
             m_sRotAngle = value
          End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Set
    End Property
 
@@ -175,14 +183,18 @@ Public Class StartMachPanelVM
          Return m_bAdd_IsChecked
       End Get
       Set(value As Boolean)
-         m_bAdd_IsChecked = value
-         If value Then
-            m_bEdit_IsChecked = False
-            m_bGrid_IsChecked = False
-            m_bMove_IsChecked = False
-            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
-            NotifyPropertyChanged(NameOf(bGrid_IsChecked))
-            NotifyPropertyChanged(NameOf(bMove_IsChecked))
+         If Map.refSceneHostVM.MainController.GetStep = 0 Then
+            m_bAdd_IsChecked = value
+            If value Then
+               m_bEdit_IsChecked = False
+               m_bGrid_IsChecked = False
+               m_bMove_IsChecked = False
+               NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+               NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+               NotifyPropertyChanged(NameOf(bMove_IsChecked))
+            End If
+         Else
+            NotifyPropertyChanged(NameOf(bAdd_IsChecked))
          End If
       End Set
    End Property
@@ -193,7 +205,7 @@ Public Class StartMachPanelVM
          Return m_bEdit_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelStart) Then
+         If Not IsNothing(m_SelStart) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bEdit_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -215,14 +227,18 @@ Public Class StartMachPanelVM
          Return m_bGrid_IsChecked
       End Get
       Set(value As Boolean)
-         m_bGrid_IsChecked = value
-         If value Then
-            m_bAdd_IsChecked = False
-            m_bEdit_IsChecked = False
-            m_bMove_IsChecked = False
-            NotifyPropertyChanged(NameOf(bAdd_IsChecked))
-            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
-            NotifyPropertyChanged(NameOf(bMove_IsChecked))
+         If Map.refSceneHostVM.MainController.GetStep = 0 Then
+            m_bGrid_IsChecked = value
+            If value Then
+               m_bAdd_IsChecked = False
+               m_bEdit_IsChecked = False
+               m_bMove_IsChecked = False
+               NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+               NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+               NotifyPropertyChanged(NameOf(bMove_IsChecked))
+            End If
+         Else
+            NotifyPropertyChanged(NameOf(bGrid_IsChecked))
          End If
       End Set
    End Property
@@ -233,7 +249,7 @@ Public Class StartMachPanelVM
          Return m_bMove_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelStart) Then
+         If Not IsNothing(m_SelStart) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
             m_bMove_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -394,6 +410,15 @@ Public Class StartMachPanelVM
       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)
       If Key = Forms.Keys.Escape Then
 
@@ -434,6 +459,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Point(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Dim nNewStartLayerId As Integer = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewStartLayerId, LAY_NEWSTART)
       EgtSetCurrPartLayer(m_nPartId, nNewStartLayerId)
@@ -463,6 +489,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Dim nNewStartLayerId As Integer = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewStartLayerId, LAY_NEWSTART)
       EgtSetCurrPartLayer(m_nPartId, nNewStartLayerId)
@@ -492,6 +519,7 @@ Public Class StartMachPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub ModifyCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand()
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
    End Sub
@@ -516,6 +544,7 @@ Public Class StartMachPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub AddPointCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       InitCommand()
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
@@ -544,6 +573,7 @@ Public Class StartMachPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          InitCommand()
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
@@ -555,7 +585,6 @@ Public Class StartMachPanelVM
 
 #End Region ' RemovePointCurve
 
-
 #Region "CPlaneTop"
 
    ''' <summary>
@@ -574,6 +603,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -598,6 +628,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneFront.  This method is invoked by the CPlaneFrontCommand.
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -622,6 +653,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneRight.  This method is invoked by the CPlaneRightCommand.
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -646,6 +678,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneBack.  This method is invoked by the CPlaneBackCommand.
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -670,6 +703,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneLeft.  This method is invoked by the CPlaneLeftCommand.
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -694,6 +728,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneBottom.  This method is invoked by the CPlaneBottomCommand.
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -718,6 +753,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneElevation.  This method is invoked by the CPlaneElevationCommand.
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -741,6 +777,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneOrigin.  This method is invoked by the CPlaneOriginCommand.
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
diff --git a/Icarus/StatusBar/StatusBarV.xaml b/Icarus/StatusBar/StatusBarV.xaml
index 17d08d9..77c142c 100644
--- a/Icarus/StatusBar/StatusBarV.xaml
+++ b/Icarus/StatusBar/StatusBarV.xaml
@@ -99,6 +99,11 @@
               Command="{Binding IsoViewSWCommand}">
                <Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding ViewToCPlaneToolTip}" 
+              Style="{StaticResource ToolBar_Button}" 
+              Command="{Binding ViewToCPlaneCommand}">
+               <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
+            </Button>
          </UniformGrid>
          <UniformGrid Rows="1"
                       DataContext="{StaticResource InstrumentPanelVM}">
diff --git a/Icarus/TSFEditor/TFSEditorVM.vb b/Icarus/TSFEditor/TFSEditorVM.vb
index 46dccdc..7225e92 100644
--- a/Icarus/TSFEditor/TFSEditorVM.vb
+++ b/Icarus/TSFEditor/TFSEditorVM.vb
@@ -591,6 +591,8 @@ Public Class TFSLayer
             m_dFCurr = dNewValue
             EgtSetInfo(nId, "FCur", m_dFCurr)
             m_bFCurr_IsModified = True
+            ' Imposto flag di ricalcolo generate
+            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_GENERATE, True)
             NotifyPropertyChanged(NameOf(Background))
          Else
             NotifyPropertyChanged(NameOf(sFCurr))
@@ -601,6 +603,8 @@ Public Class TFSLayer
       m_dFCurr = value
       EgtSetInfo(nId, "FCur", m_dFCurr)
       m_bFCurr_IsModified = True
+      ' Imposto flag di ricalcolo generate
+      EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_GENERATE, True)
       NotifyPropertyChanged(NameOf(Background))
       NotifyPropertyChanged(NameOf(sFCurr))
    End Sub
@@ -651,7 +655,7 @@ Public Class TFSLayer
          If m_bFCurr_IsModified Then
             Return Brushes.Black
          ElseIf m_dSpeed <= Map.refTFSEditorVM.dSpeedMin OrElse m_dSpeed >= Map.refTFSEditorVM.dSpeedMax Then
-            Return Brushes.Yellow
+            Return Brushes.DeepSkyBlue
          Else
             Return Brushes.Black
          End If
diff --git a/Icarus/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb
index 258e1cc..1bf580e 100644
--- a/Icarus/TopPanel/TopPanelVM.vb
+++ b/Icarus/TopPanel/TopPanelVM.vb
@@ -372,7 +372,6 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.UpdateState(False)
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
       Map.refSliderManagerVM.SetSliderVisibility(False)
-      Map.refSliderManagerVM.SetLayerIndexToZero()
       SelPart = SelPart
       Return True
    End Function
diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml
index 711f46a..7af49cb 100644
--- a/Icarus/Utility/Dictionary.xaml
+++ b/Icarus/Utility/Dictionary.xaml
@@ -1142,30 +1142,24 @@
       </ControlTemplate.Triggers>
    </ControlTemplate>
    <ControlTemplate x:Key="SliderThumbVerticalDefault" TargetType="{x:Type Thumb}">
-      <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-         <Canvas SnapsToDevicePixels="true"
-                 HorizontalAlignment="Center" 
-                 Margin="-99,-12,0,0">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="10"/>
-                  <ColumnDefinition Width="20"/>
-               </Grid.ColumnDefinitions>
-               <Border Width="30"
-                       Height="25"
-                       Style="{StaticResource RightPanel_Border}">
-                  <TextBlock HorizontalAlignment="Center"
-                             VerticalAlignment="Center"
-                             Foreground="Black"
-                             Text="{Binding Value, RelativeSource={RelativeSource AncestorType={x:Type Slider}}}"/>
-               </Border>
-               <Ellipse x:Name="grip" 
-                        Grid.Column="2" 
-                        Fill="#FFA3A3A3"
-                        Height="20" Width="20"
-                        Stroke="#FFDADADA"/>
-            </Grid>
+         <Grid HorizontalAlignment="Right" VerticalAlignment="Top">
+            <Canvas>
+               <Grid Canvas.Top="-8" Canvas.Right="0" HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="10"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <Border Height="25"
+                          Padding="3,0"
+                          Style="{StaticResource RightPanel_Border}">
+                     <TextBlock HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Foreground="Black"
+                                Text="{Binding ShowValue, RelativeSource={RelativeSource AncestorType={x:Type Slider}}}"/>
+                  </Border>
+                  <Ellipse x:Name="grip" Grid.Column="2" Height="18" Width="18" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" Stroke="{StaticResource SliderThumb.Static.Border}"/>
+               </Grid>
          </Canvas>
       </Grid>
       <ControlTemplate.Triggers>
@@ -1186,19 +1180,27 @@
    <ControlTemplate x:Key="SliderVertical" TargetType="{x:Type Slider}">
       <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
          <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto"/>
+                  <RowDefinition Height="10"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <TickBar x:Name="TopTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4"/>
-            <TickBar x:Name="BottomTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4"/>
-            <Border x:Name="TrackBackground" BorderBrush="{StaticResource SliderThumb.Track.Border}" BorderThickness="1" Background="{StaticResource SliderThumb.Track.Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,5" Width="4.0">
+               <TextBlock Grid.Column="1" 
+                          Foreground="Black"
+                          Text="{Binding ShowMaximum, RelativeSource={RelativeSource AncestorType={x:Type Slider}}}"/>
+               <TickBar x:Name="TopTick" Grid.Column="0" Grid.Row="2" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4"/>
+               <TickBar x:Name="BottomTick" Grid.Column="2" Grid.Row="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4"/>
+               <Border x:Name="TrackBackground" BorderBrush="{StaticResource SliderThumb.Track.Border}" BorderThickness="1" Background="{StaticResource SliderThumb.Track.Background}" Grid.Column="1" Grid.Row="2" HorizontalAlignment="center" Margin="0,5" Width="4.0">
                <Canvas Margin="-1,-6">
                   <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Visibility="Hidden" Width="4.0"/>
                </Canvas>
             </Border>
-            <Track x:Name="PART_Track" Grid.Column="1">
+               <Track x:Name="PART_Track" Grid.Column="1" Grid.Row="2">
                <Track.DecreaseRepeatButton>
                   <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
                </Track.DecreaseRepeatButton>
diff --git a/Icarus/Utility/LuaExec.vb b/Icarus/Utility/LuaExec.vb
index 47b8cb4..30813f2 100644
--- a/Icarus/Utility/LuaExec.vb
+++ b/Icarus/Utility/LuaExec.vb
@@ -70,4 +70,19 @@ Module LuaExec
       Return bOk
    End Function
 
+   Friend Function ExecSolid() As Boolean
+      EgtOutLog("-- Start ExecGenerate --")
+      ' eseguo generazione
+      EgtLuaCreateGlobTable("PRINT")
+      Dim bOk As Boolean = EgtLuaExecFile(Map.refMainWindowVM.MainWindowM.s3dPrintingDir & "\CalcSolids.lua")
+      If bOk Then
+         Dim nErr As Integer = 999
+         EgtLuaGetGlobIntVar("PRINT.ERR", nErr)
+         bOk = (nErr <= 0)
+      End If
+      ' Cancello tavola globale
+      EgtLuaResetGlobVar("PRINT")
+      Return bOk
+   End Function
+
 End Module
diff --git a/Icarus/ViewLayerManager/ViewLayerManagerVM.vb b/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
index 803c414..6c2694d 100644
--- a/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
+++ b/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
@@ -138,7 +138,38 @@ Public Class ViewLayer
 
    Friend Sub UpdateVisibility(bIsVisible As Boolean)
       ' Disabilito segnalazione modificato
-      Dim DisableMgr As New DisableModifiedMgr
+      Dim DisableMgr As New DisableModifiedMgr ' se solidi
+      If m_Type = ViewLayerType.SOLID_SLICE Then
+         ' aggiorno parametro di calcolo solidi sui pezzi
+         For Each CurrPart In Map.refTopPanelVM.PartList
+            EgtSetInfo(CurrPart.nPartId, KEY_CALC_SOLIDS, bIsVisible)
+         Next
+         ' lancio calcolo solidi
+         If bIsVisible Then
+            ' mostro barre di caricamento
+            Map.refSliceManagerVM.SetCalcSolid(True)
+            Map.refSliceManagerVM.SetLoadingVisibility(True)
+            ' disabilito ProjManager, TopPanel e uscita dal programma
+            Map.refProjManagerVM.SetProjCmdIsEnabled(False)
+            Map.refTopPanelVM.SetTopPanelIsEnabled(False)
+            Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(False)
+            ExecSolid()
+            ' rileggo i layer con i solidi
+            For Each CurrPart In Map.refTopPanelVM.PartList
+               CurrPart.RefreshPrintLayers()
+            Next
+            ' nascondo barre di caricamento
+            Map.refSliceManagerVM.SetCalcSolid(False)
+            Map.refSliceManagerVM.SetLoadingVisibility(False)
+            ' riabilito ProjManager, TopPanel e uscita dal programma
+            Map.refProjManagerVM.SetProjCmdIsEnabled(True)
+            Map.refTopPanelVM.SetTopPanelIsEnabled(True)
+            Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
+         End If
+         If Map.refTopPanelVM.SelPage = Pages.SLICE Then
+            Map.refSliderManagerVM.SetSliderVisibility(bIsVisible)
+         End If
+      End If
       Dim Status As GDB_ST = If(bIsVisible, GDB_ST.ON_, GDB_ST.OFF)
       For Each CurrPart In Map.refTopPanelVM.PartList
          Select Case m_Type
@@ -209,7 +240,13 @@ Public Class ViewLayer
                Case ViewLayerType.AUX_SOLIDS
                   nStatus = GetMainPrivateProfileInt(S_VIEWLAYER, K_MOD_AUXSOLIDS, 1)
                Case ViewLayerType.SOLID_SLICE
-                  nStatus = GetMainPrivateProfileInt(S_VIEWLAYER, K_MOD_SOLIDSLICE, 1)
+                  Dim bSolid As Boolean = False
+                  If Not IsNothing(Map.refTopPanelVM.SelPart) Then
+                     Dim nIsSolidActive As Integer = 0
+                     EgtGetInfo(Map.refTopPanelVM.SelPart.nPartId, KEY_CALC_SOLIDS, nIsSolidActive)
+                     bSolid = nIsSolidActive <> 0
+                  End If
+                  nStatus = If(bSolid, GetMainPrivateProfileInt(S_VIEWLAYER, K_MOD_SOLIDSLICE, 1), 0)
                Case ViewLayerType.SLICE_TOOLPATH
                   nStatus = GetMainPrivateProfileInt(S_VIEWLAYER, K_MOD_SLICETOOLPATH, 1)
             End Select
diff --git a/Icarus/ViewPanel/ViewPanelV.xaml b/Icarus/ViewPanel/ViewPanelV.xaml
index 0caf70a..60ff488 100644
--- a/Icarus/ViewPanel/ViewPanelV.xaml
+++ b/Icarus/ViewPanel/ViewPanelV.xaml
@@ -35,10 +35,15 @@
            Command="{Binding LeftViewCommand}">
       <Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
    </Button>
-   <Button ToolTip="{Binding LookFromIso_SWToolTip}"
+   <Button ToolTip="{Binding LookFromIsoSWToolTip}"
            Style="{StaticResource ToolBar_Button}"
            Command="{Binding IsoViewSWCommand}">
       <Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
    </Button>
+   <Button ToolTip="{Binding ViewToCPlaneToolTip}" 
+           Style="{StaticResource ToolBar_Button}" 
+           Command="{Binding ViewToCPlaneCommand}">
+      <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
+   </Button>
 
 </EgtFloating:EgtFloatingPanel>
diff --git a/Icarus/ViewPanel/ViewPanelVM.vb b/Icarus/ViewPanel/ViewPanelVM.vb
index 7f7c3d1..18aca78 100644
--- a/Icarus/ViewPanel/ViewPanelVM.vb
+++ b/Icarus/ViewPanel/ViewPanelVM.vb
@@ -14,6 +14,7 @@ Public Class ViewPanelVM
    Private m_cmdBackView As ICommand
    Private m_cmdRightView As ICommand
    Private m_cmdIsoViewSW As ICommand
+   Private m_cmdViewToCPlane As ICommand
 
 #Region "ToolTip"
 
@@ -226,6 +227,29 @@ Public Class ViewPanelVM
 
 #End Region ' IsoViewSWCommand
 
+#Region "ViewToCPlaneCommand"
+
+   ''' <summary>
+   ''' Returns a command that do GetDist.
+   ''' </summary>
+   Public ReadOnly Property ViewToCPlaneCommand As ICommand
+      Get
+         If m_cmdViewToCPlane Is Nothing Then
+            m_cmdViewToCPlane = New Command(AddressOf ViewToCPlane)
+         End If
+         Return m_cmdViewToCPlane
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the GetDist.  This method is invoked by the GetDistCommand.
+   ''' </summary>
+   Public Sub ViewToCPlane(ByVal param As Object)
+      Map.refSceneHostVM.MainScene.CPlaneView()
+   End Sub
+
+#End Region ' ViewToCPlaneCommand
+
 #End Region    ' COMMANDS
 
 End Class
\ No newline at end of file