- Aggiornamento di tutte le messagebox a egtmessagebox

- ricompilazione con cambio versione
- miglioria indicazione unità di misura di tempo (min:s).

Icarus/ChooseMachineWnd/ChooseMachineWndVM.vb

@@ -66,7 +66,8 @@ Public Class ChooseMachineWndVM
          RaiseEvent m_CloseWindow(True)
       Else
          ' se non seleziono nessuna macchina lo segnalo con un MessageBox
-         MessageBox.Show("No machine selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         ' MessageBox.Show("No machine selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "No machine selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
       End If
    End Sub
 

Icarus/Constants/Const3dPrint.vb

@@ -2,6 +2,7 @@
 
    Public Const TABLE = "Table"
    Public Const TABLE_OUTLINE = "TableOutline"
+   Public Const EXTRUSION_AREA = "ExtrusionArea"
    Public Const PART = "Part"
    Public Const PRINT_SOLID = "PrintSolid"
    Public Const LAY_MACH_START = "MachStart"
@@ -104,6 +105,9 @@
    Public Const MAC_G0FEED = "G0Feed"
    Public Const MAC_G0FEEDZ = "G0FeedZ"
    Public Const MAC_TOOLDIAM = "ToolDiam"
+   Public Const MAC_PREFLOWDELAY = "PreFlowDelay"
+   Public Const MAC_POSTFLOWDELAY = "PostFlowDelay"
+   Public Const MAC_SCREWBACK = "ScrewBack"
    Public Const MAC_RIBSTYPE = "RibsType"
    Public Const MAC_RIBSOVERLAP = "RibsOverlap"
    Public Const MAC_RIBSSTRANDCOUNT = "RibsStrandCount"

Icarus/Constants/ConstMachDataIni.vb

@@ -0,0 +1,35 @@
+'----------------------------------------------------------------------------
+'  EgalTech 2015-2015
+'----------------------------------------------------------------------------
+' File : ConstIni.vb       Data : 12.02.15        Versione : 1.6b3
+' Contenuto : Modulo costanti sezione e chiavi per file Ini.
+'
+'
+'
+' Modifiche : 12.02.15 DS Creazione modulo.
+'
+'
+'----------------------------------------------------------------------------
+
+Public Module ConstMachDataIni
+
+   Public Const MACHDATA_INI_FILE_NAME As String = "Data.ini"
+
+   Public Const S_TABLE As String = "Table"
+   Public Const K_DIMX As String = "DimX"
+   Public Const K_DIMY As String = "DimY"
+   Public Const K_POSX As String = "PosX"
+   Public Const K_POSY As String = "PosY"
+   Public Const K_POSZ As String = "PosZ"
+
+   Public Const S_VERTICAL As String = "Vertical"
+   Public Const S_45DEGX As String = "45DegX"
+   Public Const S_45DEGY As String = "45DegY"
+   Public Const S_HORIZONTAL As String = "Horizontal"
+   Public Const K_MINX As String = "MinX"
+   Public Const K_MAXX As String = "MaxX"
+   Public Const K_MINY As String = "MinY"
+   Public Const K_MAXY As String = "MaxY"
+
+
+End Module

Icarus/Constants/ConstMachIni.vb

@@ -1,31 +1,6 @@
 Public Module ConstMachIni
 
    Public Const MACH_INI_FILE_NAME As String = "MachData.ini"
-   Public Const GETWALLDATA_FILE_NAME As String = "GetWallData.lua"
-   Public Const GETTS3DATA_FILE_NAME As String = "GetTs3Data.lua"
-
-   Public Const K_NCTYPE As String = "NCType"
-   Public Const K_CONNECTIONSTRING As String = "ConnectionString"
-
-   Public Const S_CHANNELS As String = "Channels"
-
-   Public Const S_PARTPROGRAM As String = "PartProgram"
-   Public Const S_EXTENSION As String = "Extension"
-
-   ' Variables della macchina corrente
-   Public Const S_MAINVARIABLES As String = "MainVariables"
-   Public Const S_VARIABLES As String = "Variables"
-   Public Const S_INPUTVARIABLES As String = "InputVariables"
-   Public Const S_OUTPUTVARIABLES As String = "OutputVariables"
-   Public Const S_MDI As String = "MDI"
-
-   Public Const K_BEAM As String = "Beam"
-   Public Const K_WALL As String = "Wall"
-   Public Const K_SCRIPT As String = "Scripts"
-   Public Const K_SETUP As String = "Setup"
-   Public Const K_FLOW As String = "Flow"
-
-   Public Const TS3DATA_FILE As String = "Ts3Data.lua"
 
    Public Const S_MACHINING As String = "Machining"
    Public Const K_MACH_INITSCRIPT As String = "InitScript"
@@ -36,4 +11,6 @@
    Public Const K_SPEED_MIN As String = "SpeedMin"
    Public Const K_SPEED_MAX As String = "SpeedMax"
 
+   Public Const S_MINMAX As String = "MinMax"
+
 End Module

Icarus/ControllerInputPanel/ControllerInputPanelV.xaml

@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
         Height="38"
-        Visibility="{Binding DoneBtn_Visibility}"
+        Visibility="{Binding Message_Visibility}"
         HorizontalAlignment="Left"
         Margin="45,0,0,0"
         Padding="0"

Icarus/CurrMachiningPanel/CurrMachining.vb

@@ -199,74 +199,95 @@ Public Class CurrMachiningCathegory
       Select Case m_Type
          Case Cathegories.GENERAL
             m_sName = "General"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.SLICINGTYPE, nPartId, nIndex, bForceFromDb),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.SLICINGTYPE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.SPIRALVASE, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.SPIRALVASE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDH, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDH, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDW, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDW, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDCOUNT, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDCOUNT, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSET, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSET, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDOVERLAP, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDOVERLAP, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STARTPOINTOFFSETONSLICE, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STARTPOINTOFFSETONSLICE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.STRANDORDER, nPartId, nIndex, bForceFromDb),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.STRANDORDER, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.DIRECTION, nPartId, nIndex, bForceFromDb),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.DIRECTION, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.G0FEED, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.G0FEED, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.G0FEEDZ, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.G0FEEDZ, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.TOOLDIAM, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LINKZUP, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.TOOLDIAM, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.DYNAMIC_MODE, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrOrderedMachiningParam(MachiningParam.Params.PRINT_ORDER, nPartId, nIndex, bForceFromDb)})
+                                                                New CurrComboMachiningParam(MachiningParam.Params.DYNAMIC_MODE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrOrderedMachiningParam(MachiningParam.Params.PRINT_ORDER, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.PREFLOWDELAY, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.POSTFLOWDELAY, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.SCREWBACK, nPartId, nIndex, bForceFromDb, Me)})
          Case Cathegories.LINK
             m_sName = "Shell"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.LINKTYPE, nPartId, nIndex, bForceFromDb),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.LINKTYPE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LINKPARAM, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LINKPARAM, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LINKZUP, nPartId, nIndex, bForceFromDb),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.LEADIN, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.LEADIN, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nPartId, nIndex, bForceFromDb),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.LEADOUT, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.LEADOUT, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTTANGDIST, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTTANGDIST, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTORTHODIST, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTORTHODIST, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGLEN, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGLEN, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGFEED_PC, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGFEED_PC, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPELEN, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPELEN, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nPartId, nIndex, bForceFromDb, Me)})
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nPartId, nIndex, bForceFromDb)})
+                                                                'New CurrNumericMachiningParam(MachiningParam.Params.WIPEDIR, nPartId, nIndex, bForceFromDb, Me)})
-                                                                'New CurrNumericMachiningParam(MachiningParam.Params.WIPEDIR, nPartId, nIndex, bForceFromDb)})
          Case Cathegories.RIBS
             m_sName = "Ribs"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.RIBSTYPE, nPartId, nIndex, bForceFromDb),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.RIBSTYPE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLINK, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLINK, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb)})
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb, Me)})
          Case Cathegories.SHELL_NUMBER
             m_sName = "Reduce Shell Number"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nPartId, nIndex, bForceFromDb),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, nPartId, nIndex, bForceFromDb)})
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, nPartId, nIndex, bForceFromDb, Me)})
          Case Cathegories.AUX_SOLID
             m_sName = "Filled Solid"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nPartId, nIndex, bForceFromDb),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nPartId, nIndex, bForceFromDb),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nPartId, nIndex, bForceFromDb),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nPartId, nIndex, bForceFromDb),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nPartId, nIndex, bForceFromDb)})
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nPartId, nIndex, bForceFromDb, Me)})
+      End Select
+      ' verifico dipendenze tra parametri
+      Select Case m_Type
+         Case Cathegories.LINK
+            For Each Param In {MachiningParam.Params.LINKTYPE, MachiningParam.Params.LEADIN, MachiningParam.Params.LEADOUT}
+               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
+         Case Cathegories.RIBS
+            For Each Param In {MachiningParam.Params.RIBSTYPE}
+               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
+         Case Cathegories.AUX_SOLID
+            For Each Param In {MachiningParam.Params.AUXSOLIDSINFILL}
+               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
       End Select
    End Sub
 
@@ -292,10 +313,18 @@ Public Class CurrNumericMachiningParam
          Return If(m_bIsLen, LenToString(m_dValue, 1), DoubleToString(m_dValue, 2))
       End Get
       Set(value As String)
+         Dim dTempValue As Double = 0
          If m_bIsLen Then
-            StringToLen(value, m_dValue)
+            StringToLen(value, dTempValue)
          Else
-            StringToDouble(value, m_dValue)
+            StringToDouble(value, dTempValue)
+         End If
+         If m_bIsActiveMinMax Then
+            If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
+               m_dValue = dTempValue
+            End If
+         Else
+            m_dValue = dTempValue
          End If
          NotifyPropertyChanged(NameOf(sValue))
          NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
@@ -318,8 +347,8 @@ Public Class CurrNumericMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean)
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean, Cathegory As MachiningCathegory)
-      MyBase.New(Type, nIndex)
+      MyBase.New(Type, nIndex, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.STRANDH
@@ -388,6 +417,15 @@ Public Class CurrNumericMachiningParam
          Case Params.TOOLDIAM
             bReadFromPart = EgtGetInfo(nPartId, MAC_TOOLDIAM, m_dValue)
             m_bIsLen = True
+         Case Params.PREFLOWDELAY
+            bReadFromPart = EgtGetInfo(nPartId, MAC_PREFLOWDELAY, m_dValue)
+            m_bIsLen = True
+         Case Params.POSTFLOWDELAY
+            bReadFromPart = EgtGetInfo(nPartId, MAC_POSTFLOWDELAY, m_dValue)
+            m_bIsLen = True
+         Case Params.SCREWBACK
+            bReadFromPart = EgtGetInfo(nPartId, MAC_SCREWBACK, m_dValue)
+            m_bIsLen = True
          Case Params.RIBSOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSOVERLAP, m_dValue)
             m_bIsLen = False
@@ -448,9 +486,9 @@ Public Class CurrNumericMachiningParam
          Dim DbMachining As Machining = Map.refMachiningDbVM.MachiningList.FirstOrDefault(Function(x) x.nIndex = nIndex)
          Select Case Type
             Case Params.STRANDH, Params.STRANDW, Params.STRANDCOUNT, Params.OFFSET, Params.STRANDOVERLAP, Params.STARTPOINTOFFSETONSLICE,
-                 Params.FLOORCOUNT, Params.G0FEED, Params.G0FEEDZ, Params.TOOLDIAM, Params.FLOWRATE_PC
+                 Params.FLOORCOUNT, Params.G0FEED, Params.G0FEEDZ, Params.LINKZUP, Params.TOOLDIAM, Params.FLOWRATE_PC, Params.PREFLOWDELAY, Params.POSTFLOWDELAY, Params.SCREWBACK
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.LINKPARAM, Params.LINKZUP, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST,
+            Case Params.LINKPARAM, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST,
                  Params.LEADOUTTANGDIST, Params.LEADOUTORTHODIST, Params.COASTINGLEN, Params.COASTINGFEED_PC,
                  Params.WIPELEN, Params.WIPEFEED_PC  ' Params.WIPEDIR
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.LINK).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
@@ -529,6 +567,12 @@ Public Class CurrNumericMachiningParam
             EgtSetInfo(nPartId, MAC_G0FEEDZ, sWriteValue)
          Case Params.TOOLDIAM
             EgtSetInfo(nPartId, MAC_TOOLDIAM, sWriteValue)
+         Case Params.PREFLOWDELAY
+            EgtSetInfo(nPartId, MAC_PREFLOWDELAY, sWriteValue)
+         Case Params.POSTFLOWDELAY
+            EgtSetInfo(nPartId, MAC_POSTFLOWDELAY, sWriteValue)
+         Case Params.SCREWBACK
+            EgtSetInfo(nPartId, MAC_SCREWBACK, sWriteValue)
          Case Params.RIBSOVERLAP
             EgtSetInfo(nPartId, MAC_RIBSOVERLAP, sWriteValue)
          Case Params.RIBSSTRANDCOUNT
@@ -621,8 +665,8 @@ Public Class CurrStringMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nIndex As Integer)
+   Sub New(Type As Params, nIndex As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type, nIndex)
+      MyBase.New(Type, nIndex, Cathegory)
       m_sValue = sValue
       m_sOrigValue = m_sValue
    End Sub
@@ -677,6 +721,11 @@ Public Class CurrComboMachiningParam
          m_SelValue = value
          NotifyPropertyChanged(NameOf(SelValue))
          NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
+         ManageDependencyParam()
+         ' se aggiorno SlicingType 
+         If m_Type = Params.SLICINGTYPE Then
+            CurrentMachine.UpdateExtrusionArea()
+         End If
       End Set
    End Property
 
@@ -696,8 +745,8 @@ Public Class CurrComboMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean)
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean, Cathegory As MachiningCathegory)
-      MyBase.New(Type, nIndex)
+      MyBase.New(Type, nIndex, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.SLICINGTYPE
@@ -848,6 +897,7 @@ Public Class CurrComboMachiningParam
    Friend Overrides Sub ResetParam()
       m_SelValue = m_OrigSelValue
       NotifyPropertyChanged(NameOf(SelValue))
+      CurrentMachine.UpdateExtrusionArea()
    End Sub
 
 #Region "COMMANDS"
@@ -867,6 +917,7 @@ Public Class CurrComboMachiningParam
       m_SelValue = DbParam.OrigSelValue
       NotifyPropertyChanged(NameOf(SelValue))
       NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
+      CurrentMachine.UpdateExtrusionArea()
    End Sub
 
 #End Region    ' ResetParam
@@ -905,8 +956,8 @@ Public Class CurrCheckMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean)
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean, Cathegory As MachiningCathegory)
-      MyBase.New(Type, nIndex)
+      MyBase.New(Type, nIndex, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.SPIRALVASE
@@ -1016,8 +1067,8 @@ Public Class CurrOrderedMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean)
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean, Cathegory As MachiningCathegory)
-      MyBase.New(Type, nIndex)
+      MyBase.New(Type, nIndex, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.PRINT_ORDER

Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml

@@ -1,6 +1,7 @@
 <Grid x:Class="CurrMachiningPanelV"
       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"
       Width="310"
       VerticalAlignment="Center">
@@ -46,7 +47,8 @@
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.Resources>
                               <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid Margin="0,1,2.5,1"
+                                       IsEnabled="{Binding bIsActive}">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
@@ -55,10 +57,10 @@
                                     <TextBlock Text="{Binding sName}"
                                                Margin="0,0,2.5,0"
                                                Style="{StaticResource ParameterList_TextBlock}"/>
-                                    <TextBox Grid.Column="1"
+                                    <EgtWPFLib5:EgtTextBox2 Grid.Column="1"
-                                             Text="{Binding sValue}"
+                                                            Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                             Margin="2.5,0,2.5,0"
+                                                            Margin="2.5,0,2.5,0"
-                                             Style="{StaticResource ParameterList_TextBox}"/>
+                                                            Style="{StaticResource ParameterList_TextBox2}"/>
                                     <Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
@@ -70,7 +72,8 @@
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid Margin="0,1,2.5,1"
+                                       IsEnabled="{Binding bIsActive}">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="1*"/>
@@ -97,7 +100,8 @@
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
                                  <Grid Height="22"
-                                       Margin="0,1,2.5,1">
+                                       Margin="0,1,2.5,1"
+                                       IsEnabled="{Binding bIsActive}">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>

Icarus/EgtMessageBox/EgtMessageBoxV.xaml

@@ -0,0 +1,55 @@
+<EgtWPFLib5:EgtMainWindow x:Class="EgtMessageBoxV"
+                          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"
+                          Title="{Binding sTitle}"
+                          SizeToContent="WidthAndHeight"
+                          WindowStartupLocation="CenterOwner"
+                          Style="{StaticResource Dialog_Window}">
+   <Grid Margin="2.5,2.5,2.5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <Grid Margin="20,20,20,20">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Image Source="{Binding sIconSource}"
+                Margin="0,0,0,0"/>
+         <TextBlock Grid.Column="1"
+                    Text="{Binding sMessage}"
+                    Margin="5,0,5,0"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
+      </Grid>
+      <ItemsControl Grid.Row="1"
+                    ItemsSource="{Binding ButtonList}"
+                    HorizontalAlignment="Center">
+         <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+               <UniformGrid Rows="1"/>
+            </ItemsPanelTemplate>
+         </ItemsControl.ItemsPanel>
+         <ItemsControl.ItemTemplate>
+            <DataTemplate>
+               <Button IsDefault="{Binding bIsDefault}"
+                       Content="{Binding sMessage}"
+                       Command="{Binding Command_Command}"
+                       Margin="2.5,0,2.5,0"
+                       Style="{StaticResource RightPanel_HalfRound_Button}"/>
+            </DataTemplate>
+         </ItemsControl.ItemTemplate>
+         
+      </ItemsControl>
+      <!--<UniformGrid Grid.Column="1"
+                   Grid.Row="1"
+                   Rows="1">
+         <Button IsCancel="True"
+                 Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+      </UniformGrid>-->
+   </Grid>
+</EgtWPFLib5:EgtMainWindow>
+   

Icarus/EgtMessageBox/EgtMessageBoxV.xaml.vb

@@ -0,0 +1,107 @@
+Public Class EgtMessageBoxV
+
+#Region "FIELDS & PROPERTIES"
+
+   Private WithEvents m_EgtMessageBoxVM As EgtMessageBoxVM
+
+   Private Shadows DialogResult As MessageBoxResult
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONTRUCTORS"
+
+   Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = EgtMessageBoxVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_EgtMessageBoxVM = EgtMessageBoxVM
+   End Sub
+
+#End Region
+
+#Region "METHODS"
+
+   ''' <summary>
+   ''' Apre una EgtMessageBox con un messaggio che ritorna un risultato
+   ''' </summary>
+   ''' <param name="Owner">Finestra di appartenenza</param>
+   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
+   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
+   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String) As MessageBoxResult
+      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText))
+      NewMessagebox.ShowDialog()
+      Return NewMessagebox.DialogResult
+   End Function
+
+   ''' <summary>
+   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
+   ''' </summary>
+   ''' <param name="Owner">Finestra di appartenenza</param>
+   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
+   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
+   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
+   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String) As MessageBoxResult
+      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption))
+      NewMessagebox.ShowDialog()
+      Return NewMessagebox.DialogResult
+   End Function
+
+   ''' <summary>
+   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
+   ''' </summary>
+   ''' <param name="Owner">Finestra di appartenenza</param>
+   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
+   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
+   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
+   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
+   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton) As MessageBoxResult
+      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button))
+      NewMessagebox.ShowDialog()
+      Return NewMessagebox.DialogResult
+   End Function
+
+   ''' <summary>
+   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
+   ''' </summary>
+   ''' <param name="Owner">Finestra di appartenenza</param>
+   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
+   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
+   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
+   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
+   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
+   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage) As MessageBoxResult
+      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon))
+      NewMessagebox.ShowDialog()
+      Return NewMessagebox.DialogResult
+   End Function
+
+   ''' <summary>
+   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
+   ''' </summary>
+   ''' <param name="Owner">Finestra di appartenenza</param>
+   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
+   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
+   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
+   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
+   ''' <param name="DefaultResult">Valore che specifica il bottone di default</param>
+   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
+   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult) As MessageBoxResult
+      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon, DefaultResult))
+      NewMessagebox.ShowDialog()
+      Return NewMessagebox.DialogResult
+   End Function
+
+#End Region    ' METHODS
+
+#Region "EVENTS"
+
+   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
+      Me.DialogResult = DialogResult
+      Me.Close()
+   End Sub
+
+#End Region
+
+End Class

Icarus/EgtMessageBox/EgtMessageBoxVM.vb

@@ -0,0 +1,234 @@
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class EgtMessageBoxVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend Event m_CloseWindow(DialogResult As MessageBoxResult)
+
+   Private m_sTitle As String = ""
+   Public ReadOnly Property sTitle As String
+      Get
+         Return m_sTitle
+      End Get
+   End Property
+
+   Private m_sMessage As String = ""
+   Public ReadOnly Property sMessage As String
+      Get
+         Return m_sMessage
+      End Get
+   End Property
+
+   Private m_Button As MessageBoxButton
+   Private m_Icon As MessageBoxImage
+   Public ReadOnly Property sIconSource As String
+      Get
+         Select Case m_Icon
+            Case MessageBoxImage.Hand
+               Return "\Resources\EgtMessageBox\Error.png"
+            Case MessageBoxImage.Question
+               Return "\Resources\EgtMessageBox\Question.png"
+            Case MessageBoxImage.Exclamation
+               Return "\Resources\EgtMessageBox\Warning.png"
+            Case MessageBoxImage.Asterisk
+               Return "\Resources\EgtMessageBox\Information.png"
+            Case MessageBoxImage.Stop
+               Return "\Resources\EgtMessageBox\Error.png"
+            Case MessageBoxImage.Error
+               Return "\Resources\EgtMessageBox\Error.png"
+            Case MessageBoxImage.Warning
+               Return "\Resources\EgtMessageBox\Warning.png"
+            Case MessageBoxImage.Information
+               Return "\Resources\EgtMessageBox\Information.png"
+            Case Else ' MessageBoxImage.None
+               Return ""
+         End Select
+      End Get
+   End Property
+
+   Private m_ButtonList As New List(Of EgtMsgBoxButton)
+   Public Property ButtonList As List(Of EgtMsgBoxButton)
+      Get
+         Return m_ButtonList
+      End Get
+      Set(value As List(Of EgtMsgBoxButton))
+         m_ButtonList = value
+      End Set
+   End Property
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONTRUCTORS"
+
+   Sub New(sMessageBoxText As String)
+      EgtMsgBoxButton.SetOwner(Me)
+      m_sMessage = sMessageBoxText
+      m_Button = MessageBoxButton.OK
+      m_Icon = MessageBoxImage.None
+      NotifyPropertyChanged(NameOf(ButtonList))
+      NotifyPropertyChanged(NameOf(sIconSource))
+   End Sub
+
+   Sub New(sMessageBoxText As String, sCaption As String)
+      MyClass.New(sMessageBoxText)
+      m_sTitle = sCaption
+   End Sub
+
+   Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton)
+      MyClass.New(sMessageBoxText, sCaption)
+      m_Button = Button
+      Select Case m_Button
+         Case MessageBoxButton.OK
+            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.OK))
+         Case MessageBoxButton.OKCancel
+            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.OK))
+            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.CANCEL))
+         Case MessageBoxButton.YesNoCancel
+            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.YES))
+            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.NO))
+            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.CANCEL))
+         Case MessageBoxButton.YesNo
+            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.YES))
+            m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.NO))
+      End Select
+      NotifyPropertyChanged(NameOf(ButtonList))
+   End Sub
+
+   Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage)
+      MyClass.New(sMessageBoxText, sCaption, Button)
+      m_Icon = Icon
+      NotifyPropertyChanged(NameOf(sIconSource))
+   End Sub
+
+   Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult)
+      MyClass.New(sMessageBoxText, sCaption, Button, Icon)
+      Dim DefaultBtn As EgtMsgBoxButton = m_ButtonList.FirstOrDefault(Function(x) (x.Type = EgtMsgBoxButton.Types.OK AndAlso DefaultResult = MessageBoxResult.OK) OrElse
+                                                                                  (x.Type = EgtMsgBoxButton.Types.CANCEL AndAlso DefaultResult = MessageBoxResult.Cancel) OrElse
+                                                                                  (x.Type = EgtMsgBoxButton.Types.YES AndAlso DefaultResult = MessageBoxResult.Yes) OrElse
+                                                                                  (x.Type = EgtMsgBoxButton.Types.NO AndAlso DefaultResult = MessageBoxResult.No))
+      If Not IsNothing(DefaultBtn) Then
+         DefaultBtn.SetIsDefault(True)
+      End If
+      NotifyPropertyChanged(NameOf(ButtonList))
+   End Sub
+
+#End Region    ' CONTRUCTORS
+
+#Region "METHODS"
+
+   Friend Sub CloseWindow(DialogResult As MessageBoxResult)
+      RaiseEvent m_CloseWindow(DialogResult)
+   End Sub
+
+#End Region    ' METHODS
+
+
+End Class
+
+Public Class EgtMsgBoxButton
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Public Enum Types As Integer
+      OK = 1
+      CANCEL = 2
+      YES = 3
+      NO = 4
+   End Enum
+
+   Private Shared Owner As EgtMessageBoxVM
+
+   Private m_Type As Types
+   Public ReadOnly Property Type As Types
+      Get
+         Return m_Type
+      End Get
+   End Property
+
+   Private m_sMessage As String
+   Public ReadOnly Property sMessage As String
+      Get
+         Return m_sMessage
+      End Get
+   End Property
+
+   Private m_bIsDefault As Boolean = False
+   Public ReadOnly Property bIsDefault As Boolean
+      Get
+         Return m_bIsDefault
+      End Get
+   End Property
+   Friend Sub SetIsDefault(bValue As Boolean)
+      m_bIsDefault = bValue
+   End Sub
+   ' Definizione comandi
+   Private m_cmdCommand As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONTRUCTORS"
+
+   Sub New(Type As Types)
+      m_Type = Type
+      Select Case m_Type
+         Case Types.OK
+                m_sMessage = EgtMsg(35001)
+            Case Types.CANCEL
+                m_sMessage = EgtMsg(35002)
+            Case Types.YES
+                m_sMessage = EgtMsg(35003)
+            Case Types.NO
+                m_sMessage = EgtMsg(35004)
+        End Select
+   End Sub
+
+    Sub New(Type As Types, bIsDefault As Boolean)
+        MyClass.New(Type)
+        m_bIsDefault = bIsDefault
+    End Sub
+
+#End Region    ' CONTRUCTORS
+
+#Region "METHODS"
+
+    Friend Shared Sub SetOwner(value As EgtMessageBoxVM)
+      Owner = value
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "COMMANDS"
+
+#Region "Command"
+
+   Public ReadOnly Property Command_Command As ICommand
+      Get
+         If m_cmdCommand Is Nothing Then
+            m_cmdCommand = New Command(AddressOf Command)
+         End If
+         Return m_cmdCommand
+      End Get
+   End Property
+
+   Public Sub Command()
+      Select Case m_Type
+         Case Types.OK
+            Owner.CloseWindow(MessageBoxResult.OK)
+         Case Types.CANCEL
+            Owner.CloseWindow(MessageBoxResult.Cancel)
+         Case Types.YES
+            Owner.CloseWindow(MessageBoxResult.Yes)
+         Case Types.NO
+            Owner.CloseWindow(MessageBoxResult.No)
+      End Select
+   End Sub
+
+#End Region ' Ok
+
+#End Region    ' COMMANDS 
+
+End Class

Icarus/FilledSolidPanel/FilledSolidPanelVM.vb

@@ -35,6 +35,10 @@ Public Class FilledSolidPanelVM
          Return m_SelFilledSolid
       End Get
       Set(value As FilledSolidEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelFilledSolid))
+            Return
+         End If
          m_SelFilledSolid = value
          EgtDeselectAll()
          If Not IsNothing(value) Then
@@ -213,7 +217,7 @@ Public Class FilledSolidPanelVM
          Return m_bAdd_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bAdd_IsChecked = value
             If value Then
                m_bEdit_IsChecked = False
@@ -235,7 +239,7 @@ Public Class FilledSolidPanelVM
          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
+         If Not IsNothing(m_SelFilledSolid) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bEdit_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -259,7 +263,7 @@ Public Class FilledSolidPanelVM
          Return m_bGrid_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bGrid_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -287,7 +291,7 @@ Public Class FilledSolidPanelVM
          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
+         If Not IsNothing(m_SelFilledSolid) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bMove_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -311,7 +315,7 @@ Public Class FilledSolidPanelVM
          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
+         If Not IsNothing(m_SelFilledSolid) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bRotate_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -335,7 +339,7 @@ Public Class FilledSolidPanelVM
          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
+         If Not IsNothing(m_SelFilledSolid) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
             m_bMachParam_IsChecked = True
             m_bAdd_IsChecked = False
             m_bEdit_IsChecked = False
@@ -349,6 +353,8 @@ Public Class FilledSolidPanelVM
             NotifyPropertyChanged(NameOf(bRotate_IsChecked))
             Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.AUXSOLIDPARAM)
             NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
+            ' disattivo interfaccia
+            ManageInterface(False)
          Else
             NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
          End If
@@ -358,6 +364,8 @@ Public Class FilledSolidPanelVM
       m_bMachParam_IsChecked = False
       NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
       NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
+      ' riattivo interfaccia
+      ManageInterface(True)
    End Sub
 
    Public ReadOnly Property Compo_Visibility As Visibility
@@ -366,11 +374,17 @@ Public Class FilledSolidPanelVM
       End Get
    End Property
 
+   Private m_FilledSolidList_IsEnabled As Boolean = False
    Public ReadOnly Property FilledSolidList_IsEnabled As Boolean
       Get
-         Return Not m_bMachParam_IsChecked
+         Return If(m_FilledSolidList.Count > 0, m_FilledSolidList_IsEnabled, False)
       End Get
    End Property
+   Friend Sub SetFilledSolidListIsEnabled(bValue As Boolean)
+      m_FilledSolidList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(FilledSolidList_IsEnabled))
+   End Sub
+
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -388,6 +402,8 @@ Public Class FilledSolidPanelVM
       End Get
    End Property
 
+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"
 
    Public ReadOnly Property Import_ToolTip As String
@@ -517,7 +533,6 @@ Public Class FilledSolidPanelVM
    Private m_cmdCPlaneObj As ICommand
    Private m_cmdDragMove As ICommand
    Private m_cmdDragRotate As ICommand
-   Private m_cmdMachParam As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -572,6 +587,8 @@ Public Class FilledSolidPanelVM
          SelFilledSolid = m_FilledSolidList(0)
          NotifyPropertyChanged(NameOf(SelFilledSolid))
       End If
+      ' attivo lista filled solid
+      SetFilledSolidListIsEnabled(True)
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
 
@@ -607,8 +624,13 @@ Public Class FilledSolidPanelVM
             EgtSelectObj(m_SelFilledSolid.nCurveId)
          Case FilledSolidSelectionTypes.EXTRUSION
             ' creo layer per estrusione
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelFilledSolid.nCurveId)
          Case FilledSolidSelectionTypes.BOTH
@@ -616,6 +638,8 @@ Public Class FilledSolidPanelVM
             EgtSelectObj(m_SelFilledSolid.nExtrusionId)
       End Select
       EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
       Return True
    End Function
 
@@ -625,6 +649,7 @@ Public Class FilledSolidPanelVM
    End Sub
 
    Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
       Select Case command
          Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
             ' leggo altezza estrusione
@@ -664,6 +689,10 @@ Public Class FilledSolidPanelVM
             ' Imposto flag di ricalcolo slice
             EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Select
+      ' se non ho creato percorso riabilito interfaccia
+      If Not m_bIsCreatingPath Then
+         ManageInterface(True)
+      End If
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
@@ -718,9 +747,15 @@ Public Class FilledSolidPanelVM
             ' lo seleziono
             SelFilledSolid = NewEntity
             NotifyPropertyChanged(NameOf(SelFilledSolid))
-            ' creo layer per estrusione
+            ' verifico se esiste gia' layer estrusione e lo svuoto
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId <> GDB_ID.NULL Then
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            Else
+               ' altrimenti lo creo
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             ' seleziono percorso da estrudere
             EgtDeselectAll()
@@ -728,6 +763,9 @@ Public Class FilledSolidPanelVM
             If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
                m_bIsCreatingExtrusion = True
                Map.refControllerInputPanelVM.IsChecked = True
+               If Not EgtCurveIsClosed(nNewEntityId) Then
+                  m_bEscOnLine2P = True
+               End If
             Else
                ' cancello layer
                EgtErase(nNewExtrusionLayerId)
@@ -752,6 +790,13 @@ Public Class FilledSolidPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
+            ManageInterface(True)
+         End If
       End If
    End Sub
 
@@ -787,6 +832,18 @@ Public Class FilledSolidPanelVM
       Return nFilledSolidIndex + 1
    End Function
 
+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
+      SetFilledSolidListIsEnabled(bValue)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -809,8 +866,10 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.InsertFilledSolid()
+      ManageInterface(True)
    End Sub
 
 #End Region ' Import
@@ -833,7 +892,8 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
       If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
@@ -858,7 +918,7 @@ Public Class FilledSolidPanelVM
    End Property
 
    Public Sub Delete()
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       If IsNothing(SelFilledSolid) Then Return
       Dim bOk As Boolean = False
       Select Case m_SelFilledSolid.Type
@@ -882,6 +942,7 @@ Public Class FilledSolidPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelFilledSolid))
       End If
+      SetFilledSolidListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete
@@ -904,7 +965,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(FilledSolidSelectionTypes.CURVE)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
    End Sub
@@ -929,7 +990,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(FilledSolidSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
@@ -958,7 +1019,7 @@ Public Class FilledSolidPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(FilledSolidSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
@@ -987,7 +1048,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(FilledSolidSelectionTypes.EXTRUSION)
       If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
          m_bIsCreatingExtrusion = True
@@ -1015,7 +1076,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1040,7 +1101,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1065,7 +1126,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1090,7 +1151,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1115,7 +1176,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1140,7 +1201,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1165,7 +1226,8 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1189,7 +1251,8 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -1213,7 +1276,7 @@ Public Class FilledSolidPanelVM
    ''' 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 Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE)
       Else
