- Introdotto manuale sotto forma di indice interattivo

2023-04-14 11:58:29 +02:00
49 changed files with 996 additions and 1519 deletions
@@ -3,7 +3,6 @@
   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"
@@ -90,7 +89,6 @@
   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"
@@ -110,8 +108,6 @@
   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"
@@ -131,39 +127,15 @@
   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"
@@ -21,7 +21,6 @@ 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"

@@ -26,7 +26,6 @@ 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"
@@ -123,6 +122,8 @@ Public Module ConstIni
   Public Const K_CLR_MACHSTART As String = "MachStart"
   Public Const K_CLR_OTHERS As String = "Others"

+   Public Const S_MINMAX As String = "MinMax"
+
   Public Const S_MRUFILES As String = "MruFiles"
   Public Const S_MRUIMPORTFILES As String = "MruImportFiles"

@@ -1,6 +1,31 @@
 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"
@@ -10,8 +35,5 @@
   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
@@ -111,7 +111,6 @@ 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
@@ -129,7 +128,6 @@ 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
@@ -211,6 +209,7 @@ Public Class CurrMachiningCathegory
                                                                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.FLOORCOUNT, 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),
@@ -220,17 +219,15 @@ Public Class CurrMachiningCathegory
                                                                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)})
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.SCREWBACK, nPartId, nIndex, bForceFromDb, Me)})
         Case Cathegories.LINK
            m_sName = "Shell"
-            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),
+            m_MachiningParamList = New List(Of MachiningParam)({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 CurrNumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, 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),
@@ -241,8 +238,7 @@ Public Class CurrMachiningCathegory
                                                                'New CurrNumericMachiningParam(MachiningParam.Params.WIPEDIR, nPartId, nIndex, bForceFromDb, Me)})
         Case Cathegories.RIBS
            m_sName = "Ribs"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDWIDTH, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrComboMachiningParam(MachiningParam.Params.RIBSTYPE, nPartId, nIndex, bForceFromDb, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({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),
@@ -265,47 +261,20 @@ Public Class CurrMachiningCathegory
                                                                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.AUXSOLIDSSTRANDWIDTH, nPartId, nIndex, bForceFromDb, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, 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}
+            For Each Param In {MachiningParam.Params.LINKTYPE, MachiningParam.Params.LEADIN}
               Dim MachiningParam As ComboMachiningParam = MachiningParamList.FirstOrDefault(Function(z) z.Type = Param)
               MachiningParam.ManageDependencyParam()
            Next
@@ -319,19 +288,6 @@ Public Class CurrMachiningCathegory
               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

@@ -364,32 +320,14 @@ Public Class CurrNumericMachiningParam
            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
+            If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
+               m_dValue = dTempValue
            End If
         Else
            m_dValue = dTempValue
         End If
         NotifyPropertyChanged(NameOf(sValue))
         NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
-         ManageDependencyParam()
      End Set
   End Property

@@ -437,9 +375,6 @@ 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
@@ -491,12 +426,6 @@ Public Class CurrNumericMachiningParam
         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
@@ -530,39 +459,15 @@ 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
@@ -575,66 +480,27 @@ 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.G0FEED, Params.G0FEEDZ, Params.LINKZUP, Params.TOOLDIAM, Params.FLOWRATE_PC, Params.PREFLOWDELAY, Params.POSTFLOWDELAY, Params.SCREWBACK, Params.SLICINGHEIGHT
+                 Params.FLOORCOUNT, Params.G0FEED, Params.G0FEEDZ, Params.LINKZUP, Params.TOOLDIAM, Params.FLOWRATE_PC, Params.PREFLOWDELAY, Params.POSTFLOWDELAY, Params.SCREWBACK
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.LINKPARAM, Params.INNERSHELLWIDTH, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST,
+            Case Params.LINKPARAM, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST,
                 Params.LEADOUTTANGDIST, Params.LEADOUTORTHODIST, Params.COASTINGLEN, Params.COASTINGFEED_PC,
                 Params.WIPELEN, Params.WIPEFEED_PC  ' Params.WIPEDIR
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.LINK).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.RIBSSTRANDWIDTH, Params.RIBSOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION,
+            Case 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.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
+            Case Params.AUXSOLIDSOVERLAP, Params.AUXSOLIDSLINKPARAM, Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE,
+                 Params.AUXSOLIDSCOASTINGLEN, Params.AUXSOLIDSWIPELEN, Params.AUXSOLIDSWIPEDIR
               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
@@ -673,8 +539,6 @@ 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
@@ -709,10 +573,6 @@ Public Class CurrNumericMachiningParam
            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
@@ -735,28 +595,12 @@ 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
@@ -765,28 +609,6 @@ 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

@@ -989,14 +811,9 @@ 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_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")})
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL.NONE, "None"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
            Dim nSelValue As Integer = 0
            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSINFILL, nSelValue)
            m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
@@ -1019,28 +836,6 @@ 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
@@ -1054,8 +849,6 @@ 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
@@ -1094,12 +887,6 @@ 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

@@ -1189,10 +976,6 @@ 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
@@ -1202,10 +985,6 @@ 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
@@ -1232,10 +1011,6 @@ 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

@@ -54,16 +54,9 @@
                                       <ColumnDefinition Width="1*"/>
                                       <ColumnDefinition Width="Auto"/>
                                    </Grid.ColumnDefinitions>
-                                    <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>
+                                    <TextBlock Text="{Binding sName}"
+                                               Margin="0,0,2.5,0"
+                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                    <EgtWPFLib5:EgtTextBox2 Grid.Column="1"
                                                            Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
                                                            Margin="2.5,0,2.5,0"
@@ -86,16 +79,9 @@
                                       <ColumnDefinition Width="1*"/>
                                       <ColumnDefinition Width="Auto"/>
                                    </Grid.ColumnDefinitions>
-                                    <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>
+                                    <TextBlock Text="{Binding sName}"
+                                               Margin="0,0,2.5,0"
+                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                    <ComboBox Grid.Column="1"
                                              ItemsSource="{Binding ValueList}"
                                              SelectedItem="{Binding SelValue}"
@@ -121,16 +107,9 @@
                                       <ColumnDefinition Width="1*"/>
                                       <ColumnDefinition Width="Auto"/>
                                    </Grid.ColumnDefinitions>
-                                    <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>
+                                    <TextBlock Text="{Binding sName}"
+                                               Margin="0,0,2.5,0"
+                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                    <CheckBox Grid.Column="1"
                                              IsChecked="{Binding bValue}"
                                              HorizontalAlignment="Center"
@@ -35,10 +35,6 @@ 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
@@ -353,8 +349,6 @@ 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
@@ -364,8 +358,6 @@ 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
@@ -374,17 +366,11 @@ Public Class FilledSolidPanelVM
      End Get
   End Property

-   Private m_FilledSolidList_IsEnabled As Boolean = False
   Public ReadOnly Property FilledSolidList_IsEnabled As Boolean
      Get
-         Return If(m_FilledSolidList.Count > 0, m_FilledSolidList_IsEnabled, False)
+         Return Not m_bMachParam_IsChecked
      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

@@ -402,8 +388,6 @@ Public Class FilledSolidPanelVM
      End Get
   End Property

-   Private m_bEscOnLine2P As Boolean = False
-
 #Region "Tooltip"

   Public ReadOnly Property Import_ToolTip As String
@@ -587,8 +571,6 @@ Public Class FilledSolidPanelVM
         SelFilledSolid = m_FilledSolidList(0)
         NotifyPropertyChanged(NameOf(SelFilledSolid))
      End If
-      ' attivo lista filled solid
-      SetFilledSolidListIsEnabled(True)
      Map.refSceneHostVM.MainScene.SetStatusNull()
   End Sub

@@ -624,13 +606,8 @@ Public Class FilledSolidPanelVM
            EgtSelectObj(m_SelFilledSolid.nCurveId)
         Case FilledSolidSelectionTypes.EXTRUSION
            ' creo layer per estrusione
-            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
+            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
            EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
            EgtSelectObj(m_SelFilledSolid.nCurveId)
         Case FilledSolidSelectionTypes.BOTH
@@ -638,8 +615,6 @@ Public Class FilledSolidPanelVM
            EgtSelectObj(m_SelFilledSolid.nExtrusionId)
      End Select
      EgtDraw()
-      ' disattivo il resto dell'interfaccia
-      ManageInterface(False)
      Return True
   End Function

@@ -649,7 +624,6 @@ 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
@@ -689,10 +663,6 @@ 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
@@ -735,7 +705,6 @@ 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'
@@ -788,13 +757,6 @@ 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

