Icarus 2.7h1:

- aggiunti parametri RibsStrandOverlap e MaxSlicesNumber

Icarus/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -18,12 +18,24 @@ Public Class AboutBoxV
       Dim sLeftDays As String = ""
       Dim nLeftDays As Integer
       If EgtGetKeyLeftDays(nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays = " (" & nLeftDays.ToString() & ")"
+      Dim sAssStatus As String = " discontinued"
+      Dim nAssLeftDays As Integer
+      If EgtGetKeyAssLeftDays( nAssLeftDays) And nAssLeftDays >= 0 Then
+         If nAssLeftDays > 30 then
+            sAssStatus = "expires within " & nAssLeftDays.ToString() & " days"
+         Else If nAssLeftDays > 0 then
+            sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days"
+         Else  
+            sAssStatus = "to be renewed by today"
+         End If
+      End If
       sInfo = If(EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "")
       sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
                "  Inst" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() &
                " Ulv" & Map.refMainWindowVM.MainWindowM.nUserLevel.ToString() &
                " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine
       sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
+      sInfo &= "Maintenance plane " & sAssStatus & Environment.NewLine
       sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
       sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
       Dim sOpSys As String = String.Empty

Icarus/Constants/Const3dPrint.vb

@@ -68,6 +68,7 @@
    Public Const MAT_KW = "KW"
    Public Const MAT_KZ = "KZ"
    Public Const MAT_KN = "KN"
+   Public Const MAT_TDRYER = "TDRYER"
    Public Const MAT_ORIG = "Orig"
 
    ' parametri Lavorazione
@@ -90,6 +91,7 @@
    Public Const MAC_LINKTYPE = "LinkType"
    Public Const MAC_LINKPARAM = "LinkParam"
    Public Const MAC_LINKZUP = "LinkZup"
+   Public Const MAC_INNERSHELLWIDTH = "InnerStrandW"
    Public Const MAC_OFFSETLEADPOINT = "OffsetLeadPoint"
    Public Const MAC_LEADIN = "LeadIn"
    Public Const MAC_LEADINTANGDIST = "LeadInTangDist"
@@ -110,10 +112,16 @@
    Public Const MAC_POSTFLOWDELAY = "PostFlowDelay"
    Public Const MAC_SCREWBACK = "ScrewBack"
    Public Const MAC_SLICINGHEIGHT = "SlicingHeight"
+   Public Const MAC_MAXSLICESNUMBER = "MaxSlicesNumber"
+   Public Const MAC_RIBSSTRANDWIDTH = "RibsStrandW"
    Public Const MAC_RIBSTYPE = "RibsType"
    Public Const MAC_RIBSOVERLAP = "RibsOverlap"
+   Public Const MAC_RIBSSTRANDOVERLAP = "RibsStrandOverlap"
    Public Const MAC_RIBSSTRANDCOUNT = "RibsStrandCount"
    Public Const MAC_RIBSLINK = "RibsLink"
+   Public Const MAC_RIBSLINKFILLET = "RibsLinkFillet"
+   Public Const MAC_RIBSMERGEWITHSHELL = "RibsMergeWithShell"
+   Public Const MAC_RIBSINVERTMERGEDSHELLMAINLINK = "InvertRibsMergedShellMainLink"
    Public Const MAC_RIBSINVERTORDER = "RibsInvertOrder"
    Public Const MAC_RIBSINVERTDIRECTION = "RibsInvertDirection"
    Public Const MAC_RIBSINVERTSTRANDORDER = "RibsInvertStrandOrder"
@@ -124,11 +132,13 @@
    Public Const MAC_RIBSLEADOUTCOASTING = "RibsLeadOutCoasting"
    Public Const MAC_RIBSLEADOUTWIPE = "RibsLeadOutWipe"
    Public Const MAC_RIBSLEADOUTWIPEDIR = "RibsLeadOutWipeDir"
+   Public Const MAC_RIBSLEADFILLET = "RibsLeadFillet"
    Public Const MAC_RIBSLIMITUNBOUNDEDWITHSOLID = "LimitUnboundedRibsWithSolid"
    Public Const MAC_SHELLNBRDIFFERENCE = "ShellNbrDifference"
    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"
@@ -146,6 +156,7 @@
    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"

Icarus/Constants/ConstGen.vb

@@ -78,4 +78,7 @@ Public Module ConstGen
    ' Nome file Lua con le funzioni di attrezzaggio
    Public Const SETUP_LUA As String = "SetUp.lua"
 
+   ' Chiave di Info in gruppo di lavoro per attivazione Virtual Milling
+   Public Const KEY_MCHGRP_VM As String = "Vm"
+
 End Module

Icarus/Constants/ConstIni.vb

@@ -29,6 +29,7 @@ Public Module ConstIni
    Public Const K_NETKEY As String = "NetKey"
    Public Const K_LASTNGEDIR As String = "LastNgeDir"
    Public Const K_LASTIMPDIR As String = "LastImpDir"
+   Public Const K_MACHINEEXPORT As String = "MachineExport"
    'Public Const K_SUPPORT As String = "Support"
 
    'Public Const S_LANGUAGES As String = "Languages"
@@ -102,11 +103,14 @@ Public Module ConstIni
    Public Const K_DXFSCALE As String = "DxfScale"
    Public Const K_STLSCALE As String = "StlScale"
    Public Const K_CNCFLAG As String = "CncFlag"
+   Public Const K_ADVFLAG As String = "AdvFlag"
 
    'Public Const S_SIMUL As String = "Simul"
    'Public Const K_SLIDERX As String = "SliderX"
    'Public Const K_SLIDERVAL As String = "SliderVal"
    Public Const K_MACHVIEWMODE As String = "MachViewMode"
+   Public Const K_VIRTUALADDITIVE As String = "VirtualAdditive"
+   Public Const K_TRACEENABLE As String = "TraceEnable"
 
    Public Const S_PRINTING3D As String = "3dPrinting"
    Public Const K_3PRNBASEDIR As String = "BaseDir"
@@ -115,6 +119,9 @@ Public Module ConstIni
    Public Const K_VIEWSLIDER As String = "ViewSlider"
    Public Const K_IMPORTCURREXTENSION As String = "ImportCurrExtension"
 
+   Public Const S_SOLIDS As String = "Solids"
+   Public Const K_SIMPLIFIEDSECTION As String = "SimplifiedSection"
+
    Public Const S_COLORS As String = "Colors"
    Public Const K_CLR_PRINTPART As String = "PrintPart"
    Public Const K_CLR_RIBS As String = "Ribs"

Icarus/Constants/ConstMachIni.vb

@@ -14,4 +14,10 @@
 
    Public Const S_MINMAX As String = "MinMax"
 
+   Public Const S_VMILL As String = "VMill"
+   Public Const K_VM_ENABLE As String = "Enable"
+
+   Public Const S_TOOLTRACE As String = "ToolTrace"
+   Public Const K_TT_ENABLE As String = "Enable"
+
 End Module

Icarus/CurrMachiningPanel/CurrMachining.vb

@@ -221,15 +221,17 @@ Public Class CurrMachiningCathegory
                                                                 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.SLICINGHEIGHT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.MAXSLICESNUMBER, nPartId, nIndex, bForceFromDb, Me)})
          Case Cathegories.LINK
             m_sName = "Shell"
-            m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.LINKTYPE, nPartId, nIndex, bForceFromDb, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.INNERSHELLWIDTH, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.LINKTYPE, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.LINKPARAM, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrComboMachiningParam(MachiningParam.Params.LEADIN, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.LEADINTANGDIST, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.LEADINORTHODIST, nPartId, nIndex, bForceFromDb, Me),
-                                                                New 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),
@@ -240,11 +242,16 @@ 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 CurrComboMachiningParam(MachiningParam.Params.RIBSTYPE, nPartId, nIndex, bForceFromDb, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDWIDTH, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.RIBSTYPE, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDOVERLAP, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSLINK, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLINKFILLET, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSMERGEWITHSHELL, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTMERGEDSHELLMAINLINK, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nPartId, nIndex, bForceFromDb, Me),
@@ -254,7 +261,8 @@ Public Class CurrMachiningCathegory
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb, Me),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb, Me)})
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADFILLET, nPartId, nIndex, bForceFromDb, Me)})
          Case Cathegories.SHELL_NUMBER
             m_sName = "Reduce Shell Number"
             m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nPartId, nIndex, bForceFromDb, Me),
@@ -263,7 +271,8 @@ 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 CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nPartId, nIndex, bForceFromDb, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDWIDTH, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.AUXSOLIDSINFILLLINK, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDCOUNT, nPartId, nIndex, bForceFromDb, Me),
                                                                 New CurrComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nPartId, nIndex, bForceFromDb, Me),
@@ -282,7 +291,8 @@ Public Class CurrMachiningCathegory
                                                                 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.FLOORCOUNT, nPartId, nIndex, bForceFromDb, Me),
+            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),
@@ -360,8 +370,25 @@ Public Class CurrNumericMachiningParam
             StringToDouble(value, dTempValue)
          End If
          If m_bIsActiveMinMax Then
-            If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
-               m_dValue = dTempValue
+            If m_MinMaxType = MinMaxTypes.ABSOLUT Then
+               If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
+                  m_dValue = dTempValue
+               End If
+            ElseIf m_MinMaxType = MinMaxTypes.PERCENTAGE Then
+               Dim LinkedParam As MachiningParam = Nothing
+               ' cerco il parametro a cui e' collegato
+               For Each CurrCathegory In Map.refMachiningDbVM.SelMachining.CathegoryList
+                  LinkedParam = CurrCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = m_MinMaxLinkedParam)
+                  If Not IsNothing(LinkedParam) Then Exit For
+               Next
+               If Not IsNothing(LinkedParam) AndAlso TypeOf LinkedParam Is NumericMachiningParam Then
+                  Dim NumericLinkedParam As NumericMachiningParam = DirectCast(LinkedParam, NumericMachiningParam)
+                  If dTempValue >= NumericLinkedParam.dValue * m_dMinValue / 100 AndAlso dTempValue <= NumericLinkedParam.dValue * m_dMaxValue / 100 Then
+                     m_dValue = dTempValue
+                  End If
+               Else
+                  m_dValue = dTempValue
+               End If
             End If
          Else
             m_dValue = dTempValue
@@ -416,6 +443,9 @@ Public Class CurrNumericMachiningParam
          Case Params.LINKZUP
             bReadFromPart = EgtGetInfo(nPartId, MAC_LINKZUP, m_dValue)
             m_bIsLen = True
+         Case Params.INNERSHELLWIDTH
+            bReadFromPart = EgtGetInfo(nPartId, MAC_INNERSHELLWIDTH, m_dValue)
+            m_bIsLen = True
          Case Params.OFFSETLEADPOINT
             bReadFromPart = EgtGetInfo(nPartId, MAC_OFFSETLEADPOINT, m_dValue)
             m_bIsLen = True
@@ -460,22 +490,34 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.PREFLOWDELAY
             bReadFromPart = EgtGetInfo(nPartId, MAC_PREFLOWDELAY, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.POSTFLOWDELAY
             bReadFromPart = EgtGetInfo(nPartId, MAC_POSTFLOWDELAY, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.SCREWBACK
             bReadFromPart = EgtGetInfo(nPartId, MAC_SCREWBACK, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.SLICINGHEIGHT
             bReadFromPart = EgtGetInfo(nPartId, MAC_SLICINGHEIGHT, m_dValue)
             m_bIsLen = True
+         Case Params.MAXSLICESNUMBER
+            bReadFromPart = EgtGetInfo(nPartId, MAC_MAXSLICESNUMBER, m_dValue)
+            m_bIsLen = False
+         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
+         Case Params.RIBSSTRANDOVERLAP
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSSTRANDOVERLAP, m_dValue)
+            m_bIsLen = False
          Case Params.RIBSSTRANDCOUNT
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSSTRANDCOUNT, m_dValue)
             m_bIsLen = False
+         Case Params.RIBSLINKFILLET
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLINKFILLET, m_dValue)
+            m_bIsLen = True
          Case Params.RIBSLEADINLEN
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADINLEN, m_dValue)
             m_bIsLen = True
@@ -491,6 +533,9 @@ Public Class CurrNumericMachiningParam
          Case Params.RIBSLEADOUTWIPEDIR
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADOUTWIPEDIR, m_dValue)
             m_bIsLen = False
+         Case Params.RIBSLEADFILLET
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADFILLET, m_dValue)
+            m_bIsLen = True
          Case Params.SHELLNBRDIFFERENCE
             bReadFromPart = EgtGetInfo(nPartId, MAC_SHELLNBRDIFFERENCE, m_dValue)
             m_bIsLen = False
@@ -503,6 +548,9 @@ 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
@@ -548,6 +596,9 @@ Public Class CurrNumericMachiningParam
          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
@@ -581,24 +632,24 @@ Public Class CurrNumericMachiningParam
          Dim DbMachining As Machining = Map.refMachiningDbVM.MachiningList.FirstOrDefault(Function(x) x.nIndex = nIndex)
          Select Case Type
             Case Params.STRANDH, Params.STRANDW, Params.STRANDCOUNT, Params.OFFSET, Params.STRANDOVERLAP, Params.STARTPOINTOFFSETONSLICE,
-                 Params.G0FEED, Params.G0FEEDZ, Params.LINKZUP, Params.TOOLDIAM, Params.FLOWRATE_PC, Params.PREFLOWDELAY, Params.POSTFLOWDELAY, Params.SCREWBACK, Params.SLICINGHEIGHT
+                 Params.G0FEED, Params.G0FEEDZ, Params.LINKZUP, Params.TOOLDIAM, Params.FLOWRATE_PC, Params.PREFLOWDELAY, Params.POSTFLOWDELAY, Params.SCREWBACK, Params.SLICINGHEIGHT, Params.MAXSLICESNUMBER
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.LINKPARAM, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST,
+            Case Params.LINKPARAM, Params.INNERSHELLWIDTH, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST,
                  Params.LEADOUTTANGDIST, Params.LEADOUTORTHODIST, Params.COASTINGLEN, Params.COASTINGFEED_PC,
                  Params.WIPELEN, Params.WIPEFEED_PC  ' Params.WIPEDIR
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.LINK).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.RIBSOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION,
+            Case Params.RIBSSTRANDWIDTH, Params.RIBSOVERLAP, Params.RIBSSTRANDOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSLINKFILLET, Params.RIBSMERGEWITHSHELL, Params.RIBSINVERTMERGEDSHELLMAINLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION,
                  Params.RIBSLEADININVERT, Params.RIBSLEADINLEN, Params.RIBSLEADOUTINVERT, Params.RIBSLEADOUTLEN, Params.RIBSLEADOUTCOASTING,