@@ -1241,7 +1304,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_3P)
    End Sub
 
@@ -1265,7 +1328,7 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE)
    End Sub
 
@@ -1305,7 +1368,8 @@ Public Class FilledSolidPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       ' salvo selezione precedente e deseleziono altri oggetti
       m_PrevSelObjs.Clear()
       Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -1315,7 +1379,7 @@ Public Class FilledSolidPanelVM
       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)
+      Map.refControllerInputPanelVM.ShowMessage("Grid from Selection", "Select the face of the object where to place the grid")
    End Sub
 
 #End Region ' CPlaneObj
@@ -1332,7 +1396,7 @@ Public Class FilledSolidPanelVM
    End Property
 
    Public Sub DragMove()
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(FilledSolidSelectionTypes.BOTH)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE)
    End Sub
@@ -1351,41 +1415,13 @@ Public Class FilledSolidPanelVM
    End Property
 
    Public Sub DragRotate()
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive 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

Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml

@@ -33,7 +33,8 @@
                </ItemsControl.ItemsPanel>
                <ItemsControl.Resources>
                   <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                     <Grid Margin="0,1,2.5,1">
+                     <Grid Margin="0,1,2.5,1"
+                           IsEnabled="{Binding bIsActive}">
                         <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="2*"/>
                            <ColumnDefinition Width="1*"/>
@@ -57,7 +58,8 @@
                      </Grid>
                   </DataTemplate>
                   <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                     <Grid Margin="0,1,2.5,1">
+                     <Grid Margin="0,1,2.5,1"
+                           IsEnabled="{Binding bIsActive}">
                         <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="2*"/>
                            <ColumnDefinition Width="1*"/>
@@ -88,12 +90,19 @@
          <UniformGrid Grid.Row="1"
                       Rows="1"
                       Margin="0,2.5,0,0">
-            <Button Content="Ok"
+            <Button Command="{Binding Ok_Command}"
-                    Command="{Binding Ok_Command}"
+                    IsDefault="True"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                    Margin="0,0,2.5,0"
-            <Button Content="Cancel"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
-                    Command="{Binding Cancel_Command}"
+               <Image Source="\Resources\Common\Ok.png"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                      Style="{StaticResource Button_Image}"/>
+            </Button>
+            <Button Command="{Binding Cancel_Command}"
+                    Margin="0,0,2.5,0"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
+               <Image Source="\Resources\Common\Cancel.png"
+                      Style="{StaticResource Button_Image}"/>
+            </Button>
          </UniformGrid>
       </Grid>
    </Border>

Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb

@@ -42,17 +42,25 @@ Public Class FilledSolidParamPanelVM
 
       m_Type = Cathegories.AUX_SOLID
       m_sName = "Filled Solid"
-      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nFilledSolidId, nPartId),
+      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nFilledSolidId, nPartId),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nFilledSolidId, nPartId),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nFilledSolidId, nPartId),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nFilledSolidId, nPartId)})
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nFilledSolidId, nPartId, Me)})
       NotifyPropertyChanged(NameOf(MachiningParamList))
       NotifyPropertyChanged(NameOf(sName))
+      ' verifico dipendenze tra parametri
+      Select Case m_Type
+         Case Cathegories.AUX_SOLID
+            For Each Param In {MachiningParam.Params.AUXSOLIDSINFILL}
+               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
+      End Select
    End Sub
 
    Friend Sub SaveCurrParams()
@@ -178,8 +186,8 @@ Public Class FilledSolidNumericMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nFilledSolidId As Integer, nPartId As Integer)
+   Sub New(Type As Params, nFilledSolidId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.AUXSOLIDSOVERLAP
@@ -305,6 +313,7 @@ Public Class FilledSolidComboMachiningParam
          m_SelValue = value
          NotifyPropertyChanged(NameOf(SelValue))
          NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+         ManageDependencyParam()
       End Set
    End Property
 
@@ -324,8 +333,8 @@ Public Class FilledSolidComboMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromRib As Boolean = False
       Dim bReadFromPart As Boolean = False
       Select Case Type

Icarus/Icarus.vbproj

@@ -80,9 +80,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
     </Reference>
-    <Reference Include="EgtWPFLib48">
-      <HintPath>..\..\..\EgtProg\DllD64\EgtWPFLib48.dll</HintPath>
-    </Reference>
     <Reference Include="EgtWPFLib5, Version=2.4.5.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
@@ -127,6 +124,7 @@
     <Compile Include="Constants\ConstDataGridColumnsIni.vb" />
     <Compile Include="Constants\ConstDims.vb" />
     <Compile Include="Constants\ConstGen.vb" />
+    <Compile Include="Constants\ConstMachDataIni.vb" />
     <Compile Include="Constants\ConstIni.vb" />
     <Compile Include="Constants\ConstMachComm.vb" />
     <Compile Include="Constants\ConstMachIni.vb" />
@@ -152,6 +150,10 @@
       <DependentUpon>DispositionPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="DispositionPanel\DispositionPanelVM.vb" />
+    <Compile Include="EgtMessageBox\EgtMessageBoxV.xaml.vb">
+      <DependentUpon>EgtMessageBoxV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="EgtMessageBox\EgtMessageBoxVM.vb" />
     <Compile Include="FilledSolidPanel\FilledSolidPanelV.xaml.vb">
       <DependentUpon>FilledSolidPanelV.xaml</DependentUpon>
     </Compile>
@@ -164,6 +166,10 @@
       <DependentUpon>ImportExportMachiningPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="ImportExportMachiningPanel\ImportExportMachiningPanelVM.vb" />
+    <Compile Include="ImportLoadingWnd\ImportLoadingWndV.xaml.vb">
+      <DependentUpon>ImportLoadingWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ImportLoadingWnd\ImportLoadingWndVM.vb" />
     <Compile Include="InstrumentPanel\InstrumentPanelV.xaml.vb">
       <DependentUpon>InstrumentPanelV.xaml</DependentUpon>
     </Compile>
@@ -204,6 +210,9 @@
       <DependentUpon>MaterialDbV.xaml</DependentUpon>
     </Compile>
     <Compile Include="MaterialDb\MaterialDbVM.vb" />
+    <Compile Include="TSFEditor\ColumnHeader.xaml.vb">
+      <DependentUpon>ColumnHeader.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UpdateMachine\UpdateMachineV.xaml.vb">
       <DependentUpon>UpdateMachineV.xaml</DependentUpon>
     </Compile>
@@ -357,6 +366,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="EgtMessageBox\EgtMessageBoxV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="FilledSolidPanel\FilledSolidPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -369,6 +382,10 @@
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
+    <Page Include="ImportLoadingWnd\ImportLoadingWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="InstrumentPanel\InstrumentPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -421,6 +438,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="TSFEditor\ColumnHeader.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UpdateMachine\UpdateMachineV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -591,6 +612,7 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
     <None Include="packages.config" />
+    <Resource Include="Resources\EgtMessageBox\Error.png" />
     <Resource Include="Resources\Fonts\Roboto-Regular.ttf" />
     <Resource Include="Resources\Fonts\Roboto-Light.ttf" />
   </ItemGroup>
@@ -802,6 +824,51 @@
   <ItemGroup>
     <Resource Include="Resources\SliceManager\StopCalculation.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\SplashScreen\BlueSplashscreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\SliceManager\Dimensions.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TFSEditor\Reduce.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ReferencePanel\BC.png" />
+    <Resource Include="Resources\ReferencePanel\BL.png" />
+    <Resource Include="Resources\ReferencePanel\BR.png" />
+    <Resource Include="Resources\ReferencePanel\MC.png" />
+    <Resource Include="Resources\ReferencePanel\ML.png" />
+    <Resource Include="Resources\ReferencePanel\MR.png" />
+    <Resource Include="Resources\ReferencePanel\TC.png" />
+    <Resource Include="Resources\ReferencePanel\TL.png" />
+    <Resource Include="Resources\ReferencePanel\TR.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ReferencePanel\White_BC.png" />
+    <Resource Include="Resources\ReferencePanel\White_BL.png" />
+    <Resource Include="Resources\ReferencePanel\White_BR.png" />
+    <Resource Include="Resources\ReferencePanel\White_MC.png" />
+    <Resource Include="Resources\ReferencePanel\White_ML.png" />
+    <Resource Include="Resources\ReferencePanel\White_MR.png" />
+    <Resource Include="Resources\ReferencePanel\White_TC.png" />
+    <Resource Include="Resources\ReferencePanel\White_TL.png" />
+    <Resource Include="Resources\ReferencePanel\White_TR.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\SliceManager\Mass.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\SliceManager\Time.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\RibParamPanel\CopyFrom.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtMessageBox\Information.png" />
+    <Resource Include="Resources\EgtMessageBox\Question.png" />
+    <Resource Include="Resources\EgtMessageBox\Warning.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe

Icarus/ImportExportMachiningPanel/ImportExportMachiningPanelVM.vb

@@ -157,7 +157,8 @@ Public Class ImportExportMachiningPanelVM
                      nIndex += 1
                   End While
                   If bIsOriginal AndAlso bIsCustom Then
-                     MessageBox.Show("Corrupted file! Impossible to import it!")
+                     'MessageBox.Show("Corrupted file! Impossible to import it!")
+                     EgtMessageBoxV.Show(Application.Current.MainWindow, "Corrupted file! Impossible to import it!")
                   ElseIf bIsOriginal Then
                      LoadOriginalMaterial()
                   End If
@@ -301,9 +302,12 @@ Public Class ImportExportMachiningPanelVM
                sDuplicatedMaterialList &= " - " & m_MachiningList(Index).sName & Environment.NewLine
             End If
          Next
-         MessageBox.Show("Impossible to import the package because materials named:" & Environment.NewLine &
+         'MessageBox.Show("Impossible to import the package because materials named:" & Environment.NewLine &
-                         sDuplicatedMaterialList & Environment.NewLine &
+         '             sDuplicatedMaterialList & Environment.NewLine &
-                         "Please modify the names of these machining and then retry to import the materials.")
+         '             "Please modify the names of these machining and then retry to import the materials.")
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible to import the package because materials named:" & Environment.NewLine &
+                                sDuplicatedMaterialList & Environment.NewLine &
+                                "Please modify the names of these machining and then retry to import the materials.")
          Return
       End If
       ' aggiorno/aggiungo materiali
@@ -353,9 +357,12 @@ Public Class ImportExportMachiningPanelVM
       For Index = 0 To ImportedMaterialList.Count - 1
          sMaterialList &= " - " & m_MachiningList(Index).sName & " (" & If(ImportedMaterialList(Index) = MaterialState.NOTFOUND, "New", "Updated") & ")" & Environment.NewLine
       Next
-      MessageBox.Show("List of the materials:" & Environment.NewLine &
+      'MessageBox.Show("List of the materials:" & Environment.NewLine &
-                      sMaterialList & Environment.NewLine &
+      '              sMaterialList & Environment.NewLine &
-                      "Import successfully completed.")
+      '              "Import successfully completed.")
+      EgtMessageBoxV.Show(Application.Current.MainWindow, "List of the materials:" & Environment.NewLine &
+                    sMaterialList & Environment.NewLine &
+                    "Import successfully completed.")
       Return
    End Sub
 
@@ -471,7 +478,7 @@ Public Class ImportExportMachiningPanelVM
             End Select
          Case WindowModeEnum.EXPORT, WindowModeEnum.EXPORT_ORIG
             ' chiedo il nome con cui salvare il file 
-            Dim sExtension As String =""
+            Dim sExtension As String = ""
             If m_WindowType = WindowTypeEnum.MATERIAL Then
                If m_WindowMode = WindowModeEnum.EXPORT_ORIG Then
                   sExtension = OriginalMaterialDataExtension
@@ -580,7 +587,8 @@ Public Class ImpExpMachiningItem
             If m_AlreadyExist Then
                Select Case m_WindowType
                   Case WindowTypeEnum.MATERIAL
-                     Select Case System.Windows.MessageBox.Show("Material already existing in Db. Overwrite it?", "", MessageBoxButton.YesNoCancel)
+                     Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Material will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
+                                'System.Windows.MessageBox.Show("Material already existing in Db. Overwrite it?", "", MessageBoxButton.YesNoCancel)
                         Case MessageBoxResult.Yes
                            m_ChangeName = False
                            m_Active = True
@@ -594,7 +602,8 @@ Public Class ImpExpMachiningItem
                               End While
                            End If
                            m_sName = m_sOrigName & IMPEXPNAME & If(nImpNameIndex > 0, "_" & nImpNameIndex, "")
-                           System.Windows.MessageBox.Show("Material will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
+                           'System.Windows.MessageBox.Show("Material will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
+                           EgtMessageBoxV.Show(Application.Current.MainWindow, "Material will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
                            NotifyPropertyChanged(NameOf(sName))
                            m_ChangeName = True
                            m_Active = True
@@ -602,7 +611,8 @@ Public Class ImpExpMachiningItem
                            m_Active = False
                      End Select
                   Case WindowTypeEnum.MACHINING
-                     Select Case System.Windows.MessageBox.Show("Machining already existing in Db. Overwrite it?", "", MessageBoxButton.YesNoCancel)
+                     Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Machining already existing in Db. Overwrite it?", "", MessageBoxButton.YesNoCancel)
+                                'System.Windows.MessageBox.Show("Machining already existing in Db. Overwrite it?", "", MessageBoxButton.YesNoCancel)
                         Case MessageBoxResult.Yes
                            m_ChangeName = False
                            m_Active = True
@@ -616,7 +626,8 @@ Public Class ImpExpMachiningItem
                               End While
                            End If
                            m_sName = m_sOrigName & IMPEXPNAME & If(nImpNameIndex > 0, "_" & nImpNameIndex, "")
-                           System.Windows.MessageBox.Show("Machining will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
+                           'System.Windows.MessageBox.Show("Machining will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
+                           EgtMessageBoxV.Show(Application.Current.MainWindow, "Machining will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
                            NotifyPropertyChanged(NameOf(sName))
                            m_ChangeName = True
                            m_Active = True

Icarus/ImportLoadingWnd/ImportLoadingWndV.xaml

@@ -0,0 +1,38 @@
+<EgtWPFLib5:EgtMainWindow x:Class="ImportLoadingWndV"
+                          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"
+                          Title="New Project"
+                          SizeToContent="WidthAndHeight"
+                          WindowStartupLocation="CenterOwner"
+                          Style="{StaticResource Dialog_Window}">
+   <Grid Margin="2.5,2.5,2.5,2.5">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <TextBlock Text="{Binding Loading_Msg}"
+                 Margin="20,20,20,2.5"
+                 Style="{StaticResource DialogWindow_TextBlock}"/>
+      <Grid Grid.Row="1"
+            Margin="2.5,2.5,2.5,2.5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <ProgressBar Value="{Binding Loading_Value}" 
+                      Width="200"
+                      Margin="0,0,2.5,20"
+                      Style="{StaticResource Icarus_ProgressBar}"/>
+         <!--<Button Grid.Column="1"
+                 Grid.RowSpan="2"
+                 Command="{Binding Stop_Command}"
+                 Margin="2.5,0,0,0"
+                 Style="{StaticResource TopPanel_Button}">
+            <Image Source="\Resources\SliceManager\StopCalculation.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>-->
+      </Grid>
+   </Grid>
+   
+</EgtWPFLib5:EgtMainWindow>

Icarus/ImportLoadingWnd/ImportLoadingWndV.xaml.vb

@@ -0,0 +1,14 @@
+Public Class ImportLoadingWndV
+
+   Private WithEvents m_ImportLoadingWndVM As ImportLoadingWndVM
+
+   Sub New(Owner As Window, ImportLoadingWndVM As ImportLoadingWndVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = ImportLoadingWndVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_ImportLoadingWndVM = ImportLoadingWndVM
+   End Sub
+
+End Class

Icarus/ImportLoadingWnd/ImportLoadingWndVM.vb

@@ -0,0 +1,91 @@
+Imports System.Collections.ObjectModel
+Imports EgtUILib.EgtInterface
+Imports EgtWPFLib5
+
+Public Class ImportLoadingWndVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   ' Funzioni di callback per output in interfaccia da LUA
+   Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
+
+   Private m_bStopLoading As Boolean = False
+
+   Private m_Loading_Value As Double
+   Public Property Loading_Value As Double
+      Get
+         Return m_Loading_Value
+      End Get
+      Set(value As Double)
+         m_Loading_Value = value
+      End Set
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdStop As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "MESSAGES"
+
+   Public ReadOnly Property Loading_Msg As String
+      Get
+         Return "Importing file..."
+      End Get
+   End Property
+
+#End Region    ' MESSAGES
+
+#Region "CONSTRUCTORS"
+
+   Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefImportLoadingWndVM(Me)
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+#Region "METHODS"
+
+   Friend Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
+      m_Loading_Value = nProg
+      NotifyPropertyChanged(NameOf(Loading_Value))
+      ' Costringo ad aggiornare
+      UpdateUI()
+      ' Eventuale attesa
+      Threading.Thread.Sleep(nPause)
+      ' Ritorno eventuale stop
+      If m_bStopLoading Then
+         m_bStopLoading = False
+         Return 1
+      Else
+         Return 0
+      End If
+      Return 0
+   End Function
+
+#End Region    ' METHODS
+
+#Region "COMMANDS"
+
+#Region "Stop"
+
+   Public ReadOnly Property Stop_Command As ICommand
+      Get
+         If m_cmdStop Is Nothing Then
+            m_cmdStop = New Command(AddressOf StopLoading)
+         End If
+         Return m_cmdStop
+      End Get
+   End Property
+
+   Public Sub StopLoading()
+      m_bStopLoading = True
+   End Sub
+
+#End Region ' Stop
+
+#End Region    ' COMMANDS 
+
+End Class

Icarus/InstrumentPanel/InstrumentPanelV.xaml

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

Icarus/InstrumentPanel/MyInstrumentPanelVM.vb

@@ -96,8 +96,9 @@ Public Class MyInstrumentPanelVM
             EgtDraw()
             ' Ripristino stato segnalazione modifica
             DisableMgr.ReEnable()
-            MessageBox.Show(sResult)
+            'MessageBox.Show(sResult)
-         Else
+            EgtMessageBoxV.Show(Application.Current.MainWindow, sResult)
+            Else
             ' Disabilito segnalazione modificato
             Dim DisableMgr As New DisableModifiedMgr
             ' cancello tutti i gruppi con i chunk

Icarus/MachSaveInDbWnd/MachSaveInDbWndVM.vb

@@ -48,7 +48,8 @@ Public Class MachSaveInDbWndVM
 
    Public Sub Ok()
       If Map.refTopPanelVM.MachiningList.Any(Function(x As MachiningIndex) x.sName = m_sName) Then
-         MessageBox.Show("Name already used in Db! Please insert a different name.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         'MessageBox.Show("Name already used in Db! Please insert a different name.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Name already used in Db! Please insert a different name.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
          Return
       End If
       RaiseEvent m_CloseWindow(True)

Icarus/MachineViewPanel/MachineViewPanelV.xaml

@@ -7,7 +7,7 @@
              Width="40"
              Style="{StaticResource SelViewSlider_ComboBox}">
       <ComboBoxItem>
-         <Image Source="\Resources\SimulationPanel\HeadMode.png"
+         <Image Source="\Resources\SimulationPanel\ToolMode.png"
                 Style="{StaticResource ComboBox.Image}"/>
       </ComboBoxItem>
       <ComboBoxItem>

Icarus/MachineViewPanel/MachineViewPanelVM.vb

@@ -4,32 +4,27 @@ Imports EgtWPFLib5
 Public Class MachineViewPanelVM
    Inherits VMBase
 
-   Private m_nSelMachView As MCH_LOOK
    Public Property ghSelMachView As Integer
       Get
-         Return m_nSelMachView - 1
+         Return If(Not IsNothing(Map.refSimulationPanelVM) AndAlso Not IsNothing(Map.refSimulationPanelVM.MySimul), Map.refSimulationPanelVM.MySimul.GetMachLook() - 1, Nothing)
       End Get
       Set(value As Integer)
-         m_nSelMachView = value + 1
+         If Not IsNothing(Map.refSimulationPanelVM) AndAlso Not IsNothing(Map.refSimulationPanelVM.MySimul) Then
-         If Not IsNothing(Map.refSimulationPanelVM) Then
+            Map.refSimulationPanelVM.MySimul.SetMachLook(value + 1)
-            Dim MySimul As SimulationVM = Map.refSimulationPanelVM.MySimul
-            MySimul.SetMachLook(m_nSelMachView)
             ' aggiorno lo stato della macchina e la sua visualizzazione
-            EgtSetMachineLook(MySimul.GetMachLook())
+            EgtSetMachineLook(Map.refSimulationPanelVM.MySimul.GetMachLook())
-            WriteMainPrivateProfileString(S_SIMUL, K_MACHVIEWMODE, m_nSelMachView)
+            WriteMainPrivateProfileString(S_SIMUL, K_MACHVIEWMODE, value + 1)
          End If
          EgtDraw()
       End Set
    End Property
-   Friend Sub SetSelViewSlider(value As MCH_LOOK)
+   Friend Sub RefreshSelViewSlider()
-      m_nSelMachView = value
       NotifyPropertyChanged(NameOf(ghSelMachView))
    End Sub
 
    Sub New()
-      ' leggo vista macchina da ini e la imposto
+      ' Creo riferimento a questa classe in OmagOFFICEMap
-      Dim DefaultMachViewMode As Integer = GetMainPrivateProfileInt(S_SIMUL, K_MACHVIEWMODE, 3)
+      Map.SetRefMachineViewPanelVM(Me)
-      SetSelViewSlider(DefaultMachViewMode)
    End Sub
 
 End Class

Icarus/MachiningDb/Machining.vb

@@ -1,8 +1,10 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
+Imports System.Reflection
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports Icarus.Machining
 
 Public Class Machining
    Inherits VMBase
@@ -314,74 +316,77 @@ Public Class MachiningCathegory
       Select Case m_Type
          Case Cathegories.GENERAL
             m_sName = "General"
-            m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.SLICINGTYPE, nIndex),
+            m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.SLICINGTYPE, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.SPIRALVASE, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.SPIRALVASE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.STRANDH, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.STRANDH, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.STRANDW, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.STRANDW, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.STRANDCOUNT, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.STRANDCOUNT, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.OFFSET, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.OFFSET, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.STRANDOVERLAP, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.STRANDOVERLAP, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.STARTPOINTOFFSETONSLICE, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.STARTPOINTOFFSETONSLICE, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.STRANDORDER, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.STRANDORDER, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.DIRECTION, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.DIRECTION, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.G0FEED, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.G0FEED, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.G0FEEDZ, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.G0FEEDZ, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.TOOLDIAM, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.LINKZUP, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.TOOLDIAM, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.DYNAMIC_MODE, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nIndex, Me),
-                                                                New OrderedMachiningParam(MachiningParam.Params.PRINT_ORDER, nIndex)})
+                                                                New ComboMachiningParam(MachiningParam.Params.DYNAMIC_MODE, nIndex, Me),
+                                                                New OrderedMachiningParam(MachiningParam.Params.PRINT_ORDER, nIndex, Me),
+                                                                New NumericMachiningParam(MachiningParam.Params.PREFLOWDELAY, nIndex, Me),
+                                                                New NumericMachiningParam(MachiningParam.Params.POSTFLOWDELAY, nIndex, Me),
+                                                                New NumericMachiningParam(MachiningParam.Params.SCREWBACK, nIndex, Me)})
          Case Cathegories.LINK
             m_sName = "Shell"
