Modifica Tab basic color e color theme

Rimozione hsl

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,8 @@
 
    Public Const TABLE = "Table"
    Public Const TABLE_OUTLINE = "TableOutline"
+   Public Const EXTRUSION_AREA = "ExtrusionArea"
+   Public Const EXTRUSION_RECT = "ExtrusionRect"
    Public Const PART = "Part"
    Public Const PRINT_SOLID = "PrintSolid"
    Public Const LAY_MACH_START = "MachStart"
@@ -88,6 +90,7 @@
    Public Const MAC_LINKTYPE = "LinkType"
    Public Const MAC_LINKPARAM = "LinkParam"
    Public Const MAC_LINKZUP = "LinkZup"
+   Public Const MAC_INNERSHELLWIDTH = "InnerStrandW"
    Public Const MAC_OFFSETLEADPOINT = "OffsetLeadPoint"
    Public Const MAC_LEADIN = "LeadIn"
    Public Const MAC_LEADINTANGDIST = "LeadInTangDist"
@@ -104,6 +107,11 @@
    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_SLICINGHEIGHT = "SlicingHeight"
+   Public Const MAC_RIBSSTRANDWIDTH = "RibsStrandW"
    Public Const MAC_RIBSTYPE = "RibsType"
    Public Const MAC_RIBSOVERLAP = "RibsOverlap"
    Public Const MAC_RIBSSTRANDCOUNT = "RibsStrandCount"
@@ -123,15 +131,39 @@
    Public Const MAC_SHELLNBRCOASTING = "ShellNbrCoasting"
    Public Const MAC_SHELLNBRWIPE = "ShellNbrWipe"
    Public Const MAC_SHELLNBRWIPEDIR = "ShellNbrWipeDir"
+   Public Const MAC_AUXSOLIDSSTRANDWIDTH = "AuxSolidsStrandW"
    Public Const MAC_AUXSOLIDSOVERLAP = "AuxSolidsOverlap"
    Public Const MAC_AUXSOLIDSINFILL = "AuxSolidsInfill"
+   Public Const MAC_AUXSOLIDSINFILLLINK = "AuxSolidsInfillLink"
+   Public Const MAC_AUXSOLIDSSTRANDCOUNT = "AuxSolidsStrandCount"
    Public Const MAC_AUXSOLIDSSTRANDORDER = "AuxSolidsStrandOrder"
    Public Const MAC_AUXSOLIDSLINKTYPE = "AuxSolidsLinkType"
    Public Const MAC_AUXSOLIDSLINKPARAM = "AuxSolidsLinkParam"
    Public Const MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE = "AuxSolidsStartPointOffsetOnSlice"
+   Public Const MAC_AUXSOLIDSOFFSETLEADPOINT = "AuxSolidsOffsetLeadPoint"
+   Public Const MAC_AUXSOLIDSDENSITY = "AuxSolidsDensity"
+   Public Const MAC_AUXSOLIDSGRIDOVERLAP = "AuxSolidsGridOverlap"
+   Public Const MAC_AUXSOLIDSDIRECTION = "AuxSolidsDirection"
+   Public Const MAC_AUXSOLIDSOFFSETX = "AuxSolidsOffsetX"
+   Public Const MAC_AUXSOLIDSOFFSETY = "AuxSolidsOffsetY"
    Public Const MAC_AUXSOLIDSCOASTINGLEN = "AuxSolidsCoastingLen"
    Public Const MAC_AUXSOLIDSWIPELEN = "AuxSolidsWipeLen"
    Public Const MAC_AUXSOLIDSWIPEDIR = "AuxSolidsWipeDir"
+   Public Const MAC_INFILLSTRANDWIDTH = "InfillStrandW"
+   Public Const MAC_FLOORTYPE = "FloorType"
+   Public Const MAC_CEILCOUNT = "CeilCount"
+   Public Const MAC_CEILTYPE = "CeilType"
+   Public Const MAC_INFILLTYPE = "InfillType"
+   Public Const MAC_INFILLLINK = "InfillLink"
+   Public Const MAC_INFILLDENSITY = "InfillDensity"
+   Public Const MAC_INFILLOVERLAP = "InfillOverlap"
+   Public Const MAC_INFILLGRIDOVERLAP = "InfillGridOverlap"
+   Public Const MAC_INFILLDIRECTION = "InfillDirection"
+   Public Const MAC_INFILLOFFSETX = "InfillOffsetX"
+   Public Const MAC_INFILLOFFSETY = "InfillOffsetY"
+   Public Const MAC_INFILLCOASTING = "InfillCoasting"
+   Public Const MAC_INFILLWIPE = "InfillWipe"
+   Public Const MAC_INFILLWIPEDIR = "InfillWipeDir"
    Public Const MAC_DYNAMICMODE = "DynamicMode"
    Public Const MAC_PRINTORDER = "PrintOrder"
    Public Const MAC_CONSTANT = "Constant"

Icarus/Constants/ConstGen.vb

@@ -21,6 +21,7 @@ Public Module ConstGen
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "Icarus.lic"
    Public Const S_LICENCE As String = "Licence"
+   Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
 

Icarus/Constants/ConstIni.vb

@@ -26,6 +26,7 @@ Public Module ConstIni
    'Public Const K_MESSAGES As String = "Messages"
    'Public Const K_WINPLACE As String = "WinPlace"
    'Public Const K_LASTPROJ As String = "LastProj"
+   Public Const K_NETKEY As String = "NetKey"
    Public Const K_LASTNGEDIR As String = "LastNgeDir"
    Public Const K_LASTIMPDIR As String = "LastImpDir"
    'Public Const K_SUPPORT As String = "Support"

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"
@@ -35,5 +10,8 @@
    Public Const K_SLICINGTYPE As String = "SlicingType"
    Public Const K_SPEED_MIN As String = "SpeedMin"
    Public Const K_SPEED_MAX As String = "SpeedMax"
+   Public Const K_MAX_HEIGHT As String = "HMax"
+
+   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

@@ -111,6 +111,7 @@ Public Class CurrMachining
       m_CathegoryList.Add(New CurrMachiningCathegory(MachiningCathegory.Cathegories.RIBS, nPartId, m_nIndex, False))
       m_CathegoryList.Add(New CurrMachiningCathegory(MachiningCathegory.Cathegories.SHELL_NUMBER, nPartId, m_nIndex, False))
       m_CathegoryList.Add(New CurrMachiningCathegory(MachiningCathegory.Cathegories.AUX_SOLID, nPartId, m_nIndex, False))
+      m_CathegoryList.Add(New CurrMachiningCathegory(MachiningCathegory.Cathegories.INFILL, nPartId, m_nIndex, False))
       For Each Cathegory In m_CathegoryList
          For Each MachiningParam In Cathegory.MachiningParamList
             AddHandler MachiningParam.PropertyChanged, AddressOf OnMachiningParamPropertyChanged
@@ -128,6 +129,7 @@ Public Class CurrMachining
       m_CathegoryList.Add(New CurrMachiningCathegory(MachiningCathegory.Cathegories.RIBS, nPartId, m_nIndex, True))
       m_CathegoryList.Add(New CurrMachiningCathegory(MachiningCathegory.Cathegories.SHELL_NUMBER, nPartId, m_nIndex, True))
       m_CathegoryList.Add(New CurrMachiningCathegory(MachiningCathegory.Cathegories.AUX_SOLID, nPartId, m_nIndex, True))
+      m_CathegoryList.Add(New CurrMachiningCathegory(MachiningCathegory.Cathegories.INFILL, nPartId, m_nIndex, True))
       For Each Cathegory In m_CathegoryList
          For Each MachiningParam In Cathegory.MachiningParamList
             AddHandler MachiningParam.PropertyChanged, AddressOf OnMachiningParamPropertyChanged
@@ -199,74 +201,137 @@ 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),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.SPIRALVASE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDH, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDW, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDCOUNT, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSET, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDOVERLAP, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.STARTPOINTOFFSETONSLICE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.STRANDORDER, nPartId, nIndex, bForceFromDb),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.DIRECTION, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.G0FEED, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.G0FEEDZ, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.TOOLDIAM, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nPartId, nIndex, bForceFromDb),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.DYNAMIC_MODE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrOrderedMachiningParam(MachiningParam.Params.PRINT_ORDER, 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, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDH, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDW, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDCOUNT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSET, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STRANDOVERLAP, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.STARTPOINTOFFSETONSLICE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.STRANDORDER, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.DIRECTION, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.G0FEED, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.G0FEEDZ, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LINKZUP, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.TOOLDIAM, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nPartId, nIndex, bForceFromDb, Me),
+                                                                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),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.SLICINGHEIGHT, nPartId, nIndex, bForceFromDb, Me)})
          Case Cathegories.LINK
             m_sName = "Shell"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.LINKTYPE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LINKPARAM, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LINKZUP, nPartId, nIndex, bForceFromDb),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.LEADIN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nPartId, nIndex, bForceFromDb),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.LEADOUT, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTTANGDIST, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTORTHODIST, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGLEN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGFEED_PC, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPELEN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nPartId, nIndex, bForceFromDb)})
-                                                                'New CurrNumericMachiningParam(MachiningParam.Params.WIPEDIR, nPartId, nIndex, bForceFromDb)})
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.INNERSHELLWIDTH, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.LINKTYPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LINKPARAM, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.LEADIN, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.LEADOUT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTTANGDIST, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.LEADOUTORTHODIST, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGLEN, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.COASTINGFEED_PC, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPELEN, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nPartId, nIndex, bForceFromDb, Me)})
+                                                                'New CurrNumericMachiningParam(MachiningParam.Params.WIPEDIR, nPartId, nIndex, bForceFromDb, Me)})
          Case Cathegories.RIBS
             m_sName = "Ribs"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.RIBSTYPE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nPartId, nIndex, bForceFromDb),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLINK, nPartId, nIndex, bForceFromDb),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nPartId, nIndex, bForceFromDb),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nPartId, nIndex, bForceFromDb),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb),
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb)})
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDWIDTH, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.RIBSTYPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLINK, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                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),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, 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, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                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),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nPartId, nIndex, bForceFromDb),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nPartId, nIndex, bForceFromDb),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nPartId, nIndex, bForceFromDb)})
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDWIDTH, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.AUXSOLIDSINFILLLINK, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDCOUNT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETLEADPOINT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSDENSITY, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSGRIDOVERLAP, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSDIRECTION, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETX, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETY, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nPartId, nIndex, bForceFromDb, Me)})
+         Case Cathegories.INFILL
+            m_sName = "Infill"
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.INFILLSTRANDWIDTH, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.FLOORTYPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.CEILCOUNT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.CEILTYPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.INFILLTYPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.INFILLLINK, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLDENSITY, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLGRIDOVERLAP, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLDIRECTION, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLOFFSETX, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLOFFSETY, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLOVERLAP, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLCOASTING, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLWIPE, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.INFILLWIPEDIR, 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
+            For Each Param In {MachiningParam.Params.AUXSOLIDSSTRANDCOUNT}
+               Dim MachiningParam As NumericMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
+         Case Cathegories.INFILL
+            For Each Param In {MachiningParam.Params.FLOORCOUNT, MachiningParam.Params.CEILCOUNT}
+               Dim MachiningParam As NumericMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
+            For Each Param In {MachiningParam.Params.INFILLTYPE}
+               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
+               MachiningParam.ManageDependencyParam()
+            Next
       End Select
    End Sub
 
@@ -292,13 +357,39 @@ 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 m_MinMaxType = MinMaxTypes.ABSOLUT Then
+               If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
+                  m_dValue = dTempValue
+               End If
+            ElseIf m_MinMaxType = MinMaxTypes.PERCENTAGE Then
+               Dim LinkedParam As MachiningParam = Nothing
+               ' cerco il parametro a cui e' collegato
+               For Each CurrCathegory In Map.refMachiningDbVM.SelMachining.CathegoryList
+                  LinkedParam = CurrCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = m_MinMaxLinkedParam)
+                  If Not IsNothing(LinkedParam) Then Exit For
+               Next
+               If Not IsNothing(LinkedParam) AndAlso TypeOf LinkedParam Is NumericMachiningParam Then
+                  Dim NumericLinkedParam As NumericMachiningParam = DirectCast(LinkedParam, NumericMachiningParam)
+                  If dTempValue >= NumericLinkedParam.dValue * m_dMinValue / 100 AndAlso dTempValue <= NumericLinkedParam.dValue * m_dMaxValue / 100 Then
+                     m_dValue = dTempValue
+                  End If
+               Else
+                  m_dValue = dTempValue
+               End If
+            End If
+         Else
+            m_dValue = dTempValue
          End If
          NotifyPropertyChanged(NameOf(sValue))
          NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
+         ManageDependencyParam()
       End Set
    End Property
 
@@ -318,8 +409,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)
-      MyBase.New(Type, nIndex)
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean, Cathegory As MachiningCathegory)
+      MyBase.New(Type, nIndex, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.STRANDH
@@ -346,6 +437,9 @@ Public Class CurrNumericMachiningParam
          Case Params.LINKZUP
             bReadFromPart = EgtGetInfo(nPartId, MAC_LINKZUP, m_dValue)
             m_bIsLen = True
+         Case Params.INNERSHELLWIDTH
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INNERSHELLWIDTH, m_dValue)
+            m_bIsLen = True
          Case Params.OFFSETLEADPOINT
             bReadFromPart = EgtGetInfo(nPartId, MAC_OFFSETLEADPOINT, m_dValue)
             m_bIsLen = True
@@ -388,6 +482,21 @@ 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.SLICINGHEIGHT
+            bReadFromPart = EgtGetInfo(nPartId, MAC_SLICINGHEIGHT, m_dValue)
+            m_bIsLen = True
+         Case Params.RIBSSTRANDWIDTH
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSSTRANDWIDTH, m_dValue)
+            m_bIsLen = True
          Case Params.RIBSOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSOVERLAP, m_dValue)
             m_bIsLen = False
@@ -421,15 +530,39 @@ Public Class CurrNumericMachiningParam
          Case Params.SHELLNBRWIPEDIR
             bReadFromPart = EgtGetInfo(nPartId, MAC_SHELLNBRWIPEDIR, m_dValue)
             m_bIsLen = False
+         Case Params.AUXSOLIDSSTRANDWIDTH
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSSTRANDWIDTH, m_dValue)
+            m_bIsLen = True
          Case Params.AUXSOLIDSOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, m_dValue)
             m_bIsLen = False
          Case Params.AUXSOLIDSLINKPARAM
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKPARAM, m_dValue)
             m_bIsLen = True
+         Case Params.AUXSOLIDSSTRANDCOUNT
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSSTRANDCOUNT, m_dValue)
+            m_bIsLen = False
          Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dValue)
             m_bIsLen = True
+         Case Params.AUXSOLIDSOFFSETLEADPOINT
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSOFFSETLEADPOINT, m_dValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSDENSITY
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSDENSITY, m_dValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSGRIDOVERLAP
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSGRIDOVERLAP, m_dValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSDIRECTION
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSDIRECTION, m_dValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSOFFSETX
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSOFFSETX, m_dValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSOFFSETY
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSOFFSETY, m_dValue)
+            m_bIsLen = True
          Case Params.AUXSOLIDSCOASTINGLEN
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSCOASTINGLEN, m_dValue)
             m_bIsLen = True
@@ -442,27 +575,66 @@ Public Class CurrNumericMachiningParam
          Case Params.FLOWRATE_PC
             bReadFromPart = EgtGetInfo(nPartId, MAC_CONSTANT, m_dValue)
             m_bIsLen = False
+         Case Params.CEILCOUNT
+            bReadFromPart = EgtGetInfo(nPartId, MAC_CEILCOUNT, m_dValue)
+            m_bIsLen = False
+         Case Params.INFILLSTRANDWIDTH
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLSTRANDWIDTH, m_dValue)
+            m_bIsLen = True
+         Case Params.INFILLDENSITY
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLDENSITY, m_dValue)
+            m_bIsLen = False
+         Case Params.INFILLOVERLAP
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLOVERLAP, m_dValue)
+            m_bIsLen = False
+         Case Params.INFILLGRIDOVERLAP
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLGRIDOVERLAP, m_dValue)
+            m_bIsLen = False
+         Case Params.INFILLDIRECTION
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLDIRECTION, m_dValue)
+            m_bIsLen = False
+         Case Params.INFILLOFFSETX
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLOFFSETX, m_dValue)
+            m_bIsLen = True
+         Case Params.INFILLOFFSETY
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLOFFSETY, m_dValue)
+            m_bIsLen = True
+         Case Params.INFILLCOASTING
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLCOASTING, m_dValue)
+            m_bIsLen = True
+         Case Params.INFILLWIPE
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLWIPE, m_dValue)
+            m_bIsLen = True
+         Case Params.INFILLWIPEDIR
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLWIPEDIR, m_dValue)
+            m_bIsLen = False
       End Select
       m_dOrigValue = m_dValue
       If nIndex > 0 Then
          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.G0FEED, Params.G0FEEDZ, Params.LINKZUP, Params.TOOLDIAM, Params.FLOWRATE_PC, Params.PREFLOWDELAY, Params.POSTFLOWDELAY, Params.SCREWBACK, Params.SLICINGHEIGHT
                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.INNERSHELLWIDTH, 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)
-            Case Params.RIBSOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION,
+            Case Params.RIBSSTRANDWIDTH, Params.RIBSOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION,
                  Params.RIBSLEADININVERT, Params.RIBSLEADINLEN, Params.RIBSLEADOUTINVERT, Params.RIBSLEADOUTLEN, Params.RIBSLEADOUTCOASTING,
                  Params.RIBSLEADOUTWIPE, Params.RIBSLEADOUTWIPEDIR
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
             Case Params.SHELLNBRDIFFERENCE, Params.SHELLNBRCOASTING, Params.SHELLNBRWIPE, Params.SHELLNBRWIPEDIR
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.SHELL_NUMBER).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.AUXSOLIDSOVERLAP, Params.AUXSOLIDSLINKPARAM, Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE,
-                 Params.AUXSOLIDSCOASTINGLEN, Params.AUXSOLIDSWIPELEN, Params.AUXSOLIDSWIPEDIR
+            Case Params.AUXSOLIDSSTRANDWIDTH, Params.AUXSOLIDSOVERLAP, Params.AUXSOLIDSLINKPARAM, Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE,
+                 Params.AUXSOLIDSOFFSETLEADPOINT, Params.AUXSOLIDSDENSITY, Params.AUXSOLIDSGRIDOVERLAP,
+                 Params.AUXSOLIDSDIRECTION, Params.AUXSOLIDSOFFSETX, Params.AUXSOLIDSOFFSETY,
+                 Params.AUXSOLIDSCOASTINGLEN, Params.AUXSOLIDSWIPELEN, Params.AUXSOLIDSWIPEDIR, Params.AUXSOLIDSSTRANDCOUNT
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.AUX_SOLID).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
+            Case Params.INFILLSTRANDWIDTH, Params.FLOORCOUNT, Params.CEILCOUNT, Params.INFILLDENSITY, Params.INFILLOVERLAP,
+                 Params.INFILLGRIDOVERLAP, Params.INFILLDIRECTION, Params.INFILLOFFSETX,
+                 Params.INFILLOFFSETY, Params.INFILLCOASTING, Params.INFILLWIPE, Params.INFILLWIPEDIR
+               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.INFILL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
          End Select
          If bForceFromDb OrElse Not bReadFromPart Then
             m_dValue = m_DbParam.dOrigValue