-                 Params.RIBSLEADOUTWIPE, Params.RIBSLEADOUTWIPEDIR
+                 Params.RIBSLEADOUTWIPE, Params.RIBSLEADOUTWIPEDIR, Params.RIBSLEADFILLET
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
             Case Params.SHELLNBRDIFFERENCE, Params.SHELLNBRCOASTING, Params.SHELLNBRWIPE, Params.SHELLNBRWIPEDIR
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.SHELL_NUMBER).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.AUXSOLIDSOVERLAP, Params.AUXSOLIDSLINKPARAM, Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE,
+            Case Params.AUXSOLIDSSTRANDWIDTH, Params.AUXSOLIDSOVERLAP, Params.AUXSOLIDSLINKPARAM, Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE,
                  Params.AUXSOLIDSOFFSETLEADPOINT, Params.AUXSOLIDSDENSITY, Params.AUXSOLIDSGRIDOVERLAP,
                  Params.AUXSOLIDSDIRECTION, Params.AUXSOLIDSOFFSETX, Params.AUXSOLIDSOFFSETY,
                  Params.AUXSOLIDSCOASTINGLEN, Params.AUXSOLIDSWIPELEN, Params.AUXSOLIDSWIPEDIR, Params.AUXSOLIDSSTRANDCOUNT
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.AUX_SOLID).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.FLOORCOUNT, Params.CEILCOUNT, Params.INFILLDENSITY, Params.INFILLOVERLAP,
+            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)
@@ -640,6 +691,8 @@ Public Class CurrNumericMachiningParam
             EgtSetInfo(nPartId, MAC_LINKPARAM, sWriteValue)
          Case Params.LINKZUP
             EgtSetInfo(nPartId, MAC_LINKZUP, sWriteValue)
+         Case Params.INNERSHELLWIDTH
+            EgtSetInfo(nPartId, MAC_INNERSHELLWIDTH, sWriteValue)
          Case Params.OFFSETLEADPOINT
             EgtSetInfo(nPartId, MAC_OFFSETLEADPOINT, sWriteValue)
          Case Params.LEADINTANGDIST
@@ -676,10 +729,18 @@ Public Class CurrNumericMachiningParam
             EgtSetInfo(nPartId, MAC_SCREWBACK, sWriteValue)
          Case Params.SLICINGHEIGHT
             EgtSetInfo(nPartId, MAC_SLICINGHEIGHT, sWriteValue)
+         Case Params.MAXSLICESNUMBER
+            EgtSetInfo(nPartId, MAC_MAXSLICESNUMBER, sWriteValue)
+         Case Params.RIBSSTRANDWIDTH
+            EgtSetInfo(nPartId, MAC_RIBSSTRANDWIDTH, sWriteValue)
          Case Params.RIBSOVERLAP
             EgtSetInfo(nPartId, MAC_RIBSOVERLAP, sWriteValue)
+         Case Params.RIBSSTRANDOVERLAP
+            EgtSetInfo(nPartId, MAC_RIBSSTRANDOVERLAP, sWriteValue)
          Case Params.RIBSSTRANDCOUNT
             EgtSetInfo(nPartId, MAC_RIBSSTRANDCOUNT, sWriteValue)
+         Case Params.RIBSLINKFILLET
+            EgtSetInfo(nPartId, MAC_RIBSLINKFILLET, sWriteValue)
          Case Params.RIBSLEADINLEN
             EgtSetInfo(nPartId, MAC_RIBSLEADINLEN, sWriteValue)
          Case Params.RIBSLEADOUTLEN
@@ -690,6 +751,8 @@ Public Class CurrNumericMachiningParam
             EgtSetInfo(nPartId, MAC_RIBSLEADOUTWIPE, sWriteValue)
          Case Params.RIBSLEADOUTWIPEDIR
             EgtSetInfo(nPartId, MAC_RIBSLEADOUTWIPEDIR, sWriteValue)
+         Case Params.RIBSLEADFILLET
+            EgtSetInfo(nPartId, MAC_RIBSLEADFILLET, sWriteValue)
          Case Params.SHELLNBRDIFFERENCE
             EgtSetInfo(nPartId, MAC_SHELLNBRDIFFERENCE, sWriteValue)
          Case Params.SHELLNBRCOASTING
@@ -698,6 +761,8 @@ 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
@@ -726,6 +791,8 @@ 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
@@ -1136,6 +1203,10 @@ Public Class CurrCheckMachiningParam
             bReadFromPart = EgtGetInfo(nPartId, MAC_SPIRALVASE, m_bValue)
          Case Params.RIBSLINK
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLINK, m_bValue)
+         Case Params.RIBSMERGEWITHSHELL
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSMERGEWITHSHELL, m_bValue)
+         Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTMERGEDSHELLMAINLINK, m_bValue)
          Case Params.RIBSINVERTORDER
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTORDER, m_bValue)
          Case Params.RIBSINVERTDIRECTION
@@ -1159,7 +1230,7 @@ Public Class CurrCheckMachiningParam
          Select Case Type
             Case Params.SPIRALVASE
                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
+            Case Params.RIBSLINK, Params.RIBSMERGEWITHSHELL, Params.RIBSINVERTMERGEDSHELLMAINLINK, 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)
@@ -1179,6 +1250,10 @@ Public Class CurrCheckMachiningParam
             EgtSetInfo(nPartId, MAC_SPIRALVASE, If(m_bValue, 1, 0))
          Case Params.RIBSLINK
             EgtSetInfo(nPartId, MAC_RIBSLINK, If(m_bValue, 1, 0))
+         Case Params.RIBSMERGEWITHSHELL
+            EgtSetInfo(nPartId, MAC_RIBSMERGEWITHSHELL, If(m_bValue, 1, 0))
+         Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+            EgtSetInfo(nPartId, MAC_RIBSINVERTMERGEDSHELLMAINLINK, If(m_bValue, 1, 0))
          Case Params.RIBSINVERTORDER
             EgtSetInfo(nPartId, MAC_RIBSINVERTORDER, If(m_bValue, 1, 0))
          Case Params.RIBSINVERTDIRECTION

Icarus/DispositionPanel/DispositionPanelVM.vb

@@ -21,8 +21,8 @@ Public Class DispositionPanelVM
          Dim dNewXPos As Double = ptReference.x
          StringToLen(value, dNewXPos)
          Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
-         Dim dMin As Double = 0
-         Dim dMax As Double = CurrentMachine.b3Tab.DimX
+         Dim dMin As Double = Math.Min( 0, CurrentMachine.b3ExtrusionArea.Min.x)
+         Dim dMax As Double = Math.Max( CurrentMachine.b3Tab.DimX, CurrentMachine.b3ExtrusionArea.Max.x)
          If b3Print.Max.x > ptReference.x Then
             dMax -= b3Print.Max.x - ptReference.x
          End If
@@ -60,8 +60,8 @@ Public Class DispositionPanelVM
          Dim dNewYPos As Double = ptReference.y
          StringToLen(value, dNewYPos)
          Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
-         Dim dMin As Double = 0
-         Dim dMax As Double = CurrentMachine.b3Tab.DimY
+         Dim dMin As Double = Math.Min( 0, CurrentMachine.b3ExtrusionArea.Min.y)
+         Dim dMax As Double = Math.Max( CurrentMachine.b3Tab.DimY, CurrentMachine.b3ExtrusionArea.Max.y)
          If b3Print.Max.y > ptReference.y Then
             dMax -= b3Print.Max.y - ptReference.y
          End If

Icarus/FilledSolidPanel/FilledSolidPanelVM.vb

@@ -595,6 +595,7 @@ Public Class FilledSolidPanelVM
    Friend Sub Dispose()
       ' ripristino frame originale
       EgtSetGridFrame(m_OriginalGridFrame)
+      EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY())
       ' se in modifica parametri
       If m_bMachParam_IsChecked Then
          ' ripristino modalita' standard
@@ -1075,6 +1076,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY())
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1100,6 +1102,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1125,6 +1128,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1150,6 +1154,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1175,6 +1180,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1200,6 +1206,7 @@ Public Class FilledSolidPanelVM
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1226,6 +1233,7 @@ Public Class FilledSolidPanelVM
    Public Sub CPlaneElevation(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       ManageInterface(False)
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1251,87 +1259,12 @@ Public Class FilledSolidPanelVM
    Public Sub CPlaneOrigin(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       ManageInterface(False)
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
 #End Region ' CPlaneOrigin
 
-#Region "CPlaneRotate"
-
-   ''' <summary>
-   ''' Returns a command that do CPlaneRotate.
-   ''' </summary>
-   Public ReadOnly Property CPlaneRotate_Command As ICommand
-      Get
-         If m_cmdCPlaneRotate Is Nothing Then
-            m_cmdCPlaneRotate = New Command(AddressOf CPlaneRotate)
-         End If
-         Return m_cmdCPlaneRotate
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlaneRotate.  This method is invoked by the CPlaneRotateCommand.
-   ''' </summary>
-   Public Sub CPlaneRotate(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
-         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE)
-      Else
-         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE3D)
-      End If
-   End Sub
-
-#End Region ' CPlaneRotate
-
-#Region "CPlane3P"
-
-   ''' <summary>
-   ''' Returns a command that do CPlane3P.
-   ''' </summary>
-   Public ReadOnly Property CPlane3P_Command As ICommand
-      Get
-         If m_cmdCPlane3P Is Nothing Then
-            m_cmdCPlane3P = New Command(AddressOf CPlane3P)
-         End If
-         Return m_cmdCPlane3P
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlane3P.  This method is invoked by the CPlane3PCommand.
-   ''' </summary>
-   Public Sub CPlane3P(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_3P)
-   End Sub
-
-#End Region ' CPlane3P
-
-#Region "CPlanePerpObj"
-
-   ''' <summary>
-   ''' Returns a command that do CPlanePerpObj.
-   ''' </summary>
-   Public ReadOnly Property CPlanePerpObj_Command As ICommand
-      Get
-         If m_cmdCPlanePerpObj Is Nothing Then
-            m_cmdCPlanePerpObj = New Command(AddressOf CPlanePerpObj)
-         End If
-         Return m_cmdCPlanePerpObj
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlanePerpObj.  This method is invoked by the CPlanePerpObjCommand.
-   ''' </summary>
-   Public Sub CPlanePerpObj(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE)
-   End Sub
-
-#End Region ' CPlanePerpObj
-
 #Region "CPlaneObj"
 
    Private m_bCPlaneObj_IsActive As Boolean = False

Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb

@@ -42,8 +42,9 @@ Public Class FilledSolidParamPanelVM
 
       m_Type = Cathegories.AUX_SOLID
       m_sName = "Filled Solid"
-      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId, Me),
-                                                          New FilledSolidcheckMachiningParam(MachiningParam.Params.AUXSOLIDSINFILLLINK, nFilledSolidId, nPartId, Me),
+      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDWIDTH, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId, Me),
+                                                          New FilledSolidCheckMachiningParam(MachiningParam.Params.AUXSOLIDSINFILLLINK, nFilledSolidId, nPartId, Me),
                                                           New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDCOUNT, nFilledSolidId, nPartId, Me),
                                                           New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nFilledSolidId, nPartId, Me),
                                                           New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nFilledSolidId, nPartId, Me),
@@ -198,10 +199,14 @@ 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 = True
+            m_bIsLen = False
          Case Params.AUXSOLIDSOVERLAP
             bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, m_dValue)
             EgtGetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, m_dPartValue)
@@ -266,6 +271,12 @@ 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)

Icarus/Icarus.vbproj

@@ -76,6 +76,9 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DotNetZip">
+      <HintPath>..\..\..\EgtProg\Icarus\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EgtUILib, Version=2.4.7.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
@@ -84,9 +87,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
     </Reference>
-    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>

Icarus/MachiningDb/Machining.vb

@@ -343,10 +343,12 @@ Public Class MachiningCathegory
                                                                 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.SLICINGHEIGHT, nIndex, Me),
+                                                                New NumericMachiningParam(MachiningParam.Params.MAXSLICESNUMBER, nIndex, Me)})
          Case Cathegories.LINK
             m_sName = "Shell"
-            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.OFFSETLEADPOINT, nIndex, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.INNERSHELLWIDTH, nIndex, Me),
+                                                                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),
@@ -362,11 +364,16 @@ Public Class MachiningCathegory
                                                                 'New NumericMachiningParam(MachiningParam.Params.WIPEDIR, nIndex, Me)})
          Case Cathegories.RIBS
             m_sName = "Ribs"
-            m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.RIBSTYPE, nIndex, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.RIBSSTRANDWIDTH, nIndex, Me),
+                                                                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.RIBSSTRANDOVERLAP, nIndex, Me),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nIndex, Me),
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSLINK, nIndex, Me),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLINKFILLET, nIndex, Me),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSMERGEWITHSHELL, nIndex, Me),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTMERGEDSHELLMAINLINK, nIndex, Me),
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nIndex, Me),
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nIndex, Me),
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nIndex, Me),
@@ -376,7 +383,8 @@ Public Class MachiningCathegory
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nIndex, Me),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nIndex, Me),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nIndex, Me),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nIndex, Me)})
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nIndex, Me),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADFILLET, nIndex, Me)})
          Case Cathegories.SHELL_NUMBER
             m_sName = "Reduce Shell Number"
             m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nIndex, Me),
@@ -385,7 +393,8 @@ 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 ComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nIndex, Me),
+            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDWIDTH, 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),
@@ -404,7 +413,8 @@ Public Class MachiningCathegory
                                                                 New NumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nIndex, Me)})
          Case Cathegories.INFILL
             m_sName = "Infill"
-            m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.FLOORCOUNT, nIndex, Me),
+            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),
@@ -488,6 +498,11 @@ 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
@@ -510,6 +525,7 @@ Public MustInherit Class MachiningParam
       POSTFLOWDELAY = 20
       SCREWBACK = 21
       SLICINGHEIGHT = 22
+      MAXSLICESNUMBER = 23
       LINKTYPE = 51
       LINKPARAM = 52
       LEADIN = 53
@@ -523,22 +539,29 @@ Public MustInherit Class MachiningParam
       COASTINGFEED_PC = 61
       WIPELEN = 62
       WIPEFEED_PC = 63
+      INNERSHELLWIDTH = 64
       'WIPEDIR = 64
       RIBSTYPE = 101
       RIBSOVERLAP = 102
       RIBSSTRANDCOUNT = 103
       RIBSLINK = 104