-            m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.LINKTYPE, nIndex),
+            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.LINKPARAM, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.LINKTYPE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.LINKZUP, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.LINKPARAM, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.LEADIN, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.LEADIN, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.LEADOUT, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.LEADOUT, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.LEADOUTTANGDIST, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.LEADOUTTANGDIST, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.LEADOUTORTHODIST, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.LEADOUTORTHODIST, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.COASTINGLEN, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.COASTINGLEN, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.COASTINGFEED_PC, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.COASTINGFEED_PC, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.WIPELEN, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.WIPELEN, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nIndex, Me)})
-                                                                New NumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nIndex)})
+                                                                'New NumericMachiningParam(MachiningParam.Params.WIPEDIR, nIndex, Me)})
-                                                                'New NumericMachiningParam(MachiningParam.Params.WIPEDIR, nIndex)})
          Case Cathegories.RIBS
             m_sName = "Ribs"
-            m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.RIBSTYPE, nIndex),
+            m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.RIBSTYPE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLINK, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLINK, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nIndex)})
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nIndex, Me)})
          Case Cathegories.SHELL_NUMBER
             m_sName = "Reduce Shell Number"
-            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nIndex),
+            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, nIndex)})
+                                                                New NumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, nIndex, Me)})
          Case Cathegories.AUX_SOLID
             m_sName = "Filled Solid"
-            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nIndex),
+            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nIndex)})
+                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nIndex, Me)})
          Case Cathegories.MATERIALS
             m_sName = "Materials"
             Dim sMaterials As String = ""
@@ -389,7 +394,25 @@ Public Class MachiningCathegory
             Dim MaterialGuidList As List(Of String) = sMaterials.Split(";"c).ToList()
             m_MachiningParamList = New List(Of MachiningParam)
             For Each Material In Map.refTopPanelVM.MaterialList
-               m_MachiningParamList.Add(New MaterialMachiningParam(Material.sName, Material.sGUID, MaterialGuidList.Contains(Material.sGUID)))
+               m_MachiningParamList.Add(New MaterialMachiningParam(Material.sName, Material.sGUID, MaterialGuidList.Contains(Material.sGUID), Me))
+            Next
+      End Select
+      ' verifico dipendenze tra parametri
+      Select Case m_Type
+         Case Cathegories.LINK
+            For Each Param In {MachiningParam.Params.LINKTYPE, MachiningParam.Params.LEADIN, MachiningParam.Params.LEADOUT}
+               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
+         Case Cathegories.RIBS
+            For Each Param In {MachiningParam.Params.RIBSTYPE}
+               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
+         Case Cathegories.AUX_SOLID
+            For Each Param In {MachiningParam.Params.AUXSOLIDSINFILL}
+               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
             Next
       End Select
    End Sub
@@ -433,26 +456,29 @@ Public MustInherit Class MachiningParam
       DIRECTION = 10
       FLOORCOUNT = 11
       G0FEED = 12
-      G0FEEDZ = 13
+      LINKZUP = 13
-      TOOLDIAM = 14
+      G0FEEDZ = 14
-      FLOWRATE_PC = 15
+      TOOLDIAM = 15
-      DYNAMIC_MODE = 16
+      FLOWRATE_PC = 16
-      PRINT_ORDER = 17
+      DYNAMIC_MODE = 17
+      PRINT_ORDER = 18
+      PREFLOWDELAY = 19
+      POSTFLOWDELAY = 20
+      SCREWBACK = 21
       LINKTYPE = 51
       LINKPARAM = 52
-      LINKZUP = 53
+      LEADIN = 53
-      LEADIN = 54
+      LEADINTANGDIST = 54
-      LEADINTANGDIST = 55
+      LEADINORTHODIST = 55
-      LEADINORTHODIST = 56
+      OFFSETLEADPOINT = 56
-      OFFSETLEADPOINT = 57
+      LEADOUT = 57
-      LEADOUT = 58
+      LEADOUTTANGDIST = 58
-      LEADOUTTANGDIST = 59
+      LEADOUTORTHODIST = 59
-      LEADOUTORTHODIST = 60
+      COASTINGLEN = 60
-      COASTINGLEN = 61
+      COASTINGFEED_PC = 61
-      COASTINGFEED_PC = 62
+      WIPELEN = 62
-      WIPELEN = 63
+      WIPEFEED_PC = 63
-      WIPEFEED_PC = 64
+      'WIPEDIR = 64
-      'WIPEDIR = 65
       RIBSTYPE = 101
       RIBSOVERLAP = 102
       RIBSSTRANDCOUNT = 103
@@ -500,8 +526,16 @@ Public MustInherit Class MachiningParam
 
    Public MustOverride ReadOnly Property bIsModified As Boolean
 
-   Sub New(Type As Params)
+   Protected m_Cathegory As MachiningCathegory
+   Public ReadOnly Property Cathegory As MachiningCathegory
+      Get
+         Return m_Cathegory
+      End Get
+   End Property
+
+   Sub New(Type As Params, Cathegory As MachiningCathegory)
       m_Type = Type
+      m_Cathegory = Cathegory
       Select Case m_Type
          Case Params.SLICINGTYPE
             m_sName = "Slicing direction"
@@ -555,6 +589,12 @@ Public MustInherit Class MachiningParam
             m_sName = "G0 Feed Z"
          Case Params.TOOLDIAM
             m_sName = "Nozzle Diameter"
+         Case Params.PREFLOWDELAY
+            m_sName = "Pre Flow Delay"
+         Case Params.POSTFLOWDELAY
+            m_sName = "Post Flow Delay"
+         Case Params.SCREWBACK
+            m_sName = "Screw Back"
          Case Params.RIBSTYPE
             m_sName = "Type"
          Case Params.RIBSOVERLAP
@@ -626,8 +666,9 @@ Public MustInherit Class MachiningParam
       End Select
    End Sub
 
-   Sub New(sName As String)
+   Sub New(sName As String, Cathegory As MachiningCathegory)
       m_Type = Params.MATERIALS
+      m_Cathegory = Cathegory
       m_sName = sName
    End Sub
 
@@ -644,6 +685,10 @@ Public Class NumericMachiningParam
 
    Protected m_bIsLen As Boolean = False
 
+   Protected m_bIsActiveMinMax As Boolean = False
+   Protected m_dMinValue As Double
+   Protected m_dMaxValue As Double
+
    Protected m_dValue As Double
    Public ReadOnly Property dValue As Double
       Get
@@ -655,10 +700,18 @@ Public Class NumericMachiningParam
          Return If(m_bIsLen, LenToString(m_dValue, 1), DoubleToString(m_dValue, 2))
       End Get
       Set(value As String)
+         Dim dTempValue As Double = 0
          If m_bIsLen Then
-            StringToLen(value, m_dValue)
+            StringToLen(value, dTempValue)
          Else
-            StringToDouble(value, m_dValue)
+            StringToDouble(value, dTempValue)
+         End If
+         If m_bIsActiveMinMax Then
+            If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
+               m_dValue = dTempValue
+            End If
+         Else
+            m_dValue = dTempValue
          End If
          NotifyPropertyChanged(NameOf(sValue))
       End Set
@@ -677,12 +730,36 @@ Public Class NumericMachiningParam
       End Get
    End Property
 
-   Sub New(Type As Params)
+   Protected m_bIsActive As Boolean = True
-      MyBase.New(Type)
+   Public ReadOnly Property bIsActive As Boolean
+      Get
+         Return m_bIsActive
+      End Get
+   End Property
+   Friend Sub SetIsActive(bValue As Boolean)
+      m_bIsActive = bValue
+      NotifyPropertyChanged(NameOf(bIsActive))
    End Sub
 
-   Sub New(Type As Params, nIndex As Integer)
+   Sub New(Type As Params, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
+   End Sub
+
+   Sub New(Type As Params, nIndex As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, Cathegory)
+      ' leggo ed imposto eventuali min e max
+      Dim sMinMax As String = ""
+      If GetPrivateProfileString(S_MINMAX, Type, "", sMinMax, CurrentMachine.sMachIniFile) > 0 Then
+         Dim sMinMaxValues() As String = sMinMax.Split(","c)
+         Dim dMin As Double = 0
+         Dim dMax As Double = 0
+         If StringToDouble(sMinMaxValues(0), dMin) AndAlso StringToDouble(sMinMaxValues(1), dMax) Then
+            m_dMinValue = dMin
+            m_dMaxValue = dMax
+            m_bIsActiveMinMax = True
+         End If
+      End If
+      ' leggo parametri da Db
       If nIndex = 0 Then
          m_dValue = 0
          m_bIsLen = True
@@ -754,6 +831,15 @@ Public Class NumericMachiningParam
             Case Params.TOOLDIAM
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_TOOLDIAM, 0)
                m_bIsLen = True
+            Case Params.PREFLOWDELAY
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_PREFLOWDELAY, 0)
+               m_bIsLen = False
+            Case Params.POSTFLOWDELAY
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_POSTFLOWDELAY, 0)
+               m_bIsLen = False
+            Case Params.SCREWBACK
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 45)
+               m_bIsLen = False
             Case Params.RIBSOVERLAP
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSOVERLAP, 0)
                m_bIsLen = False
@@ -865,6 +951,12 @@ Public Class NumericMachiningParam
             WriteMachiningParam(nIndex, MAC_G0FEEDZ, sWriteValue, sFilePath)
          Case Params.TOOLDIAM
             WriteMachiningParam(nIndex, MAC_TOOLDIAM, sWriteValue, sFilePath)
+         Case Params.PREFLOWDELAY
+            WriteMachiningParam(nIndex, MAC_PREFLOWDELAY, sWriteValue, sFilePath)
+         Case Params.POSTFLOWDELAY
+            WriteMachiningParam(nIndex, MAC_POSTFLOWDELAY, sWriteValue, sFilePath)
+         Case Params.SCREWBACK
+            WriteMachiningParam(nIndex, MAC_SCREWBACK, sWriteValue, sFilePath)
          Case Params.RIBSOVERLAP
             WriteMachiningParam(nIndex, MAC_RIBSOVERLAP, sWriteValue, sFilePath)
          Case Params.RIBSSTRANDCOUNT
@@ -942,8 +1034,8 @@ Public Class StringMachiningParam
       End Get
    End Property
 
-   Sub New(Type As Params, nIndex As Integer)
+   Sub New(Type As Params, nIndex As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
       m_sValue = sValue
       m_sOrigValue = m_sValue
    End Sub
@@ -984,6 +1076,7 @@ Public Class ComboMachiningParam
       Set(value As IdNameStruct)
          m_SelValue = value
          NotifyPropertyChanged(NameOf(SelValue))
+         ManageDependencyParam()
       End Set
    End Property
 
@@ -1000,12 +1093,23 @@ Public Class ComboMachiningParam
       End Get
    End Property
 
-   Sub New(Type As Params)
+   Protected m_bIsActive As Boolean = True
-      MyBase.New(Type)
+   Public ReadOnly Property bIsActive As Boolean
+      Get
+         Return m_bIsActive
+      End Get
+   End Property
+   Friend Sub SetIsActive(bValue As Boolean)
+      m_bIsActive = bValue
+      NotifyPropertyChanged(NameOf(bIsActive))
    End Sub
 
-   Sub New(Type As Params, nIndex As Integer)
+   Sub New(Type As Params, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
+   End Sub
+
+   Sub New(Type As Params, nIndex As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, Cathegory)
       If nIndex = 0 Then
          m_ValueList = New List(Of IdNameStruct)
          m_SelValue = Nothing
@@ -1082,6 +1186,35 @@ Public Class ComboMachiningParam
       m_OrigSelValue = m_SelValue
    End Sub
 
+   Friend Sub ManageDependencyParam()
+      ' gestisco dis/attivazione parametri dipendenti
+      Select Case m_Type
+         Case Params.LINKTYPE
+            Dim NumMachiningParam As NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.LINKPARAM)
+            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_LINKTYPES.NONE)
+         Case Params.LEADIN
+            Dim NumMachiningParam As NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.LEADINTANGDIST)
+            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_LEADINOUT.NONE)
+            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.LEADINORTHODIST)
+            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_LEADINOUT.NONE)
+         Case Params.LEADOUT
+            Dim NumMachiningParam As NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.LEADOUTTANGDIST)
+            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_LEADINOUT.NONE)
+            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.LEADOUTORTHODIST)
+            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_LEADINOUT.NONE)
+         Case Params.RIBSTYPE
+            Dim CheckMachiningParam As CheckMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.RIBSLIMITUNBOUNDEDWITHSOLID)
+            CheckMachiningParam.SetIsActive(m_SelValue.Id = MPAR_RIBSTYPE.UNBOUNDED)
+         Case Params.AUXSOLIDSINFILL
+            Dim ComboMachiningParam As ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSSTRANDORDER)
+            ComboMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL.OFFSET)
+            ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSLINKTYPE)
+            ComboMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL.OFFSET)
+            Dim NumMachiningParam As NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSLINKPARAM)
+            NumMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL.OFFSET)
+      End Select
+   End Sub
+
    Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
       Select Case Type
          Case Params.SLICINGTYPE
@@ -1147,12 +1280,23 @@ Public Class CheckMachiningParam
       End Get
    End Property
 
-   Sub New(Type As Params)
+   Protected m_bIsActive As Boolean = True
-      MyBase.New(Type)
+   Public ReadOnly Property bIsActive As Boolean
+      Get
+         Return m_bIsActive
+      End Get
+   End Property
+   Friend Sub SetIsActive(bValue As Boolean)
+      m_bIsActive = bValue
+      NotifyPropertyChanged(NameOf(bIsActive))
    End Sub
 