@@ -501,6 +673,8 @@ Public Class CurrNumericMachiningParam
             EgtSetInfo(nPartId, MAC_LINKPARAM, sWriteValue)
          Case Params.LINKZUP
             EgtSetInfo(nPartId, MAC_LINKZUP, sWriteValue)
+         Case Params.INNERSHELLWIDTH
+            EgtSetInfo(nPartId, MAC_INNERSHELLWIDTH, sWriteValue)
          Case Params.OFFSETLEADPOINT
             EgtSetInfo(nPartId, MAC_OFFSETLEADPOINT, sWriteValue)
          Case Params.LEADINTANGDIST
@@ -529,6 +703,16 @@ 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.SLICINGHEIGHT
+            EgtSetInfo(nPartId, MAC_SLICINGHEIGHT, sWriteValue)
+         Case Params.RIBSSTRANDWIDTH
+            EgtSetInfo(nPartId, MAC_RIBSSTRANDWIDTH, sWriteValue)
          Case Params.RIBSOVERLAP
             EgtSetInfo(nPartId, MAC_RIBSOVERLAP, sWriteValue)
          Case Params.RIBSSTRANDCOUNT
@@ -551,12 +735,28 @@ Public Class CurrNumericMachiningParam
             EgtSetInfo(nPartId, MAC_SHELLNBRWIPE, sWriteValue)
          Case Params.SHELLNBRWIPEDIR
             EgtSetInfo(nPartId, MAC_SHELLNBRWIPEDIR, sWriteValue)
+         Case Params.AUXSOLIDSSTRANDWIDTH
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSSTRANDWIDTH, sWriteValue)
+         Case Params.AUXSOLIDSSTRANDCOUNT
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSSTRANDCOUNT, sWriteValue)
          Case Params.AUXSOLIDSOVERLAP
             EgtSetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, sWriteValue)
          Case Params.AUXSOLIDSLINKPARAM
             EgtSetInfo(nPartId, MAC_AUXSOLIDSLINKPARAM, sWriteValue)
          Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
             EgtSetInfo(nPartId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, sWriteValue)
+         Case Params.AUXSOLIDSOFFSETLEADPOINT
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSOFFSETLEADPOINT, sWriteValue)
+         Case Params.AUXSOLIDSDENSITY
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSDENSITY, sWriteValue)
+         Case Params.AUXSOLIDSGRIDOVERLAP
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSGRIDOVERLAP, sWriteValue)
+         Case Params.AUXSOLIDSDIRECTION
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSDIRECTION, sWriteValue)
+         Case Params.AUXSOLIDSOFFSETX
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSOFFSETX, sWriteValue)
+         Case Params.AUXSOLIDSOFFSETY
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSOFFSETY, sWriteValue)
          Case Params.AUXSOLIDSCOASTINGLEN
             EgtSetInfo(nPartId, MAC_AUXSOLIDSCOASTINGLEN, sWriteValue)
          Case Params.AUXSOLIDSWIPELEN
@@ -565,6 +765,28 @@ Public Class CurrNumericMachiningParam
             EgtSetInfo(nPartId, MAC_AUXSOLIDSWIPEDIR, sWriteValue)
          Case Params.FLOWRATE_PC
             EgtSetInfo(nPartId, MAC_CONSTANT, sWriteValue)
+         Case Params.INFILLSTRANDWIDTH
+            EgtSetInfo(nPartId, MAC_INFILLSTRANDWIDTH, sWriteValue)
+         Case Params.CEILCOUNT
+            EgtSetInfo(nPartId, MAC_CEILCOUNT, sWriteValue)
+         Case Params.INFILLDENSITY
+            EgtSetInfo(nPartId, MAC_INFILLDENSITY, sWriteValue)
+         Case Params.INFILLOVERLAP
+            EgtSetInfo(nPartId, MAC_INFILLOVERLAP, sWriteValue)
+         Case Params.INFILLGRIDOVERLAP
+            EgtSetInfo(nPartId, MAC_INFILLGRIDOVERLAP, sWriteValue)
+         Case Params.INFILLDIRECTION
+            EgtSetInfo(nPartId, MAC_INFILLDIRECTION, sWriteValue)
+         Case Params.INFILLOFFSETX
+            EgtSetInfo(nPartId, MAC_INFILLOFFSETX, sWriteValue)
+         Case Params.INFILLOFFSETY
+            EgtSetInfo(nPartId, MAC_INFILLOFFSETY, sWriteValue)
+         Case Params.INFILLCOASTING
+            EgtSetInfo(nPartId, MAC_INFILLCOASTING, sWriteValue)
+         Case Params.INFILLWIPE
+            EgtSetInfo(nPartId, MAC_INFILLWIPE, sWriteValue)
+         Case Params.INFILLWIPEDIR
+            EgtSetInfo(nPartId, MAC_INFILLWIPEDIR, sWriteValue)
       End Select
    End Sub
 
@@ -621,8 +843,8 @@ Public Class CurrStringMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nIndex As Integer)
-      MyBase.New(Type, nIndex)
+   Sub New(Type As Params, nIndex As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, nIndex, Cathegory)
       m_sValue = sValue
       m_sOrigValue = m_sValue
    End Sub
@@ -677,6 +899,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 +923,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)
-      MyBase.New(Type, nIndex)
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean, Cathegory As MachiningCathegory)
+      MyBase.New(Type, nIndex, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.SLICINGTYPE
@@ -762,9 +989,14 @@ Public Class CurrComboMachiningParam
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSTYPE, nSelValue)
             m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
          Case Params.AUXSOLIDSINFILL
-            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
-                                                     New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL_TYPE.NONE, "None"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.OFFSET, "Offset"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.ZIGZAG, "ZigZag"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.LINES, "Lines"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.GRID, "Grid"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.ZIGZAG_GRID, "Zigzag Grid"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.HONEYCOMB, "Honeycomb"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.HONEYCOMB_GRID, "Honeycomb Grid")})
             Dim nSelValue As Integer = 0
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSINFILL, nSelValue)
             m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
@@ -787,6 +1019,28 @@ Public Class CurrComboMachiningParam
             Dim nSelValue As Integer = 0
             bReadFromPart = EgtGetInfo(nPartId, MAC_DYNAMICMODE, nSelValue)
             m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+         Case Params.FLOORTYPE
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL_TYPE.OFFSET, "Offset"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.ZIGZAG, "ZigZag")})
+            Dim nSelValue As Integer = 0
+            bReadFromPart = EgtGetInfo(nPartId, MAC_FLOORTYPE, nSelValue)
+            m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+         Case Params.CEILTYPE
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL_TYPE.OFFSET, "Offset"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.ZIGZAG, "ZigZag")})
+            Dim nSelValue As Integer = 0
+            bReadFromPart = EgtGetInfo(nPartId, MAC_CEILTYPE, nSelValue)
+            m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+         Case Params.INFILLTYPE
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL_TYPE.NONE, "None"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.LINES, "Lines"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.GRID, "Grid"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.ZIGZAG_GRID, "Zigzag Grid"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.HONEYCOMB, "Honeycomb"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.HONEYCOMB_GRID, "Honeycomb Grid")})
+            Dim nSelValue As Integer = 0
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLTYPE, nSelValue)
+            m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
       End Select
       m_OrigSelValue = m_SelValue
       If nIndex > 0 Then
@@ -800,6 +1054,8 @@ Public Class CurrComboMachiningParam
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
             Case Params.AUXSOLIDSINFILL, Params.AUXSOLIDSSTRANDORDER, Params.AUXSOLIDSLINKTYPE
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.AUX_SOLID).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
+            Case Params.FLOORTYPE, Params.CEILTYPE, Params.INFILLTYPE
+               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.INFILL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
          End Select
          If bForceFromDb OrElse Not bReadFromPart Then
             m_SelValue = m_DbParam.OrigSelValue
@@ -838,6 +1094,12 @@ Public Class CurrComboMachiningParam
             EgtSetInfo(nPartId, MAC_AUXSOLIDSLINKTYPE, m_SelValue.Id)
          Case Params.DYNAMIC_MODE
             EgtSetInfo(nPartId, MAC_DYNAMICMODE, m_SelValue.Id)
+         Case Params.FLOORTYPE
+            EgtSetInfo(nPartId, MAC_FLOORTYPE, m_SelValue.Id)
+         Case Params.CEILTYPE
+            EgtSetInfo(nPartId, MAC_CEILTYPE, m_SelValue.Id)
+         Case Params.INFILLTYPE
+            EgtSetInfo(nPartId, MAC_INFILLTYPE, m_SelValue.Id)
       End Select
    End Sub
 
@@ -848,6 +1110,7 @@ Public Class CurrComboMachiningParam
    Friend Overrides Sub ResetParam()
       m_SelValue = m_OrigSelValue
       NotifyPropertyChanged(NameOf(SelValue))
+      CurrentMachine.UpdateExtrusionArea()
    End Sub
 
 #Region "COMMANDS"
@@ -867,6 +1130,7 @@ Public Class CurrComboMachiningParam
       m_SelValue = DbParam.OrigSelValue
       NotifyPropertyChanged(NameOf(SelValue))
       NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
+      CurrentMachine.UpdateExtrusionArea()
    End Sub
 
 #End Region    ' ResetParam
@@ -905,8 +1169,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)
-      MyBase.New(Type, nIndex)
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean, Cathegory As MachiningCathegory)
+      MyBase.New(Type, nIndex, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.SPIRALVASE
@@ -925,6 +1189,10 @@ Public Class CurrCheckMachiningParam
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADOUTINVERT, m_bValue)
          Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, m_bValue)
+         Case Params.AUXSOLIDSINFILLLINK
+            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSINFILLLINK, m_bValue)
+         Case Params.INFILLLINK
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INFILLLINK, m_bValue)
       End Select
       m_bOrigValue = m_bValue
       If nIndex > 0 Then
@@ -934,6 +1202,10 @@ Public Class CurrCheckMachiningParam
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
             Case Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT, Params.RIBSLIMITUNBOUNDEDWITHSOLID
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
+            Case Params.AUXSOLIDSINFILLLINK
+               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.AUX_SOLID).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
+            Case Params.INFILLLINK
+               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.INFILL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
          End Select
          If bForceFromDb OrElse Not bReadFromPart Then
             m_bValue = m_DbParam.bOrigValue
@@ -960,6 +1232,10 @@ Public Class CurrCheckMachiningParam
             EgtSetInfo(nPartId, MAC_RIBSLEADOUTINVERT, If(m_bValue, 1, 0))
          Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
             EgtSetInfo(nPartId, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, If(m_bValue, 1, 0))
+         Case Params.AUXSOLIDSINFILLLINK
+            EgtSetInfo(nPartId, MAC_AUXSOLIDSINFILLLINK, If(m_bValue, 1, 0))
+         Case Params.INFILLLINK
+            EgtSetInfo(nPartId, MAC_INFILLLINK, If(m_bValue, 1, 0))
       End Select
    End Sub
 
@@ -1016,8 +1292,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)
-      MyBase.New(Type, nIndex)
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean, Cathegory As MachiningCathegory)
+      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,19 +47,27 @@
                            </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*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
-                                    <TextBox Grid.Column="1"
-                                             Text="{Binding sValue}"
-                                             Margin="2.5,0,2.5,0"
-                                             Style="{StaticResource ParameterList_TextBox}"/>
+                                    <StackPanel Orientation="Horizontal">
+                                       <TextBlock Text="{Binding sName, Mode=OneWay}"
+                                                  Margin="0,0,2.5,0"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                       <TextBlock Text=" (BETA)"
+                                                  Margin="0,0,2.5,0"
+                                                  Foreground="Red"
+                                                  Visibility="{Binding IsBeta_Visibility}"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                    </StackPanel>
+                                    <EgtWPFLib5:EgtTextBox2 Grid.Column="1"
+                                                            Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
+                                                            Margin="2.5,0,2.5,0"
+                                                            Style="{StaticResource ParameterList_TextBox2}"/>
                                     <Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
@@ -70,15 +79,23 @@
                                  </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*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
+                                    <StackPanel Orientation="Horizontal">
+                                       <TextBlock Text="{Binding sName, Mode=OneWay}"
+                                                  Margin="0,0,2.5,0"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                       <TextBlock Text=" (BETA)"
+                                                  Margin="0,0,2.5,0"
+                                                  Foreground="Red"
+                                                  Visibility="{Binding IsBeta_Visibility}"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                    </StackPanel>
                                     <ComboBox Grid.Column="1"
                                               ItemsSource="{Binding ValueList}"
                                               SelectedItem="{Binding SelValue}"
@@ -97,15 +114,23 @@
                               </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*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
+                                    <StackPanel Orientation="Horizontal">
+                                       <TextBlock Text="{Binding sName, Mode=OneWay}"
+                                                  Margin="0,0,2.5,0"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                       <TextBlock Text=" (BETA)"
+                                                  Margin="0,0,2.5,0"
+                                                  Foreground="Red"
+                                                  Visibility="{Binding IsBeta_Visibility}"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                    </StackPanel>
                                     <CheckBox Grid.Column="1"
                                               IsChecked="{Binding bValue}"
                                               HorizontalAlignment="Center"

Icarus/EgtColorPicker/EgtColorPickerV.xaml

@@ -0,0 +1,265 @@
+<EgtWPFLib5:EgtMainWindow x:Class="EgtColorPickerV"
+                          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:EgtHexagon="clr-namespace:Icarus"
+                          Title="{Binding sTitle}"
+                          WindowStartupLocation="CenterOwner"
+                          Width="750" Height="450"
+                          Style="{StaticResource Dialog_Window}">
+
+   <Grid Margin="5,5,5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <Grid Margin="5,5,5,0">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid Margin="5,5,5,0">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+            <TabControl>
+               <TabItem Header="{Binding BasicColor_Msg}">
+                  <Grid HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="1*"/>
+                     </Grid.RowDefinitions>
+                     <ListBox ItemsSource="{Binding BasicColors}"
+                              SelectedItem="{Binding SelColor}"
+                              HorizontalAlignment="Center"
+                              BorderThickness="0">
+                        <ListBox.ItemsPanel>
+                           <ItemsPanelTemplate>
+                              <UniformGrid Columns="13"/>
+                           </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                        <ListBox.ItemTemplate>
+                           <DataTemplate>
+                              <Rectangle Width="20"
+                                      Height="20"
+                                      Margin="2"
+                                      Stroke="Black" 
+                                      StrokeThickness="0.5"
+                                      Fill="{Binding Fill}"/>
+                           </DataTemplate>
+                        </ListBox.ItemTemplate>
+                        <ListBox.ItemContainerStyle>
+                           <Style TargetType="ListBoxItem">
+                              <Setter Property="Margin" Value="0"/>
+                              <Setter Property="Padding" Value="0"/>
+                           </Style>
+                        </ListBox.ItemContainerStyle>
+                     </ListBox>
+                  </Grid>
+               </TabItem>
+               <TabItem Header="{Binding ColorPicker_Msg}">
+                  <TabItem.Resources>
+                     <Style TargetType="{x:Type EgtHexagon:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
+                        <Setter Property="BorderThickness" Value="1.5"/>
+                        <Setter Property="BorderBrush" Value="White"/>
+                     </Style>
+                  </TabItem.Resources>
+                  <EgtHexagon:EgtHexList ItemsSource="{Binding HexList}"
+                                         SelectedItem="{Binding sHexSelColor}"
+                                         Orientation="Vertical" 
+                                         Margin="2.5"
+                                         RowCount="13" 
+                                         ColumnCount="13"
+                                         Height="300"
+                                         Width="350"
+                                         Style="{StaticResource EgtHexList}">
+                     <EgtHexagon:EgtHexList.ItemTemplate>
+                        <DataTemplate/>
+                     </EgtHexagon:EgtHexList.ItemTemplate>
+                     <EgtHexagon:EgtHexList.ItemContainerStyle>
+                        <Style TargetType="EgtHexagon:EgtHexItem" BasedOn="{StaticResource EgtHexItem}">
+                           <Setter Property="Grid.Row" Value="{Binding nRow}"/>
+                           <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
+                           <Setter Property="Background" Value="{Binding Background}"/>
+                        </Style>
+                     </EgtHexagon:EgtHexList.ItemContainerStyle>
+                  </EgtHexagon:EgtHexList>
+               </TabItem>
+               <TabItem Header="{Binding ColorPickerTheme_Msg}">
+                  <Grid HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="1*"/>
+                     </Grid.RowDefinitions>
+                     <ListBox ItemsSource="{Binding BasicColorsTheme}"
+                              SelectedItem="{Binding SelColorTheme}"
+                              BorderThickness="0">
+                        <ListBox.ItemsPanel>
+                           <ItemsPanelTemplate>
+                              <UniformGrid Columns="13"/>
+                           </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                        <ListBox.ItemTemplate>
+                           <DataTemplate>
+                              <Rectangle Width="20"
+                                         Height="20"
+                                         Margin="2"
+                                         Stroke="Black" 
+                                         StrokeThickness="0.5"
+                                         Fill="{Binding Fill}"/>
+                           </DataTemplate>
+                        </ListBox.ItemTemplate>
+                        <ListBox.ItemContainerStyle>
+                           <Style TargetType="ListBoxItem">
+                              <Setter Property="Margin" Value="0"/>
+                              <Setter Property="Padding" Value="0"/>
+                           </Style>
+                        </ListBox.ItemContainerStyle>
+                     </ListBox>
+                  </Grid>
+               </TabItem>
+            </TabControl>
+         </Grid>
+         <Grid Grid.Column="1"
+               Margin="5,0,0,0">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <TextBlock Text="{Binding CustomColor_Msg}"
+                       Margin="5,18,5,10"
+                       Style="{StaticResource DialogWindow_TextBlock}"/>
+            <Grid Grid.Row="1">
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+               <ListBox ItemsSource="{Binding CustomColors}"
+                        SelectedItem="{Binding SelCustomColor}"
+                        HorizontalAlignment="Center"
+                        BorderThickness="0">
+                  <ListBox.ItemsPanel>
+                     <ItemsPanelTemplate>
+                        <UniformGrid Columns="13"/>
+                     </ItemsPanelTemplate>
+                  </ListBox.ItemsPanel>
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <Rectangle Width="20"
+                                   Height="20"
+                                   Margin="2"
+                                   Stroke="Black" 
+                                   StrokeThickness="0.5"
+                                   Fill="{Binding Fill}"/>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+                  <ListBox.ItemContainerStyle>
+                     <Style TargetType="ListBoxItem">
+                        <Setter Property="Margin" Value="0"/>
+                        <Setter Property="Padding" Value="0"/>
+                     </Style>
+                  </ListBox.ItemContainerStyle>
+               </ListBox>
+            </Grid>
+            <Grid Grid.Row="2"
+                  Margin="0,20,0,0">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid Margin="0,10,5,0"
+                     HorizontalAlignment="Left">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*" />
+                     <RowDefinition Height="Auto" />
+                  </Grid.RowDefinitions>
+                  <Rectangle Width="100" 
+                             Height="70" 
+                             Stroke="Black" 
+                             StrokeThickness="0.5"
+                             Fill="{Binding CurrColor}"/>
+                  <Button x:Name="SaveColor"
+                          Grid.Row="1"
+                          Margin="0,10,0,0"
+                          Content="{Binding AddCColor_Msg}"
+                          Command="{Binding SaveColor_Command}"  
+                          Style="{StaticResource LeftPanel_TextButton}"/>
+               </Grid>
+               <Grid Grid.Column="1">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <TextBlock Text="{Binding Red_Msg}"
+                             Margin="0,10,5,0"
+                             HorizontalAlignment="Right"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                  <TextBox Grid.Column="1" 
+                           HorizontalAlignment="Right"
+                           Margin="0,10,5,0"
+                           IsReadOnly="False"
+                           Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+                  <TextBlock Grid.Row="1"
+                             Text="{Binding Green_Msg}"
+                             Margin="5,5,5,0"
+                             HorizontalAlignment="Right"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                  <TextBox Grid.Column="1"
+                           Grid.Row="1"
+                           HorizontalAlignment="Right"
+                           Margin="5,5,5,0"
+                           IsReadOnly="False"
+                           Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+                  <TextBlock Grid.Row="2"
+                             Text="{Binding Blu_Msg}"
+                             Margin="5,5,5,0"
+                             HorizontalAlignment="Right"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                  <TextBox Grid.Column="1"
+                           Grid.Row="2"
+                           HorizontalAlignment="Right"
+                           Margin="5,5,5,0"
+                           IsReadOnly="False"
+                           Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+                  <TextBlock Grid.Row="3"
+                             Text="{Binding Hexadecimal_Msg}"
+                             Margin="5,5,5,0"
+                             HorizontalAlignment="Right"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                  <TextBox Grid.Column="1"
+                           Grid.Row="3"
+                           HorizontalAlignment="Right"
+                           Margin="5,5,5,0"
+                           Text="{Binding Hexadecimal}"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+               </Grid>
+            </Grid>
+         </Grid>
+      </Grid>
+      <UniformGrid Grid.Row="2"  
+                   Rows="1"
+                   Margin="10,10,10,0">
+         <Button IsDefault="True"
+                 Content="OK"
+                 Command="{Binding Ok_Command}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         <Button Content="Cancel"
+                 Command="{Binding Cancel_Command}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+      </UniformGrid>
+   </Grid>
+</EgtWPFLib5:EgtMainWindow>