-      RIBSINVERTORDER = 105
-      RIBSINVERTDIRECTION = 106
-      RIBSINVERTSTRANDORDER = 107
-      RIBSLEADININVERT = 108
-      RIBSLEADINLEN = 109
-      RIBSLEADOUTINVERT = 110
-      RIBSLEADOUTLEN = 111
-      RIBSLEADOUTCOASTING = 112
-      RIBSLEADOUTWIPE = 113
-      RIBSLEADOUTWIPEDIR = 114
-      RIBSLIMITUNBOUNDEDWITHSOLID = 115
+      RIBSMERGEWITHSHELL = 105
+      RIBSINVERTMERGEDSHELLMAINLINK = 106
+      RIBSINVERTORDER = 107
+      RIBSINVERTDIRECTION = 108
+      RIBSINVERTSTRANDORDER = 109
+      RIBSLEADININVERT = 110
+      RIBSLEADINLEN = 111
+      RIBSLEADOUTINVERT = 112
+      RIBSLEADOUTLEN = 113
+      RIBSLEADOUTCOASTING = 114
+      RIBSLEADOUTWIPE = 115
+      RIBSLEADOUTWIPEDIR = 116
+      RIBSLIMITUNBOUNDEDWITHSOLID = 117
+      RIBSSTRANDWIDTH = 118
+      RIBSLINKFILLET = 119
+      RIBSLEADFILLET = 120
+      RIBSSTRANDOVERLAP = 121
       SHELLNBRDIFFERENCE = 151
       SHELLNBRCOASTING = 152
       SHELLNBRWIPE = 153
@@ -560,6 +583,7 @@ Public MustInherit Class MachiningParam
       AUXSOLIDSWIPEDIR = 215
       AUXSOLIDSSTRANDCOUNT = 216
       AUXSOLIDSINFILLLINK = 217
+      AUXSOLIDSSTRANDWIDTH = 218
       FLOORCOUNT = 250
       FLOORTYPE = 251
       CEILCOUNT = 252
@@ -575,7 +599,8 @@ Public MustInherit Class MachiningParam
       INFILLCOASTING = 262
       INFILLWIPE = 263
       INFILLWIPEDIR = 264
-      MATERIALS = 500
+      INFILLSTRANDWIDTH = 265
+      Materials = 500
    End Enum
 
    Protected m_Type As Params
@@ -644,6 +669,8 @@ 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
@@ -682,14 +709,26 @@ Public MustInherit Class MachiningParam
             m_sName = "Screw Back"
          Case Params.SLICINGHEIGHT
             m_sName = "Slicing Height"
+         Case Params.MAXSLICESNUMBER
+            m_sName = "Max Slices Number"
+         Case Params.RIBSSTRANDWIDTH
+            m_sName = "Custom Strand Width"
          Case Params.RIBSTYPE
             m_sName = "Type"
          Case Params.RIBSOVERLAP
             m_sName = "Overlap [%]"
+         Case Params.RIBSSTRANDOVERLAP
+            m_sName = "Strand Overlap [%]"
          Case Params.RIBSSTRANDCOUNT
             m_sName = "Strand Count"
          Case Params.RIBSLINK
             m_sName = "Link"
+         Case Params.RIBSLINKFILLET
+            m_sName = "Link Fillet"
+         Case Params.RIBSMERGEWITHSHELL
+            m_sName = "Merge With Shell"
+         Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+            m_sName = "Invert Merged Shell Main Link"
          Case Params.RIBSINVERTORDER
             m_sName = "Invert Order"
          Case Params.RIBSINVERTDIRECTION
@@ -710,6 +749,8 @@ Public MustInherit Class MachiningParam
             m_sName = "Lead Out Wipe"
          Case Params.RIBSLEADOUTWIPEDIR
             m_sName = "Lead Out Wipe Dir [deg]"
+         Case Params.RIBSLEADFILLET
+            m_sName = "Lead Fillet"
          Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
             m_sName = "Limit Unbounded With Solid"
          Case Params.SHELLNBRDIFFERENCE
@@ -720,6 +761,8 @@ 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
@@ -766,6 +809,8 @@ Public MustInherit Class MachiningParam
             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
@@ -817,6 +862,8 @@ 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
 
@@ -838,8 +885,25 @@ Public Class NumericMachiningParam
             StringToDouble(value, dTempValue)
          End If
          If m_bIsActiveMinMax Then
-            If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
-               m_dValue = dTempValue
+            If m_MinMaxType = MinMaxTypes.ABSOLUT Then
+               If dTempValue >= m_dMinValue AndAlso dTempValue <= m_dMaxValue Then
+                  m_dValue = dTempValue
+               End If
+            ElseIf m_MinMaxType = MinMaxTypes.PERCENTAGE Then
+               Dim LinkedParam As MachiningParam = Nothing
+               ' cerco il parametro a cui e' collegato
+               For Each CurrCathegory In Map.refMachiningDbVM.SelMachining.CathegoryList
+                  LinkedParam = CurrCathegory.MachiningParamList.FirstOrDefault(Function(x) x.Type = m_MinMaxLinkedParam)
+                  If Not IsNothing(LinkedParam) Then Exit For
+               Next
+               If Not IsNothing(LinkedParam) AndAlso TypeOf LinkedParam Is NumericMachiningParam Then
+                  Dim NumericLinkedParam As NumericMachiningParam = DirectCast(LinkedParam, NumericMachiningParam)
+                  If dTempValue >= NumericLinkedParam.dValue * m_dMinValue / 100 AndAlso dTempValue <= NumericLinkedParam.dValue * m_dMaxValue / 100 Then
+                     m_dValue = dTempValue
+                  End If
+               Else
+                  m_dValue = dTempValue
+               End If
             End If
          Else
             m_dValue = dTempValue
@@ -885,15 +949,38 @@ Public Class NumericMachiningParam
          Dim sMinMaxValues() As String = sMinMax.Split(","c)
          Dim dMin As Double = 0
          Dim dMax As Double = 0
-         If StringToDouble(sMinMaxValues(0), dMin) AndAlso StringToDouble(sMinMaxValues(1), dMax) Then
-            m_dMinValue = dMin
-            m_dMaxValue = dMax
-            m_bIsActiveMinMax = True
+         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
          End If
       End If
       If Type = Params.SLICINGHEIGHT Then
          m_dMinValue = 0
          m_dMaxValue = CurrentMachine.dSlicingMaxHeight
+         m_MinMaxType = MinMaxTypes.ABSOLUT
          m_bIsActiveMinMax = True
       End If
       ' leggo parametri da Db
@@ -926,6 +1013,9 @@ 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
@@ -980,12 +1070,24 @@ Public Class NumericMachiningParam
             Case Params.SLICINGHEIGHT
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_SLICINGHEIGHT, CurrentMachine.dSlicingMaxHeight)
                m_bIsLen = False
+            Case Params.MAXSLICESNUMBER
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_MAXSLICESNUMBER, 0)
+               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
+            Case Params.RIBSSTRANDOVERLAP
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSSTRANDOVERLAP, 0)
+               m_bIsLen = False
             Case Params.RIBSSTRANDCOUNT
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSSTRANDCOUNT, 0)
                m_bIsLen = False
+            Case Params.RIBSLINKFILLET
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLINKFILLET, 0)
+               m_bIsLen = True
             Case Params.RIBSLEADINLEN
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADINLEN, 0)
                m_bIsLen = True
@@ -1001,6 +1103,9 @@ Public Class NumericMachiningParam
             Case Params.RIBSLEADOUTWIPEDIR
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADOUTWIPEDIR, 0)
                m_bIsLen = False
+            Case Params.RIBSLEADFILLET
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADFILLET, 0)
+               m_bIsLen = True
             Case Params.SHELLNBRDIFFERENCE
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_SHELLNBRDIFFERENCE, 0)
                m_bIsLen = False
@@ -1013,6 +1118,9 @@ 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
@@ -1055,6 +1163,9 @@ 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
@@ -1138,6 +1249,8 @@ 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
@@ -1174,10 +1287,18 @@ Public Class NumericMachiningParam
             WriteMachiningParam(nIndex, MAC_SCREWBACK, sWriteValue, sFilePath)
          Case Params.SLICINGHEIGHT
             WriteMachiningParam(nIndex, MAC_SLICINGHEIGHT, sWriteValue, sFilePath)
+         Case Params.MAXSLICESNUMBER
+            WriteMachiningParam(nIndex, MAC_MAXSLICESNUMBER, sWriteValue, sFilePath)
+         Case Params.RIBSSTRANDWIDTH
+            WriteMachiningParam(nIndex, MAC_RIBSSTRANDWIDTH, sWriteValue, sFilePath)
          Case Params.RIBSOVERLAP
             WriteMachiningParam(nIndex, MAC_RIBSOVERLAP, sWriteValue, sFilePath)
+         Case Params.RIBSSTRANDOVERLAP
+            WriteMachiningParam(nIndex, MAC_RIBSSTRANDOVERLAP, sWriteValue, sFilePath)
          Case Params.RIBSSTRANDCOUNT
             WriteMachiningParam(nIndex, MAC_RIBSSTRANDCOUNT, sWriteValue, sFilePath)
+         Case Params.RIBSLINKFILLET
+            WriteMachiningParam(nIndex, MAC_RIBSLINKFILLET, sWriteValue, sFilePath)
          Case Params.RIBSLEADINLEN
             WriteMachiningParam(nIndex, MAC_RIBSLEADINLEN, sWriteValue, sFilePath)
          Case Params.RIBSLEADOUTLEN
@@ -1188,6 +1309,8 @@ Public Class NumericMachiningParam
             WriteMachiningParam(nIndex, MAC_RIBSLEADOUTWIPE, sWriteValue, sFilePath)
          Case Params.RIBSLEADOUTWIPEDIR
             WriteMachiningParam(nIndex, MAC_RIBSLEADOUTWIPEDIR, sWriteValue, sFilePath)
+         Case Params.RIBSLEADFILLET
+            WriteMachiningParam(nIndex, MAC_RIBSLEADFILLET, sWriteValue, sFilePath)
          Case Params.SHELLNBRDIFFERENCE
             WriteMachiningParam(nIndex, MAC_SHELLNBRDIFFERENCE, sWriteValue, sFilePath)
          Case Params.SHELLNBRCOASTING
@@ -1196,6 +1319,8 @@ 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
@@ -1224,6 +1349,8 @@ 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
@@ -1614,6 +1741,10 @@ Public Class CheckMachiningParam
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_SPIRALVASE, 0)
             Case Params.RIBSLINK
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLINK, 0)
+            Case Params.RIBSMERGEWITHSHELL
+               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSMERGEWITHSHELL, 0)
+            Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTMERGEDSHELLMAINLINK, 0)
             Case Params.RIBSINVERTORDER
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTORDER, 0)
             Case Params.RIBSINVERTDIRECTION
@@ -1641,6 +1772,10 @@ Public Class CheckMachiningParam
             WriteMachiningParam(nIndex, MAC_SPIRALVASE, If(m_bValue, 1, 0), sFilePath)
          Case Params.RIBSLINK
             WriteMachiningParam(nIndex, MAC_RIBSLINK, If(m_bValue, 1, 0), sFilePath)
+         Case Params.RIBSMERGEWITHSHELL
+            WriteMachiningParam(nIndex, MAC_RIBSMERGEWITHSHELL, If(m_bValue, 1, 0), sFilePath)
+         Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+            WriteMachiningParam(nIndex, MAC_RIBSINVERTMERGEDSHELLMAINLINK, If(m_bValue, 1, 0), sFilePath)
          Case Params.RIBSINVERTORDER
             WriteMachiningParam(nIndex, MAC_RIBSINVERTORDER, If(m_bValue, 1, 0), sFilePath)
          Case Params.RIBSINVERTDIRECTION

Icarus/MainWindow/MainWindowM.vb

@@ -191,8 +191,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' 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, 2709, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5583, 2709, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

Icarus/MainWindow/MainWindowV.xaml.vb

@@ -61,6 +61,8 @@ Class MainWindowV
          Me.Activate()
          ' Recupero l'array di stringhe con i nomi del file
          Dim sFiles() As String = DirectCast(e.Data.GetData(DataFormats.FileDrop), String())
+         ' Apro il primo
+         Map.refSecondaryWindowVM.OpenStdFile(sFiles(0))
       End If
    End Sub
 

Icarus/MainWindow/MainWindowVM.vb

@@ -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

Icarus/ManagePartPanel/ManagePartPanelVM.vb

@@ -471,14 +471,6 @@ Public Class ManagePartPanelVM
                   Map.refSliceManagerVM.UpdateDimensions()
                Next
             End If
-            'EgtAddMachGroup("3dPrint")
-            'EgtSetTable("Tab")
-
-            'Dim nRawId As Integer = EgtAddRawPart(b3PrintSolid.Min, b3PrintSolid.DimX, b3PrintSolid.DimY, b3PrintSolid.DimZ, New Color3d(128, 128, 128, 30))
-            'EgtAddPartToRawPart(nPartId, b3PrintSolid.Min, nRawId)
-            'EgtMoveToCornerRawPart(nRawId, New Point3d(dPosX, dPosY, 0), MCH_CR.BL)
-
-            'EgtResetCurrMachGroup()
 
             ' seleziono ultimo pezzo aggiunto
             Map.refTopPanelVM.SelLastPart()

Icarus/MaterialDb/Material.vb

@@ -285,6 +285,8 @@ Public Class MaterialIndex
             sParamKey = MAT_KZ
          Case MaterialParam.Params.KN
             sParamKey = MAT_KN
+         Case MaterialParam.Params.TDRYER
+            sParamKey = MAT_TDRYER
       End Select
       Return ReadMaterialParamDouble(m_nIndex, sParamKey, dDefault)
    End Function
@@ -346,6 +348,7 @@ Public Class MaterialCathegory
             m_MaterialParamList = New List(Of MaterialParam)({New NumericMaterialParam(MaterialParam.Params.K_EXTRUSION, nIndex),
                                                               New NumericMaterialParam(MaterialParam.Params.K_LAY_TIME, nIndex),
                                                               New NumericMaterialParam(MaterialParam.Params.DENSITY, nIndex),
+                                                              New NumericMaterialParam(MaterialParam.Params.TDRYER, nIndex),
                                                               New StringMaterialParam(MaterialParam.Params.ORIG, nIndex)})
             m_Cathegory_Visibility = Visibility.Visible
          Case Cathegories.TEMPERATURES
@@ -419,6 +422,7 @@ Public MustInherit Class MaterialParam
       KZ = 20
       KN = 21
       ORIG = 22
+      TDRYER = 23
    End Enum
 
    Private m_Type As Params
@@ -478,6 +482,8 @@ Public MustInherit Class MaterialParam
             m_sName = "KZ"
          Case Params.KN
             m_sName = "KN"