-   Sub New(Type As Params, nIndex As Integer)
+   Sub New(Type As Params, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
+   End Sub
+
+   Sub New(Type As Params, nIndex As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, Cathegory)
       If nIndex = 0 Then
          m_bValue = 0
       Else
@@ -1247,8 +1391,8 @@ Public Class MaterialMachiningParam
       End Get
    End Property
 
-   Sub New(sName As String, sGUID As String, bValue As Boolean)
+   Sub New(sName As String, sGUID As String, bValue As Boolean, Cathegory As MachiningCathegory)
-      MyBase.New(sName)
+      MyBase.New(sName, Cathegory)
       m_sGUID = sGUID
       m_bValue = bValue
       m_bOrigValue = m_bValue
@@ -1373,12 +1517,12 @@ Public Class OrderedMachiningParam
    Private m_cmdMoveDownOrder As ICommand
    Private m_cmdResetOrder As ICommand
 
-   Sub New(Type As Params)
+   Sub New(Type As Params, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
    End Sub
 
-   Sub New(Type As Params, nIndex As Integer)
+   Sub New(Type As Params, nIndex As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
       If nIndex = 0 Then
          Select Case Type
             Case Params.PRINT_ORDER

Icarus/MachiningDb/MachiningDbV.xaml

@@ -134,7 +134,8 @@
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.Resources>
                               <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid Margin="0,1,2.5,1"
+                                       IsEnabled="{Binding bIsActive}">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
@@ -142,14 +143,15 @@
                                     <TextBlock Text="{Binding sName}"
                                                Margin="0,0,2.5,0"
                                                Style="{StaticResource ParameterList_TextBlock}"/>
-                                    <TextBox Grid.Column="1"
+                                    <EgtWPFLib5:EgtTextBox2 Grid.Column="1"
-                                             Text="{Binding sValue}"
+                                                            Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                             Margin="2.5,0,0,0"
+                                                            Margin="2.5,0,0,0"
-                                             Style="{StaticResource ParameterList_TextBox}"/>
+                                                            Style="{StaticResource ParameterList_TextBox2}"/>
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid Margin="0,1,2.5,1"
+                                       IsEnabled="{Binding bIsActive}">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="1*"/>
@@ -167,7 +169,8 @@
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
                                  <Grid Height="22"
-                                       Margin="0,1,2.5,1">
+                                       Margin="0,1,2.5,1"
+                                       IsEnabled="{Binding bIsActive}">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>

Icarus/MachiningDb/MachiningDbVM.vb

@@ -26,7 +26,8 @@ Public Class MachiningDbVM
             ' verifico se modificato
             If m_SelMachining.bIsModified Then
                ' chiedo se salvare
-               Select Case MessageBox.Show("Do you want to save the modification done on the selected machining?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+               Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Do you want to save the modification done on the selected machining?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+                            'MessageBox.Show("Do you want to save the modification done on the selected machining?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
                   Case MessageBoxResult.Yes
                      m_SelMachining.Save()
                   Case MessageBoxResult.No
@@ -198,7 +199,8 @@ Public Class MachiningDbVM
    Public Sub Ok()
       If Not IsNothing(m_SelMachining) AndAlso m_SelMachining.bIsModified Then
          ' chiedo se salvare
-         Select Case MessageBox.Show("Do you want to save modified parameters?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
+         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Do you want to save modified parameters?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
+                'MessageBox.Show("Do you want to save modified parameters?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
             Case MessageBoxResult.Yes
                m_SelMachining.Save()
             Case MessageBoxResult.No
@@ -309,7 +311,8 @@ Public Class MachiningDbVM
    Public Sub Delete()
       If IsNothing(m_SelMachining) Then Return
       ' chiedo conferma
-      Select Case MessageBox.Show("Are you sure you want to delete the selected machining?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
+      Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Are you sure you want to delete the selected machining?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
+            'MessageBox.Show("Are you sure you want to delete the selected machining?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
          Case MessageBoxResult.Yes
             m_MachiningList.Remove(m_SelMachining)
             SetIsModified(True)

Icarus/MainWindow/MainWindowM.vb

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

Icarus/MainWindow/MainWindowVM.vb

@@ -15,6 +15,9 @@ Public Class MainWindowVM
       End Get
    End Property
 
+   ' Funzioni di callback per output in interfaccia da LUA
+   Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
+
    ' Variabile che indica che il programma è stato avviato correttamente (sia la mappa che l'ambiente Egt)
    Private m_bInitStatus As Boolean
    Friend ReadOnly Property bInitStatus As Boolean
@@ -74,6 +77,8 @@ Public Class MainWindowVM
       m_MainWindowM = New MainWindowM
       ' inizializzo machine panel
       m_MachinePanelVM = New MachinePanelVM
+      ' Installo funzione gestione eventi per lua
+      EgtSetProcessEvents(m_ProcEventsCallback)
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -142,6 +147,17 @@ Public Class MainWindowVM
       End If
    End Sub
 
+   Private Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
+      If Map.refSliceManagerVM.bCalculating OrElse Map.refSliceManagerVM.bCalcSolid Then
+         Map.refSliceManagerVM.ProcessEvents(nProg, nPause)
+      End If
+      If Not IsNothing(Map.refImportLoadingWndVM) Then
+         Map.refImportLoadingWndVM.ProcessEvents(nProg, nPause)
+      End If
+      Map.refMyStatusBarVM.ProcessEvents(nProg, nPause)
+      Return 0
+   End Function
+
    Friend Sub CloseApplication()
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          Return
@@ -210,7 +226,8 @@ Public Class MainWindowVM
    ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
    Public Sub CloseApplication(ByVal param As Object)
       If Map.refSliceManagerVM.bCalculating Then
-         MessageBox.Show("Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show("Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       CloseApplication()

Icarus/ManagePartPanel/ManagePartPanelV.xaml

@@ -145,13 +145,20 @@
                       Rows="1"
                       IsEnabled="{Binding IsEnabled}"
                       Margin="0,2.5,0,0">
-            <Button Content="Ok"
+            <Button Command="{Binding Ok_Command}"
-                    Command="{Binding Ok_Command}"
+                    IsDefault="True"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                    Margin="0,0,2.5,0"
-            <Button Content="Cancel"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
-                    Command="{Binding Cancel_Command}"
+               <Image Source="\Resources\Common\Ok.png"
+                      Style="{StaticResource Button_Image}"/>
+            </Button>
+            <Button Command="{Binding Cancel_Command}"
                     Visibility="{Binding IsImport_Visibility}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                    Margin="0,0,2.5,0"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
+               <Image Source="\Resources\Common\Cancel.png"
+                      Style="{StaticResource Button_Image}"/>
+            </Button>
          </UniformGrid>
       </Grid>
    </Border>

Icarus/ManagePartPanel/ManagePartPanelVM.vb

@@ -286,7 +286,8 @@ Public Class ManagePartPanelVM
                Next
             Next
             If sErr.Count > 0 Then
-               MessageBox.Show(String.Concat(sErr), "Error")
+               'MessageBox.Show(String.Concat(sErr), "Error")
+               EgtMessageBoxV.Show(Application.Current.MainWindow, String.Concat(sErr), "Error")
                Return
             Else
                ' Creo pezzi e layer necessari

Icarus/ManagePartPanel/ManagePartUtility.vb

@@ -629,7 +629,8 @@ Public Class GeomEntity_MenuItem
          Map.refManagePartPanelVM.SetIsEnabled(True)
          Return
       ElseIf m_Type = ManagePart_Layer.LayerType.DELETE Then
-         If MessageBox.Show("Are you sure you want to delete this entity?", "Delete confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         'If MessageBox.Show("Are you sure you want to delete this entity?", "Delete confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         If EgtMessageBoxV.Show(Application.Current.MainWindow, "Are you sure you want to delete this entity?", "Delete confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
             EgtErase(m_OrigEntity.nId)
             ' se l'entita' e' gia' in lista pezzi
             If Not IsNothing(m_OrigEntity.OrigLayer) Then
@@ -1037,7 +1038,8 @@ Public Class ManagerLayer_MenuItem
          Case Else   ' PartMenuCmd.IMPORTPRINT
             Dim bDeleteOldPrint As Boolean = False
             If m_OrigLayer.EntityList.Count > 0 Then
-               If MessageBox.Show("Importing a new print solid the current one will be deleted. Are you sure you want to proced?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
+               'If MessageBox.Show("Importing a new print solid the current one will be deleted. Are you sure you want to proced?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
+               If EgtMessageBoxV.Show(Application.Current.MainWindow, "Importing a new print solid the current one will be deleted. Are you sure you want to proced?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
                   Return
                Else
                   bDeleteOldPrint = True

Icarus/MaterialDb/Material.vb

@@ -769,7 +769,8 @@ Public Class StringMaterialParam
    End Property
 
    Public Sub Original()
-      If MessageBox.Show("Are you sure you want to set this material as original?", "Original material confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+      'If MessageBox.Show("Are you sure you want to set this material as original?", "Original material confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+      If EgtMessageBoxV.Show(Application.Current.MainWindow, "Are you sure you want to set this material as original?", "Original material confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
          m_sGUID = ORIG_MATERIAL
          m_sValue = ORIG_MATERIAL
          NotifyPropertyChanged(NameOf(sValue))

Icarus/MaterialDb/MaterialDbVM.vb

@@ -24,7 +24,8 @@ Public Class MaterialDbVM
          ' verifico se modificato
          If Not IsNothing(m_SelMaterial) AndAlso m_SelMaterial.bIsModified Then
             ' chiedo se salvare
-            Select Case MessageBox.Show("Do you want to save material modification?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+            'Select Case MessageBox.Show("Do you want to save material modification?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+            Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Do you want to save material modification?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
                Case MessageBoxResult.Yes
                   m_SelMaterial.Save()
                Case MessageBoxResult.No
@@ -236,7 +237,8 @@ Public Class MaterialDbVM
    Public Sub Ok()
       If Not IsNothing(m_SelMaterial) AndAlso m_SelMaterial.bIsModified Then
          ' chiedo se salvare
-         Select Case MessageBox.Show("Do you want to save material modification?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
+         'Select Case MessageBox.Show("Do you want to save material modification?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
+         Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Do you want to save material modification?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
             Case MessageBoxResult.Yes
                m_SelMaterial.Save()
             Case MessageBoxResult.No
@@ -365,17 +367,20 @@ Public Class MaterialDbVM
       ' se materiale originale, esco
       If SelMaterialIsOriginal() Then
          If Map.refMainWindowVM.MainWindowM.nUserLevel >= 5 Then
-            If MessageBox.Show("Trying to delete an Original Material! Are you sure you want to delete it?", "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
+            'If MessageBox.Show("Trying to delete an Original Material! Are you sure you want to delete it?", "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
+            If EgtMessageBoxV.Show(Application.Current.MainWindow, "Trying to delete an Original Material! Are you sure you want to delete it?", "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
                Return
             End If
             sCheckMessage = "Trying to delete an Original Material! Are you ABSOLUTELY sure you want to delete it?"
          Else
-            MessageBox.Show("Original material impossible to delete!")
+            'MessageBox.Show("Original material impossible to delete!")
+            EgtMessageBoxV.Show(Application.Current.MainWindow, "Original material impossible to delete!")
             Return
          End If
       End If
       ' chiedo conferma
-      Select Case MessageBox.Show(sCheckMessage, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
+      Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, sCheckMessage, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
+            'MessageBox.Show(sCheckMessage, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
          Case MessageBoxResult.Yes
             m_MaterialList.Remove(m_SelMaterial)
             SetIsModified(True)

Icarus/My Project/AssemblyInfo.vb

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

Icarus/OptionsWindow/OptionWindowVM.vb

@@ -563,17 +563,17 @@ Public Class OptionWindowVM
    End Property
    Public ReadOnly Property ThickLineMsg As String
       Get
-         Return EgtMsg( 6536)                     ' Linee spesse
+         Return EgtMsg(6536)                     ' Linee spesse
       End Get
    End Property
    Public ReadOnly Property SmoothTriMeshMsg As String
       Get
-         Return EgtMsg( 6518)                     ' Superfici smussate
+         Return EgtMsg(6518)                     ' Superfici smussate
       End Get
    End Property
    Public ReadOnly Property UpdateLicenceMsg As String
       Get
-         Return EgtMsg( 6553)                     ' Aggiorna licenza
+         Return EgtMsg(6553)                     ' Aggiorna licenza
       End Get
    End Property
 
@@ -953,31 +953,32 @@ Public Class OptionWindowVM
       Dim sMachDir As String = Path.Combine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, sMachName)
       ' Preparo direttorio temporaneo
       Dim sTempDir As String = Path.Combine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, "Temp")
-      If My.Computer.FileSystem.DirectoryExists( sTempDir) Then
+      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       End If
-      My.Computer.FileSystem.CreateDirectory( sTempDir)
+      My.Computer.FileSystem.CreateDirectory(sTempDir)
       ' Unzip nel direttorio temporaneo
       Using zip As New Ionic.Zip.ZipFile(sMachZip)
-         zip.ExtractAll( sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
+         zip.ExtractAll(sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
       End Using
       ' Se non è una macchina segnalo il problema ed esco
-      If Not My.Computer.FileSystem.FileExists( Path.Combine( sTempDir, sMachName, sMachName & ".ini"))  Or
+      If Not My.Computer.FileSystem.FileExists(Path.Combine(sTempDir, sMachName, sMachName & ".ini")) Or
-         Not My.Computer.FileSystem.FileExists( Path.Combine( sTempDir, sMachName, sMachName & ".mlde")) Then
+         Not My.Computer.FileSystem.FileExists(Path.Combine(sTempDir, sMachName, sMachName & ".mlde")) Then
          ' Il file {0} non contiene una macchina  -  Avviso
          Dim sOut As String = String.Format(EgtMsg(6529), sMachZip)
-         MessageBox.Show(sOut, EgtMsg(MSG_MESSAGEBOX + 2), MessageBoxButton.OK, MessageBoxImage.Warning)
+         'MessageBox.Show(sOut, EgtMsg(MSG_MESSAGEBOX + 2), MessageBoxButton.OK, MessageBoxImage.Warning)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(MSG_MESSAGEBOX + 2), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End If
       ' Imposto data e ora correnti al file mlde della macchina
       Try
-         File.SetLastWriteTime( Path.Combine( sTempDir, sMachName, sMachName & ".mlde"), System.DateTime.Now)
+         File.SetLastWriteTime(Path.Combine(sTempDir, sMachName, sMachName & ".mlde"), System.DateTime.Now)
       Catch ex As Exception
       End Try
       ' Verifico esistenza di una macchina con lo stesso nome
-      Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists( sMachDir)
+      Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists(sMachDir)
       Dim bUpdate As Boolean = True
       If bOldExists Then
          Dim MachBox As New UpdateMachineV(Application.Current.MainWindow, New UpdateMachineVM(sMachName))
@@ -994,31 +995,32 @@ Public Class OptionWindowVM
          End Select
          ' Faccio una copia di backup della macchina corrente
          Dim sBackupDir As String = sMachDir & ".old"
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir) Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir) Then
-            My.Computer.FileSystem.DeleteDirectory( sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+            My.Computer.FileSystem.DeleteDirectory(sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          End If
          Try
-            My.Computer.FileSystem.MoveDirectory( sMachDir, sBackupDir, True)
+            My.Computer.FileSystem.MoveDirectory(sMachDir, sBackupDir, True)
          Catch ex As Exception
             ' Ripristino lo stato originale ed esco
-            My.Computer.FileSystem.MoveDirectory( sBackupDir, sMachDir, True)
+            My.Computer.FileSystem.MoveDirectory(sBackupDir, sMachDir, True)
             ' L'aggiornamento della macchina "{0}" non è riuscito.
             Dim sKo As String = String.Format(EgtMsg(6535), sMachName)
-            EgtOutLog( sKo)
+            EgtOutLog(sKo)
-            MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
+            'MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
             Return
          End Try
       End If
       ' Installo la macchina
-      My.Computer.FileSystem.MoveDirectory( Path.Combine( sTempDir, sMachName), sMachDir, True)
+      My.Computer.FileSystem.MoveDirectory(Path.Combine(sTempDir, sMachName), sMachDir, True)
       ' Se è un aggiornamento, recupero utensili, lavorazioni, attrezzaggi e dati per travi
       If bOldExists And bUpdate Then
          Dim sBackupDir As String = sMachDir & ".old"
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir & "\Tools") Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\Tools") Then
-            If My.Computer.FileSystem.DirectoryExists( sMachDir & "\Tools") Then
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\Tools") Then
-                My.Computer.FileSystem.DeleteDirectory( sMachDir & "\Tools", FileIO.DeleteDirectoryOption.DeleteAllContents)
+               My.Computer.FileSystem.DeleteDirectory(sMachDir & "\Tools", FileIO.DeleteDirectoryOption.DeleteAllContents)
             End If
-            My.Computer.FileSystem.CopyDirectory( sBackupDir & "\Tools", sMachDir & "\Tools", True)
+            My.Computer.FileSystem.CopyDirectory(sBackupDir & "\Tools", sMachDir & "\Tools", True)
          End If
          If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\Machinings") Then
             If My.Computer.FileSystem.DirectoryExists(sMachDir & "\Machinings") Then
@@ -1038,57 +1040,20 @@ Public Class OptionWindowVM
             End If
             My.Computer.FileSystem.CopyDirectory(sBackupDir & "\SetUp", sMachDir & "\SetUp", True)
          End If
-         'If My.Computer.FileSystem.DirectoryExists( sBackupDir & "\Beam") Then
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\CustomData") Then
-         '   ' Flag per sovrascrivere vecchio file BeamData.lua con nuovo
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\CustomData") Then
-         '   Dim bBeamDataExists As Boolean = False
+               My.Computer.FileSystem.DeleteDirectory(sMachDir & "\CustomData", FileIO.DeleteDirectoryOption.DeleteAllContents)
-         '   Const sBeamData As String = "\BeamData.lua"
+            End If
-         '   ' Flag per sovrascrivere vecchio file MachiningTypes.ini
+            My.Computer.FileSystem.CopyDirectory(sBackupDir & "\CustomData", sMachDir & "\CustomData", True)
-         '   Dim bMchgTypesExists As Boolean = False
+         End If
-         '   Const sMchgTypes As String = "\MachiningTypes.ini"
-         '   If My.Computer.FileSystem.DirectoryExists( sMachDir & "\Beam") Then
-         '      If My.Computer.FileSystem.FileExists( sMachDir & "\Beam" & sBeamData) Then
-         '         bBeamDataExists = True
-         '         My.Computer.FileSystem.MoveFile( sMachDir & "\Beam" & sBeamData, sMachDir & sBeamData, True) 
-         '      End If
-         '      If My.Computer.FileSystem.FileExists( sMachDir & "\Beam" & sMchgTypes) Then
-         '         bMchgTypesExists = True
-         '         My.Computer.FileSystem.MoveFile( sMachDir & "\Beam" & sMchgTypes, sMachDir & sMchgTypes, True) 
-         '      End If
-         '      My.Computer.FileSystem.DeleteDirectory( sMachDir & "\Beam", FileIO.DeleteDirectoryOption.DeleteAllContents)
-         '   End If
-         '   My.Computer.FileSystem.CopyDirectory( sBackupDir & "\Beam", sMachDir & "\Beam", True)
-         '   If bBeamDataExists Then My.Computer.FileSystem.MoveFile( sMachDir & sBeamData, sMachDir & "\Beam" & sBeamData, True)
-         '   If bMchgTypesExists Then My.Computer.FileSystem.MoveFile( sMachDir & sMchgTypes, sMachDir & "\Beam" & sMchgTypes, True)
-         'End If
-         'If My.Computer.FileSystem.DirectoryExists( sBackupDir & "\Wall") Then
-         '   ' Flag per sovrascrittura vecchio file WallData.lua con nuovo
-         '   Dim bWallDataExists As Boolean = False
-         '   Const sWallData As String = "\WallData.lua"
-         '   ' Flag per sovrascrivere vecchio file MachiningTypes.ini
-         '   Dim bMchgTypesExists As Boolean = False
-         '   Const sMchgTypes As String = "\MachiningTypes.ini"
-         '   If My.Computer.FileSystem.DirectoryExists( sMachDir & "\Wall") Then
-         '      If My.Computer.FileSystem.FileExists( sMachDir & "\Wall" & sWallData) Then
-         '         bWallDataExists = True
-         '         My.Computer.FileSystem.MoveFile( sMachDir & "\Wall" & sWallData, sMachDir & sWallData, True) 
-         '      End If
-         '      If My.Computer.FileSystem.FileExists( sMachDir & "\Wall" & sMchgTypes) Then
-         '         bMchgTypesExists = True
-         '         My.Computer.FileSystem.MoveFile( sMachDir & "\Wall" & sMchgTypes, sMachDir & sMchgTypes, True) 
-         '      End If
-         '      My.Computer.FileSystem.DeleteDirectory( sMachDir & "\Wall", FileIO.DeleteDirectoryOption.DeleteAllContents)
-         '   End If
-         '   My.Computer.FileSystem.CopyDirectory( sBackupDir & "\Wall", sMachDir & "\Wall", True)
-         '   If bWallDataExists Then My.Computer.FileSystem.MoveFile( sMachDir & sWallData, sMachDir & "\Wall" & sWallData, True)
-         '   If bMchgTypesExists Then My.Computer.FileSystem.MoveFile( sMachDir & sMchgTypes, sMachDir & "\Wall" & sMchgTypes, True)
-         'End If
       End If
       'La macchina "{0}" è stata aggiornata con successo.
       Dim sOk As String = String.Format(EgtMsg(6530), sMachName)
-      EgtOutLog( sOk)
+      EgtOutLog(sOk)
-      MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
+      'MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
+      EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
       ' Rimuovo il direttorio temporaneo
-      My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+      My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       ' Aggiorno la lista delle macchina
       MyMachine.InsertMachine(sMachDir, Map.refMachinePanelVM.MachineList)
    End Sub
@@ -1134,7 +1099,7 @@ Public Class OptionWindowVM
             ' aggiungo i file della Macchina
             Dim sMachineDir As String = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & sCurrMachineName
             If Directory.Exists(sMachineDir) Then
-               zip.AddSelectedFiles( "name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
+               zip.AddSelectedFiles("name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
             End If
             ' salvo lo zip
             zip.Save()
@@ -1144,12 +1109,14 @@ Public Class OptionWindowVM
          ' L'esportazione della macchina "{0}" non è riuscita.
          Dim sKo As String = String.Format(EgtMsg(6551), sCurrMachineName)
          EgtOutLog(sKo)
-         MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
+         'MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
       End Try
       'La macchina "{0}" è stata esportata con successo.
       Dim sOk As String = String.Format(EgtMsg(6552), sCurrMachineName)
       EgtOutLog(sOk)
-      MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
+      'MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
+      EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
    End Sub
 
 #End Region ' ExportMachine

Icarus/ProjManager/ProjManagerVM.vb

@@ -149,6 +149,9 @@ Public Class ProjManagerVM
    ''' Execute the Save.  This method is invoked by the SaveCommand.
    ''' </summary>
    Public Sub NewProjectCmd()
+      '   'MessageBox.Show("Testo di prova EgtMessageBox", "Titolo di prova")
+      '   Dim x = EgtMessageBoxV.Show(Application.Current.MainWindow, "Testo di prova EgtMessageBox", "Titolo di prova", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning, MessageBoxResult.Yes)
+
       NewProject(True)
    End Sub
 
@@ -193,23 +196,11 @@ Public Class ProjManagerVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub Open()
-      OpenProject(Nothing)
+      OpenProject("")
    End Sub
 
    Friend Function OpenProject(sFilePath As String) As Boolean
-      If String.IsNullOrEmpty(sFilePath) Then
+      Return Map.refSceneHostVM.OpenProject(sFilePath)
-         ' Recupero cartella dell'ultimo progetto aperto
-         Dim sDir As String = Map.refSceneHostVM.MainController.GetCurrFile()
-         If String.IsNullOrWhiteSpace(sDir) Then
-            GetMainPrivateProfileString(S_MRUFILES, K_FILE & 1, "", sDir)
-         End If
-         If Not String.IsNullOrWhiteSpace(sDir) Then
-            sDir = Path.GetDirectoryName(sDir)
-         End If
-         Return Map.refSceneHostVM.MainController.OpenProject(sDir)
-      Else
-         Return Map.refSceneHostVM.MainController.OpenProject(sFilePath, False)
-      End If
    End Function
 
 #End Region ' OpenCommand
@@ -382,7 +373,8 @@ Public Class ProjManagerVM
       GetMainPrivateProfileString(S_GENERAL, K_SUPPORT, "support@egaltech.com", sSupportAddress)
       ' se vuoto do messaggio di errore ed esco
       If String.IsNullOrWhiteSpace(sSupportAddress) Then
-         MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       ' Recupero numero chiave
@@ -393,14 +385,16 @@ Public Class ProjManagerVM
       EgtGetCurrFilePath(sCurrProject)
       ' se nome file vuoto o con estensione non valida, chiedo se si vuole salvare
       If String.IsNullOrWhiteSpace(sCurrProject) Or EgtGetFileType(sCurrProject) <> FT.NGE Then
-         If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         'If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
             Map.refSceneHostVM.SaveProject()
          End If
          EgtGetCurrFilePath(sCurrProject)
-      ' se modificato, chiedo se si vuole salvare
+         ' se modificato, chiedo se si vuole salvare
       Else
          If EgtGetModified() Then
-            If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+            'If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+            If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
                Map.refSceneHostVM.SaveProject()
             End If
          End If
@@ -487,7 +481,8 @@ Public Class ProjManagerVM
          bEx = True
       End Try
       If bEx OrElse EgtWPFLib5.MapiMailMessage.m_ErrorCode <> 0 Then
-         MessageBox.Show(String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
+         'MessageBox.Show(String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
       Else
          Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(MSG_TOPCOMMANDBAR + 14), 5)
       End If

Icarus/Project/ProjectV.xaml

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

Icarus/Project/ProjectVM.vb

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

Icarus/ReferencePanel/ReferencePanelV.xaml

@@ -1,6 +1,7 @@
 <UserControl x:Class="ReferencePanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:PrintApp="clr-namespace:Icarus">
    <Border Padding="2.5"
            Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
@@ -33,12 +34,33 @@
             </ListBox.ItemContainerStyle>
             <ListBox.ItemTemplate>
                <DataTemplate>
-                  <RadioButton Content="{Binding sText}"
+                  <PrintApp:CheckedImageRadioButton IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
-                               IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
+                                                    ImageSource="{Binding sText}"
-                               FontSize="40"
+                                                    CheckedImageSource="{Binding sSelText}"
-                               GroupName="ReferenceRadio"
+                                                    FontSize="40"
-                               Margin="2.5,2.5,2.5,2.5"
+                                                    GroupName="ReferenceRadio"
-                               Style="{StaticResource OptionPanel_NestingToggleButton}"/>
+                                                    Margin="2.5,2.5,2.5,2.5">
+                     <!--<RadioButton.Resources>
+                        <DataTemplate x:Key="Normal">
+                           <Image Source="{Binding sText}"
+                                  Style="{StaticResource Button_Image}"/>
+                        </DataTemplate>
+                        <DataTemplate x:Key="Selected">
+                           <Image Source="{Binding sSelText}"
+                                  Style="{StaticResource Button_Image}"/>
+                        </DataTemplate>
+                     </RadioButton.Resources>
+                     <RadioButton.Style>
+                        <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource OptionPanel_NestingToggleButton}">
+                           <Setter Property="ContentTemplate" Value="{StaticResource Normal}"/>
+                           <Style.Triggers>
+                              <Trigger Property="IsChecked" Value="True">
+                                 <Setter Property="ContentTemplate" Value="{StaticResource Selected}"/>
+                              </Trigger>
+                           </Style.Triggers>
+                        </Style>
+                     </RadioButton.Style>-->
+                  </PrintApp:CheckedImageRadioButton>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>

Icarus/ReferencePanel/ReferencePanelVM.vb

@@ -190,25 +190,52 @@ Public Class ReferenceBtn
       Get
          Select Case Type
             Case References.TL
-               Return "┌"
+               Return "/Resources/ReferencePanel/TL.png"    '"┌"
             Case References.TR
-               Return "┐"
+               Return "/Resources/ReferencePanel/TR.png"    '"┐"
             Case References.BL
-               Return "└"
+               Return "/Resources/ReferencePanel/BL.png"    '"└"
             Case References.BR
-               Return "┘"
+               Return "/Resources/ReferencePanel/BR.png"    '"┘"
             Case References.TC
-               Return "┬"
+               Return "/Resources/ReferencePanel/TC.png"    '"┬"
             Case References.ML
-               Return "├"
+               Return "/Resources/ReferencePanel/ML.png"    '"├"
             Case References.MR
-               Return "┤"
+               Return "/Resources/ReferencePanel/MR.png"    '"┤"
             Case References.BC
-               Return "┴"
+               Return "/Resources/ReferencePanel/BC.png"    '"┴"
             Case References.MC
-               Return "┼"
+               Return "/Resources/ReferencePanel/MC.png"    '"┼"
             Case Else
-               Return "X"
+               Return ""    '"X"
+         End Select
+      End Get
+   End Property
+
+   Public ReadOnly Property sSelText As String
+      Get
+         Select Case Type
+            Case References.TL
+               Return "/Resources/ReferencePanel/White_TL.png"    '"┌"
+            Case References.TR
+               Return "/Resources/ReferencePanel/White_TR.png"    '"┐"
+            Case References.BL
+               Return "/Resources/ReferencePanel/White_BL.png"    '"└"
+            Case References.BR
+               Return "/Resources/ReferencePanel/White_BR.png"    '"┘"
+            Case References.TC
+               Return "/Resources/ReferencePanel/White_TC.png"    '"┬"
+            Case References.ML
+               Return "/Resources/ReferencePanel/White_ML.png"    '"├"
+            Case References.MR
+               Return "/Resources/ReferencePanel/White_MR.png"    '"┤"
+            Case References.BC
+               Return "/Resources/ReferencePanel/White_BC.png"    '"┴"
+            Case References.MC
+               Return "/Resources/ReferencePanel/White_MC.png"    '"┼"
+            Case Else
+               Return ""    '"X"
          End Select
       End Get
    End Property

Icarus/RibPanel/RibPanelVM.vb

@@ -42,6 +42,10 @@ Public Class RibPanelVM
          Return m_SelRib
       End Get
       Set(value As RibEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refRibPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelRib))
+            Return
+         End If
          m_SelRib = value
          EgtDeselectAll()
          If Not IsNothing(value) Then
@@ -238,7 +242,7 @@ Public Class RibPanelVM
          Return m_bAdd_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bAdd_IsChecked = value
             If value Then
                m_bEdit_IsChecked = False
@@ -260,7 +264,7 @@ Public Class RibPanelVM
          Return m_bEdit_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bEdit_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -284,7 +288,7 @@ Public Class RibPanelVM
          Return m_bGrid_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bGrid_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -312,7 +316,7 @@ Public Class RibPanelVM
          Return m_bMove_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bMove_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -336,7 +340,7 @@ Public Class RibPanelVM
          Return m_bRotate_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not IsNothing(m_SelRib) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bRotate_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -360,7 +364,7 @@ Public Class RibPanelVM
          Return m_bMachParam_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelRib) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
+         If Not IsNothing(m_SelRib) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
             m_bMachParam_IsChecked = True
             m_bAdd_IsChecked = False
             m_bEdit_IsChecked = False
@@ -374,6 +378,8 @@ Public Class RibPanelVM
             NotifyPropertyChanged(NameOf(bRotate_IsChecked))
             Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.RIBPARAM)
             NotifyPropertyChanged(NameOf(RibList_IsEnabled))
+            ' disattivo interfaccia
+            ManageInterface(False)
          Else
             NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
          End If
@@ -383,6 +389,8 @@ Public Class RibPanelVM
       m_bMachParam_IsChecked = False
       NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
       NotifyPropertyChanged(NameOf(RibList_IsEnabled))
+      ' riattivo interfaccia
+      ManageInterface(True)
    End Sub
 
    Public ReadOnly Property Compo_Visibility As Visibility
@@ -391,11 +399,17 @@ Public Class RibPanelVM
       End Get
    End Property
 
+   Private m_RibList_IsEnabled As Boolean = False
    Public ReadOnly Property RibList_IsEnabled As Boolean
       Get
-         Return Not m_bMachParam_IsChecked
+         Return If(m_RibList.Count > 0, m_RibList_IsEnabled, False)
       End Get
    End Property
+   Friend Sub SetRibListIsEnabled(bValue As Boolean)
+      m_RibList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(RibList_IsEnabled))
+   End Sub
+
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -413,6 +427,8 @@ Public Class RibPanelVM
       End Get
    End Property
 
+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"
 
    Public ReadOnly Property Import_ToolTip As String
@@ -542,7 +558,6 @@ Public Class RibPanelVM
    Private m_cmdCPlaneObj As ICommand
    Private m_cmdDragMove As ICommand
    Private m_cmdDragRotate As ICommand
-   Private m_cmdMachParam As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -597,6 +612,8 @@ Public Class RibPanelVM
          SelRib = m_RibList(0)
          NotifyPropertyChanged(NameOf(SelRib))
       End If
+      ' abilito lista ribs
+      SetRibListIsEnabled(True)
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
 
@@ -632,8 +649,13 @@ Public Class RibPanelVM
             EgtSelectObj(m_SelRib.nCurveId)
          Case RibSelectionTypes.EXTRUSION
             ' creo layer per estrusione
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelRib.nCurveId)
          Case RibSelectionTypes.BOTH
@@ -641,6 +663,8 @@ Public Class RibPanelVM
             EgtSelectObj(m_SelRib.nExtrusionId)
       End Select
       EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
       Return True
    End Function
 
@@ -650,6 +674,7 @@ Public Class RibPanelVM
    End Sub
 
    Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
       Select Case command
          Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
             ' leggo altezza estrusione
@@ -689,6 +714,10 @@ Public Class RibPanelVM
             ' Imposto flag di ricalcolo slice
             EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Select
+      ' se non ho creato percorso riabilito interfaccia
+      If Not m_bIsCreatingPath Then
+         ManageInterface(True)
+      End If
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
@@ -740,18 +769,25 @@ Public Class RibPanelVM
             ' lo seleziono
             SelRib = NewEntity
             NotifyPropertyChanged(NameOf(SelRib))
-            ' creo layer per estrusione
+            ' verifico se esiste gia' layer estrusione e lo svuoto
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId <> GDB_ID.NULL Then
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            Else
+               ' altrimenti lo creo
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             ' seleziono percorso da estrudere
             EgtDeselectAll()
             EgtSelectObj(nNewEntityId)
             If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
                m_bIsCreatingExtrusion = True
+               If Not EgtCurveIsClosed(nNewEntityId) Then
+                  m_bEscOnLine2P = True
+               End If
             Else
-               ' cancello layer
-               'EgtErase(nNewRibLayerId)
                EgtErase(nNewExtrusionLayerId)
             End If
          End If
@@ -774,6 +810,13 @@ Public Class RibPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
+            ManageInterface(True)
+         End If
       End If
    End Sub
 
@@ -809,6 +852,18 @@ Public Class RibPanelVM
       Return nRibIndex + 1
    End Function
 
+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
+      SetRibListIsEnabled(bValue)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -831,8 +886,10 @@ Public Class RibPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Import(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.InsertRib()
+      ManageInterface(True)
    End Sub
 
 #End Region ' Import
@@ -855,7 +912,8 @@ Public Class RibPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
       If nNewRibLayerId = GDB_ID.NULL Then nNewRibLayerId = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewRibLayerId, LAY_NEWRIB)
@@ -880,7 +938,7 @@ Public Class RibPanelVM
    End Property
 
    Public Sub Delete()
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       If IsNothing(SelRib) Then Return
       Dim bOk As Boolean = False
       Select Case m_SelRib.Type
@@ -900,10 +958,11 @@ Public Class RibPanelVM
          Else
             SelRib = Nothing
             m_bEdit_IsChecked = False
-            NotifyPropertyChanged(NameOf( bEdit_IsChecked))
+            NotifyPropertyChanged(NameOf(bEdit_IsChecked))
          End If
          NotifyPropertyChanged(NameOf(SelRib))
       End If
+      SetRibListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete
@@ -926,7 +985,7 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub ModifyCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(RibSelectionTypes.CURVE)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
    End Sub
@@ -951,7 +1010,7 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub AddPointCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(RibSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
@@ -980,7 +1039,7 @@ Public Class RibPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(RibSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
@@ -1009,7 +1068,7 @@ Public Class RibPanelVM
    ''' Execute the Extrude.  This method is invoked by the ExtrudeCommand.
    ''' </summary>
    Public Sub Extrude(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(RibSelectionTypes.EXTRUSION)
       If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
          m_bIsCreatingExtrusion = True
@@ -1036,7 +1095,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1061,7 +1120,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneFront.  This method is invoked by the CPlaneFrontCommand.
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1086,7 +1145,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneRight.  This method is invoked by the CPlaneRightCommand.
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1111,7 +1170,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneBack.  This method is invoked by the CPlaneBackCommand.
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1136,7 +1195,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneLeft.  This method is invoked by the CPlaneLeftCommand.
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1161,7 +1220,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneBottom.  This method is invoked by the CPlaneBottomCommand.
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1186,7 +1245,8 @@ Public Class RibPanelVM
    ''' Execute the CPlaneElevation.  This method is invoked by the CPlaneElevationCommand.
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1210,7 +1270,8 @@ Public Class RibPanelVM
    ''' Execute the CPlaneOrigin.  This method is invoked by the CPlaneOriginCommand.
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -1234,7 +1295,7 @@ Public Class RibPanelVM
    ''' Execute the CPlaneRotate.  This method is invoked by the CPlaneRotateCommand.
    ''' </summary>
    Public Sub CPlaneRotate(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE)
       Else
@@ -1262,7 +1323,7 @@ Public Class RibPanelVM
    ''' Execute the CPlane3P.  This method is invoked by the CPlane3PCommand.
    ''' </summary>
    Public Sub CPlane3P(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_3P)
    End Sub
 
@@ -1286,7 +1347,7 @@ Public Class RibPanelVM
    ''' Execute the CPlanePerpObj.  This method is invoked by the CPlanePerpObjCommand.
    ''' </summary>
    Public Sub CPlanePerpObj(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE)
    End Sub
 
@@ -1326,7 +1387,8 @@ Public Class RibPanelVM
    ''' Execute the CPlaneObj.  This method is invoked by the CPlaneObjCommand.
    ''' </summary>
    Public Sub CPlaneObj(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       ' salvo selezione precedente e deseleziono altri oggetti
       m_PrevSelObjs.Clear()
       Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -1336,7 +1398,7 @@ Public Class RibPanelVM
       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)
+      Map.refControllerInputPanelVM.ShowMessage("Grid from Selection", "Select the face of the object where to place the grid")
    End Sub
 
 #End Region ' CPlaneObj
@@ -1353,6 +1415,7 @@ Public Class RibPanelVM
    End Property
 
    Public Sub DragMove()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(RibSelectionTypes.BOTH)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE)
    End Sub
@@ -1371,40 +1434,13 @@ Public Class RibPanelVM
    End Property
 
    Public Sub DragRotate()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(RibSelectionTypes.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.RIBPARAM)
-   End Sub
-
-#End Region    ' MachParam
-
 #End Region    ' COMMANDS
 
 End Class

Icarus/RibParamPanel/CopyFromWndVM.vb

@@ -51,7 +51,8 @@ Public Class CopyFromWndVM
 
    Public Sub Ok()
       If IsNothing(m_SelRib) Then
-         MessageBox.Show("Please select the rib from which to copy the parameters!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         'MessageBox.Show("Please select the rib from which to copy the parameters!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Please select the rib from which to copy the parameters!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
          Return
       End If
       ' copio i parametri nella rib corrente

Icarus/RibParamPanel/RibParamPanelV.xaml

@@ -114,15 +114,25 @@
          <UniformGrid Grid.Row="1"
                       Rows="1"
                       Margin="0,2.5,0,0">
-            <Button Content="Ok"
+            <Button Command="{Binding Ok_Command}"
-                    Command="{Binding Ok_Command}"
+                    Margin="0,0,2.5,0"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
-            <Button Content="Cancel"
+               <Image Source="\Resources\Common\Ok.png"
-                    Command="{Binding Cancel_Command}"
+                      Style="{StaticResource Button_Image}"/>
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+            </Button>
-            <Button Content="Copy From"
+            <Button Command="{Binding Cancel_Command}"
-                    Command="{Binding CopyFrom_Command}"
+                    Margin="0,0,2.5,0"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
+               <Image Source="\Resources\Common\Cancel.png"
+                      Style="{StaticResource Button_Image}"/>
+            </Button>
+            <Button Command="{Binding CopyFrom_Command}"
+                    ToolTip="Copy From"
+                    Margin="0,0,2.5,0"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
+               <Image Source="\Resources\RibParamPanel\CopyFrom.png"
+                      Style="{StaticResource Button_Image}"/>
+            </Button>
          </UniformGrid>
       </Grid>
    </Border>

Icarus/RibParamPanel/RibParamPanelVM.vb

@@ -42,19 +42,19 @@ Public Class RibParamPanelVM
 
       m_Type = Cathegories.RIBS
       m_sName = "Ribs"
-      m_MachiningParamList = New List(Of MachiningParam)({New RibComboMachiningParam(MachiningParam.Params.RIBSTYPE, nRibId, nPartId),
+      m_MachiningParamList = New List(Of MachiningParam)({New RibComboMachiningParam(MachiningParam.Params.RIBSTYPE, nRibId, nPartId, Me),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nRibId, nPartId, Me),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId, Me),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLINK, nRibId, nPartId),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLINK, nRibId, nPartId, Me),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId, Me),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nRibId, nPartId),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nRibId, nPartId, Me),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId, Me),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nRibId, nPartId, Me),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nRibId, nPartId),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nRibId, nPartId, Me),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nRibId, nPartId, Me),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nRibId, nPartId, Me),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nRibId, nPartId),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nRibId, nPartId, Me),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nRibId, nPartId)})
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nRibId, nPartId, Me)})
       NotifyPropertyChanged(NameOf(MachiningParamList))
       NotifyPropertyChanged(NameOf(sName))
    End Sub
@@ -135,6 +135,8 @@ Public Class RibParamPanelVM
             Map.refSliceManagerVM.UpdateDimensions()
          End If
       End If
+      ' riattivo lista ribs
+      Map.refRibPanelVM.SetRibListIsEnabled(False)
       ' ripristino modalita' standard
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
       Map.refRibPanelVM.ResetMachParamIsChecked()
@@ -224,8 +226,8 @@ Public Class RibNumericMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.RIBSOVERLAP
@@ -420,8 +422,8 @@ Public Class RibComboMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromRib As Boolean = False
       Dim bReadFromPart As Boolean = False
       Select Case Type
