From 7592a8d8889bc34ffc3de622c79f0a1a2be3fde4 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Wed, 1 Mar 2023 10:36:46 +0100
Subject: [PATCH] - Aggiunti FilledSolid - Aggiunto ShellNumberId fisso -
 Gestiti messaggi in StatusBar per misure - Aggiornate icone TopPanel

---
 Icarus/Constants/Const3dPrint.vb              |    2 +
 .../CurrMachiningPanelV.xaml                  |    7 +-
 .../FilledSolidPanel/FilledSolidPanelV.xaml   |  361 +++++
 .../FilledSolidPanelV.xaml.vb                 |    3 +
 Icarus/FilledSolidPanel/FilledSolidPanelVM.vb | 1358 +++++++++++++++++
 .../FilledSolidParamPanelV.xaml               |  100 ++
 .../FilledSolidParamPanelV.xaml.vb            |    3 +
 .../FilledSolidParamPanelVM.vb                |  441 ++++++
 Icarus/Icarus.vbproj                          |   26 +
 Icarus/LeftPanel/LeftPanelV.xaml              |    2 +-
 Icarus/LeftPanel/LeftPanelVM.vb               |    5 +-
 Icarus/ManagePartPanel/ManagePartPanelVM.vb   |    6 +
 Icarus/ManagePartPanel/ManagePartUtility.vb   |   18 +-
 Icarus/Project/ProjectV.xaml                  |    3 +
 Icarus/Resources/CurrMachining/SaveInDb.png   |  Bin 0 -> 580 bytes
 Icarus/Resources/ProjectManager/Import.png    |  Bin 396 -> 285 bytes
 .../TopPanel/MaterialDb.horizontal.png        |  Bin 0 -> 1053 bytes
 Icarus/Resources/TopPanel/MaterialDb.png      |  Bin 1053 -> 912 bytes
 Icarus/Resources/TopPanel/Offset.png          |  Bin 924 -> 455 bytes
 Icarus/Resources/TopPanel/StrandH.png         |  Bin 432 -> 344 bytes
 Icarus/Resources/TopPanel/StrandW.png         |  Bin 422 -> 329 bytes
 Icarus/RibPanel/RibPanelVM.vb                 |   30 +-
 Icarus/RightPanel/RightPanelV.xaml            |    2 +-
 Icarus/RightPanel/RightPanelVM.vb             |    2 +
 Icarus/SceneHost/MySceneHostVM.vb             |  161 ++
 Icarus/ShellNumberPanel/ShellNumberPanelVM.vb |   49 +-
 Icarus/StatusBar/MessagePanelV.xaml           |   19 +
 Icarus/StatusBar/MessagePanelV.xaml.vb        |    3 +
 Icarus/StatusBar/MyStatusBarVM.vb             |   20 +-
 Icarus/TopPanel/TopPanelV.xaml                |   30 +-
 Icarus/Utility/Dictionary.xaml                |    5 +
 Icarus/Utility/Map.vb                         |  418 +----
 32 files changed, 2598 insertions(+), 476 deletions(-)
 create mode 100644 Icarus/FilledSolidPanel/FilledSolidPanelV.xaml
 create mode 100644 Icarus/FilledSolidPanel/FilledSolidPanelV.xaml.vb
 create mode 100644 Icarus/FilledSolidPanel/FilledSolidPanelVM.vb
 create mode 100644 Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml
 create mode 100644 Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml.vb
 create mode 100644 Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb
 create mode 100644 Icarus/Resources/CurrMachining/SaveInDb.png
 create mode 100644 Icarus/Resources/TopPanel/MaterialDb.horizontal.png
 create mode 100644 Icarus/StatusBar/MessagePanelV.xaml
 create mode 100644 Icarus/StatusBar/MessagePanelV.xaml.vb

diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb
index e72f458..d34df6b 100644
--- a/Icarus/Constants/Const3dPrint.vb
+++ b/Icarus/Constants/Const3dPrint.vb
@@ -15,6 +15,8 @@
    Public Const RIB_EXTRUSION = "RibExtrusion"
    Public Const RIB_CURVE = "RibCurve"
    Public Const RIB_ID = "RibId"
+   Public Const SHELLNUMBER_ID = "ShellNumberId"
+   Public Const FILLEDSOLID_ID = "FilledSolidId"
    Public Const VIEWPARAMS = "ViewParams"
    Public Const IMPORTED_SOLID = "ImportedSolid"
    Public Const RESULT_READ_PROG = "ResultReadProg"
diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
index b67e184..2eb7cec 100644
--- a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
+++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
@@ -198,10 +198,13 @@
             <Image Source="\Resources\Common\Cancel.png"
                    Style="{StaticResource Button_Image}"/>
          </Button>
-         <Button Content="Save in Db"
+         <Button ToolTip="Save in Db"
                  Command="{Binding SaveInDb_Command}"
                  Margin="0,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
+            <Image Source="\Resources\CurrMachining\SaveInDb.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
       </UniformGrid>
    </Grid>
 </Border>