+         Case Params.TDRYER
+            m_sName = "Dryer Temperature"
          Case Params.ORIG
             m_sName = "Original"
       End Select
@@ -583,6 +589,9 @@ Public Class NumericMaterialParam
          Case Params.KN
             m_dValue = ReadMaterialParamDouble(nIndex, MAT_KN, 0)
             m_bIsLen = False
+         Case Params.TDRYER
+            m_dValue = ReadMaterialParamDouble(nIndex, MAT_TDRYER, 0)
+            m_bIsLen = False
       End Select
       m_dOrigValue = m_dValue
    End Sub
@@ -633,6 +642,8 @@ Public Class NumericMaterialParam
             WriteMaterialParam(nIndex, MAT_KZ, sWriteValue, sFilePath)
          Case Params.KN
             WriteMaterialParam(nIndex, MAT_KN, sWriteValue, sFilePath)
+         Case Params.TDRYER
+            WriteMaterialParam(nIndex, MAT_TDRYER, sWriteValue, sFilePath)
       End Select
    End Sub
 

Icarus/My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("Icarus")>
-<Assembly: AssemblyCopyright("Copyright ©  2022-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2022-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>
 
@@ -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.7.9.1")>
+<Assembly: AssemblyFileVersion("2.7.9.1")>

Icarus/OptionsWindow/OptionModule.vb

@@ -15,6 +15,8 @@ Friend Module OptionModule
    Friend m_bThickLine As Boolean
    ' Flag per visualizzazione smussata delle superfici
    Friend m_bSmoothTriMesh As Boolean
+   ' Flag per visualizzazione semplificate sezione strand
+   Friend m_bUseSimplifiedSection As Boolean
 
    ' Colore di default in disegno
    Friend m_DefMaterialColor As Color3d
@@ -43,6 +45,14 @@ Friend Module OptionModule
    Friend m_sFont As String
    Friend m_dTextHeight As Double
 
+   ' Parametri per la griglia
+   Friend m_bGridVisibility As Boolean
+   Friend m_dSnapStepMm As Double
+   Friend m_dSnapStepInch As Double
+   Friend m_nMinLineSStep As Integer
+   Friend m_nMajLineSStep As Integer
+   Friend m_nExtSStep As Integer
+
    ' Variabili che indicano per ogni tipo di lavorazione quale geometria è selezionabile
    'Friend m_SelGeomSawing As SceneSelModeOpt
    'Friend m_SelGeomDrilling As SceneSelModeOpt
@@ -99,6 +109,8 @@ Friend Module OptionModule
       m_bThickLine = GetMainPrivateProfileInt(S_SCENE, K_LINEWIDTH, 1) <> 1
       ' Inizializzo flag visualizzazione smussata delle superfici
       m_bSmoothTriMesh = GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0
+      ' Inizializzo flag visualizzazione sezione strand semplificata
+      m_bUseSimplifiedSection = GetMainPrivateProfileInt(S_SOLIDS, K_SIMPLIFIEDSECTION, 0) <> 0
       ' Inizio colore di default in disegno
       Dim DefColor As New Color3d(0, 0, 0)
       GetMainPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
@@ -108,6 +120,13 @@ Friend Module OptionModule
       ' Inizializzo variabili per import
       m_dDxfScaleFactor = GetMainPrivateProfileDouble(S_IMPORT, K_DXFSCALE, 1)
       m_dStlScaleFactor = GetMainPrivateProfileDouble(S_IMPORT, K_STLSCALE, 1)
+      ' Inizializzo parametri griglia
+      m_bGridVisibility = (GetMainPrivateProfileInt(S_GRID, K_SHOWGRID, 1) <> 0)
+      m_dSnapStepMm = GetMainPrivateProfileDouble(S_GRID, K_SNAPSTEP, 10)
+      m_dSnapStepInch = GetMainPrivateProfileDouble(S_GRID, K_SNAPSTEPINCH, 12.7)
+      m_nMinLineSStep = GetMainPrivateProfileInt(S_GRID, K_MINLINESSTEP, 1)
+      m_nMajLineSStep = GetMainPrivateProfileInt(S_GRID, K_MAJLINESSTEP, 10)
+      m_nExtSStep = GetMainPrivateProfileInt(S_GRID, K_EXTSSTEP, 100)
    End Sub
 
 End Module

Icarus/OptionsWindow/OptionWindowV.xaml

@@ -61,6 +61,7 @@
                   <Grid.RowDefinitions>
                      <RowDefinition Height="1*"/>
                      <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
                   <TextBlock Text="{Binding ThickLineMsg}" VerticalAlignment="Center"
                              Grid.Row="0" Margin="0,5,0,5"/>
@@ -70,6 +71,10 @@
                              Grid.Row="1" Margin="0,5,0,5"/>
                   <CheckBox IsChecked="{Binding SmoothTriMesh}"
                              Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
+                  <TextBlock Text="{Binding UseSimplifiedSectionMsg}" VerticalAlignment="Center"
+                             Grid.Row="2" Margin="0,5,0,5"/>
+                  <CheckBox IsChecked="{Binding UseSimplifiedSection}"
+                             Grid.Column="1" Grid.Row="2" Margin="22,5,0,5" VerticalAlignment="Center"/>
                </Grid>
                <!--<UniformGrid Columns="2"
                         Margin="0,0,0,5">

Icarus/OptionsWindow/OptionWindowVM.vb

@@ -147,6 +147,7 @@ Public Class OptionWindowVM
          If StringToLen(value, dVal) AndAlso dVal > 0 Then
             OptionModule.m_dGeometryTolerance = dVal
             Map.refSceneHostVM.MainController.SetSurfTmTolerance(OptionModule.m_dGeometryTolerance)
+            Map.refSceneHostVM.MainController.SetAdvImpTolerance(OptionModule.m_dGeometryTolerance)
             WriteMainPrivateProfileString(S_GEOMDB, K_SURFTMTOLER, DoubleToString(OptionModule.m_dGeometryTolerance, 5))
          End If
       End Set
@@ -214,6 +215,16 @@ Public Class OptionWindowVM
       End Set
    End Property
 
+   Public Property UseSimplifiedSection As Boolean
+      Get
+         Return OptionModule.m_bUseSimplifiedSection
+      End Get
+      Set(value As Boolean)
+         OptionModule.m_bUseSimplifiedSection = value
+         WriteMainPrivateProfileString(S_SOLIDS, K_SIMPLIFIEDSECTION, If(value, "1", "0"))
+      End Set
+   End Property
+
    'Public Property SelectedTextFont As String
    '   Get
    '      Return m_FontList(m_FontList.IndexOf(OptionModule.m_sFontText))
@@ -563,17 +574,23 @@ Public Class OptionWindowVM
    End Property
    Public ReadOnly Property ThickLineMsg As String
       Get
-         Return EgtMsg( 6536)                     ' Linee spesse
+         Return EgtMsg(6536)                     ' Linee spesse
       End Get
    End Property
    Public ReadOnly Property SmoothTriMeshMsg As String
       Get
-         Return EgtMsg( 6518)                     ' Superfici smussate
+         Return EgtMsg(6518)                     ' Superfici smussate
       End Get
    End Property
+   Public ReadOnly Property UseSimplifiedSectionMsg As String
+      Get
+         Return "Use simplified strand section"
+      End Get
+   End Property
+
    Public ReadOnly Property UpdateLicenceMsg As String
       Get
-         Return EgtMsg( 6553)                     ' Aggiorna licenza
+         Return EgtMsg(6553)                     ' Aggiorna licenza
       End Get
    End Property
 
@@ -953,31 +970,31 @@ Public Class OptionWindowVM
       Dim sMachDir As String = Path.Combine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, sMachName)
       ' Preparo direttorio temporaneo
       Dim sTempDir As String = Path.Combine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, "Temp")
-      If My.Computer.FileSystem.DirectoryExists( sTempDir) Then
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+      If My.Computer.FileSystem.DirectoryExists(sTempDir) Then
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       End If
-      My.Computer.FileSystem.CreateDirectory( sTempDir)
+      My.Computer.FileSystem.CreateDirectory(sTempDir)
       ' Unzip nel direttorio temporaneo
       Using zip As New Ionic.Zip.ZipFile(sMachZip)