@@ -525,8 +527,8 @@ Public Class RibCheckMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.RIBSLINK

Icarus/SceneHost/MySceneHostVM.vb

@@ -85,21 +85,23 @@ Public Class MySceneHostVM
          ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
          Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
          Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
-         MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
          ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
          Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6)
          Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
-         If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
+         'If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
+         If EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
             Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
-               .DefaultExt = ".lic",
+           .DefaultExt = ".lic",
-               .Filter = "Licences (.lic)|*.lic",
+           .Filter = "Licences (.lic)|*.lic",
-               .CheckFileExists = True,
+           .CheckFileExists = True,
-               .ValidateNames = True
+           .ValidateNames = True
-            }
+        }
             If LicDlg.ShowDialog() = True Then
                ' Recupero il direttorio del file
                Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
@@ -242,13 +244,14 @@ Public Class MySceneHostVM
 
 #Region "ProjectManager"
 
-   Public Overrides Sub NewProject()
+   Public Overrides Function NewProject() As Boolean
       EgtSetCurrentContext(MainScene.GetCtx())
       Dim bOk As Boolean = MainController.NewProject()
       MainScene.SetStatusNull()
-   End Sub
+      Return bOk
+   End Function
 
-   Public Overrides Sub OpenProject(sFilePath As String)
+   Public Overrides Function OpenProject(sFilePath As String) As Boolean
       EgtSetCurrentContext(MainScene.GetCtx())
       Dim bOk As Boolean = False
       If String.IsNullOrEmpty(sFilePath) Then
@@ -260,39 +263,76 @@ Public Class MySceneHostVM
          If Not String.IsNullOrWhiteSpace(sDir) Then
             sDir = Path.GetDirectoryName(sDir)
          End If
-         bOk = MainController.OpenProject(sDir)
+         Dim OpenFileDialog As New Windows.Forms.OpenFileDialog With {
-      Else
+            .Title = "Open",
-         bOk = MainController.OpenProject(sFilePath, False)
+            .Filter = "Icarus project(*.icrs)|*.icrs" &
+                      "|New geometry EgalTech(*.nge)|*.nge",
+            .FilterIndex = 1,
+            .InitialDirectory = sDir
+         }
+         If Not OpenFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then Return False
+         sFilePath = OpenFileDialog.FileName
       End If
+      bOk = MainController.OpenProject(sFilePath, False)
+      ' Imposto stato gestione mouse diretto della scena a nessuno
       MainScene.SetStatusNull()
-      ' imposto modalita' import
+      Return bOk
-      Map.refTopPanelVM.SelPage = Pages.NULL
+   End Function
-   End Sub
 
-   Public Overrides Sub SaveProject()
+   Public Overrides Function SaveProject() As Boolean
       ' Se nome progetto non definito o con estensione non valida lo chiedo
       Dim sCurrFile As String = ""
       EgtGetCurrFilePath(sCurrFile)
+      Dim bOk As Boolean = False
       If String.IsNullOrWhiteSpace(sCurrFile) Or EgtGetFileType(sCurrFile) <> FT.NGE Then
-         MyBase.SaveAsProject()
+         bOk = SaveAsProject()
-         Return
+      Else
+         Dim bDeleteNgeFile As Boolean = Path.GetExtension(sCurrFile) = ".nge"
+         EgtSetCurrFilePath(Path.ChangeExtension(sCurrFile, "icrs"))
+         ' Salvataggio standard
+         bOk = MainController.SaveProject()
+         If bOk AndAlso bDeleteNgeFile AndAlso File.Exists(sCurrFile) Then
+            Try
+               File.Delete(sCurrFile)
+            Catch ex As Exception
+               EgtOutLog("Delete nge file failed!")
+            End Try
+         End If
       End If
-      ' Salvataggio standard
-      MyBase.SaveProject()
       ' Imposto stato gestione mouse diretto della scena a nessuno
       MainScene.SetStatusNull()
-   End Sub
+      Return bOk
+   End Function
 
-   Public Overrides Sub SaveAsProject()
+   Public Overrides Function SaveAsProject() As Boolean
       m_bIsSaveAs = True
-      MyBase.SaveAsProject()
+      Dim sFile As String = ""
+      EgtGetCurrFilePath(sFile)
+      Dim bOk As Boolean = False
+      ' Se nome vuoto, assegno "New"
+      If String.IsNullOrWhiteSpace(sFile) Then sFile = "New.icrs"
+      ' Eventuale sistemazione estensione
+      sFile = IO.Path.ChangeExtension(sFile, "icrs")
+      ' Assegnazione nome file con dialogo
+      Dim SaveFileDialog As New Windows.Forms.SaveFileDialog With {
+         .Title = "Save",
+         .Filter = "Icarus Project(*.icrs)|*.icrs",
+         .FileName = sFile,
+         .InitialDirectory = IO.Path.GetDirectoryName(sFile)
+      }
+      If SaveFileDialog.ShowDialog = Windows.Forms.DialogResult.OK Then
+         Dim sFileName As String = SaveFileDialog.FileName
+         EgtSetCurrFilePath(sFileName)
+         ' Salvataggio standard
+         bOk = MainController.SaveProject()
+      End If
       m_bIsSaveAs = False
       ' Imposto stato gestione mouse diretto della scena a nessuno
       MainScene.SetStatusNull()
-   End Sub
+      Return bOk
+   End Function
 
-   Public Overrides Sub InsertProject()
+   Public Overrides Function InsertProject() As Boolean
-      ' eseguo
       ' Recupero cartella dell'ultimo progetto aperto
       Dim sDir As String = MainController.GetCurrFile()
       If String.IsNullOrWhiteSpace(sDir) Then
@@ -313,7 +353,7 @@ Public Class MySceneHostVM
                                                      .FilterIndex = ExtIndex,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
-         Return
+         Return False
       End If
       WriteMainPrivateProfileString(S_PRINTING3D, K_IMPORTCURREXTENSION, OpenFileDialog.FilterIndex)
       Dim sFile As String = String.Empty
@@ -327,8 +367,12 @@ Public Class MySceneHostVM
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
       Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
       Map.refSliderManagerVM.SetSliderVisibility(False)
+      ' mostro finestra di caricamento
+      Dim ImportLoadingWnd As ImportLoadingWndV = New ImportLoadingWndV(Application.Current.MainWindow, New ImportLoadingWndVM)
+      ImportLoadingWnd.Show()
       ' importo la nuova geometria
-      If MainController.InsertProject(sFile, False) Then
+      Dim bOk As Boolean = MainController.InsertProject(sFile, False)
+      If bOk Then
          Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
          ' la sposto in centro tavola
          Dim nNewPartId As Integer = EgtGetLastPart()
@@ -346,10 +390,13 @@ Public Class MySceneHostVM
          Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
          Map.refSliderManagerVM.SetSliderVisibility(True)
       End If
+      ' chiudo finestra di caricamento
+      ImportLoadingWnd.Close()
       EgtDraw()
-   End Sub
+      Return bOk
+   End Function
 
-   Public Sub InsertRib()
+   Public Function InsertRib() As Boolean
       ' Recupero cartella dell'ultimo progetto aperto
       Dim sDir As String = MainController.GetCurrFile()
       If String.IsNullOrWhiteSpace(sDir) Then
@@ -369,12 +416,13 @@ Public Class MySceneHostVM
                                                      .FilterIndex = 1,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
-         Return
+         Return False
       End If
       Dim sFile As String = String.Empty
       sFile = OpenFileDialog.FileName
       ' importo la nuova geometria
-      If MainController.InsertProject(sFile, False) Then
+      Dim bOk As Boolean = MainController.InsertProject(sFile, False)
+      If bOk Then
          ' sposto le nuove geometrie nel layer rib del pezzo
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
@@ -416,9 +464,10 @@ Public Class MySceneHostVM
          ' Imposto flag di ricalcolo slice
          EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End If
-   End Sub
+      Return bOk
+   End Function
 
-   Public Sub InsertPrint(MenuItem As ManagerLayer_MenuItem)
+   Public Function InsertPrint(MenuItem As ManagerLayer_MenuItem) As Boolean
       ' Recupero cartella dell'ultimo progetto aperto
       Dim sDir As String = MainController.GetCurrFile()
       If String.IsNullOrWhiteSpace(sDir) Then
@@ -438,18 +487,20 @@ Public Class MySceneHostVM
                                                      .FilterIndex = 1,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
-         Return
+         Return False
       End If
       Dim sFile As String = String.Empty
       sFile = OpenFileDialog.FileName
       ' importo la nuova geometria
-      If MainController.InsertProject(sFile, False) Then
+      Dim bOk As Boolean = MainController.InsertProject(sFile, False)
+      If bOk Then
          ' sposto le nuove geometrie nel layer rib del pezzo
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
          ' verifico che ci sia una sola entita'
          If EgtGetGroupObjs(nNewLayerId) <> 1 Then
-            MessageBox.Show("Impossible importing file that contains more than one entity.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            'MessageBox.Show("Impossible importing file that contains more than one entity.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible importing file that contains more than one entity.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          Else
             ' elimino eventuale entita' vecchia
             If MenuItem.OrigLayer.EntityList.Count > 0 AndAlso MenuItem.OrigLayer.EntityList(0).nId <> GDB_ID.NULL Then EgtErase(MenuItem.OrigLayer.EntityList(0).nId)
@@ -472,9 +523,10 @@ Public Class MySceneHostVM
          EgtErase(nNewPartId)
          EgtDraw()
       End If
-   End Sub
+      Return bOk
+   End Function
 
-   Public Sub InsertShellNumber()
+   Public Function InsertShellNumber() As Boolean
       ' Recupero cartella dell'ultimo progetto aperto
       Dim sDir As String = MainController.GetCurrFile()
       If String.IsNullOrWhiteSpace(sDir) Then
@@ -494,12 +546,13 @@ Public Class MySceneHostVM
                                                      .FilterIndex = 1,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
-         Return
+         Return False
       End If
       Dim sFile As String = String.Empty
       sFile = OpenFileDialog.FileName
       ' importo la nuova geometria
-      If MainController.InsertProject(sFile, False) Then
+      Dim bOk As Boolean = MainController.InsertProject(sFile, False)
+      If bOk Then
          ' sposto le nuove geometrie nel layer ShellNumber del pezzo
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
@@ -541,9 +594,10 @@ Public Class MySceneHostVM
          ' Imposto flag di ricalcolo slice
          EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End If
-   End Sub
+      Return bOk
+   End Function
 
-   Public Sub InsertFilledSolid()
+   Public Function InsertFilledSolid() As Boolean
       ' Recupero cartella dell'ultimo progetto aperto
       Dim sDir As String = MainController.GetCurrFile()
       If String.IsNullOrWhiteSpace(sDir) Then
@@ -563,12 +617,13 @@ Public Class MySceneHostVM
                                                      .FilterIndex = 1,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
-         Return
+         Return False
       End If
       Dim sFile As String = String.Empty
       sFile = OpenFileDialog.FileName
       ' importo la nuova geometria
-      If MainController.InsertProject(sFile, False) Then
+      Dim bOk As Boolean = MainController.InsertProject(sFile, False)
+      If bOk Then
          ' sposto le nuove geometrie nel layer ShellNumber del pezzo
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
@@ -610,21 +665,10 @@ Public Class MySceneHostVM
          ' Imposto flag di ricalcolo slice
          EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End If
-   End Sub
+      Return bOk
+   End Function
 
-   Public Overrides Sub ImportProject()
+   Public Overrides Function ExportProject() As Boolean
-      Dim sDir As String = String.Empty
-      GetMainPrivateProfileString(S_MRUIMPORT, K_FILE & "1", "", sDir)
-      If Not String.IsNullOrWhiteSpace(sDir) Then
-         sDir = Path.GetDirectoryName(sDir)
-      End If
-      sDir.TrimEnd("\"c)
-      MainController.ImportProject(sDir)
-      ' Imposto stato gestione mouse diretto della scena a nessuno
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub ExportProject()
       ' Reset controller e scena
       MainController.ResetStatus()
       'Assegnazione nome file con dialogo
@@ -636,18 +680,19 @@ Public Class MySceneHostVM
          .FileName = Path.ChangeExtension(MainController.GetCurrFile(), "").TrimEnd("."c)
       }
       Dim DialogResult As Boolean? = SaveFileDialog.ShowDialog
-      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+      If IsNothing(DialogResult) OrElse Not DialogResult Then Return False
       MainController.SetDefaultFilterForExport(EEX_FLT.DEFAULT + EEX_FLT.LEV_TEMP)
-      MainController.ExportProject(SaveFileDialog.FileName, False)
+      Return MainController.ExportProject(SaveFileDialog.FileName, False)
-   End Sub
+   End Function
 
-   Friend Shadows Sub ExecScript(sFilePath As String)
+   Public Overrides Function ExecScript(sFilePath As String) As Boolean
+      Dim bOk As Boolean = False
       If String.IsNullOrEmpty(sFilePath) Then
          Dim sDir As String = String.Empty
          'GetMainPrivateProfileString(S_GENERAL, K_LASTLUADIR, "", sDir)
-         MainController.Exec(sDir)
+         bOk = MainController.Exec(sDir)
       Else
-         MainController.Exec(sFilePath, False)
+         bOk = MainController.Exec(sFilePath, False)
       End If
       Dim bMachiningMode As Boolean = EgtGetCurrMachGroup() <> GDB_ID.NULL
       If Not bMachiningMode And EgtGetCurrLayer() = GDB_ID.NULL Then
@@ -656,7 +701,8 @@ Public Class MySceneHostVM
             EgtResetCurrPartLayer()
          End If
       End If
-   End Sub
+      Return bOk
+   End Function
 
 #End Region    ' ProjectManager
 
@@ -950,33 +996,15 @@ Public Class MySceneHostVM
                Map.refDispositionPanelVM.OnKeyDown(e.KeyData)
             Case ModifyModes.REFERENCE
             Case ModifyModes.STARTMACH
+               Map.refStartMachPanelVM.OnKeyDown(e.KeyData)
             Case ModifyModes.RIBS
+               Map.refRibPanelVM.OnKeyDown(e.KeyData)
             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
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   ' Con DEL eseguo cancellazione delle entità selezionate
-      '   If e.KeyData = System.Windows.Forms.Keys.Delete Then
-      '      MainController.SetLastInteger(GDB_ID.SEL)
-      '      MainController.ExecuteCommand(Controller.CMD.DELETE)
-      '      ' Con SPAZIO ripeto l'ultimo comando
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.Space Then
-      '      MainController.RepeatLastCommand()
-      '      ' Con 'A' e in modalità continuazione, forzo il passaggio ad arco
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.A And MainController.GetContinue() Then
-      '      MainController.ContinueArcPDP()
-      '      ' Con 'L'  e in modalità continuazione, forzo il passaggio a retta
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.L And MainController.GetContinue() Then
-      '      MainController.ContinueLine2P()
-      '      ' Con 'V' cambio lo stato del check
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.V Then
-      '      Map.refFreeContourInputVM.ChangeInputBoxCheck()
-      '   End If
-      'End If
    End Sub
 
    Private Sub OnCloseGetDist(sender As System.Object)
@@ -996,12 +1024,14 @@ Public Class MySceneHostVM
       EgtErase(EgtGetFirstPart())
       CurrentMachine.CreateMachineTable()
       If Not bOk Then
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10002), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Error on new file  - Error
+         'MessageBox.Show(Application.Current.MainWindow, EgtMsg(10002), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Error on new file  - Error
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10002), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)
       End If
 
       Map.refTopPanelVM.PartList.Clear()
       Map.refTopPanelVM.SetSelModifyMode(ModifyModes.NULL)
       Map.refSliceManagerVM.UpdateTimeAndMass()
+      Map.refSliceManagerVM.UpdateDimensions()
       Map.refSliderManagerVM.RefreshSlider(0, 0)
       Map.refSliderManagerVM.SetLayerIndexToMax()
 
@@ -1024,7 +1054,8 @@ Public Class MySceneHostVM
          Else
             sMsg = EgtMsg(10009) & " '" & sFile & "'"            'Missing file
          End If
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+         'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+         EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)
       End If
       ' leggo materiale e macchina
       Dim nTabPartId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, TABLE)
@@ -1036,7 +1067,8 @@ Public Class MySceneHostVM
             ' imposto la macchina
             Map.refMachinePanelVM.SelectedMachine = ProjectMachine
          Else