Icarus/EgtColorPicker/EgtColorPickerV.xaml.vb

@@ -0,0 +1,67 @@
+Imports System.Windows.Forms
+
+Public Class EgtColorPickerV
+
+#Region "FIELDS & PROPERTIES"
+
+   Private WithEvents m_EgtColorPickerVM As EgtColorPickerVM
+
+   Private Shadows DialogResult As DialogResult
+
+   Public Property CustomColors As Integer()
+      Get
+         Return m_EgtColorPickerVM.GetCustomColors()
+      End Get
+      Set(value As Integer())
+         m_EgtColorPickerVM.SetCustomColors(value)
+      End Set
+   End Property
+
+   Public Property Color As System.Drawing.Color
+      Get
+         Return System.Drawing.Color.FromArgb(255, m_EgtColorPickerVM.Red, m_EgtColorPickerVM.Green, m_EgtColorPickerVM.Blue)
+      End Get
+      Set(value As System.Drawing.Color)
+         m_EgtColorPickerVM.Red = value.R
+         m_EgtColorPickerVM.Green = value.G
+         m_EgtColorPickerVM.Blue = value.B
+      End Set
+   End Property
+
+#End Region    ' Fields & Properties
+
+#Region "CONTRUCTORS"
+
+   Sub New(Owner As Window, EtgColorPickerVM As EgtColorPickerVM)
+      MyBase.New(Owner)
+      InitializeComponent()
+      Me.DataContext = EtgColorPickerVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_EgtColorPickerVM = EtgColorPickerVM
+   End Sub
+
+#End Region    ' Constructors
+
+#Region "EVENTS"
+
+   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtColorPickerVM.m_CloseWindow
+      Me.DialogResult = DialogResult
+      Me.Close()
+   End Sub
+
+#End Region     ' Events
+
+#Region "METHODS"
+
+   ''' <summary>
+   ''' Apre una finestra EgtColorPicker
+   ''' </summary>
+   ''' <returns></returns>
+   Public Overloads Function ShowDialog() As DialogResult
+      MyBase.ShowDialog()
+      Return Me.DialogResult
+   End Function
+
+#End Region    ' Methods
+
+End Class

Icarus/EgtColorPicker/EgtHexagon.vb

@@ -0,0 +1,373 @@
+Imports System.Globalization
+
+Public Class EgtHexagon
+   Inherits Panel
+
+#Region "ORIENTATION"
+
+   Public Shared ReadOnly OrientationProperty As DependencyProperty = DependencyProperty.RegisterAttached("Orientation",
+                                                                                                          GetType(Orientation),
+                                                                                                          GetType(EgtHexagon),
+                                                                                                          New FrameworkPropertyMetadata(Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange Or FrameworkPropertyMetadataOptions.[Inherits]))
+
+   Public Shared Sub SetOrientation(element As DependencyObject, value As Orientation)
+      element.SetValue(OrientationProperty, value)
+   End Sub
+
+   Public Shared Function GetOrientation(element As DependencyObject) As Orientation
+      Return CType(element.GetValue(OrientationProperty), Orientation)
+   End Function
+
+   Public Property Orientation As Orientation
+      Get
+         Return CType(GetValue(OrientationProperty), Orientation)
+      End Get
+      Set(value As Orientation)
+         SetValue(OrientationProperty, value)
+      End Set
+   End Property
+
+#End Region    ' Orientation
+
+#Region "ROW"
+
+   Public Shared ReadOnly RowCountProperty As DependencyProperty = DependencyProperty.Register("RowCount", GetType(Integer),
+                                                                                               GetType(EgtHexagon),
+                                                                                               New FrameworkPropertyMetadata(1, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange), AddressOf ValidateCountCallback)
+
+   Public Property RowCount As Integer
+      Get
+         Return CInt(GetValue(RowCountProperty))
+      End Get
+      Set(value As Integer)
+         SetValue(RowCountProperty, value)
+      End Set
+   End Property
+
+#End Region    ' Row
+
+#Region "COLUMN"
+
+   Public Shared ReadOnly ColumnCountProperty As DependencyProperty = DependencyProperty.Register("ColumnCount",
+                                                                                                  GetType(Integer),
+                                                                                                  GetType(EgtHexagon),
+                                                                                                  New FrameworkPropertyMetadata(1, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange), AddressOf ValidateCountCallback)
+
+   Public Property ColumnCount As Integer
+      Get
+         Return CInt(GetValue(ColumnCountProperty))
+      End Get
+      Set(value As Integer)
+         SetValue(ColumnCountProperty, value)
+      End Set
+   End Property
+
+#End Region    'Column
+
+#Region "VALIDATE"
+
+   Private Shared Function ValidateCountCallback(value As Object) As Boolean
+      If TypeOf value Is Integer Then
+         Dim count As Integer = CInt(value)
+         Return count > 0
+      End If
+
+      Return False
+   End Function
+
+   Private Function GetRow(e As UIElement) As Integer
+      Dim row As Integer = CInt(e.GetValue(Grid.RowProperty))
+      If row >= RowCount Then row = RowCount - 1
+      Return row
+   End Function
+
+   Private Function GetColumn(e As UIElement) As Integer
+      Dim column As Integer = CInt(e.GetValue(Grid.ColumnProperty))
+      If column >= ColumnCount Then column = ColumnCount - 1
+      Return column
+   End Function
+
+   Protected Overrides Function MeasureOverride(ByVal availableSize As Size) As Size
+      Dim w As Double = availableSize.Width
+      Dim h As Double = availableSize.Height
+
+      If Double.IsInfinity(w) OrElse Double.IsInfinity(h) Then
+         h = 0
+         w = 0
+
+         For Each e As UIElement In InternalChildren
+            e.Measure(availableSize)
+            Dim s = e.DesiredSize
+            If s.Height > h Then h = s.Height
+            If s.Width > w Then w = s.Width
+         Next
+
+         If Orientation = Orientation.Horizontal Then Return New Size(w * (ColumnCount * 3 + 1) / 4, h * (RowCount * 2 + 1) / 2)
+         Return New Size(w * (ColumnCount * 2 + 1) / 2, h * (RowCount * 3 + 1) / 4)
+      End If
+
+      Return availableSize
+   End Function
+
+#End Region    ' Validate
+
+#Region "HASSHIFT"
+
+   Private Sub HasShift(first As Boolean, last As Boolean)
+      If Orientation = Orientation.Horizontal Then
+         HasRowShift(first, last)
+      Else
+         HasColumnShift(first, last)
+      End If
+   End Sub
+
+   Private Sub HasRowShift(firstRow As Boolean, lastRow As Boolean)
+      lastRow = True
+      firstRow = lastRow
+      Dim elements As UIElementCollection = MyBase.InternalChildren
+      Dim i As Integer = 0
+
+      While i < elements.Count AndAlso (firstRow OrElse lastRow)
+         Dim e = elements(i)
+         If e.Visibility = Visibility.Collapsed Then Continue While
+         Dim row As Integer = GetRow(e)
+         Dim column As Integer = GetColumn(e)
+         Dim modify As Integer = column Mod 2
+         If row = 0 AndAlso modify = 0 Then firstRow = False
+         If row = RowCount - 1 AndAlso modify = 1 Then lastRow = False
+         i += 1
+      End While
+   End Sub
+
+   Private Sub HasColumnShift(firstColumn As Boolean, lastColumn As Boolean)
+      lastColumn = True
+      firstColumn = lastColumn
+      Dim elements As UIElementCollection = MyBase.InternalChildren
+      Dim i As Integer = 0
+
+      While i < elements.Count AndAlso (firstColumn OrElse lastColumn)
+         Dim e = elements(i)
+         If e.Visibility = Visibility.Collapsed Then Continue While
+         Dim row As Integer = GetRow(e)
+         Dim column As Integer = GetColumn(e)
+         Dim modify As Integer = row Mod 2
+         If column = 0 AndAlso modify = 0 Then firstColumn = False
+         If column = ColumnCount - 1 AndAlso modify = 1 Then lastColumn = False
+         i += 1
+      End While
+   End Sub
+
+#End Region    ' HasShift
+
+#Region "GETHEXSIZE"
+
+   Private Function GetHexSize(gridSize As Size) As Size
+      Dim minH As Double = 0
+      Dim minW As Double = 0
+
+      For Each e As UIElement In InternalChildren
+         Dim f = TryCast(e, FrameworkElement)
+
+         If f IsNot Nothing Then
+            If f.MinHeight > minH Then minH = f.MinHeight
+            If f.MinWidth > minW Then minW = f.MinWidth
+         End If
+      Next
+
+      Dim first, last As Boolean
+      HasShift(first, last)
+      Dim possibleSize = GetPossibleSize(gridSize)
+      Dim possibleW As Double = possibleSize.Width
+      Dim possibleH As Double = possibleSize.Height
+      Dim w = Math.Max(minW, possibleW)
+      Dim h = Math.Max(minH, possibleH)
+
+      Return New Size(w, h)
+   End Function
+
+   Private Function GetPossibleSize(gridSize As Size) As Size
+      Dim first, last As Boolean
+      HasShift(first, last)
+      If Orientation = Orientation.Horizontal Then Return GetPossibleSizeHorizontal(gridSize, first, last)
+      Return GetPossibleSizeVertical(gridSize, first, last)
+   End Function
+
+   Private Function GetPossibleSizeVertical(gridSize As Size, first As Boolean, last As Boolean) As Size
+      Dim columns As Integer = ((If(first, 0, 1)) + 2 * ColumnCount - (If(last, 1, 0)))
+      Dim w As Double = 2 * (gridSize.Width / columns)
+      Dim rows As Integer = 1 + 3 * RowCount
+      Dim h As Double = 4 * (gridSize.Height / rows)
+      Return New Size(w, h)
+   End Function
+
+   Private Function GetPossibleSizeHorizontal(gridSize As Size, first As Boolean, last As Boolean) As Size
+      Dim columns As Integer = 1 + 3 * ColumnCount
+      Dim w As Double = 4 * (gridSize.Width / columns)
+      Dim rows As Integer = (If(first, 0, 1)) + 2 * RowCount - (If(last, 1, 0))
+      Dim h As Double = 2 * (gridSize.Height / rows)
+      Return New Size(w, h)
+   End Function
+
+#End Region    ' GetHexSize
+
+#Region "ARRANGE"
+
+   Protected Overrides Function ArrangeOverride(finalSize As Size) As Size
+      Dim first, last As Boolean
+      HasShift(first, last)
+      Dim hexSize As Size = GetHexSize(finalSize)
+      Dim columnWidth, rowHeight As Double
+
+      If Orientation = Orientation.Horizontal Then
+         rowHeight = 0.5 * hexSize.Height
+         columnWidth = 0.25 * hexSize.Width
+      Else
+         rowHeight = 0.25 * hexSize.Height
+         columnWidth = 0.5 * hexSize.Width
+      End If
+
+      Dim elements As UIElementCollection = MyBase.InternalChildren
+
+      For i As Integer = 0 To elements.Count - 1
+         If elements(i).Visibility = Visibility.Collapsed Then Continue For
+         ArrangeElement(elements(i), hexSize, columnWidth, rowHeight, first)
+      Next
+
+      Return finalSize
+   End Function
+
+   Private Sub ArrangeElement(e As UIElement, hexSize As Size, columnWidth As Double, rowHeight As Double, shift As Boolean)
+      Dim row As Integer = GetRow(e)
+      Dim column As Integer = GetColumn(e)
+      Dim x As Double
+      Dim y As Double
+
+      If Orientation = Orientation.Horizontal Then
+         x = 3 * columnWidth * column
+         y = rowHeight * (2 * row + (If(column Mod 2 = 1, 1, 0)) + (If(shift, -1, 0)))
+      Else
+         x = columnWidth * (2 * column + (If(row Mod 2 = 1, 1, 0)) + (If(shift, -1, 0)))
+         y = 3 * rowHeight * row
+      End If
+
+      e.Arrange(New Rect(x, y, hexSize.Width, hexSize.Height))
+   End Sub
+
+#End Region    ' Arrange
+
+End Class
+
+Public Class EgtHexList
+   Inherits ListBox
+
+   Shared Sub New()
+      DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtHexList),
+                                               New FrameworkPropertyMetadata(GetType(EgtHexList)))
+   End Sub
+
+   Public Shared ReadOnly OrientationProperty As DependencyProperty = EgtHexagon.OrientationProperty.AddOwner(GetType(EgtHexList))
+   Public Shared ReadOnly RowCountProperty As DependencyProperty = EgtHexagon.RowCountProperty.AddOwner(GetType(EgtHexList))
+   Public Shared ReadOnly ColumnCountProperty As DependencyProperty = EgtHexagon.ColumnCountProperty.AddOwner(GetType(EgtHexList))
+
+   Public Property Orientation As Orientation
+      Get
+         Return CType(GetValue(OrientationProperty), Orientation)
+      End Get
+      Set(value As Orientation)
+         SetValue(OrientationProperty, value)
+      End Set
+   End Property
+
+   Public Property RowCount As Integer
+      Get
+         Return CInt(GetValue(RowCountProperty))
+      End Get
+      Set(value As Integer)
+         SetValue(RowCountProperty, value)
+      End Set
+   End Property
+
+   Public Property ColumnCount As Integer
+      Get
+         Return CInt(GetValue(ColumnCountProperty))
+      End Get
+      Set(value As Integer)
+         SetValue(ColumnCountProperty, value)
+      End Set
+   End Property
+
+   Protected Overrides Function IsItemItsOwnContainerOverride(item As Object) As Boolean
+      Return (TypeOf item Is EgtHexItem)
+   End Function
+
+   Protected Overrides Function GetContainerForItemOverride() As DependencyObject
+      Return New EgtHexItem()
+   End Function
+
+End Class
+
+Public Class EgtHexItem
+   Inherits ListBoxItem
+
+   Shared Sub New()
+      DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtHexItem),
+                                               New FrameworkPropertyMetadata(GetType(EgtHexItem)))
+   End Sub
+
+   Public Shared ReadOnly OrientationProperty As DependencyProperty = EgtHexagon.OrientationProperty.AddOwner(GetType(EgtHexItem))
+
+   Public Property Orientation As Orientation
+      Get
+         Return CType(GetValue(OrientationProperty), Orientation)
+      End Get
+      Set(value As Orientation)
+         SetValue(OrientationProperty, value)
+      End Set
+   End Property
+
+End Class
+
+Public Class HexClipConverter
+   Implements IMultiValueConverter
+
+   Public Function Convert(values() As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IMultiValueConverter.Convert
+      Dim width As Double = CDbl(values(0))
+      Dim height As Double = CDbl(values(1))
+      Dim orientation As Orientation = CType(values(2), Orientation)
+
+      If width <= 0 OrElse height <= 0 Then Return Nothing
+
+      Dim pathGeometry As New PathGeometry With {
+         .Figures = New PathFigureCollection()
+      }
+
+      Dim pathFigure As New PathFigure()
+
+      If orientation = Orientation.Horizontal Then
+         pathFigure.StartPoint = New Point(0, height * 0.5)
+
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.25, 0)})
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.75, 0)})
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.5)})
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.75, height)})
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.25, height)})
+      Else
+         pathFigure.StartPoint = New Point(width * 0.5, 0)
+
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.25)})
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.75)})
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.5, height)})
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(0, height * 0.75)})
+         pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(0, height * 0.25)})
+      End If
+
+      pathGeometry.Figures.Add(pathFigure)
+
+      Return pathGeometry
+
+   End Function
+
+   Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
+      Throw New NotImplementedException()
+   End Function
+End Class

Icarus/EgtManageFileDialog/EgtManageFileDialogV.xaml