-         zip.ExtractAll( sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
+         zip.ExtractAll(sTempDir, Ionic.Zip.ExtractExistingFileAction.DoNotOverwrite)
       End Using
       ' Se non è una macchina segnalo il problema ed esco
-      If Not My.Computer.FileSystem.FileExists( Path.Combine( sTempDir, sMachName, sMachName & ".ini"))  Or
-         Not My.Computer.FileSystem.FileExists( Path.Combine( sTempDir, sMachName, sMachName & ".mlde")) Then
+      If Not My.Computer.FileSystem.FileExists(Path.Combine(sTempDir, sMachName, sMachName & ".ini")) Or
+         Not My.Computer.FileSystem.FileExists(Path.Combine(sTempDir, sMachName, sMachName & ".mlde")) Then
          ' Il file {0} non contiene una macchina  -  Avviso
          Dim sOut As String = String.Format(EgtMsg(6529), sMachZip)
          MessageBox.Show(sOut, EgtMsg(MSG_MESSAGEBOX + 2), MessageBoxButton.OK, MessageBoxImage.Warning)
          ' Rimuovo il direttorio temporaneo ed esco
-         My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          Return
       End If
       ' Imposto data e ora correnti al file mlde della macchina
       Try
-         File.SetLastWriteTime( Path.Combine( sTempDir, sMachName, sMachName & ".mlde"), System.DateTime.Now)
+         File.SetLastWriteTime(Path.Combine(sTempDir, sMachName, sMachName & ".mlde"), System.DateTime.Now)
       Catch ex As Exception
       End Try
       ' Verifico esistenza di una macchina con lo stesso nome
-      Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists( sMachDir)
+      Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists(sMachDir)
       Dim bUpdate As Boolean = True
       If bOldExists Then
          Dim MachBox As New UpdateMachineV(Application.Current.MainWindow, New UpdateMachineVM(sMachName))
@@ -994,23 +1011,23 @@ Public Class OptionWindowVM
          End Select
          ' Faccio una copia di backup della macchina corrente
          Dim sBackupDir As String = sMachDir & ".old"
-         If My.Computer.FileSystem.DirectoryExists( sBackupDir) Then
-            My.Computer.FileSystem.DeleteDirectory( sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+         If My.Computer.FileSystem.DirectoryExists(sBackupDir) Then
+            My.Computer.FileSystem.DeleteDirectory(sBackupDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
          End If
          Try
-            My.Computer.FileSystem.MoveDirectory( sMachDir, sBackupDir, True)
+            My.Computer.FileSystem.MoveDirectory(sMachDir, sBackupDir, True)
          Catch ex As Exception
             ' Ripristino lo stato originale ed esco
-            My.Computer.FileSystem.MoveDirectory( sBackupDir, sMachDir, True)
+            My.Computer.FileSystem.MoveDirectory(sBackupDir, sMachDir, True)
             ' L'aggiornamento della macchina "{0}" non è riuscito.
             Dim sKo As String = String.Format(EgtMsg(6535), sMachName)
-            EgtOutLog( sKo)
+            EgtOutLog(sKo)
             MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK)
             Return
          End Try
       End If
       ' Installo la macchina
-      My.Computer.FileSystem.MoveDirectory( Path.Combine( sTempDir, sMachName), sMachDir, True)
+      My.Computer.FileSystem.MoveDirectory(Path.Combine(sTempDir, sMachName), sMachDir, True)
       ' Se è un aggiornamento, recupero utensili, lavorazioni, attrezzaggi e dati per travi
       If bOldExists And bUpdate Then
          Dim sBackupDir As String = sMachDir & ".old"
@@ -1047,10 +1064,10 @@ Public Class OptionWindowVM
       End If
       'La macchina "{0}" è stata aggiornata con successo.
       Dim sOk As String = String.Format(EgtMsg(6530), sMachName)
-      EgtOutLog( sOk)
+      EgtOutLog(sOk)
       MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
       ' Rimuovo il direttorio temporaneo
-      My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
+      My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       ' Aggiorno la lista delle macchina
       MyMachine.InsertMachine(sMachDir, Map.refMachinePanelVM.MachineList)
    End Sub
@@ -1093,10 +1110,12 @@ Public Class OptionWindowVM
       End If
       Try
          Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
+            zip.AlternateEncoding = Text.Encoding.UTF8
             ' aggiungo i file della Macchina
             Dim sMachineDir As String = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & sCurrMachineName
             If Directory.Exists(sMachineDir) Then
-               zip.AddSelectedFiles( "name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
+               zip.AddSelectedFiles("name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
             End If
             ' salvo lo zip
             zip.Save()

Icarus/ProjManager/ProjManagerVM.vb

@@ -248,37 +248,9 @@ Public Class ProjManagerVM
    ''' Execute the Save.  This method is invoked by the SaveCommand.
    ''' </summary>
    Public Sub Save()
-      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-         CreateJson()
-      End If
       Map.refSceneHostVM.SaveProject()
    End Sub
 
-   Private Function CreateJson() As Boolean
-      ' creo json
-      Dim LayerList As New List(Of JsonLayer)
-      For Each Layer In Map.refTFSEditorVM.LayerList
-         LayerList.Add(Layer.ConvertToJsonLayer())
-      Next
-      Dim json As String = JsonConvert.SerializeObject(LayerList, Formatting.Indented)
-      Dim sProjName As String = ""
-      EgtGetCurrFilePath(sProjName)
-      If Not String.IsNullOrWhiteSpace(sProjName) Then
-         sProjName = Path.ChangeExtension(sProjName, ".json")
-         If File.Exists(sProjName) Then
-            Try
-               File.Delete(sProjName)
-            Catch ex As Exception
-            End Try
-         End If
-         Try
-            File.AppendAllText(sProjName, json)
-         Catch ex As Exception
-            EgtOutLog("Json writing error!")
-         End Try
-      End If
-   End Function
-
 #End Region ' SaveCommand
 
 #Region "SaveAsCommand"
@@ -422,14 +394,6 @@ Public Class ProjManagerVM
             End If
          End If
       End If
-      ' Verifico se il progetto corrente è una porta
-      Dim nPartId As Integer = EgtGetFirstPart()
-      If nPartId = GDB_ID.NULL Then
-         nPartId = EgtGetFirstPartInRawPart(EgtGetFirstRawPart())
-      End If
-      Dim sPartName As String = String.Empty
-      EgtGetName(nPartId, sPartName)
-      Dim bPrjIsDoor As Boolean = (String.Compare(sPartName, "DOOR") = 0)
       ' Recupero macchine dei gruppi di lavoro del progetto
       Dim Machines As New List(Of String)
       Dim nMchGrpId As Integer = EgtGetFirstMachGroup()
@@ -446,9 +410,12 @@ Public Class ProjManagerVM
       If Not String.IsNullOrWhiteSpace(sCurrProject) Then
          Dim sCurrProjectDir As String = Path.GetDirectoryName(sCurrProject)
          If Not String.IsNullOrWhiteSpace(sCurrProjectDir) Then
+            Dim sCurrProjName As String = Path.GetFileNameWithoutExtension(sCurrProject).ToUpper()
             Dim TempFiles() As String = Directory.GetFiles(sCurrProjectDir)
             For FileIndex = 0 To TempFiles.Count - 1
-               If Path.GetFileNameWithoutExtension(TempFiles(FileIndex)).Contains(Path.GetFileNameWithoutExtension(sCurrProject)) AndAlso TempFiles(FileIndex) <> sCurrProject Then
+               If TempFiles(FileIndex) = sCurrProject Then Continue For 
+               Dim sCurrFileName As String = Path.GetFileNameWithoutExtension( TempFiles(FileIndex)).ToUpper()
+               If String.Compare(sCurrFileName, sCurrProjName) = 0 Then
                   OtherFiles.Add(TempFiles(FileIndex))
                End If
             Next
@@ -461,11 +428,13 @@ Public Class ProjManagerVM
       End If
       Try
          Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
+            zip.AlternateEncoding = Text.Encoding.UTF8
             ' aggiungo file macchine
             For Each sMachineName As String In Machines
                Dim sMachineDir As String = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & sMachineName
                If Directory.Exists(sMachineDir) Then
-                  zip.AddItem(sMachineDir, sMachineName)
+                  zip.AddSelectedFiles( "name != *\.git\*.* and name != *.git*", sMachineDir, sMachineName, True)
                End If
             Next
             ' aggiungo progetto corrente

Icarus/RibPanel/RibPanelVM.vb

@@ -620,6 +620,7 @@ Public Class RibPanelVM
    Friend Sub Dispose()
       ' ripristino frame originale
       EgtSetGridFrame(m_OriginalGridFrame)
+      EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY())
       ' se in modifica parametri
       If m_bMachParam_IsChecked Then
          ' ripristino modalita' standard
@@ -641,7 +642,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
@@ -692,12 +693,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()
@@ -1096,6 +1097,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY())
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1121,6 +1123,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1146,6 +1149,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1171,6 +1175,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1196,6 +1201,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1221,6 +1227,7 @@ Public Class RibPanelVM
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1247,6 +1254,7 @@ Public Class RibPanelVM
    Public Sub CPlaneElevation(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       ManageInterface(False)
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1272,87 +1280,12 @@ Public Class RibPanelVM
    Public Sub CPlaneOrigin(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       ManageInterface(False)
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
 #End Region ' CPlaneOrigin
 
-#Region "CPlaneRotate"
-
-   ''' <summary>
-   ''' Returns a command that do CPlaneRotate.
-   ''' </summary>
-   Public ReadOnly Property CPlaneRotate_Command As ICommand
-      Get
-         If m_cmdCPlaneRotate Is Nothing Then
-            m_cmdCPlaneRotate = New Command(AddressOf CPlaneRotate)
-         End If
-         Return m_cmdCPlaneRotate
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlaneRotate.  This method is invoked by the CPlaneRotateCommand.
-   ''' </summary>
-   Public Sub CPlaneRotate(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
-         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE)
-      Else
-         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE3D)
-      End If
-   End Sub
-
-#End Region ' CPlaneRotate
-
-#Region "CPlane3P"
-
-   ''' <summary>
-   ''' Returns a command that do CPlane3P.
-   ''' </summary>
-   Public ReadOnly Property CPlane3P_Command As ICommand
-      Get
-         If m_cmdCPlane3P Is Nothing Then
-            m_cmdCPlane3P = New Command(AddressOf CPlane3P)
-         End If
-         Return m_cmdCPlane3P
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlane3P.  This method is invoked by the CPlane3PCommand.
-   ''' </summary>
-   Public Sub CPlane3P(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_3P)
-   End Sub
-
-#End Region ' CPlane3P
-
-#Region "CPlanePerpObj"
-
-   ''' <summary>
-   ''' Returns a command that do CPlanePerpObj.
-   ''' </summary>
-   Public ReadOnly Property CPlanePerpObj_Command As ICommand
-      Get
-         If m_cmdCPlanePerpObj Is Nothing Then
-            m_cmdCPlanePerpObj = New Command(AddressOf CPlanePerpObj)
-         End If
-         Return m_cmdCPlanePerpObj
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlanePerpObj.  This method is invoked by the CPlanePerpObjCommand.
-   ''' </summary>
-   Public Sub CPlanePerpObj(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE)
-   End Sub
-
-#End Region ' CPlanePerpObj
-
 #Region "CPlaneObj"
 
    Private m_bCPlaneObj_IsActive As Boolean = False

Icarus/RibParamPanel/CopyFromWndVM.vb

@@ -55,10 +55,14 @@ Public Class CopyFromWndVM
          Return
       End If
       ' copio i parametri nella rib corrente
-      Dim ParamList As New List(Of MachiningParam.Params)({MachiningParam.Params.RIBSTYPE,
+      Dim ParamList As New List(Of MachiningParam.Params)({MachiningParam.Params.RIBSSTRANDWIDTH,
+                                                           MachiningParam.Params.RIBSTYPE,
                                                            MachiningParam.Params.RIBSOVERLAP,
+                                                           MachiningParam.Params.RIBSSTRANDOVERLAP,
                                                            MachiningParam.Params.RIBSSTRANDCOUNT,
                                                            MachiningParam.Params.RIBSLINK,
+                                                           MachiningParam.Params.RIBSLINKFILLET,
+                                                           MachiningParam.Params.RIBSMERGEWITHSHELL,
                                                            MachiningParam.Params.RIBSINVERTDIRECTION,
                                                            MachiningParam.Params.RIBSINVERTSTRANDORDER,
                                                            MachiningParam.Params.RIBSLEADININVERT,
@@ -67,12 +71,13 @@ Public Class CopyFromWndVM
                                                            MachiningParam.Params.RIBSLEADOUTLEN,
                                                            MachiningParam.Params.RIBSLEADOUTCOASTING,
                                                            MachiningParam.Params.RIBSLEADOUTWIPE,
-                                                           MachiningParam.Params.RIBSLEADOUTWIPEDIR})
+                                                           MachiningParam.Params.RIBSLEADOUTWIPEDIR,
+                                                           MachiningParam.Params.RIBSLEADFILLET})
       For Each Param In ParamList
          Select Case Map.refRibPanelVM.SelRib.Type
-            'Case RibEntity.RibTypes.FROMDRAW
-            '   CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nCurveId)
-            '   CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nExtrusionId)
+            Case RibEntity.RibTypes.FROMDRAW
+               CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nCurveId)
+               CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nExtrusionId)
             Case RibEntity.RibTypes.FROMIMPORT
                CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nExtrusionId)
          End Select
@@ -98,17 +103,26 @@ Public Class CopyFromWndVM
             Else
                RibTypeParam.SelValue = RibTypeParam.PartSelValue
             End If
-         Case MachiningParam.Params.RIBSOVERLAP, MachiningParam.Params.RIBSSTRANDCOUNT, MachiningParam.Params.RIBSLEADINLEN, MachiningParam.Params.RIBSLEADOUTLEN,
-              MachiningParam.Params.RIBSLEADOUTCOASTING, MachiningParam.Params.RIBSLEADOUTWIPE, MachiningParam.Params.RIBSLEADOUTWIPEDIR
+         Case MachiningParam.Params.RIBSSTRANDWIDTH, MachiningParam.Params.RIBSOVERLAP, MachiningParam.Params.RIBSSTRANDOVERLAP, MachiningParam.Params.RIBSSTRANDCOUNT, MachiningParam.Params.RIBSLINKFILLET, MachiningParam.Params.RIBSLEADINLEN, MachiningParam.Params.RIBSLEADOUTLEN,
+              MachiningParam.Params.RIBSLEADOUTCOASTING, MachiningParam.Params.RIBSLEADOUTWIPE, MachiningParam.Params.RIBSLEADOUTWIPEDIR, MachiningParam.Params.RIBSLEADFILLET
             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)
+               Case MachiningParam.Params.RIBSSTRANDOVERLAP
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSSTRANDOVERLAP)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSSTRANDOVERLAP, dRibParam)
                Case MachiningParam.Params.RIBSSTRANDCOUNT
                   RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSSTRANDCOUNT)
                   bRead = EgtGetInfo(nFromId, MAC_RIBSSTRANDCOUNT, dRibParam)
+               Case MachiningParam.Params.RIBSLINKFILLET
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLINKFILLET)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLINKFILLET, dRibParam)
                Case MachiningParam.Params.RIBSLEADINLEN
                   RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADINLEN)
                   bRead = EgtGetInfo(nFromId, MAC_RIBSLEADINLEN, dRibParam)
@@ -124,19 +138,25 @@ Public Class CopyFromWndVM
                Case MachiningParam.Params.RIBSLEADOUTWIPEDIR
                   RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADOUTWIPEDIR)
                   bRead = EgtGetInfo(nFromId, MAC_RIBSLEADOUTWIPEDIR, dRibParam)
+               Case MachiningParam.Params.RIBSLEADFILLET
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADFILLET)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLEADFILLET, dRibParam)
             End Select
             If Not IsNothing(RibTypeParam) AndAlso bRead Then
                RibTypeParam.SetValue(dRibParam)
             Else
                RibTypeParam.SetValue(RibTypeParam.dPartValue)
             End If
-         Case MachiningParam.Params.RIBSLINK, MachiningParam.Params.RIBSINVERTDIRECTION, MachiningParam.Params.RIBSINVERTSTRANDORDER, MachiningParam.Params.RIBSLEADININVERT, MachiningParam.Params.RIBSLEADOUTINVERT
+         Case MachiningParam.Params.RIBSLINK, MachiningParam.Params.RIBSMERGEWITHSHELL, MachiningParam.Params.RIBSINVERTDIRECTION, MachiningParam.Params.RIBSINVERTSTRANDORDER, MachiningParam.Params.RIBSLEADININVERT, MachiningParam.Params.RIBSLEADOUTINVERT
             Dim RibTypeParam As RibCheckMachiningParam = Nothing
             Dim bRibParam As Boolean = False
             Select Case Type
                Case MachiningParam.Params.RIBSLINK
                   RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLINK)
                   bRead = EgtGetInfo(nFromId, MAC_RIBSLINK, bRibParam)
+               Case MachiningParam.Params.RIBSMERGEWITHSHELL
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSMERGEWITHSHELL)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSMERGEWITHSHELL, bRibParam)
                Case MachiningParam.Params.RIBSINVERTDIRECTION
                   RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSINVERTDIRECTION)
                   bRead = EgtGetInfo(nFromId, MAC_RIBSINVERTDIRECTION, bRibParam)

Icarus/RibParamPanel/RibParamPanelVM.vb

@@ -42,10 +42,14 @@ Public Class RibParamPanelVM
 
       m_Type = Cathegories.RIBS
       m_sName = "Ribs"
-      m_MachiningParamList = New List(Of MachiningParam)({New RibComboMachiningParam(MachiningParam.Params.RIBSTYPE, nRibId, nPartId, Me),
+      m_MachiningParamList = New List(Of MachiningParam)({New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDWIDTH, nRibId, nPartId, Me),
+                                                          New RibComboMachiningParam(MachiningParam.Params.RIBSTYPE, nRibId, nPartId, Me),
                                                           New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDOVERLAP, nRibId, nPartId, Me),
                                                           New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId, Me),
                                                           New RibCheckMachiningParam(MachiningParam.Params.RIBSLINK, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLINKFILLET, nRibId, nPartId, Me),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSMERGEWITHSHELL, nRibId, nPartId, Me),
                                                           New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId, Me),
                                                           New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nRibId, nPartId, Me),
                                                           New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId, Me),
@@ -54,7 +58,8 @@ Public Class RibParamPanelVM
                                                           New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nRibId, nPartId, Me),
                                                           New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nRibId, nPartId, Me),
                                                           New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nRibId, nPartId, Me),
-                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nRibId, nPartId, Me)})
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nRibId, nPartId, Me),
+                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADFILLET, nRibId, nPartId, Me)})
       NotifyPropertyChanged(NameOf(MachiningParamList))
       NotifyPropertyChanged(NameOf(sName))
    End Sub
@@ -230,14 +235,26 @@ 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 = True
+            m_bIsLen = False
+         Case Params.RIBSSTRANDOVERLAP
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSSTRANDOVERLAP, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSSTRANDOVERLAP, m_dPartValue)
+            m_bIsLen = False
          Case Params.RIBSSTRANDCOUNT
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSSTRANDCOUNT, m_dValue)
             EgtGetInfo(nPartId, MAC_RIBSSTRANDCOUNT, m_dPartValue)
             m_bIsLen = True
+         Case Params.RIBSLINKFILLET
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLINKFILLET, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLINKFILLET, m_dPartValue)
+            m_bIsLen = True
          Case Params.RIBSINVERTDIRECTION
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTDIRECTION, m_dValue)
             EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_dPartValue)
@@ -274,6 +291,10 @@ Public Class RibNumericMachiningParam
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADOUTWIPEDIR, m_dValue)
             EgtGetInfo(nPartId, MAC_RIBSLEADOUTWIPEDIR, m_dPartValue)
             m_bIsLen = True
+         Case Params.RIBSLEADFILLET
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADFILLET, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSLEADFILLET, m_dPartValue)
+            m_bIsLen = True
       End Select
       m_dOrigValue = m_dValue
       If Not bReadFromPart Then
@@ -290,18 +311,36 @@ 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)
             Else
                EgtRemoveInfo(nRibId, MAC_RIBSOVERLAP)
             End If
+         Case Params.RIBSSTRANDOVERLAP
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSSTRANDOVERLAP, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSSTRANDOVERLAP)
+            End If
          Case Params.RIBSSTRANDCOUNT
             If bIsModifiedFromPart Then
                EgtSetInfo(nRibId, MAC_RIBSSTRANDCOUNT, sWriteValue)
             Else
                EgtRemoveInfo(nRibId, MAC_RIBSSTRANDCOUNT)
             End If
+         Case Params.RIBSLINKFILLET
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLINKFILLET, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLINKFILLET)
+            End If
          Case Params.RIBSINVERTDIRECTION
             If bIsModifiedFromPart Then
                EgtSetInfo(nRibId, MAC_RIBSINVERTDIRECTION, sWriteValue)