@@ -830,18 +792,6 @@ 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"
@@ -865,9 +815,7 @@ Public Class FilledSolidPanelVM
   ''' </summary>
   Public Sub Import(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.InsertFilledSolid()
-      ManageInterface(True)
   End Sub

 #End Region ' Import
@@ -891,7 +839,6 @@ Public Class FilledSolidPanelVM
   ''' </summary>
   Public Sub Line2P(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
      If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
      EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
@@ -940,7 +887,6 @@ Public Class FilledSolidPanelVM
         End If
         NotifyPropertyChanged(NameOf(SelFilledSolid))
      End If
-      SetFilledSolidListIsEnabled(True)
   End Sub

 #End Region    ' Delete
@@ -1225,7 +1171,6 @@ Public Class FilledSolidPanelVM
   ''' </summary>
   Public Sub CPlaneElevation(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
   End Sub

@@ -1250,7 +1195,6 @@ Public Class FilledSolidPanelVM
   ''' </summary>
   Public Sub CPlaneOrigin(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
   End Sub

@@ -1367,7 +1311,6 @@ Public Class FilledSolidPanelVM
   ''' </summary>
   Public Sub CPlaneObj(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      ' salvo selezione precedente e deseleziono altri oggetti
      m_PrevSelObjs.Clear()
      Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -84,32 +84,6 @@
                                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>
@@ -42,21 +42,12 @@ Public Class FilledSolidParamPanelVM

      m_Type = Cathegories.AUX_SOLID
      m_sName = "Filled Solid"
-      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDWIDTH, nFilledSolidId, nPartId, Me),
+      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, 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)})
@@ -199,14 +190,6 @@ Public Class FilledSolidNumericMachiningParam
      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)
@@ -219,30 +202,6 @@ 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)
@@ -271,18 +230,6 @@ 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)
@@ -301,42 +248,6 @@ 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)
@@ -428,14 +339,9 @@ Public Class FilledSolidComboMachiningParam
      Dim bReadFromPart As Boolean = False
      Select Case Type
         Case Params.AUXSOLIDSINFILL
-            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")})
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL.NONE, "None"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
+                                                     New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
            Dim nSelValue As Integer = 1
            bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSINFILL, nSelValue)
            If bReadFromRib Then
@@ -473,7 +379,7 @@ Public Class FilledSolidComboMachiningParam
         Else
            Select Case Type
               Case Params.AUXSOLIDSINFILL
-                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_INFILL_TYPE.NONE)
+                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_INFILL.NONE)
                  m_SelValue = m_OrigSelValue
               Case Params.AUXSOLIDSSTRANDORDER
                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_STRANDORDERS.OUTTOIN)
@@ -541,95 +447,4 @@ 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
@@ -0,0 +1,118 @@
+<Grid x:Class="HelpPanelV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:PrintApp="clr-namespace:Icarus"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Icarus"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800">
+   <Grid.Resources>
+      <SolidColorBrush x:Key="HighlightBorder_Color" Color="Red"/>
+      <Thickness x:Key="HighlightBorder_Thickness">5</Thickness>
+      <CornerRadius x:Key="HighlightBorder_CornerRadius">2</CornerRadius>
+      <Thickness x:Key="HighlightBorder_Margin">-2</Thickness>
+      <Style x:Key="Highlight_HelpBorder" TargetType="{x:Type Border}">
+         <Setter Property="BorderBrush" Value="{StaticResource HighlightBorder_Color}"/>
+         <Setter Property="BorderThickness" Value="{StaticResource HighlightBorder_Thickness}"/>
+         <Setter Property="CornerRadius" Value="{StaticResource HighlightBorder_CornerRadius}"/>
+         <Setter Property="Margin" Value="{StaticResource HighlightBorder_Margin}"/>
+      </Style>
+      <Style x:Key="Popup_HelpBorder" TargetType="{x:Type Border}">
+         <Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}"/>
+         <Setter Property="BorderThickness" Value="1"/>
+         <Setter Property="CornerRadius" Value="5"/>
+         <Setter Property="Background" Value="White"/>
+      </Style>
+      <Style TargetType="{x:Type Popup}">
+         <Setter Property="AllowsTransparency" Value="True"/>
+         <Setter Property="StaysOpen" Value="True"/>
+         <Setter Property="Placement" Value="Bottom"/>
+      </Style>
+   </Grid.Resources>
+   <Border BorderThickness="{StaticResource WindowBorder_Thickness}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="{StaticResource TitleBarHeight}"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+         </Grid.RowDefinitions>
+         <Grid Style="{StaticResource TopBar_HelpButton}">
+            <Border Visibility="{Binding Icon_Visibility}" 
+                     Style="{StaticResource Highlight_HelpBorder}">
+            </Border>
+         </Grid>
+         <Grid Grid.Column="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Grid Style="{StaticResource TopBar_HelpButton}"/>
+            <Grid Grid.Column="1"
+                  Style="{StaticResource TopBar_HelpButton}"/>
+            <Grid Grid.Column="2"
+                  Style="{StaticResource TopBar_HelpButton}"/>
+            <Grid Grid.Column="3"
+                  Style="{StaticResource TopBar_HelpButton}"/>
+            <Grid Grid.Column="4"
+                  Style="{StaticResource TopBar_HelpButton}"/>
+            <Grid Grid.Column="5"
+                  Style="{StaticResource TopBar_HelpButton}"/>
+            <Grid Grid.Column="6" 
+                  Style="{StaticResource TopBar_HelpButton}"/>
+            <Grid Grid.Column="7" 
+                  Style="{StaticResource TopBar_HelpButton}"/>
+            <Grid Grid.Column="8"
+                  Style="{StaticResource TopBar_HelpButton}"/>
+            <Border Grid.ColumnSpan="9"
+                     Visibility="{Binding ProjectManager_Visibility}"
+                     Style="{StaticResource Highlight_HelpBorder}">
+            </Border>
+         </Grid>
+         <Grid Grid.Column="2" Width="70"/>
+         <Grid Grid.Column="3"/>
+         <Grid Grid.Column="4">
+            <UniformGrid Rows="1">
+               <Grid Style="{StaticResource TopBar_HelpButton}"/>
+               <Grid Style="{StaticResource TopBar_HelpButton}"/>
+               <Grid Style="{StaticResource TopBar_HelpButton}"/>
+            </UniformGrid>
+         </Grid>
+         <Border Grid.Row="1"
+                 Grid.ColumnSpan="5"
+                 HorizontalAlignment="Left"
+                 VerticalAlignment="Top"
+                 Margin="-2,7,0,0"
+                 Visibility="{Binding Icon_Visibility}"
+                 Style="{StaticResource Popup_HelpBorder}">
+            <PrintApp:Icon_Tooltip/>
+         </Border>
+         <Border Grid.Row="1"
+                 Grid.Column="1"
+                 Grid.ColumnSpan="5"
+                 HorizontalAlignment="Left"
+                 VerticalAlignment="Top"
+                 Margin="-2,7,0,0"
+                 Visibility="{Binding ProjectManager_Visibility}"
+                 Style="{StaticResource Popup_HelpBorder}">
+            <PrintApp:ProjectManager_Tooltip/>
+         </Border>
+
+      </Grid>
+   </Border>
+</Grid>
@@ -0,0 +1,3 @@
+Public Class HelpPanelV
+
+End Class
@@ -0,0 +1,81 @@
+Imports EgtWPFLib5
+
+Public Class HelpPanelVM
+   Inherits VMBase
+
+   Public Enum HelpPages As Integer
+      NULL = 0
+      ICON = 1
+      PROJECTMANAGER = 2
+   End Enum
+
+   Private m_CurrHelpPage As HelpPages
+   Public ReadOnly Property CurrHelpPage As HelpPages
+      Get
+         Return m_CurrHelpPage
+      End Get
+   End Property
+
+   Private m_Icon_Visibility As Boolean = False
+   Public ReadOnly Property Icon_Visibility As Visibility
+      Get
+         Return If(m_Icon_Visibility, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+   Public Property Icon_IsOpen As Boolean
+      Get
+         Return m_Icon_Visibility
+      End Get
+      Set(value As Boolean)
+         m_Icon_Visibility = value
+      End Set
+   End Property
+   Friend Sub SetIconVisibility(bValue As Boolean)
+      m_Icon_Visibility = bValue
+      NotifyPropertyChanged(NameOf(Icon_Visibility))
+      NotifyPropertyChanged(NameOf(Icon_IsOpen))
+   End Sub
+
+   Private m_ProjectManager_Visibility As Boolean = False
+   Public ReadOnly Property ProjectManager_Visibility As Visibility
+      Get
+         Return If(m_ProjectManager_Visibility, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+   Public Property ProjectManager_IsOpen As Boolean
+      Get
+         Return m_ProjectManager_Visibility
+      End Get
+      Set(value As Boolean)
+         m_ProjectManager_Visibility = value
+      End Set
+   End Property
+   Friend Sub SetProjectManagerVisibility(bValue As Boolean)
+      m_ProjectManager_Visibility = bValue
+      NotifyPropertyChanged(NameOf(ProjectManager_Visibility))
+      NotifyPropertyChanged(NameOf(ProjectManager_IsOpen))
+   End Sub
+
+   Sub New()
+      Map.SetRefHelpPanelVM(Me)
+   End Sub
+
+   Friend Sub SelHelpPage(SelHelpPage As HelpPages)
+      Select Case m_CurrHelpPage
+         Case HelpPages.ICON
+            SetIconVisibility(False)
+         Case HelpPages.PROJECTMANAGER
+            SetProjectManagerVisibility(False)
+      End Select
+      m_CurrHelpPage = SelHelpPage
+      Select Case m_CurrHelpPage
+         Case HelpPages.NULL
+            SetProjectManagerVisibility(False)
+         Case HelpPages.ICON
+            SetIconVisibility(True)
+         Case HelpPages.PROJECTMANAGER
+            SetProjectManagerVisibility(True)
+      End Select
+   End Sub
+
+End Class
@@ -0,0 +1,12 @@
+<RichTextBox x:Class="Icon_Tooltip"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             BorderThickness="0"
+             Width="200"
+             Margin="5">
+   <FlowDocument>
+      <Paragraph FontSize="20">Icon</Paragraph>
+      <Paragraph FontSize="14">The software logo icon.
+                               If clicked opens the AboutBox.</Paragraph>
+   </FlowDocument>
+</RichTextBox>
@@ -0,0 +1,3 @@
+Public Class Icon_Tooltip
+
+End Class
@@ -0,0 +1,29 @@
+<RichTextBox x:Class="ProjectManager_Tooltip"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             BorderThickness="0"
+             Width="300"
+             Margin="10">
+   <FlowDocument>
+      <Paragraph FontSize="20">Project Manager</Paragraph>
+      <Paragraph FontSize="14">This space permit to manage the project.
+                               The commands available are :</Paragraph>
+      <List>
+         <ListItem>
+            <Paragraph>New</Paragraph>
+         </ListItem>
+         <ListItem>
+            <Paragraph>Open</Paragraph>
+         </ListItem>
+         <ListItem>
+            <Paragraph>Save</Paragraph>
+         </ListItem>
+         <ListItem>
+            <Paragraph>Save As</Paragraph>
+         </ListItem>
+         <ListItem>
+            <Paragraph>Import</Paragraph>
+         </ListItem>
+      </List>
+   </FlowDocument>
+</RichTextBox>
@@ -0,0 +1,3 @@
+Public Class ProjectManager_Tooltip
+
+End Class
@@ -0,0 +1,71 @@
+<EgtWPFLib5:EgtMainWindow x:Class="HelpWndV"
+                          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 Title_Msg}"
+                          Icon="/Resources/Icarus.ico"
+                          Height="600"
+                          Width="800"
+                          CloseCommand="{Binding Close_Command, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                          Style="{StaticResource Help_Window}">
+   <RichTextBox IsReadOnly="True"
+                IsDocumentEnabled="True">
+
+      <!--<FlowDocumentReader ViewingMode="Page"
+                       IsTwoPageViewEnabled="False"
+                       IsScrollViewEnabled="False">-->
+      <FlowDocument>
+         <Paragraph FontSize="50"
+                    FontWeight="Bold"
+                    TextAlignment="Center">
+            Icarus Manual
+         </Paragraph>
+         <List FontSize="14">
+            <ListItem>
+               <Paragraph>
+                  <Hyperlink Command="{Binding SoftwareStructure_Command}">
+                     Software Structure
+                  </Hyperlink>
+               </Paragraph>
+               <List FontSize="14">
+                  <ListItem>
+                     <Paragraph>
+                        <Hyperlink Command="{Binding Icon_Command}">
+                           Icon
+                        </Hyperlink>
+                     </Paragraph>
+                  </ListItem>
+                  <ListItem>
+                     <Paragraph>
+                        <Hyperlink Command="{Binding ProjectManagerBar_Command}">
+                           Project Manager Bar
+                        </Hyperlink>
+                     </Paragraph>
+                  </ListItem>
+                  <ListItem>
+                     <Paragraph>View Bar</Paragraph>
+                  </ListItem>
+                  <ListItem>
+                     <Paragraph>Status Bar</Paragraph>
+                  </ListItem>
+                  <ListItem>
+                     <Paragraph>Top Panel</Paragraph>
+                  </ListItem>
+                  <ListItem>
+                     <Paragraph>Slice Manager</Paragraph>
+                  </ListItem>
+               </List>
+            </ListItem>
+            <ListItem>
+               <Paragraph>ListItem 2</Paragraph>
+            </ListItem>
+            <ListItem>
+               <Paragraph>ListItem 3</Paragraph>
+            </ListItem>
+         </List>
+
+      </FlowDocument>
+   </RichTextBox>
+   <!--</FlowDocumentReader>-->
+
+</EgtWPFLib5:EgtMainWindow>
@@ -0,0 +1,18 @@
+Public Class HelpWndV
+
+   Private WithEvents m_HelpWndVM As HelpWndVM
+
+   Sub New(Owner As Window, HelpWndVM As HelpWndVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = HelpWndVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_HelpWndVM = HelpWndVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_HelpWndVM.m_CloseWindow
+      Me.Close()
+   End Sub
+
+End Class
@@ -0,0 +1,108 @@
+Imports System.Collections.ObjectModel
+Imports System.Drawing
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip
+Imports EgtWPFLib5
+
+Public Class HelpWndVM
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
+
+#Region "Messages"
+
+   Public ReadOnly Property Title_Msg As String
+      Get
+         Return "Help"
+      End Get
+   End Property
+
+#End Region    ' Messages
+
+   ' Definizione comandi
+   Private m_cmdSoftwareStructure As ICommand
+   Private m_cmdIcon As ICommand
+   Private m_cmdProjectManagerBar As ICommand
+   Private m_cmdClose As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+   Sub New()
+      Map.SetRefHelpWndVM(Me)
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "SoftwareStructure"
+
+   Public ReadOnly Property SoftwareStructure_Command As ICommand
+      Get
+         If m_cmdSoftwareStructure Is Nothing Then
+            m_cmdSoftwareStructure = New Command(AddressOf SoftwareStructure)
+         End If
+         Return m_cmdSoftwareStructure
+      End Get
+   End Property
+
+   Public Sub SoftwareStructure()
+
+   End Sub
+
+#End Region ' SoftwareStructure
+
+#Region "Icon"
+
+   Public ReadOnly Property Icon_Command As ICommand
+      Get
+         If m_cmdIcon Is Nothing Then
+            m_cmdIcon = New Command(AddressOf Icon)
+         End If
+         Return m_cmdIcon
+      End Get
+   End Property
+
+   Public Sub Icon()
+      Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.ICON)
+   End Sub
+
+#End Region ' Icon
+
+#Region "ProjectManagerBar"
+
+   Public ReadOnly Property ProjectManagerBar_Command As ICommand
+      Get
+         If m_cmdProjectManagerBar Is Nothing Then
+            m_cmdProjectManagerBar = New Command(AddressOf ProjectManagerBar)
+         End If
+         Return m_cmdProjectManagerBar
+      End Get
+   End Property
+
+   Public Sub ProjectManagerBar()
+      Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.PROJECTMANAGER)
+   End Sub
+
+#End Region ' ProjectManagerBar
+
+#Region "Close"
+
+   Public ReadOnly Property Close_Command As ICommand
+      Get
+         If m_cmdClose Is Nothing Then
+            m_cmdClose = New Command(AddressOf Close)
+         End If
+         Return m_cmdClose
+      End Get
+   End Property
+
+   Public Sub Close()
+      Map.refHelpPanelVM.SelHelpPage(HelpPanelVM.HelpPages.NULL)
+      Map.SetRefHelpWndVM(Nothing)
+      RaiseEvent m_CloseWindow(True)
+   End Sub
+
+#End Region ' Close
+
+#End Region    ' COMMANDS 
+
+End Class
@@ -158,6 +158,20 @@
      <DependentUpon>FilledSolidParamPanelV.xaml</DependentUpon>
    </Compile>
    <Compile Include="FilledSolidParamPanel\FilledSolidParamPanelVM.vb" />
+    <Compile Include="HelpPanel\HelpPanelV.xaml.vb">
+      <DependentUpon>HelpPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="HelpPanel\HelpPanelVM.vb" />
+    <Compile Include="HelpPanel\Icon_Tooltip.xaml.vb">
+      <DependentUpon>Icon_Tooltip.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="HelpPanel\ProjectManager_Tooltip.xaml.vb">
+      <DependentUpon>ProjectManager_Tooltip.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="HelpWnd\HelpWndV.xaml.vb">
+      <DependentUpon>HelpWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="HelpWnd\HelpWndVM.vb" />
    <Compile Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml.vb">
      <DependentUpon>ImportExportMachiningPanelV.xaml</DependentUpon>
    </Compile>
@@ -370,6 +384,22 @@
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
+    <Page Include="HelpPanel\HelpPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="HelpPanel\Icon_Tooltip.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="HelpPanel\ProjectManager_Tooltip.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="HelpWnd\HelpWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml">
      <SubType>Designer</SubType>
      <Generator>XamlIntelliSenseFileGenerator</Generator>
@@ -3,7 +3,6 @@
            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}"
@@ -45,6 +45,12 @@ Public Class Machining
      SUPPORT = 4
   End Enum

+   Public Enum MPAR_INFILL As Integer
+      NONE = 1
+      OFFSET = 2
+      ZIGZAG = 3
+   End Enum
+
   Public Enum MPAR_DYNAMIC_MODE As Integer
      STANDARD = 1
      FAST = 2
@@ -61,17 +67,6 @@ Public Class Machining
      RIB_SUPPORT = 8
   End Enum

-   Public Enum MPAR_INFILL_TYPE As Integer
-      NONE = 0
-      OFFSET = 16
-      ZIGZAG = 17
-      LINES = 32
-      GRID = 33
-      ZIGZAG_GRID = 34
-      HONEYCOMB = 35
-      HONEYCOMB_GRID = 36
-   End Enum
-
   Protected m_CathegoryList As New ObservableCollection(Of MachiningCathegory)
   Public ReadOnly Property CathegoryList As ObservableCollection(Of MachiningCathegory)
      Get
@@ -152,7 +147,6 @@ Public Class Machining
      m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.RIBS, nIndex))
      m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.SHELL_NUMBER, nIndex))
      m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.AUX_SOLID, nIndex))
-      m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.INFILL, nIndex))
      m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.MATERIALS, nIndex))
      For Each Cathegory In m_CathegoryList
         For Each MachiningParam In Cathegory.MachiningParamList
@@ -279,8 +273,7 @@ Public Class MachiningCathegory
      RIBS = 8
      SHELL_NUMBER = 9
      AUX_SOLID = 10
-      INFILL = 11
-      MATERIALS = 12
+      MATERIALS = 11
   End Enum

   Protected m_Type As Cathegories
@@ -333,6 +326,7 @@ Public Class MachiningCathegory
                                                                New NumericMachiningParam(MachiningParam.Params.STARTPOINTOFFSETONSLICE, nIndex, Me),
                                                                New ComboMachiningParam(MachiningParam.Params.STRANDORDER, nIndex, Me),
                                                                New ComboMachiningParam(MachiningParam.Params.DIRECTION, nIndex, Me),
+                                                                New NumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.G0FEED, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.G0FEEDZ, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.LINKZUP, nIndex, Me),
@@ -342,12 +336,10 @@ Public Class MachiningCathegory
                                                                New OrderedMachiningParam(MachiningParam.Params.PRINT_ORDER, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.PREFLOWDELAY, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.POSTFLOWDELAY, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.SCREWBACK, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.SLICINGHEIGHT, nIndex, Me)})
+                                                                New NumericMachiningParam(MachiningParam.Params.SCREWBACK, nIndex, Me)})
         Case Cathegories.LINK
            m_sName = "Shell"
-            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.INNERSHELLWIDTH, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nIndex, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nIndex, Me),
                                                                New ComboMachiningParam(MachiningParam.Params.LINKTYPE, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.LINKPARAM, nIndex, Me),
                                                                New ComboMachiningParam(MachiningParam.Params.LEADIN, nIndex, Me),
@@ -363,8 +355,7 @@ Public Class MachiningCathegory
                                                                'New NumericMachiningParam(MachiningParam.Params.WIPEDIR, nIndex, Me)})
         Case Cathegories.RIBS
            m_sName = "Ribs"
-            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.RIBSSTRANDWIDTH, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.RIBSTYPE, nIndex, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.RIBSTYPE, nIndex, Me),
                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nIndex, Me),
@@ -387,42 +378,15 @@ Public Class MachiningCathegory
                                                                New NumericMachiningParam(MachiningParam.Params.SHELLNBRWIPEDIR, nIndex, Me)})
         Case Cathegories.AUX_SOLID
            m_sName = "Filled Solid"
-            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDWIDTH, nIndex, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nIndex, Me),
                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.AUXSOLIDSINFILLLINK, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDCOUNT, nIndex, Me),
                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nIndex, Me),
                                                                New ComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETLEADPOINT, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSDENSITY, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSGRIDOVERLAP, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSDIRECTION, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETX, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSOFFSETY, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nIndex, Me)})
-         Case Cathegories.INFILL
-            m_sName = "Infill"
-            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.INFILLSTRANDWIDTH, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.FLOORTYPE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.CEILCOUNT, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.CEILTYPE, nIndex, Me),
-                                                                New ComboMachiningParam(MachiningParam.Params.INFILLTYPE, nIndex, Me),
-                                                                New CheckMachiningParam(MachiningParam.Params.INFILLLINK, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLDENSITY, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLGRIDOVERLAP, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLDIRECTION, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLOFFSETX, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLOFFSETY, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLOVERLAP, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLCOASTING, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLWIPE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.INFILLWIPEDIR, nIndex, Me)})
         Case Cathegories.MATERIALS
            m_sName = "Materials"
            Dim sMaterials As String = ""
@@ -450,19 +414,6 @@ Public Class MachiningCathegory
               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

@@ -492,11 +443,6 @@ End Class
 Public MustInherit Class MachiningParam
   Inherits VMBase

-   Public Enum MinMaxTypes As Integer
-      ABSOLUT = 1
-      PERCENTAGE = 2
-   End Enum
-
   Public Enum Params As Integer
      SLICINGTYPE = 1
      SPIRALVASE = 2
@@ -508,6 +454,7 @@ Public MustInherit Class MachiningParam
      STARTPOINTOFFSETONSLICE = 8
      STRANDORDER = 9
      DIRECTION = 10
+      FLOORCOUNT = 11
      G0FEED = 12
      LINKZUP = 13
      G0FEEDZ = 14
@@ -518,7 +465,6 @@ Public MustInherit Class MachiningParam
      PREFLOWDELAY = 19
      POSTFLOWDELAY = 20
      SCREWBACK = 21
-      SLICINGHEIGHT = 22
      LINKTYPE = 51
      LINKPARAM = 52
      LEADIN = 53
@@ -532,7 +478,6 @@ Public MustInherit Class MachiningParam
      COASTINGFEED_PC = 61
      WIPELEN = 62
      WIPEFEED_PC = 63
-      INNERSHELLWIDTH = 64
      'WIPEDIR = 64
      RIBSTYPE = 101
      RIBSOVERLAP = 102
@@ -549,7 +494,6 @@ Public MustInherit Class MachiningParam
      RIBSLEADOUTWIPE = 113
      RIBSLEADOUTWIPEDIR = 114
      RIBSLIMITUNBOUNDEDWITHSOLID = 115
-      RIBSSTRANDWIDTH = 116
      SHELLNBRDIFFERENCE = 151
      SHELLNBRCOASTING = 152
      SHELLNBRWIPE = 153
@@ -560,35 +504,10 @@ Public MustInherit Class MachiningParam
      AUXSOLIDSLINKTYPE = 204
      AUXSOLIDSLINKPARAM = 205
      AUXSOLIDSSTARTPOINTOFFSETONSLICE = 206
-      AUXSOLIDSOFFSETLEADPOINT = 207
-      AUXSOLIDSDENSITY = 208
-      AUXSOLIDSGRIDOVERLAP = 209
-      AUXSOLIDSDIRECTION = 210
-      AUXSOLIDSOFFSETX = 211
-      AUXSOLIDSOFFSETY = 212
-      AUXSOLIDSCOASTINGLEN = 213
-      AUXSOLIDSWIPELEN = 214
-      AUXSOLIDSWIPEDIR = 215
-      AUXSOLIDSSTRANDCOUNT = 216
-      AUXSOLIDSINFILLLINK = 217
-      AUXSOLIDSSTRANDWIDTH = 218
-      FLOORCOUNT = 250
-      FLOORTYPE = 251
-      CEILCOUNT = 252
-      CEILTYPE = 253
-      INFILLTYPE = 254
-      INFILLLINK = 255
-      INFILLDENSITY = 256
-      INFILLOVERLAP = 257
-      INFILLGRIDOVERLAP = 258
-      INFILLDIRECTION = 259
-      INFILLOFFSETX = 260
-      INFILLOFFSETY = 261
-      INFILLCOASTING = 262
-      INFILLWIPE = 263
-      INFILLWIPEDIR = 264
-      INFILLSTRANDWIDTH = 265
-      Materials = 500
+      AUXSOLIDSCOASTINGLEN = 207
+      AUXSOLIDSWIPELEN = 208
+      AUXSOLIDSWIPEDIR = 209
+      MATERIALS = 250
   End Enum

   Protected m_Type As Params
@@ -614,29 +533,12 @@ Public MustInherit Class MachiningParam
      End Get
   End Property

-   Public ReadOnly Property bIsBeta As Boolean
-      Get
-         Select Case m_Type
-            Case Params.FLOORCOUNT, Params.FLOORTYPE, Params.CEILCOUNT, Params.CEILTYPE, Params.INFILLTYPE
-               Return True
-            Case Else
-               Return False
-         End Select
-      End Get
-   End Property
-
-   Public ReadOnly Property IsBeta_Visibility As Visibility
-      Get
-         Return If(bIsBeta, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
   Sub New(Type As Params, Cathegory As MachiningCathegory)
      m_Type = Type
      m_Cathegory = Cathegory
      Select Case m_Type
         Case Params.SLICINGTYPE
-            m_sName = "Slicing Direction"
+            m_sName = "Slicing direction"
         Case Params.STRANDH
            m_sName = "Strand Height"
         Case Params.STRANDW
@@ -657,8 +559,6 @@ Public MustInherit Class MachiningParam
            m_sName = "Link Param"
         Case Params.LINKZUP
            m_sName = "Link Z Up"
-         Case Params.INNERSHELLWIDTH
-            m_sName = "Custom Inner Shell Width"
         Case Params.OFFSETLEADPOINT
            m_sName = "Offset Lead Point"
         Case Params.LEADIN
@@ -695,10 +595,6 @@ Public MustInherit Class MachiningParam
            m_sName = "Post Flow Delay"
         Case Params.SCREWBACK
            m_sName = "Screw Back"
-         Case Params.SLICINGHEIGHT
-            m_sName = "Slicing Height"
-         Case Params.RIBSSTRANDWIDTH
-            m_sName = "Custom Strand Width"
         Case Params.RIBSTYPE
            m_sName = "Type"
         Case Params.RIBSOVERLAP
@@ -737,16 +633,10 @@ Public MustInherit Class MachiningParam
            m_sName = "Wipe"
         Case Params.SHELLNBRWIPEDIR
            m_sName = "Wipe Direction [deg]"
-         Case Params.AUXSOLIDSSTRANDWIDTH
-            m_sName = "Custom Strand Width"
         Case Params.AUXSOLIDSOVERLAP
            m_sName = "Overlap [%]"
         Case Params.AUXSOLIDSINFILL
            m_sName = "Infill"
-         Case Params.AUXSOLIDSINFILLLINK
-            m_sName = "Infill Link"
-         Case Params.AUXSOLIDSSTRANDCOUNT
-            m_sName = "Strand Count"
         Case Params.AUXSOLIDSSTRANDORDER
            m_sName = "Strand Order"
         Case Params.AUXSOLIDSLINKTYPE
@@ -755,18 +645,6 @@ Public MustInherit Class MachiningParam
            m_sName = "Link Parameter"
         Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
            m_sName = "Start Point Offset On Slice"
-         Case Params.AUXSOLIDSOFFSETLEADPOINT
-            m_sName = "Offset Lead Point"
-         Case Params.AUXSOLIDSDENSITY
-            m_sName = "Density [%]"
-         Case Params.AUXSOLIDSGRIDOVERLAP
-            m_sName = "Grid Overlap [%]"
-         Case Params.AUXSOLIDSDIRECTION
-            m_sName = "Direction"
-         Case Params.AUXSOLIDSOFFSETX
-            m_sName = "Offset X"
-         Case Params.AUXSOLIDSOFFSETY
-            m_sName = "Offset Y"
         Case Params.AUXSOLIDSCOASTINGLEN
            m_sName = "Coasting Length"
         Case Params.AUXSOLIDSWIPELEN
@@ -780,41 +658,11 @@ Public MustInherit Class MachiningParam
         Case Params.STRANDOVERLAP
            m_sName = "Strand Overlap [%]"
         Case Params.FLOWRATE_PC
-            m_sName = "Flow Rate [%]"
+            m_sName = "Flow rate [%]"
         Case Params.DYNAMIC_MODE
            m_sName = "Dynamic Mode"
         Case Params.PRINT_ORDER
            m_sName = "Print Order"
-         Case Params.INFILLSTRANDWIDTH
-            m_sName = "Custom Strand Width"
-         Case Params.FLOORTYPE
-            m_sName = "Floor Type"
-         Case Params.CEILCOUNT
-            m_sName = "Ceil Count"
-         Case Params.CEILTYPE
-            m_sName = "Ceil Type"
-         Case Params.INFILLTYPE
-            m_sName = "Infill Type"
-         Case Params.INFILLLINK
-            m_sName = "Link"
-         Case Params.INFILLDENSITY
-            m_sName = "Density [%]"
-         Case Params.INFILLOVERLAP
-            m_sName = "Overlap [%]"
-         Case Params.INFILLGRIDOVERLAP
-            m_sName = "Grid Overlap [%]"
-         Case Params.INFILLDIRECTION
-            m_sName = "Direction"
-         Case Params.INFILLOFFSETX
-            m_sName = "Offset X"
-         Case Params.INFILLOFFSETY
-            m_sName = "Offset Y"
-         Case Params.INFILLCOASTING
-            m_sName = "Coasting"
-         Case Params.INFILLWIPE
-            m_sName = "Wipe"
-         Case Params.INFILLWIPEDIR
-            m_sName = "Wipe Direction"
      End Select
   End Sub

@@ -838,8 +686,6 @@ Public Class NumericMachiningParam
   Protected m_bIsLen As Boolean = False

   Protected m_bIsActiveMinMax As Boolean = False
-   Protected m_MinMaxLinkedParam As Params = 0
-   Protected m_MinMaxType As MinMaxTypes = 0
   Protected m_dMinValue As Double
   Protected m_dMaxValue As Double

@@ -861,31 +707,13 @@ Public Class NumericMachiningParam
            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
+            If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
+               m_dValue = dTempValue
            End If
         Else
            m_dValue = dTempValue
         End If
         NotifyPropertyChanged(NameOf(sValue))
-         ManageDependencyParam()
      End Set
   End Property

@@ -921,43 +749,16 @@ Public Class NumericMachiningParam
      MyBase.New(Type, Cathegory)
      ' leggo ed imposto eventuali min e max
      Dim sMinMax As String = ""
-      If GetPrivateProfileString(S_MINMAX, Type, "", sMinMax, CurrentMachine.sMachIniFile) > 0 Then
+      If GetMainPrivateProfileString(S_MINMAX, Type, "", sMinMax) > 0 Then
         Dim sMinMaxValues() As String = sMinMax.Split(","c)
         Dim dMin As Double = 0
         Dim dMax As Double = 0
-         If sMinMaxValues.Count() = 2 Then
-            If StringToDouble(sMinMaxValues(0), dMin) AndAlso StringToDouble(sMinMaxValues(1), dMax) Then
-               m_MinMaxType = MinMaxTypes.ABSOLUT
-               m_dMinValue = dMin
-               m_dMaxValue = dMax
-               m_bIsActiveMinMax = True
-            End If
-         ElseIf sMinMaxValues.Count() > 2 Then
-            Dim nMinMaxType As Integer = 0
-            If StringToDouble(sMinMaxValues(0), nMinMaxType) AndAlso nMinMaxType = 1 Then
-               If StringToDouble(sMinMaxValues(0), dMin) AndAlso StringToDouble(sMinMaxValues(1), dMax) Then
-                  m_MinMaxType = nMinMaxType
-                  m_dMinValue = dMin
-                  m_dMaxValue = dMax
-                  m_bIsActiveMinMax = True
-               End If
-            ElseIf StringToDouble(sMinMaxValues(0), nMinMaxType) AndAlso nMinMaxType = 2 Then
-               Dim nMinMaxLinkedParam As Integer = 0
-               If sMinMaxValues.Count() >= 4 AndAlso Integer.TryParse(sMinMaxValues(1), nMinMaxLinkedParam) AndAlso StringToDouble(sMinMaxValues(2), dMin) AndAlso StringToDouble(sMinMaxValues(3), dMax) Then
-                  m_MinMaxLinkedParam = nMinMaxLinkedParam
-                  m_MinMaxType = nMinMaxType
-                  m_dMinValue = dMin
-                  m_dMaxValue = dMax
-                  m_bIsActiveMinMax = True
-               End If
-            End If
+         If StringToDouble(sMinMaxValues(0), dMin) AndAlso StringToDouble(sMinMaxValues(1), dMax) Then
+            m_dMinValue = dMin
+            m_dMaxValue = dMax
+            m_bIsActiveMinMax = True
         End If
      End If
-      If Type = Params.SLICINGHEIGHT Then
-         m_dMinValue = 0
-         m_dMaxValue = CurrentMachine.dSlicingMaxHeight
-         m_bIsActiveMinMax = True
-      End If
      ' leggo parametri da Db
      If nIndex = 0 Then
         m_dValue = 0
@@ -988,9 +789,6 @@ Public Class NumericMachiningParam
            Case Params.LINKZUP
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_LINKZUP, 0)
               m_bIsLen = True
-            Case Params.INNERSHELLWIDTH
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INNERSHELLWIDTH, 0)
-               m_bIsLen = True
            Case Params.OFFSETLEADPOINT
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_OFFSETLEADPOINT, 0)
               m_bIsLen = True
@@ -1040,14 +838,8 @@ Public Class NumericMachiningParam
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_POSTFLOWDELAY, 0)
               m_bIsLen = False
            Case Params.SCREWBACK
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 45)
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_SCREWBACK, 0)
               m_bIsLen = False
-            Case Params.SLICINGHEIGHT
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_SLICINGHEIGHT, CurrentMachine.dSlicingMaxHeight)
-               m_bIsLen = False
-            Case Params.RIBSSTRANDWIDTH
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSSTRANDWIDTH, 0)
-               m_bIsLen = True
            Case Params.RIBSOVERLAP
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSOVERLAP, 0)
               m_bIsLen = False
@@ -1081,12 +873,6 @@ Public Class NumericMachiningParam
            Case Params.SHELLNBRWIPEDIR
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_SHELLNBRWIPEDIR, 0)
               m_bIsLen = False
-            Case Params.AUXSOLIDSSTRANDWIDTH
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSSTRANDWIDTH, 0)
-               m_bIsLen = True
-            Case Params.AUXSOLIDSSTRANDCOUNT
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSSTRANDCOUNT, 0)
-               m_bIsLen = False
            Case Params.AUXSOLIDSOVERLAP
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSOVERLAP, 0)
               m_bIsLen = False
@@ -1096,24 +882,6 @@ Public Class NumericMachiningParam
            Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, 0)
               m_bIsLen = True
-            Case Params.AUXSOLIDSOFFSETLEADPOINT
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSOFFSETLEADPOINT, 0)
-               m_bIsLen = True
-            Case Params.AUXSOLIDSDENSITY
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSDENSITY, 0)
-               m_bIsLen = False
-            Case Params.AUXSOLIDSGRIDOVERLAP
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSGRIDOVERLAP, 0)
-               m_bIsLen = True
-            Case Params.AUXSOLIDSDIRECTION
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSDIRECTION, 0)
-               m_bIsLen = False
-            Case Params.AUXSOLIDSOFFSETX
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSOFFSETX, 0)
-               m_bIsLen = True
-            Case Params.AUXSOLIDSOFFSETY
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSOFFSETY, 0)
-               m_bIsLen = True
            Case Params.AUXSOLIDSCOASTINGLEN
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSCOASTINGLEN, 0)
               m_bIsLen = True
@@ -1126,68 +894,11 @@ Public Class NumericMachiningParam
            Case Params.FLOWRATE_PC
               m_dValue = ReadMachiningParamDouble(nIndex, MAC_CONSTANT, 100)
               m_bIsLen = False
-            Case Params.INFILLSTRANDWIDTH
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLSTRANDWIDTH, 0)
-               m_bIsLen = True
-            Case Params.CEILCOUNT
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_CEILCOUNT, 0)
-               m_bIsLen = False
-            Case Params.INFILLDENSITY
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLDENSITY, 0)
-               m_bIsLen = False
-            Case Params.INFILLOVERLAP
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLOVERLAP, 0)
-               m_bIsLen = False
-            Case Params.INFILLGRIDOVERLAP
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLGRIDOVERLAP, 0)
-               m_bIsLen = False
-            Case Params.INFILLDIRECTION
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLDIRECTION, 0)
-               m_bIsLen = False
-            Case Params.INFILLOFFSETX
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLOFFSETX, 0)
-               m_bIsLen = True
-            Case Params.INFILLOFFSETY
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLOFFSETY, 0)
-               m_bIsLen = True
-            Case Params.INFILLCOASTING
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLCOASTING, 0)
-               m_bIsLen = True
-            Case Params.INFILLWIPE
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLWIPE, 0)
-               m_bIsLen = True
-            Case Params.INFILLWIPEDIR
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_INFILLWIPEDIR, 0)
-               m_bIsLen = False
         End Select
      End If
      m_dOrigValue = m_dValue
   End Sub

-   Friend Sub ManageDependencyParam()
-      ' gestisco dis/attivazione parametri dipendenti
-      Select Case m_Type
-         Case Params.FLOORCOUNT
-            Dim ComboMachiningParam As ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.FLOORTYPE)
-            ComboMachiningParam.SetIsActive(m_dValue <> 0)
-         Case Params.CEILCOUNT
-            Dim ComboMachiningParam As ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.CEILTYPE)
-            ComboMachiningParam.SetIsActive(m_dValue <> 0)
-         Case Params.AUXSOLIDSSTRANDCOUNT
-            Dim AuxSolidsInfillParam As ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSINFILL)
-            Dim ComboMachiningParam As ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSSTRANDORDER)
-            ComboMachiningParam.SetIsActive(m_dValue > 0 OrElse AuxSolidsInfillParam.SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET)
-            ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSLINKTYPE)
-            ComboMachiningParam.SetIsActive(m_dValue > 0 OrElse AuxSolidsInfillParam.SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET)
-            Dim NumericMachiningParam As NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSLINKPARAM)
-            NumericMachiningParam.SetIsActive(m_dValue > 0 OrElse AuxSolidsInfillParam.SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET)
-            NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE)
-            NumericMachiningParam.SetIsActive(m_dValue > 0 OrElse AuxSolidsInfillParam.SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET)
-            NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSOFFSETLEADPOINT)
-            NumericMachiningParam.SetIsActive(m_dValue > 0 OrElse AuxSolidsInfillParam.SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET)
-      End Select
-   End Sub
-
   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
      Dim sWriteValue As String = ""
      If m_bIsLen Then
@@ -1212,8 +923,6 @@ Public Class NumericMachiningParam
            WriteMachiningParam(nIndex, MAC_LINKPARAM, sWriteValue, sFilePath)
         Case Params.LINKZUP
            WriteMachiningParam(nIndex, MAC_LINKZUP, sWriteValue, sFilePath)
-         Case Params.INNERSHELLWIDTH
-            WriteMachiningParam(nIndex, MAC_INNERSHELLWIDTH, sWriteValue, sFilePath)
         Case Params.OFFSETLEADPOINT
            WriteMachiningParam(nIndex, MAC_OFFSETLEADPOINT, sWriteValue, sFilePath)
         Case Params.LEADINTANGDIST
@@ -1248,10 +957,6 @@ Public Class NumericMachiningParam
            WriteMachiningParam(nIndex, MAC_POSTFLOWDELAY, sWriteValue, sFilePath)
         Case Params.SCREWBACK
            WriteMachiningParam(nIndex, MAC_SCREWBACK, sWriteValue, sFilePath)
-         Case Params.SLICINGHEIGHT
-            WriteMachiningParam(nIndex, MAC_SLICINGHEIGHT, sWriteValue, sFilePath)
-         Case Params.RIBSSTRANDWIDTH
-            WriteMachiningParam(nIndex, MAC_RIBSSTRANDWIDTH, sWriteValue, sFilePath)
         Case Params.RIBSOVERLAP
            WriteMachiningParam(nIndex, MAC_RIBSOVERLAP, sWriteValue, sFilePath)
         Case Params.RIBSSTRANDCOUNT
@@ -1274,28 +979,12 @@ Public Class NumericMachiningParam
            WriteMachiningParam(nIndex, MAC_SHELLNBRWIPE, sWriteValue, sFilePath)
         Case Params.SHELLNBRWIPEDIR
            WriteMachiningParam(nIndex, MAC_SHELLNBRWIPEDIR, sWriteValue, sFilePath)
-         Case Params.AUXSOLIDSSTRANDWIDTH
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSSTRANDWIDTH, sWriteValue, sFilePath)
-         Case Params.AUXSOLIDSSTRANDCOUNT
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSSTRANDCOUNT, sWriteValue, sFilePath)
         Case Params.AUXSOLIDSOVERLAP
            WriteMachiningParam(nIndex, MAC_AUXSOLIDSOVERLAP, sWriteValue, sFilePath)
         Case Params.AUXSOLIDSLINKPARAM
            WriteMachiningParam(nIndex, MAC_AUXSOLIDSLINKPARAM, sWriteValue, sFilePath)
         Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
            WriteMachiningParam(nIndex, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, sWriteValue, sFilePath)
-         Case Params.AUXSOLIDSOFFSETLEADPOINT
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSOFFSETLEADPOINT, sWriteValue, sFilePath)
-         Case Params.AUXSOLIDSDENSITY
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSDENSITY, sWriteValue, sFilePath)
-         Case Params.AUXSOLIDSGRIDOVERLAP
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSGRIDOVERLAP, sWriteValue, sFilePath)
-         Case Params.AUXSOLIDSDIRECTION
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSDIRECTION, sWriteValue, sFilePath)
-         Case Params.AUXSOLIDSOFFSETX
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSOFFSETX, sWriteValue, sFilePath)
-         Case Params.AUXSOLIDSOFFSETY
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSOFFSETY, sWriteValue, sFilePath)
         Case Params.AUXSOLIDSCOASTINGLEN
            WriteMachiningParam(nIndex, MAC_AUXSOLIDSCOASTINGLEN, sWriteValue, sFilePath)
         Case Params.AUXSOLIDSWIPELEN
@@ -1304,28 +993,6 @@ Public Class NumericMachiningParam
            WriteMachiningParam(nIndex, MAC_AUXSOLIDSWIPEDIR, sWriteValue, sFilePath)
         Case Params.FLOWRATE_PC
            WriteMachiningParam(nIndex, MAC_CONSTANT, sWriteValue, sFilePath)
-         Case Params.INFILLSTRANDWIDTH
-            WriteMachiningParam(nIndex, MAC_INFILLSTRANDWIDTH, sWriteValue, sFilePath)
-         Case Params.CEILCOUNT
-            WriteMachiningParam(nIndex, MAC_CEILCOUNT, sWriteValue, sFilePath)
-         Case Params.INFILLDENSITY
-            WriteMachiningParam(nIndex, MAC_INFILLDENSITY, sWriteValue, sFilePath)
-         Case Params.INFILLOVERLAP
-            WriteMachiningParam(nIndex, MAC_INFILLOVERLAP, sWriteValue, sFilePath)
-         Case Params.INFILLGRIDOVERLAP
-            WriteMachiningParam(nIndex, MAC_INFILLGRIDOVERLAP, sWriteValue, sFilePath)
-         Case Params.INFILLDIRECTION
-            WriteMachiningParam(nIndex, MAC_INFILLDIRECTION, sWriteValue, sFilePath)
-         Case Params.INFILLOFFSETX
-            WriteMachiningParam(nIndex, MAC_INFILLOFFSETX, sWriteValue, sFilePath)
-         Case Params.INFILLOFFSETY
-            WriteMachiningParam(nIndex, MAC_INFILLOFFSETY, sWriteValue, sFilePath)
-         Case Params.INFILLCOASTING
-            WriteMachiningParam(nIndex, MAC_INFILLCOASTING, sWriteValue, sFilePath)
-         Case Params.INFILLWIPE
-            WriteMachiningParam(nIndex, MAC_INFILLWIPE, sWriteValue, sFilePath)
-         Case Params.INFILLWIPEDIR
-            WriteMachiningParam(nIndex, MAC_INFILLWIPEDIR, sWriteValue, sFilePath)
      End Select
   End Sub

@@ -1470,71 +1137,50 @@ Public Class ComboMachiningParam
            Case Params.STRANDORDER
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_STRANDORDERS.OUTTOIN, "From Outside To Inside"),
                                                        New IdNameStruct(Machining.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_STRANDORDER, Machining.MPAR_STRANDORDERS.OUTTOIN))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_STRANDORDER, 0))
            Case Params.DIRECTION
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_DIRECTIONS.CCW, "Counterclockwise"),
                                                        New IdNameStruct(Machining.MPAR_DIRECTIONS.CW, "Clockwise")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_DIRECTION, Machining.MPAR_DIRECTIONS.CCW))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_DIRECTION, 0))
            Case Params.LINKTYPE
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LINKTYPES.NONE, "None"),
                                                        New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
                                                        New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LINKTYPE, Machining.MPAR_LEADINOUT.NONE))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LINKTYPE, 0))
            Case Params.LEADIN
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LEADINOUT.NONE, "None"),
                                                        New IdNameStruct(Machining.MPAR_LEADINOUT.LINEAR, "Linear"),
                                                        New IdNameStruct(Machining.MPAR_LEADINOUT.ARC, "Arc")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LEADIN, Machining.MPAR_LEADINOUT.NONE))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LEADIN, 0))
            Case Params.LEADOUT
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LEADINOUT.NONE, "None"),
                                                        New IdNameStruct(Machining.MPAR_LEADINOUT.LINEAR, "Linear"),
                                                        New IdNameStruct(Machining.MPAR_LEADINOUT.ARC, "Arc")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LEADOUT, Machining.MPAR_LEADINOUT.NONE))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LEADOUT, 0))
            Case Params.RIBSTYPE
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_RIBSTYPE.INTERNAL, "Internal"),
                                                        New IdNameStruct(Machining.MPAR_RIBSTYPE.EXTERNAL, "External"),
                                                        New IdNameStruct(Machining.MPAR_RIBSTYPE.UNBOUNDED, "Unbounded"),
                                                        New IdNameStruct(Machining.MPAR_RIBSTYPE.SUPPORT, "Support")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_RIBSTYPE, Machining.MPAR_RIBSTYPE.INTERNAL))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_RIBSTYPE, 1))
            Case Params.AUXSOLIDSINFILL
-               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")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSINFILL, Machining.MPAR_INFILL_TYPE.NONE))
+               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_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSINFILL, 0))
            Case Params.AUXSOLIDSSTRANDORDER
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_STRANDORDERS.OUTTOIN, "From Outside To Inside"),
                                                        New IdNameStruct(Machining.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSSTRANDORDER, Machining.MPAR_STRANDORDERS.OUTTOIN))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSSTRANDORDER, 0))
            Case Params.AUXSOLIDSLINKTYPE
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LINKTYPES.NONE, "None"),
                                                        New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
                                                        New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSLINKTYPE, Machining.MPAR_LINKTYPES.NONE))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSLINKTYPE, 0))
            Case Params.DYNAMIC_MODE
               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_DYNAMIC_MODE.STANDARD, "Standard"),
                                                        New IdNameStruct(Machining.MPAR_DYNAMIC_MODE.FAST, "Fast")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_DYNAMICMODE, Machining.MPAR_DYNAMIC_MODE.STANDARD))
-            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")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_FLOORTYPE, Machining.MPAR_INFILL_TYPE.OFFSET))
-            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")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_CEILTYPE, Machining.MPAR_INFILL_TYPE.OFFSET))
-            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")})
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_INFILLTYPE, Machining.MPAR_INFILL_TYPE.NONE))
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_DYNAMICMODE, 1))
         End Select
      End If
      m_OrigSelValue = m_SelValue
@@ -1560,43 +1206,12 @@ Public Class ComboMachiningParam
            Dim CheckMachiningParam As CheckMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.RIBSLIMITUNBOUNDEDWITHSOLID)
            CheckMachiningParam.SetIsActive(m_SelValue.Id = MPAR_RIBSTYPE.UNBOUNDED)
         Case Params.AUXSOLIDSINFILL
-            Dim AuxSolidsStrandCountParam As NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSSTRANDCOUNT)
            Dim ComboMachiningParam As ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSSTRANDORDER)
-            ComboMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET OrElse AuxSolidsStrandCountParam.dValue > 0)
+            ComboMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL.OFFSET)
            ComboMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSLINKTYPE)
-            ComboMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET OrElse AuxSolidsStrandCountParam.dValue > 0)
+            ComboMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL.OFFSET)
            Dim NumMachiningParam As NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSLINKPARAM)
-            NumMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET OrElse AuxSolidsStrandCountParam.dValue > 0)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE)
-            NumMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET OrElse AuxSolidsStrandCountParam.dValue > 0)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSOFFSETLEADPOINT)
-            NumMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL_TYPE.OFFSET OrElse AuxSolidsStrandCountParam.dValue > 0)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSDENSITY)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.ZIGZAG AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.OFFSET)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSGRIDOVERLAP)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.ZIGZAG AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.OFFSET AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.LINES AndAlso
-                                           m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.GRID)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSDIRECTION)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.ZIGZAG AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.OFFSET)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSOFFSETX)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.ZIGZAG AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.OFFSET)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSOFFSETY)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.ZIGZAG AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.OFFSET)
-            Dim CheckMachiningParam As CheckMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.AUXSOLIDSINFILLLINK)
-            CheckMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.ZIGZAG AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.OFFSET)
-         Case Params.INFILLTYPE
-            Dim NumMachiningParam As NumericMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.INFILLDENSITY)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.INFILLGRIDOVERLAP)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.LINES AndAlso m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.GRID)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.INFILLDIRECTION)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.INFILLOFFSETX)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE)
-            NumMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.INFILLOFFSETY)
-            NumMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE)
-            Dim CheckMachiningParam As CheckMachiningParam = m_Cathegory.MachiningParamList.FirstOrDefault(Function(z) z.Type = Params.INFILLLINK)
-            CheckMachiningParam.SetIsActive(m_SelValue.Id <> Machining.MPAR_INFILL_TYPE.NONE)
+            NumMachiningParam.SetIsActive(m_SelValue.Id = Machining.MPAR_INFILL.OFFSET)
      End Select
   End Sub

@@ -1624,12 +1239,6 @@ Public Class ComboMachiningParam
            WriteMachiningParam(nIndex, MAC_AUXSOLIDSLINKTYPE, m_SelValue.Id, sFilePath)
         Case Params.DYNAMIC_MODE
            WriteMachiningParam(nIndex, MAC_DYNAMICMODE, m_SelValue.Id, sFilePath)
-         Case Params.FLOORTYPE
-            WriteMachiningParam(nIndex, MAC_FLOORTYPE, m_SelValue.Id, sFilePath)
-         Case Params.CEILTYPE
-            WriteMachiningParam(nIndex, MAC_CEILTYPE, m_SelValue.Id, sFilePath)
-         Case Params.INFILLTYPE
-            WriteMachiningParam(nIndex, MAC_INFILLTYPE, m_SelValue.Id, sFilePath)
      End Select
   End Sub

@@ -1708,10 +1317,6 @@ Public Class CheckMachiningParam
               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADOUTINVERT, 0)
            Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, 0)
-            Case Params.AUXSOLIDSINFILLLINK
-               m_bValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSINFILLLINK, 0)
-            Case Params.INFILLLINK
-               m_bValue = ReadMachiningParamDouble(nIndex, MAC_INFILLLINK, 0)
         End Select
      End If
      m_bOrigValue = m_bValue
@@ -1735,10 +1340,6 @@ Public Class CheckMachiningParam
            WriteMachiningParam(nIndex, MAC_RIBSLEADOUTINVERT, If(m_bValue, 1, 0), sFilePath)
         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
            WriteMachiningParam(nIndex, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, If(m_bValue, 1, 0), sFilePath)
-         Case Params.AUXSOLIDSINFILLLINK
-            WriteMachiningParam(nIndex, MAC_AUXSOLIDSINFILLLINK, If(m_bValue, 1, 0), sFilePath)
-         Case Params.INFILLLINK
-            WriteMachiningParam(nIndex, MAC_INFILLLINK, If(m_bValue, 1, 0), sFilePath)
      End Select
   End Sub

@@ -140,16 +140,9 @@
                                       <ColumnDefinition Width="2*"/>
                                       <ColumnDefinition Width="1*"/>
                                    </Grid.ColumnDefinitions>
-                                    <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>
+                                    <TextBlock Text="{Binding sName}"
+                                               Margin="0,0,2.5,0"
+                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                    <EgtWPFLib5:EgtTextBox2 Grid.Column="1"
                                                            Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
                                                            Margin="2.5,0,0,0"
@@ -163,16 +156,9 @@
                                       <ColumnDefinition Width="1*"/>
                                       <ColumnDefinition Width="1*"/>
                                    </Grid.ColumnDefinitions>
-                                    <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>
+                                    <TextBlock Text="{Binding sName}"
+                                               Margin="0,0,2.5,0"
+                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                    <ComboBox Grid.Column="1"
                                              ItemsSource="{Binding ValueList}"
                                              SelectedItem="{Binding SelValue}"
@@ -189,16 +175,9 @@
                                       <ColumnDefinition Width="2*"/>
                                       <ColumnDefinition Width="1*"/>
                                    </Grid.ColumnDefinitions>
-                                    <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>
+                                    <TextBlock Text="{Binding sName}"
+                                               Margin="0,0,2.5,0"
+                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                    <CheckBox Grid.Column="1"
                                              IsChecked="{Binding bValue}"
                                              HorizontalAlignment="Center"
@@ -75,6 +75,13 @@ 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() & "." &
@@ -182,17 +189,14 @@ Public Class MainWindowM
      Dim sKey As String = String.Empty
      EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
      EgtSetKey(sKey)
-      ' 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
+      Dim sNestKey As String = ""
+      EgtUILib.GetPrivateProfileString(S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
+      'EgtSetNestKey(sNestKey)
+      ' Verifico abilitazione nesting automatico
+      m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5583, 2508, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5583, 2508, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5583, 2504, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5583, 2504, 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())
@@ -116,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
@@ -132,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
@@ -148,7 +148,7 @@ Public Class MainWindowVM
   End Sub

   Private Function ProcessEvents(ByVal nProg As Integer, ByVal nPause As Integer) As Integer
-      If Map.refSliceManagerVM.bCalculating OrElse Map.refSliceManagerVM.bCalcSolid Then
+      If Map.refSliceManagerVM.bCalculating Then
         Map.refSliceManagerVM.ProcessEvents(nProg, nPause)
      End If
      If Not IsNothing(Map.refImportLoadingWndVM) Then
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.5.8.1")>
-<Assembly: AssemblyFileVersion("2.5.8.1")>
+<Assembly: AssemblyVersion("2.5.4.1")>
+<Assembly: AssemblyFileVersion("2.5.4.1")>
@@ -86,5 +86,12 @@
      <Image Source="/Resources/ProjectManager/Send.png"
             Style="{StaticResource Button_Image}"/>
   </Button>
+   <Button Command="{Binding Help_Command}"
+           ToolTip="{Binding Help_ToolTip}"
+           Margin="2.5,0,0,0"
+           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/Send.png"
+             Style="{StaticResource Button_Image}"/>
+   </Button>

 </StackPanel>
@@ -63,6 +63,7 @@ Public Class ProjManagerVM
   Private m_cmdExport As ICommand
   Private m_cmdOptions As ICommand
   Private m_cmdSendFeedback As ICommand
+   Private m_cmdHelp As ICommand


 #Region "ToolTip"
@@ -197,7 +198,7 @@ Public Class ProjManagerVM
   End Sub

   Friend Function OpenProject(sFilePath As String) As Boolean
-      Return Map.refSceneHostVM.OpenProject(sFilePath)
+      Map.refSceneHostVM.OpenProject(sFilePath)
   End Function

 #End Region ' OpenCommand
@@ -385,7 +386,7 @@ Public Class ProjManagerVM
            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
@@ -483,6 +484,30 @@ Public Class ProjManagerVM

 #End Region ' SendFeedback

+#Region "Help"
+
+   ''' <summary>
+   ''' Returns a command that do SendFeedback.
+   ''' </summary>
+   Public ReadOnly Property Help_Command As ICommand
+      Get
+         If m_cmdHelp Is Nothing Then
+            m_cmdHelp = New Command(AddressOf Help)
+         End If
+         Return m_cmdHelp
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the SendFeedback.  This method is invoked by the SendFeedbackCommand.
+   ''' </summary>
+   Public Sub Help(ByVal param As Object)
+      Dim HelpWnd As New HelpWndV(Application.Current.MainWindow, New HelpWndVM())
+      HelpWnd.Show()
+   End Sub
+
+#End Region ' Help
+
 #End Region    ' Commands

 End Class
@@ -2,9 +2,7 @@
           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 }"/>
@@ -29,27 +27,12 @@
                                        DataContext="{StaticResource SliderManagerVM}"
                                        HorizontalAlignment="Stretch"/>
      <!--StatusBar -->
-      <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"
+      <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}"/>
@@ -3,7 +3,6 @@ Imports EgtWPFLib5
 Imports EgtUILib
 Imports System.Collections.ObjectModel
 Imports System.IO
-Imports System.Globalization

 Public Class ProjectVM
   Inherits VMBase
@@ -29,15 +28,3 @@ 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
@@ -42,10 +42,6 @@ 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
@@ -378,8 +374,6 @@ 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
@@ -389,8 +383,6 @@ 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
@@ -399,17 +391,11 @@ Public Class RibPanelVM
      End Get
   End Property

-   Private m_RibList_IsEnabled As Boolean = False
   Public ReadOnly Property RibList_IsEnabled As Boolean
      Get
-         Return If(m_RibList.Count > 0, m_RibList_IsEnabled, False)
+         Return Not m_bMachParam_IsChecked
      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

@@ -427,8 +413,6 @@ Public Class RibPanelVM
      End Get
   End Property

-   Private m_bEscOnLine2P As Boolean = False
-
 #Region "Tooltip"

   Public ReadOnly Property Import_ToolTip As String
@@ -612,8 +596,6 @@ Public Class RibPanelVM
         SelRib = m_RibList(0)
         NotifyPropertyChanged(NameOf(SelRib))
      End If
-      ' abilito lista ribs
-      SetRibListIsEnabled(True)
      Map.refSceneHostVM.MainScene.SetStatusNull()
   End Sub

@@ -641,7 +623,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
@@ -649,13 +631,8 @@ Public Class RibPanelVM
            EgtSelectObj(m_SelRib.nCurveId)
         Case RibSelectionTypes.EXTRUSION
            ' creo layer per estrusione
-            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
+            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
            EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
            EgtSelectObj(m_SelRib.nCurveId)
         Case RibSelectionTypes.BOTH
@@ -663,8 +640,6 @@ Public Class RibPanelVM
            EgtSelectObj(m_SelRib.nExtrusionId)
      End Select
      EgtDraw()
-      ' disattivo il resto dell'interfaccia
-      ManageInterface(False)
      Return True
   End Function

@@ -674,7 +649,6 @@ 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
@@ -692,12 +666,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()
@@ -714,10 +688,6 @@ 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
@@ -784,10 +754,9 @@ Public Class RibPanelVM
            EgtSelectObj(nNewEntityId)
            If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.EXTRUDE) Then
               m_bIsCreatingExtrusion = True
-               If Not EgtCurveIsClosed(nNewEntityId) Then
-                  m_bEscOnLine2P = True
-               End If
            Else
+               ' cancello layer
+               'EgtErase(nNewRibLayerId)
               EgtErase(nNewExtrusionLayerId)
            End If
         End If
@@ -810,13 +779,6 @@ 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

@@ -852,18 +814,6 @@ 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"
@@ -887,9 +837,7 @@ Public Class RibPanelVM
   ''' </summary>
   Public Sub Import(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.InsertRib()
-      ManageInterface(True)
   End Sub

 #End Region ' Import
@@ -913,7 +861,6 @@ Public Class RibPanelVM
   ''' </summary>
   Public Sub Line2P(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
      If nNewRibLayerId = GDB_ID.NULL Then nNewRibLayerId = EgtCreateGroup(m_nPartId)
      EgtSetName(nNewRibLayerId, LAY_NEWRIB)
@@ -958,11 +905,10 @@ 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
@@ -1246,7 +1192,6 @@ Public Class RibPanelVM
   ''' </summary>
   Public Sub CPlaneElevation(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
   End Sub

@@ -1271,7 +1216,6 @@ Public Class RibPanelVM
   ''' </summary>
   Public Sub CPlaneOrigin(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
   End Sub

@@ -1388,7 +1332,6 @@ Public Class RibPanelVM
   ''' </summary>
   Public Sub CPlaneObj(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      ' salvo selezione precedente e deseleziono altri oggetti
      m_PrevSelObjs.Clear()
      Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -55,8 +55,7 @@ Public Class CopyFromWndVM
         Return
      End If
      ' copio i parametri nella rib corrente
-      Dim ParamList As New List(Of MachiningParam.Params)({MachiningParam.Params.RIBSSTRANDWIDTH,
-                                                           MachiningParam.Params.RIBSTYPE,
+      Dim ParamList As New List(Of MachiningParam.Params)({MachiningParam.Params.RIBSTYPE,
                                                           MachiningParam.Params.RIBSOVERLAP,
                                                           MachiningParam.Params.RIBSSTRANDCOUNT,
                                                           MachiningParam.Params.RIBSLINK,
@@ -71,9 +70,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
@@ -99,14 +98,11 @@ Public Class CopyFromWndVM
            Else
               RibTypeParam.SelValue = RibTypeParam.PartSelValue
            End If
-         Case MachiningParam.Params.RIBSSTRANDWIDTH, MachiningParam.Params.RIBSOVERLAP, MachiningParam.Params.RIBSSTRANDCOUNT, MachiningParam.Params.RIBSLEADINLEN, MachiningParam.Params.RIBSLEADOUTLEN,
+         Case 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)
@@ -42,8 +42,7 @@ Public Class RibParamPanelVM

      m_Type = Cathegories.RIBS
      m_sName = "Ribs"
-      m_MachiningParamList = New List(Of MachiningParam)({New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDWIDTH, nRibId, nPartId, Me),
-                                                          New RibComboMachiningParam(MachiningParam.Params.RIBSTYPE, nRibId, nPartId, Me),
+      m_MachiningParamList = New List(Of MachiningParam)({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),
@@ -136,8 +135,6 @@ 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()
@@ -231,14 +228,10 @@ Public Class RibNumericMachiningParam
      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 = False
+            m_bIsLen = True
         Case Params.RIBSSTRANDCOUNT
            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSSTRANDCOUNT, m_dValue)
            EgtGetInfo(nPartId, MAC_RIBSSTRANDCOUNT, m_dPartValue)
@@ -295,12 +288,6 @@ 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)
@@ -274,6 +274,8 @@ Public Class MySceneHostVM
      bOk = MainController.OpenProject(sFilePath, False)
      ' Imposto stato gestione mouse diretto della scena a nessuno
      MainScene.SetStatusNull()
+      ' imposto modalita' import
+      Map.refTopPanelVM.SelPage = Pages.NULL
      Return bOk
   End Function

@@ -15,6 +15,9 @@
   <EgtWPFLib5:EgtMainWindow.TitlePanel>
      <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
   </EgtWPFLib5:EgtMainWindow.TitlePanel>
+   <EgtWPFLib5:EgtMainWindow.HelpPanel>
+      <PrintApp:HelpPanelV DataContext="{StaticResource HelpPanelVM}"/>
+   </EgtWPFLib5:EgtMainWindow.HelpPanel>
   <EgtWPFLib5:EgtMainWindow.OpacityMask>
      <SolidColorBrush Color="White" Opacity="{Binding Window_Opacity}"/>
   </EgtWPFLib5:EgtMainWindow.OpacityMask>
@@ -26,5 +29,4 @@
      <PrintApp:ProjectV DataContext="{StaticResource ProjectVM}"/>

   </DockPanel>
-   
 </EgtWPFLib5:EgtMainWindow>
@@ -130,10 +130,7 @@ 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
-      Dim bOk As Boolean = OpenStdFile(sFile)
-      m_Window_Opacity = 1
-      NotifyPropertyChanged(NameOf(Window_Opacity))
-      Return bOk
+      Return OpenStdFile(sFile)
   End Function

   Friend Function OpenStdFile(sFile As String) As Boolean
@@ -40,10 +40,6 @@ 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
@@ -358,8 +354,6 @@ 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
@@ -369,8 +363,6 @@ 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
@@ -379,17 +371,11 @@ Public Class ShellNumberPanelVM
      End Get
   End Property

-   Private m_ShellNumberList_IsEnabled As Boolean = False
   Public ReadOnly Property ShellNumberList_IsEnabled As Boolean
      Get
-         Return If(m_ShellNumberList.Count > 0, m_ShellNumberList_IsEnabled, False)
+         Return Not m_bMachParam_IsChecked
      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

@@ -407,8 +393,6 @@ Public Class ShellNumberPanelVM
      End Get
   End Property

-   Private m_bEscOnLine2P As Boolean = False
-
 #Region "Tooltip"

   Public ReadOnly Property Import_ToolTip As String
@@ -592,8 +576,6 @@ Public Class ShellNumberPanelVM
         SelShellNumber = m_ShellNumberList(0)
         NotifyPropertyChanged(NameOf(SelShellNumber))
      End If
-      ' abilito lista shell number
-      SetShellNumberListIsEnabled(True)
      Map.refSceneHostVM.MainScene.SetStatusNull()
   End Sub

@@ -629,13 +611,8 @@ Public Class ShellNumberPanelVM
            EgtSelectObj(m_SelShellNumber.nCurveId)
         Case ShellNumberSelectionTypes.EXTRUSION
            ' creo layer per estrusione
-            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
+            Dim nNewExtrusionLayerId As Integer = EgtCreateGroup(m_nPartId)
+            EgtSetName(nNewExtrusionLayerId, LAY_NEWEXTRUSION)
            EgtSetCurrPartLayer(m_nPartId, nNewExtrusionLayerId)
            EgtSelectObj(m_SelShellNumber.nCurveId)
         Case ShellNumberSelectionTypes.BOTH
@@ -643,8 +620,6 @@ Public Class ShellNumberPanelVM
            EgtSelectObj(m_SelShellNumber.nExtrusionId)
      End Select
      EgtDraw()
-      ' disattivo il resto dell'interfaccia
-      ManageInterface(False)
      Return True
   End Function

@@ -654,7 +629,6 @@ 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
@@ -694,10 +668,6 @@ 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
@@ -740,7 +710,6 @@ 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'
@@ -793,13 +762,6 @@ 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

@@ -835,19 +797,6 @@ 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"
@@ -871,9 +820,7 @@ Public Class ShellNumberPanelVM
   ''' </summary>
   Public Sub Import(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.InsertShellNumber()
-      ManageInterface(True)
   End Sub

 #End Region ' Import
@@ -897,7 +844,6 @@ Public Class ShellNumberPanelVM
   ''' </summary>
   Public Sub Line2P(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Dim nNewShellNumberLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWRIB)
      If nNewShellNumberLayerId = GDB_ID.NULL Then nNewShellNumberLayerId = EgtCreateGroup(m_nPartId)
      EgtSetName(nNewShellNumberLayerId, LAY_NEWRIB)
@@ -946,7 +892,6 @@ Public Class ShellNumberPanelVM
         End If
         NotifyPropertyChanged(NameOf(SelShellNumber))
      End If
-      SetShellNumberListIsEnabled(True)
   End Sub

 #End Region    ' Delete
@@ -1231,7 +1176,6 @@ Public Class ShellNumberPanelVM
   ''' </summary>
   Public Sub CPlaneElevation(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
   End Sub

@@ -1256,7 +1200,6 @@ Public Class ShellNumberPanelVM
   ''' </summary>
   Public Sub CPlaneOrigin(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
   End Sub

@@ -1373,7 +1316,6 @@ Public Class ShellNumberPanelVM
   ''' </summary>
   Public Sub CPlaneObj(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      ' salvo selezione precedente e deseleziono altri oggetti
      m_PrevSelObjs.Clear()
      Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -44,11 +44,6 @@ Public Class SliceManagerVM
   Private m_bCalcTFS As Boolean = False
   Private m_bGenerate As Boolean = False
   Private m_bCalcSolid As Boolean = False
-   Friend ReadOnly Property bCalcSolid As Boolean
-      Get
-         Return m_bCalcSolid
-      End Get
-   End Property
   Friend Sub SetCalcSolid(value As Boolean)
      m_bCalcSolid = value
   End Sub
@@ -531,8 +526,6 @@ 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
@@ -20,22 +20,23 @@ 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
-               ' 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)
+               ' 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
               End If
               m_nLayerIndex = value
               ' se diverso da nullo visualizzo corrente
-               If m_nLayerIndex > 0 Then EgtSetStatus(Map.refTopPanelVM.SelPart.LayerList(m_nLayerIndex - 1).nLayerId, GDB_ST.ON_)
+               If Not IsNothing(Map.refTopPanelVM.SelPart) AndAlso 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
@@ -63,7 +64,6 @@ Public Class SliderManagerVM
               End If
               m_nLayerIndex = value
         End Select
-         DisableMgr.ReEnable()
         NotifyPropertyChanged(NameOf(ghShowValue))
         NotifyPropertyChanged(NameOf(ghValueIndex))
         NotifyPropertyChanged(NameOf(ghValueHeight))
@@ -71,44 +71,47 @@ 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
-            ' 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
+            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
            m_nLayerIndex = value
         Case ViewSliderType.UNTIL_SELECTED
-            ' 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
+            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
            m_nLayerIndex = value
         Case ViewSliderType.FROM_SELECTED
-            ' 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
+            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
            m_nLayerIndex = value
      End Select
-      DisableMgr.ReEnable()
      NotifyPropertyChanged(NameOf(nLayerIndex))
      NotifyPropertyChanged(NameOf(ghShowValue))
      NotifyPropertyChanged(NameOf(ghValueIndex))
@@ -198,8 +201,6 @@ 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
@@ -246,7 +247,6 @@ Public Class SliderManagerVM
               End If
               m_dLayerAdvancement = value
         End Select
-         DisableMgr.ReEnable()
         EgtDraw()
      End Set
   End Property
@@ -335,7 +335,6 @@ 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
@@ -362,7 +361,6 @@ 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))
@@ -28,7 +28,6 @@
             ItemsSource="{Binding StartList}"
             SelectedItem="{Binding SelStart}"
             DisplayMemberPath="ghName"
-             IsEnabled="{Binding StartList_IsEnabled}"
             Style="{StaticResource LeftPanel_ComboBox}"/>
   <!-- Add Button -->
   <ToggleButton x:Name="AddBtn"
@@ -35,10 +35,6 @@ Public Class StartMachPanelVM
         Return m_SelStart
      End Get
      Set(value As StartEntity)
-         If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse Map.refStartMachPanelVM.bCPlaneObj_IsActive Then
-            NotifyPropertyChanged(NameOf(SelStart))
-            Return
-         End If
         m_SelStart = value
         EgtDeselectAll()
         If Not IsNothing(value) Then
@@ -297,18 +293,6 @@ Public Class StartMachPanelVM
      End Get
   End Property

-   Private m_StartList_IsEnabled As Boolean = False
-   Public ReadOnly Property StartList_IsEnabled As Boolean
-      Get
-         Return If(m_StartList.Count > 0, m_StartList_IsEnabled, False)
-      End Get
-   End Property
-   Friend Sub SetStartListIsEnabled(bValue As Boolean)
-      m_StartList_IsEnabled = bValue
-      NotifyPropertyChanged(NameOf(StartList_IsEnabled))
-   End Sub
-
-
   ' riferimento griglia all'ingresso in questa pagina
   Private m_OriginalGridFrame As New Frame3d

@@ -320,8 +304,6 @@ Public Class StartMachPanelVM
      End Get
   End Property

-   Private m_bEscOnLine2P As Boolean = False
-
 #Region "Tooltip"

   Public ReadOnly Property Point_ToolTip As String
@@ -476,8 +458,6 @@ Public Class StartMachPanelVM
         SelStart = m_StartList(0)
         NotifyPropertyChanged(NameOf(SelStart))
      End If
-      ' abilito lista start mach
-      SetStartListIsEnabled(True)
      Map.refSceneHostVM.MainScene.SetStatusNull()
   End Sub

@@ -501,33 +481,16 @@ Public Class StartMachPanelVM
      ' seleziono percorso corrente
      EgtDeselectAll()
      EgtSelectObj(m_SelStart.nId)
-      EgtDraw()
-      ' disattivo il resto dell'interfaccia
-      ManageInterface(False)
      Return True
   End Function

   Friend Sub UpdateUI()
      ' se attiva operazione in piu' passaggi, esco
      If Map.refSceneHostVM.MainController.GetContinue() Then Return
-   End Sub
-
-   Friend Sub OnExecCmdEnd(command As Controller.CMD)
-      m_bEscOnLine2P = False
-      Select Case command
-         Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE,
-              Controller.CMD.MOVE, Controller.CMD.ROTATE
-            ' Imposto flag di ricalcolo slice
-            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
-            ' rimetto la selezione scena a null
-            Map.refSceneHostVM.MainScene.SetStatusNull()
-      End Select
-      ' riabilito interfaccia
-      ManageInterface(True)
-      ' se finita creazione curva
+      Dim NewEntity As StartEntity = Nothing
+      ' se finita creazione curva (è stata chiusa)
      If bIsCreatingPath Then
         m_bIsCreatingPath = False
-         Dim NewEntity As StartEntity = Nothing
         Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
         Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewStartLayerId)
         Dim NewGeomType As GDB_TY = EgtGetType(nNewEntityId)
@@ -540,22 +503,37 @@ Public Class StartMachPanelVM
                  NewEntityType = StartMachTypes.COMPO
            End Select
            EgtSetName(nNewEntityId, START_GEOM)
-            ' resetto colore entita'
-            EgtResetColor(nNewEntityId)
+            ' coloro l'entita' di rosso
+            Dim c3Red As Color3d
+            c3Red.FromColor(System.Drawing.Color.Red)
+            EgtSetColor(nNewEntityId, c3Red)
            ' lo sposto nel layer degli start
            EgtRelocateGlob(nNewEntityId, m_nStartMachLayerId, GDB_POS.LAST_SON)
            ' lo aggiungo alla lista
            NewEntity = New StartEntity(nNewEntityId, NewEntityType)
            m_StartList.Add(NewEntity)
-            ' lo seleziono
-            SelStart = NewEntity
-            NotifyPropertyChanged(NameOf(SelStart))
+            ' cancello layer di disegno
+            EgtErase(nNewStartLayerId)
         End If
-         ' cancello layer di disegno
-         EgtErase(nNewStartLayerId)
      End If
      ' aggiorno posizione
      RefreshPos()
+      ' se aggiunta entita'
+      If Not IsNothing(NewEntity) Then
+         SelStart = NewEntity
+         NotifyPropertyChanged(NameOf(SelStart))
+      End If
+      ' rimetto la selezione scena a null
+      Map.refSceneHostVM.MainScene.SetStatusNull()
+   End Sub
+
+   Friend Sub OnExecCmdEnd(command As Controller.CMD)
+      Select Case command
+         Case Controller.CMD.LINE2P, Controller.CMD.DELETE, Controller.CMD.MODIFYCURVE, Controller.CMD.ADDPOINTCURVE, Controller.CMD.REMOVEPOINTCURVE,
+              Controller.CMD.MOVE, Controller.CMD.ROTATE
+            ' Imposto flag di ricalcolo slice
+            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+      End Select
   End Sub

   Friend Sub OnKeyDown(Key As Forms.Keys)
@@ -572,12 +550,6 @@ Public Class StartMachPanelVM
            ' rimetto la selezione scena a null
            Map.refSceneHostVM.MainScene.SetStatusNull()
         End If
-         ' se esc su creazione percorso, lo annullo, altrimenti riabilito interfaccia
-         If m_bEscOnLine2P Then
-            m_bEscOnLine2P = False
-         Else
-            ManageInterface(True)
-         End If
      End If
   End Sub

@@ -593,18 +565,6 @@ Public Class StartMachPanelVM
      End If
   End Sub

-   Friend Sub ManageInterface(bValue As Boolean)
-      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
-      Map.refProjManagerVM.SetProjCmdIsEnabled(bValue)
-      Map.refTopPanelVM.SetTopPanelIsEnabled(bValue)
-      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(bValue)
-      Map.refSliderManagerVM.SetLayerIndexIsEnabled(bValue)
-      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(bValue)
-      Map.refSliceManagerVM.SetButtonsIsEnabled(bValue)
-      Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bValue)
-      SetStartListIsEnabled(bValue)
-   End Sub
-
 #End Region    ' METHODS

 #Region "COMMANDS"
@@ -628,13 +588,13 @@ Public Class StartMachPanelVM
   ''' </summary>
   Public Sub Point(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
-      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
+      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup( m_nPartId, LAY_NEWSTART)
      If nNewStartLayerId = GDB_ID.NULL Then
         nNewStartLayerId = EgtCreateGroup(m_nPartId)
         EgtSetName(nNewStartLayerId, LAY_NEWSTART)
      End If
      EgtSetCurrPartLayer(m_nPartId, nNewStartLayerId)
+      'InitCommand(True)
      If Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.POINT) Then
         m_bIsCreatingPath = True
      End If
@@ -661,8 +621,7 @@ Public Class StartMachPanelVM
   ''' </summary>
   Public Sub Line2P(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
-      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup(m_nPartId, LAY_NEWSTART)
+      Dim nNewStartLayerId As Integer = EgtGetFirstNameInGroup( m_nPartId, LAY_NEWSTART)
      If nNewStartLayerId = GDB_ID.NULL Then
         nNewStartLayerId = EgtCreateGroup(m_nPartId)
         EgtSetName(nNewStartLayerId, LAY_NEWSTART)
@@ -929,7 +888,6 @@ Public Class StartMachPanelVM
   ''' </summary>
   Public Sub CPlaneElevation(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
   End Sub

@@ -954,7 +912,6 @@ Public Class StartMachPanelVM
   ''' </summary>
   Public Sub CPlaneOrigin(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
   End Sub

@@ -995,7 +952,6 @@ Public Class StartMachPanelVM
   ''' </summary>
   Public Sub CPlaneObj(ByVal param As Object)
      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      ManageInterface(False)
      ' salvo selezione precedente e deseleziono altri oggetti
      m_PrevSelObjs.Clear()
      Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
@@ -1056,7 +1012,6 @@ Public Class StartMachPanelVM
         End If
         NotifyPropertyChanged(NameOf(SelStart))
      End If
-      SetStartListIsEnabled(True)
   End Sub

 #End Region    ' Delete
@@ -264,7 +264,7 @@
                     </DataTemplate>
                  </DataGridTextColumn.HeaderTemplate>
               </DataGridTextColumn>
-               <!--<DataGridTextColumn Header="FMin" 
+               <DataGridTextColumn Header="FMin" 
                                   Binding="{Binding sFMin}"
                                   IsReadOnly="True"
                                   Visibility="{Binding DataContext.ColExtend_Visibility,
@@ -276,7 +276,7 @@
                                               MeasureUnit="{Binding DataContext.MmPerMin_Msg, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:TFSEditorV}}}"/>
                     </DataTemplate>
                  </DataGridTextColumn.HeaderTemplate>
-               </DataGridTextColumn>-->
+               </DataGridTextColumn>
               <DataGridTextColumn Binding="{Binding sFTrg}"
                                   IsReadOnly="True"
                                   Visibility="{Binding DataContext.ColExtend_Visibility,
@@ -337,7 +337,7 @@ Public Class TFSEditorVM

   Public ReadOnly Property Seconds_Msg As String
      Get
-         Return "min:s"
+         Return "s"
      End Get
   End Property

@@ -58,7 +58,7 @@
      <ToggleButton x:Name="ModifyBtn"
                    Grid.Column="2"
                    Grid.Row="1"          
-                    Content="{Binding SelModifyModeName}"
+                    Content="{Binding SelectedItem.sName, ElementName=ModifyModeListBox}"
                    IsChecked="{Binding bModify_IsChecked}"  
                    Margin="2.5,0,2.5,0"
                    Style="{StaticResource TopPanel_Modify_ToggleButton}">
@@ -121,7 +121,6 @@ Public Class TopPanelVM
            Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.NULL)
            NotifyPropertyChanged(NameOf(SelModifyMode))
         End If
-         NotifyPropertyChanged(NameOf(SelModifyModeName))
         ' chiudo il popup
         SetModifyIsChecked(False)
      End Set
@@ -129,15 +128,8 @@ Public Class TopPanelVM
   Friend Sub SetSelModifyMode(ModifyMode As ModifyModes)
      SelModifyMode = m_ModifyModeList.FirstOrDefault(Function(x) x.ModifyMode = ModifyMode)
      NotifyPropertyChanged(NameOf(SelModifyMode))
-      NotifyPropertyChanged(NameOf(SelModifyModeName))
   End Sub

-   Public ReadOnly Property SelModifyModeName As String
-      Get
-         Return If(Not IsNothing(m_SelModifyMode) AndAlso m_SelModifyMode.ModifyMode <> ModifyModes.NULL, m_SelModifyMode.sName, "Modify")
-      End Get
-   End Property
-
   Private m_bModify_IsChecked As Boolean
   Public Property bModify_IsChecked As Boolean
      Get
@@ -274,27 +266,7 @@ Public Class TopPanelVM
            WriteMainPrivateProfileString(S_PRINTING3D, K_CURRMACHINING, value.sGUID.ToString())
            ' imposto selezionata come corrente
            If Not IsNothing(m_SelPart) AndAlso (IsNothing(m_SelMachining) OrElse value.sGUID <> m_SelMachining.sGUID) Then
-               Dim GeneralCathegory As MachiningCathegory = Map.refTopPanelVM.CurrMachining.CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL)
-               Dim OldSlicingTypeValue As Machining.MPAR_SLICINGTYPE = Nothing
-               Dim NewSlicingTypeValue As Machining.MPAR_SLICINGTYPE = Nothing
-               If Not IsNothing(GeneralCathegory) Then
-                  Dim SlicingTypeParam As ComboMachiningParam = GeneralCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.SLICINGTYPE)
-                  If Not IsNothing(SlicingTypeParam) Then
-                     OldSlicingTypeValue = SlicingTypeParam.SelValue.Id
-                  End If
-               End If
               Map.refCurrMachiningPanelVM.SetCurrMachining(New CurrMachining(m_SelPart.nPartId, value.nIndex))
-               GeneralCathegory = Map.refTopPanelVM.CurrMachining.CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL)
-               If Not IsNothing(GeneralCathegory) Then
-                  Dim SlicingTypeParam As ComboMachiningParam = GeneralCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.SLICINGTYPE)
-                  If Not IsNothing(SlicingTypeParam) Then
-                     NewSlicingTypeValue = SlicingTypeParam.SelValue.Id
-                  End If
-               End If
-               If IsNothing(OldSlicingTypeValue) OrElse IsNothing(NewSlicingTypeValue) OrElse OldSlicingTypeValue <> NewSlicingTypeValue Then
-                  ' aggiorno area di estrusione
-                  CurrentMachine.UpdateExtrusionArea()
-               End If
            End If
         End If
         m_SelMachining = value
@@ -79,14 +79,6 @@ Public Module CurrentMachine
      End Get
   End Property

-   ' altezza massima di estrusione impostata in file ini macchina
-   Private m_dSlicingMaxHeight As Double
-   Public ReadOnly Property dSlicingMaxHeight As Double
-      Get
-         Return m_dSlicingMaxHeight
-      End Get
-   End Property
-
 #Region "Init"

   Sub InitCurrentMachine(sMachinesRootDir As String, sMachineName As String)
@@ -105,8 +97,6 @@ Public Module CurrentMachine
      m_sMachiningFilePath = sMachinesRootDir & "\" & sMachineName & "\Machinings\Machinings.ini"
      ' impostazione cartella materiali
      m_sMaterialFilePath = sMachinesRootDir & "\" & sMachineName & "\Materials\Materials.ini"
-      ' leggo altezza massima estrusione impostata su macchina
-      m_dSlicingMaxHeight = GetPrivateProfileDouble(S_MACH_PRINTING3D, K_MAX_HEIGHT, 900, m_sMachIniFile)
      ' Disabilito segnalazione modificato
      Dim DisableMgr As New DisableModifiedMgr
      ' recupero box macchina
@@ -157,26 +147,20 @@ Public Module CurrentMachine
   End Sub

   Public Sub UpdateExtrusionArea()
-      Dim DisableMgr As New DisableModifiedMgr
      ' recupero eventuale vecchia area di estrusione
      Dim nTabPartId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, TABLE)
      Dim nTabLayerId As Integer = EgtGetFirstNameInGroup(nTabPartId, TABLE)
      Dim nExtrusionAreaId As Integer = EgtGetFirstNameInGroup(nTabLayerId, EXTRUSION_AREA)
-      If nExtrusionAreaId <> GDB_ID.NULL Then EgtErase(nExtrusionAreaId)
-      Dim nExtrusionRectId As Integer = EgtGetFirstNameInGroup(nTabLayerId, EXTRUSION_RECT)
-      If nExtrusionRectId <> GDB_ID.NULL Then EgtErase(nExtrusionRectId)
+      If nExtrusionAreaId <> GDB_ID.NULL Then
+         ' e la cancello
+         EgtErase(nExtrusionAreaId)
+      End If
      ' se lavorazione corrente nulla, esco
-      If IsNothing(Map.refTopPanelVM.CurrMachining) Then
-         DisableMgr.ReEnable() 
-         Return
-      End If
+      If IsNothing(Map.refTopPanelVM.CurrMachining) Then Return
      ' se non esiste file dati macchina, esco
-      If String.IsNullOrWhiteSpace(m_sMachDataIniFile) Then
-         DisableMgr.ReEnable()
-         Return
-      End If
+      If String.IsNullOrWhiteSpace(m_sMachDataIniFile) Then Return
      ' recupero tipo di slice
-      Dim sExtrusionType As String = S_VERTICAL
+      Dim sExtrusionType As String
      Dim GeneralCathegory As MachiningCathegory = Map.refTopPanelVM.CurrMachining.CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.GENERAL)
      Dim SlicingTypeParam As ComboMachiningParam = GeneralCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.SLICINGTYPE)
      Dim SlicingTypeValue As Machining.MPAR_SLICINGTYPE = SlicingTypeParam.SelValue.Id
@@ -194,19 +178,12 @@ Public Module CurrentMachine
      Dim dExtrXMin = GetPrivateProfileDouble(sExtrusionType, K_MINX, 0, m_sMachDataIniFile)
      Dim dExtrYMax = GetPrivateProfileDouble(sExtrusionType, K_MAXY, 0, m_sMachDataIniFile)
      Dim dExtrYMin = GetPrivateProfileDouble(sExtrusionType, K_MINY, 0, m_sMachDataIniFile)
-      Const AREA_WIDTH As Double = 10
-      Dim nAuxRectId As Integer = EgtCreateRectangle2P(nTabLayerId, New Point3d(dExtrXMin - AREA_WIDTH, dExtrYMin - AREA_WIDTH, 0), New Point3d(dExtrXMax + AREA_WIDTH, dExtrYMax + AREA_WIDTH, 0))
-      nExtrusionRectId = EgtCreateRectangle2P(nTabLayerId, New Point3d(dExtrXMin, dExtrYMin, 0), New Point3d(dExtrXMax, dExtrYMax, 0))
-      nExtrusionAreaId = EgtCreateSurfTmByRegion( nTabLayerId, { nAuxRectId, nExtrusionRectId}, EPS_STM)
-      EgtErase( nAuxRectId)
+      nExtrusionAreaId = EgtCreateRectangle2P(nTabLayerId, New Point3d(dExtrXMin, dExtrYMin, 0), New Point3d(dExtrXMax, dExtrYMax, 0))
      Dim c3Temp As New Color3d
      c3Temp.FromColor(System.Drawing.Color.Lime)
      EgtSetColor(nExtrusionAreaId, c3Temp)
      EgtSetName(nExtrusionAreaId, EXTRUSION_AREA)
-      EgtSetColor(nExtrusionRectId, c3Temp)
-      EgtSetName(nExtrusionRectId, EXTRUSION_RECT)
      m_b3ExtrusionArea = New BBox3d(New Point3d(dExtrXMin, dExtrYMin, 0), New Point3d(dExtrXMax, dExtrYMax, 0))
-      DisableMgr.ReEnable()
      EgtDraw()
   End Sub

@@ -52,6 +52,7 @@
   <PrintApp:MachineViewPanelVM x:Key="MachineViewPanelVM"/>
   <!--<PrintApp:ModifyPartPanelVM x:Key="ModifyPartPanelVM"/>-->
   <PrintApp:ManagePartPanelVM x:Key="ManagePartPanelVM"/>
+   <PrintApp:HelpPanelVM x:Key="HelpPanelVM"/>
   <!--<EgtBEAMWALL:CALCPanelVM x:Key="CALCPanelVM"/>
   <EgtBEAMWALL:PartParametersVM x:Key="PartParametersVM"/>
   <EgtBEAMWALL:LeftPanelVM x:Key="LeftPanelVM"/>
@@ -4190,81 +4191,70 @@
                              Background="White">
                           <Grid.ColumnDefinitions>
                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="*"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
                              <ColumnDefinition Width="Auto"/>
                           </Grid.ColumnDefinitions>

                           <Button Command="{Binding AboutBoxCommand}"
                                   Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
                                   Style="{StaticResource AboutBox_Button}">
-                              <Image Source="{TemplateBinding Icon}"/>
+                              <Image Source="{TemplateBinding Icon}"
+                                     Style="{StaticResource Button_Image}"/>
                           </Button>
-                           <Grid Grid.Column="1">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                              </Grid.ColumnDefinitions>
-                              <ContentPresenter Content="{TemplateBinding TitlePanel}"  
-                                                VerticalAlignment="Center"/>
-                              <TextBlock Text="{TemplateBinding ProjectName}" 
-                                          ToolTip="{TemplateBinding ProjectPath}"
-                                          Grid.Column="1"
-                                          TextTrimming="CharacterEllipsis"
-                                          FontSize="14"
-                                          VerticalAlignment="Center"
-                                          Background="{StaticResource Icarus_Gray}"
-                                          Padding="5,2,5,3"
-                                          Margin="10,0,0,0"
-                                          Foreground="White"/>
-                              <TextBlock x:Name="PART_MoveRectangle"
-                                          Text="{TemplateBinding Title}" 
-                                          Grid.Column="2"
-                                          TextTrimming="CharacterEllipsis"
-                                          HorizontalAlignment="Stretch" 
-                                          FontSize="14"
-                                          TextAlignment="Center"
-                                          VerticalAlignment="Center"
-                                          Width="Auto"
-                                          Foreground="{StaticResource Icarus_Gray}"
-                                          Panel.ZIndex="0"/>
-                           </Grid>
-
-                           <Grid x:Name="WindowControlsGrid" 
-                                 Grid.Column="2" 
-                                 Background="White">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="Auto"/>
-                              </Grid.ColumnDefinitions>
-
-                              <Button x:Name="MinimizeButton"
-                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
-                                       Style="{StaticResource TitleBar_Button}">
-                                 <Image Source="\Resources\Common\Minimize.png"/>
-                              </Button>
-                              <Button x:Name="MaximizeButton"
-                                       Grid.Column="1"
-                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
-                                       Style="{StaticResource TitleBar_Button}">
-                                 <Image Source="\Resources\Common\Maximize.png"/>
-                              </Button>
-                              <Button x:Name="RestoreButton"
-                                       Grid.Column="1"
-                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
-                                       Style="{StaticResource TitleBar_Button}"
-                                       Visibility="Collapsed">
-                                 <Image Source="\Resources\Common\Restore.png"/>
-                              </Button>
-                              <Button x:Name="CloseButton"
+                           <ContentPresenter Grid.Column="1"
+                                             Content="{TemplateBinding TitlePanel}"  
+                                             VerticalAlignment="Center"/>
+                           <TextBlock Text="{TemplateBinding ProjectName}" 
+                                       ToolTip="{TemplateBinding ProjectPath}"
                                       Grid.Column="2"
-                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
-                                       Command="{TemplateBinding CloseCommand}"
-                                       Style="{StaticResource TitleBar_Button}">
-                                 <Image Source="\Resources\Common\Close.png"/>
-                              </Button>
-                           </Grid>
+                                       TextTrimming="CharacterEllipsis"
+                                       FontSize="14"
+                                       VerticalAlignment="Center"
+                                       Background="{StaticResource Icarus_Gray}"
+                                       Padding="5,2,5,3"
+                                       Margin="10,0,0,0"
+                                       Foreground="White"/>
+                           <TextBlock x:Name="PART_MoveRectangle"
+                                       Text="{TemplateBinding Title}" 
+                                       Grid.Column="3"
+                                       TextTrimming="CharacterEllipsis"
+                                       HorizontalAlignment="Stretch" 
+                                       FontSize="14"
+                                       TextAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       Width="Auto"
+                                       Foreground="{StaticResource Icarus_Gray}"
+                                       Panel.ZIndex="0"/>
+                           <Button x:Name="MinimizeButton"
+                                   Grid.Column="4"
+                                    Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                    Style="{StaticResource TitleBar_Button}">
+                              <Image Source="\Resources\Common\Minimize.png"/>
+                           </Button>
+                           <Button x:Name="MaximizeButton"
+                                    Grid.Column="5"
+                                    Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                    Style="{StaticResource TitleBar_Button}">
+                              <Image Source="\Resources\Common\Maximize.png"/>
+                           </Button>
+                           <Button x:Name="RestoreButton"
+                                    Grid.Column="5"
+                                    Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                    Style="{StaticResource TitleBar_Button}"
+                                    Visibility="Collapsed">
+                              <Image Source="\Resources\Common\Restore.png"/>
+                           </Button>
+                           <Button x:Name="CloseButton"
+                                    Grid.Column="6"
+                                    Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                    Command="{TemplateBinding CloseCommand}"
+                                    Style="{StaticResource TitleBar_Button}">
+                              <Image Source="\Resources\Common\Close.png"/>
+                           </Button>
                        </Grid>
                        <Grid x:Name="PART_MainContentGrid"
                              Grid.Row="1"
@@ -4329,6 +4319,9 @@
                        Height="{StaticResource WindowBorder_Height}"
                        x:Name="topLeft" />
                  </Grid>
+                  <Grid Panel.ZIndex="20">
+                     <ContentPresenter Content="{TemplateBinding HelpPanel}"/>
+                  </Grid>
               </Grid>
               <ControlTemplate.Triggers>
                  <Trigger Property="WindowState" Value="Maximized">
@@ -4441,6 +4434,150 @@
      </Setter>
   </Style>

+   <Style x:Key="Help_Window" TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="Black"/>
+      <Setter Property="MinHeight" Value="320"/>
+      <Setter Property="MinWidth" Value="480"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
+      <Setter Property="Title" Value="{Binding Title}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type EgtWPFLib5:EgtMainWindow}">
+               <Grid Background="Transparent" x:Name="WindowRoot">
+                  <Border x:Name="ResizeBorder"
+                          BorderBrush="{StaticResource Icarus_Gray}"
+                          BorderThickness="{StaticResource WindowBorder_Thickness}">
+                     <Grid x:Name="LayoutRoot"
+                           Background="{TemplateBinding Background}">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="{StaticResource TitleBarHeight}"/>
+                           <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+
+                        <!--TitleBar-->
+                        <Grid x:Name="PART_HeaderBar"
+                              Background="White">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+
+                           <Button Command="{Binding AboutBoxCommand}"
+                                   Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                   Style="{StaticResource AboutBox_Button}">
+                              <Image Source="{TemplateBinding Icon}"/>
+                           </Button>
+                           <Grid Grid.Column="1">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <TextBlock x:Name="PART_MoveRectangle"
+                                          Text="{TemplateBinding Title}" 
+                                          Grid.Column="2"
+                                          TextTrimming="CharacterEllipsis"
+                                          HorizontalAlignment="Stretch" 
+                                          FontSize="14"
+                                          TextAlignment="Center"
+                                          VerticalAlignment="Center"
+                                          Width="Auto"
+                                          Foreground="{StaticResource Icarus_Gray}"
+                                          Panel.ZIndex="0"/>
+                           </Grid>
+
+                           <Grid x:Name="WindowControlsGrid" 
+                                 Grid.Column="2" 
+                                 Background="White">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+
+                              <Button x:Name="CloseButton"
+                                       Grid.Column="2"
+                                       Width="{Binding ActualHeight, ElementName=PART_HeaderBar}"
+                                       Command="{TemplateBinding CloseCommand}"
+                                       Style="{StaticResource TitleBar_Button}">
+                                 <Image Source="\Resources\Common\Close.png"/>
+                              </Button>
+                           </Grid>
+                        </Grid>
+                        <Grid x:Name="PART_MainContentGrid"
+                              Grid.Row="1"
+                              Panel.ZIndex="10">
+                           <ContentPresenter x:Name="PART_MainContentPresenter"/>
+                        </Grid>
+                     </Grid>
+                  </Border>
+                  <!-- Resize grid to be inserted here -->
+                  <Grid x:Name="PART_ResizeGrid">
+                     <Rectangle x:Name="top"
+                                Height="{StaticResource WindowBorder_Height}"
+                                VerticalAlignment="Top"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"
+                                Margin="5,0,5,0" />
+                     <Rectangle x:Name="bottom"
+                                Height="{StaticResource WindowBorder_Height}"
+                                VerticalAlignment="Bottom"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"
+                                Margin="5,0,5,0" />
+                     <Rectangle x:Name="left"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Left"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"
+                                Margin="0,5,0,5"/>
+                     <Rectangle x:Name="right"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Right"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"
+                                Margin="0,5,0,5"/>
+                     <Rectangle x:Name="bottomLeft"
+                                Height="{StaticResource WindowBorder_Height}"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Bottom"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"/>
+                     <Rectangle x:Name="bottomRight"
+                                Height="{StaticResource WindowBorder_Height}"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Bottom"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"/>
+                     <Rectangle x:Name="topRight"
+                                Height="{StaticResource WindowBorder_Height}"
+                                Width="{StaticResource WindowBorder_Height}"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Fill="Transparent"
+                                Stroke="{x:Null}"/>
+                     <Rectangle
+                        Stroke="{x:Null}"
+                        Fill="Transparent"
+                        HorizontalAlignment="Left"
+                        Width="{StaticResource WindowBorder_Height}"
+                        VerticalAlignment="Top"
+                        Height="{StaticResource WindowBorder_Height}"
+                        x:Name="topLeft" />
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Maximized">
+                     <Setter TargetName="ResizeBorder" Property="BorderThickness" Value="0"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
   <!-- ______________________________________________________________________________________________________________________________________________ -->

   <!--EgtMainWindow-->
@@ -4701,6 +4838,17 @@
   </Style>

   -->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- Help -->
+
+   <Style x:Key="TopBar_HelpButton" TargetType="{x:Type Grid}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+   </Style>
+
+
   <!-- ______________________________________________________________________________________________________________________________________________ -->

 </ResourceDictionary>
@@ -35,6 +35,8 @@ Module Map
   Private m_refManagePartPanelVM As ManagePartPanelVM
   Private m_refMachineViewPanelVM As MachineViewPanelVM
   Private m_refImportLoadingWndVM As ImportLoadingWndVM
+   Private m_refHelpPanelVM As HelpPanelVM
+   Private m_refHelpWndVM As HelpWndVM

 #Region "Get"

@@ -247,6 +249,18 @@ Module Map
      End Get
   End Property

+   Public ReadOnly Property refHelpPanelVM As HelpPanelVM
+      Get
+         Return m_refHelpPanelVM
+      End Get
+   End Property
+
+   Public ReadOnly Property refHelpWndVM As HelpWndVM
+      Get
+         Return m_refHelpWndVM
+      End Get
+   End Property
+
 #End Region    ' Get

 #Region "Set"
@@ -415,6 +429,16 @@ Module Map
      Return Not IsNothing(m_refImportLoadingWndVM)
   End Function

+   Friend Function SetRefHelpPanelVM(HelpPanelVM As HelpPanelVM) As Boolean
+      m_refHelpPanelVM = HelpPanelVM
+      Return Not IsNothing(m_refHelpPanelVM)
+   End Function
+
+   Friend Function SetRefHelpWndVM(HelpWndVM As HelpWndVM) As Boolean
+      m_refHelpWndVM = HelpWndVM
+      Return Not IsNothing(m_refHelpWndVM)
+   End Function
+
 #End Region    ' Set

 #Region "Init"
@@ -150,8 +150,8 @@ Public Class ViewLayer
   End Sub

   Friend Sub UpdateVisibility(bIsVisible As Boolean)
-      Dim DisableMgr As New DisableModifiedMgr
-      ' se solidi
+      ' Disabilito segnalazione modificato
+      Dim DisableMgr As New DisableModifiedMgr ' se solidi
      If m_Type = ViewLayerType.SOLID_SLICE Then
         If Map.refSceneHostVM.MainController.GetStep() = 0 Then
            ' aggiorno parametro di calcolo solidi sui pezzi
@@ -242,6 +242,7 @@ Public Class ViewLayer
            Next
         Next
      End If
+      ' Ripristino stato segnalazione modifica
      DisableMgr.ReEnable()
   End Sub