@@ -0,0 +1,450 @@
+<EgtWPFLib5:EgtMainWindow  x:Class="EgtManageFileDialogV"
+        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:local="clr-namespace:Icarus"                   
+        Title="{Binding sTitle}"
+        SizeToContent="WidthAndHeight"
+        WindowStartupLocation="CenterOwner"
+        Style="{StaticResource Dialog_Window}">
+   <Grid Margin="5,5,5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <Grid Margin="5,5,5,0">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Button Command="{Binding GoBack_Command}"
+                 HorizontalAlignment="Right"
+                 Margin="2.5,0,0,0"
+                 Style="{StaticResource RightPanel_Button}">
+            <Image Source="\Resources\EgtDialog\Restore.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <TextBlock Grid.Column="1"
+                    Margin="5"
+                    Text="{Binding sUrl_Msg, Mode=TwoWay}"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
+         <ComboBox Grid.Column="2"
+                   HorizontalAlignment="Right"
+                   IsSynchronizedWithCurrentItem="True"
+                   ItemsSource="{Binding VisualizationList}"
+                   SelectedItem="{Binding SelVisualization}"
+                   Width="200"
+                   Margin="2.5,0,2.5,5"
+                   Style="{StaticResource RightPanel_ComboBox}">
+         </ComboBox>
+      </Grid>
+      <Grid Grid.Row="1"
+            Margin="5,5,5,0">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <TreeView x:Name="FileTree" 
+                   ItemsSource="{Binding RootList}"                   
+                   Height="300"
+                   Width="200"
+                   Margin="10"
+                   HorizontalAlignment="Left"
+                   VerticalAlignment="Center">
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type local:EgtFolder}" 
+                                         ItemsSource="{Binding FolderList}">
+                  <TextBlock Text="{Binding sName}"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+               </HierarchicalDataTemplate>
+               <DataTemplate DataType="{x:Type local:EgtItem}">
+                  <TextBlock Text="{Binding sName}"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+               </DataTemplate>
+            </TreeView.Resources>
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}">
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+               </Style>
+            </TreeView.ItemContainerStyle>
+         </TreeView>
+         <TabControl Grid.Column="1"
+                     BorderBrush="White"
+                     BorderThickness="0"
+                     Background="White"
+                     SelectedIndex="{Binding nSelectView}">
+            <TabItem Visibility="{Binding ListBox_Visibility}">
+               <Grid Grid.Column="1"
+                     Margin="5,5,5,0">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="Auto"/>
+                  </Grid.RowDefinitions>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <TextBlock Text="{Binding Name_Msg}"
+                             Visibility="{Binding UVision_Visibility}"
+                             Margin="5,5,5,5"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                  <ListBox x:Name="FileList" 
+                           Grid.Row="1"
+                           Width="350"
+                           Height="250"
+                           Margin="5,5,5,5"
+                           BorderBrush="White"
+                           IsSynchronizedWithCurrentItem="True"
+                           ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
+                           SelectedItem="{Binding SelTreeItem.ItemSelected}">
+                     <ListBox.Resources>
+                        <DataTemplate x:Key="ScheduleTemplate" 
+                                      DataType="{x:Type local:EgtDirectory}" >
+                           <Grid Margin="5,5,5,0">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <Image Source="{Binding sIconSource}"
+                                     Height="15"
+                                     Style="{StaticResource Button_Image}"/>
+                              <TextBlock Grid.Column="1"
+                                         Text="{Binding sName}"
+                                         Style="{StaticResource DialogWindow_TextBlock}"/>
+                           </Grid>
+                        </DataTemplate>
+                        <DataTemplate x:Key="BoxingTemplate"
+                                      DataType="{x:Type local:EgtDirectory}">
+                           <Grid  Margin="5,5,5,0">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <Image Source="{Binding sIconSource}"
+                                     Height="65"
+                                     Style="{StaticResource Button_Image}"/>
+                              <UniformGrid Grid.Column="1"
+                                           Rows="3"
+                                           Margin="2.5,0,2.5,5">
+                                 <TextBlock TextAlignment="Left"
+                                            Text="{Binding sName}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            Text="{Binding sTypeItem}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            Text="{Binding sDimension}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                              </UniformGrid>
+                           </Grid>
+                        </DataTemplate>
+                        <DataTemplate x:Key="ContentTemplateView"
+                                      DataType="{x:Type local:EgtDirectory}">
+                           <Grid  Margin="5,5,5,0">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <Image Source="{Binding sIconSource}"
+                                     Height="60"
+                                     Style="{StaticResource Button_Image}"/>
+                              <UniformGrid Grid.Column="1"
+                                           Rows="2"
+                                           Margin="2.5,0,2.5,5">
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding sName}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding sTypeItem}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                              </UniformGrid>
+                              <UniformGrid Grid.Column="2"
+                                           Rows="2"
+                                           Margin="2.5,0,2.5,5">
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding dLastModifyDate}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding sDimension}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                              </UniformGrid>
+                           </Grid>
+                        </DataTemplate>
+                     </ListBox.Resources>
+                     <ListBox.ItemTemplate>
+                        <DataTemplate DataType="{x:Type local:EgtDirectory}">
+                           <ContentControl Content="{Binding}">
+                              <ContentControl.Style>
+                                 <Style TargetType="{x:Type ContentControl}">
+                                    <Style.Triggers>
+                                       <DataTrigger  Binding="{Binding DataContext.nTaskStatus, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtMainWindow}}}" Value="0">
+                                          <Setter Property="ContentTemplate" Value="{StaticResource ScheduleTemplate}" />
+                                       </DataTrigger>
+                                       <DataTrigger  Binding="{Binding DataContext.nTaskStatus, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtMainWindow}}}" Value="1">
+                                          <Setter Property="ContentTemplate" Value="{StaticResource BoxingTemplate}" />
+                                       </DataTrigger>
+                                       <DataTrigger  Binding="{Binding DataContext.nTaskStatus, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtMainWindow}}}" Value="2">
+                                          <Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
+                                       </DataTrigger>
+                                    </Style.Triggers>
+                                 </Style>
+                              </ContentControl.Style>
+                           </ContentControl>
+                        </DataTemplate>
+                     </ListBox.ItemTemplate>
+                     
+                     <!--<ListBox.ItemTemplate>
+                        <DataTemplate  >
+                           <TextBlock Text="{Binding Name}"
+                                      Style="{StaticResource DialogWindow_TextBlock}"/>-->
+
+                           <!--<Grid  Margin="5,5,5,0">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <Image Source="/Resources/ProjectManager/New.png"
+                                     Height="65"
+                                     Style="{StaticResource Button_Image}"/>
+                              <UniformGrid Grid.Column="1"
+                                           Rows="3"
+                                           Margin="2.5,0,2.5,5">
+                                 <TextBlock TextAlignment="Left"
+                                            Text="{Binding Name}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            Text="{Binding TypeItem}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            Text="{Binding Dimension}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                              </UniformGrid>
+                           </Grid>-->
+
+                           <!--<Grid  Margin="5,5,5,0">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <Image Source="/Resources/ProjectManager/New.png"
+                                     Height="60"
+                                     Style="{StaticResource Button_Image}"/>
+                              <UniformGrid Grid.Column="1"
+                                           Rows="2"
+                                           Margin="2.5,0,2.5,5">
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding Name}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding TypeItem}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                              </UniformGrid>
+                              <UniformGrid Grid.Column="2"
+                                           Rows="2"
+                                           Margin="2.5,0,2.5,5">
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding LastModifyDate}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 <TextBlock TextAlignment="Left"
+                                            HorizontalAlignment="Left"
+                                            Text="{Binding Dimension}"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                              </UniformGrid>
+                           </Grid>-->
+                        <!--</DataTemplate>
+                     </ListBox.ItemTemplate>-->
+                  </ListBox>
+                  <UniformGrid Visibility="{Binding UVision_Visibility}" 
+                                  Grid.Column="1"
+                                  Columns="3"
+                                  HorizontalAlignment="Stretch">
+                        <TextBlock Margin="5,5,5,5"
+                                   Text="{Binding LastModify_Msg}"
+                                   Style="{StaticResource DialogWindow_TextBlock}"/>   
+                        <TextBlock Margin="5,5,5,5"
+                                   Text="{Binding Type_Msg}"
+                                   Style="{StaticResource DialogWindow_TextBlock}"/>
+                        <TextBlock Margin="5,5,5,5"
+                                   Text="{Binding Dimension_Msg}"
+                                   Style="{StaticResource DialogWindow_TextBlock}"/>
+                     </UniformGrid>
+                  <UniformGrid Visibility="{Binding UVision_Visibility}"
+                                  Grid.Column="1"
+                                  Grid.Row="1"
+                                  Columns="3"
+                                  HorizontalAlignment="Stretch">
+                        <TextBlock Grid.Column="1"
+                                   Grid.Row="1"
+                                   Margin="5,5,5,5"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Top"
+                                   Text="{Binding SelectedItem.dLastModifyDate, ElementName=FileList}"
+                                   Style="{StaticResource DialogWindow_TextBlock}"/>
+                        <TextBlock Grid.Column="2"
+                                   Grid.Row="1"
+                                   Margin="5,5,5,5"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Top"
+                                   Text="{Binding SelectedItem.sTypeItem, ElementName=FileList}"
+                                   Style="{StaticResource DialogWindow_TextBlock}"/>
+                        <TextBlock Grid.Column="3"
+                                    Grid.Row="1"
+                                    Margin="5,5,5,5"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Top"
+                                    Text="{Binding SelectedItem.sDimension, ElementName=FileList}"
+                                    Style="{StaticResource DialogWindow_TextBlock}"/>
+                     </UniformGrid>
+               </Grid>
+            </TabItem>
+            <TabItem Visibility="{Binding DataGrid_Visibility}">
+               <DataGrid AutoGenerateColumns="False"
+                         Height="300"
+                         Margin="5,5,5,10"
+                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
+                         SelectedItem="{Binding SelTreeItem.ItemSelected}">
+                  <DataGrid.Columns>
+                     <DataGridTextColumn Binding="{Binding sName}">
+                        <DataGridTextColumn.HeaderTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                           </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                        <DataGridTextColumn.ElementStyle>
+                           <Style TargetType="TextBlock">
+                              <Setter Property="HorizontalAlignment" Value="Left"/>
+                              <Setter Property="VerticalAlignment" Value="Center"/>
+                              <Setter Property="TextAlignment" Value="Left"/>
+                              <Setter Property="Padding" Value="12,6,12,6"/>
+                           </Style>
+                        </DataGridTextColumn.ElementStyle>
+                     </DataGridTextColumn>
+                     <DataGridTextColumn Binding="{Binding dLastModifyDate}">
+                        <DataGridTextColumn.HeaderTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                           </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                        <DataGridTextColumn.ElementStyle>
+                           <Style TargetType="TextBlock">
+                              <Setter Property="HorizontalAlignment" Value="Center"/>
+                              <Setter Property="VerticalAlignment" Value="Center"/>
+                              <Setter Property="TextAlignment" Value="Left"/>
+                              <Setter Property="Padding" Value="12,6,12,6"/>
+                           </Style>
+                        </DataGridTextColumn.ElementStyle>
+                     </DataGridTextColumn>
+                     <DataGridTextColumn Binding="{Binding sTypeItem}">
+                        <DataGridTextColumn.HeaderTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                           </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                        <DataGridTextColumn.ElementStyle>
+                           <Style TargetType="TextBlock">
+                              <Setter Property="HorizontalAlignment" Value="Left"/>
+                              <Setter Property="VerticalAlignment" Value="Center"/>
+                              <Setter Property="TextAlignment" Value="Left"/>
+                              <Setter Property="Padding" Value="12,6,12,6"/>
+                           </Style>
+                        </DataGridTextColumn.ElementStyle>
+                     </DataGridTextColumn>
+                     <DataGridTextColumn Binding="{Binding sDimension}">
+                        <DataGridTextColumn.HeaderTemplate>
+                           <DataTemplate>
+                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                           </DataTemplate>
+                        </DataGridTextColumn.HeaderTemplate>
+                        <DataGridTextColumn.ElementStyle>
+                           <Style TargetType="TextBlock">
+                              <Setter Property="HorizontalAlignment" Value="Right"/>
+                              <Setter Property="VerticalAlignment" Value="Center"/>
+                              <Setter Property="TextAlignment" Value="Right"/>
+                              <Setter Property="Padding" Value="12,6,12,6"/>
+                           </Style>
+                        </DataGridTextColumn.ElementStyle>
+                     </DataGridTextColumn>
+                  </DataGrid.Columns>
+                  <DataGrid.RowStyle>
+                     <Style TargetType="DataGridRow" 
+                            BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+                     </Style>
+                  </DataGrid.RowStyle>
+                  <DataGrid.CellStyle>
+                     <Style TargetType="{x:Type DataGridCell}">
+                     </Style>
+                  </DataGrid.CellStyle>
+               </DataGrid>
+            </TabItem>
+         </TabControl>
+      </Grid>
+      <Grid Grid.Row="2" 
+            Margin="5,5,5,0">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Margin="5,5,5,5"
+                    Text="{Binding FileName_Msg}"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
+         <!--<ComboBox Grid.Column="1"
+                   IsSynchronizedWithCurrentItem="True"
+                   IsEditable="True"
+                   ItemsSource="{Binding ListItemView}"
+                   SelectedItem="{Binding SelListItemView}"
+                   Width="400"
+                   Margin="2.5,0,2.5,5"
+                   Style="{StaticResource RightPanel_ComboBox}">
+         </ComboBox>-->
+         <TextBox Grid.Column="1"
+                  Margin="2.5,2.5,2.5,5"
+                  Width="350"
+                  Height="30"
+                  TextAlignment="Left"
+                  Text="{Binding sSaveFileName}"
+                  Style="{StaticResource ParameterList_TextBox}"/>
+         <ComboBox Grid.Column="2"
+                   IsSynchronizedWithCurrentItem="True"
+                   ItemsSource="{Binding ListFilter}"
+                   SelectedItem="{Binding SelExstension}"
+                   DisplayMemberPath="sNameExstension"
+                   HorizontalAlignment="Right"
+                   Width="200"
+                   Margin="2.5,0,2.5,5"
+                   Style="{StaticResource RightPanel_ComboBox}">
+         </ComboBox>
+         <UniformGrid Grid.Row="1"  
+                      Grid.Column="2"
+                      Rows="1"
+                      Margin="2.5,0,2.5,5">
+            <Button IsDefault="True"
+                    Content="OK"
+                    Command="{Binding Ok_Command}"
+                    Margin="15,0,2.5,0"
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+            <Button Content="Cancel"
+                    Command="{Binding Cancel_Command}"
+                    HorizontalAlignment="Right"
+                    Margin="2.5,0,0,0"
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         </UniformGrid>
+      </Grid>
+   </Grid>
+</EgtWPFLib5:EgtMainWindow>

Icarus/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb

@@ -0,0 +1,88 @@
+Imports System.Windows.Forms
+
+Public Class EgtManageFileDialogV
+
+#Region "FIELDS & PROPERTIES"
+
+   Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM
+
+   Private Shadows DialogResult As DialogResult
+
+   Public Overloads Property Title As String
+      Get
+         Return m_EgtManageFileDialogVM.sTitle
+      End Get
+      Set(value As String)
+         m_EgtManageFileDialogVM.sTitle = value
+      End Set
+   End Property
+
+   Public Property Filter As String
+      Get
+         Return m_EgtManageFileDialogVM.sFilter
+      End Get
+      Set(value As String)
+         m_EgtManageFileDialogVM.sFilter = value
+      End Set
+   End Property
+
+   Public Property InitialDirectory As String
+      Get
+         Return m_EgtManageFileDialogVM.sInitialDirectory
+      End Get
+      Set(value As String)
+         m_EgtManageFileDialogVM.sInitialDirectory = value
+      End Set
+   End Property
+
+   Public Property FileName As String
+      Get
+         Return m_EgtManageFileDialogVM.sFileName
+      End Get
+      Set(value As String)
+         m_EgtManageFileDialogVM.sFileName = value
+      End Set
+   End Property
+
+   Public Property FilterIndex As Integer
+      Get
+         Return m_EgtManageFileDialogVM.nFilterIndex
+      End Get
+      Set(value As Integer)
+         m_EgtManageFileDialogVM.nFilterIndex = value
+      End Set
+   End Property
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONTRUCTORS"
+
+   Sub New(Owner As Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
+      MyBase.New(Owner)
+      InitializeComponent()
+      Me.DataContext = EgtManageFileDialogVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_EgtManageFileDialogVM = EgtManageFileDialogVM
+   End Sub
+
+#End Region
+
+#Region "EVENTS"
+
+   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtManageFileDialogVM.m_CloseWindow
+      Me.DialogResult = DialogResult
+      Me.Close()
+   End Sub
+
+#End Region
+
+#Region "METHODS"
+
+   Public Overloads Function ShowDialog() As DialogResult
+      MyBase.ShowDialog()
+      Return Me.DialogResult
+   End Function
+
+#End Region    '  METHODS
+
+End Class

Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb

@@ -0,0 +1,893 @@
+Imports System.Collections.ObjectModel
+Imports System.ComponentModel
+Imports System.IO
+Imports System.Windows.Forms
+Imports EgtWPFLib5
+Imports EgtUILib
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
+
+Public Class EgtManageFileDialogVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Public Enum VisualizationContainerType As Integer
+      LISTBOX = 0
+      DATAGRID = 1
+   End Enum
+
+   Public Enum VisualizationType As Integer
+      SCHEDULETEMPLATE = 0
+      DETAILSTEMPLATE = 1
+      BOXINGTEMPLATE = 2
+      CONTENTTEMPLATE = 3
+   End Enum
+
+   Private m_sTitle As String
+   Public Property sTitle As String
+      Get
+         Return m_sTitle
+      End Get
+      Set(value As String)
+         m_sTitle = value
+      End Set
+   End Property
+
+   Private m_sFilter As String
+   Public Property sFilter As String
+      Get
+         Return m_sFilter
+      End Get
+      Set(value As String)
+         m_sFilter = value
+         If Not IsNothing(sFilter) Then
+            Dim FilterListSplit As String() = sFilter.Split("|"c)
+            For i As Integer = 0 To FilterListSplit.Count - 1
+               If i Mod 2 = 0 Then
+                  Dim strExstension As New EgtExstension() With {.sNameExstension = FilterListSplit(i) & FilterListSplit(i + 1), .sExstension = FilterListSplit(i + 1)}
+                  m_ListFilter.Add(strExstension)
+               End If
+            Next
+         End If
+      End Set
+   End Property
+
+   Private m_sInitialDirectory As String
+   Public Property sInitialDirectory As String
+      Get
+         Return m_sInitialDirectory
+      End Get
+      Set(value As String)
+         m_sInitialDirectory = value
+         m_sSaveFileName = "New.icrs"
+         m_sUrl_Msg = m_sInitialDirectory
+         Dim DirectoryStart As String() = m_sInitialDirectory.Split("\"c)
+
+         For i As Integer = 0 To m_RootList.Count - 1
+            If m_RootList(i).sName.Trim("\") = DirectoryStart(0) Then
+               m_RootList(i).IsExpanded = True
+               Dim CurrItem As EgtFolder = TryCast(m_RootList(i), EgtFolder)
+               If Not IsNothing(CurrItem) Then
+                  For j As Integer = 0 To CurrItem.FolderList.Count - 1
+                     If CurrItem.FolderList(j).sName = DirectoryStart(1) Then
+                        CurrItem.FolderList(j).IsExpanded = True
+                        Dim ItemFolder As EgtFolder = TryCast(CurrItem.FolderList(j), EgtFolder)
+                        If Not IsNothing(ItemFolder) Then
+                           For y As Integer = 0 To ItemFolder.FolderList.Count - 1
+                              If ItemFolder.FolderList(y).sName = DirectoryStart(2) Then
+                                 ItemFolder.FolderList(y).IsExpanded = True
+                                 ItemFolder.FolderList(y).IsSelected = True
+                              End If
+                           Next
+                        End If
+                     End If
+                  Next
+               End If
+            End If
+         Next
+      End Set
+   End Property
+
+   Private m_sFileName As String
+   Public Property sFileName As String
+      Get
+         Return m_sFileName
+      End Get
+      Set(value As String)
+         m_sFileName = value
+         m_sSaveFileName = m_sFileName
+      End Set
+   End Property
+
+   Public Shared m_sUrl_Msg As String
+   Public Property sUrl_Msg As String
+      Get
+         Return m_sUrl_Msg
+      End Get
+      Set(value As String)
+         m_sUrl_Msg = value
+      End Set
+   End Property
+
+   'Private m_sSelListItemView As String
+   'Public Property SelListItemView As String
+   '   Get
+   '      Return m_sSelListItemView
+   '   End Get
+   '   Set(value As String)
+   '      m_sSelListItemView = value
+   '   End Set
+   'End Property
+
+   Private m_sSaveFileName As String
+   Public Property sSaveFileName As String
+      Get
+         Return m_sSaveFileName
+      End Get
+      Set(value As String)
+         m_sSaveFileName = value
+      End Set
+   End Property
+
+   Private m_nTaskStatus As Integer
+   Public Property nTaskStatus As String
+      Get
+         Return m_nTaskStatus
+      End Get
+      Set(value As String)
+         m_nTaskStatus = value
+         NotifyPropertyChanged(NameOf(nTaskStatus))
+      End Set
+   End Property
+
+   Private m_nFilterIndex As Integer
+   Public Property nFilterIndex As Integer
+      Get
+         Return m_nFilterIndex
+      End Get
+      Set(value As Integer)
+         m_nFilterIndex = value
+      End Set
+   End Property
+
+   Private m_nSelectView As Integer
+   Public Property nSelectView As Integer
+      Get
+         Return m_nSelectView
+      End Get
+      Set(value As Integer)
+         m_nSelectView = value
+      End Set
+   End Property
+
+   Private m_ListFilter As ObservableCollection(Of EgtExstension)
+   Public Property ListFilter As ObservableCollection(Of EgtExstension)
+      Get
+         Return m_ListFilter
+      End Get
+      Set(value As ObservableCollection(Of EgtExstension))
+         m_ListFilter = value
+      End Set
+   End Property
+
+   'Public Shared m_ListItemView As ObservableCollection(Of String)
+   'Public Property ListItemView As ObservableCollection(Of String)
+   '   Get
+   '      Return m_ListItemView
+   '   End Get
+   '   Set(value As ObservableCollection(Of String))
+   '      m_ListItemView = value
+   '   End Set
+   'End Property
+
+   Private m_RootList As New ObservableCollection(Of EgtDirectory)
+   Public Property RootList As ObservableCollection(Of EgtDirectory)
+      Get
+         Return m_RootList
+      End Get
+      Set(value As ObservableCollection(Of EgtDirectory))
+         m_RootList = value
+      End Set
+   End Property
+
+   Private m_VisualizationList As ObservableCollection(Of IdNameStruct)
+   Public Property VisualizationList As ObservableCollection(Of IdNameStruct)
+      Get
+         Return m_VisualizationList
+      End Get
+      Set(value As ObservableCollection(Of IdNameStruct))
+         m_VisualizationList = value
+      End Set
+   End Property
+
+   Private m_SelVisualization As IdNameStruct
+   Public Property SelVisualization As IdNameStruct
+      Get
+         Return m_SelVisualization
+      End Get
+      Set(value As IdNameStruct)
+         m_SelVisualization = value
+         Select Case m_SelVisualization.Id
+            Case VisualizationType.SCHEDULETEMPLATE
+               m_nSelectView = VisualizationContainerType.LISTBOX
+               nTaskStatus = 0
+               m_UVision_Visibility = Visibility.Visible
+               m_ListBox_Visibility = Visibility.Visible
+               m_DataGrid_Visibility = Visibility.Collapsed
+            Case VisualizationType.DETAILSTEMPLATE
+               m_nSelectView = VisualizationContainerType.DATAGRID
+               m_UVision_Visibility = Visibility.Collapsed
+               m_ListBox_Visibility = Visibility.Collapsed
+               m_DataGrid_Visibility = Visibility.Visible
+            Case VisualizationType.BOXINGTEMPLATE
+               m_nSelectView = VisualizationContainerType.LISTBOX
+               nTaskStatus = 1
+               m_UVision_Visibility = Visibility.Collapsed
+               m_ListBox_Visibility = Visibility.Visible
+               m_DataGrid_Visibility = Visibility.Collapsed
+            Case VisualizationType.CONTENTTEMPLATE
+               m_nSelectView = VisualizationContainerType.LISTBOX
+               nTaskStatus = 2
+               m_UVision_Visibility = Visibility.Collapsed
+               m_ListBox_Visibility = Visibility.Visible
+               m_DataGrid_Visibility = Visibility.Collapsed
+         End Select
+         NotifyPropertyChanged(NameOf(nSelectView))
+         NotifyPropertyChanged(NameOf(UVision_Visibility))
+         NotifyPropertyChanged(NameOf(DataGrid_Visibility))
+         NotifyPropertyChanged(NameOf(ListBox_Visibility))
+      End Set
+   End Property
+
+   Private m_DataGrid_Visibility As Visibility
+   Public Property DataGrid_Visibility As Visibility
+      Get
+         Return m_DataGrid_Visibility
+      End Get
+      Set(value As Visibility)
+         m_DataGrid_Visibility = value
+      End Set
+   End Property
+
+   Private m_ListBox_Visibility As Visibility
+   Public Property ListBox_Visibility As Visibility
+      Get
+         Return m_ListBox_Visibility
+      End Get
+      Set(value As Visibility)
+         m_ListBox_Visibility = value
+      End Set
+   End Property
+
+   Private m_UVision_Visibility As Visibility
+   Public Property UVision_Visibility As Visibility
+      Get
+         Return m_UVision_Visibility
+      End Get
+      Set(value As Visibility)
+         m_UVision_Visibility = value
+      End Set
+   End Property
+
+   Public Shared m_SelExstension As EgtExstension
+   Public Property SelExstension As EgtExstension
+      Get
+         Return m_SelExstension
+      End Get
+      Set(value As EgtExstension)
+         m_SelExstension = value
+         Dim CurrItem As EgtFolder = TryCast(m_SelTreeItem, EgtFolder)
+         If Not IsNothing(CurrItem) Then
+            CollectionViewSource.GetDefaultView(CurrItem.FolderList).Refresh()
+         End If
+      End Set
+   End Property
+
+   Public Shared m_SelTreeItem As EgtDirectory
+   Public Property SelTreeItem As EgtDirectory
+      Get
+         Return m_SelTreeItem
+      End Get
+      Set(value As EgtDirectory)
+         m_SelTreeItem = value
+         NotifyPropertyChanged(NameOf(SelTreeItem))
+      End Set
+   End Property
+
+   Friend Sub UpdateSelRoot(Item As EgtDirectory)
+      m_SelTreeItem = Item
+      NotifyPropertyChanged(NameOf(SelTreeItem))
+   End Sub
+
+   'Comandi
+   Private m_cmdCancel As ICommand
+   Private m_cmdOk As ICommand
+   Private m_cmdGoBack As ICommand
+   Friend Event m_CloseWindow(bDialogResult As MessageBoxResult)
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONTRUCTORS"
+
+   Sub New()
+      m_RootList.Clear()
+      EgtDirectory.refUpdateSelRoot = AddressOf UpdateSelRoot
+      Dim drives As DriveInfo() = DriveInfo.GetDrives().Where(Function(d) d.IsReady).ToArray()
+
+      m_ListFilter = New ObservableCollection(Of EgtExstension)
+
+      For i As Integer = 0 To drives.Count() - 1
+         Dim directory As New EgtFolder(drives(i).RootDirectory, Nothing)
+         'AddHandler directory.PropertyChanged, AddressOf Directory_PropertyChanged
+         m_RootList.Add(directory)
+      Next
+
+      SetVisualizzationList()
+
+      m_SelVisualization.Id = VisualizationType.SCHEDULETEMPLATE
+      m_nSelectView = VisualizationContainerType.LISTBOX
+      nTaskStatus = 0
+      m_UVision_Visibility = Visibility.Visible
+      m_ListBox_Visibility = Visibility.Visible
+      m_DataGrid_Visibility = Visibility.Collapsed
+
+      NotifyPropertyChanged(NameOf(RootList))
+      NotifyPropertyChanged(NameOf(ListFilter))
+      NotifyPropertyChanged(NameOf(VisualizationList))
+   End Sub
+
+#End Region    ' CONTRUCTORS
+
+#Region "Messages"
+   Public ReadOnly Property Name_Msg As String
+      Get
+         Return EgtMsg(15060)
+      End Get
+   End Property
+
+   Public ReadOnly Property LastModify_Msg As String
+      Get
+         Return EgtMsg(15061)
+      End Get
+   End Property
+
+   Public ReadOnly Property Type_Msg As String
+      Get
+         Return EgtMsg(15062)
+      End Get
+   End Property
+
+   Public ReadOnly Property Dimension_Msg As String
+      Get
+         Return EgtMsg(15063)
+      End Get
+   End Property
+
+   Public Shared ReadOnly Property Folder_Msg As String
+      Get
+         Return EgtMsg(15064)
+      End Get
+   End Property
+
+   Public Shared ReadOnly Property FileName_Msg As String
+      Get
+         Return EgtMsg(15065)
+      End Get
+   End Property
+
+   Public Shared ReadOnly Property Schedule_Msg As String
+      Get
+         Return EgtMsg(15067)
+      End Get
+   End Property
+
+   Public Shared ReadOnly Property Details_Msg As String
+      Get
+         Return EgtMsg(15068)
+      End Get
+   End Property
+
+   Public Shared ReadOnly Property Boxing_Msg As String
+      Get
+         Return EgtMsg(15069)
+      End Get
+   End Property
+
+   Public Shared ReadOnly Property Content_Msg As String
+      Get
+         Return EgtMsg(15070)
+      End Get
+   End Property
+
+   Public Shared ReadOnly Property DataFolder_Msg As String
+      Get
+         Return EgtMsg(15071)
+      End Get
+   End Property
+
+#End Region
+
+#Region "METHODS"
+
+   ''' <summary>
+   ''' Inizializza la ComboBox per la scelta dei template
+   ''' </summary>
+   Private Sub SetVisualizzationList()
+      m_VisualizationList = New ObservableCollection(Of IdNameStruct)
+      Dim ItemVisualization As New IdNameStruct With {
+         .Id = 0,
+         .Name = Schedule_Msg
+      }
+      m_VisualizationList.Add(ItemVisualization)
+      ItemVisualization.Id = 1
+      ItemVisualization.Name = Details_Msg
+      m_VisualizationList.Add(ItemVisualization)
+      ItemVisualization.Id = 2
+      ItemVisualization.Name = Boxing_Msg
+      m_VisualizationList.Add(ItemVisualization)
+      ItemVisualization.Id = 3
+      ItemVisualization.Name = Content_Msg
+      m_VisualizationList.Add(ItemVisualization)
+   End Sub
+
+   Private Sub Directory_PropertyChanged(sender As Object, e As PropertyChangedEventArgs)
+      If e.PropertyName = "IsSelected" Then
+         'UpdateSelRoot()
+      End If
+   End Sub
+
+#End Region
+
+#Region "COMMANDS"
+
+#Region "Command Ok"
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      Dim CurrItem As EgtItem = TryCast(EgtFolder.m_ItemSelected, EgtItem)
+      If Not IsNothing(CurrItem) Then
+         m_sFileName = m_SelTreeItem.InfoDir.FullName & "\" & CurrItem.sName
+      Else
+         m_sFileName = m_SelTreeItem.InfoDir.FullName & "\" & m_sSaveFileName
+      End If
+      RaiseEvent m_CloseWindow(DialogResult.OK)
+   End Sub
+#End Region    'Command Ok
+
+#Region "Command GoBack"
+   Public ReadOnly Property GoBack_Command As ICommand
+      Get
+         If m_cmdGoBack Is Nothing Then
+            m_cmdGoBack = New Command(AddressOf GoBack)
+         End If
+         Return m_cmdGoBack
+      End Get
+   End Property
+
+   Public Sub GoBack()
+      m_SelTreeItem = EgtFolder.m_ParentFolder
+      m_SelTreeItem.IsSelected = True
+      m_sUrl_Msg = ""
+      m_sUrl_Msg = m_SelTreeItem.InfoDir.FullName
+      EgtDirectory.m_sIconSource = "\Resources\EgtDialog\Folder.png"
+      NotifyPropertyChanged(NameOf(sUrl_Msg))
+   End Sub
+#End Region    'Command GoBack
+
+#Region "Command Cancel"
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      RaiseEvent m_CloseWindow(DialogResult.Cancel)
+   End Sub
+#End Region    'Command Cancel
+
+#End Region    ' COMMANDS
+
+End Class
+
+Public Class EgtExstension
+   Inherits VMBase
+
+   Public m_sNameExstension As String
+   Public Property sNameExstension As String
+      Get
+         Return m_sNameExstension
+      End Get
+      Set(value As String)
+         m_sNameExstension = value
+         NotifyPropertyChanged(NameOf(sNameExstension))
+      End Set
+   End Property
+
+   Public m_sExstension As String
+   Public Property sExstension As String
+      Get
+         Return m_sExstension
+      End Get
+      Set(value As String)
+         m_sExstension = value
+         NotifyPropertyChanged(NameOf(sExstension))
+      End Set
+   End Property
+
+End Class
+
+Public Class EgtDirectory
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend Shared refUpdateSelRoot As Action(Of EgtDirectory)
+
+   Private m_bIsSelected As Boolean
+   Public Overridable Property IsSelected As Boolean
+      Get
+         Return m_bIsSelected
+      End Get
+      Set(value As Boolean)
+         m_bIsSelected = value
+         refUpdateSelRoot(Me)
+      End Set
+   End Property
+
+   Private m_bIsExpanded As Boolean
+   Public Overridable Property IsExpanded As Boolean
+      Get
+         Return m_bIsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bIsExpanded = value
+      End Set
+   End Property
+
+   Protected m_InfoDir As DirectoryInfo
+   Public Property InfoDir As DirectoryInfo
+      Get
+         Return m_InfoDir
+      End Get
+      Set(value As DirectoryInfo)
+         m_InfoDir = value
+      End Set
+   End Property
+
+   Public ReadOnly Property sName As String
+      Get
+         Try
+            Return If(Not IsNothing(m_InfoDir), m_InfoDir.Name, "")
+         Catch ex As Exception
+            Return ""
+         End Try
+      End Get
+   End Property
+
+   Public Shared m_sIconSource As String
+   Public Property sIconSource As String
+      Get
+         Return m_sIconSource
+      End Get
+      Set(value As String)
+         m_sIconSource = value
+      End Set
+   End Property
+
+   Public ReadOnly Property sTypeItem As String
+      Get
+         Try
+            Return If(Not IsNothing(m_InfoDir), m_InfoDir.Extension, "")
+         Catch ex As Exception
+            Return ""
+         End Try
+      End Get
+   End Property
+
+   Public ReadOnly Property dLastModifyDate As Date
+      Get
+         Try
+            Return If(Not IsNothing(m_InfoDir), m_InfoDir.LastAccessTime.ToString("dd/MM/yyyy HH:mm:ss"), Date.UtcNow.ToString("dd/MM/yyyy HH:mm:ss"))
+         Catch ex As Exception
+            Return Date.UtcNow.ToString("dd/MM/yyyy HH:mm:ss")
+         End Try
+      End Get
+   End Property
+
+   Public ReadOnly Property sDimension As Integer
+      Get
+         Try
+            Return If(Not IsNothing(m_InfoDir), m_InfoDir.EnumerateDirectories().Count, 0)
+         Catch ex As Exception
+            Return 0
+         End Try
+      End Get
+   End Property
+
+#End Region    ' FIELDS & PROPERTIES
+
+End Class
+
+Public Class EgtFolder
+   Inherits EgtDirectory
+
+#Region "FIELDS & PROPERTIES"
+
+   Public Shared m_ItemList_View As CollectionView = Nothing
+
+   Private m_FolderList As New ObservableCollection(Of EgtDirectory)
+   Public Property FolderList As ObservableCollection(Of EgtDirectory)
+      Get
+         Return m_FolderList
+      End Get
+      Set(value As ObservableCollection(Of EgtDirectory))
+         m_FolderList = value
+      End Set
+   End Property
+
+   Public Shared m_ItemSelected As EgtDirectory
+   Public Property ItemSelected As EgtDirectory
+      Get
+         Return m_ItemSelected
+      End Get
+      Set(value As EgtDirectory)
+         m_ItemSelected = value
+      End Set
+   End Property
+
+   Private m_sName As String
+   Public Overloads Property sName As String
+      Get
+         Return m_sName
+      End Get
+      Set(value As String)
+         m_sName = value
+      End Set
+   End Property
+
+   Private m_sTypeItem As String
+   Public Overloads Property sTypeItem As String
+      Get
+         Return m_sTypeItem
+      End Get
+      Set(value As String)
+         m_sTypeItem = value
+      End Set
+   End Property
+
+   Private m_dLastModifyDate As Date
+   Public Overloads Property dLastModifyDate As String
+      Get
+         Return m_dLastModifyDate
+      End Get
+      Set(value As String)
+         m_dLastModifyDate = value
+      End Set
+   End Property
+
+   Public Shared m_ParentFolder As EgtFolder
+   Public Property ParentFolder As EgtFolder
+      Get
+         Return m_ParentFolder
+      End Get
+      Set(value As EgtFolder)
+         m_ParentFolder = value
+      End Set
+   End Property
+
+   Private m_bIsExpanded As Boolean
+   Public Overrides Property IsExpanded As Boolean
+      Get
+         Return m_bIsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bIsExpanded = value
+         NotifyPropertyChanged(NameOf(IsExpanded))
+         Dim DirectoryList() As DirectoryInfo
+         Dim FileList() As FileInfo
+         Try
+            DirectoryList = m_InfoDir.GetDirectories().Where(Function(file) (file.Attributes And FileAttributes.Hidden And file.Name <> EgtManageFileDialogVM.DataFolder_Msg) = 0).ToArray()
+            FileList = m_InfoDir.GetFiles().Where(Function(file) (file.Attributes And FileAttributes.Hidden) = 0).ToArray()
+         Catch ex As Exception
+            DirectoryList = Nothing
+            FileList = Nothing
+         End Try
+         m_FolderList.Clear()
+         If Not IsNothing(DirectoryList) Then
+            For Each subDir As DirectoryInfo In DirectoryList
+               Dim directory As New EgtFolder(subDir, Me)
+               m_FolderList.Add(directory)
+            Next
+         End If
+         If Not IsNothing(FileList) Then
+            For Each files As FileInfo In FileList
+               Dim file As New EgtItem(files)
+               m_FolderList.Add(file)
+            Next
+         End If
+      End Set
+   End Property
+
+   Private m_bIsSelected As Boolean
+   Public Overrides Property IsSelected As Boolean
+      Get
+         Return m_bIsSelected
+      End Get
+      Set(value As Boolean)
+         m_bIsSelected = value
+         refUpdateSelRoot(Me)
+         Dim DirectoryList() As DirectoryInfo
+         Dim FileList() As FileInfo
+         Try
+            DirectoryList = m_InfoDir.GetDirectories().Where(Function(file) (file.Attributes And FileAttributes.Hidden And file.Name <> EgtManageFileDialogVM.DataFolder_Msg) = 0).ToArray()
+            FileList = m_InfoDir.GetFiles().Where(Function(file) (file.Attributes And FileAttributes.Hidden) = 0).ToArray()
+         Catch ex As Exception
+            DirectoryList = Nothing
+            FileList = Nothing
+         End Try
+         m_FolderList.Clear()
+         If Not IsNothing(DirectoryList) Then
+            For Each subDir As DirectoryInfo In DirectoryList
+               Dim directory As New EgtFolder(subDir, Me)
+               m_FolderList.Add(directory)
+            Next
+         End If
+         If Not IsNothing(FileList) Then
+            For Each files As FileInfo In FileList
+               Dim file As New EgtItem(files)
+               m_FolderList.Add(file)
+            Next
+         End If
+      End Set
+   End Property
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONTRUCTORS"
+
+   Sub New(InfoDir As DirectoryInfo, Folder As EgtFolder)
+
+      m_InfoDir = InfoDir
+      m_sName = InfoDir.Name
+      m_dLastModifyDate = InfoDir.LastWriteTime.ToString("dd/MM/yyyy HH:mm:ss")
+      If InfoDir.Extension <> "" Then
+         m_sTypeItem = "File " & InfoDir.Extension.ToUpper()
+         m_sIconSource = "\Resources\EgtDialog\New.png"
+      Else
+         m_sTypeItem = EgtManageFileDialogVM.Folder_Msg
+         m_sIconSource = "\Resources\EgtDialog\Folder.png"
+      End If
+      m_FolderList.Add(New EgtDirectory())
+      EgtManageFileDialogVM.m_SelExstension = New EgtExstension()
+      m_ParentFolder = Folder
+      m_ItemSelected = New EgtDirectory()
+
+
+      m_ItemList_View = CollectionViewSource.GetDefaultView(m_FolderList)
+      m_ItemList_View.Filter = AddressOf ItemFilter
+
+      NotifyPropertyChanged(NameOf(sName))
+      NotifyPropertyChanged(NameOf(dLastModifyDate))
+      NotifyPropertyChanged(NameOf(sTypeItem))
+      NotifyPropertyChanged(NameOf(sIconSource))
+      NotifyPropertyChanged(NameOf(FolderList))
+   End Sub
+
+#End Region    '  CONTRUCTORS
+
+#Region "METHODS"
+
+   Private Function ItemFilter(Item As Object) As Boolean
+      Dim CurrItem As EgtItem = TryCast(Item, EgtItem)
+
+      If Not IsNothing(CurrItem) AndAlso Not IsNothing(EgtManageFileDialogVM.m_SelExstension.m_sExstension) Then
+         'Return CurrItem.TypeItem = EgtOpenDialogVM.m_SelExstension.s_Exstension.TrimStart("*")
+         If CurrItem.sTypeItem.Substring(5).ToLower() = EgtManageFileDialogVM.m_SelExstension.m_sExstension.TrimStart("*") Then
+            'EgtManageFileDialogVM.m_ListItemView.Add(m_InfoDir.FullName & "\" & CurrItem.sName)
+            Return True
+         Else
+            Return False
+         End If
+      End If
+
+      Return True
+   End Function
+
+#End Region
+
+End Class
+
+Public Class EgtItem
+   Inherits EgtDirectory
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_sName As String
+   Public Overloads Property sName As String
+      Get
+         Return m_sName
+      End Get
+      Set(value As String)
+         m_sName = value
+      End Set
+   End Property
+
+   Private m_sTypeItem As String
+   Public Overloads Property sTypeItem As String
+      Get
+         Return m_sTypeItem
+      End Get
+      Set(value As String)
+         m_sTypeItem = value
+      End Set
+   End Property
+
+   Private m_sDimension As String
+   Public Overloads Property sDimension As String
+      Get
+         Return m_sDimension
+      End Get
+      Set(value As String)
+         m_sDimension = value
+      End Set
+   End Property
+
+   Private m_dLastModifyDate As Date
+   Public Overloads Property dLastModifyDate As String
+      Get
+         Return m_dLastModifyDate
+      End Get
+      Set(value As String)
+         m_dLastModifyDate = value
+      End Set
+   End Property
+
+   Private m_bIsSelected As Boolean
+   Public Overrides Property IsSelected As Boolean
+      Get
+         Return m_bIsSelected
+      End Get
+      Set(value As Boolean)
+         m_bIsSelected = value
+         'm_sIconSource = "\Resources\EgtDialog\New.png"
+      End Set
+   End Property
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONTRUCTORS"
+
+   Sub New(InfoDir As FileInfo)
+
+      m_sName = InfoDir.Name
+      m_sDimension = String.Format("{0:#,##0.00}", InfoDir.Length / 1024) & " Kb"
+      m_dLastModifyDate = InfoDir.LastWriteTime.ToString("dd/MM/yyyy HH:mm:ss")
+      If InfoDir.Extension <> "" Then
+         m_sTypeItem = "File " & InfoDir.Extension.ToUpper()
+         m_sIconSource = "\Resources\EgtDialog\New.png"
+      Else
+         m_sTypeItem = ""
+      End If
+
+      NotifyPropertyChanged(NameOf(sName))
+      NotifyPropertyChanged(NameOf(sDimension))
+      NotifyPropertyChanged(NameOf(dLastModifyDate))
+      NotifyPropertyChanged(NameOf(sTypeItem))
+      NotifyPropertyChanged(NameOf(sIconSource))
+   End Sub
+
+#End Region    '  CONTRUCTORS
+
+End Class
+

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)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelFilledSolid.nCurveId)
          Case FilledSolidSelectionTypes.BOTH
@@ -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
@@ -706,6 +735,7 @@ Public Class FilledSolidPanelVM
          If NewGeomType = GDB_TY.CRV_COMPO Then
             If Not EgtCurveIsClosed(nNewEntityId) Then
                EgtCloseCurveCompo(nNewEntityId)
+               m_bEscOnLine2P = True
             End If
             EgtSetName(nNewEntityId, RIB_CURVE)
             ' resetto colore entita'
@@ -718,9 +748,15 @@ Public Class FilledSolidPanelVM
             ' lo seleziono
             SelFilledSolid = NewEntity
             NotifyPropertyChanged(NameOf(SelFilledSolid))
-            ' creo layer per estrusione
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            ' verifico se esiste gia' layer estrusione e lo svuoto
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, 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()
@@ -752,6 +788,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 +830,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 +864,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 +890,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 +916,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 +940,7 @@ Public Class FilledSolidPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelFilledSolid))
       End If
+      SetFilledSolidListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete
@@ -904,7 +963,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 +988,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 +1017,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 +1046,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 +1074,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 +1099,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 +1124,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 +1149,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 +1174,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 +1199,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 +1224,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 +1249,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 +1274,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 +1302,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 +1326,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 +1366,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 +1377,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 +1394,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 +1413,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*"/>
@@ -82,18 +84,51 @@
                                 Style="{StaticResource ToolBar_SmallButton}"/>
                      </Grid>
                   </DataTemplate>
+                  <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
+                     <Grid Margin="0,1,2.5,1"
+                           IsEnabled="{Binding bIsActive}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <CheckBox Grid.Column="1"
+                                  IsChecked="{Binding bValue}"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  Margin="2.5,0,0,0"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromPart}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
                </ItemsControl.Resources>
             </ItemsControl>
          </ScrollViewer>
          <UniformGrid Grid.Row="1"
                       Rows="1"
                       Margin="0,2.5,0,0">
-            <Button Content="Ok"
-                    Command="{Binding Ok_Command}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="Cancel"
-                    Command="{Binding Cancel_Command}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+            <Button Command="{Binding Ok_Command}"
+                    IsDefault="True"
+                    Margin="0,0,2.5,0"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
+               <Image Source="\Resources\Common\Ok.png"
+                      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,34 @@ 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),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nFilledSolidId, nPartId),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nFilledSolidId, nPartId)})
+      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDWIDTH, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidCheckMachiningParam(MachiningParam.Params.AUXSOLIDSINFILLLINK, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDCOUNT, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETLEADPOINT, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSDENSITY, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSGRIDOVERLAP, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSDIRECTION, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETX, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETY, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nFilledSolidId, nPartId, Me),
+                                                          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,10 +195,18 @@ Public Class FilledSolidNumericMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nFilledSolidId As Integer, nPartId As Integer)
-      MyBase.New(Type)
+   Sub New(Type As Params, nFilledSolidId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
+         Case Params.AUXSOLIDSSTRANDWIDTH
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSSTRANDWIDTH, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSSTRANDWIDTH, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSSTRANDCOUNT
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSSTRANDCOUNT, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSSTRANDCOUNT, m_dPartValue)
+            m_bIsLen = False
          Case Params.AUXSOLIDSOVERLAP
             bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, m_dValue)
             EgtGetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, m_dPartValue)
@@ -194,6 +219,30 @@ Public Class FilledSolidNumericMachiningParam
             bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dValue)
             EgtGetInfo(nPartId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dPartValue)
             m_bIsLen = True
+         Case Params.AUXSOLIDSOFFSETLEADPOINT
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETLEADPOINT, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSOFFSETLEADPOINT, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSDENSITY
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSDENSITY, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSDENSITY, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSGRIDOVERLAP
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSGRIDOVERLAP, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSGRIDOVERLAP, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSDIRECTION
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSDIRECTION, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSDIRECTION, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSOFFSETX
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETX, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSOFFSETX, m_dPartValue)
+            m_bIsLen = True
+         Case Params.AUXSOLIDSOFFSETY
+            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETY, m_dValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSOFFSETY, m_dPartValue)
+            m_bIsLen = True
          Case Params.AUXSOLIDSCOASTINGLEN
             bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN, m_dValue)
             EgtGetInfo(nPartId, MAC_AUXSOLIDSCOASTINGLEN, m_dPartValue)
@@ -222,6 +271,18 @@ Public Class FilledSolidNumericMachiningParam
          sWriteValue = DoubleToString(m_dValue, 2)
       End If
       Select Case Type
+         Case Params.AUXSOLIDSSTRANDWIDTH
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSSTRANDWIDTH, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSSTRANDWIDTH)
+            End If
+         Case Params.AUXSOLIDSSTRANDCOUNT
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSSTRANDCOUNT, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSSTRANDCOUNT)
+            End If
          Case Params.AUXSOLIDSOVERLAP
             If bIsModifiedFromPart Then
                EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, sWriteValue)
@@ -240,6 +301,42 @@ Public Class FilledSolidNumericMachiningParam
             Else
                EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE)
             End If
+         Case Params.AUXSOLIDSOFFSETLEADPOINT
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETLEADPOINT, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETLEADPOINT)
+            End If
+         Case Params.AUXSOLIDSDENSITY
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSDENSITY, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSDENSITY)
+            End If
+         Case Params.AUXSOLIDSGRIDOVERLAP
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSGRIDOVERLAP, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSGRIDOVERLAP)
+            End If
+         Case Params.AUXSOLIDSDIRECTION
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSDIRECTION, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSDIRECTION)
+            End If
+         Case Params.AUXSOLIDSOFFSETX
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETX, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETX)
+            End If
+         Case Params.AUXSOLIDSOFFSETY
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETY, sWriteValue)
+            Else
+               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSOFFSETY)
+            End If
          Case Params.AUXSOLIDSCOASTINGLEN
             If bIsModifiedFromPart Then
                EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN, sWriteValue)
@@ -305,6 +402,7 @@ Public Class FilledSolidComboMachiningParam
          m_SelValue = value
          NotifyPropertyChanged(NameOf(SelValue))
          NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+         ManageDependencyParam()
       End Set
    End Property
 
@@ -324,15 +422,20 @@ Public Class FilledSolidComboMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
-      MyBase.New(Type)
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromRib As Boolean = False
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.AUXSOLIDSINFILL
-            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
-                                                     New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL_TYPE.NONE, "None"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.OFFSET, "Offset"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.ZIGZAG, "ZigZag"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.LINES, "Lines"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.GRID, "Grid"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.ZIGZAG_GRID, "Zigzag Grid"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.HONEYCOMB, "Honeycomb"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL_TYPE.HONEYCOMB_GRID, "Honeycomb Grid")})
             Dim nSelValue As Integer = 1
             bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSINFILL, nSelValue)
             If bReadFromRib Then
@@ -370,7 +473,7 @@ Public Class FilledSolidComboMachiningParam
          Else
             Select Case Type
                Case Params.AUXSOLIDSINFILL
-                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_INFILL.NONE)
+                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_INFILL_TYPE.NONE)
                   m_SelValue = m_OrigSelValue
                Case Params.AUXSOLIDSSTRANDORDER
                   m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_STRANDORDERS.OUTTOIN)
@@ -438,4 +541,95 @@ Public Class FilledSolidComboMachiningParam
 #End Region    ' COMMANDS
 
 
+End Class
+
+Public Class FilledSolidCheckMachiningParam
+   Inherits CheckMachiningParam
+
+   Public Overrides Property bValue As Boolean
+      Get
+         Return m_bValue
+      End Get
+      Set(value As Boolean)
+         m_bValue = value
+         NotifyPropertyChanged(NameOf(bValue))
+         NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+      End Set
+   End Property
+
+   Protected m_bPartValue As Boolean
+   Public ReadOnly Property bPartValue As Boolean
+      Get
+         Return m_bPartValue
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsModifiedFromPart As Boolean
+      Get
+         Return m_bValue <> m_bPartValue
+      End Get
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdResetParam As ICommand
+
+   Sub New(Type As Params, nAuxSolidId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, Cathegory)
+      Dim bReadFromPart As Boolean = False
+      Select Case Type
+         Case Params.AUXSOLIDSINFILLLINK
+            bReadFromPart = EgtGetInfo(nAuxSolidId, MAC_AUXSOLIDSINFILLLINK, m_bValue)
+            EgtGetInfo(nPartId, MAC_AUXSOLIDSINFILLLINK, m_bPartValue)
+      End Select
+      m_bOrigValue = m_bValue
+      If Not bReadFromPart Then
+         m_bValue = m_bPartValue
+         m_bOrigValue = m_bPartValue
+      End If
+   End Sub
+
+   Friend Sub WriteParamInRib(nAuxSolidId As Integer)
+      Select Case Type
+         Case Params.AUXSOLIDSINFILLLINK
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nAuxSolidId, MAC_AUXSOLIDSINFILLLINK, If(m_bValue, 1, 0))
+            Else
+               EgtRemoveInfo(nAuxSolidId, MAC_AUXSOLIDSINFILLLINK)
+            End If
+      End Select
+   End Sub
+
+   Friend Overrides Sub SaveParam()
+      m_bOrigValue = m_bValue
+   End Sub
+
+   Friend Overrides Sub ResetParam()
+      m_bValue = m_bOrigValue
+      NotifyPropertyChanged(NameOf(bValue))
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "ResetParam"
+
+   Public ReadOnly Property ResetParam_Command As ICommand
+      Get
+         If m_cmdResetParam Is Nothing Then
+            m_cmdResetParam = New Command(AddressOf ResetParamCmd)
+         End If
+         Return m_cmdResetParam
+      End Get
+   End Property
+
+   Public Sub ResetParamCmd()
+      m_bValue = m_bPartValue
+      NotifyPropertyChanged(NameOf(bValue))
+      NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+   End Sub
+
+#End Region    ' ResetParam
+
+#End Region    ' COMMANDS
+
+
 End Class

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,19 @@
       <DependentUpon>DispositionPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="DispositionPanel\DispositionPanelVM.vb" />
+    <Compile Include="EgtColorPicker\EgtHexagon.vb" />
+    <Compile Include="EgtMessageBox\EgtMessageBoxV.xaml.vb">
+      <DependentUpon>EgtMessageBoxV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="EgtMessageBox\EgtMessageBoxVM.vb" />
+    <Compile Include="EgtColorPicker\EgtColorPickerV.xaml.vb">
+      <DependentUpon>EgtColorPickerV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="EgtColorPicker\EgtColorPickerVM.vb" />
+    <Compile Include="EgtManageFileDialog\EgtManageFileDialogV.xaml.vb">
+      <DependentUpon>EgtManageFileDialogV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="EgtManageFileDialog\EgtManageFileDialogVM.vb" />
     <Compile Include="FilledSolidPanel\FilledSolidPanelV.xaml.vb">
       <DependentUpon>FilledSolidPanelV.xaml</DependentUpon>
     </Compile>
@@ -164,6 +175,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 +219,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 +375,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="EgtMessageBox\EgtMessageBoxV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="EgtColorPicker\EgtColorPickerV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="EgtManageFileDialog\EgtManageFileDialogV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="FilledSolidPanel\FilledSolidPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -369,6 +399,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 +455,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 +629,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 +841,60 @@
   <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>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Restore.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\New.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Folder.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 &
-                         sDuplicatedMaterialList & Environment.NewLine &
-                         "Please modify the names of these machining and then retry to import the materials.")
+         'MessageBox.Show("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.")
+         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 &
-                      sMaterialList & Environment.NewLine &
-                      "Import successfully completed.")
+      'MessageBox.Show("List of the materials:" & Environment.NewLine &
+      '              sMaterialList & Environment.NewLine &
+      '              "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)
-         Else
+            'MessageBox.Show(sResult)
+            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) Then
-            Dim MySimul As SimulationVM = Map.refSimulationPanelVM.MySimul
-            MySimul.SetMachLook(m_nSelMachView)
+         If Not IsNothing(Map.refSimulationPanelVM) AndAlso Not IsNothing(Map.refSimulationPanelVM.MySimul) Then
+            Map.refSimulationPanelVM.MySimul.SetMachLook(value + 1)
             ' aggiorno lo stato della macchina e la sua visualizzazione
-            EgtSetMachineLook(MySimul.GetMachLook())
-            WriteMainPrivateProfileString(S_SIMUL, K_MACHVIEWMODE, m_nSelMachView)
+            EgtSetMachineLook(Map.refSimulationPanelVM.MySimul.GetMachLook())
+            WriteMainPrivateProfileString(S_SIMUL, K_MACHVIEWMODE, value + 1)
          End If
          EgtDraw()
       End Set
    End Property
-   Friend Sub SetSelViewSlider(value As MCH_LOOK)
-      m_nSelMachView = value
+   Friend Sub RefreshSelViewSlider()
       NotifyPropertyChanged(NameOf(ghSelMachView))
    End Sub
 
    Sub New()
-      ' leggo vista macchina da ini e la imposto
-      Dim DefaultMachViewMode As Integer = GetMainPrivateProfileInt(S_SIMUL, K_MACHVIEWMODE, 3)
-      SetSelViewSlider(DefaultMachViewMode)
+      ' Creo riferimento a questa classe in OmagOFFICEMap
+      Map.SetRefMachineViewPanelVM(Me)
    End Sub
 
 End Class

Icarus/MachiningDb/MachiningDbV.xaml

@@ -134,29 +134,45 @@
                            </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*"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
-                                    <TextBox Grid.Column="1"
-                                             Text="{Binding sValue}"
-                                             Margin="2.5,0,0,0"
-                                             Style="{StaticResource ParameterList_TextBox}"/>
+                                    <StackPanel Orientation="Horizontal">
+                                       <TextBlock Text="{Binding sName, Mode=OneWay}"
+                                                  Margin="0,0,2.5,0"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                       <TextBlock Text=" (BETA)"
+                                                  Margin="0,0,2.5,0"
+                                                  Foreground="Red"
+                                                  Visibility="{Binding IsBeta_Visibility}"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                    </StackPanel>
+                                    <EgtWPFLib5:EgtTextBox2 Grid.Column="1"
+                                                            Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
+                                                            Margin="2.5,0,0,0"
+                                                            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*"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
+                                    <StackPanel Orientation="Horizontal">
+                                       <TextBlock Text="{Binding sName, Mode=OneWay}"
+                                                  Margin="0,0,2.5,0"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                       <TextBlock Text=" (BETA)"
+                                                  Margin="0,0,2.5,0"
+                                                  Foreground="Red"
+                                                  Visibility="{Binding IsBeta_Visibility}"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                    </StackPanel>
                                     <ComboBox Grid.Column="1"
                                               ItemsSource="{Binding ValueList}"
                                               SelectedItem="{Binding SelValue}"
@@ -167,14 +183,22 @@
                               </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*"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
+                                    <StackPanel Orientation="Horizontal">
+                                       <TextBlock Text="{Binding sName, Mode=OneWay}"
+                                                  Margin="0,0,2.5,0"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                       <TextBlock Text=" (BETA)"
+                                                  Margin="0,0,2.5,0"
+                                                  Foreground="Red"
+                                                  Visibility="{Binding IsBeta_Visibility}"
+                                                  Style="{StaticResource ParameterList_TextBlock}"/>
+                                    </StackPanel>
                                     <CheckBox Grid.Column="1"
                                               IsChecked="{Binding bValue}"
                                               HorizontalAlignment="Center"

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

@@ -75,13 +75,6 @@ Public Class MainWindowM
       End Get
    End Property
 
-   Private m_bAutoNestOption As Boolean = False
-   Friend ReadOnly Property AutoNestOption As Boolean
-      Get
-         Return m_bAutoNestOption
-      End Get
-   End Property
-
    Friend ReadOnly Property sVersion As String
       Get
          Return My.Application.Info.Version.Major.ToString() & "." &
@@ -189,14 +182,17 @@ Public Class MainWindowM
       Dim sKey As String = String.Empty
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
-      Dim sNestKey As String = ""
-      EgtUILib.GetPrivateProfileString(S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
-      'EgtSetNestKey(sNestKey)
-      ' Verifico abilitazione nesting automatico
-      m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
+      ' Impostazioni per chiave di rete
+      Dim bNetKey As Boolean = ( GetMainPrivateProfileInt( S_GENERAL, K_NETKEY, 0) = 1)
+      EgtSetNetHwKey( bNetKey)
+      Dim sLockId As String = ""
+      EgtUILib.GetPrivateProfileString( S_LICENCE, K_LOCKID, "", sLockId, sLicFile)
+      If Not String.IsNullOrEmpty( sLockId) Then
+         EgtSetLockId( sLockId)
+      End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5583, 2502, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5583, 2502, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5583, 2510, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5583, 2510, 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
@@ -111,7 +116,7 @@ Public Class MainWindowVM
                End If
                ' annullo trasparenza attivata durante edit rib
                If Not IsNothing(Map.refRibPanelVM.SelRib) Then
-                  EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
+                  'EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
                End If
             ElseIf Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.SHELLNUMBER Then
                ' cancello eventuali layer di modifica
@@ -127,7 +132,7 @@ Public Class MainWindowVM
                End If
                ' annullo trasparenza attivata durante edit rib
                If Not IsNothing(Map.refShellNumberPanelVM.SelShellNumber) Then
-                  EgtSetAlpha(Map.refShellNumberPanelVM.SelShellNumber.nExtrusionId, 100)
+                  'EgtSetAlpha(Map.refShellNumberPanelVM.SelShellNumber.nExtrusionId, 100)
                End If
             End If
          End If
@@ -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"
-                    Command="{Binding Ok_Command}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="Cancel"
-                    Command="{Binding Cancel_Command}"
+            <Button Command="{Binding Ok_Command}"
+                    IsDefault="True"
+                    Margin="0,0,2.5,0"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
+               <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: AssemblyFileVersion("2.5.3.1")>
+<Assembly: AssemblyVersion("2.5.10.1")>
+<Assembly: AssemblyFileVersion("2.5.10.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
 
@@ -759,15 +759,19 @@ Public Class OptionWindowVM
          End If
       Next
       ' Creo dialogo colori
-      Dim ColorDlg As New System.Windows.Forms.ColorDialog
-      ColorDlg.FullOpen = True
-      ColorDlg.CustomColors = nCustomColors.ToArray()
-      ColorDlg.Color = Col.ToColor()
+      'Dim ColorDlg As New System.Windows.Forms.ColorDialog
+      'ColorDlg.FullOpen = True
+      'ColorDlg.CustomColors = nCustomColors.ToArray()
+      'ColorDlg.Color = Col.ToColor()
+      Dim ColorDlg As New EgtColorPickerV(Application.Current.MainWindow, New EgtColorPickerVM()) With {
+         .CustomColors = nCustomColors.ToArray(),
+         .Color = Col.ToColor()
+      }
       ' Visualizzo dialogo
       If ColorDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return False
-      ' Recupero colore scelto
+      'Recupero colore scelto
       NewCol.FromColor(ColorDlg.Color)
-      ' Salvo eventuali modifiche ai colori custom
+      ''Salvo eventuali modifiche ai colori custom
       sCustomColors = ""
       For Each Color In ColorDlg.CustomColors
          sCustomColors &= Color.ToString() & ","
@@ -953,31 +957,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
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
+         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
-         Not My.Computer.FileSystem.FileExists( Path.Combine( sTempDir, sMachName, sMachName & ".mlde")) Then
+      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
          ' 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 +999,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
-            My.Computer.FileSystem.DeleteDirectory( sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir) Then
+            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)
-            MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
+            EgtOutLog(sKo)
+            '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( sMachDir & "\Tools") Then
-                My.Computer.FileSystem.DeleteDirectory( sMachDir & "\Tools", FileIO.DeleteDirectoryOption.DeleteAllContents)
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\Tools") Then
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\Tools") Then
+               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 +1044,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
-         '   ' Flag per sovrascrivere vecchio file BeamData.lua con nuovo
-         '   Dim bBeamDataExists As Boolean = False
-         '   Const sBeamData As String = "\BeamData.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 & "\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
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir & "\CustomData") Then
+            If My.Computer.FileSystem.DirectoryExists(sMachDir & "\CustomData") Then
+               My.Computer.FileSystem.DeleteDirectory(sMachDir & "\CustomData", FileIO.DeleteDirectoryOption.DeleteAllContents)
+            End If
+            My.Computer.FileSystem.CopyDirectory(sBackupDir & "\CustomData", sMachDir & "\CustomData", True)
+         End If
       End If
       'La macchina "{0}" è stata aggiornata con successo.
       Dim sOk As String = String.Format(EgtMsg(6530), sMachName)
-      EgtOutLog( sOk)
-      MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
+      EgtOutLog(sOk)
+      '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 +1103,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 +1113,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
@@ -1256,10 +1227,15 @@ Public Class LayerColor
          End If
       Next
       ' Creo dialogo colori
-      Dim ColorDlg As New System.Windows.Forms.ColorDialog
-      ColorDlg.FullOpen = True
-      ColorDlg.CustomColors = nCustomColors.ToArray()
-      ColorDlg.Color = Col.ToColor()
+      'Dim ColorDlg As New System.Windows.Forms.ColorDialog
+      'ColorDlg.FullOpen = True
+      'ColorDlg.CustomColors = nCustomColors.ToArray()
+      'ColorDlg.Color = Col.ToColor()
+      ' Visualizzo dialogo
+      Dim ColorDlg As New EgtColorPickerV(Application.Current.MainWindow, New EgtColorPickerVM()) With {
+         .CustomColors = nCustomColors.ToArray(),
+         .Color = Col.ToColor()
+      }
       ' Visualizzo dialogo
       If ColorDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return False
       ' Recupero colore scelto

Icarus/ProjManager/ProjManagerVM.vb

@@ -150,6 +150,27 @@ Public Class ProjManagerVM
    ''' </summary>
    Public Sub NewProjectCmd()
       NewProject(True)
+      'Dim x As New OpenFileDialog()
+      'x.ShowDialog()
+
+      Dim sDir As String = "C:\EgtData\Test3dPrinting"
+      Dim od As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+         .Title = "Open",
+         .Filter = "Icarus project(*.icrs)|*.icrs" &
+                   "|New geometry EgalTech(*.nge)|*.nge",
+         .FileName = "New.icrs",
+         .FilterIndex = 1,
+         .InitialDirectory = sDir}
+      od.ShowDialog()
+      Dim sFilePath As String = od.FileName
+
+      'Dim save As New EgtSaveDialogV(Application.Current.MainWindow, New EgtSaveDialogVM()) With {
+      '   .Title = "Save",
+      '   .Filter = "Icarus project(*.icrs)|*.icrs",
+      '   .FileName = "New.icrs",
+      '   .InitialDirectory = sDir}
+      'save.ShowDialog()
+      'Dim sFilePath As String = save.FileName
    End Sub
 
    Friend Sub NewProject(bDialog As Boolean)
@@ -193,23 +214,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
-         ' 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
+      Return Map.refSceneHostVM.OpenProject(sFilePath)
    End Function
 
 #End Region ' OpenCommand
@@ -382,7 +391,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 +403,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 +499,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}"
-                               IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
-                               FontSize="40"
-                               GroupName="ReferenceRadio"
-                               Margin="2.5,2.5,2.5,2.5"
-                               Style="{StaticResource OptionPanel_NestingToggleButton}"/>
+                  <PrintApp:CheckedImageRadioButton IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
+                                                    ImageSource="{Binding sText}"
+                                                    CheckedImageSource="{Binding sSelText}"
+                                                    FontSize="40"
+                                                    GroupName="ReferenceRadio"
+                                                    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
 
@@ -624,7 +641,7 @@ Public Class RibPanelVM
       ' attivo modifiche su scena
       Map.refSceneHostVM.MainScene.ResetStatus()
       ' rendo traspanete estrusione
-      EgtSetAlpha(m_SelRib.nExtrusionId, 50)
+      'EgtSetAlpha(m_SelRib.nExtrusionId, 50)
       ' seleziono percorso corrente
       EgtDeselectAll()
       Select Case RibSelectionType
@@ -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)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelRib.nCurveId)
          Case RibSelectionTypes.BOTH