@@ -356,6 +395,12 @@ Public Class RibNumericMachiningParam
             Else
                EgtRemoveInfo(nRibId, MAC_RIBSLEADOUTWIPEDIR)
             End If
+         Case Params.RIBSLEADFILLET
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSLEADFILLET, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSLEADFILLET)
+            End If
       End Select
    End Sub
 
@@ -534,6 +579,9 @@ Public Class RibCheckMachiningParam
          Case Params.RIBSLINK
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLINK, m_bValue)
             EgtGetInfo(nPartId, MAC_RIBSLINK, m_bPartValue)
+         Case Params.RIBSMERGEWITHSHELL
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSMERGEWITHSHELL, m_bValue)
+            EgtGetInfo(nPartId, MAC_RIBSMERGEWITHSHELL, m_bPartValue)
          Case Params.RIBSINVERTDIRECTION
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTDIRECTION, m_bValue)
             EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_bPartValue)
@@ -562,6 +610,12 @@ Public Class RibCheckMachiningParam
             Else
                EgtRemoveInfo(nRibId, MAC_RIBSLINK)
             End If
+         Case Params.RIBSMERGEWITHSHELL
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSMERGEWITHSHELL, If(m_bValue, 1, 0))
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSMERGEWITHSHELL)
+            End If
          Case Params.RIBSINVERTDIRECTION
             If bIsModifiedFromPart Then
                EgtSetInfo(nRibId, MAC_RIBSINVERTDIRECTION, If(m_bValue, 1, 0))

Icarus/SceneHost/MySceneHostVM.vb

@@ -49,9 +49,8 @@ Public Class MySceneHostVM
       AddHandler MainController.OnOpenProject, AddressOf OnOpenProject
       AddHandler MainController.OnSavingProject, AddressOf OnSavingProject
       AddHandler MainController.OnSavedProject, AddressOf OnSavedProject
+      AddHandler MainController.OnInsertingProject, AddressOf OnInsertingProject
       AddHandler MainController.OnInsertedProject, AddressOf OnInsertedProject
-      AddHandler MainController.OnImportingProject, AddressOf OnImportingProject
-      AddHandler MainController.OnImportedProject, AddressOf OnImportedProject
       AddHandler MainController.PrepareInputBox, AddressOf PrepareInputBox
       AddHandler MainController.SetInputBoxText, AddressOf SetInputBoxText
       AddHandler MainController.SetInputBoxCheck, AddressOf SetInputBoxCheck
@@ -71,6 +70,8 @@ Public Class MySceneHostVM
       ' Se tutto bene
       If MainScene.Init() And Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.BASE) Then
          PostInitializeScene()
+         ' Non imposto automaticamente il focus sulla scena muovendo il mouse sopra di essa (necessario click)
+         MainScene.SetFocusOnMove( True, 0.3, 0.3, 0.1, 0.2)
          ' Imposto stato gestione mouse diretto della scena a nessuno
          MainScene.SetStatusNull()
          EgtSetCurrentContext(MainScene.GetCtx())
@@ -81,17 +82,32 @@ Public Class MySceneHostVM
       ' Problemi
       ' Se manca la chiave
       If Map.refMainWindowVM.MainWindowM.nKeyLevel = -1 Or Map.refMainWindowVM.MainWindowM.nKeyLevel = -2 Then
-         EgtOutLog("Missing Dongle")
-         ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         If Not EgtGetNetHwKey() Then
+            EgtOutLog("Missing Dongle")
+            ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
+            Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            EgtOutLog("NetDongle is full")
+            ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC."  "Errore"
+            Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111)
+            Dim sTitle As String = EgtMsg(10101)
+            MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         End If
+      ' Se altrimenti manca il collegamento con la chiave di rete
+      ElseIf Map.refMainWindowVM.MainWindowM.nKeyLevel = -9 Then
+         EgtOutLog("Missing Link with Net Dongle")
+         ' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione."  "Errore"
+         Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109)
+         Dim sTitle As String = EgtMsg(10101)
          MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-         ' Altrimenti manca la licenza
+      ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         Dim sText As String = EgtMsg(10105) & vbCrLf & EgtMsg(10106)
+         Dim sTitle As String = EgtMsg(10101)
          If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
             Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
@@ -186,33 +202,24 @@ Public Class MySceneHostVM
    Private Sub PostInitializeScene()
       ' Impostazioni Controller
       MainController.SetScene(MainScene)
-      MainController.SetSurfTmTolerance(0.05)
+      MainController.SetSurfTmTolerance(OptionModule.m_dGeometryTolerance)
+      MainController.SetAdvImpTolerance(OptionModule.m_dGeometryTolerance)
       MainController.SetUseCustomColors(True, S_SCENE, K_CUSTOMCOLORS)
       ' imposto unità di misura per interfaccia utente
       Dim bMmUnits As Boolean = GetMainPrivateProfileInt(S_SCENE, K_MMUNITS, 1) <> 0
       EgtSetUiUnits(bMmUnits)
-      'Map.refMyStatusBarVM.SetMeasureUnit(nMeasureUnit <> 0)
       ' imposto visualizzazione riferimento globale
       EgtSetGlobFrameShow(True)
       ' imposto i dati della griglia
-      Dim bGridVisibility As Boolean = (GetMainPrivateProfileInt(S_GRID, K_SHOWGRID, 1) <> 0)
-      Dim dSnapStepMm As Double = GetMainPrivateProfileDouble(S_GRID, K_SNAPSTEP, 10)
-      Dim dSnapStepInch As Double = GetMainPrivateProfileDouble(S_GRID, K_SNAPSTEPINCH, 10)
-      Dim nMinLineSStep As Integer = GetMainPrivateProfileInt(S_GRID, K_MINLINESSTEP, 1)
-      Dim nMajLineSStep As Integer = GetMainPrivateProfileInt(S_GRID, K_MAJLINESSTEP, 10)
-      Dim nExtSStep As Integer = GetMainPrivateProfileInt(S_GRID, K_EXTSSTEP, 50)
       Dim MinLnColor As Color3d = New Color3d(160, 160, 160)
       GetMainPrivateProfileColor(S_GRID, K_MINLNCOLOR, MinLnColor)
       Dim MajLnColor As Color3d = New Color3d(160, 160, 160)
       GetMainPrivateProfileColor(S_GRID, K_MAJLNCOLOR, MajLnColor)
       EgtSetGridFrame(Frame3d.GLOB)
-      If bMmUnits Then
-         EgtSetGridGeo(dSnapStepMm, nMinLineSStep, nMajLineSStep, nExtSStep)
-      Else
-         EgtSetGridGeo(dSnapStepInch, nMinLineSStep, nMajLineSStep, nExtSStep)
-      End If
+      EgtSetGridGeo( If( bMmUnits, OptionModule.m_dSnapStepMm, OptionModule.m_dSnapStepInch),
+                     OptionModule.m_nMinLineSStep, OptionModule.m_nMajLineSStep, OptionModule.m_nExtSStep)
       EgtSetGridColor(MinLnColor, MajLnColor)
-      EgtSetGridShow(bGridVisibility, bGridVisibility)
+      EgtSetGridShow(OptionModule.m_bGridVisibility, OptionModule.m_bGridVisibility)
       ' imposto tipo coordinate
       MainScene.SetGridCursorPos(True)
       ' visualizzazione avanzata dei triangoli costituenti le superfici
@@ -347,6 +354,7 @@ Public Class MySceneHostVM
                                                                "|Step files (*.stp;*.step)|*.stp;*.step" &
                                                                "|3D Manufacturing format (*.3mf)|*.3mf" &
                                                                "|New geometry EgalTech(*.nge)|*.nge" &
+                                                               "|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
                                                                "|All Files (*.*)|*.*",
                                                      .FilterIndex = ExtIndex,
                                                      .InitialDirectory = sDir}
@@ -354,8 +362,7 @@ Public Class MySceneHostVM
          Return False
       End If
       WriteMainPrivateProfileString(S_PRINTING3D, K_IMPORTCURREXTENSION, OpenFileDialog.FilterIndex)
-      Dim sFile As String = String.Empty
-      sFile = OpenFileDialog.FileName
+      Dim sFile As String = OpenFileDialog.FileName
       ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
       Map.refProjManagerVM.SetProjCmdIsEnabled(False)
       Map.refTopPanelVM.SetTopPanelIsEnabled(False)
@@ -410,8 +417,9 @@ Public Class MySceneHostVM
                                                                "|Step files (*.stp;*.step)|*.stp;*.step" &
                                                                "|3D Manufacturing format (*.3mf)|*.3mf" &
                                                                "|New geometry EgalTech(*.nge)|*.nge" &
+                                                               "|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
                                                                "|All Files (*.*)|*.*",
-                                                     .FilterIndex = 1,
+                                                     .FilterIndex = 6,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
          Return False
@@ -424,29 +432,35 @@ Public Class MySceneHostVM
          ' sposto le nuove geometrie nel layer rib del pezzo
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
+         Dim frLayer As New Frame3d
+         EgtGetGroupGlobFrame( nNewLayerId, frLayer)   
          Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewLayerId)
          While nNewEntityId <> GDB_ID.NULL
             Dim EntityType As GDB_TY = EgtGetType(nNewEntityId)
             Select Case EntityType
                Case GDB_TY.CRV_COMPO, GDB_TY.CRV_LINE, GDB_TY.CRV_ARC
-                  Dim nNewRib = nNewEntityId
+                  Dim nNewRib As Integer = GDB_ID.NULL
                   If EntityType = GDB_TY.CRV_LINE OrElse EntityType = GDB_TY.CRV_ARC Then
-                     nNewRib = EgtCreateCurveCompo(Map.refTopPanelVM.SelPart.nPartId, nNewEntityId, False)
+                     nNewRib = EgtCreateCurveCompo(nNewLayerId, nNewEntityId, False)
+                     EgtRelocate( nNewRib, Map.refRibPanelVM.nRibLayerId, GDB_POS.LAST_SON)
                   Else
                      ' lo copio nel layer dei rib
                      nNewRib = EgtCopy(nNewEntityId, Map.refRibPanelVM.nRibLayerId, GDB_POS.LAST_SON)
                   End If
                   EgtSetName(nNewRib, RIB_CURVE)
+                  ' elimino effetti di eventuale riferimento originale
+                  EgtTransform( nNewRib, frLayer)
                   ' elimino colore entita'
                   EgtResetColor(nNewEntityId)
                   ' lo aggiungo alla lista
                   Dim NewEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMIMPORT, nNewRib)
                   Map.refRibPanelVM.RibList.Add(NewEntity)
                Case GDB_TY.SRF_MESH, GDB_TY.SRF_FRGN, GDB_TY.SRF_BEZ
-                  Dim nNewRib = nNewEntityId
                   ' lo copio nel layer dei rib
-                  nNewRib = EgtCopy(nNewEntityId, Map.refRibPanelVM.nRibLayerId, GDB_POS.LAST_SON)
+                  Dim nNewRib As Integer = EgtCopy(nNewEntityId, Map.refRibPanelVM.nRibLayerId, GDB_POS.LAST_SON)
                   EgtSetName(nNewRib, RIB_EXTRUSION)
+                  ' elimino effetti di eventuale riferimento originale
+                  EgtTransform( nNewRib, frLayer)
                   ' elimino colore entita'
                   EgtResetColor(nNewEntityId)
                   ' lo aggiungo alla lista
@@ -481,20 +495,22 @@ Public Class MySceneHostVM
                                                                "|Step files (*.stp;*.step)|*.stp;*.step" &
                                                                "|3D Manufacturing format (*.3mf)|*.3mf" &
                                                                "|New geometry EgalTech(*.nge)|*.nge" &
+                                                               "|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
                                                                "|All Files (*.*)|*.*",
-                                                     .FilterIndex = 1,
+                                                     .FilterIndex = 6,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
          Return False
       End If
-      Dim sFile As String = String.Empty
-      sFile = OpenFileDialog.FileName
+      Dim sFile As String = OpenFileDialog.FileName
       ' importo la nuova geometria
       Dim bOk As Boolean = MainController.InsertProject(sFile, False)
       If bOk Then
          ' sposto le nuove geometrie nel layer rib del pezzo
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
+         Dim frLayer As New Frame3d
+         EgtGetGroupGlobFrame( nNewLayerId, frLayer)   
          ' verifico che ci sia una sola entita'
          If EgtGetGroupObjs(nNewLayerId) <> 1 Then
             MessageBox.Show("Impossible importing file that contains more than one entity.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
@@ -503,6 +519,8 @@ Public Class MySceneHostVM
             If MenuItem.OrigLayer.EntityList.Count > 0 AndAlso MenuItem.OrigLayer.EntityList(0).nId <> GDB_ID.NULL Then EgtErase(MenuItem.OrigLayer.EntityList(0).nId)
             Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewLayerId)
             EgtRelocate(nNewEntityId, MenuItem.OrigLayer.nLayerId, GDB_POS.LAST_SON)
+            ' elimino effetti di eventuale riferimento originale
+            EgtTransform( nNewEntityId, frLayer)
             ' elimino colore entita'
             EgtResetColor(nNewEntityId)
             ' aggiorno riferimento pezzo
@@ -539,8 +557,9 @@ Public Class MySceneHostVM
                                                                "|Step files (*.stp;*.step)|*.stp;*.step" &
                                                                "|3D Manufacturing format (*.3mf)|*.3mf" &
                                                                "|New geometry EgalTech(*.nge)|*.nge" &
+                                                               "|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
                                                                "|All Files (*.*)|*.*",
-                                                     .FilterIndex = 1,
+                                                     .FilterIndex = 6,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
          Return False
@@ -553,29 +572,35 @@ Public Class MySceneHostVM
          ' sposto le nuove geometrie nel layer ShellNumber del pezzo
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
+         Dim frLayer As New Frame3d
+         EgtGetGroupGlobFrame( nNewLayerId, frLayer)   
          Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewLayerId)
          While nNewEntityId <> GDB_ID.NULL
             Dim EntityType As GDB_TY = EgtGetType(nNewEntityId)
             Select Case EntityType
                Case GDB_TY.CRV_COMPO, GDB_TY.CRV_LINE, GDB_TY.CRV_ARC
-                  Dim nNewShellNumberId As Integer = nNewEntityId
+                  Dim nNewShellNumberId As Integer = GDB_ID.NULL
                   If EntityType = GDB_TY.CRV_LINE OrElse EntityType = GDB_TY.CRV_ARC Then