diff --git a/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml b/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml
new file mode 100644
index 0000000..ef181f8
--- /dev/null
+++ b/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml
@@ -0,0 +1,361 @@
+<Grid x:Class="FilledSolidPanelV"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+            xmlns:PrintApp="clr-namespace:Icarus"
+            Margin="5">
+   <Grid.Resources>
+      <PrintApp:FromBooleanToVisibility x:Key="FromBooleanToVisibility"/>
+   </Grid.Resources>
+   <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+   </Grid.ColumnDefinitions>
+   <Grid.RowDefinitions>
+      <RowDefinition Height="1*"/>
+      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="1*"/>
+   </Grid.RowDefinitions>
+   <ComboBox Grid.Row="3"
+             ItemsSource="{Binding FilledSolidList}"
+             SelectedItem="{Binding SelFilledSolid}"
+             IsEnabled="{Binding FilledSolidList_IsEnabled}"
+             DisplayMemberPath="ghName"
+             Style="{StaticResource LeftPanel_ComboBox}"/>
+   <!--Add Button-->
+   <ToggleButton x:Name="AddBtn" 
+                 Grid.Row="4"
+                 Content="Add"
+                 IsChecked="{Binding bAdd_IsChecked}"
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
+   <Border Grid.Column="1"
+           Grid.Row="3"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Button Grid.Column="0"
+                 Command="{Binding Import_Command}"
+                 ToolTip="{Binding Import_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/ProjectManager/Import.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="1"
+                 Command="{Binding Line2P_Command}"
+                 ToolTip="{Binding Line2P_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Line2P.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--Edit Button-->
+   <ToggleButton x:Name="EditBtn"
+                 Grid.Row="5"
+                 Content="Edit"
+                 IsChecked="{Binding bEdit_IsChecked}"
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
+   <Border Grid.Column="1"
+           Grid.Row="4"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Button Grid.Column="0"
+                 Command="{Binding Delete_Command}"
+                 ToolTip="{Binding Delete_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Delete.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="1"
+                 Command="{Binding ModifyCurve_Command}"
+                 ToolTip="{Binding ModifyCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/ModifyCurve.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="2"
+                 Command="{Binding AddPointCurve_Command}"
+                 ToolTip="{Binding AddPointCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/AddPointCurve.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="3"
+                 Command="{Binding RemovePointCurve_Command}"
+                 ToolTip="{Binding RemovePointCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/RemovePointCurve.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="4"
+                 Command="{Binding Extrude_Command}"
+                 ToolTip="{Binding Extrude_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Extrude.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--Grid Button-->
+   <ToggleButton x:Name="GridBtn"
+                 Grid.Row="6"
+                 Content="Grid"
+                 IsChecked="{Binding bGrid_IsChecked}"
+                 IsEnabled="{Binding bGrid_IsEnabled}"
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
+   <Border Grid.Column="1"
+           Grid.Row="5"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Button Command="{Binding CPlaneTop_Command}" 
+                 ToolTip="{Binding CPlaneTopToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="1"
+                 Command="{Binding CPlaneFront_Command}" 
+                 ToolTip="{Binding CPlaneFrontToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="2" 
+                 Command="{Binding CPlaneRight_Command}" 
+                 ToolTip="{Binding CPlaneRightToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="3"
+                 Command="{Binding CPlaneBack_Command}" 
+                 ToolTip="{Binding CPlaneBackToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="4"
+                 Command="{Binding CPlaneLeft_Command}"
+                 ToolTip="{Binding CPlaneLeftToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="5"
+                 Command="{Binding CPlaneBottom_Command}"
+                 ToolTip="{Binding CPlaneBottomToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="6" 
+                 Command="{Binding CPlaneElevation_Command}" 
+                 ToolTip="{Binding CPlaneElevationToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="7"
+                 Command="{Binding CPlaneOrigin_Command}"
+                 ToolTip="{Binding CPlaneOriginToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Grid.Column="8"
+                 Command="{Binding CPlaneObj_Command}"
+                 ToolTip="{Binding CPlaneObjToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--Move Button-->
+   <ToggleButton x:Name="MoveBtn" 
+                 Grid.Row="7"
+                 Content="Move"
+                 IsChecked="{Binding bMove_IsChecked}"
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
+   <Border Grid.Column="1"
+           Grid.Row="5"
+           Grid.RowSpan="5"
+           VerticalAlignment="Center"
+           Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanel_Popup_Border}">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <Grid Margin="0,0,0,2.5">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="X"
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
+         </Grid>
+         <Grid Grid.Row="1"
+               Margin="0,2.5,0,2.5">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="Y"
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
+         </Grid>
+         <Grid Grid.Row="2"
+               Margin="0,2.5,0,2.5">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="Z"
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
+         </Grid>
+         <Grid Grid.Row="3"
+               Margin="0,2.5,0,0">
+            <Button Content="Drag"
+                    Command="{Binding DragMove_Command}"
+                    Style="{StaticResource LeftPanel_TextButton}"/>
+         </Grid>
+      </Grid>
+   </Border>
+   <!--Rotate Button-->
+   <ToggleButton x:Name="RotateBtn"
+                 Grid.Row="8"
+                 Content="Rotate"
+                 IsChecked="{Binding bRotate_IsChecked}"
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
+   <Border Grid.Column="1"
+           Grid.Row="6"
+           Grid.RowSpan="5"
+           VerticalAlignment="Center"
+           Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanel_Popup_Border}">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <UniformGrid Columns="3">
+            <RadioButton Content="X"
+                         GroupName="Axes"
+                         IsChecked="{Binding RotX}"
+                         Style="{StaticResource ToolBar_ToggleButton}"/>
+            <RadioButton Content="Y"
+                         GroupName="Axes"
+                         IsChecked="{Binding RotY}"
+                         Style="{StaticResource ToolBar_ToggleButton}"/>
+            <RadioButton Content="Z"
+                         GroupName="Axes"
+                         IsChecked="{Binding RotZ}"
+                         Style="{StaticResource ToolBar_ToggleButton}"/>
+         </UniformGrid>
+         <EgtWPFLib5:EgtTextBox2 Grid.Row="1"
+                                 Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
+                                 ResetValueOnLostFocus="False"
+                                 Margin="0,5,0,2.5"/>
+         <Grid Grid.Row="2"
+               Margin="0,2.5,0,0">
+            <Button Content="Drag"
+                    Command="{Binding DragRotate_Command}"
+                    Style="{StaticResource LeftPanel_TextButton}"/>
+         </Grid>
+      </Grid>
+   </Border>
+   <!--Parameters Button-->
+   <ToggleButton Content="Parameters"
+                 Grid.Row="9"
+                 IsChecked="{Binding bMachParam_IsChecked}"
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_Parameters_ToggleButton}"/>
+
+</Grid>
diff --git a/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml.vb b/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml.vb
new file mode 100644
index 0000000..8d2de0b
--- /dev/null
+++ b/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class FilledSolidPanelV
+
+End Class
diff --git a/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb b/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb
new file mode 100644
index 0000000..08d2cc3
--- /dev/null
+++ b/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb
@@ -0,0 +1,1358 @@
+Imports System.Collections.ObjectModel
+Imports System.Collections.Specialized
+Imports System.Globalization
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class FilledSolidPanelVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Public Enum FilledSolidSelectionTypes As Integer
+      CURVE = 1
+      EXTRUSION = 2
+      BOTH = 3
+   End Enum
+
+   Private m_nPartId As Integer = GDB_ID.NULL
+   Private m_nFilledSolidLayerId As Integer = GDB_ID.NULL
+   Friend ReadOnly Property nFilledSolidLayerId As Integer
+      Get
+         Return m_nFilledSolidLayerId
+      End Get
+   End Property
+
+   Private m_FilledSolidList As New ObservableCollection(Of FilledSolidEntity)
+   Public ReadOnly Property FilledSolidList As ObservableCollection(Of FilledSolidEntity)
+      Get
+         Return m_FilledSolidList
+      End Get
+   End Property
+   Private m_SelFilledSolid As FilledSolidEntity
+   Public Property SelFilledSolid As FilledSolidEntity
+      Get
+         Return m_SelFilledSolid
+      End Get
+      Set(value As FilledSolidEntity)
+         m_SelFilledSolid = value
+         EgtDeselectAll()
+         If Not IsNothing(value) Then
+            EgtSelectObj(value.nCurveId)
+            EgtSelectObj(value.nExtrusionId)
+            ' aggiorno visibilita' bottoni edit
+            NotifyPropertyChanged(NameOf(Compo_Visibility))
+            ' aggiorno campi di testo posizione
+            NotifyPropertyChanged(NameOf(sXPos))
+            NotifyPropertyChanged(NameOf(sYPos))
+            NotifyPropertyChanged(NameOf(sZPos))
+         End If
+         EgtDraw()
+      End Set
+   End Property
+
+   Public Property sXPos As String
+      Get
+         If Not IsNothing(m_SelFilledSolid) Then
+            Dim nId As Integer = If(m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW, m_SelFilledSolid.nCurveId, m_SelFilledSolid.nExtrusionId)
+            Dim b3Reference As New BBox3d
+            EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
+            Return LenToString(b3Reference.Min.x, 1)
+         Else
+            Return ""
+         End If
+      End Get
+      Set(value As String)
+         Dim nId As Integer = If(m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW, m_SelFilledSolid.nCurveId, m_SelFilledSolid.nExtrusionId)
+         Dim b3Reference As New BBox3d
+         EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
+         Dim dNewXPos As Double = b3Reference.Min.x
+         StringToLen(value, dNewXPos)
+         If dNewXPos >= -b3Reference.DimX AndAlso dNewXPos <= CurrentMachine.b3Tab.DimX - b3Reference.DimX Then
+            EgtMove(m_SelFilledSolid.nCurveId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
+            EgtMove(m_SelFilledSolid.nExtrusionId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
+            EgtDraw()
+         Else
+            NotifyPropertyChanged(NameOf(sXPos))
+         End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+      End Set
+   End Property
+
+   Public Property sYPos As String
+      Get
+         If Not IsNothing(m_SelFilledSolid) Then
+            Dim nId As Integer = If(m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW, m_SelFilledSolid.nCurveId, m_SelFilledSolid.nExtrusionId)
+            Dim b3Reference As New BBox3d
+            EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
+            Return LenToString(b3Reference.Min.y, 1)
+         Else
+            Return ""
+         End If
+      End Get
+      Set(value As String)
+         Dim nId As Integer = If(m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW, m_SelFilledSolid.nCurveId, m_SelFilledSolid.nExtrusionId)
+         Dim b3Reference As New BBox3d
+         EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
+         Dim dNewYPos As Double = b3Reference.Min.y
+         StringToLen(value, dNewYPos)
+         If dNewYPos >= -b3Reference.DimY AndAlso dNewYPos <= CurrentMachine.b3Tab.DimY - b3Reference.DimY Then
+            EgtMove(m_SelFilledSolid.nCurveId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
+            EgtMove(m_SelFilledSolid.nExtrusionId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
+            EgtDraw()
+         Else
+            NotifyPropertyChanged(NameOf(sYPos))
+         End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+      End Set
+   End Property
+
+   Public Property sZPos As String
+      Get
+         If Not IsNothing(m_SelFilledSolid) Then
+            Dim nId As Integer = If(m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW, m_SelFilledSolid.nCurveId, m_SelFilledSolid.nExtrusionId)
+            Dim b3Reference As New BBox3d
+            EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
+            Return LenToString(b3Reference.Min.z, 1)
+         Else
+            Return ""
+         End If
+      End Get
+      Set(value As String)
+         Dim nId As Integer = If(m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW, m_SelFilledSolid.nCurveId, m_SelFilledSolid.nExtrusionId)
+         Dim b3Reference As New BBox3d
+         EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
+         Dim dNewZPos As Double = b3Reference.Min.y
+         StringToLen(value, dNewZPos)
+         If dNewZPos >= -1000 Then
+            EgtMove(m_SelFilledSolid.nCurveId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min, GDB_RT.GLOB)
+            EgtMove(m_SelFilledSolid.nExtrusionId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min, GDB_RT.GLOB)
+            EgtDraw()
+         Else
+            NotifyPropertyChanged(NameOf(sZPos))
+         End If
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+      End Set
+   End Property
+
+   Private m_RotAxes() As Boolean = {False, False, True}
+   Public Property RotX As Boolean
+      Get
+         Return m_RotAxes(0)
+      End Get
+      Set(value As Boolean)
+         m_RotAxes(0) = value
+      End Set
+   End Property
+   Public Property RotY As Boolean
+      Get
+         Return m_RotAxes(1)
+      End Get
+      Set(value As Boolean)
+         m_RotAxes(1) = value
+      End Set
+   End Property
+   Public Property RotZ As Boolean
+      Get
+         Return m_RotAxes(2)
+      End Get
+      Set(value As Boolean)
+         m_RotAxes(2) = value
+      End Set
+   End Property
+
+   Public ReadOnly Property vtSelRotAxes As Vector3d
+      Get
+         If m_RotAxes(0) Then
+            Return Vector3d.X_AX
+         ElseIf m_RotAxes(1) Then
+            Return Vector3d.Y_AX
+         Else
+            Return Vector3d.Z_AX
+         End If
+      End Get
+   End Property
+
+   Private m_sRotAngle As String
+   Public Property sRotAngle As String
+      Get
+         Return m_sRotAngle
+      End Get
+      Set(value As String)
+         Dim dNewAngle As Double = 0
+         If Not StringToLen(value, dNewAngle) Then
+            m_sRotAngle = 0
+            NotifyPropertyChanged(NameOf(sRotAngle))
+            Return
+         End If
+         Dim nId As Integer = If(m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW, m_SelFilledSolid.nCurveId, m_SelFilledSolid.nExtrusionId)
+         Dim b3Rib As New BBox3d
+         EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Rib)
+         Dim bOk As Boolean = False
+         bOk = EgtRotate(nId, b3Rib.Center(), vtSelRotAxes, dNewAngle, GDB_RT.GLOB)
+         If bOk AndAlso m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW Then EgtRotate(m_SelFilledSolid.nExtrusionId, b3Rib.Center, vtSelRotAxes, dNewAngle, GDB_RT.GLOB)
+         If bOk Then
+            EgtDraw()
+            RefreshPos()
+            m_sRotAngle = 0
+            NotifyPropertyChanged(NameOf(sRotAngle))
+            ' Imposto flag di ricalcolo slice
+            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+         Else
+            m_sRotAngle = value
+         End If
+      End Set
+   End Property
+
+   Private m_bAdd_IsChecked As Boolean
+   Public Property bAdd_IsChecked As Boolean
+      Get
+         Return m_bAdd_IsChecked
+      End Get
+      Set(value As Boolean)
+         If Not m_bMachParam_IsChecked AndAlso 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
+               m_bRotate_IsChecked = False
+               NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+               NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+               NotifyPropertyChanged(NameOf(bMove_IsChecked))
+               NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+            End If
+         End If
+      End Set
+   End Property
+
+   Private m_bEdit_IsChecked As Boolean
+   Public Property bEdit_IsChecked As Boolean
+      Get
+         Return m_bEdit_IsChecked
+      End Get
+      Set(value As Boolean)
+         If Not IsNothing(m_SelFilledSolid) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+            m_bEdit_IsChecked = value
+            If value Then
+               m_bAdd_IsChecked = False
+               m_bGrid_IsChecked = False
+               m_bMove_IsChecked = False
+               m_bRotate_IsChecked = False
+               NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+               NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+               NotifyPropertyChanged(NameOf(bMove_IsChecked))
+               NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+            End If
+         Else
+            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+         End If
+      End Set
+   End Property
+
+   Private m_bGrid_IsChecked As Boolean
+   Public Property bGrid_IsChecked As Boolean
+      Get
+         Return m_bGrid_IsChecked
+      End Get
+      Set(value As Boolean)
+         If Not m_bMachParam_IsChecked AndAlso 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
+               m_bRotate_IsChecked = False
+               NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+               NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+               NotifyPropertyChanged(NameOf(bMove_IsChecked))
+               NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+            End If
+         End If
+      End Set
+   End Property
+
+   Public ReadOnly Property bGrid_IsEnabled As Boolean
+      Get
+         Return Map.refMyStatusBarVM.bGridVisibility
+      End Get
+   End Property
+
+   Private m_bMove_IsChecked As Boolean
+   Public Property bMove_IsChecked As Boolean
+      Get
+         Return m_bMove_IsChecked
+      End Get
+      Set(value As Boolean)
+         If Not IsNothing(m_SelFilledSolid) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+            m_bMove_IsChecked = value
+            If value Then
+               m_bAdd_IsChecked = False
+               m_bEdit_IsChecked = False
+               m_bGrid_IsChecked = False
+               m_bRotate_IsChecked = False
+               NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+               NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+               NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+               NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+            End If
+         Else
+            NotifyPropertyChanged(NameOf(bMove_IsChecked))
+         End If
+      End Set
+   End Property
+
+   Private m_bRotate_IsChecked As Boolean
+   Public Property bRotate_IsChecked As Boolean
+      Get
+         Return m_bRotate_IsChecked
+      End Get
+      Set(value As Boolean)
+         If Not IsNothing(m_SelFilledSolid) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+            m_bRotate_IsChecked = value
+            If value Then
+               m_bAdd_IsChecked = False
+               m_bEdit_IsChecked = False
+               m_bGrid_IsChecked = False
+               m_bMove_IsChecked = False
+               NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+               NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+               NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+               NotifyPropertyChanged(NameOf(bMove_IsChecked))
+            End If
+         Else
+            NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+         End If
+      End Set
+   End Property
+
+   Private m_bMachParam_IsChecked As Boolean
+   Public Property bMachParam_IsChecked As Boolean
+      Get
+         Return m_bMachParam_IsChecked
+      End Get
+      Set(value As Boolean)
+         If Not IsNothing(m_SelFilledSolid) 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
+            m_bGrid_IsChecked = False
+            m_bMove_IsChecked = False
+            m_bRotate_IsChecked = False
+            NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+            NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+            NotifyPropertyChanged(NameOf(bMove_IsChecked))
+            NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+            Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.AUXSOLIDPARAM)
+            NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
+         Else
+            NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
+         End If
+      End Set
+   End Property
+   Friend Sub ResetMachParamIsChecked()
+      m_bMachParam_IsChecked = False
+      NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
+      NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
+   End Sub
+
+   Public ReadOnly Property Compo_Visibility As Visibility
+      Get
+         Return If(Not IsNothing(m_SelFilledSolid) AndAlso m_SelFilledSolid.Type = FilledSolidEntity.FilledSolidTypes.FROMDRAW, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+   Public ReadOnly Property FilledSolidList_IsEnabled As Boolean
+      Get
+         Return Not m_bMachParam_IsChecked
+      End Get
+   End Property
+   ' riferimento griglia all'ingresso in questa pagina
+   Private m_OriginalGridFrame As New Frame3d
+
+   ' parametro che indica se e' in corso il disegno di un percorso
+   Private m_bIsCreatingPath As Boolean = False
+   Public ReadOnly Property bIsCreatingPath As Boolean
+      Get
+         Return m_bIsCreatingPath
+      End Get
+   End Property
+   Private m_bIsCreatingExtrusion As Boolean = False
+   Public ReadOnly Property bIsCreatingExtrusion As Boolean
+      Get
+         Return m_bIsCreatingExtrusion
+      End Get
+   End Property
+
+
+   ' Definizione comandi
+   Private m_cmdImport As ICommand
+   Private m_cmdLine2P As ICommand
+   Private m_cmdDelete As ICommand
+   Private m_cmdModifyCurve As ICommand
+   Private m_cmdAddPointCurve As ICommand
+   Private m_cmdRemovePointCurve As ICommand
+   Private m_cmdExtrude As ICommand
+   Private m_cmdCPlaneTop As ICommand
+   Private m_cmdCPlaneFront As ICommand
+   Private m_cmdCPlaneRight As ICommand
+   Private m_cmdCPlaneBack As ICommand
+   Private m_cmdCPlaneLeft As ICommand
+   Private m_cmdCPlaneBottom As ICommand
+   Private m_cmdCPlaneView As ICommand
+   Private m_cmdCPlaneElevation As ICommand
+   Private m_cmdCPlaneOrigin As ICommand
+   Private m_cmdCPlaneRotate As ICommand
+   Private m_cmdCPlane3P As ICommand
+   Private m_cmdCPlanePerpObj As ICommand
+   Private m_cmdCPlaneObj As ICommand
+   Private m_cmdDragMove As ICommand
+   Private m_cmdDragRotate As ICommand
+   Private m_cmdMachParam As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTORS"
+
+   Sub New()
+      ' Creo riferimento a questa classe in EgtCAM5Map
+      Map.SetRefFilledSolidPanelVM(Me)
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+#Region "METHODS"
+
+   Friend Sub Init()
+      ' asse rotazione di default
+      RotZ = True
+      NotifyPropertyChanged(NameOf(RotZ))
+      ' azzero indice 
+      StartEntity.ResetSharedIndex()
+      ' fisso frame originale
+      m_OriginalGridFrame = EgtGetGridFrame()
+      ' recupero dati pezzo selezionato layer ed entita'
+      m_nPartId = Map.refTopPanelVM.SelPart.nPartId
+      m_nFilledSolidLayerId = Map.refTopPanelVM.SelPart.nAuxSolidsLayerId
+      If m_nFilledSolidLayerId = GDB_ID.NULL Then
+         m_nFilledSolidLayerId = EgtCreateGroup(m_nPartId)
+         EgtSetName(m_nFilledSolidLayerId, LAY_AUX_SOLIDS)
+      End If
+      'recupero tutte le entita' filled solid
+      m_FilledSolidList.Clear()
+      Dim nFilledSolidId As Integer = EgtGetFirstInGroup(m_nFilledSolidLayerId)
+      While nFilledSolidId <> GDB_ID.NULL
+         Dim EntityType As GDB_TY = EgtGetType(nFilledSolidId)
+         Dim DrawType As Integer = FilledSolidEntity.FilledSolidTypes.FROMDRAW
+         EgtGetInfo(nFilledSolidId, KEY_AUXSOLID_TYPE, DrawType)
+         If EntityType = GDB_TY.CRV_COMPO AndAlso DrawType = FilledSolidEntity.FilledSolidTypes.FROMDRAW Then
+            Dim nExtrusionId As Integer = GDB_ID.NULL
+            EgtGetInfo(nFilledSolidId, KEY_EXTRUSION_ID, nExtrusionId)
+            Dim FilledSolidEntity As FilledSolidEntity = New FilledSolidEntity(FilledSolidEntity.FilledSolidTypes.FROMDRAW, nFilledSolidId)
+            If nExtrusionId <> GDB_ID.NULL Then
+               FilledSolidEntity.SetExtrusionId(nExtrusionId)
+            End If
+            m_FilledSolidList.Add(FilledSolidEntity)
+         ElseIf (EntityType = GDB_TY.SRF_BEZ OrElse EntityType = GDB_TY.SRF_MESH OrElse EntityType = GDB_TY.SRF_FRGN) AndAlso DrawType = FilledSolidEntity.FilledSolidTypes.FROMIMPORT Then
+            Dim FilledSolidEntity As FilledSolidEntity = New FilledSolidEntity(FilledSolidEntity.FilledSolidTypes.FROMIMPORT, nFilledSolidId)
+            m_FilledSolidList.Add(FilledSolidEntity)
+         End If
+         nFilledSolidId = EgtGetNext(nFilledSolidId)
+      End While
+      If m_FilledSolidList.Count > 0 Then
+         SelFilledSolid = m_FilledSolidList(0)
+         NotifyPropertyChanged(NameOf(SelFilledSolid))
+      End If
+      Map.refSceneHostVM.MainScene.SetStatusNull()
+   End Sub
+
+   Friend Sub Dispose()
+      ' ripristino frame originale
+      EgtSetGridFrame(m_OriginalGridFrame)
+      ' se in modifica parametri
+      If m_bMachParam_IsChecked Then
+         ' ripristino modalita' standard
+         Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
+         Map.refFilledSolidPanelVM.ResetMachParamIsChecked()
+      End If
+      EgtDeselectAll()
+      EgtDraw()
+      Map.refSceneHostVM.MainScene.SetStatusNull()
+   End Sub
+
+   Friend Sub RefreshPos()
+      NotifyPropertyChanged(NameOf(sXPos))
+      NotifyPropertyChanged(NameOf(sYPos))
+      NotifyPropertyChanged(NameOf(sZPos))
+   End Sub
+
+   Private Function InitCommand(FilledSolidSelectionType As FilledSolidSelectionTypes) As Boolean
+      ' attivo modifiche su scena
+      Map.refSceneHostVM.MainScene.ResetStatus()
+      ' rendo traspanete estrusione
+      EgtSetAlpha(m_SelFilledSolid.nExtrusionId, 50)
+      ' seleziono percorso corrente
+      EgtDeselectAll()
+      Select Case FilledSolidSelectionType
+         Case FilledSolidSelectionTypes.CURVE
+            EgtSelectObj(m_SelFilledSolid.nCurveId)
+         Case FilledSolidSelectionTypes.EXTRUSION
+            ' creo layer per estrusione
+            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
+            EgtSelectObj(m_SelFilledSolid.nCurveId)
+         Case FilledSolidSelectionTypes.BOTH
+            EgtSelectObj(m_SelFilledSolid.nCurveId)
+            EgtSelectObj(m_SelFilledSolid.nExtrusionId)
+      End Select
+      EgtDraw()
+      Return True
+   End Function
+
+   Friend Sub UpdateUI()
+      ' se attiva operazione in piu' passaggi, esco
+      If Map.refSceneHostVM.MainController.GetContinue() Then Return
+   End Sub
+
+   Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      Select Case command
+         Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
+            ' leggo altezza estrusione
+            Dim dExtrusionLength As Double = 0
+            EgtGetInfo(m_SelFilledSolid.nExtrusionId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
+            ' cancello estrusione
+            EgtErase(m_SelFilledSolid.nExtrusionId)
+            Dim nNewEntityId As Integer = EgtCreateSurfTmByRegionExtrusion(m_nFilledSolidLayerId, 1, {m_SelFilledSolid.nCurveId}, Vector3d.Z_AX * dExtrusionLength, EPS_STM)
+            EgtSetName(nNewEntityId, RIB_EXTRUSION)
+            EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
+            ' aggiorno riferimento nella curva
+            m_SelFilledSolid.SetExtrusionId(nNewEntityId)
+            ' seleziono nuova estrusione
+            EgtSelectObj(m_SelFilledSolid.nExtrusionId)
+            ' ripristino trasparenza estrusione
+            EgtSetAlpha(m_SelFilledSolid.nExtrusionId, 100)
+            EgtDraw()
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+         Case Controller.CMD.MOVE, Controller.CMD.ROTATE
+            EgtSetAlpha(Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId, 100)
+            ' seleziono nuova estrusione
+            EgtSelectObj(m_SelFilledSolid.nExtrusionId)
+            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, Controller.CMD.GRID_OBJ
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+      End Select
+      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
+      If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
+      ' se finita creazione estrusione
+      If m_bIsCreatingExtrusion Then
+         m_bIsCreatingExtrusion = False
+         ' se riferimento non nullo, elimino vecchia estrusione
+         If m_SelFilledSolid.nExtrusionId <> GDB_ID.NULL Then
+            EgtErase(m_SelFilledSolid.nExtrusionId)
+         End If
+         Dim NewEntity As FilledSolidEntity = Nothing
+         Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
+         Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewExtrusionLayerId)
+         Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
+         If NewGeomType = GDB_TY.SRF_FRGN OrElse NewGeomType = GDB_TY.SRF_MESH Then
+            EgtSetName(nNewEntityId, RIB_EXTRUSION)
+            Dim dExtrusionLength As Double = 0
+            StringToLen(Map.refControllerInputPanelVM.Text, dExtrusionLength)
+            EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
+            '' lo sposto nel layer dei rib
+            EgtRelocateGlob(nNewEntityId, m_nFilledSolidLayerId, GDB_POS.LAST_SON)
+            ' aggiungo riferimento a curva
+            m_SelFilledSolid.SetExtrusionId(nNewEntityId)
+         End If
+         ' cancello layer estrusione
+         EgtErase(nNewExtrusionLayerId)
+         ' aggiorno posizione
+         RefreshPos()
+         EgtDraw()
+         ' rimetto la selezione scena a null
+         Map.refSceneHostVM.MainScene.SetStatusNull()
+      End If
+      ' se finita creazione curva 
+      If bIsCreatingPath Then
+         m_bIsCreatingPath = False
+         Dim NewEntity As FilledSolidEntity = Nothing
+         Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
+         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)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
+            ' lo sposto nel layer dei rib
+            EgtRelocateGlob(nNewEntityId, m_nFilledSolidLayerId, GDB_POS.LAST_SON)
+            ' lo aggiungo alla lista
+            NewEntity = New FilledSolidEntity(FilledSolidEntity.FilledSolidTypes.FROMDRAW, nNewEntityId)
+            m_FilledSolidList.Add(NewEntity)
+            ' lo seleziono
+            SelFilledSolid = NewEntity
+            NotifyPropertyChanged(NameOf(SelFilledSolid))
+            ' creo layer per estrusione
+            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
+            ' seleziono percorso da estrudere
+            EgtDeselectAll()
+            EgtSelectObj(nNewEntityId)
+            If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
+               m_bIsCreatingExtrusion = True
+               Map.refControllerInputPanelVM.IsChecked = True
+            Else
+               ' cancello layer
+               EgtErase(nNewExtrusionLayerId)
+            End If
+         End If
+         ' cancello layer di disegno
+         EgtErase(nNewRibLayerId)
+      End If
+   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.refFilledSolidPanelVM.PrevSelObjs
+               EgtSelectObj(Id)
+            Next
+            EgtDraw()
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+         End If
+      End If
+   End Sub
+
+   Friend Function OnMouseSelectingObj(nId As Integer) As Boolean
+      Return EgtGetParent(nId) = m_nFilledSolidLayerId
+   End Function
+
+   Friend Sub SelStartFromId(nId)
+      Dim SelFilledSolidEntity As FilledSolidEntity = m_FilledSolidList.FirstOrDefault(Function(x) x.nCurveId = nId OrElse x.nExtrusionId = nId)
+      If Not IsNothing(SelFilledSolidEntity) Then
+         SelFilledSolid = SelFilledSolidEntity
+         NotifyPropertyChanged(NameOf(SelFilledSolid))
+      End If
+   End Sub
+
+   Friend Sub SelLastFilledSolid()
+      If FilledSolidList.Count <= 0 Then Return
+      SelFilledSolid = FilledSolidList(FilledSolidList.Count - 1)
+      NotifyPropertyChanged(NameOf(SelFilledSolid))
+   End Sub
+
+   Friend Shared Function GetNextFilledSolidIndex()
+      Dim nFilledSolidIndex As Integer = 0
+      Dim nFilledSolidId As Integer = EgtGetFirstInGroup(Map.refTopPanelVM.SelPart.nAuxSolidsLayerId)
+      While nFilledSolidId <> GDB_ID.NULL
+         Dim nCurrIndex As Integer = GDB_ID.NULL
+         EgtGetInfo(nFilledSolidId, FILLEDSOLID_ID, nCurrIndex)
+         If nCurrIndex > nFilledSolidIndex Then
+            nFilledSolidIndex = nCurrIndex
+         End If
+         nFilledSolidId = EgtGetNext(nFilledSolidId)
+      End While
+      Return nFilledSolidIndex + 1
+   End Function
+
+#End Region    ' METHODS
+
+#Region "COMMANDS"
+
+#Region "Import"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneTop.
+   ''' </summary>
+   Public ReadOnly Property Import_Command As ICommand
+      Get
+         If m_cmdImport Is Nothing Then
+            m_cmdImport = New Command(AddressOf Import)
+         End If
+         Return m_cmdImport
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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.InsertFilledSolid()
+   End Sub
+
+#End Region ' Import
+
+#Region "Line2P"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneTop.
+   ''' </summary>
+   Public ReadOnly Property Line2P_Command As ICommand
+      Get
+         If m_cmdLine2P Is Nothing Then
+            m_cmdLine2P = New Command(AddressOf Line2P)
+         End If
+         Return m_cmdLine2P
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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 = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
+      If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
+      EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
+      EgtSetCurrPartLayer(m_nPartId, nNewShellNumberLayerId)
+      Map.refSceneHostVM.MainController.SetContinue()
+      If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.LINE2P) Then
+         m_bIsCreatingPath = True
+      End If
+   End Sub
+
+#End Region ' Line2P
+
+#Region "Delete"
+
+   Public ReadOnly Property Delete_Command As ICommand
+      Get
+         If m_cmdDelete Is Nothing Then
+            m_cmdDelete = New Command(AddressOf Delete)
+         End If
+         Return m_cmdDelete
+      End Get
+   End Property
+
+   Public Sub Delete()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If IsNothing(SelFilledSolid) Then Return
+      Dim bOk As Boolean = False
+      Select Case m_SelFilledSolid.Type
+         Case FilledSolidEntity.FilledSolidTypes.FROMDRAW
+            bOk = EgtErase(m_SelFilledSolid.nCurveId)
+            If bOk Then EgtErase(m_SelFilledSolid.nExtrusionId)
+         Case FilledSolidEntity.FilledSolidTypes.FROMIMPORT
+            bOk = EgtErase(m_SelFilledSolid.nExtrusionId)
+      End Select
+      If bOk Then
+         Dim nSelStartIndex As Integer = m_FilledSolidList.IndexOf(SelFilledSolid)
+         m_FilledSolidList.Remove(SelFilledSolid)
+         If nSelStartIndex < m_FilledSolidList.Count Then
+            SelFilledSolid = m_FilledSolidList(nSelStartIndex)
+         ElseIf m_FilledSolidList.Count > 0 Then
+            SelFilledSolid = m_FilledSolidList(m_FilledSolidList.Count - 1)
+         Else
+            SelFilledSolid = Nothing
+         End If
+         NotifyPropertyChanged(NameOf(SelFilledSolid))
+      End If
+   End Sub
+
+#End Region    ' Delete
+
+#Region "ModifyCurve"
+
+   ''' <summary>
+   ''' Returns a command that do Linear Dimension.
+   ''' </summary>
+   Public ReadOnly Property ModifyCurve_Command As ICommand
+      Get
+         If m_cmdModifyCurve Is Nothing Then
+            m_cmdModifyCurve = New Command(AddressOf ModifyCurve)
+         End If
+         Return m_cmdModifyCurve
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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(FilledSolidSelectionTypes.CURVE)
+      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
+   End Sub
+
+#End Region ' ModifyCurve
+
+#Region "AddPointCurve"
+
+   ''' <summary>
+   ''' Returns a command that do Linear Dimension.
+   ''' </summary>
+   Public ReadOnly Property AddPointCurve_Command As ICommand
+      Get
+         If m_cmdAddPointCurve Is Nothing Then
+            m_cmdAddPointCurve = New Command(AddressOf AddPointCurve)
+         End If
+         Return m_cmdAddPointCurve
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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(FilledSolidSelectionTypes.CURVE)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
+      Else
+         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.ADDPOINTCURVE)
+      End If
+   End Sub
+
+#End Region ' AddPointCurve
+
+#Region "RemovePointCurve"
+
+   ''' <summary>
+   ''' Returns a command that do Linear Dimension.
+   ''' </summary>
+   Public ReadOnly Property RemovePointCurve_Command As ICommand
+      Get
+         If m_cmdRemovePointCurve Is Nothing Then
+            m_cmdRemovePointCurve = New Command(AddressOf RemovePointCurve)
+         End If
+         Return m_cmdRemovePointCurve
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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(FilledSolidSelectionTypes.CURVE)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
+      Else
+         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.REMOVEPOINTCURVE)
+      End If
+   End Sub
+
+#End Region ' RemovePointCurve
+
+#Region "Extrude"
+
+   ''' <summary>
+   ''' Returns a command that do Extrude.
+   ''' </summary>
+   Public ReadOnly Property Extrude_Command As ICommand
+      Get
+         If m_cmdExtrude Is Nothing Then
+            m_cmdExtrude = New Command(AddressOf Extrude)
+         End If
+         Return m_cmdExtrude
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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(FilledSolidSelectionTypes.EXTRUSION)
+      If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
+         m_bIsCreatingExtrusion = True
+         Map.refControllerInputPanelVM.IsChecked = True
+      End If
+   End Sub
+
+#End Region ' Extrude
+
+#Region "CPlaneTop"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneTop.
+   ''' </summary>
+   Public ReadOnly Property CPlaneTop_Command As ICommand
+      Get
+         If m_cmdCPlaneTop Is Nothing Then
+            m_cmdCPlaneTop = New Command(AddressOf CPlaneTop)
+         End If
+         Return m_cmdCPlaneTop
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlaneTop
+
+#Region "CPlaneFront"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneFront.
+   ''' </summary>
+   Public ReadOnly Property CPlaneFront_Command As ICommand
+      Get
+         If m_cmdCPlaneFront Is Nothing Then
+            m_cmdCPlaneFront = New Command(AddressOf CPlaneFront)
+         End If
+         Return m_cmdCPlaneFront
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlaneFront
+
+#Region "CPlaneRight"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneRight.
+   ''' </summary>
+   Public ReadOnly Property CPlaneRight_Command As ICommand
+      Get
+         If m_cmdCPlaneRight Is Nothing Then
+            m_cmdCPlaneRight = New Command(AddressOf CPlaneRight)
+         End If
+         Return m_cmdCPlaneRight
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlaneRight
+
+#Region "CPlaneBack"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneBack.
+   ''' </summary>
+   Public ReadOnly Property CPlaneBack_Command As ICommand
+      Get
+         If m_cmdCPlaneBack Is Nothing Then
+            m_cmdCPlaneBack = New Command(AddressOf CPlaneBack)
+         End If
+         Return m_cmdCPlaneBack
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlaneBack
+
+#Region "CPlaneLeft"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneLeft.
+   ''' </summary>
+   Public ReadOnly Property CPlaneLeft_Command As ICommand
+      Get
+         If m_cmdCPlaneLeft Is Nothing Then
+            m_cmdCPlaneLeft = New Command(AddressOf CPlaneLeft)
+         End If
+         Return m_cmdCPlaneLeft
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlaneLeft
+
+#Region "CPlaneBottom"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneBottom.
+   ''' </summary>
+   Public ReadOnly Property CPlaneBottom_Command As ICommand
+      Get
+         If m_cmdCPlaneBottom Is Nothing Then
+            m_cmdCPlaneBottom = New Command(AddressOf CPlaneBottom)
+         End If
+         Return m_cmdCPlaneBottom
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlaneBottom
+
+#Region "CPlaneElevation"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneElevation.
+   ''' </summary>
+   Public ReadOnly Property CPlaneElevation_Command As ICommand
+      Get
+         If m_cmdCPlaneElevation Is Nothing Then
+            m_cmdCPlaneElevation = New Command(AddressOf CPlaneElevation)
+         End If
+         Return m_cmdCPlaneElevation
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlaneElevation
+
+#Region "CPlaneOrigin"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneOrigin.
+   ''' </summary>
+   Public ReadOnly Property CPlaneOrigin_Command As ICommand
+      Get
+         If m_cmdCPlaneOrigin Is Nothing Then
+            m_cmdCPlaneOrigin = New Command(AddressOf CPlaneOrigin)
+         End If
+         Return m_cmdCPlaneOrigin
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlaneOrigin
+
+#Region "CPlaneRotate"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneRotate.
+   ''' </summary>
+   Public ReadOnly Property CPlaneRotate_Command As ICommand
+      Get
+         If m_cmdCPlaneRotate Is Nothing Then
+            m_cmdCPlaneRotate = New Command(AddressOf CPlaneRotate)
+         End If
+         Return m_cmdCPlaneRotate
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE3D)
+      End If
+   End Sub
+
+#End Region ' CPlaneRotate
+
+#Region "CPlane3P"
+
+   ''' <summary>
+   ''' Returns a command that do CPlane3P.
+   ''' </summary>
+   Public ReadOnly Property CPlane3P_Command As ICommand
+      Get
+         If m_cmdCPlane3P Is Nothing Then
+            m_cmdCPlane3P = New Command(AddressOf CPlane3P)
+         End If
+         Return m_cmdCPlane3P
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlane3P
+
+#Region "CPlanePerpObj"
+
+   ''' <summary>
+   ''' Returns a command that do CPlanePerpObj.
+   ''' </summary>
+   Public ReadOnly Property CPlanePerpObj_Command As ICommand
+      Get
+         If m_cmdCPlanePerpObj Is Nothing Then
+            m_cmdCPlanePerpObj = New Command(AddressOf CPlanePerpObj)
+         End If
+         Return m_cmdCPlanePerpObj
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+
+#End Region ' CPlanePerpObj
+
+#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>
+   Public ReadOnly Property CPlaneObj_Command As ICommand
+      Get
+         If m_cmdCPlaneObj Is Nothing Then
+            m_cmdCPlaneObj = New Command(AddressOf CPlaneObj)
+         End If
+         Return m_cmdCPlaneObj
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' 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
+      ' salvo selezione precedente e deseleziono altri oggetti
+      m_PrevSelObjs.Clear()
+      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
+
+#Region "DragMove"
+
+   Public ReadOnly Property DragMove_Command As ICommand
+      Get
+         If m_cmdDragMove Is Nothing Then
+            m_cmdDragMove = New Command(AddressOf DragMove)
+         End If
+         Return m_cmdDragMove
+      End Get
+   End Property
+
+   Public Sub DragMove()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      InitCommand(FilledSolidSelectionTypes.BOTH)
+      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE)
+   End Sub
+
+#End Region    ' DragMove
+
+#Region "DragRotate"
+
+   Public ReadOnly Property DragRotate_Command As ICommand
+      Get
+         If m_cmdDragRotate Is Nothing Then
+            m_cmdDragRotate = New Command(AddressOf DragRotate)
+         End If
+         Return m_cmdDragRotate
+      End Get
+   End Property
+
+   Public Sub DragRotate()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      InitCommand(FilledSolidSelectionTypes.BOTH)
+      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.ROTATE)
+   End Sub
+
+#End Region    ' DragRotate
+
+#Region "MachParam"
+
+   Public ReadOnly Property MachParam_Command As ICommand
+      Get
+         If m_cmdMachParam Is Nothing Then
+            m_cmdMachParam = New Command(AddressOf MachParam)
+         End If
+         Return m_cmdMachParam
+      End Get
+   End Property
+
+   Public Sub MachParam()
+      If IsNothing(Map.refTopPanelVM.SelMachining) Then Return
+      m_bAdd_IsChecked = False
+      m_bEdit_IsChecked = False
+      m_bGrid_IsChecked = False
+      m_bMove_IsChecked = False
+      m_bRotate_IsChecked = False
+      NotifyPropertyChanged(NameOf(bAdd_IsChecked))
+      NotifyPropertyChanged(NameOf(bEdit_IsChecked))
+      NotifyPropertyChanged(NameOf(bGrid_IsChecked))
+      NotifyPropertyChanged(NameOf(bMove_IsChecked))
+      NotifyPropertyChanged(NameOf(bRotate_IsChecked))
+      Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.AUXSOLIDPARAM)
+   End Sub
+
+#End Region    ' MachParam
+
+#End Region    ' COMMANDS
+
+End Class
+
+Public Class FilledSolidEntity
+   Inherits VMBase
+
+   Public Enum FilledSolidTypes As Integer
+      FROMDRAW = 1
+      FROMIMPORT = 2
+   End Enum
+
+   Private Shared m_nSharedIndex As Integer = 0
+   Private ReadOnly Property nSharedIndex As Integer
+      Get
+         m_nSharedIndex += 1
+         Return m_nSharedIndex
+      End Get
+   End Property
+   Friend Shared Sub ResetSharedIndex()
+      m_nSharedIndex = 0
+   End Sub
+
+   Private m_Type As FilledSolidTypes
+   Public ReadOnly Property Type As FilledSolidTypes
+      Get
+         Return m_Type
+      End Get
+   End Property
+
+   Private m_nCurveId As Integer = GDB_ID.NULL
+   Public ReadOnly Property nCurveId As Integer
+      Get
+         Return m_nCurveId
+      End Get
+   End Property
+
+   Private m_nExtrusionId As Integer = GDB_ID.NULL
+   Public ReadOnly Property nExtrusionId As Integer
+      Get
+         Return m_nExtrusionId
+      End Get
+   End Property
+   Friend Sub SetExtrusionId(nId As Integer)
+      m_nExtrusionId = nId
+      EgtSetInfo(m_nCurveId, KEY_EXTRUSION_ID, m_nExtrusionId)
+   End Sub
+
+   Private m_nIndex As Integer
+   Public ReadOnly Property nIndex As Integer
+      Get
+         Return m_nIndex
+      End Get
+   End Property
+
+   Public ReadOnly Property ghName As String
+      Get
+         Return String.Format("[{0}] {1}", {m_nIndex, If(m_Type = FilledSolidTypes.FROMDRAW, "Draw Filled Solid", "Import Filled Solid")})
+      End Get
+   End Property
+
+   Sub New(Type As FilledSolidTypes, nId As Integer)
+      If Not EgtGetInfo(nId, FILLEDSOLID_ID, m_nIndex) Then
+         m_nIndex = FilledSolidPanelVM.GetNextFilledSolidIndex()
+         EgtSetInfo(nId, FILLEDSOLID_ID, m_nIndex)
+      End If
+      m_Type = Type
+      EgtSetInfo(nId, KEY_AUXSOLID_TYPE, Type)
+      Select Case Type
+         Case FilledSolidTypes.FROMDRAW
+            m_nCurveId = nId
+         Case FilledSolidTypes.FROMIMPORT
+            m_nExtrusionId = nId
+      End Select
+   End Sub
+
+End Class
diff --git a/Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml b/Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml
new file mode 100644
index 0000000..ef39a21
--- /dev/null
+++ b/Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml
@@ -0,0 +1,100 @@
+<Grid x:Class="FilledSolidParamPanelV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:PrintApp="clr-namespace:Icarus"
+      Width="310"
+      VerticalAlignment="Center">
+   <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="1*"/>
+   </Grid.RowDefinitions>
+   <Border Margin="0,0,0,2.5"
+           Style="{StaticResource Title_Border}">
+      <TextBlock Text="REDUCE SHELL NUMBER PARAMETERS"
+                 Style="{StaticResource Title_TextBlock}"/>
+   </Border>
+   <Border Grid.Row="1"
+           Padding="0,2.5,0,0"
+           Margin="0,2.5,0,0"
+           Style="{StaticResource BottomGrayRow_Border}">
+      <Grid Margin="2.5,2.5,2.5,0">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <ScrollViewer VerticalScrollBarVisibility="Auto"
+                       HorizontalScrollBarVisibility="Disabled">
+            <ItemsControl ItemsSource="{Binding MachiningParamList}">
+               <ItemsControl.ItemsPanel>
+                  <ItemsPanelTemplate>
+                     <UniformGrid Columns="1"
+                                    HorizontalAlignment="Stretch"/>
+                  </ItemsPanelTemplate>
+               </ItemsControl.ItemsPanel>
+               <ItemsControl.Resources>
+                  <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
+                     <Grid Margin="0,1,2.5,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <TextBox Grid.Column="1"
+                                 Text="{Binding sValue}"
+                                 Margin="2.5,0,2.5,0"
+                                 Style="{StaticResource ParameterList_TextBox}"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromPart}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
+                  <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
+                     <Grid Margin="0,1,2.5,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <ComboBox Grid.Column="1"
+                                  ItemsSource="{Binding ValueList}"
+                                  SelectedItem="{Binding SelValue}"
+                                  HorizontalAlignment="Stretch"
+                                  Margin="2.5,0,2.5,0"
+                                  Style="{StaticResource RightPanel_ComboBox}"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromPart}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
+               </ItemsControl.Resources>
+            </ItemsControl>
+         </ScrollViewer>
+         <UniformGrid Grid.Row="1"
+                      Rows="1"
+                      Margin="0,2.5,0,0">
+            <Button Content="Ok"
+                    Command="{Binding Ok_Command}"
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+            <Button Content="Cancel"
+                    Command="{Binding Cancel_Command}"
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         </UniformGrid>
+      </Grid>
+   </Border>
+</Grid>
diff --git a/Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml.vb b/Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml.vb
new file mode 100644
index 0000000..4edf7fc
--- /dev/null
+++ b/Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class FilledSolidParamPanelV
+
+End Class
diff --git a/Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb b/Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb
new file mode 100644
index 0000000..5e8247c
--- /dev/null
+++ b/Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb
@@ -0,0 +1,441 @@
+Imports System.Collections.ObjectModel
+Imports System.Reflection
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class FilledSolidParamPanelVM
+   Inherits MachiningCathegory
+
+#Region "FIELDS & PROPERTIES"
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTORS"
+
+   Sub New()
+      ' Creo riferimento a questa classe in EgtCAM5Map
+      Map.SetRefFilledSolidParamPanelVM(Me)
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+#Region "METHODS"
+
+   Friend Sub Init()
+      If IsNothing(Map.refFilledSolidPanelVM.SelFilledSolid) Then
+         ' ripristino modalita' standard
+         Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
+         Return
+      End If
+      Dim nPartId As Integer = Map.refTopPanelVM.SelPart.nPartId
+      Dim nFilledSolidId As Integer = GDB_ID.NULL
+      Select Case Map.refFilledSolidPanelVM.SelFilledSolid.Type
+         Case RibEntity.RibTypes.FROMDRAW
+            nFilledSolidId = Map.refFilledSolidPanelVM.SelFilledSolid.nCurveId
+         Case RibEntity.RibTypes.FROMIMPORT
+            nFilledSolidId = Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId
+      End Select
+
+      m_Type = Cathegories.AUX_SOLID
+      m_sName = "Filled Solid"
+      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nFilledSolidId, nPartId),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nFilledSolidId, nPartId),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nFilledSolidId, nPartId)})
+      NotifyPropertyChanged(NameOf(MachiningParamList))
+      NotifyPropertyChanged(NameOf(sName))
+   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 WriteParamsInFilledSolid(nRibId As Integer)
+      ' se parametri modificati
+      Dim bModified As Boolean = False
+      For Each Param In m_MachiningParamList
+         Select Case Param.GetType()
+            Case GetType(FilledSolidNumericMachiningParam)
+               Dim NumericParam As FilledSolidNumericMachiningParam = TryCast(Param, FilledSolidNumericMachiningParam)
+               If NumericParam.bIsModified AndAlso Not bModified Then bModified = True
+               NumericParam.WriteParamInFilledSolid(nRibId)
+            Case GetType(FilledSolidComboMachiningParam)
+               Dim NumericParam As FilledSolidComboMachiningParam = TryCast(Param, FilledSolidComboMachiningParam)
+               If NumericParam.bIsModified AndAlso Not bModified Then bModified = True
+               NumericParam.WriteParamInFilledSolid(nRibId)
+         End Select
+      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
+
+#Region "COMMANDS"
+
+#Region "Ok"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      If Not IsNothing(Map.refFilledSolidPanelVM.SelFilledSolid) Then
+         ' scrivo i parametri modificati
+         Select Case Map.refFilledSolidPanelVM.SelFilledSolid.Type
+            Case FilledSolidEntity.FilledSolidTypes.FROMDRAW
+               WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nCurveId)
+               WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId)
+            Case FilledSolidEntity.FilledSolidTypes.FROMIMPORT
+               WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId)
+         End Select
+      End If
+      ' ripristino modalita' standard
+      Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
+      Map.refFilledSolidPanelVM.ResetMachParamIsChecked()
+   End Sub
+
+#End Region    ' Ok
+
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      ' ripristino modalita' standard
+      Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
+      Map.refFilledSolidPanelVM.ResetMachParamIsChecked()
+   End Sub
+
+#End Region    ' Cancel
+
+#End Region    ' COMMANDS
+
+End Class
+
+Public Class FilledSolidNumericMachiningParam
+   Inherits NumericMachiningParam
+
+   Public Overrides Property sValue As String
+      Get
+         Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
+      End Get
+      Set(value As String)
+         If m_bIsLen Then
+            StringToLen(value, m_dValue)
+         Else
+            m_dValue = value
+         End If
+         NotifyPropertyChanged(NameOf(sValue))
+         NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+      End Set
+   End Property
+
+   Private m_dPartValue As Double
+   Public ReadOnly Property dPartValue As Double
+      Get
+         Return m_dPartValue
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsModifiedFromPart As Boolean
+      Get
+         Return m_dValue <> m_dPartValue
+      End Get
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdResetParam As ICommand
+
+   Sub New(Type As Params, nFilledSolidId As Integer, nPartId As Integer)
+      MyBase.New(Type)
+      Dim bReadFromPart As Boolean = False
+      Select Case Type
+         Case Params.AUXSOLIDSOVERLAP
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSLINKPARAM
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKPARAM, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSCOASTINGLEN
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSCOASTINGLEN, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSWIPELEN
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSWIPELEN, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSWIPEDIR
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSWIPEDIR, m_dPartValue)
+            m_bIsLen = True
+      End Select
+      m_dOrigValue = m_dValue
+      If Not bReadFromPart Then
+         m_dValue = m_dPartValue
+         m_dOrigValue = m_dPartValue
+      End If
+   End Sub
+
+   Friend Sub WriteParamInFilledSolid(nFilledSolidId As Integer)
+      Dim sWriteValue As String = ""
+      If m_bIsLen Then
+         sWriteValue = LenToString(m_dValue, 2)
+      Else
+         sWriteValue = DoubleToString(m_dValue, 2)
+      End If
+      Select Case Type
+         Case Params.AUXSOLIDSOVERLAP
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP)
+            End If
+         Case Params.AUXSOLIDSLINKPARAM
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM)
+            End If
+         Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE)
+            End If
+         Case Params.AUXSOLIDSCOASTINGLEN
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN)
+            End If
+         Case Params.AUXSOLIDSWIPELEN
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN)
+            End If
+         Case Params.AUXSOLIDSWIPEDIR
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR)
+            End If
+      End Select
+   End Sub
+
+   Friend Overrides Sub SaveParam()
+      m_dOrigValue = m_dValue
+   End Sub
+
+   Friend Overrides Sub ResetParam()
+      m_dValue = m_dOrigValue
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "ResetParam"
+
+   Public ReadOnly Property ResetParam_Command As ICommand
+      Get
+         If m_cmdResetParam Is Nothing Then
+            m_cmdResetParam = New Command(AddressOf ResetParamCmd)
+         End If
+         Return m_cmdResetParam
+      End Get
+   End Property
+
+   Public Sub ResetParamCmd()
+      m_dValue = m_dPartValue
+      NotifyPropertyChanged(NameOf(sValue))
+      NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+   End Sub
+
+#End Region    ' ResetParam
+
+#End Region    ' COMMANDS
+
+End Class
+
+Public Class FilledSolidComboMachiningParam
+   Inherits ComboMachiningParam
+
+   Public Overrides Property SelValue As IdNameStruct
+      Get
+         Return m_SelValue
+      End Get
+      Set(value As IdNameStruct)
+         m_SelValue = value
+         NotifyPropertyChanged(NameOf(SelValue))
+         NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+      End Set
+   End Property
+
+   Protected m_PartSelValue As IdNameStruct
+   Public ReadOnly Property PartSelValue As IdNameStruct
+      Get
+         Return m_PartSelValue
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsModifiedFromPart As Boolean
+      Get
+         Return m_SelValue.Id <> m_PartSelValue.Id
+      End Get
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdResetParam As ICommand
+
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
+      MyBase.New(Type)
+      Dim bReadFromRib As Boolean = False
+      Dim bReadFromPart As Boolean = False
+      Select Case Type
+         Case Params.AUXSOLIDSINFILL
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL.NONE, "None"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
+            Dim nSelValue As Integer = 1
+            bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSINFILL, nSelValue)
+            If bReadFromRib Then
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+            End If
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSINFILL, nSelValue)
+            m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+         Case Params.AUXSOLIDSSTRANDORDER
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_STRANDORDERS.OUTTOIN, "From Outside To Inside"),
+                                                     New IdNameStruct(Machining.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside")})
+            Dim nSelValue As Integer = 1
+            bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER, nSelValue)
+            If bReadFromRib Then
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+            End If
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSSTRANDORDER, nSelValue)
+            m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+         Case Params.AUXSOLIDSLINKTYPE
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LINKTYPES.NONE, "None"),
+                                                     New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
+                                                     New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
+            Dim nSelValue As Integer = 1
+            bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSLINKTYPE, nSelValue)
+            If bReadFromRib Then
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+            End If
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKTYPE, nSelValue)
+            m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+      End Select
+      m_OrigSelValue = m_SelValue
+      If Not bReadFromRib Then
+         If bReadFromPart Then
+            m_SelValue = m_PartSelValue
+            m_OrigSelValue = m_PartSelValue
+         Else
+            Select Case Type
+               Case Params.AUXSOLIDSINFILL
+                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_INFILL.NONE)
+                  m_SelValue = m_OrigSelValue
+               Case Params.AUXSOLIDSSTRANDORDER
+                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_STRANDORDERS.OUTTOIN)
+                  m_SelValue = m_OrigSelValue
+               Case Params.AUXSOLIDSLINKTYPE
+                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_LINKTYPES.NONE)
+                  m_SelValue = m_OrigSelValue
+            End Select
+         End If
+      End If
+   End Sub
+
+   Friend Sub WriteParamInFilledSolid(nRibId As Integer)
+      Select Case Type
+         Case Params.AUXSOLIDSINFILL
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_AUXSOLIDSINFILL, m_SelValue.Id)
+            Else
+               EgtRemoveInfo(nRibId, MAC_AUXSOLIDSINFILL)
+            End If
+         Case Params.AUXSOLIDSSTRANDORDER
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER, m_SelValue.Id)
+            Else
+               EgtRemoveInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER)
+            End If
+         Case Params.AUXSOLIDSLINKTYPE
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_AUXSOLIDSLINKTYPE, m_SelValue.Id)
+            Else
+               EgtRemoveInfo(nRibId, MAC_AUXSOLIDSLINKTYPE)
+            End If
+      End Select
+   End Sub
+
+   Friend Overrides Sub SaveParam()
+      m_OrigSelValue = m_SelValue
+   End Sub
+
+   Friend Overrides Sub ResetParam()
+      m_SelValue = m_OrigSelValue
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "ResetParam"
+
+   Public ReadOnly Property ResetParam_Command As ICommand
+      Get
+         If m_cmdResetParam Is Nothing Then
+            m_cmdResetParam = New Command(AddressOf ResetParamCmd)
+         End If
+         Return m_cmdResetParam
+      End Get
+   End Property
+
+   Public Sub ResetParamCmd()
+      m_SelValue = m_PartSelValue
+      NotifyPropertyChanged(NameOf(SelValue))
+      NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+   End Sub
+
+#End Region    ' ResetParam
+
+#End Region    ' COMMANDS
+
+
+End Class
diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj
index 112989c..94de932 100644
--- a/Icarus/Icarus.vbproj
+++ b/Icarus/Icarus.vbproj
@@ -149,6 +149,14 @@
       <DependentUpon>DispositionPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="DispositionPanel\DispositionPanelVM.vb" />
+    <Compile Include="FilledSolidPanel\FilledSolidPanelV.xaml.vb">
+      <DependentUpon>FilledSolidPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="FilledSolidPanel\FilledSolidPanelVM.vb" />
+    <Compile Include="FilledSolidParamPanel\FilledSolidParamPanelV.xaml.vb">
+      <DependentUpon>FilledSolidParamPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="FilledSolidParamPanel\FilledSolidParamPanelVM.vb" />
     <Compile Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml.vb">
       <DependentUpon>ImportExportMachiningPanelV.xaml</DependentUpon>
     </Compile>
@@ -281,6 +289,9 @@
       <DependentUpon>StartMachPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="StartMachPanel\StartMachPanelVM.vb" />
+    <Compile Include="StatusBar\MessagePanelV.xaml.vb">
+      <DependentUpon>MessagePanelV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="StatusBar\MyStatusBarVM.vb" />
     <Compile Include="StatusBar\StatusBarV.xaml.vb">
       <DependentUpon>StatusBarV.xaml</DependentUpon>
@@ -342,6 +353,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="FilledSolidPanel\FilledSolidPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="FilledSolidParamPanel\FilledSolidParamPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
@@ -486,6 +505,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="StatusBar\MessagePanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="StatusBar\StatusBarV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -753,6 +776,9 @@
     <Resource Include="Resources\AboutBox\EgalwareLogo.png" />
     <Resource Include="Resources\AboutBox\IcarusLogo.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\CurrMachining\SaveInDb.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe
diff --git a/Icarus/LeftPanel/LeftPanelV.xaml b/Icarus/LeftPanel/LeftPanelV.xaml
index 298132e..1d611b8 100644
--- a/Icarus/LeftPanel/LeftPanelV.xaml
+++ b/Icarus/LeftPanel/LeftPanelV.xaml
@@ -36,7 +36,7 @@
          <PrintApp:ShellNumberPanelV DataContext="{StaticResource ShellNumberPanelVM}"/>
       </TabItem>
       <TabItem Header="AUXSOLIDS">
-         <Button Height="100"/>
+         <PrintApp:FilledSolidPanelV DataContext="{StaticResource FilledSolidPanelVM}"/>
       </TabItem>
       <TabItem Header="MODIFYPART">
          <!--<PrintApp:ModifyPartPanelV DataContext="{StaticResource ModifyPartPanelVM}"/>-->
diff --git a/Icarus/LeftPanel/LeftPanelVM.vb b/Icarus/LeftPanel/LeftPanelVM.vb
index 505bbd6..e69b106 100644
--- a/Icarus/LeftPanel/LeftPanelVM.vb
+++ b/Icarus/LeftPanel/LeftPanelVM.vb
@@ -39,6 +39,8 @@ Public Class LeftPanelVM
             Map.refRibPanelVM.Dispose()
          Case Panels.SHELLNUMBER
             Map.refShellNumberPanelVM.Dispose()
+         Case Panels.AUXSOLIDS
+            Map.refFilledSolidPanelVM.Dispose()
       End Select
       m_SelPanel = Panel
       Select Case Panel
@@ -54,8 +56,9 @@ Public Class LeftPanelVM
             Map.refRibPanelVM.Init()
          Case Panels.SHELLNUMBER
             Map.refShellNumberPanelVM.Init()
+         Case Panels.AUXSOLIDS
+            Map.refFilledSolidPanelVM.Init()
          Case Panels.MODIFYPART
-            ''Map.refModifyPartPanelVM.Init()
             Map.refManagePartPanelVM.Init(ManagePartPanelVM.ManagePartType.MODIFY)
       End Select
       If Not IsNothing(Map.refViewLayerManagerVM) Then Map.refViewLayerManagerVM.UpdateForced()
diff --git a/Icarus/ManagePartPanel/ManagePartPanelVM.vb b/Icarus/ManagePartPanel/ManagePartPanelVM.vb
index 7f83613..388f587 100644
--- a/Icarus/ManagePartPanel/ManagePartPanelVM.vb
+++ b/Icarus/ManagePartPanel/ManagePartPanelVM.vb
@@ -375,27 +375,33 @@ Public Class ManagePartPanelVM
                            nShellNumberLayerId = EgtCreateGroup(nPartId)
                            EgtSetName(nShellNumberLayerId, LAY_SHELL_NBR)
                            EgtSetColor(nShellNumberLayerId, GeomEntityColors.c3ShellNumber)
+                           Dim nShellNumberIndex As Integer = 1
                            For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
                               EgtSetInfo(PartManager_GeomEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
+                              EgtSetInfo(PartManager_GeomEntity.nId, SHELLNUMBER_ID, nShellNumberIndex)
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nShellNumberLayerId, GDB_POS.LAST_SON)
                               ' elimino colore entita'
                               EgtResetColor(PartManager_GeomEntity.nId)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
+                              nShellNumberIndex += 1
                            Next
                         Case ManagePart_Layer.LayerType.AUX_SOLIDS
                            nAuxSolidsLayerId = EgtCreateGroup(nPartId)
                            EgtSetName(nAuxSolidsLayerId, LAY_AUX_SOLIDS)
                            EgtSetColor(nAuxSolidsLayerId, GeomEntityColors.c3AuxSolids)
+                           Dim nFilledSolidIndex As Integer = 1
                            For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
                               EgtSetInfo(PartManager_GeomEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
+                              EgtSetInfo(PartManager_GeomEntity.nId, FILLEDSOLID_ID, nFilledSolidIndex)
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nAuxSolidsLayerId, GDB_POS.LAST_SON)
                               ' elimino colore entita'
                               EgtResetColor(PartManager_GeomEntity.nId)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
+                              nFilledSolidIndex += 1
                            Next
                         Case ManagePart_Layer.LayerType.OTHERS
                            nOthersLayerId = EgtCreateGroup(nPartId)
diff --git a/Icarus/ManagePartPanel/ManagePartUtility.vb b/Icarus/ManagePartPanel/ManagePartUtility.vb
index 267900f..cb96f95 100644
--- a/Icarus/ManagePartPanel/ManagePartUtility.vb
+++ b/Icarus/ManagePartPanel/ManagePartUtility.vb
@@ -512,11 +512,11 @@ Public Class ManagePart_Layer
             m_nLayerId = PrintPart.nAuxSolidsLayerId
             Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
             While nEntityId <> GDB_ID.NULL
-               'Dim ShellType As Integer = ShellNumberEntity.ShellNumberTypes.FROMDRAW
-               'EgtGetInfo(nEntityId, KEY_SHELLNBR_TYPE, ShellType)
-               'If ShellType = ShellNumberEntity.ShellNumberTypes.FROMIMPORT Then
-               m_EntityList.Add(New PartManager_GeomEntity(Me, nEntityId))
-               'End If
+               Dim FIlledSolidType As Integer = FilledSolidEntity.FilledSolidTypes.FROMDRAW
+               EgtGetInfo(nEntityId, KEY_AUXSOLID_TYPE, FIlledSolidType)
+               If FIlledSolidType = FilledSolidEntity.FilledSolidTypes.FROMIMPORT Then
+                  m_EntityList.Add(New PartManager_GeomEntity(Me, nEntityId))
+               End If
                nEntityId = EgtGetNext(nEntityId)
             End While
          Case LayerType.OTHERS
@@ -835,31 +835,27 @@ Public Class GeomEntity_MenuItem
                Select Case m_Type
                   Case ManagePart_Layer.LayerType.PRINT_SOLID
                      EgtSetName(m_OrigEntity.nId, PRINT_SOLID)
-                     EgtSetColor(m_OrigEntity.nId, c3Print)
                      ' rimuovo eventuale nota spostamento per 45 gradi
                      EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, KEY_MOVEDPART)
                      bIsMovedPartOrRib = True
                   Case ManagePart_Layer.LayerType.MACH_START
                      EgtSetName(m_OrigEntity.nId, LAY_MACH_START)
-                     EgtSetColor(m_OrigEntity.nId, c3MachStart)
                   Case ManagePart_Layer.LayerType.RIBS
                      EgtSetName(m_OrigEntity.nId, LAY_RIBS)
                      EgtSetInfo(m_OrigEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
                      EgtSetInfo(m_OrigEntity.nId, RIB_ID, RibPanelVM.GetNextRibIndex())
-                     EgtSetColor(m_OrigEntity.nId, c3Rib)
                      bIsMovedPartOrRib = True
                   Case ManagePart_Layer.LayerType.SHELL_NUMBER
                      EgtSetName(m_OrigEntity.nId, LAY_SHELL_NBR)
                      EgtSetInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
-                     EgtSetColor(m_OrigEntity.nId, c3ShellNumber)
                   Case ManagePart_Layer.LayerType.AUX_SOLIDS
                      EgtSetName(m_OrigEntity.nId, LAY_AUX_SOLIDS)
                      EgtSetInfo(m_OrigEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
-                     EgtSetColor(m_OrigEntity.nId, c3AuxSolids)
                   Case ManagePart_Layer.LayerType.OTHERS
                      EgtSetName(m_OrigEntity.nId, LAY_OTHERS)
-                     EgtSetColor(m_OrigEntity.nId, c3Others)
                End Select
+               ' resetto colore entita'
+               EgtResetColor(m_OrigEntity.nId)
                ' se spostato un Rib, aggiorno posizione riferimento e pezzo
                If bIsMovedPartOrRib Then
                   Map.refReferencePanelVM.UpdateFramePosition(NewPart.PrintPart)
diff --git a/Icarus/Project/ProjectV.xaml b/Icarus/Project/ProjectV.xaml
index 1a0fe9c..a0ab6d4 100644
--- a/Icarus/Project/ProjectV.xaml
+++ b/Icarus/Project/ProjectV.xaml
@@ -30,6 +30,9 @@
       <PrintApp:ControllerInputPanelV Grid.Row="1"
                                       Grid.ColumnSpan="2"
                                       DataContext="{StaticResource ControllerInputPanelVM}"/>
+      <PrintApp:MessagePanelV Grid.Row="1"
+                              Grid.ColumnSpan="2"
+                              DataContext="{StaticResource StatusBarVM}"/>
       <PrintApp:ShowPanelV Grid.Column="2"
                            Grid.Row="1"
                            DataContext="{StaticResource ShowPanelVM}"/>
diff --git a/Icarus/Resources/CurrMachining/SaveInDb.png b/Icarus/Resources/CurrMachining/SaveInDb.png
new file mode 100644
index 0000000000000000000000000000000000000000..22e70412043df6c0df02bbe2824e71c86e099a89
GIT binary patch
literal 580
zcmeAS@N?(olHy`uVBq!ia0vp^hCr;w!3-p$CN}c|sqg@w5Lchf!buZ)sg7)&y_Nv2
zkSPiB3uaiLAn@QrLW9GB2?ZAnHUvz0w6N~UxjAp%ef{_|ZSRg{Ky{o29+AZi4BSE>
z%y{W;-5&-9#%xa)#}Es_xl>=3wJ7kk9#%7Wk#qO<?|<iSPJVE#gD<!4#l;_qdgcs&
zjji^(xVxyWd|0qV_*&tmQy+8xwl4Ym=}kg%&(Exnxr|>NEEI~&POVn3^c8!h@1o$<
zkf)}jG_i28(Ai=o7n$d&-X%tVB+p&=a@q2c%a_fc<P^F$r~iD}pwUz$$oH)w;9j+M
zt5$=l18>ZIyTBI;L5mc<>N*VFe$MK)dn*vt_FhbU{u#ZGE*sm99)0e@p!Z4mu2+El
zt`)O7`6N32ym+Lh<#KI7cjJ74IFl7`l7tgw?D=jURZA+{n6I{}dwP+soX}#n?qXxX
zWnmZBy1YAb^eCHBdD7LRvP!!%8me186kFu9S|)_GyitGn?Q5jssZi_I!Va+?2TyNX
zWi@eoc=hdVr{?jMZRG#+>f+JZq_V<00#Y3}kES)nnw-q*_+(P>`iiQ*Tj7i|>gQhH
zc2}KUvHkY8^>eb`U)R1b7e3*g*4!I%E?>CU<XYOjbZg!Kj0*-&S3j3^P6<r_rTq-u

literal 0
HcmV?d00001

diff --git a/Icarus/Resources/ProjectManager/Import.png b/Icarus/Resources/ProjectManager/Import.png
index 5fb8d4b94e82b531543e891a9543a9ee78edc5c8..ba84af5a26371b590017679a15857f2dfe9936ad 100644
GIT binary patch
delta 249
zcmeBSp35{rGMt%#f#H+G1w$aE72p%%>XTVGX+keCXljap4p0|wNswPK!-0ke0v{$A
zI1~gZBplkH(>zg8yq=-K)5S5wqWA5TlUxTBcwB_PfBj#-J!I_*#lR)YFO}CFF%WJk
zH$0JiDtkudhwXei8#lP*T5<N3RPk-&-MXgr^0E0_rsPZu*|NAj&gALQlU-LfY%F(t
zuew`h=3D3OOv$<5GG-sW&oV>l>iWiIDQ;<3KU${mpY+aThlrfaF5cGy;tV?&F3c96
Uy3<bNAJCl)p00i_>zopr08ip?<p2Nx

delta 361
zcmV-v0ha!q0*nKY83+ad0070FAOn$b7k>dhNkl<ZScUDE(G7wy5Qcw^@4A6*AWop8
zxIk0W37CM`uz)MLfli=qpd07}m?kG_h~o7C<)Po3^nlN!y<P`JQJ`-OduIe-B)u`W
z*&4vQCS<3y+5J?CgqB}oL{h!{d{K%^l;RRxJad~R0A{qZ#x<c2TA^2^&ABrv5`Q{{
zyntAQh)FVa1uzY`<)*Zmg}g&Dr|PPB8}Z>%N}B_KBQyL+@!d)h+<zaOB}k=|Hf~<o
zFJYGAej`PswCvyUpm7mmDW%OFz~;m7hQ>uS?mTmwx%xBrE?ty1Nt0)`vCUMo^(lL7
z8cWfV-_y^%qy$uH(s}y0?3|^YW>%GWn&DD@KI#A_e{{LOIthPHZ5gMNE^+(m3b7py
zAWCtGQe2`G7hg)$y0%E!6#5lCrETUPTa6Pc4;lUI5&%2_N}O3DkCEfg00000NkvXX
Hu0mjfIa#KH

diff --git a/Icarus/Resources/TopPanel/MaterialDb.horizontal.png b/Icarus/Resources/TopPanel/MaterialDb.horizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..263a51f12fa45788c059d31934467a9bdb26da6a
GIT binary patch
literal 1053
zcmV+&1mgRNP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XT
z000XT0n*)m`~Uz0&q+i<R9J=Wm_3LbWf;eQcL^FlAZG|E6wC%wXm@Bpi!0VbNFi~%
zAf{MNuyT0UsjT$0(G-q54y4d%t`Wb$M6eK4TtBLS8f>(PvZt8(gcwppPX6*AeKYRt
z&S*}qxCf3~-ktY(e(&@3KC^S{>+5Vbncs9oTTm@zQ$lUuNaaPI4S_Cj4j3jOJ=bL4
zhIy*UvlRmkfHCk*k!Ood_HKx$3?zVV64EtbROFced-mFFs3OmneJUv$B_ZuKFswa&
zV9kaG{%Yj^B~S^upb$1W)O?X=1D~Lb|3ghS`q^c}$lx0_Kwkn!fL%VsOqqLm_@We(
zgml?T)Z%{yb^<>G7l3=cb{2TRN`H~DB%}(>gTR}>Co)_Cx(~P?*amzG+){pDCv`b>
z#-95S=vb+|8Gt99xbG_5MV={i&&yyL_9D;ZxerR9B&1(>T?c%t$g`)WRbpNBt$5S-
z`ja=3kPhromA0TS0yj8hUnL<u6aoD(0qDHEWSygFmDso?6nVA;#JBex@Pv{)32DCq
zv~vQ`t-xJAoD%<qI$Ld8!U5-1Y5ckxAmz^8Nl3pf@@y~go%ai9)oYIfmx?@FbMlX!
z9*WSob@Q~_6|#4dkajCTlFk&MC9hpbLb}`4d))fE4(mc&sBKm-$wQJmR9O*_jNfRW
z!@%cW+wbR<m-;;L0p+oN8z?2|O{&ZYXzvW5{eJGSTgH#k+A-i2;8YUQ73<J}JB^@<
zJnOg}9IXJA;b{W&dbD;Dc-3pi_&Y6B1f!;&64bankrl{8S0bRL89=3R0UZTis{oB0
z#xr$LS9M(VDP1MHRIT7M=hxE)`bWM@0eTEbYk>Yd^u(4>({0}aJ_3FNPWwJPSmfD7
z=SG|_3PV-{^l%c=x4qW&?J<b*s?|L86L8sgoAT-sa2s$!S4SmZUTOf;_g#1uP_3t?
z$Q55PlHZjV9(TqS<8i*|`9l+cP63Zrf&L9tEIZt1r1X6oy1iojtZ#xU(9qY=Xp-Xp
zG7bysycItJTn~I48P|PxPYqDF4v0EWd8(A#?^KvvAqRn*ot&M@7I|z{vzGTB@iX1%
zQjUS9j>OwNHCBf%RnIdTNq{{X`h6LH?c~HmUM!bAcb#<iSN~dV3sgcaIxqf`B%}+o
zHWqmnyT5$CZ?7GQrq7|*8v&J2+H|_evtC(64MpMU+Y3GSrDuVCl^2Fy8z9NNOMIWZ
z>Y78)M9M?R*kTgW=TwCrKl;&oUn?NVHUBBdg|O@c_Gi5${4Y?~LbiT&X)0S#jRg1u
Xx~vf*GW4ou00000NkvXXu0mjf5whk#

literal 0
HcmV?d00001

diff --git a/Icarus/Resources/TopPanel/MaterialDb.png b/Icarus/Resources/TopPanel/MaterialDb.png
index 263a51f12fa45788c059d31934467a9bdb26da6a..91c78d9a6059d50b8aabd1ad47c9b3459b9faf63 100644
GIT binary patch
literal 912
zcmeAS@N?(olHy`uVBq!ia0vp^YCx>Y!3-oN%d?Gu)Qte25Lchf!sg)!v~~DFUUe@C
z@(X78VBjFI;6lTJ2MGoL<O38oys!HfZu{rXggI|JJ|DTZEak<H-=B7U{o(WT;H1Bg
z*4wN|`~H0C%}rUq*339}=IomjuTSZHe0kSPLbU8F&`8b#kH}&M25un`X1sK_?hgY4
z6St>}V~B-d>y_(8s|^I$9>lYTM#XeIzIS=@<?8&Z|K?W8DM<(XHih%lY|hxKeXzYV
z#4nKh+$Em39a~a&uGxQPYtbs!;IoW36S^AR7oGG{R85w&NOm~3B8kDoI%RQd*b?WK
z3(Sj-yi!_Xli<yJ;SkeoZ>}C)qp}`N)&q<i)EWHVG<1AExA~1%@sbw%!`s$tT+sSD
zVP>KHgzhJq$7GnTK1Ls(mo!CUy_Lbw$8VBeh2F1aNsCUBPkw(~=!LlO1D$#4D%R(A
zbd;U4;;#9vWXXFuIDP4(+wu<jcFcaeSN?KYWRyPl=iWz$75QJKf8_o=^`JwTkB)6O
z3;!#-eV@BuEAITmcVb1-Eqlv@jDad1yOukCe5dQ+8I_*q+vs_bKkLaeMPqU1D>D>D
zZrphjaz2)Md$QcBTbr*0KDhO@rq(kw<I{q&H?db2eR{mVLhN6E%$4oo{_G6Jix*6C
zVyL|H{qhm%oJ9_uk9Tyx|K55nWUHBOXZMv$@27^#UT4hNz1(WiDXYA7YzGR?7=Hh+
zpPj$)!mp6!^{btvwKiPOZ#cq#>AJn1<Nq|~fa!8QOV5YR6I*Jc&An9q%)`hFmLH0q
zraR2IpZ7}oW%2f#-No4*VJl<SyI+<(u+`>R%9Q7A-lBoKe#o@#IQxg;ik@DQvvPEg
z)#U^q?X?VxXY;HqJ94?*AWu#C(w+%@ty6>E-DY`U|7*Wa;}MO8xxlo-;OXk;vd$@?
F2>?#<wPXMQ

literal 1053
zcmV+&1mgRNP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XT
z000XT0n*)m`~Uz0&q+i<R9J=Wm_3LbWf;eQcL^FlAZG|E6wC%wXm@Bpi!0VbNFi~%
zAf{MNuyT0UsjT$0(G-q54y4d%t`Wb$M6eK4TtBLS8f>(PvZt8(gcwppPX6*AeKYRt
z&S*}qxCf3~-ktY(e(&@3KC^S{>+5Vbncs9oTTm@zQ$lUuNaaPI4S_Cj4j3jOJ=bL4
zhIy*UvlRmkfHCk*k!Ood_HKx$3?zVV64EtbROFced-mFFs3OmneJUv$B_ZuKFswa&
zV9kaG{%Yj^B~S^upb$1W)O?X=1D~Lb|3ghS`q^c}$lx0_Kwkn!fL%VsOqqLm_@We(
zgml?T)Z%{yb^<>G7l3=cb{2TRN`H~DB%}(>gTR}>Co)_Cx(~P?*amzG+){pDCv`b>
z#-95S=vb+|8Gt99xbG_5MV={i&&yyL_9D;ZxerR9B&1(>T?c%t$g`)WRbpNBt$5S-
z`ja=3kPhromA0TS0yj8hUnL<u6aoD(0qDHEWSygFmDso?6nVA;#JBex@Pv{)32DCq
zv~vQ`t-xJAoD%<qI$Ld8!U5-1Y5ckxAmz^8Nl3pf@@y~go%ai9)oYIfmx?@FbMlX!
z9*WSob@Q~_6|#4dkajCTlFk&MC9hpbLb}`4d))fE4(mc&sBKm-$wQJmR9O*_jNfRW
z!@%cW+wbR<m-;;L0p+oN8z?2|O{&ZYXzvW5{eJGSTgH#k+A-i2;8YUQ73<J}JB^@<
zJnOg}9IXJA;b{W&dbD;Dc-3pi_&Y6B1f!;&64bankrl{8S0bRL89=3R0UZTis{oB0
z#xr$LS9M(VDP1MHRIT7M=hxE)`bWM@0eTEbYk>Yd^u(4>({0}aJ_3FNPWwJPSmfD7
z=SG|_3PV-{^l%c=x4qW&?J<b*s?|L86L8sgoAT-sa2s$!S4SmZUTOf;_g#1uP_3t?
z$Q55PlHZjV9(TqS<8i*|`9l+cP63Zrf&L9tEIZt1r1X6oy1iojtZ#xU(9qY=Xp-Xp
zG7bysycItJTn~I48P|PxPYqDF4v0EWd8(A#?^KvvAqRn*ot&M@7I|z{vzGTB@iX1%
zQjUS9j>OwNHCBf%RnIdTNq{{X`h6LH?c~HmUM!bAcb#<iSN~dV3sgcaIxqf`B%}+o
zHWqmnyT5$CZ?7GQrq7|*8v&J2+H|_evtC(64MpMU+Y3GSrDuVCl^2Fy8z9NNOMIWZ
z>Y78)M9M?R*kTgW=TwCrKl;&oUn?NVHUBBdg|O@c_Gi5${4Y?~LbiT&X)0S#jRg1u
Xx~vf*GW4ou00000NkvXXu0mjf5whk#

diff --git a/Icarus/Resources/TopPanel/Offset.png b/Icarus/Resources/TopPanel/Offset.png
index 508de539c4a4da7af6da537b6dbe73fcf1fd21cc..50d84211236998b201a27642600efc2fb9bcd138 100644
GIT binary patch
literal 455
zcmeAS@N?(olHy`uVBq!ia0vp^#z3sb!3-qhQi2VDlzo6th^tR#;iL(@WTWh@^Fo0}
ziIfES1v6YQNDx@?p~2xm!GwSZ3L7p*yiF;eJ8=t8p0mIsvY3H^TL^?1FWs&C!@$7E
z=jq}YV$u6{%Ed{|3OugNP6|r5-rf8E|C(%Bt~=+7+8cIX?L5=`iaeXX=$-xOuq{{V
zL4eNVH8WP7`@7GU_h7oivd7l_$+8<e6=f&aM~TT6H!cjyJ#we(9NWI`hy|I4f7*#O
zTu@@FT*9Z^@WSOxUxwrITE`{pgpCcRB<-BwyTVOKZt3!AZ`B^}YuF+6UL>ez|6MuR
z?zx&*d(6+-ZcZ<5{g{@mzA!WI{2Rep*Jkr3s=q&-xk<O>&MnK#{qtl@oUXhs3zRWF
zv)zer=BEiWzHXamkP_Mdp=aTW>;I=Hu0K|I?#TVxy55D$El*_V8!5d$a{9;({&%5n
xO?$)A{~BZ#P2U^Z$p1OtXI1@0BLTs`49_+Syi_Wgz62Ot44$rjF6*2Ung9+|%W41s

delta 913
zcmV;C18)4s1Dpqt8Gi-<003#aqXGZ`010qNS#tmY3labT3lag+-G2N400T}*L_t(o
z3Ef%kk()3O-OJqnI2D8rj#Lmzpo60U1|JQC6kr{g1}K3Nd>xPu+(F!dGwXXI0`sLs
z{PCM%%y^__pR`|EJzcL?dK7$l7$!vYykt;WD4&QTA_|D;Wq*6MTKplR6A@K$k~VXL
zC(R5baw6j28qX<C(u<8oWuc-tNh`}aJ1ky^hso@xNR5&y3$-VrcOv@Dglq{Ia(E%K
zI7vgveELs}_4!3aZ*h|5L*oX`tSnT8)%dYwduI^f5d#aEm4&)l1}{*Yq)}hqT>!w2
zFp<Ck5dx8~Wq+Yo5u#60jW#{#*+GYlHVKDB2)6#=NR~<H9s0KD?@SK=a7Bbao*`(Q
z9Lj98FPs0jWMBp!KJFUMh!})ePtP=8GXStdS%psxBaHeJW5#@@k%W7og5I~qGRcIJ
zs8be-SBS~fl3fK!j#L-H{JOL2oM(>t!8_)M3%}bu$AA2gAM=B6J8$S=IV?{w@51`?
zyY?9m+ikO=8Fs@-uz;Kza&6E+|5b(N&Siw6PeLb{tOz19uyf}T3g8ScO0a8oMpUb9
zDR+`gStt)-_YSU2Ok+&$lr9?2y$L&`Fw|$4x3W;qDuSgL$V;40Udux1Gfv$n-mjVi
zBj0?-e}DdfQ*PxieO*j=cz=ODJI+n!fDV~BN%a9t7o7oC;B1a_Q321PpFnlFg=*n!
z{69>lN35C3J#3QF1KSkXH%9cCwT3m(Y_twri9s?;ASH8#Z*2jVdzQ!*k<m6g7b<O`
z<@J4ZDKwdjV0$yvQceg#P7S#>@N}YWyEA2>_<!Y_jZ-7y?a|i~higQt$o7<r1^62$
z=@a#$*$3=(@c|7Vj<_#|j*i4USfOU9+p++m*<UcpRMOKX8hn%UB#poY=;&((0Jc|u
z!-OafxkG@Sy3=|?OGY=^nCS*lDnRqW2_fiLp;OxWcqcTY?Rl0qHYUJ}^y+YTZvNSC
z(|-<?Ga(L06&lqpN*0cEKi3``up>DZ<<1@Mk|vaIi@JW-P>6bMR}*@iG?Af2p1ab>
zkVk4%&-Liwd1XY=tSnS$Tx;Z0?WoynK;t?g(m4TsB`P@<!o%YuyH`uDRjlqb5se1z
nbpx<Tv6C-ew8y!iC8B>2)C3gH={+p~015yANkvXXu0mjfo^zj~

diff --git a/Icarus/Resources/TopPanel/StrandH.png b/Icarus/Resources/TopPanel/StrandH.png
index 15df1b69857d32f21cb5dfafc53398595c3f8ac7..b2a9d006ff5011f2acbe12f6a864956581c03466 100644
GIT binary patch
literal 344
zcmeAS@N?(olHy`uVBq!ia0vp^#z3sb!3-qhQi2VDlv#jJh^tR#;iL(@q@t>dS292o
z1WSVaf*CG+Fc4T!&~U)v!G?f@2@3BwyFQ2nN^%x>L>4nJa0`Jj<E6WGe}ICkJzX3_
zECkP9@#Z_Mz{3*YoO8(h<(>bVLd6|lYRQE<%{BFBONka+_Ic^9kIz=@;k1Zc<dAfh
zK`NW4W6eqivrAJ%x;C|Xr5)v8_GaCb*&8b=P6+1ClAF7K!N&MwcjiubW3<y|{yy7(
z|9h+V95*?6*UmE5&AE8%w`)!3v{%)-Ju<xd<#l9;*i4zYnRDN=HOzg>!ZPUu+nY5L
txyrYnmDnrf%C@)4)vxO4`i_o0jAlzY3yv_oECV{5!PC{xWt~$(697Pfkdy!b

delta 397
zcmV;80doG>0<Z&+83+ad003#aqXLnD7k>d_Nkl<ZScUDG(M`iJ5Qcvc?{tH*0c=3o
z05)I&%fS<L0;`q>X_<hGKsP8Gv=anfbXQp=iKr^2J}aM;7e|)v%h|bea?>;oO5wH`
zlT(=({Ok2Xxtya6i<BV)V8NGKPG#mX_y^T8G58sPM;=qV)Fd;hfZC-dGO0jOGJp3m
z_@^tya}gr*4&Vd87QhRDokp2sI}?Ma>@1CS>X%s&OftDrl+0b<4Q@QEal<*Am9cIk
zlR9NsWDVdz6EYQ{2fdELzll&^W-1n080)^rjq!iP;7Oq7SX-H)J+sTac>am6FEf-4
zOXe~7T=&h2JN+O7eKJb`)So>A_<9;IzO(t{SX(+}jCFgB-Sbp5b7hjrm7-+Y!&wZT
zDk*)Tne%D0%C+(jA(`280h)1bQF&|@nK~KUa-C5}m&`_^2t<bW#}ALy!&CAleVdWQ
r!C0qOChg7Sji#2OWTt<bSpwh}moHl5y@63J00000NkvXXu0mjfA=tFP

diff --git a/Icarus/Resources/TopPanel/StrandW.png b/Icarus/Resources/TopPanel/StrandW.png
index 5968c910940135b376ae225cd9f0256855a2dfcf..60e1153be7015c05e0375787a3a777be4296af75 100644
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^#z3sb!3-qhQi2VDlv#jJh^tR#;iL(@q@t>dS292o
z1WSVaf*BTUP!RZVq2Yi*!h?Vb4h8S0eE8`Ml;kY%h%9Dc;1&X5#!GkW{s0B%c)B=-
zSoFS~e3$Q#0Y|I%b*KO8@BeQ~I~Lfx?O|T#m))(x4;Y@EKfjryGbE>0sy$Mb(Qna8
z$CqxOgEZaOHivO-yj8MD)x>W#<Hd+s>0IZ!4`1A$SK;IMVq=D_wnMJ{Ya#XQUt-0a
zM%y>46)f2PT3=M&?eLGgp9H^`*?*5X_clSIs5<S+z2rO0pZA!b3$Sa;D*d!>O33w6
c-D5MXbuV$9RD9)l4d_k=Pgg&ebxsLQ0E~-^`2YX_

delta 387
zcmV-}0et?+0;U6y83+ad003#aqXLnD7k>d*Nkl<ZSPAWz;c3G#5Jtb2{;xM^H)uxi
z2F(WX0!G0TxC@914bXIhj^J$IZqRO!OyF>EDsrk&L8v&)JurkQ!uR+h-z7KGG+`;+
zF2+P<1fw!iQ5mVIj8s%cDk>wDMakTy-t^A)0P6DPWOD$}x27B84ZnWRcxPV$7=Hkt
z06qkYR9xQ?z^XOfS6E0T6GZCPbceEa=HZ>CMBV^2lu+1o>CB8$MVOJ3nUP9{QrUQC
z>GiH~kvUXc*F8)9kdkTmtZev_%1djy*_qZqG^C<3Qd#~ubB=d*#p6xQJ*dywcP-x8
zE#H%#T0`9Jvt_)qk5Tb!ex?V;)Nr1Ef_lm`UsTsONkwwA#y)#Aa{~0ihk^xP!ydpk
z44lb6<DFec$vmAczZaYgnndH?b2^mF5HI}MG`+JGf7OEAuHc#J`QAe$aB*hT2|y|;
hBNdgA%5r1?oB#(IYFTwe^nU;V002ovPDHLkV1jX#w;uoi

diff --git a/Icarus/RibPanel/RibPanelVM.vb b/Icarus/RibPanel/RibPanelVM.vb
index 5be6e39..22a65c4 100644
--- a/Icarus/RibPanel/RibPanelVM.vb
+++ b/Icarus/RibPanel/RibPanelVM.vb
@@ -555,10 +555,8 @@ Public Class RibPanelVM
             Dim nNewEntityId As Integer = EgtCreateSurfTmByRegionExtrusion(m_nRibLayerId, 1, {m_SelRib.nCurveId}, Vector3d.Z_AX * dExtrusionLength, EPS_STM)
             EgtSetName(nNewEntityId, RIB_EXTRUSION)
             EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
-            ' coloro l'entita' di viola
-            Dim c3LightBlue As Color3d
-            c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
-            EgtSetColor(nNewEntityId, c3LightBlue)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
             ' aggiorno riferimento nella curva
             m_SelRib.SetExtrusionId(nNewEntityId)
             ' seleziono nuova estrusione
@@ -580,6 +578,12 @@ Public Class RibPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
       End Select
+      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
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
@@ -597,10 +601,8 @@ Public Class RibPanelVM
             Dim dExtrusionLength As Double = 0
             StringToLen(Map.refControllerInputPanelVM.Text, dExtrusionLength)
             EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
-            ' coloro l'entita' di blu
-            Dim c3LightBlue As Color3d
-            c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
-            EgtSetColor(nNewEntityId, c3LightBlue)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
             '' lo sposto nel layer dei rib
             EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON)
             ' aggiungo riferimento a curva
@@ -623,10 +625,8 @@ Public Class RibPanelVM
          Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
          If NewGeomType = GDB_TY.CRV_COMPO Then
             EgtSetName(nNewEntityId, RIB_CURVE)
-            ' coloro l'entita' di blu
-            Dim c3LightBlue As Color3d
-            c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
-            EgtSetColor(nNewEntityId, c3LightBlue)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
             ' lo sposto nel layer dei rib
             EgtRelocateGlob(nNewEntityId, m_nRibLayerId, GDB_POS.LAST_SON)
             ' lo aggiungo alla lista
@@ -653,12 +653,6 @@ 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)
diff --git a/Icarus/RightPanel/RightPanelV.xaml b/Icarus/RightPanel/RightPanelV.xaml
index b453b10..0c11cf0 100644
--- a/Icarus/RightPanel/RightPanelV.xaml
+++ b/Icarus/RightPanel/RightPanelV.xaml
@@ -32,7 +32,7 @@
          <PrintApp:ShellNumberParamPanelV DataContext="{StaticResource ShellNumberParamPanelVM}"/>
       </TabItem>
       <TabItem Header="AUXSOLIDPARAM">
-         <Button/>
+         <PrintApp:FilledSolidParamPanelV DataContext="{StaticResource FilledSolidParamPanelVM}"/>
       </TabItem>
       <TabItem Header="TFSEDITOR">
          <PrintApp:TFSEditorV DataContext="{StaticResource TFSEditorVM}"/>
diff --git a/Icarus/RightPanel/RightPanelVM.vb b/Icarus/RightPanel/RightPanelVM.vb
index 3409383..55447cb 100644
--- a/Icarus/RightPanel/RightPanelVM.vb
+++ b/Icarus/RightPanel/RightPanelVM.vb
@@ -54,6 +54,8 @@ Public Class RightPanelVM
             Map.refRibParamPanelVM.Init()
          Case Panels.SHELLNUMBERPARAM
             Map.refShellNumberParamPanelVM.Init()
+         Case Panels.AUXSOLIDPARAM
+            Map.refFilledSolidParamPanelVM.Init()
          Case Panels.TFSEDITOR
             'Map.refTFSEditorVM.Refresh()
          Case Panels.SIMULATION
diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb
index 215ea67..32bb71f 100644
--- a/Icarus/SceneHost/MySceneHostVM.vb
+++ b/Icarus/SceneHost/MySceneHostVM.vb
@@ -536,6 +536,75 @@ Public Class MySceneHostVM
       End If
    End Sub
 
+   Public Sub InsertFilledSolid()
+      ' Recupero cartella dell'ultimo progetto aperto
+      Dim sDir As String = MainController.GetCurrFile()
+      If String.IsNullOrWhiteSpace(sDir) Then
+         GetMainPrivateProfileString(S_MRUIMPORTFILES, K_FILE & 1, "", sDir)
+      End If
+      If Not String.IsNullOrWhiteSpace(sDir) Then
+         sDir = Path.GetDirectoryName(sDir)
+      End If
+      If Not Directory.Exists(sDir) Then sDir = ""
+      Dim OpenFileDialog As New OpenFileDialog With {.Title = "Insert",
+                                                     .Filter = "Stereolithography (*.stl)|*.stl" &
+                                                               "|Iges files (*.igs;*.iges)|*.igs;*.iges" &
+                                                               "|Step files (*.stp;*.step)|*.stp;*.step" &
+                                                               "|3D Manufacturing format (*.3mf)|*.3mf" &
+                                                               "|New geometry EgalTech(*.nge)|*.nge" &
+                                                               "|All Files (*.*)|*.*",
+                                                     .FilterIndex = 1,
+                                                     .InitialDirectory = sDir}
+      If Not OpenFileDialog.ShowDialog Then
+         Return
+      End If
+      Dim sFile As String = String.Empty
+      sFile = OpenFileDialog.FileName
+      ' importo la nuova geometria
+      If MainController.InsertProject(sFile, False) Then
+         ' sposto le nuove geometrie nel layer ShellNumber del pezzo
+         Dim nNewPartId As Integer = EgtGetLastPart()
+         Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
+         Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewLayerId)
+         While nNewEntityId <> GDB_ID.NULL
+            Dim EntityType As GDB_TY = EgtGetType(nNewEntityId)
+            Select Case EntityType
+               Case GDB_TY.CRV_COMPO, GDB_TY.CRV_LINE, GDB_TY.CRV_ARC
+                  Dim nNewFilledSolidId As Integer = nNewEntityId
+                  If EntityType = GDB_TY.CRV_LINE OrElse EntityType = GDB_TY.CRV_ARC Then
+                     nNewFilledSolidId = EgtCreateCurveCompo(Map.refTopPanelVM.SelPart.nPartId, nNewEntityId, False)
+                  Else
+                     ' lo copio nel layer dei shellnumber
+                     nNewFilledSolidId = EgtCopy(nNewEntityId, Map.refFilledSolidPanelVM.nFilledSolidLayerId, GDB_POS.LAST_SON)
+                  End If
+                  EgtSetName(nNewFilledSolidId, RIB_CURVE)
+                  ' elimino colore entita'
+                  EgtResetColor(nNewEntityId)
+                  ' lo aggiungo alla lista
+                  Dim NewEntity As FilledSolidEntity = New FilledSolidEntity(FilledSolidEntity.FilledSolidTypes.FROMIMPORT, nNewFilledSolidId)
+                  Map.refFilledSolidPanelVM.FilledSolidList.Add(NewEntity)
+               Case GDB_TY.SRF_MESH, GDB_TY.SRF_FRGN, GDB_TY.SRF_BEZ
+                  Dim nNewFilledSolidId = nNewEntityId
+                  ' lo copio nel layer dei rib
+                  nNewFilledSolidId = EgtCopy(nNewEntityId, Map.refFilledSolidPanelVM.nFilledSolidLayerId, GDB_POS.LAST_SON)
+                  EgtSetName(nNewFilledSolidId, RIB_EXTRUSION)
+                  ' elimino colore entita'
+                  EgtResetColor(nNewEntityId)
+                  ' lo aggiungo alla lista
+                  Dim NewEntity As FilledSolidEntity = New FilledSolidEntity(FilledSolidEntity.FilledSolidTypes.FROMIMPORT, nNewFilledSolidId)
+                  Map.refFilledSolidPanelVM.FilledSolidList.Add(NewEntity)
+            End Select
+            nNewEntityId = EgtGetNext(nNewEntityId)
+         End While
+         EgtErase(nNewPartId)
+         ' seleziono ultima rib
+         Map.refFilledSolidPanelVM.SelLastFilledSolid()
+         EgtDraw()
+         ' Imposto flag di ricalcolo slice
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+      End If
+   End Sub
+
    Public Overrides Sub ImportProject()
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_MRUIMPORT, K_FILE & "1", "", sDir)
@@ -632,6 +701,8 @@ Public Class MySceneHostVM
                   Rib_OnMouseDownScene(sender, e)
                Case ModifyModes.SHELLNUMBER
                   ShellNumber_OnMouseDownScene(sender, e)
+               Case ModifyModes.AUXSOLIDS
+                  FilledSolid_OnMouseDownScene(sender, e)
             End Select
          ElseIf Map.refTopPanelVM.SelPage = Pages.IMPORT Then
             Import_OnMouseDownScene(sender, e)
@@ -678,6 +749,8 @@ Public Class MySceneHostVM
                   Rib_OnMouseMoveScene(sender, e)
                Case ModifyModes.SHELLNUMBER
                   ShellNumber_OnMouseMoveScene(sender, e)
+               Case ModifyModes.AUXSOLIDS
+                  FilledSolid_OnMouseMoveScene(sender, e)
             End Select
          ElseIf Map.refTopPanelVM.SelPage = Pages.IMPORT Then
             Import_OnMouseMoveScene(sender, e)
@@ -723,6 +796,8 @@ Public Class MySceneHostVM
                   Rib_OnMouseUpScene(sender, e)
                Case ModifyModes.SHELLNUMBER
                   ShellNumber_OnMouseUpScene(sender, e)
+               Case ModifyModes.AUXSOLIDS
+                  FilledSolid_OnMouseUpScene(sender, e)
             End Select
          ElseIf Map.refTopPanelVM.SelPage = Pages.IMPORT Then
             Import_OnMouseUpScene(sender, e)
@@ -767,6 +842,7 @@ Public Class MySceneHostVM
             Case ModifyModes.SHELLNUMBER
                bOk = Map.refShellNumberPanelVM.OnMouseSelectingObj(nId)
             Case ModifyModes.AUXSOLIDS
+               bOk = Map.refFilledSolidPanelVM.OnMouseSelectingObj(nId)
          End Select
       End If
    End Sub
@@ -871,6 +947,7 @@ Public Class MySceneHostVM
             Case ModifyModes.SHELLNUMBER
                Map.refShellNumberPanelVM.OnKeyDown(e.KeyData)
             Case ModifyModes.AUXSOLIDS
+               Map.refFilledSolidPanelVM.OnKeyDown(e.KeyData)
          End Select
       End If
       '' Se in modalità edit L250
@@ -1140,6 +1217,7 @@ Public Class MySceneHostVM
             Case ModifyModes.SHELLNUMBER
                Map.refShellNumberPanelVM.UpdateUI()
             Case ModifyModes.AUXSOLIDS
+               Map.refFilledSolidPanelVM.UpdateUI()
          End Select
       End If
       ' aggiorno titolo
@@ -1159,6 +1237,7 @@ Public Class MySceneHostVM
             Case ModifyModes.SHELLNUMBER
                Map.refShellNumberPanelVM.OnExecCmdEnd(command)
             Case ModifyModes.AUXSOLIDS
+               Map.refFilledSolidPanelVM.OnExecCmdEnd(command)
          End Select
       End If
    End Sub
@@ -1551,6 +1630,88 @@ Public Class MySceneHostVM
 
 #End Region       ' ShellNumber
 
+#Region "FilledSolid"
+
+   Friend Sub FilledSolid_OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
+      m_nIdToSel = GDB_ID.NULL
+      ' 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
+         ' Se per Griglia da faccia di oggetto
+         If Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then
+            If EgtGetType(nId) = GDB_TY.SRF_MESH Then
+               m_nIdToSel = nId
+               Exit While
+            End If
+         Else
+            Dim nFilledSolidLayerId As Integer = EgtGetParent(nId)
+            If nFilledSolidLayerId = Map.refFilledSolidPanelVM.nFilledSolidLayerId Then
+               m_nIdToSel = nId
+               Exit While
+            End If
+         End If
+         nId = EgtGetNextObjInSelWin()
+      End While
+      If Map.refFilledSolidPanelVM.bCPlaneObj_IsActive And m_nIdToSel <> GDB_ID.NULL Then
+         ' recupero dati punto di selezione
+         Dim PtTemp As Point3d
+         Dim nAux As Integer
+         If EgtGetPointFromSelect(m_nIdToSel, e.Location, PtTemp, nAux) Then
+            ' eseguo la selezione
+            EgtSelectObj(m_nIdToSel)
+            ' dati ausiliari
+            EgtSetSelInfo(m_nIdToSel, nAux, PtTemp)
+         End If
+      End If
+      ' Dati per drag
+      m_bDragToStart = True
+   End Sub
+
+   Friend Sub FilledSolid_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 FilledSolid_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
+         If Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then
+            ' eseguo comando
+            Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
+            Map.refFilledSolidPanelVM.ResetCPlaneObjIsActive()
+            ' ripristino selezioni precedenti
+            For Each Id In Map.refFilledSolidPanelVM.PrevSelObjs
+               EgtSelectObj(Id)
+            Next
+            Map.refControllerInputPanelVM.ResetInputBox()
+         Else
+            ' eseguo la selezione
+            Map.refFilledSolidPanelVM.SelStartFromId(m_nIdToSel)
+         End If
+      End If
+      ' Reset
+      m_bDrag = False
+      m_nIdToSel = GDB_ID.NULL
+      m_nIdToDesel = GDB_ID.NULL
+      EgtDraw()
+   End Sub
+
+#End Region       ' FilledSolid
+
 #End Region    ' VIEW EVENTS
 
 End Class
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
index f9caf2f..97ba11d 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
@@ -535,10 +535,8 @@ Public Class ShellNumberPanelVM
             Dim nNewEntityId As Integer = EgtCreateSurfTmByRegionExtrusion(m_nShellNumberLayerId, 1, {m_SelShellNumber.nCurveId}, Vector3d.Z_AX * dExtrusionLength, EPS_STM)
             EgtSetName(nNewEntityId, RIB_EXTRUSION)
             EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
-            ' coloro l'entita' di verde
-            Dim c3LightBlue As Color3d
-            c3LightBlue.FromColor(System.Drawing.Color.Lime)
-            EgtSetColor(nNewEntityId, c3LightBlue)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
             ' aggiorno riferimento nella curva
             m_SelShellNumber.SetExtrusionId(nNewEntityId)
             ' seleziono nuova estrusione
@@ -560,6 +558,12 @@ Public Class ShellNumberPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
       End Select
+      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
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
@@ -577,10 +581,8 @@ Public Class ShellNumberPanelVM
             Dim dExtrusionLength As Double = 0
             StringToLen(Map.refControllerInputPanelVM.Text, dExtrusionLength)
             EgtSetInfo(nNewEntityId, KEY_EXTRUSION_LENGTH, dExtrusionLength)
-            ' coloro l'entita' di verde
-            Dim c3LightBlue As Color3d
-            c3LightBlue.FromColor(System.Drawing.Color.Lime)
-            EgtSetColor(nNewEntityId, c3LightBlue)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
             '' lo sposto nel layer dei rib
             EgtRelocateGlob(nNewEntityId, m_nShellNumberLayerId, GDB_POS.LAST_SON)
             ' aggiungo riferimento a curva
@@ -606,10 +608,8 @@ Public Class ShellNumberPanelVM
                EgtCloseCurveCompo(nNewEntityId)
             End If
             EgtSetName(nNewEntityId, RIB_CURVE)
-            ' coloro l'entita' di verde
-            Dim c3LightBlue As Color3d
-            c3LightBlue.FromColor(System.Drawing.Color.Lime)
-            EgtSetColor(nNewEntityId, c3LightBlue)
+            ' resetto colore entita'
+            EgtResetColor(nNewEntityId)
             ' lo sposto nel layer dei rib
             EgtRelocateGlob(nNewEntityId, m_nShellNumberLayerId, GDB_POS.LAST_SON)
             ' lo aggiungo alla lista
@@ -636,12 +636,6 @@ Public Class ShellNumberPanelVM
          ' 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)
@@ -679,6 +673,20 @@ Public Class ShellNumberPanelVM
       NotifyPropertyChanged(NameOf(SelShellNumber))
    End Sub
 
+   Friend Shared Function GetNextShellNumberIndex()
+      Dim nShellNumberIndex As Integer = 0
+      Dim nShellNumberId As Integer = EgtGetFirstInGroup(Map.refTopPanelVM.SelPart.nShellNumberLayerId)
+      While nShellNumberId <> GDB_ID.NULL
+         Dim nCurrIndex As Integer = GDB_ID.NULL
+         EgtGetInfo(nShellNumberId, SHELLNUMBER_ID, nCurrIndex)
+         If nCurrIndex > nShellNumberIndex Then
+            nShellNumberIndex = nCurrIndex
+         End If
+         nShellNumberId = EgtGetNext(nShellNumberId)
+      End While
+      Return nShellNumberIndex + 1
+   End Function
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -1338,7 +1346,10 @@ Public Class ShellNumberEntity
    End Property
 
    Sub New(Type As ShellNumberTypes, nId As Integer)
-      m_nIndex = nSharedIndex
+      If Not EgtGetInfo(nId, SHELLNUMBER_ID, m_nIndex) Then
+         m_nIndex = ShellNumberPanelVM.GetNextShellNumberIndex()
+         EgtSetInfo(nId, SHELLNUMBER_ID, m_nIndex)
+      End If
       m_Type = Type
       EgtSetInfo(nId, KEY_SHELLNBR_TYPE, Type)
       Select Case Type
diff --git a/Icarus/StatusBar/MessagePanelV.xaml b/Icarus/StatusBar/MessagePanelV.xaml
new file mode 100644
index 0000000..3f73472
--- /dev/null
+++ b/Icarus/StatusBar/MessagePanelV.xaml
@@ -0,0 +1,19 @@
+<Border x:Class="MessagePanelV"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:Icarus"
+        Height="18"
+        HorizontalAlignment="Left"
+        Margin="45,0,0,0"
+        Padding="0"
+        Visibility="{Binding OutputMessage, Converter={StaticResource StringToVisibilityConverter}}"
+        Style="{StaticResource ViewLayerManager_Border}">
+   <Border.InputBindings>
+      <MouseBinding MouseAction="LeftClick"
+                     Command="{Binding ClearOutputMessage_Command}"/>
+   </Border.InputBindings>
+   <!--Stringa di output messaggi-->
+   <TextBlock Text="{Binding OutputMessage}"
+              Margin="5,0,5,0"
+              Style="{StaticResource ControllerInput_TextBlock}"/>
+</Border>
diff --git a/Icarus/StatusBar/MessagePanelV.xaml.vb b/Icarus/StatusBar/MessagePanelV.xaml.vb
new file mode 100644
index 0000000..6cfd9d2
--- /dev/null
+++ b/Icarus/StatusBar/MessagePanelV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class MessagePanelV
+
+End Class
diff --git a/Icarus/StatusBar/MyStatusBarVM.vb b/Icarus/StatusBar/MyStatusBarVM.vb
index b88ad8d..b5d9bd8 100644
--- a/Icarus/StatusBar/MyStatusBarVM.vb
+++ b/Icarus/StatusBar/MyStatusBarVM.vb
@@ -1,4 +1,5 @@
-Imports System.Runtime.InteropServices
+Imports System.Globalization
+Imports System.Runtime.InteropServices
 Imports System.Threading
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -224,3 +225,20 @@ Public Class MyStatusBarVM
 #End Region    ' COMMANDS
 
 End Class
+
+Public Class StringToVisibilityConverter
+   Implements IValueConverter
+
+   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
+      If TypeOf value Is String Then
+         Dim sValue As String = CStr(value)
+         Return If(String.IsNullOrWhiteSpace(sValue), Visibility.Collapsed, Visibility.Visible)
+      End If
+      Return Visibility.Collapsed
+   End Function
+
+   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New NotImplementedException()
+   End Function
+
+End Class
\ No newline at end of file
diff --git a/Icarus/TopPanel/TopPanelV.xaml b/Icarus/TopPanel/TopPanelV.xaml
index ea28475..881c61d 100644
--- a/Icarus/TopPanel/TopPanelV.xaml
+++ b/Icarus/TopPanel/TopPanelV.xaml
@@ -126,10 +126,8 @@
                       Style="{StaticResource TopPanel_ComboBox}" Grid.RowSpan="2"/>
             <Button Grid.Column="1"
                     Command="{Binding MaterialDb_Command}"
-                    Width="35"
-                    Height="35"
                     Margin="-2"
-                    Style="{StaticResource TopPanel_Button}" Grid.ColumnSpan="2" Grid.RowSpan="2">
+                    Style="{StaticResource TopPanel_Button}">
                <Image Source="/Resources/TopPanel/MaterialDb.png" Stretch="Uniform"/>
             </Button>
          </Grid>
@@ -176,76 +174,52 @@
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1.5*"/>
                <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1.5*"/>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1.5*"/>
             </Grid.ColumnDefinitions>
             <Image Source="/Resources/TopPanel/SlicingDirection.png"
                    ToolTip="Slicing direction"
                    Style="{StaticResource Button_Image}"/>
-            <!--<TextBlock Text="Slicing direction:"
-                       VerticalAlignment="Bottom"
-                       Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
             <TextBlock Grid.Column="1"
                        Text="{Binding CurrMachining.sCurrSlicingType}"
                        HorizontalAlignment="Left"
-                       VerticalAlignment="Bottom"
                        Margin="5,0,5,0"
                        Style="{StaticResource TopPanelData_TextBlock}"/>
             <Image Grid.Column="2"
                    Source="/Resources/TopPanel/StrandH.png"
                    ToolTip="Strand Height"
                    Style="{StaticResource Button_Image}"/>
-            <!--<TextBlock Grid.Column="2"
-                       Text="StrandH:"
-                       VerticalAlignment="Bottom"
-                       Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
             <TextBlock Grid.Column="3"
                        Text="{Binding CurrMachining.sCurrStrandH}"
                        HorizontalAlignment="Left"
-                       VerticalAlignment="Bottom"
                        Margin="5,0,5,0"
                        Style="{StaticResource TopPanelData_TextBlock}"/>
             <Image Grid.Column="4"
                    Source="/Resources/TopPanel/StrandW.png"
                    ToolTip="Strand Width"
                    Style="{StaticResource Button_Image}"/>
-            <!--<TextBlock Grid.Column="4"
-                       Text="StrandW:"
-                       VerticalAlignment="Bottom"
-                       Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
             <TextBlock Grid.Column="5"
                        Text="{Binding CurrMachining.sCurrStrandW}"
                        HorizontalAlignment="Left"
-                       VerticalAlignment="Bottom"
                        Margin="5,0,5,0"
                        Style="{StaticResource TopPanelData_TextBlock}"/>
             <Image Grid.Column="6"
                    Source="/Resources/TopPanel/StrandCount.png"
                    ToolTip="Strand Count"
                    Style="{StaticResource Button_Image}"/>
-            <!--<TextBlock Grid.Column="6"
-                       Text="StrandCount:"
-                       VerticalAlignment="Bottom"
-                       Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
             <TextBlock Grid.Column="7"
                        Text="{Binding CurrMachining.sCurrStrandCount}"
                        HorizontalAlignment="Left"
-                       VerticalAlignment="Bottom"
                        Margin="5,0,5,0"
                        Style="{StaticResource TopPanelData_TextBlock}"/>
             <Image Grid.Column="8"
                    Source="/Resources/TopPanel/Offset.png"
                    ToolTip="Offset"
                    Style="{StaticResource Button_Image}"/>
-            <!--<TextBlock Grid.Column="8"
-                       Text="Offset:"
-                       VerticalAlignment="Bottom"
-                       Style="{StaticResource TopPanelFixed_TextBlock}"/>-->
             <TextBlock Grid.Column="9"
                        Text="{Binding CurrMachining.sCurrOffset}"
                        HorizontalAlignment="Left"
-                       VerticalAlignment="Bottom"
                        Margin="5,0,5,0"
                        Style="{StaticResource TopPanelData_TextBlock}"/>
          </Grid>
diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml
index f86dd7f..55518c5 100644
--- a/Icarus/Utility/Dictionary.xaml
+++ b/Icarus/Utility/Dictionary.xaml
@@ -43,6 +43,8 @@
    <PrintApp:RibParamPanelVM x:Key="RibParamPanelVM"/>
    <PrintApp:ShellNumberPanelVM x:Key="ShellNumberPanelVM"/>
    <PrintApp:ShellNumberParamPanelVM x:Key="ShellNumberParamPanelVM"/>
+   <PrintApp:FilledSolidPanelVM x:Key="FilledSolidPanelVM"/>
+   <PrintApp:FilledSolidParamPanelVM x:Key="FilledSolidParamPanelVM"/>
    <PrintApp:SimulationPanelVM x:Key="SimulationPanelVM"/>
    <PrintApp:ReferencePanelVM x:Key="ReferencePanelVM"/>
    <PrintApp:ViewLayerManagerVM x:Key="ViewLayerManagerVM"/>
@@ -117,6 +119,9 @@
    <!--o viene eseguito un lua che non aggiorna l'interfaccia-->
    <PopupAnimation x:Key="{x:Static SystemParameters.MenuPopupAnimationKey}">None</PopupAnimation>
 
+   <!--convertert per visibilita' stringa di testo con misure in StatusBar-->
+   <PrintApp:StringToVisibilityConverter x:Key="StringToVisibilityConverter"/>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- FocusVisual standard-->
diff --git a/Icarus/Utility/Map.vb b/Icarus/Utility/Map.vb
index 7698fe0..837d91b 100644
--- a/Icarus/Utility/Map.vb
+++ b/Icarus/Utility/Map.vb
@@ -5,49 +5,18 @@ Module Map
    Private m_refMainWindowVM As MainWindowVM
    Private m_refMyStatusBarVM As MyStatusBarVM
    Private m_refProjManagerVM As ProjManagerVM
-   'Private m_refProdManagerVM As ProdManagerVM
    Private m_refProjectVM As ProjectVM
    Private m_refSecondaryWindowVM As SecondaryWindowVM
    Private m_refSecondaryWindowV As SecondaryWindowV
-   'Private m_refMainMenuVM As MainMenuVM
    Private m_refMachinePanelVM As MachinePanelVM
-   ''Private m_refMyMachGroupPanelVM As MyMachGroupPanelVM
    Private m_refLeftPanelVM As LeftPanelVM
    Private m_refRightPanelVM As RightPanelVM
    Private m_refDispositionPanelVM As DispositionPanelVM
    Private m_refStartMachPanelVM As StartMachPanelVM
    Private m_refRibPanelVM As RibPanelVM
    Private m_refControllerInputPanelVM As ControllerInputPanelVM
-   'Private m_refBottomPanelVM As BottomPanelVM
-   'Private m_refShowBeamPanelVM As ShowBeamPanelVM
-   'Private m_refConfigurationPageVM As ConfigurationPageVM
-   'Private m_refRawPartListVM As RawPartListVM
-   'Private m_refPartInRawPartListVM As PartInRawPartListVM
-   'Private m_refWarehouseWndVM As WarehouseWndVM
-   'Private m_refFeatureListVM As FeatureListVM
-   'Private m_refFreeContourManagerVM As FreeContourManagerVM
-   'Private m_refFreeContourInputVM As FreeContourInputVM
-   'Private m_refPartManagerVM As PartManagerVM
    Private m_refInstrumentPanelVM As InstrumentPanelVM
    Private m_refTopPanelVM As TopPanelVM
-   'Private m_refOptimizePanelVM As OptimizePanelVM
-   'Private m_refCALCPanelVM As CALCPanelVM
-   'Private m_refPartListVM As BTLPartListVM
-   'Private m_refFeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM
-   'Private m_refStatisticsVM As StatisticsVM
-   'Private m_refPParameterListVM As PParameterListVM
-   'Private m_refQParameterListVM As QParameterListVM
-   'Private m_refFeatureManagerVM As FeatureManagerVM
-   'Private m_refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM
-   'Private m_refStatisticsTimePanelVM As StatisticsTimePanelVM
-   'Private m_refOpenProjectFileDialogVM As OpenProjectFileDialogVM
-   'Private m_refRawPartTabVM As RawPartTabVM
-   'Private m_refNestingTabVM As NestingTabVM
-   'Private m_refMachiningTabVM As MachiningTabVM
-   'Private m_refSplitModeVM As SplitModeVM
-   'Private m_refMoveRawModeVM As MoveRawModeVM
-   'Private m_refSimulTabVM As SimulTabVM
-   ''Private m_refImportPanelVM As ImportPanelVM
    Private m_refSliceManagerVM As SliceManagerVM
    Private m_refTFSEditorVM As TFSEditorVM
    Private m_refCurrMachiningPanelVM As CurrMachiningPanelVM
@@ -60,8 +29,9 @@ Module Map
    Private m_refViewLayerManagerVM As ViewLayerManagerVM
    Private m_refShellNumberPanelVM As ShellNumberPanelVM
    Private m_refShellNumberParamPanelVM As ShellNumberParamPanelVM
+   Private m_refFilledSolidPanelVM As FilledSolidPanelVM
+   Private m_refFilledSolidParamPanelVM As FilledSolidParamPanelVM
    Private m_refSplashScreen As SplashScreen
-   ''Private m_refModifyPartPanelVM As ModifyPartPanelVM
    Private m_refManagePartPanelVM As ManagePartPanelVM
 
 #Region "Get"
@@ -113,12 +83,6 @@ Module Map
       End Get
    End Property
 
-   'Public ReadOnly Property refMainMenuVM As MainMenuVM
-   '   Get
-   '      Return m_refMainMenuVM
-   '   End Get
-   'End Property
-
    Public ReadOnly Property refMachinePanelVM As MachinePanelVM
       Get
          Return m_refMachinePanelVM
@@ -161,72 +125,6 @@ Module Map
       End Get
    End Property
 
-   'Public ReadOnly Property refMachGroupPanelVM As MyMachGroupPanelVM
-   '   Get
-   '      Return CoreMap.refMachGroupPanelVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refBottomPanelVM As BottomPanelVM
-   '   Get
-   '      Return m_refBottomPanelVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refShowBeamPanelVM As ShowBeamPanelVM
-   '   Get
-   '      Return m_refShowBeamPanelVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refConfigurationPageVM As ConfigurationPageVM
-   '   Get
-   '      Return m_refConfigurationPageVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refRawPartListVM As RawPartListVM
-   '   Get
-   '      Return m_refRawPartListVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refPartInRawPartListVM As PartInRawPartListVM
-   '   Get
-   '      Return m_refPartInRawPartListVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refWarehouseWndVM As WarehouseWndVM
-   '   Get
-   '      Return m_refWarehouseWndVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refFeatureListVM As FeatureListVM
-   '   Get
-   '      Return m_refFeatureListVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refFreeContourManagerVM As FreeContourManagerVM
-   '   Get
-   '      Return m_refFreeContourManagerVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refFreeContourInputVM As FreeContourInputVM
-   '   Get
-   '      Return m_refFreeContourInputVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refPartManagerVM As PartManagerVM
-   '   Get
-   '      Return m_refPartManagerVM
-   '   End Get
-   'End Property
-
    Public ReadOnly Property refInstrumentPanelVM As MyInstrumentPanelVM
       Get
          Return m_refInstrumentPanelVM
@@ -239,120 +137,6 @@ Module Map
       End Get
    End Property
 
-   'Public ReadOnly Property refOptimizePanelVM As OptimizePanelVM
-   '   Get
-   '      Return m_refOptimizePanelVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refCALCPanelVM As CALCPanelVM
-   '   Get
-   '      Return m_refCALCPanelVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refPartListVM As BTLPartListVM
-   '   Get
-   '      Return m_refPartListVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refFeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM
-   '   Get
-   '      Return m_refFeatureInPartInRawPartListVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refStatisticsVM As StatisticsVM
-   '   Get
-   '      Return m_refStatisticsVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refPParameterListVM As PParameterListVM
-   '   Get
-   '      Return m_refPParameterListVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refQParameterListVM As QParameterListVM
-   '   Get
-   '      Return m_refQParameterListVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refFeatureManagerVM As FeatureManagerVM
-   '   Get
-   '      Return m_refFeatureManagerVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM
-   '   Get
-   '      Return m_refAddSectionXMaterialWndVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refStatisticsTimePanelVM As StatisticsTimePanelVM
-   '   Get
-   '      Return m_refStatisticsTimePanelVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refOpenProjectFileDialogVM As OpenProjectFileDialogVM
-   '   Get
-   '      Return m_refOpenProjectFileDialogVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refOptionPanelVM As OptionPanelVM
-   '   Get
-   '      Return m_refOptionPanelVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refRawPartTabVM As RawPartTabVM
-   '   Get
-   '      Return m_refRawPartTabVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refNestingTabVM As NestingTabVM
-   '   Get
-   '      Return m_refNestingTabVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refMachiningTabVM As MachiningTabVM
-   '   Get
-   '      Return m_refMachiningTabVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refSplitModeVM As SplitModeVM
-   '   Get
-   '      Return m_refSplitModeVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refMoveRawModeVM As MoveRawModeVM
-   '   Get
-   '      Return m_refMoveRawModeVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refSimulTabVM As SimulTabVM
-   '   Get
-   '      Return m_refSimulTabVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refImportPanelVM As ImportPanelVM
-   '   Get
-   '      Return m_refImportPanelVM
-   '   End Get
-   'End Property
-
    Public ReadOnly Property refSliceManagerVM As SliceManagerVM
       Get
          Return m_refSliceManagerVM
@@ -425,18 +209,24 @@ Module Map
       End Get
    End Property
 
+   Public ReadOnly Property refFilledSolidPanelVM As FilledSolidPanelVM
+      Get
+         Return m_refFilledSolidPanelVM
+      End Get
+   End Property
+
+   Public ReadOnly Property refFilledSolidParamPanelVM As FilledSolidParamPanelVM
+      Get
+         Return m_refFilledSolidParamPanelVM
+      End Get
+   End Property
+
    Public ReadOnly Property refSplashScreen As SplashScreen
       Get
          Return m_refSplashScreen
       End Get
    End Property
 
-   ''Public ReadOnly Property refModifyPartPanelVM As ModifyPartPanelVM
-   ''   Get
-   ''      Return m_refModifyPartPanelVM
-   ''   End Get
-   ''End Property
-
    Public ReadOnly Property refManagePartPanelVM As ManagePartPanelVM
       Get
          Return m_refManagePartPanelVM
@@ -457,21 +247,11 @@ Module Map
       Return Not IsNothing(m_refProjManagerVM)
    End Function
 
-   'Friend Function SetRefProdManagerVM(ProdManagerVM As ProdManagerVM) As Boolean
-   '   m_refProdManagerVM = ProdManagerVM
-   '   Return Not IsNothing(m_refProdManagerVM)
-   'End Function
-
    Friend Function SetRefProjectVM(ProjectVM As ProjectVM) As Boolean
       m_refProjectVM = ProjectVM
       Return Not IsNothing(m_refProjectVM)
    End Function
 
-   'Friend Function SetRefMainMenuVM(MainMenuVM As MainMenuVM) As Boolean
-   '   m_refMainMenuVM = MainMenuVM
-   '   Return Not IsNothing(m_refMainMenuVM)
-   'End Function
-
    Friend Function SetRefSceneHostVM(SceneHostVM As SceneHostVM) As Boolean
       LibMap.SetRefSceneHostVM(SceneHostVM)
       Return Not IsNothing(LibMap.refSceneHostVM)
@@ -486,11 +266,6 @@ Module Map
       Return Not IsNothing(m_refSecondaryWindowV)
    End Function
 
-   'Friend Function SetRefShowPanelVM(ShowPanelVM As ShowPanelVM) As Boolean
-   '   LibMap.SetRefShowPanelVM(ShowPanelVM)
-   '   Return Not IsNothing(LibMap.refShowPanelVM)
-   'End Function
-
    Friend Function SetRefMachinePanelVM(MachinePanelVM As MachinePanelVM) As Boolean
       m_refMachinePanelVM = MachinePanelVM
       Return Not IsNothing(m_refMachinePanelVM)
@@ -526,61 +301,6 @@ Module Map
       Return Not IsNothing(m_refControllerInputPanelVM)
    End Function
 
-   'Friend Function SetRefMachGroupPanelVM(MachGroupPanelVM As MyMachGroupPanelVM) As Boolean
-   '   CoreMap.SetRefMachGroupPanelVM(MachGroupPanelVM)
-   '   Return Not IsNothing(CoreMap.refMachGroupPanelVM)
-   'End Function
-
-   'Friend Function SetRefBottomPanelVM(BottomPanelVM As BottomPanelVM) As Boolean
-   '   m_refBottomPanelVM = BottomPanelVM
-   '   Return Not IsNothing(m_refBottomPanelVM)
-   'End Function
-
-   'Friend Function SetRefShowBeamPanelVM(ShowBeamPanelVM As ShowBeamPanelVM) As Boolean
-   '   m_refShowBeamPanelVM = ShowBeamPanelVM
-   '   Return Not IsNothing(m_refShowBeamPanelVM)
-   'End Function
-
-   'Friend Function SetRefConfigurationPageVM(ConfigurationPageVM As ConfigurationPageVM) As Boolean
-   '   m_refConfigurationPageVM = ConfigurationPageVM
-   '   Return Not IsNothing(m_refConfigurationPageVM)
-   'End Function
-
-   'Friend Function SetRefRawPartListVM(RawPartListVM As RawPartListVM) As Boolean
-   '   m_refRawPartListVM = RawPartListVM
-   '   Return Not IsNothing(m_refRawPartListVM)
-   'End Function
-
-   'Friend Function SetRefPartInRawPartListVM(PartInRawPartListVM As PartInRawPartListVM) As Boolean
-   '   m_refPartInRawPartListVM = PartInRawPartListVM
-   '   Return Not IsNothing(m_refPartInRawPartListVM)
-   'End Function
-
-   'Friend Function SetRefWarehouseWndVM(WarehouseWndVM As WarehouseWndVM) As Boolean
-   '   m_refWarehouseWndVM = WarehouseWndVM
-   '   Return Not IsNothing(m_refWarehouseWndVM)
-   'End Function
-
-   'Friend Function SetRefFeatureListVM(FeatureListVM As FeatureListVM) As Boolean
-   '   m_refFeatureListVM = FeatureListVM
-   '   Return Not IsNothing(m_refFeatureListVM)
-   'End Function
-
-   'Friend Function SetRefFreeContourManagerVM(FreeContourManagerVM As FreeContourManagerVM) As Boolean
-   '   m_refFreeContourManagerVM = FreeContourManagerVM
-   '   Return Not IsNothing(m_refFreeContourManagerVM)
-   'End Function
-
-   'Friend Function SetRefFreeContourInputVM(FreeContourInputVM As FreeContourInputVM) As Boolean
-   '   m_refFreeContourInputVM = FreeContourInputVM
-   '   Return Not IsNothing(m_refFreeContourInputVM)
-   'End Function
-
-   'Friend Function SetRefPartManagerVM(PartManagerVM As PartManagerVM) As Boolean
-   '   m_refPartManagerVM = PartManagerVM
-   '   Return Not IsNothing(m_refPartManagerVM)
-   'End Function
-
    Friend Function SetRefInstrumentPanelVM(InstrumentPanelVM As InstrumentPanelVM) As Boolean
       m_refInstrumentPanelVM = InstrumentPanelVM
       Return Not IsNothing(m_refInstrumentPanelVM)
@@ -591,101 +311,6 @@ Module Map
       Return Not IsNothing(m_refTopPanelVM)
    End Function
 
-   'Friend Function SetRefOptimizePanelVM(OptimizePanelVM As OptimizePanelVM) As Boolean
-   '   m_refOptimizePanelVM = OptimizePanelVM
-   '   Return Not IsNothing(m_refOptimizePanelVM)
-   'End Function
-
-   'Friend Function SetRefCALCPanelVM(CALCPanelVM As CALCPanelVM) As Boolean
-   '   m_refCALCPanelVM = CALCPanelVM
-   '   Return Not IsNothing(m_refCALCPanelVM)
-   'End Function
-
-   'Friend Function SetRefPartListVM(PartListVM As BTLPartListVM) As Boolean
-   '   m_refPartListVM = PartListVM
-   '   Return Not IsNothing(m_refPartListVM)
-   'End Function
-
-   'Friend Function SetRefFeatureInPartInRawPartListVM(FeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM) As Boolean
-   '   m_refFeatureInPartInRawPartListVM = FeatureInPartInRawPartListVM
-   '   Return Not IsNothing(m_refFeatureInPartInRawPartListVM)
-   'End Function
-
-   'Friend Function SetRefStatisticsVM(StatisticsVM As StatisticsVM) As Boolean
-   '   m_refStatisticsVM = StatisticsVM
-   '   Return Not IsNothing(m_refStatisticsVM)
-   'End Function
-
-   'Friend Function SetRefPParameterListVM(PParameterListVM As PParameterListVM) As Boolean
-   '   m_refPParameterListVM = PParameterListVM
-   '   Return Not IsNothing(m_refPParameterListVM)
-   'End Function
-
-   'Friend Function SetRefQParameterListVM(QParameterListVM As QParameterListVM) As Boolean
-   '   m_refQParameterListVM = QParameterListVM
-   '   Return Not IsNothing(m_refQParameterListVM)
-   'End Function
-
-   'Friend Function SetRefFeatureManagerVM(FeatureManagerVM As FeatureManagerVM) As Boolean
-   '   m_refFeatureManagerVM = FeatureManagerVM
-   '   Return Not IsNothing(m_refFeatureManagerVM)
-   'End Function
-
-   'Friend Function SetRefAddSectionXMaterialWndVM(AddSectionXMaterialWndVM As AddSectionXMaterialWndVM) As Boolean
-   '   m_refAddSectionXMaterialWndVM = AddSectionXMaterialWndVM
-   '   Return Not IsNothing(m_refAddSectionXMaterialWndVM)
-   'End Function
-
-   'Friend Function SetRefStatisticsTimePanelVM(StatisticsTimePanelVM As StatisticsTimePanelVM) As Boolean
-   '   m_refStatisticsTimePanelVM = StatisticsTimePanelVM
-   '   Return Not IsNothing(m_refStatisticsTimePanelVM)
-   'End Function
-
-   'Friend Function SetRefOpenProjectFileDialogVM(OpenProjectFileDialogVM As OpenProjectFileDialogVM) As Boolean
-   '   m_refOpenProjectFileDialogVM = OpenProjectFileDialogVM
-   '   Return Not IsNothing(m_refOpenProjectFileDialogVM)
-   'End Function
-
-   'Friend Function SetRefOptionPanelVM(OptionPanelVM As OptionPanelVM) As Boolean
-   '   m_refOptionPanelVM = OptionPanelVM
-   '   Return Not IsNothing(m_refOptionPanelVM)
-   'End Function
-
-   'Friend Function SetRefRawPartTabVM(RawPartTabVM As RawPartTabVM) As Boolean
-   '   m_refRawPartTabVM = RawPartTabVM
-   '   Return Not IsNothing(m_refRawPartTabVM)
-   'End Function
-
-   'Friend Function SetRefNestingTabVM(NestingTabVM As NestingTabVM) As Boolean
-   '   m_refNestingTabVM = NestingTabVM
-   '   Return Not IsNothing(m_refNestingTabVM)
-   'End Function
-
-   'Friend Function SetRefMachiningTabVM(MachiningTabVM As MachiningTabVM) As Boolean
-   '   m_refMachiningTabVM = MachiningTabVM
-   '   Return Not IsNothing(m_refMachiningTabVM)
-   'End Function
-
-   'Friend Function SetRefSplitModeVM(SplitModeVM As SplitModeVM) As Boolean
-   '   m_refSplitModeVM = SplitModeVM
-   '   Return Not IsNothing(m_refSplitModeVM)
-   'End Function
-
-   'Friend Function SetRefMoveRawModeVM(MoveRawModeVM As MoveRawModeVM) As Boolean
-   '   m_refMoveRawModeVM = MoveRawModeVM
-   '   Return Not IsNothing(m_refMoveRawModeVM)
-   'End Function
-
-   'Friend Function SetRefSimulTabVM(SimulTabVM As SimulTabVM) As Boolean
-   '   m_refSimulTabVM = SimulTabVM
-   '   Return Not IsNothing(m_refSimulTabVM)
-   'End Function
-
-   ''Friend Function SetRefImportPanelVM(ImportPanelVM As ImportPanelVM) As Boolean
-   ''   m_refImportPanelVM = ImportPanelVM
-   ''   Return Not IsNothing(m_refImportPanelVM)
-   ''End Function
-
    Friend Function SetRefSliceManagerVM(SliceManagerVM As SliceManagerVM) As Boolean
       m_refSliceManagerVM = SliceManagerVM
       Return Not IsNothing(m_refSliceManagerVM)
@@ -746,16 +371,21 @@ Module Map
       Return Not IsNothing(m_refShellNumberParamPanelVM)
    End Function
 
+   Friend Function SetRefFilledSolidPanelVM(FilledSolidPanelVM As FilledSolidPanelVM) As Boolean
+      m_refFilledSolidPanelVM = FilledSolidPanelVM
+      Return Not IsNothing(m_refFilledSolidPanelVM)
+   End Function
+
+   Friend Function SetRefFilledSolidParamPanelVM(FilledSolidParamPanelVM As FilledSolidParamPanelVM) As Boolean
+      m_refFilledSolidParamPanelVM = FilledSolidParamPanelVM
+      Return Not IsNothing(m_refFilledSolidParamPanelVM)
+   End Function
+
    Friend Function SetRefSplashScreen(SplashScreen As SplashScreen) As Boolean
       m_refSplashScreen = SplashScreen
       Return Not IsNothing(m_refSplashScreen)
    End Function
 
-   ''Friend Function SetRefModifyPartPanelVM(ModifyPartPanelVM As ModifyPartPanelVM) As Boolean
-   ''   m_refModifyPartPanelVM = ModifyPartPanelVM
-   ''   Return Not IsNothing(m_refModifyPartPanelVM)
-   ''End Function
-
    Friend Function SetRefManagePartPanelVM(ManagePartPanelVM As ManagePartPanelVM) As Boolean
       m_refManagePartPanelVM = ManagePartPanelVM
       Return Not IsNothing(m_refManagePartPanelVM)