@@ -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
@@ -667,12 +692,12 @@ Public Class RibPanelVM
             ' seleziono nuova estrusione
             EgtSelectObj(m_SelRib.nExtrusionId)
             ' ripristino trasparenza estrusione
-            EgtSetAlpha(m_SelRib.nExtrusionId, 100)
+            'EgtSetAlpha(m_SelRib.nExtrusionId, 100)
             EgtDraw()
             ' rimetto la selezione scena a null
             Map.refSceneHostVM.MainScene.SetStatusNull()
          Case Controller.CMD.MOVE, Controller.CMD.ROTATE
-            EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
+            ' EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
             ' seleziono nuova estrusione
             EgtSelectObj(m_SelRib.nExtrusionId)
             EgtDraw()
@@ -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
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            ' verifico se esiste gia' layer estrusione e lo svuoto
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, 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,11 +51,13 @@ 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
-      Dim ParamList As New List(Of MachiningParam.Params)({MachiningParam.Params.RIBSTYPE,
+      Dim ParamList As New List(Of MachiningParam.Params)({MachiningParam.Params.RIBSSTRANDWIDTH,
+                                                           MachiningParam.Params.RIBSTYPE,
                                                            MachiningParam.Params.RIBSOVERLAP,
                                                            MachiningParam.Params.RIBSSTRANDCOUNT,
                                                            MachiningParam.Params.RIBSLINK,
@@ -70,9 +72,9 @@ Public Class CopyFromWndVM
                                                            MachiningParam.Params.RIBSLEADOUTWIPEDIR})
       For Each Param In ParamList
          Select Case Map.refRibPanelVM.SelRib.Type
-            'Case RibEntity.RibTypes.FROMDRAW
-            '   CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nCurveId)
-            '   CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nExtrusionId)
+            Case RibEntity.RibTypes.FROMDRAW
+               CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nCurveId)
+               CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nExtrusionId)
             Case RibEntity.RibTypes.FROMIMPORT
                CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nExtrusionId)
          End Select