-                     nNewShellNumberId = EgtCreateCurveCompo(Map.refTopPanelVM.SelPart.nPartId, nNewEntityId, False)
+                     nNewShellNumberId = EgtCreateCurveCompo(nNewLayerId, nNewEntityId, False)
+                     EgtRelocate( nNewShellNumberId, Map.refShellNumberPanelVM.nShellNumberLayerId, GDB_POS.LAST_SON)
                   Else
                      ' lo copio nel layer dei shellnumber
                      nNewShellNumberId = EgtCopy(nNewEntityId, Map.refShellNumberPanelVM.nShellNumberLayerId, GDB_POS.LAST_SON)
                   End If
                   EgtSetName(nNewShellNumberId, RIB_CURVE)
+                  ' elimino effetti di eventuale riferimento originale
+                  EgtTransform( nNewShellNumberId, frLayer)
                   ' elimino colore entita'
                   EgtResetColor(nNewEntityId)
                   ' lo aggiungo alla lista
                   Dim NewEntity As ShellNumberEntity = New ShellNumberEntity(ShellNumberEntity.ShellNumberTypes.FROMIMPORT, nNewShellNumberId)
                   Map.refShellNumberPanelVM.ShellNumberList.Add(NewEntity)
                Case GDB_TY.SRF_MESH, GDB_TY.SRF_FRGN, GDB_TY.SRF_BEZ
-                  Dim nNewShellNumberId = nNewEntityId
-                  ' lo copio nel layer dei rib
-                  nNewShellNumberId = EgtCopy(nNewEntityId, Map.refShellNumberPanelVM.nShellNumberLayerId, GDB_POS.LAST_SON)
+                  ' lo copio nel layer dei shellnumber
+                  Dim nNewShellNumberId As Integer = EgtCopy(nNewEntityId, Map.refShellNumberPanelVM.nShellNumberLayerId, GDB_POS.LAST_SON)
                   EgtSetName(nNewShellNumberId, RIB_EXTRUSION)
+                  ' elimino effetti di eventuale riferimento originale
+                  EgtTransform( nNewShellNumberId, frLayer)
                   ' elimino colore entita'
                   EgtResetColor(nNewEntityId)
                   ' lo aggiungo alla lista
@@ -585,7 +610,7 @@ Public Class MySceneHostVM
             nNewEntityId = EgtGetNext(nNewEntityId)
          End While
          EgtErase(nNewPartId)
-         ' seleziono ultima rib
+         ' seleziono ultima ShellNumber
          Map.refShellNumberPanelVM.SelLastShellNumber()
          EgtDraw()
          ' Imposto flag di ricalcolo slice
@@ -610,8 +635,9 @@ Public Class MySceneHostVM
                                                                "|Step files (*.stp;*.step)|*.stp;*.step" &
                                                                "|3D Manufacturing format (*.3mf)|*.3mf" &
                                                                "|New geometry EgalTech(*.nge)|*.nge" &
+                                                               "|Imported Files (*.*)|*.stl;*.igs;*.iges;*.stp;*.step;*.3mf;*.nge" &
                                                                "|All Files (*.*)|*.*",
-                                                     .FilterIndex = 1,
+                                                     .FilterIndex = 6,
                                                      .InitialDirectory = sDir}
       If Not OpenFileDialog.ShowDialog Then
          Return False
@@ -624,29 +650,35 @@ Public Class MySceneHostVM
          ' sposto le nuove geometrie nel layer ShellNumber del pezzo
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
+         Dim frLayer As New Frame3d
+         EgtGetGroupGlobFrame( nNewLayerId, frLayer)   
          Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewLayerId)
          While nNewEntityId <> GDB_ID.NULL
             Dim EntityType As GDB_TY = EgtGetType(nNewEntityId)
             Select Case EntityType
                Case GDB_TY.CRV_COMPO, GDB_TY.CRV_LINE, GDB_TY.CRV_ARC
-                  Dim nNewFilledSolidId As Integer = nNewEntityId
+                  Dim nNewFilledSolidId As Integer = GDB_ID.NULL
                   If EntityType = GDB_TY.CRV_LINE OrElse EntityType = GDB_TY.CRV_ARC Then
-                     nNewFilledSolidId = EgtCreateCurveCompo(Map.refTopPanelVM.SelPart.nPartId, nNewEntityId, False)
+                     nNewFilledSolidId = EgtCreateCurveCompo(nNewLayerId, nNewEntityId, False)
+                     EgtRelocate( nNewFilledSolidId, Map.refFilledSolidPanelVM.nFilledSolidLayerId, GDB_POS.LAST_SON)
                   Else
-                     ' lo copio nel layer dei shellnumber
+                     ' lo copio nel layer dei FilledSolid
                      nNewFilledSolidId = EgtCopy(nNewEntityId, Map.refFilledSolidPanelVM.nFilledSolidLayerId, GDB_POS.LAST_SON)
                   End If
                   EgtSetName(nNewFilledSolidId, RIB_CURVE)
+                  ' elimino effetti di eventuale riferimento originale
+                  EgtTransform( nNewFilledSolidId, frLayer)
                   ' elimino colore entita'
                   EgtResetColor(nNewEntityId)
                   ' lo aggiungo alla lista
                   Dim NewEntity As FilledSolidEntity = New FilledSolidEntity(FilledSolidEntity.FilledSolidTypes.FROMIMPORT, nNewFilledSolidId)
                   Map.refFilledSolidPanelVM.FilledSolidList.Add(NewEntity)
                Case GDB_TY.SRF_MESH, GDB_TY.SRF_FRGN, GDB_TY.SRF_BEZ
-                  Dim nNewFilledSolidId = nNewEntityId
-                  ' lo copio nel layer dei rib
-                  nNewFilledSolidId = EgtCopy(nNewEntityId, Map.refFilledSolidPanelVM.nFilledSolidLayerId, GDB_POS.LAST_SON)
+                  ' lo copio nel layer dei FilledSolid
+                  Dim nNewFilledSolidId As Integer = EgtCopy(nNewEntityId, Map.refFilledSolidPanelVM.nFilledSolidLayerId, GDB_POS.LAST_SON)
                   EgtSetName(nNewFilledSolidId, RIB_EXTRUSION)
+                  ' elimino effetti di eventuale riferimento originale
+                  EgtTransform( nNewFilledSolidId, frLayer)
                   ' elimino colore entita'
                   EgtResetColor(nNewEntityId)
                   ' lo aggiungo alla lista
@@ -656,7 +688,7 @@ Public Class MySceneHostVM
             nNewEntityId = EgtGetNext(nNewEntityId)
          End While
          EgtErase(nNewPartId)
-         ' seleziono ultima rib
+         ' seleziono ultima FilledSolid
          Map.refFilledSolidPanelVM.SelLastFilledSolid()
          EgtDraw()
          ' Imposto flag di ricalcolo slice
@@ -1193,6 +1225,15 @@ Public Class MySceneHostVM
       End If
    End Sub
 
+   Private Sub OnInsertingProject(sender As Object, nType As Integer, ByRef nFlag As Integer)
+      If nType = FT.OBJ Or nType = FT.IGES Or nType = FT.STEP_ Or nType = FT.ACIS Or
+         nType = FT.PARASOLID Or nType = FT.JT Or nType = FT.VRML Or nType = FT.C3D Then
+         nFlag = GetMainPrivateProfileInt(S_IMPORT, K_ADVFLAG, 0)
+      Else
+         nFlag = 0
+      End If
+   End Sub
+
    Private Sub OnInsertedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
       ' Segnalo eventuale errore
       If Not bOk Then
@@ -1205,37 +1246,6 @@ Public Class MySceneHostVM
       MainScene.SetStatusNull()
    End Sub
 
-   Private Sub OnImportingProject(sender As Object, nType As Integer, ByRef nFlag As Integer)
-      If nType <> FT.NULL Then
-         If nType = FT.CNC Then
-            nFlag = GetMainPrivateProfileInt(S_IMPORT, K_CNCFLAG, EIC_FL.NONE)
-         Else
-            nFlag = 0
-         End If
-         ' Abilito progress e bottone stop
-         Map.refMyStatusBarVM.StartLoading("", True)
-      Else
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
-      End If
-   End Sub
-
-   Private Sub OnImportedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
-      EgtZoom(ZM.ALL)
-      ' Disabilito progress e bottone stop
-      Map.refMyStatusBarVM.EndLoading("")
-      ' Salvo path
-      WriteMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, Path.GetDirectoryName(sFile))
-      ' Segnalo eventuale errore
-      If Not bOk Then
-         Dim sMsg As String = EgtMsg(10006) & " '" & sFile & "'"            'Error importing file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
-      ElseIf Path.GetExtension(sFile) <> ".cnc" Then
-         ' creo oggetto pezzo in lista
-         'Map.refProjectVM.
-      End If
-      MainScene.SetStatusNull()
-   End Sub
-
    Private Sub PrepareInputBox(ByVal sTitle As String, ByVal sLabel As String, ByVal sCheckLabel As String,
                                  ByVal bShowCombo As Boolean, ByVal bShowBtn As Boolean)
       Map.refControllerInputPanelVM.PrepareInputBox(sTitle, sLabel, sCheckLabel, bShowCombo, bShowBtn)
@@ -1508,6 +1518,8 @@ Public Class MySceneHostVM
             ' eseguo comando
             Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
             Map.refStartMachPanelVM.ResetCPlaneObjIsActive()
+            ' imposto dimensioni griglia standard (non tavola)
+            EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
             ' ripristino selezioni precedenti
             For Each Id In Map.refStartMachPanelVM.PrevSelObjs
                EgtSelectObj(Id)
@@ -1592,6 +1604,8 @@ Public Class MySceneHostVM
             ' eseguo comando
             Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
             Map.refRibPanelVM.ResetCPlaneObjIsActive()
+            ' imposto dimensioni griglia standard (non tavola)
+            EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
             ' ripristino selezioni precedenti
             For Each Id In Map.refRibPanelVM.PrevSelObjs
                EgtSelectObj(Id)
@@ -1677,6 +1691,8 @@ Public Class MySceneHostVM
             ' eseguo comando
             Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
             Map.refShellNumberPanelVM.ResetCPlaneObjIsActive()
+            ' imposto dimensioni griglia standard (non tavola)
+            EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
             ' ripristino selezioni precedenti
             For Each Id In Map.refShellNumberPanelVM.PrevSelObjs
                EgtSelectObj(Id)
@@ -1762,6 +1778,8 @@ Public Class MySceneHostVM
             ' eseguo comando
             Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_OBJ)
             Map.refFilledSolidPanelVM.ResetCPlaneObjIsActive()
+            ' imposto dimensioni griglia standard (non tavola)
+            EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
             ' ripristino selezioni precedenti
             For Each Id In Map.refFilledSolidPanelVM.PrevSelObjs
                EgtSelectObj(Id)

Icarus/ShellNumberPanel/ShellNumberPanelVM.vb

@@ -600,6 +600,7 @@ Public Class ShellNumberPanelVM
    Friend Sub Dispose()
       ' ripristino frame originale
       EgtSetGridFrame(m_OriginalGridFrame)
+      EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY())
       ' se in modifica parametri
       If m_bMachParam_IsChecked Then
          ' ripristino modalita' standard
@@ -1081,6 +1082,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY())
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1106,6 +1108,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1131,6 +1134,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1156,6 +1160,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1181,6 +1186,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1206,6 +1212,7 @@ Public Class ShellNumberPanelVM
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -1232,6 +1239,7 @@ Public Class ShellNumberPanelVM
    Public Sub CPlaneElevation(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       ManageInterface(False)
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -1257,87 +1265,12 @@ Public Class ShellNumberPanelVM
    Public Sub CPlaneOrigin(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       ManageInterface(False)
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 
 #End Region ' CPlaneOrigin
 
-#Region "CPlaneRotate"
-
-   ''' <summary>
-   ''' Returns a command that do CPlaneRotate.
-   ''' </summary>
-   Public ReadOnly Property CPlaneRotate_Command As ICommand
-      Get
-         If m_cmdCPlaneRotate Is Nothing Then
-            m_cmdCPlaneRotate = New Command(AddressOf CPlaneRotate)
-         End If
-         Return m_cmdCPlaneRotate
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlaneRotate.  This method is invoked by the CPlaneRotateCommand.
-   ''' </summary>
-   Public Sub CPlaneRotate(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      If (Keyboard.Modifiers And ModifierKeys.Shift) <> ModifierKeys.Shift Then
-         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE)
-      Else
-         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ROTATE3D)
-      End If
-   End Sub
-
-#End Region ' CPlaneRotate
-
-#Region "CPlane3P"
-
-   ''' <summary>
-   ''' Returns a command that do CPlane3P.
-   ''' </summary>
-   Public ReadOnly Property CPlane3P_Command As ICommand
-      Get
-         If m_cmdCPlane3P Is Nothing Then
-            m_cmdCPlane3P = New Command(AddressOf CPlane3P)
-         End If
-         Return m_cmdCPlane3P
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlane3P.  This method is invoked by the CPlane3PCommand.
-   ''' </summary>
-   Public Sub CPlane3P(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_3P)
-   End Sub
-
-#End Region ' CPlane3P
-
-#Region "CPlanePerpObj"
-
-   ''' <summary>
-   ''' Returns a command that do CPlanePerpObj.
-   ''' </summary>
-   Public ReadOnly Property CPlanePerpObj_Command As ICommand
-      Get
-         If m_cmdCPlanePerpObj Is Nothing Then
-            m_cmdCPlanePerpObj = New Command(AddressOf CPlanePerpObj)
-         End If
-         Return m_cmdCPlanePerpObj
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the CPlanePerpObj.  This method is invoked by the CPlanePerpObjCommand.
-   ''' </summary>
-   Public Sub CPlanePerpObj(ByVal param As Object)
-      If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
-      Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_PERPCURVE)
-   End Sub
-
-#End Region ' CPlanePerpObj
-
 #Region "CPlaneObj"
 
    Private m_bCPlaneObj_IsActive As Boolean = False

Icarus/SimulationPanel/MySimulation.vb

@@ -23,6 +23,16 @@ Public Class MySimulation
 
 #End Region    ' FIELDS & PROPERTIES
 
+#Region "Messages"
+
+   Public ReadOnly Property VMillAdditiveMsg As String
+      Get
+         Return "Virtual Additive"
+      End Get
+   End Property
+
+#End Region     ' Messages
+
 #Region "CONSTRUCTOR"
 
    Sub New()
@@ -57,12 +67,13 @@ Public Class MySimulation
                   SetShowPlay(True)
                   NotifyPropertyChanged("PlayPauseImage")
                End If