-            MessageBox.Show("Project machine not found! Impossible to open the project.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            'MessageBox.Show("Project machine not found! Impossible to open the project.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, "Project machine not found! Impossible to open the project.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
             Map.refProjManagerVM.NewProject(False)
             Return
          End If
@@ -1059,7 +1091,9 @@ Public Class MySceneHostVM
          Else
             Dim sMaterialName As String = ""
             EgtGetInfo(nTabPartId, KEY_MATERIAL_NAME, sMaterialName)
-            MessageBox.Show("Project material (Guid:" & sMaterialGuid & " Name:""" & sMaterialName & """) not found!" & Environment.NewLine &
+            'MessageBox.Show("Project material (Guid:" & sMaterialGuid & " Name:""" & sMaterialName & """) not found!" & Environment.NewLine &
+            '                "Please select another material!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, "Project material (Guid:" & sMaterialGuid & " Name:""" & sMaterialName & """) not found!" & Environment.NewLine &
                             "Please select another material!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
          End If
       End If
@@ -1108,6 +1142,7 @@ Public Class MySceneHostVM
 
       '  aggiorno tempo e massa
       Map.refSliceManagerVM.UpdateTimeAndMass()
+      Map.refSliceManagerVM.UpdateDimensions()
 
       Map.refSliderManagerVM.SetLayerIndexToMax()
 
@@ -1142,7 +1177,8 @@ Public Class MySceneHostVM
       Else
          Map.refProjManagerVM.MruFiles.Remove(sFile)
          Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'"            'Error saving file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
+         'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
+         EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)
       End If
    End Sub
 
@@ -1150,7 +1186,8 @@ Public Class MySceneHostVM
       ' Segnalo eventuale errore
       If Not bOk Then
          Dim sMsg As String = EgtMsg(10006) & " '" & sFile & "'"            'Error importing file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
+         'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
+         EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)
       End If
       Map.refProjManagerVM.MruImportFiles.Add(sFile)
       EgtSetInfo(EgtGetLastPart(), FILE_PATH, sFile)
@@ -1168,7 +1205,8 @@ Public Class MySceneHostVM
          ' Abilito progress e bottone stop
          Map.refMyStatusBarVM.StartLoading("", True)
       Else
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
+         'MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
       End If
    End Sub
 
@@ -1181,7 +1219,8 @@ Public Class MySceneHostVM
       ' Segnalo eventuale errore
       If Not bOk Then
          Dim sMsg As String = EgtMsg(10006) & " '" & sFile & "'"            'Error importing file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
+         'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
+         EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
       ElseIf Path.GetExtension(sFile) <> ".cnc" Then
          ' creo oggetto pezzo in lista
          'Map.refProjectVM.
@@ -1451,7 +1490,10 @@ Public Class MySceneHostVM
    Friend Sub StartMach_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Se eseguito drag
       If Not m_bDragToStart Then
-
+         ' se in scelta piano da oggetto resetto eventuale selezione
+         If Map.refRibPanelVM.bCPlaneObj_IsActive Then
+            EgtDeselectAll()
+         End If
          ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          If Map.refStartMachPanelVM.bCPlaneObj_IsActive Then
@@ -1532,7 +1574,10 @@ Public Class MySceneHostVM
    Friend Sub Rib_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Se eseguito drag
       If Not m_bDragToStart Then
-
+         ' se in scelta piano da oggetto resetto eventuale selezione
+         If Map.refRibPanelVM.bCPlaneObj_IsActive Then
+            EgtDeselectAll()
+         End If
          ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          If Map.refRibPanelVM.bCPlaneObj_IsActive Then
@@ -1614,7 +1659,10 @@ Public Class MySceneHostVM
    Friend Sub ShellNumber_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Se eseguito drag
       If Not m_bDragToStart Then
-
+         ' se in scelta piano da oggetto resetto eventuale selezione
+         If Map.refRibPanelVM.bCPlaneObj_IsActive Then
+            EgtDeselectAll()
+         End If
          ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          If Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
@@ -1696,7 +1744,10 @@ Public Class MySceneHostVM
    Friend Sub FilledSolid_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Se eseguito drag
       If Not m_bDragToStart Then
-
+         ' se in scelta piano da oggetto resetto eventuale selezione
+         If Map.refRibPanelVM.bCPlaneObj_IsActive Then
+            EgtDeselectAll()
+         End If
          ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          If Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then

Icarus/SecondaryWindow/SecondaryWindowV.xaml

@@ -13,10 +13,12 @@
                           Background="Transparent"
                           Style="{DynamicResource {x:Type EgtWPFLib5:EgtMainWindow}}">
    <EgtWPFLib5:EgtMainWindow.TitlePanel>
-
       <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
-
    </EgtWPFLib5:EgtMainWindow.TitlePanel>
+   <EgtWPFLib5:EgtMainWindow.OpacityMask>
+      <SolidColorBrush Color="White" Opacity="{Binding Window_Opacity}"/>
+   </EgtWPFLib5:EgtMainWindow.OpacityMask>
+
 
    <!--Pannello principale -->
    <DockPanel>

Icarus/SecondaryWindow/SecondaryWindowVM.vb

@@ -9,6 +9,13 @@ Public Class SecondaryWindowVM
    Private m_SplashScreen_Timer As New DispatcherTimer
    Private m_WaitAfterRender As Integer = 0
 
+   Private m_Window_Opacity As Double = 0.2
+   Public ReadOnly Property Window_Opacity As Double
+      Get
+         Return m_Window_Opacity
+      End Get
+   End Property
+
    ' Titolo
    Public ReadOnly Property sTitle As String
       Get
@@ -106,8 +113,11 @@ Public Class SecondaryWindowVM
 
    Private Sub SplashScreenTimer_Tick()
       If m_WaitAfterRender > 1 Then
+         m_Window_Opacity = 1
+         NotifyPropertyChanged(NameOf(Window_Opacity))
          ' chiudo SplashScreen
          Map.refSplashScreen.Close()
+         m_SplashScreen_Timer.Stop()
       ElseIf m_WaitAfterRender > 0 Then
          m_WaitAfterRender += 1
       End If
@@ -120,7 +130,10 @@ Public Class SecondaryWindowVM
       Dim sFile As String = Environment.GetCommandLineArgs(1)
       Dim sExt As String = IO.Path.GetExtension(sFile).ToLower()
       If String.IsNullOrWhiteSpace(sFile) OrElse String.IsNullOrWhiteSpace(sExt) Then Return False
-      Return OpenStdFile(sFile)
+      Dim bOk As Boolean = OpenStdFile(sFile)
+      m_Window_Opacity = 1
+      NotifyPropertyChanged(NameOf(Window_Opacity))
+      Return bOk
    End Function
 
    Friend Function OpenStdFile(sFile As String) As Boolean
@@ -170,7 +183,8 @@ Public Class SecondaryWindowVM
    ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
    Public Sub CloseApplication(ByVal param As Object)
       If Map.refSliceManagerVM.bCalculating Then
-         MessageBox.Show("Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show("Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       Map.refMainWindowVM.CloseApplication()

Icarus/ShellNumberPanel/ShellNumberPanelVM.vb

@@ -40,6 +40,10 @@ Public Class ShellNumberPanelVM
          Return m_SelShellNumber
       End Get
       Set(value As ShellNumberEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelShellNumber))
+            Return
+         End If
          m_SelShellNumber = value
          EgtDeselectAll()
          If Not IsNothing(value) Then
@@ -218,7 +222,7 @@ Public Class ShellNumberPanelVM
          Return m_bAdd_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bAdd_IsChecked = value
             If value Then
                m_bEdit_IsChecked = False
@@ -240,7 +244,7 @@ Public Class ShellNumberPanelVM
          Return m_bEdit_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bEdit_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -264,7 +268,7 @@ Public Class ShellNumberPanelVM
          Return m_bGrid_IsChecked
       End Get
       Set(value As Boolean)
-         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bGrid_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -292,7 +296,7 @@ Public Class ShellNumberPanelVM
          Return m_bMove_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bMove_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -316,7 +320,7 @@ Public Class ShellNumberPanelVM
          Return m_bRotate_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not IsNothing(m_SelShellNumber) AndAlso Not m_bMachParam_IsChecked AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bRotate_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -340,7 +344,7 @@ Public Class ShellNumberPanelVM
          Return m_bMachParam_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelShellNumber) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
+         If Not IsNothing(m_SelShellNumber) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive AndAlso Not IsNothing(Map.refTopPanelVM.SelMachining) AndAlso value Then
             m_bMachParam_IsChecked = True
             m_bAdd_IsChecked = False
             m_bEdit_IsChecked = False
@@ -354,6 +358,8 @@ Public Class ShellNumberPanelVM
             NotifyPropertyChanged(NameOf(bRotate_IsChecked))
             Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.SHELLNUMBERPARAM)
             NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
+            ' disattivo interfaccia
+            ManageInterface(False)
          Else
             NotifyPropertyChanged(NameOf(m_bMachParam_IsChecked))
          End If
@@ -363,6 +369,8 @@ Public Class ShellNumberPanelVM
       m_bMachParam_IsChecked = False
       NotifyPropertyChanged(NameOf(bMachParam_IsChecked))
       NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
+      ' riattivo interfaccia
+      ManageInterface(True)
    End Sub
 
    Public ReadOnly Property Compo_Visibility As Visibility
@@ -371,11 +379,17 @@ Public Class ShellNumberPanelVM
       End Get
    End Property
 
+   Private m_ShellNumberList_IsEnabled As Boolean = False
    Public ReadOnly Property ShellNumberList_IsEnabled As Boolean
       Get
-         Return Not m_bMachParam_IsChecked
+         Return If(m_ShellNumberList.Count > 0, m_ShellNumberList_IsEnabled, False)
       End Get
    End Property
+   Friend Sub SetShellNumberListIsEnabled(bValue As Boolean)
+      m_ShellNumberList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(ShellNumberList_IsEnabled))
+   End Sub
+
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -393,6 +407,8 @@ Public Class ShellNumberPanelVM
       End Get
    End Property
 
+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"
 
    Public ReadOnly Property Import_ToolTip As String
@@ -522,7 +538,6 @@ Public Class ShellNumberPanelVM
    Private m_cmdCPlaneObj As ICommand
    Private m_cmdDragMove As ICommand
    Private m_cmdDragRotate As ICommand
-   Private m_cmdMachParam As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -577,6 +592,8 @@ Public Class ShellNumberPanelVM
          SelShellNumber = m_ShellNumberList(0)
          NotifyPropertyChanged(NameOf(SelShellNumber))
       End If
+      ' abilito lista shell number
+      SetShellNumberListIsEnabled(True)
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
 
@@ -612,8 +629,13 @@ Public Class ShellNumberPanelVM
             EgtSelectObj(m_SelShellNumber.nCurveId)
          Case ShellNumberSelectionTypes.EXTRUSION
             ' creo layer per estrusione
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelShellNumber.nCurveId)
          Case ShellNumberSelectionTypes.BOTH
@@ -621,6 +643,8 @@ Public Class ShellNumberPanelVM
             EgtSelectObj(m_SelShellNumber.nExtrusionId)
       End Select
       EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
       Return True
    End Function
 
@@ -630,6 +654,7 @@ Public Class ShellNumberPanelVM
    End Sub
 
    Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
       Select Case command
          Case Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE
             ' leggo altezza estrusione
@@ -669,6 +694,10 @@ Public Class ShellNumberPanelVM
             ' Imposto flag di ricalcolo slice
             EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
       End Select
+      ' se non ho creato percorso riabilito interfaccia
+      If Not m_bIsCreatingPath Then
+         ManageInterface(True)
+      End If
       If command <> Controller.CMD.LINE2P AndAlso command <> Controller.CMD.EXTRUDE Then Return
       ' se finita creazione estrusione
       If m_bIsCreatingExtrusion Then
@@ -723,9 +752,15 @@ Public Class ShellNumberPanelVM
             ' lo seleziono
             SelShellNumber = NewEntity
             NotifyPropertyChanged(NameOf(SelShellNumber))
-            ' creo layer per estrusione
+            ' verifico se esiste gia' layer estrusione e lo svuoto
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId <> GDB_ID.NULL Then
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            Else
+               ' altrimenti lo creo
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             ' seleziono percorso da estrudere
             EgtDeselectAll()
@@ -733,6 +768,9 @@ Public Class ShellNumberPanelVM
             If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
                m_bIsCreatingExtrusion = True
                Map.refControllerInputPanelVM.IsChecked = True
+               If Not EgtCurveIsClosed(nNewEntityId) Then
+                  m_bEscOnLine2P = True
+               End If
             Else
                ' cancello layer
                EgtErase(nNewExtrusionLayerId)
@@ -757,6 +795,13 @@ Public Class ShellNumberPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            If m_bIsCreatingExtrusion Then m_bIsCreatingExtrusion = False
+            ManageInterface(True)
+         End If
       End If
    End Sub
 
@@ -792,6 +837,19 @@ Public Class ShellNumberPanelVM
       Return nShellNumberIndex + 1
    End Function
 
+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
+      SetShellNumberListIsEnabled(bValue)
+   End Sub
+
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -814,8 +872,10 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Import(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.InsertShellNumber()
+      ManageInterface(True)
    End Sub
 
 #End Region ' Import
@@ -838,7 +898,8 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
       If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
       EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
@@ -863,7 +924,7 @@ Public Class ShellNumberPanelVM
    End Property
 
    Public Sub Delete()
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       If IsNothing(SelShellNumber) Then Return
       Dim bOk As Boolean = False
       Select Case m_SelShellNumber.Type
@@ -887,6 +948,7 @@ Public Class ShellNumberPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelShellNumber))
       End If
+      SetShellNumberListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete
@@ -909,7 +971,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub ModifyCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(ShellNumberSelectionTypes.CURVE)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
    End Sub
@@ -934,7 +996,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub AddPointCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(ShellNumberSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
@@ -963,7 +1025,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(ShellNumberSelectionTypes.CURVE)
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
@@ -992,7 +1054,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the Extrude.  This method is invoked by the ExtrudeCommand.
    ''' </summary>
    Public Sub Extrude(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(ShellNumberSelectionTypes.EXTRUSION)
       If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
          m_bIsCreatingExtrusion = True
@@ -1020,7 +1082,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1045,7 +1107,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneFront.  This method is invoked by the CPlaneFrontCommand.
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1070,7 +1132,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneRight.  This method is invoked by the CPlaneRightCommand.
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1095,7 +1157,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneBack.  This method is invoked by the CPlaneBackCommand.
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1120,7 +1182,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneLeft.  This method is invoked by the CPlaneLeftCommand.
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1145,7 +1207,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneBottom.  This method is invoked by the CPlaneBottomCommand.
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1170,7 +1232,8 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneElevation.  This method is invoked by the CPlaneElevationCommand.
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1194,7 +1257,8 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneOrigin.  This method is invoked by the CPlaneOriginCommand.
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -1218,7 +1282,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlaneRotate.  This method is invoked by the CPlaneRotateCommand.
    ''' </summary>
    Public Sub CPlaneRotate(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE)
       Else
@@ -1246,7 +1310,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlane3P.  This method is invoked by the CPlane3PCommand.
    ''' </summary>
    Public Sub CPlane3P(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_3P)
    End Sub
 
@@ -1270,7 +1334,7 @@ Public Class ShellNumberPanelVM
    ''' Execute the CPlanePerpObj.  This method is invoked by the CPlanePerpObjCommand.
    ''' </summary>
    Public Sub CPlanePerpObj(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE)
    End Sub
 
@@ -1310,7 +1374,8 @@ Public Class ShellNumberPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       ' salvo selezione precedente e deseleziono altri oggetti
       m_PrevSelObjs.Clear()
       Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -1320,7 +1385,7 @@ Public Class ShellNumberPanelVM
       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)
+      Map.refControllerInputPanelVM.ShowMessage("Grid from Selection", "Select the face of the object where to place the grid")
    End Sub
 
 #End Region ' CPlaneObj
@@ -1337,7 +1402,7 @@ Public Class ShellNumberPanelVM
    End Property
 
    Public Sub DragMove()
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(ShellNumberSelectionTypes.BOTH)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE)
    End Sub
@@ -1356,41 +1421,13 @@ Public Class ShellNumberPanelVM
    End Property
 
    Public Sub DragRotate()
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand(ShellNumberSelectionTypes.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.SHELLNUMBERPARAM)
-   End Sub
-
-#End Region    ' MachParam
-
 #End Region    ' COMMANDS
 
 End Class

Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb

@@ -41,10 +41,10 @@ Public Class ShellNumberParamPanelVM
 
       m_Type = Cathegories.SHELL_NUMBER
       m_sName = "Reduce Shell Number"
-      m_MachiningParamList = New List(Of MachiningParam)({New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nShellNumberId, nPartId),
+      m_MachiningParamList = New List(Of MachiningParam)({New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nShellNumberId, nPartId, Me),
-                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nShellNumberId, nPartId),
+                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nShellNumberId, nPartId, Me),
-                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nShellNumberId, nPartId),
+                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nShellNumberId, nPartId, Me),
-                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, nShellNumberId, nPartId)})
+                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, nShellNumberId, nPartId, Me)})
       NotifyPropertyChanged(NameOf(MachiningParamList))
       NotifyPropertyChanged(NameOf(sName))
    End Sub
@@ -164,8 +164,8 @@ Public Class ShellNumberNumericMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nShellNumberId As Integer, nPartId As Integer)
+   Sub New(Type As Params, nShellNumberId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
-      MyBase.New(Type)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.SHELLNBRDIFFERENCE

Icarus/SimulationPanel/MySimulation.vb

@@ -71,11 +71,14 @@ Public Class MySimulation
                   Case MCH_SIM.OUTSTROKE
                      Dim sInfo As String = String.Empty
                      EgtGetOutstrokeInfo(sInfo)
-                     MessageBox.Show(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)        'Extracorsa ...
+                     'MessageBox.Show(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)        'Extracorsa ...
+                     EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)
                   Case MCH_SIM.DIR_ERR
-                     MessageBox.Show(EgtMsg(MSG_SIMULATIONPAGEUC + 3), EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)         'Direzione utensile irraggiungibile
+                     'MessageBox.Show(EgtMsg(MSG_SIMULATIONPAGEUC + 3), EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)         'Direzione utensile irraggiungibile
+                     EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATIONPAGEUC + 3), EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)
                   Case Else
-                     MessageBox.Show(EgtMsg(MSG_SIMULATIONPAGEUC + 4), EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)         'Errore
+                     'MessageBox.Show(EgtMsg(MSG_SIMULATIONPAGEUC + 4), EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)         'Errore
+                     EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATIONPAGEUC + 4), EgtMsg(MSG_SIMULATIONPAGEUC + 5), MessageBoxButton.OK, MessageBoxImage.Stop)
                End Select
             End If
             ' Aggiorno stato visualizzazione macchina (dipende anche da utensile)

Icarus/SimulationPanel/SimulationPanelV.xaml

@@ -2,146 +2,154 @@
       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"
-      Width="310"
+      xmlns:PrintApp="clr-namespace:Icarus"
       VerticalAlignment="Center">
    <Grid.Resources>
       <SolidColorBrush x:Key="SliderThumb.Track.Background" Color="{StaticResource Icarus_Blue_Color}"/>
       <SolidColorBrush x:Key="SliderThumb.Track.Border" Color="{StaticResource Icarus_Blue_Color}"/>
    </Grid.Resources>
-   <Grid.RowDefinitions>
+   <Grid.ColumnDefinitions>
-      <RowDefinition Height="Auto"/>
+      <ColumnDefinition Width="Auto"/>
-      <RowDefinition Height="1*"/>
+      <ColumnDefinition Width="Auto"/>
-   </Grid.RowDefinitions>
+   </Grid.ColumnDefinitions>
-   <Border Margin="0,0,0,2.5" 
+   <PrintApp:MachineViewPanelV DataContext="{StaticResource MachineViewPanelVM}"
-           Style="{StaticResource Title_Border}">
+                               Margin="0,0,5,0"/>
-      <TextBlock Text="SIMULATION"
+   <Grid Grid.Column="1"
-                 Style="{StaticResource Title_TextBlock}"/>
+         Width="310">
-   </Border>
+      <Grid.RowDefinitions>
-   <Border Grid.Row="1"
+         <RowDefinition Height="Auto"/>
-           Margin="0,2.5,0,0"
+         <RowDefinition Height="1*"/>
-           Style="{StaticResource BottomGrayRow_Border}">
+      </Grid.RowDefinitions>
-      <Grid>
+      <Border Margin="0,0,0,2.5" 
-         <Grid.RowDefinitions>
+              Style="{StaticResource Title_Border}">
-            <RowDefinition Height="Auto"/>
+         <TextBlock Text="SIMULATION"
-            <RowDefinition Height="Auto"/>
+                    Style="{StaticResource Title_TextBlock}"/>
-            <RowDefinition Height="Auto"/>
+      </Border>
-         </Grid.RowDefinitions>
+      <Border Grid.Row="1"
+              Margin="0,2.5,0,0"
+              Style="{StaticResource BottomGrayRow_Border}">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
 
-         <StackPanel DataContext="{Binding MySimul}"
+            <StackPanel DataContext="{Binding MySimul}"
-                     Margin="2.5">
+                        Margin="2.5">
-            <UniformGrid Columns="3"
+               <UniformGrid Columns="3"
-                         Margin="0,2.5,0,2.5">
+                            Margin="0,2.5,0,2.5">
-               <Button Grid.Column="0" 
+                  <Button Grid.Column="0" 
-                       Grid.Row="3"
+                          Grid.Row="3"
-                       Command="{Binding StepCommand}"
+                          Command="{Binding StepCommand}"
-                       ToolTip="{Binding OneStepToolTip}" 
+                          ToolTip="{Binding OneStepToolTip}" 
-                       Margin="2.5,0,2.5,0"
+                          Margin="2.5,0,2.5,0"
-                       Style="{StaticResource SimulationPanel_Button}">
+                          Style="{StaticResource SimulationPanel_Button}">
-                  <Image Source="/Resources/SimulationPanel/PlayStep.png"
+                     <Image Source="/Resources/SimulationPanel/PlayStep.png"
-                         Style="{StaticResource SimulationButton_Image}"/>
+                            Style="{StaticResource SimulationButton_Image}"/>
-               </Button>
+                  </Button>
-               <Button Grid.Column="1"
+                  <Button Grid.Column="1"
-                       Grid.Row="3"
+                          Grid.Row="3"
-                       Command="{Binding PlayPauseCommand}" 
+                          Command="{Binding PlayPauseCommand}" 
-                       ToolTip="{Binding PlayPauseToolTip}" 
+                          ToolTip="{Binding PlayPauseToolTip}" 
-                       Margin="2.5,0,2.5,0"
+                          Margin="2.5,0,2.5,0"
-                       Style="{StaticResource SimulationPanel_Button}">
+                          Style="{StaticResource SimulationPanel_Button}">
-                  <Image Source="{Binding PlayPauseImage}"
+                     <Image Source="{Binding PlayPauseImage}"
-                         Style="{StaticResource SimulationButton_Image}"/>
+                            Style="{StaticResource SimulationButton_Image}"/>
-               </Button>
+                  </Button>
-               <Button Grid.Column="2" Grid.Row="3"
+                  <Button Grid.Column="2" Grid.Row="3"
-                       Command="{Binding StopCommand}"
+                          Command="{Binding StopCommand}"
-                       ToolTip="{Binding StopHomeToolTip}" 
+                          ToolTip="{Binding StopHomeToolTip}" 
-                       Margin="2.5,0,2.5,0"
+                          Margin="2.5,0,2.5,0"
-                       Style="{StaticResource SimulationPanel_Button}">
+                          Style="{StaticResource SimulationPanel_Button}">
-                  <Image Source="/Resources/SimulationPanel/Stop.png"
+                     <Image Source="/Resources/SimulationPanel/Stop.png"
-                         Style="{StaticResource SimulationButton_Image}"/>
+                            Style="{StaticResource SimulationButton_Image}"/>
-               </Button>
+                  </Button>
 
-            </UniformGrid>
+               </UniformGrid>
-            <TextBlock Text="{Binding StatusMsg}" 
+               <TextBlock Text="{Binding StatusMsg}" 
-                       TextAlignment="Center" 
+                          TextAlignment="Center" 
-                       Margin="2.5"
-                       Style="{StaticResource Simulation_TextBlock}"/>
-            <Slider Name="SpeedSlider"
-                    Foreground="{StaticResource Icarus_Gray}"
-                    Value="{Binding SliderValue}"
-                    Minimum="1"
-                    Maximum="100"
-                    TickPlacement="TopLeft"
-                    TickFrequency="5"
-                    Margin="2.5" 
-                    Style="{StaticResource LayerIndex_Slider}"/>
-            <Grid Margin="2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <Border Style="{StaticResource SimulPanel_KeyValue_Border}">
-                  <TextBlock Text="{Binding TName}" 
-                             Margin="2.5,2.5,2.5,2.5"
-                             Style="{StaticResource Simulation_TextBlock}"/>
-               </Border>
-               <Border Grid.Column="1"  
-                       Style="{StaticResource SimulPanel_KeyValue_Border}">
-                  <TextBlock Text="{Binding SValue}" 
-                             Margin="2.5,2.5,2.5,2.5"
-                             Style="{StaticResource Simulation_TextBlock}"/>
-               </Border>
-               <Border Grid.Row="1"  
-                       Style="{StaticResource SimulPanel_KeyValue_Border}">
-                  <TextBlock Text="{Binding GCode}" 
-                             Margin="2.5,2.5,2.5,2.5"
-                             Style="{StaticResource Simulation_TextBlock}"/>
-               </Border>
-               <Border Grid.Column="1"
-                       Grid.Row="1"  
-                       Style="{StaticResource SimulPanel_KeyValue_Border}">
-                  <TextBlock Text="{Binding FValue}" 
-                             Margin="2.5,2.5,2.5,2.5"
-                             Style="{StaticResource Simulation_TextBlock}"/>
-               </Border>
-
-            </Grid>
-            <ItemsControl ItemsSource="{Binding MachineAxisList}"
                           Margin="2.5"
-                          BorderThickness="0"
+                          Style="{StaticResource Simulation_TextBlock}"/>
-                          Padding="0">
+               <Slider Name="SpeedSlider"
-               <ItemsControl.ItemTemplate>
+                       Foreground="{StaticResource Icarus_Gray}"
-                  <DataTemplate>
+                       Value="{Binding SliderValue}"
-                     <Border Style="{StaticResource SimulPanel_KeyValue_Border}"
+                       Minimum="1"
-                             Margin="0,1,0,1">
+                       Maximum="100"
-                        <Grid>
+                       TickPlacement="TopLeft"
-                           <Grid.ColumnDefinitions>
+                       TickFrequency="5"
-                              <ColumnDefinition Width="1*"/>
+                       Margin="2.5" 
-                              <ColumnDefinition Width="1*"/>
+                       Style="{StaticResource LayerIndex_Slider}"/>
-                           </Grid.ColumnDefinitions>
+               <Grid Margin="2.5">
-                           <TextBlock Text="{Binding Token}" 
+                  <Grid.ColumnDefinitions>
-                                      Style="{StaticResource Simulation_TextBlock}"/>
+                     <ColumnDefinition Width="1*"/>
-                           <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                     <ColumnDefinition Width="1*"/>
-                                                  BorderThickness="0"
+                  </Grid.ColumnDefinitions>
-                                                  Text="{Binding Value, UpdateSourceTrigger=Explicit}" 
+                  <Grid.RowDefinitions>
-                                                  IsReadOnly="{Binding IsReadOnlyAxesValue}"
+                     <RowDefinition Height="1*"/>
-                                                  IsEnabled="{Binding IsEnabledAxesValue}"
+                     <RowDefinition Height="1*"/>
-                                                  Style="{StaticResource SimulationPanel_Axes_TextBox}">
+                  </Grid.RowDefinitions>
-                           </EgtWPFLib5:EgtTextBox>
+                  <Border Style="{StaticResource SimulPanel_KeyValue_Border}">
-                        </Grid>
+                     <TextBlock Text="{Binding TName}" 
-                     </Border>
+                                Margin="2.5,2.5,2.5,2.5"
-                  </DataTemplate>
+                                Style="{StaticResource Simulation_TextBlock}"/>
-               </ItemsControl.ItemTemplate>
+                  </Border>
-            </ItemsControl>
+                  <Border Grid.Column="1"  
-         </StackPanel>
+                          Style="{StaticResource SimulPanel_KeyValue_Border}">
-         <Button Grid.Row="3"
+                     <TextBlock Text="{Binding SValue}" 
-                 Command="{Binding Ok_Command}"
+                                Margin="2.5,2.5,2.5,2.5"
-                 Style="{StaticResource RightPanel_HalfRound_Button}">
+                                Style="{StaticResource Simulation_TextBlock}"/>
-            <Image Source="\Resources\Common\Ok.png"
+                  </Border>
-                   Style="{StaticResource Button_Image}"/>
+                  <Border Grid.Row="1"  
-         </Button>
+                          Style="{StaticResource SimulPanel_KeyValue_Border}">
-      </Grid>
+                     <TextBlock Text="{Binding GCode}" 
-   </Border>
+                                Margin="2.5,2.5,2.5,2.5"
+                                Style="{StaticResource Simulation_TextBlock}"/>
+                  </Border>
+                  <Border Grid.Column="1"
+                          Grid.Row="1"  
+                          Style="{StaticResource SimulPanel_KeyValue_Border}">
+                     <TextBlock Text="{Binding FValue}" 
+                                Margin="2.5,2.5,2.5,2.5"
+                                Style="{StaticResource Simulation_TextBlock}"/>
+                  </Border>
 
+               </Grid>
+               <ItemsControl ItemsSource="{Binding MachineAxisList}"
+                             Margin="2.5"
+                             BorderThickness="0"
+                             Padding="0">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Border Style="{StaticResource SimulPanel_KeyValue_Border}"
+                                Margin="0,1,0,1">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <TextBlock Text="{Binding Token}" 
+                                         Style="{StaticResource Simulation_TextBlock}"/>
+                              <EgtWPFLib5:EgtTextBox2 Grid.Column="1"
+                                                     BorderThickness="0"
+                                                     Text="{Binding Value, UpdateSourceTrigger=Explicit}" 
+                                                     IsReadOnly="{Binding IsReadOnlyAxesValue}"
+                                                     IsEnabled="{Binding IsEnabledAxesValue}"
+                                                     Style="{StaticResource SimulationPanel_Axes_TextBox}">
+                              </EgtWPFLib5:EgtTextBox2>
+                           </Grid>
+                        </Border>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </StackPanel>
+            <Button Grid.Row="3"
+                    Command="{Binding Ok_Command}"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
+               <Image Source="\Resources\Common\Ok.png"
+                      Style="{StaticResource Button_Image}"/>
+            </Button>
+         </Grid>
+      </Border>
+   </Grid>
 </Grid>

Icarus/SimulationPanel/SimulationPanelVM.vb

@@ -52,6 +52,10 @@ Public Class SimulationPanelVM
       ' Creo riferimento a questa classe in OmagOFFICEMap
       Map.SetRefSimulationPanelVM(Me)
       MySimul = New MySimulation
+      ' leggo vista macchina da ini e la imposto
+      Dim DefaultMachViewMode As Integer = GetMainPrivateProfileInt(S_SIMUL, K_MACHVIEWMODE, 3)
+      MySimul.SetMachLook(DefaultMachViewMode)
+      Map.refMachineViewPanelVM.RefreshSelViewSlider()
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -76,7 +80,6 @@ Public Class SimulationPanelVM
       'Cambio la vista della scena
       EgtGetGenericView(m_dPrevAngVertDegView, m_dPrevAngHorizDegView)
       EgtSetView(VT.ISO_SW, False)
-      MySimul.SetMachLook(MCH_LOOK.ALL)
       EgtSetMachineLook(MySimul.GetMachLook())
       ' Nascondo griglia
       EgtSetGridShow(False, False)
@@ -85,10 +88,12 @@ Public Class SimulationPanelVM
       If Not EgtSimInit() OrElse Not EgtSimStart() Then
          If EgtGetLastMachMgrErrorId() <> 0 Then
             Dim sErr As String = EgtGetLastMachMgrErrorString()
-            MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+                'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         Else
+                EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-            MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+            Else
-         End If
+                'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+                EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
+            End If
       End If
       ' Imposto stato corrente
       MySimul.SetSimulationStatus(MCH_SIM_ST.UI_STOP)
@@ -111,6 +116,7 @@ Public Class SimulationPanelVM
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
       Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
+      EgtDraw()
    End Sub
 
    Private Function LoadCurrTools() As Boolean
@@ -138,9 +144,6 @@ Public Class SimulationPanelVM
       Map.refMyStatusBarVM.ClearOutputMessage()
       ' Mi assicuro di terminare la simulazione
       MySimul.ResetSimulation()
-      ' Ripristino visibilità standard
-      MySimul.SetMachLook(MCH_LOOK.TAB)
-      EgtSetMachineLook(MySimul.GetMachLook())
       '' Nascondo tutte le lavorazioni
       'CamAuto.HideAllMachinings()
       ' Abilito impostazione modificato

Icarus/SliceManager/SliceManagerV.xaml

@@ -15,21 +15,63 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <TextBlock Text="{Binding ghTime}"
+      <Grid HorizontalAlignment="Center"
-                 Visibility="{Binding Time_Visibility}"
+            Visibility="{Binding Time_Visibility}"
-                 FontSize="35"
+            Margin="0,0,0,5">
-                 Style="{StaticResource SliceManager_TextBlock}"/>
+         <Grid.ColumnDefinitions>
-      <TextBlock Grid.Row="1"
+            <ColumnDefinition Width="Auto"/>
-                 Text="{Binding ghDimensions}"
+            <ColumnDefinition Width="1*"/>
-                 FontSize="18"
+         </Grid.ColumnDefinitions>
-                 Margin="0,0,0,5"
+         <Image Source="\Resources\SliceManager\Time.png"
-                 Style="{StaticResource SliceManager_TextBlock}"/>
+                Height="25"
-      <TextBlock Grid.Row="2"
+                Width="25"
-                 Text="{Binding ghMass}"
+                Margin="0,0,2.5,0"
-                 Visibility="{Binding Mass_Visibility}"
+                Style="{StaticResource Button_Image}"/>
-                 FontSize="18"
+         <TextBlock Grid.Column="1"
-                 Margin="0,0,0,5"
+                    Text="{Binding ghTime}"
-                 Style="{StaticResource SliceManager_TextBlock}"/>
+                    FontSize="35"
+                    Style="{StaticResource SliceManager_TextBlock}"/>
+      </Grid>
+      <Grid Grid.Row="1"
+            HorizontalAlignment="Center"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Image Source="\Resources\SliceManager\Dimensions.png"
+                Visibility="{Binding ghDimensions, Converter={StaticResource StringToVisibilityConverter}}"
+                Height="25"
+                Width="25"
+                Margin="0,0,2.5,0"
+                Style="{StaticResource Button_Image}"/>
+         <TextBlock Grid.Column="1"
+                    Text="{Binding ghDimensions}"
+                    FontSize="18"
+                    HorizontalAlignment="Left"
+                    Margin="2.5,0,0,0"
+                    Style="{StaticResource SliceManager_TextBlock}"/>
+      </Grid>
+      <Grid Grid.Row="2"
+            HorizontalAlignment="Center"
+            Visibility="{Binding Mass_Visibility}"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Image Source="\Resources\SliceManager\Mass.png"
+                Height="25"
+                Width="25"
+                Margin="0,0,2.5,0"
+                Style="{StaticResource Button_Image}"/>
+         <TextBlock Grid.Column="1"
+                    Text="{Binding ghMass}"
+                    FontSize="18"
+                    HorizontalAlignment="Left"
+                    Margin="2.5,0,0,0"
+                    Style="{StaticResource SliceManager_TextBlock}"/>
+      </Grid>
       <TextBlock Grid.Row="3"
                  Text="{Binding sLoadingText}"
                  Visibility="{Binding Loading_Visibility}"
@@ -76,12 +118,12 @@
                     Visibility="{Binding ModifyMode_Visibility}"
                     Margin="2.5,0,2.5,0"
                     Style="{StaticResource SliceMannager_Button}"/>
-            <Button Content="Update"
+            <!--<Button Content="Update"
                     Command="{Binding Update_Command}"
                     IsEnabled="{Binding Buttons_IsEnabled}"
                     Visibility="{Binding SliceMode_Visibility}"
                     Margin="2.5,0,2.5,0"
-                    Style="{StaticResource SliceMannager_Button}"/>
+                    Style="{StaticResource SliceMannager_Button}"/>-->
             <Button Content="Generate"
                     Command="{Binding Generate_Command}"
                     IsEnabled="{Binding Buttons_IsEnabled}"

Icarus/SliceManager/SliceManagerVM.vb

@@ -36,9 +36,19 @@ Public Class SliceManagerVM
    Private m_bStopScriptToManage As Boolean = False
 
    Private m_bSlice As Boolean = False
+   Friend ReadOnly Property bSlice As Boolean
+      Get
+         Return m_bSlice
+      End Get
+   End Property
    Private m_bCalcTFS As Boolean = False
    Private m_bGenerate As Boolean = False
    Private m_bCalcSolid As Boolean = False
+   Friend ReadOnly Property bCalcSolid As Boolean
+      Get
+         Return m_bCalcSolid
+      End Get
+   End Property
    Friend Sub SetCalcSolid(value As Boolean)
       m_bCalcSolid = value
    End Sub
@@ -118,7 +128,7 @@ Public Class SliceManagerVM
    Public ReadOnly Property ghTime As String
       Get
          Dim dtTime As TimeSpan = TimeSpan.FromSeconds(m_dTime)
-         Return Math.Floor(dtTime.TotalHours) & ":" & (Math.Floor(dtTime.Minutes)).ToString("00") & ":" & (Math.Ceiling(dtTime.Seconds)).ToString("00")
+         Return Math.Floor(dtTime.TotalHours) & "h " & (Math.Floor(dtTime.Minutes)).ToString("00") & "m"     '& (Math.Ceiling(dtTime.Seconds)).ToString("00")
       End Get
    End Property
 
@@ -133,7 +143,7 @@ Public Class SliceManagerVM
       Get
          If Not IsNothing(Map.refTopPanelVM.SelPart) Then
             Dim b3Print As BBox3d = Map.refDispositionPanelVM.GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
-            Return "[ " & DoubleToString(b3Print.DimX, 1) & " x " & DoubleToString(b3Print.DimY, 1) & " x " & DoubleToString(b3Print.DimZ, 1) & " ]"
+            Return DoubleToString(b3Print.DimX, 1) & " x " & DoubleToString(b3Print.DimY, 1) & " x " & DoubleToString(b3Print.DimZ, 1) & " mm"
          End If
          Return ""
       End Get
@@ -194,8 +204,6 @@ Public Class SliceManagerVM
    Sub New()
       ' Creo riferimento a questa classe in EgtCAM5Map
       Map.SetRefSliceManagerVM(Me)
-      ' Installo funzione gestione eventi per lua
-      EgtSetProcessEvents(m_ProcEventsCallback)
       UpdateState(False)
    End Sub
 
@@ -230,7 +238,7 @@ Public Class SliceManagerVM
       NotifyPropertyChanged(NameOf(Mass_Visibility))
    End Sub
 
-   Private Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
+   Friend Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
       ' Se previsto, imposto progress
       If nProg >= 0 Then
          Dim dPartialProgress As Integer = 0
@@ -314,7 +322,8 @@ Public Class SliceManagerVM
       End If
       EgtGetCurrFilePath(sCurrProject)
       If String.IsNullOrWhiteSpace(sCurrProject) Or EgtGetFileType(sCurrProject) <> FT.NGE Then
-         MessageBox.Show("Save project before calculating slices!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show("Save project before calculating slices!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Save project before calculating slices!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          Return False
       End If
       ' mostro barre di caricamento
@@ -388,7 +397,8 @@ Public Class SliceManagerVM
       Map.refTopPanelVM.SelPart.RefreshPrintLayers()
       ' in caso di errore, segnalazione
       If Not bOk Then
-         MessageBox.Show("Error in slicing! See log file.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show("Error in slicing! See log file.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Error in slicing! See log file.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
       End If
       If bOk And m_bGenerate Then
          ' verifico esistenza e correttezza machgroup
@@ -416,7 +426,8 @@ Public Class SliceManagerVM
             Else
                sOut &= sMsg
             End If
-            MessageBox.Show(sOut, "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            'MessageBox.Show(sOut, "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          End If
       End If
       '  aggiorno tempo e massa
@@ -433,9 +444,6 @@ Public Class SliceManagerVM
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
       SetButtonsIsEnabled(True)
-      m_bSlice = False
-      m_bCalcTFS = False
-      m_bGenerate = False
       Return bOk
    End Function
 
@@ -476,7 +484,8 @@ Public Class SliceManagerVM
       EgtLuaCreateGlobTable("MACH")
       If Not EgtLuaExecFile(sInitMachScriptPath) Then
          EgtOutLog("Error executing Machining init script " & sInitMachScriptPath)
-         MessageBox.Show(EgtMsg(5463) & " " & sInitMachScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show(EgtMsg(5463) & " " & sInitMachScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5463) & " " & sInitMachScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error)
          Return False
       End If
       Dim nErr As Integer = 999
@@ -495,7 +504,8 @@ Public Class SliceManagerVM
       EgtLuaCreateGlobTable("MACH")
       If Not EgtLuaExecFile(sExitMachScriptPath) Then
          EgtOutLog("Error executing Machining exit script " & sExitMachScriptPath)
-         MessageBox.Show(EgtMsg(5464) & " " & sExitMachScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show(EgtMsg(5464) & " " & sExitMachScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5464) & " " & sExitMachScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error)
          Return False
       End If
       Dim nErr As Integer = 999
@@ -526,25 +536,35 @@ Public Class SliceManagerVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Slice()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refStartMachPanelVM.bCPlaneObj_IsActive OrElse Map.refRibPanelVM.bCPlaneObj_IsActive OrElse
+         Map.refShellNumberPanelVM.bCPlaneObj_IsActive OrElse Map.refFilledSolidPanelVM.bCPlaneObj_IsActive Then Return
       If m_bCalculating Then Return
       m_bCalculating = True
       If IsNothing(Map.refTopPanelVM.SelPart) Then
-         MessageBox.Show("No parts to slice!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show("No parts to slice!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "No parts to slice!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          m_bCalculating = False
          Return
       End If
       If IsNothing(Map.refTopPanelVM.SelMaterial) Then
-         MessageBox.Show("No print material set!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show("No print material set!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "No print material set!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          m_bCalculating = False
          Return
       End If
       If IsNothing(Map.refTopPanelVM.SelMachining) OrElse IsNothing(Map.refTopPanelVM.CurrMachining) OrElse Map.refTopPanelVM.CurrMachining.dCurrStrandH <= 0 Then
-         MessageBox.Show("No print parameters set!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         'MessageBox.Show("No print parameters set!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "No print parameters set!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         m_bCalculating = False
+         Return
+      End If
+      Dim b3Print As BBox3d = Map.refDispositionPanelVM.GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
+      If Not String.IsNullOrWhiteSpace(CurrentMachine.sMachDataIniFile) AndAlso Not CurrentMachine.b3ExtrusionArea.EnclosesXY(b3Print) Then
+         'MessageBox.Show("Part outside the extrusion area!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Part outside the extrusion area!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          m_bCalculating = False
          Return
       End If
-      '' esco da altre pagine
-      'Dim PreviousPage As Pages = Map.refTopPanelVM.SelPage
       ' eseguo calcoli
       CalcSlice(False)
       ' se non ho interrotto calcoli
@@ -554,11 +574,16 @@ Public Class SliceManagerVM
          Map.refSliderManagerVM.SetLayerIndexToMax()
          NotifyPropertyChanged(NameOf(Time_Visibility))
          NotifyPropertyChanged(NameOf(Mass_Visibility))
-         'Else
+         ' se ricalcolato slice attivo vista SliceToolpath e modo TillSelected 
-         '   Map.refTopPanelVM.SelPage = PreviousPage
+         If m_bSlice Then
+            Map.refSliderManagerVM.SetSelViewSlider(SliderManagerVM.ViewSliderType.UNTIL_SELECTED)
+         End If
       Else
          m_bStopScriptToManage = False
       End If
+      m_bSlice = False
+      m_bCalcTFS = False
+      m_bGenerate = False
       m_bCalculating = False
    End Sub
 
@@ -698,7 +723,8 @@ Public Class SliceManagerVM
                Process.Start("Notepad.exe", sIsoFilePath)
                ' altrimenti lo segnalo
             Else
-               MessageBox.Show("Edit failed, missing part program file" & " (" & sIsoFilePath & ")")
+               'MessageBox.Show("Edit failed, missing part program file" & " (" & sIsoFilePath & ")")
+               EgtMessageBoxV.Show(Application.Current.MainWindow, "Edit failed, missing part program file" & " (" & sIsoFilePath & ")")
             End If
          End If
          NotifyPropertyChanged(NameOf(Time_Visibility))

Icarus/SliderManager/SliderManagerVM.vb

@@ -368,7 +368,7 @@ Public Class SliderManagerVM
       End Set
    End Property
    Friend Sub SetSelViewSlider(value As ViewSliderType)
-      m_nSelViewSlider = value
+      ghSelViewSlider = value - 1
       NotifyPropertyChanged(NameOf(ghSelViewSlider))
    End Sub
 
@@ -381,7 +381,8 @@ Public Class SliderManagerVM
       Map.SetRefSliderManagerVM(Me)
       ' leggo valore default  ViewSlider
       Dim nViewSlider As Integer = GetMainPrivateProfileInt(S_PRINTING3D, K_VIEWSLIDER, 1)
-      SetSelViewSlider(nViewSlider)
+      m_nSelViewSlider = nViewSlider
+      NotifyPropertyChanged(NameOf(ghSelViewSlider))
    End Sub
 
 #End Region    ' CONSTRUCTOR

Icarus/SplashScreen/SplashScreen.xaml

@@ -10,32 +10,19 @@
         Height="600" 
         Width="1000">
    <Grid>
-      <Image Source="/Resources/SplashScreen/GoldSplashscreen.png" 
+      <Image Source="/Resources/SplashScreen/BlueSplashscreen.png" 
              Stretch="UniformToFill"/>
-      <TextBlock Text="ICARUS"
-                 Foreground="#b9984c"
-                 FontSize="47"
-                 FontFamily="/Resources/Fonts/#Roboto"
-                 FontWeight="Light"
-                 Margin="463,125,0,0"/>
       <TextBlock x:Name="VersionTxBl"
                  FontSize="14"
                  FontFamily="/Resources/Fonts/#Roboto"
-                 Margin="500,175,0,0"/>
+                 Foreground="White"
-      <Grid Height="180"
+                 HorizontalAlignment="Center"
-            Width="92"
+                 Margin="591,140,0,0"/>
-            VerticalAlignment="Bottom"
+      <!--<TextBlock Text="2022-2023"
-            Margin="620,0,0,0">
+                 FontSize="6"
-         <Image Source="/Resources/SplashScreen/LogoEgalware.png"
+                 FontFamily="/Resources/Fonts/#Roboto"
-                Height="180"
+                 HorizontalAlignment="Right"
-                Width="92"
+                 VerticalAlignment="Bottom"
-                Stretch="UniformToFill"/>
+                 Margin="0,0,254,60"/>-->
-         <TextBlock Text="2022-2023"
-                    FontSize="12"
-                    FontFamily="/Resources/Fonts/#Roboto"
-                    HorizontalAlignment="Center"
-                    Margin="0,140,0,0"/>
-         
-      </Grid>
    </Grid>
 </Window>

Icarus/StartMachPanel/StartMachPanelV.xaml

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

Icarus/StartMachPanel/StartMachPanelVM.vb

@@ -35,6 +35,10 @@ Public Class StartMachPanelVM
          Return m_SelStart
       End Get
       Set(value As StartEntity)
+         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refStartMachPanelVM.bCPlaneObj_IsActive Then
+            NotifyPropertyChanged(NameOf(SelStart))
+            Return
+         End If
          m_SelStart = value
          EgtDeselectAll()
          If Not IsNothing(value) Then
@@ -199,7 +203,7 @@ Public Class StartMachPanelVM
          Return m_bAdd_IsChecked
       End Get
       Set(value As Boolean)
-         If Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bAdd_IsChecked = value
             If value Then
                m_bEdit_IsChecked = False
@@ -221,7 +225,7 @@ Public Class StartMachPanelVM
          Return m_bEdit_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelStart) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not IsNothing(m_SelStart) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bEdit_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -243,7 +247,7 @@ Public Class StartMachPanelVM
          Return m_bGrid_IsChecked
       End Get
       Set(value As Boolean)
-         If Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bGrid_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -271,7 +275,7 @@ Public Class StartMachPanelVM
          Return m_bMove_IsChecked
       End Get
       Set(value As Boolean)
-         If Not IsNothing(m_SelStart) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 Then
+         If Not IsNothing(m_SelStart) AndAlso Map.refSceneHostVM.MainController.GetStep = 0 AndAlso Not m_bCPlaneObj_IsActive Then
             m_bMove_IsChecked = value
             If value Then
                m_bAdd_IsChecked = False
@@ -293,6 +297,18 @@ Public Class StartMachPanelVM
       End Get
    End Property
 
+   Private m_StartList_IsEnabled As Boolean = False
+   Public ReadOnly Property StartList_IsEnabled As Boolean
+      Get
+         Return If(m_StartList.Count > 0, m_StartList_IsEnabled, False)
+      End Get
+   End Property
+   Friend Sub SetStartListIsEnabled(bValue As Boolean)
+      m_StartList_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(StartList_IsEnabled))
+   End Sub
+
+
    ' riferimento griglia all'ingresso in questa pagina
    Private m_OriginalGridFrame As New Frame3d
 
@@ -304,6 +320,8 @@ Public Class StartMachPanelVM
       End Get
    End Property
 
+   Private m_bEscOnLine2P As Boolean = False
+
 #Region "Tooltip"
 
    Public ReadOnly Property Point_ToolTip As String
@@ -458,6 +476,8 @@ Public Class StartMachPanelVM
          SelStart = m_StartList(0)
          NotifyPropertyChanged(NameOf(SelStart))
       End If
+      ' abilito lista start mach
+      SetStartListIsEnabled(True)
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
 
@@ -481,16 +501,33 @@ Public Class StartMachPanelVM
       ' seleziono percorso corrente
       EgtDeselectAll()
       EgtSelectObj(m_SelStart.nId)
+      EgtDraw()
+      ' disattivo il resto dell'interfaccia
+      ManageInterface(False)
       Return True
    End Function
 
    Friend Sub UpdateUI()
       ' se attiva operazione in piu' passaggi, esco
       If Map.refSceneHostVM.MainController.GetContinue() Then Return
-      Dim NewEntity As StartEntity = Nothing
+   End Sub
-      ' se finita creazione curva (è stata chiusa)
+
+   Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      m_bEscOnLine2P = False
+      Select Case command
+         Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE,
+              Controller.CMD.MOVE, Controller.CMD.ROTATE
+            ' Imposto flag di ricalcolo slice
+            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+            ' rimetto la selezione scena a null
+            Map.refSceneHostVM.MainScene.SetStatusNull()
+      End Select
+      ' riabilito interfaccia
+      ManageInterface(True)
+      ' se finita creazione curva
       If bIsCreatingPath Then
          m_bIsCreatingPath = False
+         Dim NewEntity As StartEntity = Nothing
          Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
          Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewStartLayerId)
          Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
@@ -503,37 +540,22 @@ Public Class StartMachPanelVM
                   NewEntityType = StartMachTypes.COMPO
             End Select
             EgtSetName(nNewEntityId, START_GEOM)
-            ' coloro l'entita' di rosso
+            ' resetto colore entita'
-            Dim c3Red As Color3d
+            EgtResetColor(nNewEntityId)
-            c3Red.FromColor(System.Drawing.Color.Red)
-            EgtSetColor(nNewEntityId, c3Red)
             ' lo sposto nel layer degli start
             EgtRelocateGlob(nNewEntityId, m_nStartMachLayerId, GDB_POS.LAST_SON)
             ' lo aggiungo alla lista
             NewEntity = New StartEntity(nNewEntityId, NewEntityType)
             m_StartList.Add(NewEntity)
-            ' cancello layer di disegno
+            ' lo seleziono
-            EgtErase(nNewStartLayerId)
+            SelStart = NewEntity
+            NotifyPropertyChanged(NameOf(SelStart))
          End If
+         ' cancello layer di disegno
+         EgtErase(nNewStartLayerId)
       End If
       ' aggiorno posizione
       RefreshPos()
-      ' se aggiunta entita'
-      If Not IsNothing(NewEntity) Then
-         SelStart = NewEntity
-         NotifyPropertyChanged(NameOf(SelStart))
-      End If
-      ' rimetto la selezione scena a null
-      Map.refSceneHostVM.MainScene.SetStatusNull()
-   End Sub
-
-   Friend Sub OnExecCmdEnd(command As Controller.CMD)
-      Select Case command
-         Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE,
-              Controller.CMD.MOVE, Controller.CMD.ROTATE
-            ' Imposto flag di ricalcolo slice
-            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
-      End Select
    End Sub
 
    Friend Sub OnKeyDown(Key As Forms.Keys)
@@ -550,6 +572,12 @@ Public Class StartMachPanelVM
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          End If
+         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
+         If m_bEscOnLine2P Then
+            m_bEscOnLine2P = False
+         Else
+            ManageInterface(True)
+         End If
       End If
    End Sub
 
@@ -565,6 +593,18 @@ Public Class StartMachPanelVM
       End If
    End Sub
 
+   Friend Sub ManageInterface(bValue As Boolean)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
+      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
+      SetStartListIsEnabled(bValue)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -587,14 +627,14 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Point(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup( m_nPartId, LAY_NEWSTART)
+      ManageInterface(False)
+      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
       If nNewStartLayerId = GDB_ID.NULL Then
          nNewStartLayerId = EgtCreateGroup(m_nPartId)
          EgtSetName(nNewStartLayerId, LAY_NEWSTART)
       End If
       EgtSetCurrPartLayer(m_nPartId, nNewStartLayerId)
-      'InitCommand(True)
       If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.POINT) Then
          m_bIsCreatingPath = True
       End If
@@ -620,8 +660,9 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub Line2P(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup( m_nPartId, LAY_NEWSTART)
+      ManageInterface(False)
+      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
       If nNewStartLayerId = GDB_ID.NULL Then
          nNewStartLayerId = EgtCreateGroup(m_nPartId)
          EgtSetName(nNewStartLayerId, LAY_NEWSTART)
@@ -653,7 +694,7 @@ Public Class StartMachPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub ModifyCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand()
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MODIFYCURVE)
    End Sub
@@ -678,7 +719,7 @@ Public Class StartMachPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub AddPointCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand()
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOARC)
@@ -707,7 +748,7 @@ Public Class StartMachPanelVM
    ''' Execute the LinearDimension.  This method is invoked by the LinDimCommand.
    ''' </summary>
    Public Sub RemovePointCurve(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
          InitCommand()
          Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.CURVETOLINE)
@@ -737,7 +778,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -762,7 +803,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneFront.  This method is invoked by the CPlaneFrontCommand.
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -787,7 +828,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneRight.  This method is invoked by the CPlaneRightCommand.
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -812,7 +853,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneBack.  This method is invoked by the CPlaneBackCommand.
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -837,7 +878,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneLeft.  This method is invoked by the CPlaneLeftCommand.
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -862,7 +903,7 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneBottom.  This method is invoked by the CPlaneBottomCommand.
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -887,7 +928,8 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneElevation.  This method is invoked by the CPlaneElevationCommand.
    ''' </summary>
    Public Sub CPlaneElevation(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -911,7 +953,8 @@ Public Class StartMachPanelVM
    ''' Execute the CPlaneOrigin.  This method is invoked by the CPlaneOriginCommand.
    ''' </summary>
    Public Sub CPlaneOrigin(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
@@ -951,7 +994,8 @@ Public Class StartMachPanelVM
    ''' 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
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      ManageInterface(False)
       ' salvo selezione precedente e deseleziono altri oggetti
       m_PrevSelObjs.Clear()
       Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -961,7 +1005,7 @@ Public Class StartMachPanelVM
       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)
+      Map.refControllerInputPanelVM.ShowMessage("Grid from Selection", "Select the face of the object where to place the grid")
    End Sub
 
 #End Region ' CPlaneObj
@@ -978,6 +1022,7 @@ Public Class StartMachPanelVM
    End Property
 
    Public Sub DragMove()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       InitCommand()
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.MOVE)
    End Sub
@@ -996,7 +1041,7 @@ Public Class StartMachPanelVM
    End Property
 
    Public Sub Delete()
-      If IsNothing(SelStart) Then Return
+      If IsNothing(SelStart) OrElse Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       If EgtErase(m_SelStart.nId) Then
          Dim nSelStartIndex As Integer = m_StartList.IndexOf(SelStart)
          m_StartList.Remove(SelStart)
@@ -1011,6 +1056,7 @@ Public Class StartMachPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelStart))
       End If
+      SetStartListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete

Icarus/StatusBar/MyStatusBarVM.vb

@@ -8,7 +8,6 @@ Public Class MyStatusBarVM
    Inherits EgtWPFLib5.StatusBarVM
 
    ' Funzioni di callback per output in interfaccia da LUA
-   Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
    Private m_OutTextCallback As New OutTextCallback(AddressOf OutText)
 
    Private m_bStopProgress As Boolean
@@ -115,8 +114,6 @@ Public Class MyStatusBarVM
    Sub New()
       ' Creo riferimento a questa classe in Map
       Map.SetRefMyStatusBarVM(Me)
-      ' Installo funzione gestione eventi per lua
-      EgtSetProcessEvents(m_ProcEventsCallback)
       ' Installo funzione output testo su status per lua
       EgtSetOutText(m_OutTextCallback)
       ' imposto stato di visualizzazione della griglia
@@ -163,7 +160,7 @@ Public Class MyStatusBarVM
       Return True
    End Function
 
-   Private Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
+   Friend Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
       ' Se previsto, imposto progress
       If nProg > 0 Then SetLoadingProgress(Math.Min(nProg, 100))
       ' Costringo ad aggiornare

Icarus/StatusBar/StatusBarV.xaml

@@ -42,6 +42,7 @@
                                             IsChecked="{Binding bGridVisibility}"
                                             ImageSource="/Resources/StatusBar/GridVisibility.png"
                                             CheckedImageSource="/Resources/StatusBar/GridVisibilityWhite.png"
+                                            ToolTip="Grid Visibility"
                                             Margin="0,2.5,0,0"
                                             Style="{StaticResource StatusBar_ToggleButton}"/>
       </Grid>

Icarus/TSFEditor/ColumnHeader.xaml

@@ -0,0 +1,13 @@
+<Grid x:Class="ColumnHeader"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+   </Grid.RowDefinitions>
+   <TextBlock Text="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"
+              Style="{StaticResource BaseTextBlock}"/>
+   <TextBlock Grid.Row="1"
+              Text="{Binding MeasureUnit, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"
+              Style="{StaticResource MeasureUnit_TextBlock}"/>
+</Grid>

Icarus/TSFEditor/ColumnHeader.xaml.vb

@@ -0,0 +1,25 @@
+Public Class ColumnHeader
+
+   Public Shared ReadOnly HeaderProperty As DependencyProperty = DependencyProperty.Register("Header", GetType(String), GetType(ColumnHeader), New FrameworkPropertyMetadata(""))
+
+   Public Property Header As String
+      Get
+         Return CStr(MyBase.GetValue(HeaderProperty))
+      End Get
+      Set(value As String)
+         MyBase.SetValue(HeaderProperty, value)
+      End Set
+   End Property
+
+   Public Shared ReadOnly MeasureUnitProperty As DependencyProperty = DependencyProperty.Register("MeasureUnit", GetType(String), GetType(ColumnHeader), New FrameworkPropertyMetadata(""))
+
+   Public Property MeasureUnit As String
+      Get
+         Return CStr(MyBase.GetValue(MeasureUnitProperty))
+      End Get
+      Set(value As String)
+         MyBase.SetValue(MeasureUnitProperty, value)
+      End Set
+   End Property
+
+End Class

Icarus/TSFEditor/TFSEditorV.xaml

@@ -29,13 +29,13 @@
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
                   <RowDefinition Height="Auto"/>
                </Grid.RowDefinitions>
-               <StackPanel Grid.ColumnSpan="2"
+               <StackPanel Orientation="Horizontal"
-                           Orientation="Horizontal"
                            HorizontalAlignment="Center"
                            Margin="0,2.5,0,2.5">
                   <TextBlock Text="Modify"
@@ -45,7 +45,7 @@
                   <ComboBox ItemsSource="{Binding MediaTypeList}"
                             SelectedIndex="{Binding ghSelMediaType}"
                             Margin="2.5,0,0,0"
-                            Width="160"
+                            Width="150"
                             Style="{StaticResource RightPanel_ComboBox}"/>
                </StackPanel>
                <StackPanel Grid.Row="1"
@@ -77,12 +77,20 @@
                           Style="{StaticResource RightPanel_Button}"/>
                </StackPanel>
                <Button Grid.Column="1"
+                       Grid.RowSpan="2"
+                       Content="Update"
+                       Command="{Binding Update_Command}"
+                       Height="45"
+                       Width="45"
+                       Margin="0,2.5,2.5,2.5"
+                       Style="{StaticResource RightPanel_Button}"/>
+               <Button Grid.Column="2"
                        Grid.RowSpan="2"
                        Content="Reset"
                        Command="{Binding Reset_Command}"
                        Height="45"
                        Width="45"
-                       Margin="0,2.5,5,2.5"
+                       Margin="2.5,2.5,5,2.5"
                        Style="{StaticResource RightPanel_Button}"/>
             </Grid>
             <ContentControl.Style>
@@ -106,7 +114,7 @@
                                        <ComboBox ItemsSource="{Binding MediaTypeList}"
                                                  SelectedIndex="{Binding ghSelMediaType}"
                                                  Margin="2.5,0,2.5,0"
-                                                 Width="160"
+                                                 Width="150"
                                                  Style="{StaticResource RightPanel_ComboBox}"/>
                                     </StackPanel>
                                     <StackPanel Grid.Column="1"
@@ -136,12 +144,22 @@
                                                Margin="2.5,0,0,0"
                                                Style="{StaticResource RightPanel_Button}"/>
                                     </StackPanel>
-                                    <Button Grid.Column="1"
+                                    <StackPanel Grid.Column="1"
-                                            Content="Reset"
+                                                Orientation="Horizontal"
-                                            Command="{Binding Reset_Command}"
+                                                HorizontalAlignment="Right">
-                                            HorizontalAlignment="Right"
+                                       <Button Grid.Column="1"
-                                            Margin="0,0,5,0"
+                                               Content="Update"
-                                            Style="{StaticResource RightPanel_Button}"/>
+                                               Command="{Binding Update_Command}"
+                                               HorizontalAlignment="Right"
+                                               Margin="0,0,5,0"
+                                               Style="{StaticResource RightPanel_Button}"/>
+                                       <Button Grid.Column="1"
+                                               Content="Reset"
+                                               Command="{Binding Reset_Command}"
+                                               HorizontalAlignment="Right"
+                                               Margin="0,0,5,0"
+                                               Style="{StaticResource RightPanel_Button}"/>
+                                    </StackPanel>
                                  </Grid>
                               </ControlTemplate>
                            </Setter.Value>
@@ -158,69 +176,150 @@
                    SelectionMode="Extended"
                    HorizontalGridLinesBrush="White"
                    VerticalGridLinesBrush="White"
+                   ColumnHeaderHeight="40"
                    Margin="0,2.5,0,2.5">
             <DataGrid.Columns>
-               <DataGridTextColumn Header="Index" 
+               <DataGridTextColumn Header="Layer" 
                                    Binding="{Binding nIndex}"
                                    IsReadOnly="True"
-                                   Width="Auto"/>
+                                   Width="Auto">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.Layer_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.Index_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
                <DataGridTextColumn Header="Length"
                                    Binding="{Binding sLength}"
                                    IsReadOnly="True"
                                    Visibility="{Binding DataContext.ColExtend_Visibility,
                                                         Source={x:Reference TFSEditorStackPanel}}"
-                                   Width="2*"
+                                   Width="1.5*"
-                                   TextBlock.TextAlignment="Center"/>
+                                   TextBlock.TextAlignment="Center">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.Length_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.Millimeters_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
                <DataGridTextColumn Header="TMin" 
                                    Binding="{Binding sTMin}"
                                    IsReadOnly="True"
                                    Visibility="{Binding DataContext.ColExtend_Visibility,
                                                         Source={x:Reference TFSEditorStackPanel}}"
-                                   Width="1*"/>
+                                   Width="1*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.TMin_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.Seconds_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
                <DataGridTextColumn Header="TTrg" 
                                    Binding="{Binding sTTrg}"
                                    IsReadOnly="True"
-                                   Width="1*"/>
+                                   Width="1*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.TTrg_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.Seconds_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
                <DataGridTextColumn Header="TMax" 
                                    Binding="{Binding sTMax}"
                                    IsReadOnly="True"
                                    Visibility="{Binding DataContext.ColExtend_Visibility,
                                                         Source={x:Reference TFSEditorStackPanel}}"
-                                   Width="1*"/>
+                                   Width="1*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.TMax_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.Seconds_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
                <DataGridTextColumn Header="TCurr" 
                                    Binding="{Binding sTCurr}"
                                    IsReadOnly="True"
-                                   Width="1*"/>
+                                   Width="1*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.TCurr_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.Seconds_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
                <DataGridTextColumn Header="TWait" 
                                    Binding="{Binding sTWait}"
                                    Visibility="{Binding DataContext.ColWait_Visibility,
                                                         Source={x:Reference TFSEditorStackPanel}}"
-                                   Width="1*"/>
+                                   Width="1*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.TWait_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.Seconds_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
                <DataGridTextColumn Header="FMin" 
                                    Binding="{Binding sFMin}"
                                    IsReadOnly="True"
                                    Visibility="{Binding DataContext.ColExtend_Visibility,
                                                         Source={x:Reference TFSEditorStackPanel}}"
-                                   Width="1*"/>
+                                   Width="1*">
-               <DataGridTextColumn Header="FTrg" 
+                  <DataGridTextColumn.HeaderTemplate>
-                                   Binding="{Binding sFTrg}"
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.FMin_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.MmPerMin_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <DataGridTextColumn Binding="{Binding sFTrg}"
                                    IsReadOnly="True"
                                    Visibility="{Binding DataContext.ColExtend_Visibility,
                                                         Source={x:Reference TFSEditorStackPanel}}"
-                                   Width="1*"/>
+                                   Width="1*">
-               <DataGridTextColumn Header="FMax" 
+                  <DataGridTextColumn.HeaderTemplate>
-                                   Binding="{Binding sFMax}"
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.FTrg_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.MmPerMin_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <DataGridTextColumn Binding="{Binding sFMax}"
                                    IsReadOnly="True"
                                    Visibility="{Binding DataContext.ColExtend_Visibility,
                                                         Source={x:Reference TFSEditorStackPanel}}"
-                                   Width="1*"/>
+                                   Width="1*">
-               <DataGridTextColumn Header="FCurr" 
+                  <DataGridTextColumn.HeaderTemplate>
-                                   Binding="{Binding sFCurr}"
+                     <DataTemplate>
-                                   Width="1*"/>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.FMax_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
-               <DataGridTextColumn Header="Speed" 
+                                               MeasureUnit="{Binding DataContext.MmPerMin_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
-                                   Binding="{Binding sSpeed}"
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <DataGridTextColumn Binding="{Binding sFCurr}"
+                                   Width="1*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.FCurr_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.MmPerMin_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <DataGridTextColumn Binding="{Binding sSpeed}"
                                    IsReadOnly="True"
-                                   Width="1*"/>
+                                   Width="1*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <PrintApp:ColumnHeader Header="{Binding DataContext.Speed_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"
+                                               MeasureUnit="{Binding DataContext.Rpm_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
             </DataGrid.Columns>
             <DataGrid.RowStyle>
                <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
@@ -243,16 +342,37 @@
                       SelectedIndex="{Binding nSelFilter}"
                       Width="125"
                       Margin="2.5,0,2.5,0"
+                      ToolTip="Filter"
                       Style="{StaticResource RightPanel_ComboBox}"/>
-            <Button DockPanel.Dock="Right"
+            <ToggleButton DockPanel.Dock="Right"
-                    Command="{Binding Extend_Command}"
+                          IsChecked="{Binding bColExtend}"
-                    Margin="2.5,0,2.5,0"
+                          Margin="2.5,0,2.5,0">
-                    Style="{StaticResource ToolBar_Button}">
+               <ToggleButton.Resources>
-               <Image Source="/Resources/TFSEditor/Expand.png"
+                  <DataTemplate x:Key="Expand">
-                      Style="{StaticResource Button_Image}"/>
+                     <Image Source="/Resources/TFSEditor/Expand.png"
-            </Button>
+                            Style="{StaticResource Button_Image}"/>
+                  </DataTemplate>
+                  <DataTemplate x:Key="Reduce">
+                     <Image Source="/Resources/TFSEditor/Reduce.png"
+                            Style="{StaticResource Button_Image}"/>
+                  </DataTemplate>
+               </ToggleButton.Resources>
+               <ToggleButton.Style>
+                  <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToolBar_ToggleButton}">
+                     <Setter Property="ContentTemplate" Value="{StaticResource Expand}"/>
+                     <Setter Property="ToolTip" Value="Expand"/>
+                     <Style.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                           <Setter Property="ContentTemplate" Value="{StaticResource Reduce}"/>
+                           <Setter Property="ToolTip" Value="Reduce"/>
+                        </Trigger>
+                     </Style.Triggers>
+                  </Style>
+               </ToggleButton.Style>
+            </ToggleButton>
             <Grid VerticalAlignment="Center"
-                  HorizontalAlignment="Center">
+                  HorizontalAlignment="Left"
+                  Margin="2.5,0,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>

Icarus/TSFEditor/TFSEditorVM.vb

@@ -14,10 +14,10 @@ Public Class TFSEditorVM
 
    Public Enum MediaTypes As Integer
       HEIGHT = 1
-      SECTIONCHANGE = 2
+      'SECTIONCHANGE = 2
-      SELECTION = 3
+      SELECTION = 2
-      FEED_INCREMENT = 4
+      FEED_INCREMENT = 3
-      SELECTION_WAIT = 5
+      SELECTION_WAIT = 4
    End Enum
 
    Public Enum Filters As Integer
@@ -60,13 +60,13 @@ Public Class TFSEditorVM
       End Set
    End Property
 
-   Private m_MediaTypeList As New List(Of String)({"Feed by Slice Number", "Feed by Section change", "Feed by Selection", "Wait by Selection", "Feed by Increment"})
+   Private m_MediaTypeList As New List(Of String)({"Feed by Slice Number", "Feed by Selection", "Wait by Selection", "Feed by Increment"})
    Public ReadOnly Property MediaTypeList As List(Of String)
       Get
          If bWaitingTime Then
-            Return New List(Of String)({"Feed by Slice Number", "Feed by Section change", "Feed by Selection", "Feed by Increment", "Wait by Selection"})
+            Return New List(Of String)({"Feed by Slice Number", "Feed by Selection", "Feed by Increment", "Wait by Selection"})
          Else
-            Return New List(Of String)({"Feed by Slice Number", "Feed by Section change", "Feed by Selection", "Feed by Increment"})
+            Return New List(Of String)({"Feed by Slice Number", "Feed by Selection", "Feed by Increment"})
          End If
          ' Return m_MediaTypeList
       End Get
@@ -83,12 +83,12 @@ Public Class TFSEditorVM
             Case MediaTypes.HEIGHT
                SetSetVisibility(False)
                SetMediaVisibility(True)
-            Case MediaTypes.SECTIONCHANGE
+            'Case MediaTypes.SECTIONCHANGE
-               SetSetVisibility(False)
+            '   SetSetVisibility(False)
-               SetMediaVisibility(True)
+            '   SetMediaVisibility(True)
             Case MediaTypes.SELECTION
                SetSetVisibility(True)
-               SetMediaVisibility(True)
+               SetMediaVisibility(False)
             Case MediaTypes.SELECTION_WAIT
                SetSetVisibility(True)
                SetMediaVisibility(False)
@@ -170,10 +170,16 @@ Public Class TFSEditorVM
    End Property
 
    Private m_bColExtend As Boolean = False
-   Public ReadOnly Property bColExtend As Boolean
+   Public Property bColExtend As Boolean
       Get
          Return m_bColExtend
       End Get
+      Set(value As Boolean)
+         m_bColExtend = value
+         NotifyPropertyChanged(NameOf(bColExtend))
+         NotifyPropertyChanged(NameOf(ColExtend_Visibility))
+         NotifyPropertyChanged(NameOf(ControlWidth))
+      End Set
    End Property
    Public ReadOnly Property ColExtend_Visibility As Visibility
       Get
@@ -229,8 +235,8 @@ Public Class TFSEditorVM
          Select Case m_nSelMediaType
             Case MediaTypes.HEIGHT
                Return "Slice Number:"
-            Case MediaTypes.SECTIONCHANGE
+            'Case MediaTypes.SECTIONCHANGE
-               Return "Difference:"
+            '   Return "Difference:"
             Case MediaTypes.SELECTION
                Return "Feed:"
             Case MediaTypes.SELECTION_WAIT
@@ -243,9 +249,116 @@ Public Class TFSEditorVM
       End Get
    End Property
 
+#Region "Messages"
+
+   Public ReadOnly Property Layer_Msg As String
+      Get
+         Return "Layer"
+      End Get
+   End Property
+
+   Public ReadOnly Property Length_Msg As String
+      Get
+         Return "Length"
+      End Get
+   End Property
+
+   Public ReadOnly Property TMin_Msg As String
+      Get
+         Return "TMin"
+      End Get
+   End Property
+
+   Public ReadOnly Property TTrg_Msg As String
+      Get
+         Return "TTrg"
+      End Get
+   End Property
+
+   Public ReadOnly Property TMax_Msg As String
+      Get
+         Return "TMax"
+      End Get
+   End Property
+
+   Public ReadOnly Property TCurr_Msg As String
+      Get
+         Return "TCurr"
+      End Get
+   End Property
+
+   Public ReadOnly Property TWait_Msg As String
+      Get
+         Return "TWait"
+      End Get
+   End Property
+
+   Public ReadOnly Property FMin_Msg As String
+      Get
+         Return "FMin"
+      End Get
+   End Property
+
+   Public ReadOnly Property FTrg_Msg As String
+      Get
+         Return "FTrg"
+      End Get
+   End Property
+
+   Public ReadOnly Property FMax_Msg As String
+      Get
+         Return "FMax"
+      End Get
+   End Property
+
+   Public ReadOnly Property FCurr_Msg As String
+      Get
+         Return "FCurr"
+      End Get
+   End Property
+
+   Public ReadOnly Property Speed_Msg As String
+      Get
+         Return "Speed"
+      End Get
+   End Property
+
+   Public ReadOnly Property Index_Msg As String
+      Get
+         Return "n°"
+      End Get
+   End Property
+
+   Public ReadOnly Property Millimeters_Msg As String
+      Get
+         Return "mm"
+      End Get
+   End Property
+
+   Public ReadOnly Property Seconds_Msg As String
+      Get
+         Return "min:s"
+      End Get
+   End Property
+
+   Public ReadOnly Property MmPerMin_Msg As String
+      Get
+         Return "mm/min"
+      End Get
+   End Property
+
+   Public ReadOnly Property Rpm_Msg As String
+      Get
+         Return "rpm"
+      End Get
+   End Property
+
+#End Region    ' Messages
+
    ' Definizione comandi
    Private m_cmdSet As ICommand
    Private m_cmdMedia As ICommand
+   Private m_cmdUpdate As ICommand
    Private m_cmdReset As ICommand
    Private m_cmdExtend As ICommand
 
@@ -417,33 +530,33 @@ Public Class TFSEditorVM
                   m_LayerList(Index2).SetFCurr(dNewFCurr)
                Next
             Next
-         Case MediaTypes.SECTIONCHANGE
+         'Case MediaTypes.SECTIONCHANGE
-            Dim ChangeIndexList As New List(Of Integer)({0})
+         '   Dim ChangeIndexList As New List(Of Integer)({0})
-            Dim dPrevLength As Double = m_LayerList(0).dLength
+         '   Dim dPrevLength As Double = m_LayerList(0).dLength
-            ' recupero punti di rottura
+         '   ' recupero punti di rottura
-            For Index = 1 To m_LayerList.Count() - 1
+         '   For Index = 1 To m_LayerList.Count() - 1
-               Dim dCurrLength = m_LayerList(Index)
+         '      Dim dCurrLength = m_LayerList(Index)
-               If dPrevLength < m_LayerList(Index).dLength * (1 - (m_dModifyValue / 100)) OrElse dPrevLength > m_LayerList(Index).dLength * (1 + (m_dModifyValue / 100)) Then
+         '      If dPrevLength < m_LayerList(Index).dLength * (1 - (m_dModifyValue / 100)) OrElse dPrevLength > m_LayerList(Index).dLength * (1 + (m_dModifyValue / 100)) Then
-                  ChangeIndexList.Add(Index)
+         '         ChangeIndexList.Add(Index)
-               End If
+         '      End If
-               dPrevLength = m_LayerList(Index).dLength
+         '      dPrevLength = m_LayerList(Index).dLength
-            Next
+         '   Next
-            If ChangeIndexList(ChangeIndexList.Count - 1) <> m_LayerList.Count() - 1 Then
+         '   If ChangeIndexList(ChangeIndexList.Count - 1) <> m_LayerList.Count() - 1 Then
-               ChangeIndexList.Add(m_LayerList.Count() - 1)
+         '      ChangeIndexList.Add(m_LayerList.Count() - 1)
-            End If
+         '   End If
-            ' ricalcolo media sugli intervalli trovati
+         '   ' ricalcolo media sugli intervalli trovati
-            For Index = 0 To ChangeIndexList.Count() - 2
+         '   For Index = 0 To ChangeIndexList.Count() - 2
-               Dim dFSum As Double = 0
+         '      Dim dFSum As Double = 0
-               Dim dFIndex As Double = 0
+         '      Dim dFIndex As Double = 0
-               For Index2 = ChangeIndexList(Index) To ChangeIndexList(Index + 1)
+         '      For Index2 = ChangeIndexList(Index) To ChangeIndexList(Index + 1)
-                  dFSum += m_LayerList(Index2).sFCurr
+         '         dFSum += m_LayerList(Index2).sFCurr
-                  dFIndex += 1
+         '         dFIndex += 1
-               Next
+         '      Next
-               Dim dNewFCurr As Double = dFSum / dFIndex
+         '      Dim dNewFCurr As Double = dFSum / dFIndex
-               For Index2 = ChangeIndexList(Index) To ChangeIndexList(Index + 1)
+         '      For Index2 = ChangeIndexList(Index) To ChangeIndexList(Index + 1)
-                  m_LayerList(Index2).SetFCurr(dNewFCurr)
+         '         m_LayerList(Index2).SetFCurr(dNewFCurr)
-               Next
+         '      Next
-            Next
+         '   Next
          Case MediaTypes.SELECTION
             If m_SelLayers.Count <= 0 Then Return
             Dim dFSum As Double = 0
@@ -475,6 +588,29 @@ Public Class TFSEditorVM
 
 #End Region ' Media
 
+#Region "Update"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneTop.
+   ''' </summary>
+   Public ReadOnly Property Update_Command As ICommand
+      Get
+         If m_cmdUpdate Is Nothing Then
+            m_cmdUpdate = New Command(AddressOf Update)
+         End If
+         Return m_cmdUpdate
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
+   ''' </summary>
+   Public Sub Update()
+      Map.refSliceManagerVM.Update()
+   End Sub
+
+#End Region ' Update
+
 #Region "Reset"
 
    ''' <summary>
@@ -571,14 +707,14 @@ Public Class TFSLayer
    End Property
    Public ReadOnly Property sTMin As String
       Get
-         Return DoubleToString(m_dTMin, 0)
+         Return SecondsToStringConverter(m_dTMin)
       End Get
    End Property
 
    Private m_dTTrg As Double
    Public ReadOnly Property sTTrg As String
       Get
-         Return DoubleToString(m_dTTrg, 0)
+         Return SecondsToStringConverter(m_dTTrg)
       End Get
    End Property
 
@@ -590,7 +726,7 @@ Public Class TFSLayer
    End Property
    Public ReadOnly Property sTMax As String
       Get
-         Return DoubleToString(m_dTMax, 0)
+         Return SecondsToStringConverter(m_dTMax)
       End Get
    End Property
 
@@ -602,14 +738,14 @@ Public Class TFSLayer
    End Property
    Public ReadOnly Property sTCurr As String
       Get
-         Return DoubleToString(m_dTCurr, 0)
+         Return SecondsToStringConverter(m_dTCurr)
       End Get
    End Property
 
    Private m_dTWait As Double
    Public Property sTWait As String
       Get
-         Return LenToString(m_dTWait, 0)
+         Return SecondsToStringConverter(m_dTWait)
       End Get
       Set(value As String)
          Dim dNewValue As Double
@@ -818,4 +954,12 @@ Public Class TFSLayer
       m_dSpeed = dSpeed
    End Sub
 
+   Private Function SecondsToStringConverter(value As Double) As String
+      Dim dtTime As TimeSpan = TimeSpan.FromSeconds(value)
+      Dim dHours As Double = Math.Floor(dtTime.TotalHours)
+      Dim dMinutes As Double = Math.Floor(dtTime.Minutes)
+      Dim dSeconds As Double = Math.Ceiling(dtTime.Seconds)
+      Return If(dHours > 0, dHours.ToString("00") & ":", "") & If(dHours > 0, dMinutes.ToString("00"), dMinutes.ToString()) & ":" & dSeconds.ToString("00")
+   End Function
+
 End Class

Icarus/TopPanel/TopPanelV.xaml

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

Icarus/TopPanel/TopPanelVM.vb

@@ -121,6 +121,7 @@ Public Class TopPanelVM
             Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.NULL)
             NotifyPropertyChanged(NameOf(SelModifyMode))
          End If
+         NotifyPropertyChanged(NameOf(SelModifyModeName))
          ' chiudo il popup
          SetModifyIsChecked(False)
       End Set
@@ -128,8 +129,15 @@ Public Class TopPanelVM
    Friend Sub SetSelModifyMode(ModifyMode As ModifyModes)
       SelModifyMode = m_ModifyModeList.FirstOrDefault(Function(x) x.ModifyMode = ModifyMode)
       NotifyPropertyChanged(NameOf(SelModifyMode))
+      NotifyPropertyChanged(NameOf(SelModifyModeName))
    End Sub
 
+   Public ReadOnly Property SelModifyModeName As String
+      Get
+         Return If(Not IsNothing(m_SelModifyMode) AndAlso m_SelModifyMode.ModifyMode <> ModifyModes.NULL, m_SelModifyMode.sName, "Modify")
+      End Get
+   End Property
+
    Private m_bModify_IsChecked As Boolean
    Public Property bModify_IsChecked As Boolean
       Get
@@ -171,10 +179,8 @@ Public Class TopPanelVM
          End If
          m_SelPart = value
          If Not IsNothing(value) Then
-            ' Eseguo la selezione
+            ' deseleziono tutto
             EgtDeselectAll()
-            ' EgtSetMark(m_SelPart.nPrintSolidId)
-            EgtDraw()
             ' imposto lavorazione e materiale del pezzo selezionato
             Map.refCurrMachiningPanelVM.ReadMachParamFromSelPart()
             Dim DbMachining As MachiningIndex = MachiningList.FirstOrDefault(Function(x) x.sGUID = Map.refCurrMachiningPanelVM.CurrMachining.sCurrGUID)
@@ -183,6 +189,9 @@ Public Class TopPanelVM
             ' notifico posizione pezzo
             Map.refDispositionPanelVM.RefreshPos()
             Map.refSliceManagerVM.UpdateDimensions()
+            ' aggiorno area di estrusione
+            CurrentMachine.UpdateExtrusionArea()
+            EgtDraw()
          End If
       End Set
    End Property
@@ -743,7 +752,8 @@ Public Class TopPanelVM
    Public Sub Machining()
       If IsNothing(m_SelPart) OrElse IsNothing(CurrMachining) Then Return
       If IsNothing(m_SelMachining) Then
-         MessageBox.Show("Select current Db Machining first!", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+         'MessageBox.Show("Select current Db Machining first!", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, "Select current Db Machining first!", "Warning", MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Return
       End If
       SelPage = Pages.CURRMACHINING

Icarus/Utility/CurrentMachine.vb

@@ -28,6 +28,13 @@ Public Module CurrentMachine
          Return m_sMachIniFile
       End Get
    End Property
+   ' File ini dei dati della macchina
+   Private m_sMachDataIniFile As String = String.Empty
+   Friend ReadOnly Property sMachDataIniFile As String
+      Get
+         Return m_sMachDataIniFile
+      End Get
+   End Property
    ' File script della macchina
    Private m_sMachScriptDir As String = String.Empty
    Friend ReadOnly Property sMachScriptDir As String
@@ -64,6 +71,14 @@ Public Module CurrentMachine
       End Get
    End Property
 
+   ' box dell'area di estrusione
+   Private m_b3ExtrusionArea As New BBox3d
+   Friend ReadOnly Property b3ExtrusionArea As BBox3d
+      Get
+         Return m_b3ExtrusionArea
+      End Get
+   End Property
+
 #Region "Init"
 
    Sub InitCurrentMachine(sMachinesRootDir As String, sMachineName As String)
@@ -73,6 +88,9 @@ Public Module CurrentMachine
       m_sMachDir = sMachinesRootDir & "\" & sMachineName
       ' Impostazione path MachIni file
       m_sMachIniFile = sMachinesRootDir & "\" & sMachineName & "\" & sMachineName & ".ini"
+      ' Impostazione path MachData Ini file
+      m_sMachDataIniFile = sMachinesRootDir & "\" & sMachineName & "\" & "CustomData" & "\" & MACHDATA_INI_FILE_NAME
+      If Not File.Exists(m_sMachDataIniFile) Then m_sMachDataIniFile = ""
       ' impostazione cartella script
       m_sMachScriptDir = sMachinesRootDir & "\" & sMachineName & "\Scripts"
       ' impostazione cartella lavorazioni
@@ -103,14 +121,8 @@ Public Module CurrentMachine
    Public Sub CreateMachineTable()
       ' Disabilito segnalazione modificato
       Dim DisableMgr As New DisableModifiedMgr
-      ' Recupero dati tavola (creando gruppo di lavoro temporaneo)
-      Dim nTempId = EgtAddMachGroup("qqq")
-      EgtSetTable("Tab")
-      Dim b3Tab As New BBox3d
-      EgtGetTableArea(1, b3Tab)
       Dim dTabX = b3Tab.DimX
       Dim dTabY = b3Tab.DimY()
-      EgtRemoveMachGroup(nTempId)
       ' Disegno tavola
       Dim nTabPartId As Integer = EgtCreateGroup(GDB_ID.ROOT)
       EgtSetLevel(nTabPartId, GDB_LV.SYSTEM)
@@ -128,10 +140,53 @@ Public Module CurrentMachine
          EgtSetInfo(nTabPartId, KEY_MATERIAL_GUID, Map.refTopPanelVM.SelMaterial.sGUID)
          EgtSetInfo(nTabPartId, KEY_MATERIAL_NAME, Map.refTopPanelVM.SelMaterial.sName)
       End If
+      '' creo area di estrusione
+      UpdateExtrusionArea()
       ' Ripristino stato segnalazione modifica
       DisableMgr.ReEnable()
    End Sub
 
+   Public Sub UpdateExtrusionArea()
+      ' recupero eventuale vecchia area di estrusione
+      Dim nTabPartId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, TABLE)
+      Dim nTabLayerId As Integer = EgtGetFirstNameInGroup(nTabPartId, TABLE)
+      Dim nExtrusionAreaId As Integer = EgtGetFirstNameInGroup(nTabLayerId, EXTRUSION_AREA)
+      If nExtrusionAreaId <> GDB_ID.NULL Then
+         ' e la cancello
+         EgtErase(nExtrusionAreaId)
+      End If
+      ' se lavorazione corrente nulla, esco
+      If IsNothing(Map.refTopPanelVM.CurrMachining) Then Return
+      ' se non esiste file dati macchina, esco
+      If String.IsNullOrWhiteSpace(m_sMachDataIniFile) Then Return
+      ' recupero tipo di slice
+      Dim sExtrusionType As String = S_VERTICAL
+      Dim GeneralCathegory As MachiningCathegory = Map.refTopPanelVM.CurrMachining.CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL)
+      Dim SlicingTypeParam As ComboMachiningParam = GeneralCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.SLICINGTYPE)
+      Dim SlicingTypeValue As Machining.MPAR_SLICINGTYPE = SlicingTypeParam.SelValue.Id
+      Select Case SlicingTypeValue
+         Case Machining.MPAR_SLICINGTYPE.VERTICAL
+            sExtrusionType = S_VERTICAL
+         Case Machining.MPAR_SLICINGTYPE.DEG45
+            sExtrusionType = S_45DEGX
+         Case Machining.MPAR_SLICINGTYPE.DEG45_Y
+            sExtrusionType = S_45DEGY
+         Case Machining.MPAR_SLICINGTYPE.HORIZONTAL
+            sExtrusionType = S_HORIZONTAL
+      End Select
+      Dim dExtrXMax = GetPrivateProfileDouble(sExtrusionType, K_MAXX, 0, m_sMachDataIniFile)
+      Dim dExtrXMin = GetPrivateProfileDouble(sExtrusionType, K_MINX, 0, m_sMachDataIniFile)
+      Dim dExtrYMax = GetPrivateProfileDouble(sExtrusionType, K_MAXY, 0, m_sMachDataIniFile)
+      Dim dExtrYMin = GetPrivateProfileDouble(sExtrusionType, K_MINY, 0, m_sMachDataIniFile)
+      nExtrusionAreaId = EgtCreateRectangle2P(nTabLayerId, New Point3d(dExtrXMin, dExtrYMin, 0), New Point3d(dExtrXMax, dExtrYMax, 0))
+      Dim c3Temp As New Color3d
+      c3Temp.FromColor(System.Drawing.Color.Lime)
+      EgtSetColor(nExtrusionAreaId, c3Temp)
+      EgtSetName(nExtrusionAreaId, EXTRUSION_AREA)
+      m_b3ExtrusionArea = New BBox3d(New Point3d(dExtrXMin, dExtrYMin, 0), New Point3d(dExtrXMax, dExtrYMax, 0))
+      EgtDraw()
+   End Sub
+
    Friend Function ReadMachiningParamString(lpAppName As String, lpKeyName As String, lpDefault As String, ByRef lpString As String, Optional sFilePath As String = "") As Integer
       Dim nResult As Integer = GetPrivateProfileString(lpAppName, lpKeyName, "", lpString, If(Not String.IsNullOrWhiteSpace(sFilePath), sFilePath, m_sMachiningFilePath))
       If Not String.IsNullOrWhiteSpace(lpString) Then

Icarus/Utility/Dictionary.xaml

@@ -703,6 +703,14 @@
       <Setter Property="Template" Value="{StaticResource ToggleButton.NoBackgroundButton}"/>
    </Style>
 
+   <Style x:Key="TFSExpand_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Template" Value="{StaticResource ToggleButton.NoBackgroundButton}"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBlock -->
@@ -828,10 +836,18 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
+   <Style x:Key="MeasureUnit_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
+      <Setter Property="FontSize" Value="10"/>
+      <Setter Property="FontStyle" Value="Italic"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBox -->
 
+   <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="#FF7EB4EA"/>
+   <SolidColorBrush x:Key="TextBox.Focus.Border" Color="#FF569DE5"/>
+
    <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
@@ -917,12 +933,122 @@
    <Style x:Key="ParameterList_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource BaseTextBox}">
       <Setter Property="TextAlignment" Value="Center"/>
    </Style>
+   <Style x:Key="ParameterList_TextBox2" TargetType="{x:Type EgtWPFLib5:EgtTextBox2}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox2}}">
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="ExplicitUpdateSource" Value="EnterKeyPressOrLostFocus"/>
+      <Setter Property="ResetValueOnLostFocus" Value="False"/>
+   </Style>
 
-   <Style x:Key="SimulationPanel_Axes_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+   <Style x:Key="SimulationPanel_Axes_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox2}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox2}}">
       <Setter Property="FontSize" Value="18"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtTextBox2}">
+               <TextBox Name="PART_TextBox"
+                        AcceptsReturn="{TemplateBinding AcceptsReturn}"
+                        AcceptsTab="{TemplateBinding AcceptsTab}"
+                        AllowDrop="{TemplateBinding AllowDrop}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CacheMode="{TemplateBinding CacheMode}"
+                        CaretBrush="{TemplateBinding CaretBrush}"
+                        CharacterCasing="{TemplateBinding CharacterCasing}"
+                        Clip="{TemplateBinding Clip}"
+                        ClipToBounds="{TemplateBinding ClipToBounds}"
+                        ContextMenu="{TemplateBinding ContextMenu}"
+                        Cursor="{TemplateBinding Cursor}"
+                        DataContext="{TemplateBinding DataContext}"
+                        Effect="{TemplateBinding Effect}"
+                        FlowDirection="{TemplateBinding FlowDirection}"
+                        Focusable="{TemplateBinding Focusable}"
+                        FocusVisualStyle="{TemplateBinding FocusVisualStyle}"
+                        FontFamily="{TemplateBinding FontFamily}"
+                        FontSize="{TemplateBinding FontSize}"
+                        FontStretch="{TemplateBinding FontStretch}"
+                        FontWeight="{TemplateBinding FontWeight}"
+                        ForceCursor="{TemplateBinding ForceCursor}"
+                        Foreground="{TemplateBinding Foreground}"
+                        Height="{TemplateBinding Height}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
+                        InputScope="{TemplateBinding InputScope}"
+                        IsEnabled="{TemplateBinding IsEnabled}"
+                        IsHitTestVisible="{TemplateBinding IsHitTestVisible}"
+                        IsManipulationEnabled="{TemplateBinding IsManipulationEnabled}"
+                        IsReadOnly="{TemplateBinding IsReadOnly}"
+                        IsTabStop="{TemplateBinding IsTabStop}"
+                        IsReadOnlyCaretVisible="{TemplateBinding IsReadOnlyCaretVisible}"
+                        IsUndoEnabled="{TemplateBinding IsUndoEnabled}"
+                        Language="{TemplateBinding Language}"
+                        LayoutTransform="{TemplateBinding LayoutTransform}"
+                        Margin="0"
+                        MaxHeight="{TemplateBinding MaxHeight}"
+                        MaxLength="{TemplateBinding MaxLength}"
+                        MaxLines="{TemplateBinding MaxLines}"
+                        MaxWidth="{TemplateBinding MaxWidth}"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        MinLines="{TemplateBinding MinLines}"
+                        MinWidth="{TemplateBinding MinWidth}"
+                        Opacity="{TemplateBinding Opacity}"
+                        OpacityMask="{TemplateBinding OpacityMask}"
+                        OverridesDefaultStyle="{TemplateBinding OverridesDefaultStyle}"
+                        Padding="{TemplateBinding Padding}"
+                        RenderTransform="{TemplateBinding RenderTransform}"
+                        RenderTransformOrigin="{TemplateBinding RenderTransformOrigin}"
+                        SelectionBrush="{TemplateBinding SelectionBrush}"
+                        SelectionOpacity="{TemplateBinding SelectionOpacity}"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                        TabIndex="{TemplateBinding TabIndex}"
+                        Tag="{TemplateBinding Tag}"
+                        TextAlignment="{TemplateBinding TextAlignment}"
+                        TextDecorations="{TemplateBinding TextDecorations}"
+                        TextWrapping="{TemplateBinding TextWrapping}"
+                        ToolTip="{TemplateBinding ToolTip}"
+                        Uid="{TemplateBinding Uid}"
+                        UndoLimit="{TemplateBinding UndoLimit}"
+                        UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}"
+                        Visibility="{TemplateBinding Visibility}"
+                        Width="{TemplateBinding Width}">
+                  <TextBox.Style>
+                     <Style TargetType="{x:Type TextBox}">
+                        <Setter Property="Template">
+                           <Setter.Value>
+                              <ControlTemplate TargetType="{x:Type TextBox}">
+                                 <Border x:Name="border" Background="{TemplateBinding Background}" 
+                                         BorderBrush="{TemplateBinding BorderBrush}" 
+                                         BorderThickness="{TemplateBinding BorderThickness}" 
+                                         SnapsToDevicePixels="True">
+                                    <ScrollViewer x:Name="PART_ContentHost" 
+                                                  Focusable="false" 
+                                                  HorizontalScrollBarVisibility="Hidden" 
+                                                  VerticalScrollBarVisibility="Hidden"/>
+                                 </Border>
+                                 <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="true">
+                                       <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource TextBox.MouseOver.Border}"/>
+                                    </Trigger>
+                                    <Trigger Property="IsKeyboardFocused" Value="true">
+                                       <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource TextBox.Focus.Border}"/>
+                                    </Trigger>
+                                 </ControlTemplate.Triggers>
+                              </ControlTemplate>
+                           </Setter.Value>
+                        </Setter>
+                     </Style>
+                  </TextBox.Style>
+               </TextBox>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+
    </Style>
 
    <Style x:Key="AboutBox_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">