@@ -98,11 +100,14 @@ Public Class CopyFromWndVM
             Else
                RibTypeParam.SelValue = RibTypeParam.PartSelValue
             End If
-         Case MachiningParam.Params.RIBSOVERLAP, MachiningParam.Params.RIBSSTRANDCOUNT, MachiningParam.Params.RIBSLEADINLEN, MachiningParam.Params.RIBSLEADOUTLEN,
+         Case MachiningParam.Params.RIBSSTRANDWIDTH, MachiningParam.Params.RIBSOVERLAP, MachiningParam.Params.RIBSSTRANDCOUNT, MachiningParam.Params.RIBSLEADINLEN, MachiningParam.Params.RIBSLEADOUTLEN,
               MachiningParam.Params.RIBSLEADOUTCOASTING, MachiningParam.Params.RIBSLEADOUTWIPE, MachiningParam.Params.RIBSLEADOUTWIPEDIR
             Dim RibTypeParam As RibNumericMachiningParam = Nothing
             Dim dRibParam As Double = 0
             Select Case Type
+               Case MachiningParam.Params.RIBSSTRANDWIDTH
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSSTRANDWIDTH)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSSTRANDWIDTH, dRibParam)
                Case MachiningParam.Params.RIBSOVERLAP
                   RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSOVERLAP)
                   bRead = EgtGetInfo(nFromId, MAC_RIBSOVERLAP, dRibParam)

Icarus/RibParamPanel/RibParamPanelV.xaml

@@ -114,15 +114,25 @@
          <UniformGrid Grid.Row="1"
                       Rows="1"
                       Margin="0,2.5,0,0">
-            <Button Content="Ok"
-                    Command="{Binding Ok_Command}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="Cancel"
-                    Command="{Binding Cancel_Command}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="Copy From"
-                    Command="{Binding CopyFrom_Command}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+            <Button Command="{Binding Ok_Command}"
+                    Margin="0,0,2.5,0"
+                    Style="{StaticResource RightPanel_HalfRound_Button}">
+               <Image Source="\Resources\Common\Ok.png"
+                      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>
+            <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,20 @@ Public Class RibParamPanelVM
 
       m_Type = Cathegories.RIBS
       m_sName = "Ribs"
-      m_MachiningParamList = New List(Of MachiningParam)({New RibComboMachiningParam(MachiningParam.Params.RIBSTYPE, nRibId, nPartId),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nRibId, nPartId),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLINK, nRibId, nPartId),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nRibId, nPartId),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nRibId, nPartId),
-                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nRibId, nPartId),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nRibId, nPartId),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nRibId, nPartId),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nRibId, nPartId),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nRibId, nPartId)})
+      m_MachiningParamList = New List(Of MachiningParam)({New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDWIDTH, nRibId, nPartId, Me),
+                                                          New RibComboMachiningParam(MachiningParam.Params.RIBSTYPE, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId, Me),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLINK, nRibId, nPartId, Me),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId, Me),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nRibId, nPartId, Me),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nRibId, nPartId, Me),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nRibId, nPartId, Me)})
       NotifyPropertyChanged(NameOf(MachiningParamList))
       NotifyPropertyChanged(NameOf(sName))
    End Sub
@@ -135,6 +136,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,14 +227,18 @@ Public Class RibNumericMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
-      MyBase.New(Type)
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromPart As Boolean = False
       Select Case Type
+         Case Params.RIBSSTRANDWIDTH
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSSTRANDWIDTH, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSSTRANDWIDTH, m_dPartValue)
+            m_bIsLen = True
          Case Params.RIBSOVERLAP
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSOVERLAP, m_dValue)
             EgtGetInfo(nPartId, MAC_RIBSOVERLAP, m_dPartValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.RIBSSTRANDCOUNT
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSSTRANDCOUNT, m_dValue)
             EgtGetInfo(nPartId, MAC_RIBSSTRANDCOUNT, m_dPartValue)
@@ -288,6 +295,12 @@ Public Class RibNumericMachiningParam
          sWriteValue = DoubleToString(m_dValue, 2)
       End If
       Select Case Type
+         Case Params.RIBSSTRANDWIDTH
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSSTRANDWIDTH, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSSTRANDWIDTH)
+            End If
          Case Params.RIBSOVERLAP
             If bIsModifiedFromPart Then
                EgtSetInfo(nRibId, MAC_RIBSOVERLAP, sWriteValue)
@@ -420,8 +433,8 @@ Public Class RibComboMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
-      MyBase.New(Type)
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
+      MyBase.New(Type, Cathegory)
       Dim bReadFromRib As Boolean = False
       Dim bReadFromPart As Boolean = False
       Select Case Type
@@ -525,8 +538,8 @@ Public Class RibCheckMachiningParam
    ' Definizione comandi
    Private m_cmdResetParam As ICommand
 
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
-      MyBase.New(Type)
+   Sub New(Type As Params, nRibId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
+      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",
-               .Filter = "Licences (.lic)|*.lic",
-               .CheckFileExists = True,
-               .ValidateNames = True
-            }
+           .DefaultExt = ".lic",
+           .Filter = "Licences (.lic)|*.lic",
+           .CheckFileExists = True,
+           .ValidateNames = True
+        }
             If LicDlg.ShowDialog() = True Then
                ' Recupero il direttorio del file
                Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
@@ -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,96 @@ Public Class MySceneHostVM
          If Not String.IsNullOrWhiteSpace(sDir) Then
             sDir = Path.GetDirectoryName(sDir)
          End If
-         bOk = MainController.OpenProject(sDir)
-      Else
-         bOk = MainController.OpenProject(sFilePath, False)
+         'Dim OpenFileDialog As New Windows.Forms.OpenFileDialog With {
+         '   .Title = "Open",
+         '   .Filter = "Icarus project(*.icrs)|*.icrs" &
+         '             "|New geometry EgalTech(*.nge)|*.nge",
+         '   .FilterIndex = 1,
+         '   .InitialDirectory = sDir
+         '}
+         Dim OpenFileDialog As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+            .Title = "Open",
+            .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
-      Map.refTopPanelVM.SelPage = Pages.NULL
-   End Sub
+      Return bOk
+   End Function
 