-               ' Se movimento non riuscito
+            ' Se movimento non riuscito
             Else
                SetSimulationStatus(MCH_SIM_ST.UI_STOP)
                ' Aggiornamenti per bottone Play/Pause
                SetShowPlay(True)
                NotifyPropertyChanged("PlayPauseImage")
+               ' Eventuale messaggio
                Select Case nMove
                   Case MCH_SIM.END_
                      StatusMsg = EgtMsg(MSG_SIMULATIONPAGEUC + 1)     'Simulazione completata
@@ -104,6 +115,15 @@ Public Class MySimulation
             MachineAxisList(Index).IsReadOnlyAxesValue = True
          Next
       End If
+      EgtSimSetUiStatus(GetStatus())
+   End Sub
+
+   Public Overrides Sub VMillActiveInfoTitle(VMillActive As Boolean)
+      If VMillActive Then
+         EgtSetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_VM, VMillActive)
+      Else
+         EgtRemoveInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_VM)
+      End If
    End Sub
 
 #End Region    ' METHODS

Icarus/SimulationPanel/SimulationPanelV.xaml

@@ -67,6 +67,40 @@
                   </Button>
 
                </UniformGrid>
+               <Grid DataContext="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:SimulationPanelV}}}"
+                     IsEnabled="{Binding MySimul.VMill_IsEnabled}"
+                     Margin="2.5"
+                     HorizontalAlignment="Center"
+                     Visibility="{Binding MySimul.VMill_Visibility}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <CheckBox IsChecked="{Binding MySimul.VMillActive}"
+                         VerticalAlignment="Center"
+                         Margin="2.5"/>
+                  <TextBlock Grid.Column="1"
+                          Text="{Binding MySimul.VMillAdditiveMsg}" 
+                          Margin="2.5"
+                          Style="{StaticResource Simulation_TextBlock}"/>
+               </Grid>
+               <Grid DataContext="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type PrintApp:SimulationPanelV}}}"
+                     IsEnabled="{Binding MySimul.Trace_IsEnabled}"
+                     Margin="2.5"
+                     HorizontalAlignment="Center"
+                     Visibility="{Binding MySimul.Trace_Visibility}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <CheckBox IsChecked="{Binding MySimul.TraceActive}"
+                         VerticalAlignment="Center"
+                         Margin="2.5"/>
+                  <TextBlock Grid.Column="1"
+                          Text="{Binding MySimul.TraceMsg}" 
+                          Margin="2.5"
+                          Style="{StaticResource Simulation_TextBlock}"/>
+               </Grid>
                <TextBlock Text="{Binding StatusMsg}" 
                           TextAlignment="Center" 
                           Margin="2.5"

Icarus/SimulationPanel/SimulationPanelVM.vb

@@ -20,6 +20,15 @@ Public Class SimulationPanelVM
       End Set
    End Property
 
+#Region "Messages"
+
+   Public ReadOnly Property VirtualAdditive_Msg As String
+      Get
+         Return "Virtual Additive"
+      End Get
+   End Property
+
+#End Region
 
    ' Definizione comandi
    Private m_cmdOk As ICommand
@@ -101,6 +110,32 @@ Public Class SimulationPanelVM
       MySimul.SliderValue = SliderVal
       MySimul.ShowCncData()
       MySimul.StatusMsg = EgtMsg(MSG_SIMULATIONPAGEUC + 14)   ' Home
+      ' Gestione check VMill
+      If GetMainPrivateProfileInt(S_SIMUL, K_VIRTUALADDITIVE, 0) > 0 AndAlso
+         EgtUILib.GetPrivateProfileInt( S_VMILL, K_VM_ENABLE, 0, CurrentMachine.sMachIniFile) > 0 Then
+         MySimul.VMill_Visibility = Visibility.Visible
+         MySimul.VMill_IsEnabled = True
+         Dim bVal As Boolean
+         MySimul.SetVMillActive( EgtGetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_VM, bVal) AndAlso bVal)
+      Else
+         ' Disabilito Vmill, ma inibisco dichiarazione progetto modificato
+         MySimul.VMill_Visibility = Visibility.Collapsed
+         MySimul.VMill_IsEnabled = False
+         MySimul.VMillActive = False
+         EgtDisableModified()
+         EgtRemoveInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_VM)
+         EgtEnableModified()
+      End If
+      ' Gestione check Trace
+      If GetMainPrivateProfileInt(S_SIMUL, K_TRACEENABLE, 0) > 0 And
+         EgtUILib.GetPrivateProfileInt(S_TOOLTRACE, K_TT_ENABLE, 0, CurrentMachine.sMachIniFile) > 0 Then
+         MySimul.Trace_Visibility = Visibility.Visible
+         MySimul.Trace_IsEnabled = True
+         If MySimul.TraceActive Then MySimul.TraceActive = True
+      Else
+         MySimul.Trace_Visibility = Visibility.Collapsed
+         MySimul.Trace_IsEnabled = False
+      End If
       ' nascondo slider strati e layer da visualizzare
       Map.refSliderManagerVM.SetSliderVisibility(False)
       Map.refViewLayerManagerVM.SetViewLayerManagerVisibility(False)
@@ -147,7 +182,7 @@ Public Class SimulationPanelVM
       ' Abilito impostazione modificato
       EgtEnableModified()
       ' Ripristino vista griglia
-      EgtSetGridShow(True, True)
+      EgtSetGridShow(OptionModule.m_bGridVisibility, OptionModule.m_bGridVisibility)
       ' Cambio la vista della scena
       EgtSetGenericView(m_dPrevAngVertDegView, m_dPrevAngHorizDegView, False)
       EgtZoom(ZM.ALL)

Icarus/SliceManager/SliceManagerVM.vb

@@ -456,6 +456,7 @@ Public Class SliceManagerVM
          ' Definisco e posiziono il grezzo sulla tavola
          EgtAddMachGroup("3dPrint")
          EgtSetTable("Tab")
+         EgtSetTableAreaOffset( 500, 500, 500, 500) 
          For Each CurrPart In Map.refTopPanelVM.PartList
             Dim b3Part As New BBox3d
             Dim b3PrintSolid As New BBox3d
@@ -718,8 +719,8 @@ Public Class SliceManagerVM
                ' altrimenti lo segnalo
             End If
             ' verifico se creare pacchetto
-            If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.MACHINE_EXPORT) Then
-               'If True Then
+            If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.MACHINE_EXPORT) AndAlso
+               GetMainPrivateProfileInt(S_GENERAL, K_MACHINEEXPORT, 1) > 0 Then
                If Not CreateProjectForMachine(sIsoFilePath) Then
                   MessageBox.Show("Icrx file generation failed!!", "Error!", MessageBoxButton.OK, MessageBoxImage.Error)
                End If

Icarus/StartMachPanel/StartMachPanelVM.vb

@@ -484,6 +484,7 @@ Public Class StartMachPanelVM
    Friend Sub Dispose()
       ' ripristino frame originale
       EgtSetGridFrame(m_OriginalGridFrame)
+      EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY())
       EgtDeselectAll()
       EgtDraw()
       Map.refSceneHostVM.MainScene.SetStatusNull()
@@ -779,6 +780,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneTop(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeoAdv( -1, -1, -1, 0, CurrentMachine.b3Tab.DimX(), 0, CurrentMachine.b3Tab.DimY())
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.TOP)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -804,6 +806,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneFront(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.FRONT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -829,6 +832,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneRight(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.RIGHT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -854,6 +858,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneBack(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BACK)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -879,6 +884,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneLeft(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.LEFT)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -904,6 +910,7 @@ Public Class StartMachPanelVM
    ''' </summary>
    Public Sub CPlaneBottom(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.SetLastInteger(Controller.GRID_TYPE.BOTTOM)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID)
    End Sub
@@ -930,6 +937,7 @@ Public Class StartMachPanelVM
    Public Sub CPlaneElevation(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       ManageInterface(False)
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ELEVATION)
    End Sub
 
@@ -955,6 +963,7 @@ Public Class StartMachPanelVM
    Public Sub CPlaneOrigin(ByVal param As Object)
       If Map.refSceneHostVM.MainController.GetStep <> 0 OrElse m_bCPlaneObj_IsActive Then Return
       ManageInterface(False)
+      EgtSetGridGeo( -1, -1, -1, OptionModule.m_nExtSStep)
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.GRID_ORIGIN)
    End Sub
 

Icarus/StatusBar/MyStatusBarVM.vb

@@ -25,11 +25,13 @@ Public Class MyStatusBarVM
       Set(value As Boolean)
          If Map.refRibPanelVM.bGrid_IsChecked Or Map.refStartMachPanelVM.bGrid_IsChecked Or Map.refShellNumberPanelVM.bGrid_IsChecked Then Return
          m_bGridVisibility = value
+         OptionModule.m_bGridVisibility = m_bGridVisibility
          EgtSetGridShow(value, value)
          EgtDraw()
-         Map.refRibPanelVM.NotifyPropertyChanged(NameOf(Map.refRibPanelVM.bGrid_IsEnabled))
          Map.refStartMachPanelVM.NotifyPropertyChanged(NameOf(Map.refStartMachPanelVM.bGrid_IsEnabled))
+         Map.refRibPanelVM.NotifyPropertyChanged(NameOf(Map.refRibPanelVM.bGrid_IsEnabled))
          Map.refShellNumberPanelVM.NotifyPropertyChanged(NameOf(Map.refShellNumberPanelVM.bGrid_IsEnabled))
+         Map.refFilledSolidPanelVM.NotifyPropertyChanged(NameOf(Map.refFilledSolidPanelVM.bGrid_IsEnabled))
       End Set
    End Property
 
@@ -117,7 +119,7 @@ Public Class MyStatusBarVM
       ' Installo funzione output testo su status per lua
       EgtSetOutText(m_OutTextCallback)
       ' imposto stato di visualizzazione della griglia
-      m_bGridVisibility = GetMainPrivateProfileInt(S_GRID, K_SHOWGRID, 1) <> 0
+      m_bGridVisibility = OptionModule.m_bGridVisibility
       NotifyPropertyChanged(NameOf(bGridVisibility))
    End Sub
 

Icarus/TSFEditor/TFSEditorV.xaml

@@ -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,

Icarus/TopPanel/TopPanelVM.vb

@@ -626,15 +626,6 @@ Public Class TopPanelVM
       ' rinomino pezzo e layer
       Dim nPartId As Integer = EgtGetLastPart()
       EgtSetName(nPartId, PART)
-      'Dim nLayerId As Integer = EgtGetFirstInGroup(nPartId)
-      'EgtSetName(nLayerId, ORIGINAL_SOLID)
-
-      '' Recupero o creo layer ausiliario
-      'Dim nAuxId As Integer = EgtGetFirstNameInGroup(nPartId, LAY_AUX)
-      'If Not nAuxId Then
-      '   nAuxId = EgtCreateGroup(nPartId)
-      '   EgtSetName(nAuxId, LAY_AUX)
-      'End If
 
       ' Richiedo posizione origine e offset pezzo
       Dim b3Part As New BBox3d
@@ -643,24 +634,6 @@ Public Class TopPanelVM
       Dim nRefY As Integer = 1
       Dim dPosX As Double = CurrentMachine.b3Tab.DimX / 2 - b3Part.DimX / 2
       Dim dPosY As Double = CurrentMachine.b3Tab.DimY / 2 - b3Part.DimY / 2
-      ' Dim Positions = EgtDialogBox( 'Part position on table:', { 'Reference', 'CB:Left,Center,Right'},
-      '                                                         { '', 'CB:Bottom,Middle,Top'},
-      '                                                         { 'X', EgtNumToString( EgtToUiUnits( dPosX), 1)},
-      '                                                         { 'Y', EgtNumToString( EgtToUiUnits( dPosY), 1)})
-
-      'Dim ChooseReferenceWndVM As New ChooseReferenceWndVM
-      'Dim ChooseReferenceWndV As New ChooseReferenceWndV(Application.Current.MainWindow, ChooseReferenceWndVM)
-      'If Not ChooseReferenceWndV.ShowDialog() Then Return
-
-      'Dim gg = ChooseReferenceWndVM.SelReference
-      '' Aggiungo il box del solido
-      'Dim nBoxId As Integer = EgtSurftmb(nAuxId, b3Solid, False, GDB_RT.GLOB)
-
-      '' posiziono il pezzo al centro
-      'Dim b3Part As New BBox3d
-      'EgtGetBBoxGlob(nPartId, GDB_BB.EXACT, b3Part)
-      'Dim dPosX As Double = (CurrentMachine.b3Tab.DimX() / 2) - (b3Part.DimX() / 2)
-      'Dim dPosY As Double = (CurrentMachine.b3Tab.DimY() / 2) - (b3Part.DimY() / 2)
 
       ' Posiziono il pezzo e aggiorno il suo box
       Dim vtMove As Vector3d = New Point3d(dPosX, dPosY, 0) - b3Part.Min()
@@ -677,6 +650,7 @@ Public Class TopPanelVM
 
       EgtAddMachGroup("3dPrint")
       EgtSetTable("Tab")
+      EgtSetTableAreaOffset( 500, 500, 500, 500) 
 
       Dim nRawId As Integer = EgtAddRawPart(b3Part.Min, b3Part.DimX, b3Part.DimY, b3Part.DimZ, New Color3d(128, 128, 128, 30))
       EgtAddPartToRawPart(nPartId, b3Part.Min, nRawId)

Icarus/Utility/CurrentMachine.vb

@@ -131,7 +131,7 @@ Public Module CurrentMachine
    Public Sub CreateMachineTable()
       ' Disabilito segnalazione modificato
       Dim DisableMgr As New DisableModifiedMgr
-      Dim dTabX = b3Tab.DimX
+      Dim dTabX = b3Tab.DimX()
       Dim dTabY = b3Tab.DimY()
       ' Disegno tavola
       Dim nTabPartId As Integer = EgtCreateGroup(GDB_ID.ROOT)
@@ -150,8 +150,10 @@ Public Module CurrentMachine
          EgtSetInfo(nTabPartId, KEY_MATERIAL_GUID, Map.refTopPanelVM.SelMaterial.sGUID)
          EgtSetInfo(nTabPartId, KEY_MATERIAL_NAME, Map.refTopPanelVM.SelMaterial.sName)
       End If
-      '' creo area di estrusione
+      ' creo area di estrusione
       UpdateExtrusionArea()
+      ' imposto dati griglia (primi tre parametri -1 indica tieni i correnti)
+      EgtSetGridGeoAdv( -1, -1, -1, 0, dTabX, 0, dTabY)
       ' Ripristino stato segnalazione modifica
       DisableMgr.ReEnable()
    End Sub

Icarus/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Ionic.Zip" version="1.9.1.8" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
 </packages>