-   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()
-         Return
+         bOk = SaveAsProject()
+      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")
+      Dim sDir As String = 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
+      ' 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)
+      '}
+      Dim SaveFileDialog As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+         .Title = "Save",
+         .Filter = "Icarus project(*.icrs)|*.icrs",
+         .FileName = sFile,
+         .InitialDirectory = sDir
+      }
+      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()
-      ' eseguo
+   Public Overrides Function InsertProject() As Boolean
       ' Recupero cartella dell'ultimo progetto aperto
       Dim sDir As String = MainController.GetCurrFile()
       If String.IsNullOrWhiteSpace(sDir) Then
@@ -313,7 +373,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 +387,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 +410,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 +436,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 +484,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 +507,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 +543,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 +566,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 +614,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 +637,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 +685,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()
-      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()
+   Public Overrides Function ExportProject() As Boolean
       ' Reset controller e scena
       MainController.ResetStatus()
       'Assegnazione nome file con dialogo
@@ -636,18 +700,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)
-   End Sub
+      Return MainController.ExportProject(SaveFileDialog.FileName, False)
+   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 +721,8 @@ Public Class MySceneHostVM
             EgtResetCurrPartLayer()
          End If
       End If
-   End Sub
+      Return bOk
+   End Function
 
 #End Region    ' ProjectManager
 
@@ -950,33 +1016,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 +1044,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 +1074,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 +1087,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 +1111,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 +1162,7 @@ Public Class MySceneHostVM
 
       '  aggiorno tempo e massa
       Map.refSliceManagerVM.UpdateTimeAndMass()
+      Map.refSliceManagerVM.UpdateDimensions()
 
       Map.refSliderManagerVM.SetLayerIndexToMax()
 
@@ -1142,7 +1197,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 +1206,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 +1225,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 +1239,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 +1510,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 +1594,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 +1679,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 +1764,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)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWEXTRUSION)
+            If nNewExtrusionLayerId = GDB_ID.NULL Then
+               nNewExtrusionLayerId = EgtCreateGroup(m_nPartId)
+               EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            Else
+               EgtEmptyGroup(nNewExtrusionLayerId)
+            End If
             EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
             EgtSelectObj(m_SelShellNumber.nCurveId)
          Case ShellNumberSelectionTypes.BOTH
@@ -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
@@ -711,6 +740,7 @@ Public Class ShellNumberPanelVM
          If NewGeomType = GDB_TY.CRV_COMPO Then
             If Not EgtCurveIsClosed(nNewEntityId) Then
                EgtCloseCurveCompo(nNewEntityId)
+               m_bEscOnLine2P = True
             End If
             EgtSetName(nNewEntityId, RIB_CURVE)
             ' resetto colore entita'
@@ -723,9 +753,15 @@ Public Class ShellNumberPanelVM
             ' lo seleziono
             SelShellNumber = NewEntity
             NotifyPropertyChanged(NameOf(SelShellNumber))
-            ' creo layer per estrusione
-            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
-            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
+            ' verifico se esiste gia' layer estrusione e lo svuoto
+            Dim nNewExtrusionLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, 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()
@@ -757,6 +793,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 +835,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 +870,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 +896,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 +922,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 +946,7 @@ Public Class ShellNumberPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelShellNumber))
       End If
+      SetShellNumberListIsEnabled(True)
    End Sub
 
 #End Region    ' Delete
@@ -909,7 +969,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 +994,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 +1023,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 +1052,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 +1080,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 +1105,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 +1130,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 +1155,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 +1180,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 +1205,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 +1230,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 +1255,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 +1280,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 +1308,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 +1332,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 +1372,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 +1383,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 +1400,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 +1419,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),
-                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nShellNumberId, nPartId),
-                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nShellNumberId, nPartId),
-                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, nShellNumberId, nPartId)})
+      m_MachiningParamList = New List(Of MachiningParam)({New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nShellNumberId, nPartId, Me),
+                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRCOASTING, nShellNumberId, nPartId, Me),
+                                                          New ShellNumberNumericMachiningParam(MachiningParam.Params.SHELLNBRWIPE, nShellNumberId, nPartId, Me),
+                                                          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)
-      MyBase.New(Type)
+   Sub New(Type As Params, nShellNumberId As Integer, nPartId As Integer, Cathegory As MachiningCathegory)
+      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>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <Border Margin="0,0,0,2.5" 
-           Style="{StaticResource Title_Border}">
-      <TextBlock Text="SIMULATION"
-                 Style="{StaticResource Title_TextBlock}"/>
-   </Border>
-   <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>
+   <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="Auto"/>
+   </Grid.ColumnDefinitions>
+   <PrintApp:MachineViewPanelV DataContext="{StaticResource MachineViewPanelVM}"
+                               Margin="0,0,5,0"/>
+   <Grid Grid.Column="1"
+         Width="310">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <Border Margin="0,0,0,2.5" 
+              Style="{StaticResource Title_Border}">
+         <TextBlock Text="SIMULATION"
+                    Style="{StaticResource Title_TextBlock}"/>
+      </Border>
+      <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}"
-                     Margin="2.5">
-            <UniformGrid Columns="3"
-                         Margin="0,2.5,0,2.5">
-               <Button Grid.Column="0" 
-                       Grid.Row="3"
-                       Command="{Binding StepCommand}"
-                       ToolTip="{Binding OneStepToolTip}" 
-                       Margin="2.5,0,2.5,0"
-                       Style="{StaticResource SimulationPanel_Button}">
-                  <Image Source="/Resources/SimulationPanel/PlayStep.png"
-                         Style="{StaticResource SimulationButton_Image}"/>
-               </Button>
-               <Button Grid.Column="1"
-                       Grid.Row="3"
-                       Command="{Binding PlayPauseCommand}" 
-                       ToolTip="{Binding PlayPauseToolTip}" 
-                       Margin="2.5,0,2.5,0"
-                       Style="{StaticResource SimulationPanel_Button}">
-                  <Image Source="{Binding PlayPauseImage}"
-                         Style="{StaticResource SimulationButton_Image}"/>
-               </Button>
-               <Button Grid.Column="2" Grid.Row="3"
-                       Command="{Binding StopCommand}"
-                       ToolTip="{Binding StopHomeToolTip}" 
-                       Margin="2.5,0,2.5,0"
-                       Style="{StaticResource SimulationPanel_Button}">
-                  <Image Source="/Resources/SimulationPanel/Stop.png"
-                         Style="{StaticResource SimulationButton_Image}"/>
-               </Button>
+            <StackPanel DataContext="{Binding MySimul}"
+                        Margin="2.5">
+               <UniformGrid Columns="3"
+                            Margin="0,2.5,0,2.5">
+                  <Button Grid.Column="0" 
+                          Grid.Row="3"
+                          Command="{Binding StepCommand}"
+                          ToolTip="{Binding OneStepToolTip}" 
+                          Margin="2.5,0,2.5,0"
+                          Style="{StaticResource SimulationPanel_Button}">
+                     <Image Source="/Resources/SimulationPanel/PlayStep.png"
+                            Style="{StaticResource SimulationButton_Image}"/>
+                  </Button>
+                  <Button Grid.Column="1"
+                          Grid.Row="3"
+                          Command="{Binding PlayPauseCommand}" 
+                          ToolTip="{Binding PlayPauseToolTip}" 
+                          Margin="2.5,0,2.5,0"
+                          Style="{StaticResource SimulationPanel_Button}">
+                     <Image Source="{Binding PlayPauseImage}"
+                            Style="{StaticResource SimulationButton_Image}"/>
+                  </Button>
+                  <Button Grid.Column="2" Grid.Row="3"
+                          Command="{Binding StopCommand}"
+                          ToolTip="{Binding StopHomeToolTip}" 
+                          Margin="2.5,0,2.5,0"
+                          Style="{StaticResource SimulationPanel_Button}">
+                     <Image Source="/Resources/SimulationPanel/Stop.png"
+                            Style="{StaticResource SimulationButton_Image}"/>
+                  </Button>
 
-            </UniformGrid>
-            <TextBlock Text="{Binding StatusMsg}" 
-                       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}"
+               </UniformGrid>
+               <TextBlock Text="{Binding StatusMsg}" 
+                          TextAlignment="Center" 
                           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:EgtTextBox Grid.Column="1"
-                                                  BorderThickness="0"
-                                                  Text="{Binding Value, UpdateSourceTrigger=Explicit}" 
-                                                  IsReadOnly="{Binding IsReadOnlyAxesValue}"
-                                                  IsEnabled="{Binding IsEnabledAxesValue}"
-                                                  Style="{StaticResource SimulationPanel_Axes_TextBox}">
-                           </EgtWPFLib5:EgtTextBox>
-                        </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>
+                          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"
+                             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)
-         Else
-            MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
+                'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+                EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+            Else
+                '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}"
-                 Visibility="{Binding Time_Visibility}"
-                 FontSize="35"
-                 Style="{StaticResource SliceManager_TextBlock}"/>
-      <TextBlock Grid.Row="1"
-                 Text="{Binding ghDimensions}"
-                 FontSize="18"
-                 Margin="0,0,0,5"
-                 Style="{StaticResource SliceManager_TextBlock}"/>
-      <TextBlock Grid.Row="2"
-                 Text="{Binding ghMass}"
-                 Visibility="{Binding Mass_Visibility}"
-                 FontSize="18"
-                 Margin="0,0,0,5"
-                 Style="{StaticResource SliceManager_TextBlock}"/>
+      <Grid HorizontalAlignment="Center"
+            Visibility="{Binding Time_Visibility}"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Image Source="\Resources\SliceManager\Time.png"
+                Height="25"
+                Width="25"
+                Margin="0,0,2.5,0"
+                Style="{StaticResource Button_Image}"/>
+         <TextBlock Grid.Column="1"
+                    Text="{Binding ghTime}"
+                    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
-         '   Map.refTopPanelVM.SelPage = PreviousPage
+         ' se ricalcolato slice attivo vista SliceToolpath e modo TillSelected 
+         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

@@ -20,23 +20,22 @@ Public Class SliderManagerVM
       End Get
       Set(value As Integer)
          If IsNothing(Map.refTopPanelVM.SelPart) Then Return
+         Dim DisableMgr As New DisableModifiedMgr
          Select Case m_nSelViewSlider
             Case ViewSliderType.ONLY_SELECTED
-               ' se diverso da nullo nascondo precedente
-               If Not IsNothing(Map.refTopPanelVM.SelPart) Then
-                  ' riporto vecchio strato a visualizzazione di tutti i solidi
-                  If m_nLayerIndex > 0 Then dLayerAdvancement = 100
-                  If m_nLayerIndex = 0 Then
-                     For Each Layer In Map.refTopPanelVM.SelPart.LayerList
-                        EgtSetStatus(Layer.nLayerId, GDB_ST.OFF)
-                     Next
-                  ElseIf m_nLayerIndex > 0 Then
-                     EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(m_nLayerIndex - 1).nLayerId, GDB_ST.OFF)
-                  End If
+               ' nascondo precedente
+               ' riporto vecchio strato a visualizzazione di tutti i solidi
+               If m_nLayerIndex > 0 Then dLayerAdvancement = 100
+               If m_nLayerIndex = 0 Then
+                  For Each Layer In Map.refTopPanelVM.SelPart.LayerList
+                     EgtSetStatus(Layer.nLayerId, GDB_ST.OFF)
+                  Next
+               ElseIf m_nLayerIndex > 0 Then
+                  EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(m_nLayerIndex - 1).nLayerId, GDB_ST.OFF)
                End If
                m_nLayerIndex = value
                ' se diverso da nullo visualizzo corrente
-               If Not IsNothing(Map.refTopPanelVM.SelPart) AndAlso m_nLayerIndex > 0 Then EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(m_nLayerIndex - 1).nLayerId, GDB_ST.ON_)
+               If m_nLayerIndex > 0 Then EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(m_nLayerIndex - 1).nLayerId, GDB_ST.ON_)
                ' porto barra nuovo strato a 100 
                If m_nLayerIndex > 0 Then SetLayerAdvancement(100)
             Case ViewSliderType.UNTIL_SELECTED
@@ -64,6 +63,7 @@ Public Class SliderManagerVM
                End If
                m_nLayerIndex = value
          End Select
+         DisableMgr.ReEnable()
          NotifyPropertyChanged(NameOf(ghShowValue))
          NotifyPropertyChanged(NameOf(ghValueIndex))
          NotifyPropertyChanged(NameOf(ghValueHeight))
@@ -71,47 +71,44 @@ Public Class SliderManagerVM
       End Set
    End Property
    Private Sub SetLayerIndex(value As Integer)
+      If IsNothing(Map.refTopPanelVM.SelPart) Then Return
+      Dim DisableMgr As New DisableModifiedMgr
       Select Case m_nSelViewSlider
          Case ViewSliderType.ONLY_SELECTED
-            If Not IsNothing(Map.refTopPanelVM.SelPart) Then
-               ' riporto vecchio strato a visualizzazione di tutti i solidi
-               If m_nLayerIndex > 0 AndAlso m_nLayerIndex < Map.refTopPanelVM.SelPart.LayerList.Count Then dLayerAdvancement = 100
-               For nLayerInd = 0 To Map.refTopPanelVM.SelPart.LayerList.Count - 1
-                  If nLayerInd = value - 1 Then
-                     EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.ON_)
-                  Else
-                     EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.OFF)
-                  End If
-               Next
-            End If
+            ' riporto vecchio strato a visualizzazione di tutti i solidi
+            If m_nLayerIndex > 0 AndAlso m_nLayerIndex < Map.refTopPanelVM.SelPart.LayerList.Count Then dLayerAdvancement = 100
+            For nLayerInd = 0 To Map.refTopPanelVM.SelPart.LayerList.Count - 1
+               If nLayerInd = value - 1 Then
+                  EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.ON_)
+               Else
+                  EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.OFF)
+               End If
+            Next
             m_nLayerIndex = value
          Case ViewSliderType.UNTIL_SELECTED
-            If Not IsNothing(Map.refTopPanelVM.SelPart) Then
-               ' riporto vecchio strato a visualizzazione di tutti i solidi
-               If m_nLayerIndex > 0 AndAlso m_nLayerIndex < Map.refTopPanelVM.SelPart.LayerList.Count Then dLayerAdvancement = 100
-               For nLayerInd = 0 To Map.refTopPanelVM.SelPart.LayerList.Count - 1
-                  If nLayerInd <= value - 1 Then
-                     EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.ON_)
-                  Else
-                     EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.OFF)
-                  End If
-               Next
-            End If
+            ' riporto vecchio strato a visualizzazione di tutti i solidi
+            If m_nLayerIndex > 0 AndAlso m_nLayerIndex < Map.refTopPanelVM.SelPart.LayerList.Count Then dLayerAdvancement = 100
+            For nLayerInd = 0 To Map.refTopPanelVM.SelPart.LayerList.Count - 1
+               If nLayerInd <= value - 1 Then
+                  EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.ON_)
+               Else
+                  EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.OFF)
+               End If
+            Next
             m_nLayerIndex = value
          Case ViewSliderType.FROM_SELECTED
-            If Not IsNothing(Map.refTopPanelVM.SelPart) Then
-               ' riporto vecchio strato a visualizzazione di tutti i solidi
-               If m_nLayerIndex > 0 AndAlso m_nLayerIndex < Map.refTopPanelVM.SelPart.LayerList.Count Then dLayerAdvancement = 100
-               For nLayerInd = 0 To Map.refTopPanelVM.SelPart.LayerList.Count - 1
-                  If nLayerInd >= value - 1 Then
-                     EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.ON_)
-                  Else
-                     EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.OFF)
-                  End If
-               Next
-            End If
+            ' riporto vecchio strato a visualizzazione di tutti i solidi
+            If m_nLayerIndex > 0 AndAlso m_nLayerIndex < Map.refTopPanelVM.SelPart.LayerList.Count Then dLayerAdvancement = 100
+            For nLayerInd = 0 To Map.refTopPanelVM.SelPart.LayerList.Count - 1
+               If nLayerInd >= value - 1 Then
+                  EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.ON_)
+               Else
+                  EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(nLayerInd).nLayerId, GDB_ST.OFF)
+               End If
+            Next
             m_nLayerIndex = value
       End Select
+      DisableMgr.ReEnable()
       NotifyPropertyChanged(NameOf(nLayerIndex))
       NotifyPropertyChanged(NameOf(ghShowValue))
       NotifyPropertyChanged(NameOf(ghValueIndex))
@@ -201,6 +198,8 @@ Public Class SliderManagerVM
          Return m_dLayerAdvancement
       End Get
       Set(value As Double)
+         If IsNothing(Map.refTopPanelVM.SelPart) Then Return
+         Dim DisableMgr As New DisableModifiedMgr
          Select Case m_nSelViewSlider
             Case ViewSliderType.ONLY_SELECTED
                Dim nTotSolid As Integer = 0
@@ -247,6 +246,7 @@ Public Class SliderManagerVM
                End If
                m_dLayerAdvancement = value
          End Select
+         DisableMgr.ReEnable()
          EgtDraw()
       End Set
    End Property
@@ -335,6 +335,7 @@ Public Class SliderManagerVM
          WriteMainPrivateProfileString(S_PRINTING3D, K_VIEWSLIDER, m_nSelViewSlider)
          ' ciclo tutti i layer per nasconderli/mostrarli
          If IsNothing(Map.refTopPanelVM.SelPart) OrElse IsNothing(Map.refTopPanelVM.SelPart.LayerList) Then Return
+         Dim DisableMgr As New DisableModifiedMgr
          Select Case m_nSelViewSlider
             Case ViewSliderType.ONLY_SELECTED
                For Each Layer In Map.refTopPanelVM.SelPart.LayerList
@@ -361,6 +362,7 @@ Public Class SliderManagerVM
                   End If
                Next
          End Select
+         DisableMgr.ReEnable()
          ' mostro/nascondo slider orizzontale
          m_LayerAdvancement_Visibility = If(m_nSelViewSlider = ViewSliderType.ONLY_SELECTED, Visibility.Visible, Visibility.Hidden)
          NotifyPropertyChanged(NameOf(LayerAdvancement_Visibility))
@@ -368,7 +370,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 +383,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"/>
-      <Grid Height="180"
-            Width="92"
-            VerticalAlignment="Bottom"
-            Margin="620,0,0,0">
-         <Image Source="/Resources/SplashScreen/LogoEgalware.png"
-                Height="180"
-                Width="92"
-                Stretch="UniformToFill"/>
-         <TextBlock Text="2022-2023"
-                    FontSize="12"
-                    FontFamily="/Resources/Fonts/#Roboto"
-                    HorizontalAlignment="Center"
-                    Margin="0,140,0,0"/>
-         
-      </Grid>
+                 Foreground="White"
+                 HorizontalAlignment="Center"
+                 Margin="591,140,0,0"/>
+      <!--<TextBlock Text="2022-2023"
+                 FontSize="6"
+                 FontFamily="/Resources/Fonts/#Roboto"
+                 HorizontalAlignment="Right"
+                 VerticalAlignment="Bottom"
+                 Margin="0,0,254,60"/>-->
    </Grid>
 </Window>