Merge branch 'develop' into ImportExportMaterialDb

- gestione visibilita' entita' in importazione
- eliminazione marcatura pezzo selezionato
- correzione su cancellazione pezzo

Icarus/AirspacePopup.vb

@@ -1,275 +0,0 @@
-' Follow steps 1a or 1b and then 2 to use this custom control in a XAML file.
-'
-' Step 1a) Using this custom control in a XAML file that exists in the current project.
-' Add this XmlNamespace attribute to the root element of the markup file where it is 
-' to be used:
-'
-'     xmlns:MyNamespace="clr-namespace:Icarus"
-'
-'
-' Step 1b) Using this custom control in a XAML file that exists in a different project.
-' Add this XmlNamespace attribute to the root element of the markup file where it is 
-' to be used:
-'
-'     xmlns:MyNamespace="clr-namespace:Icarus;assembly=Icarus"
-'
-' You will also need to add a project reference from the project where the XAML file lives
-' to this project and Rebuild to avoid compilation errors:
-'
-'     Right click on the target project in the Solution Explorer and
-'     "Add Reference"->"Projects"->[Browse to and select this project]
-'
-'
-' Step 2)
-' Go ahead and use your control in the XAML file. Note that Intellisense in the
-' XML editor does not currently work on custom controls and its child elements.
-'
-'     <MyNamespace:AirspacePopup/>
-'
-
-Imports System.Windows.Controls.Primitives
-Imports System
-Imports System.ComponentModel
-Imports System.Diagnostics
-Imports System.Runtime.InteropServices
-Imports System.Windows
-Imports System.Windows.Input
-Imports System.Windows.Interop
-
-Public Class AirspacePopup
-   Inherits Popup
-
-   Public Shared ReadOnly IsTopmostProperty As DependencyProperty = DependencyProperty.Register("IsTopmost", GetType(Boolean), GetType(AirspacePopup), New FrameworkPropertyMetadata(False, AddressOf OnIsTopmostChanged))
-   Public Shared ReadOnly FollowPlacementTargetProperty As DependencyProperty = DependencyProperty.RegisterAttached("FollowPlacementTarget", GetType(Boolean), GetType(AirspacePopup), New UIPropertyMetadata(False))
-   Public Shared ReadOnly AllowOutsideScreenPlacementProperty As DependencyProperty = DependencyProperty.RegisterAttached("AllowOutsideScreenPlacement", GetType(Boolean), GetType(AirspacePopup), New UIPropertyMetadata(False))
-   Public Shared ReadOnly ParentWindowProperty As DependencyProperty = DependencyProperty.RegisterAttached("ParentWindow", GetType(Window), GetType(AirspacePopup), New UIPropertyMetadata(Nothing, AddressOf ParentWindowPropertyChanged))
-
-   Private Shared Sub OnIsTopmostChanged(ByVal source As DependencyObject, ByVal e As DependencyPropertyChangedEventArgs)
-      Dim airspacePopup As AirspacePopup = TryCast(source, AirspacePopup)
-      airspacePopup.SetTopmostState(airspacePopup.IsTopmost)
-   End Sub
-
-   Private Shared Sub ParentWindowPropertyChanged(ByVal source As DependencyObject, ByVal e As DependencyPropertyChangedEventArgs)
-      Dim airspacePopup As AirspacePopup = TryCast(source, AirspacePopup)
-      airspacePopup.ParentWindowChanged()
-   End Sub
-
-   Private m_appliedTopMost As Boolean?
-   Private m_alreadyLoaded As Boolean
-   Private m_parentWindow As Window
-
-   Shared Sub New()
-      'This OverrideMetadata call tells the system that this element wants to provide a style that is different than its base class.
-      'This style is defined in themes\generic.xaml
-      DefaultStyleKeyProperty.OverrideMetadata(GetType(AirspacePopup), New FrameworkPropertyMetadata(GetType(AirspacePopup)))
-   End Sub
-
-   Public Sub New()
-      AddHandler Loaded, AddressOf OnPopupLoaded
-      AddHandler Unloaded, AddressOf OnPopupUnloaded
-      Dim descriptor As DependencyPropertyDescriptor = DependencyPropertyDescriptor.FromProperty(PlacementTargetProperty, GetType(AirspacePopup))
-      descriptor.AddValueChanged(Me, AddressOf PlacementTargetChanged)
-   End Sub
-
-   Public Property IsTopmost As Boolean
-      Get
-         Return CBool(GetValue(IsTopmostProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(IsTopmostProperty, value)
-      End Set
-   End Property
-
-   Public Property FollowPlacementTarget As Boolean
-      Get
-         Return CBool(GetValue(FollowPlacementTargetProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(FollowPlacementTargetProperty, value)
-      End Set
-   End Property
-
-   Public Property AllowOutsideScreenPlacement As Boolean
-      Get
-         Return CBool(GetValue(AllowOutsideScreenPlacementProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(AllowOutsideScreenPlacementProperty, value)
-      End Set
-   End Property
-
-   Public Property ParentWindow As Window
-      Get
-         Return CType(GetValue(ParentWindowProperty), Window)
-      End Get
-      Set(ByVal value As Window)
-         SetValue(ParentWindowProperty, value)
-      End Set
-   End Property
-
-   Private Sub ParentWindowChanged()
-      If ParentWindow IsNot Nothing Then
-         AddHandler ParentWindow.LocationChanged, Function(sender, e2)
-                                                     UpdatePopupPosition()
-                                                  End Function
-
-         AddHandler ParentWindow.SizeChanged, Function(sender, e2)
-                                                 UpdatePopupPosition()
-                                              End Function
-      End If
-   End Sub
-
-   Private Sub PlacementTargetChanged(ByVal sender As Object, ByVal e As EventArgs)
-      Dim placementTarget As FrameworkElement = TryCast(Me.PlacementTarget, FrameworkElement)
-
-      If placementTarget IsNot Nothing Then
-         AddHandler placementTarget.SizeChanged, Function(sender2, e2)
-                                                    UpdatePopupPosition()
-                                                 End Function
-      End If
-   End Sub
-
-   Private Sub UpdatePopupPosition()
-      Dim placementTarget As FrameworkElement = TryCast(Me.PlacementTarget, FrameworkElement)
-      Dim child As FrameworkElement = TryCast(Me.Child, FrameworkElement)
-
-      If PresentationSource.FromVisual(placementTarget) IsNot Nothing AndAlso AllowOutsideScreenPlacement = True Then
-         Dim leftOffset As Double = CutLeft(placementTarget)
-         Dim topOffset As Double = CutTop(placementTarget)
-         Dim rightOffset As Double = CutRight(placementTarget)
-         Dim bottomOffset As Double = CutBottom(placementTarget)
-         Debug.WriteLine(bottomOffset)
-         Me.Width = Math.Max(0, Math.Min(leftOffset, rightOffset) + placementTarget.ActualWidth)
-         Me.Height = Math.Max(0, Math.Min(topOffset, bottomOffset) + placementTarget.ActualHeight)
-
-         If child IsNot Nothing Then
-            child.Margin = New Thickness(leftOffset, topOffset, rightOffset, bottomOffset)
-         End If
-      End If
-
-      If FollowPlacementTarget = True Then
-         Me.HorizontalOffset += 0.01
-         Me.HorizontalOffset -= 0.01
-      End If
-   End Sub
-
-   Private Function CutLeft(ByVal placementTarget As FrameworkElement) As Double
-      Dim point As Point = placementTarget.PointToScreen(New Point(0, placementTarget.ActualWidth))
-      Return Math.Min(0, point.X)
-   End Function
-
-   Private Function CutTop(ByVal placementTarget As FrameworkElement) As Double
-      Dim point As Point = placementTarget.PointToScreen(New Point(placementTarget.ActualHeight, 0))
-      Return Math.Min(0, point.Y)
-   End Function
-
-   Private Function CutRight(ByVal placementTarget As FrameworkElement) As Double
-      Dim point As Point = placementTarget.PointToScreen(New Point(0, placementTarget.ActualWidth))
-      point.X += placementTarget.ActualWidth
-      Return Math.Min(0, SystemParameters.VirtualScreenWidth - (Math.Max(SystemParameters.VirtualScreenWidth, point.X)))
-   End Function
-
-   Private Function CutBottom(ByVal placementTarget As FrameworkElement) As Double
-      Dim point As Point = placementTarget.PointToScreen(New Point(placementTarget.ActualHeight, 0))
-      point.Y += placementTarget.ActualHeight
-      Return Math.Min(0, SystemParameters.VirtualScreenHeight - (Math.Max(SystemParameters.VirtualScreenHeight, point.Y)))
-   End Function
-
-   Private Sub OnPopupLoaded(ByVal sender As Object, ByVal e As RoutedEventArgs)
-      If m_alreadyLoaded Then Return
-      m_alreadyLoaded = True
-
-      If Child IsNot Nothing Then
-         Child.[AddHandler](PreviewMouseLeftButtonDownEvent, New MouseButtonEventHandler(AddressOf OnChildPreviewMouseLeftButtonDown), True)
-      End If
-
-      m_parentWindow = Window.GetWindow(Me)
-      If m_parentWindow Is Nothing Then Return
-      AddHandler m_parentWindow.Activated, AddressOf OnParentWindowActivated
-      AddHandler m_parentWindow.Deactivated, AddressOf OnParentWindowDeactivated
-   End Sub
-
-   Private Sub OnPopupUnloaded(ByVal sender As Object, ByVal e As RoutedEventArgs)
-      If m_parentWindow Is Nothing Then Return
-      RemoveHandler m_parentWindow.Activated, AddressOf OnParentWindowActivated
-      RemoveHandler m_parentWindow.Deactivated, AddressOf OnParentWindowDeactivated
-   End Sub
-
-   Private Sub OnParentWindowActivated(ByVal sender As Object, ByVal e As EventArgs)
-      SetTopmostState(True)
-   End Sub
-
-   Private Sub OnParentWindowDeactivated(ByVal sender As Object, ByVal e As EventArgs)
-      If IsTopmost = False Then
-         SetTopmostState(IsTopmost)
-      End If
-   End Sub
-
-   Private Sub OnChildPreviewMouseLeftButtonDown(ByVal sender As Object, ByVal e As MouseButtonEventArgs)
-      SetTopmostState(True)
-
-      If Not m_parentWindow.IsActive AndAlso IsTopmost = False Then
-         m_parentWindow.Activate()
-      End If
-   End Sub
-
-   Protected Overrides Sub OnOpened(ByVal e As EventArgs)
-      SetTopmostState(IsTopmost)
-      MyBase.OnOpened(e)
-   End Sub
-
-   Private Sub SetTopmostState(ByVal isTop As Boolean)
-      If m_appliedTopMost.HasValue AndAlso m_appliedTopMost = isTop Then
-         Return
-      End If
-
-      If Child Is Nothing Then Return
-      Dim hwndSource = TryCast((PresentationSource.FromVisual(Child)), HwndSource)
-      If hwndSource Is Nothing Then Return
-      Dim hwnd = hwndSource.Handle
-      Dim rect As RECT
-      If Not GetWindowRect(hwnd, rect) Then Return
-      Debug.WriteLine("setting z-order " & isTop)
-
-      If isTop Then
-         SetWindowPos(hwnd, HWND_TOPMOST, rect.Left, rect.Top, CInt(Width), CInt(Height), TOPMOST_FLAGS)
-      Else
-         SetWindowPos(hwnd, HWND_BOTTOM, rect.Left, rect.Top, CInt(Width), CInt(Height), TOPMOST_FLAGS)
-         SetWindowPos(hwnd, HWND_TOP, rect.Left, rect.Top, CInt(Width), CInt(Height), TOPMOST_FLAGS)
-         SetWindowPos(hwnd, HWND_NOTOPMOST, rect.Left, rect.Top, CInt(Width), CInt(Height), TOPMOST_FLAGS)
-      End If
-
-      m_appliedTopMost = isTop
-   End Sub
-
-   <StructLayout(LayoutKind.Sequential)>
-   Public Structure RECT
-      Public Left As Integer
-      Public Top As Integer
-      Public Right As Integer
-      Public Bottom As Integer
-   End Structure
-
-   <DllImport("user32.dll")>
-   Private Shared Function GetWindowRect(ByVal hWnd As IntPtr, <Out> ByRef lpRect As RECT) As Boolean
-   End Function
-   <DllImport("user32.dll")>
-   Private Shared Function SetWindowPos(ByVal hWnd As IntPtr, ByVal hWndInsertAfter As IntPtr, ByVal X As Integer, ByVal Y As Integer, ByVal cx As Integer, ByVal cy As Integer, ByVal uFlags As UInteger) As Boolean
-   End Function
-   Shared ReadOnly HWND_TOPMOST As IntPtr = New IntPtr(-1)
-   Shared ReadOnly HWND_NOTOPMOST As IntPtr = New IntPtr(-2)
-   Shared ReadOnly HWND_TOP As IntPtr = New IntPtr(0)
-   Shared ReadOnly HWND_BOTTOM As IntPtr = New IntPtr(1)
-   Private Const SWP_NOSIZE As UInt32 = &H1
-   Const SWP_NOMOVE As UInt32 = &H2
-   Const SWP_NOZORDER As UInt32 = &H4
-   Const SWP_NOREDRAW As UInt32 = &H8
-   Const SWP_NOACTIVATE As UInt32 = &H10
-   Const SWP_FRAMECHANGED As UInt32 = &H20
-   Const SWP_SHOWWINDOW As UInt32 = &H40
-   Const SWP_HIDEWINDOW As UInt32 = &H80
-   Const SWP_NOCOPYBITS As UInt32 = &H100
-   Const SWP_NOOWNERZORDER As UInt32 = &H200
-   Const SWP_NOSENDCHANGING As UInt32 = &H400
-   Const TOPMOST_FLAGS As UInt32 = SWP_NOACTIVATE Or SWP_NOOWNERZORDER Or SWP_NOSIZE Or SWP_NOMOVE Or SWP_NOREDRAW Or SWP_NOSENDCHANGING
-End Class

Icarus/Constants/Const3dPrint.vb

@@ -14,11 +14,13 @@
    Public Const START_GEOM = "Start"
    Public Const RIB_EXTRUSION = "RibExtrusion"
    Public Const RIB_CURVE = "RibCurve"
+   Public Const RIB_ID = "RibId"
    Public Const VIEWPARAMS = "ViewParams"
    Public Const IMPORTED_SOLID = "ImportedSolid"
    Public Const RESULT_READ_PROG = "ResultReadProg"
    Public Const KEY_CALC_SOLIDS = "CalcSolids"
    Public Const KEY_HAS_SOLIDS = "Solids"
+   Public Const LAY_CHUNKS = "Chunks"
 
 
    ' parametri calcolo tempi, F ed S
@@ -47,7 +49,8 @@
    Public Const MAT_T3 = "T3"
    Public Const MAT_T4 = "T4"
    Public Const MAT_T5 = "T5"
-   Public Const MAT_K = "K"
+   Public Const MAT_KEXTRUSION = "KExtrusion"
+   Public Const MAT_KLAYERTIME = "KLayerTime"
    Public Const MAT_C1 = "C1"
    Public Const MAT_C2 = "C2"
    Public Const MAT_DENSITY = "Density"
@@ -104,6 +107,7 @@
    Public Const MAC_RIBSLINK = "RibsLink"
    Public Const MAC_RIBSINVERTORDER = "RibsInvertOrder"
    Public Const MAC_RIBSINVERTDIRECTION = "RibsInvertDirection"
+   Public Const MAC_RIBSINVERTSTRANDORDER = "RibsInvertStrandOrder"
    Public Const MAC_RIBSLEADININVERT = "RibsLeadInInvert"
    Public Const MAC_RIBSLEADINLEN = "RibsLeadInLen"
    Public Const MAC_RIBSLEADOUTINVERT = "RibsLeadOutInvert"
@@ -124,6 +128,8 @@
    Public Const MAC_AUXSOLIDSCOASTINGLEN = "AuxSolidsCoastingLen"
    Public Const MAC_AUXSOLIDSWIPELEN = "AuxSolidsWipeLen"
    Public Const MAC_AUXSOLIDSWIPEDIR = "AuxSolidsWipeDir"
+   Public Const MAC_DYNAMICMODE = "DynamicMode"
+   Public Const MAC_PRINTORDER = "PrintOrder"
    Public Const MAC_CONSTANT = "Constant"
    Public Const MAC_MATERIALS = "Materials"
 
@@ -148,11 +154,19 @@
    ' materiale in progetto
    Public Const KEY_MATERIAL_GUID = "MaterialGuid"
    Public Const KEY_MATERIAL_NAME = "MaterialName"
+
    ' nome file cn in progetto
    Public Const KEY_ISOFILE_PATH = "IsoFilePath"
 
+   ' info di spostamento pezzo per 45 gradi
+   Public Const KEY_MOVEDPART = "MovedPart"
+   Public Const KEY_MOVEDPART2 = "MovedPart2"
+
    Public Const FILE_PATH = "FilePath"
    Public Const PART_NAME = "PartName"
    Public Const ENTITY_NAME = "EntityName"
 
+   ' stringa che identifica il materiale come originale del costruttore
+   Public Const ORIG_MATERIAL As String = "***"
+
 End Module

Icarus/Constants/ConstGen.vb

@@ -51,17 +51,7 @@ Public Module ConstGen
 
    ' Abilitazioni licenza
    Friend Enum KEY_OPT As UInteger
-      BASE = 1                            ' Prodotto EgtCAM5
+      BASE = 1                            ' Prodotto Icarus
-      DOORS = 2
-      GUNSTOCK = 4
-      DOORCREATOR = 8                     ' Prodotto DOORCreator
-      VIRTUALMILLING = 16
-      JAMBS = 32
-      BEAM = 64
-      CAD2D = 128
-      STEELDORS = 256
-      WALL = 512
-      _3DPRINT = 1024
    End Enum
 
    ' File di log generale

Icarus/CurrMachiningPanel/CurrMachining.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.Collections.Specialized
 Imports System.ComponentModel
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -150,7 +151,7 @@ Public Class CurrMachining
 
    Friend Overrides Sub OnMachiningParamPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       Select Case e.PropertyName
-         Case NameOf(sender.dValue), NameOf(sender.sValue), NameOf(sender.bValue), NameOf(sender.SelValue)
+         Case NameOf(sender.dValue), NameOf(sender.sValue), NameOf(sender.bValue), NameOf(sender.SelValue), NameOf(sender.Value)
             m_bIsModified = m_CathegoryList.Any(Function(x) x.MachiningParamList.Any(Function(y) y.bIsModified))
             NotifyPropertyChanged(NameOf(ghName))
             NotifyPropertyChanged(NameOf(sCurrSlicingType))
@@ -158,9 +159,25 @@ Public Class CurrMachining
             NotifyPropertyChanged(NameOf(sCurrStrandW))
             NotifyPropertyChanged(NameOf(sCurrStrandCount))
             NotifyPropertyChanged(NameOf(sCurrOffset))
+            sender.NotifyPropertyChanged(NameOf(sender.bIsModifiedFromDb))
       End Select
    End Sub
 
+   Friend Overrides Sub Save()
+      If bIsModified Then
+         ' salvo tutti i parametri su orig
+         SaveParams()
+         ' resetto stato di modificata
+         UpdateIsModified()
+      End If
+   End Sub
+
+   Protected Overrides Sub SaveParams()
+      For Each Cathegory In m_CathegoryList
+         Cathegory.SaveParams()
+      Next
+   End Sub
+
    Friend Sub WriteCurrParamInPart(nPartId As Integer)
       EgtSetInfo(nPartId, MAC_GUID, m_sCurrGUID.ToString())
       For Each Cathegory As CurrMachiningCathegory In m_CathegoryList
@@ -196,7 +213,9 @@ Public Class CurrMachiningCathegory
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.G0FEED, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.G0FEEDZ, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.TOOLDIAM, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nPartId, nIndex, bForceFromDb)})
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nPartId, nIndex, bForceFromDb),
+                                                                New CurrComboMachiningParam(MachiningParam.Params.DYNAMIC_MODE, nPartId, nIndex, bForceFromDb),
+                                                                New CurrOrderedMachiningParam(MachiningParam.Params.PRINT_ORDER, nPartId, nIndex, bForceFromDb)})
          Case Cathegories.LINK
             m_sName = "Shell"
             m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.LINKTYPE, nPartId, nIndex, bForceFromDb),
@@ -212,8 +231,8 @@ Public Class CurrMachiningCathegory
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.COASTINGLEN, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.COASTINGFEED_PC, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.WIPELEN, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nPartId, nIndex, bForceFromDb)})
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.WIPEDIR, nPartId, nIndex, bForceFromDb)})
+                                                                'New CurrNumericMachiningParam(MachiningParam.Params.WIPEDIR, nPartId, nIndex, bForceFromDb)})
          Case Cathegories.RIBS
             m_sName = "Ribs"
             m_MachiningParamList = New List(Of MachiningParam)({New CurrComboMachiningParam(MachiningParam.Params.RIBSTYPE, nPartId, nIndex, bForceFromDb),
@@ -222,6 +241,7 @@ Public Class CurrMachiningCathegory
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSLINK, nPartId, nIndex, bForceFromDb),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nPartId, nIndex, bForceFromDb),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nPartId, nIndex, bForceFromDb),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nPartId, nIndex, bForceFromDb),
                                                                 New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nPartId, nIndex, bForceFromDb),
@@ -249,12 +269,6 @@ Public Class CurrMachiningCathegory
       End Select
    End Sub
 
-   Friend Sub SaveCurrParams()
-      For Each Param In m_MachiningParamList
-         Param.SaveParam()
-      Next
-   End Sub
-
    Friend Sub ResetCurrParams()
       For Each Param In m_MachiningParamList
          Param.ResetParam()
@@ -315,13 +329,13 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.STRANDCOUNT
             bReadFromPart = EgtGetInfo(nPartId, MAC_STRANDCOUNT, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.OFFSET
             bReadFromPart = EgtGetInfo(nPartId, MAC_OFFSET, m_dValue)
             m_bIsLen = True
          Case Params.STRANDOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_STRANDOVERLAP, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.STARTPOINTOFFSETONSLICE
             bReadFromPart = EgtGetInfo(nPartId, MAC_STARTPOINTOFFSETONSLICE, m_dValue)
             m_bIsLen = True
@@ -358,12 +372,12 @@ Public Class CurrNumericMachiningParam
          Case Params.WIPEFEED_PC
             bReadFromPart = EgtGetInfo(nPartId, MAC_WIPEFEEDPU, m_dValue)
             m_bIsLen = False
-         Case Params.WIPEDIR
+         'Case Params.WIPEDIR
-            bReadFromPart = EgtGetInfo(nPartId, MAC_WIPEDIR, m_dValue)
+         '   bReadFromPart = EgtGetInfo(nPartId, MAC_WIPEDIR, m_dValue)
-            m_bIsLen = True
+         '   m_bIsLen = True
          Case Params.FLOORCOUNT
             bReadFromPart = EgtGetInfo(nPartId, MAC_FLOORCOUNT, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.G0FEED
             bReadFromPart = EgtGetInfo(nPartId, MAC_G0FEED, m_dValue)
             m_bIsLen = True
@@ -375,10 +389,10 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.RIBSOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSOVERLAP, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.RIBSSTRANDCOUNT
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSSTRANDCOUNT, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.RIBSLEADINLEN
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADINLEN, m_dValue)
             m_bIsLen = True
@@ -393,10 +407,10 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.RIBSLEADOUTWIPEDIR
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADOUTWIPEDIR, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.SHELLNBRDIFFERENCE
             bReadFromPart = EgtGetInfo(nPartId, MAC_SHELLNBRDIFFERENCE, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.SHELLNBRCOASTING
             bReadFromPart = EgtGetInfo(nPartId, MAC_SHELLNBRCOASTING, m_dValue)
             m_bIsLen = True
@@ -405,10 +419,10 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.SHELLNBRWIPEDIR
             bReadFromPart = EgtGetInfo(nPartId, MAC_SHELLNBRWIPEDIR, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.AUXSOLIDSOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.AUXSOLIDSLINKPARAM
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKPARAM, m_dValue)
             m_bIsLen = True
@@ -423,7 +437,7 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.AUXSOLIDSWIPEDIR
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSWIPEDIR, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.FLOWRATE_PC
             bReadFromPart = EgtGetInfo(nPartId, MAC_CONSTANT, m_dValue)
             m_bIsLen = False
@@ -437,7 +451,7 @@ Public Class CurrNumericMachiningParam
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
             Case Params.LINKPARAM, Params.LINKZUP, Params.OFFSETLEADPOINT, Params.LEADINTANGDIST, Params.LEADINORTHODIST,
                  Params.LEADOUTTANGDIST, Params.LEADOUTORTHODIST, Params.COASTINGLEN, Params.COASTINGFEED_PC,
-                 Params.WIPELEN, Params.WIPEFEED_PC, Params.WIPEDIR
+                 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,
                  Params.RIBSLEADININVERT, Params.RIBSLEADINLEN, Params.RIBSLEADOUTINVERT, Params.RIBSLEADOUTLEN, Params.RIBSLEADOUTCOASTING,
@@ -453,6 +467,9 @@ Public Class CurrNumericMachiningParam
             m_dValue = m_DbParam.dOrigValue
             m_dOrigValue = m_DbParam.dOrigValue
          End If
+      ElseIf Type = Params.G0FEEDZ AndAlso Not bReadFromPart Then
+         m_dValue = 1000
+         m_dOrigValue = 1000
       ElseIf Type = Params.FLOWRATE_PC AndAlso Not bReadFromPart Then
          m_dValue = 100
          m_dOrigValue = 100
@@ -501,8 +518,8 @@ Public Class CurrNumericMachiningParam
             EgtSetInfo(nPartId, MAC_WIPELEN, sWriteValue)
          Case Params.WIPEFEED_PC
             EgtSetInfo(nPartId, MAC_WIPEFEEDPU, sWriteValue)
-         Case Params.WIPEDIR
+         'Case Params.WIPEDIR
-            EgtSetInfo(nPartId, MAC_WIPEDIR, sWriteValue)
+         '   EgtSetInfo(nPartId, MAC_WIPEDIR, sWriteValue)
          Case Params.FLOORCOUNT
             EgtSetInfo(nPartId, MAC_FLOORCOUNT, sWriteValue)
          Case Params.G0FEED
@@ -738,7 +755,8 @@ Public Class CurrComboMachiningParam
          Case Params.RIBSTYPE
             m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_RIBSTYPE.INTERNAL, "Internal"),
                                                      New IdNameStruct(Machining.MPAR_RIBSTYPE.EXTERNAL, "External"),
-                                                     New IdNameStruct(Machining.MPAR_RIBSTYPE.UNBOUNDED, "Unbounded")})
+                                                     New IdNameStruct(Machining.MPAR_RIBSTYPE.UNBOUNDED, "Unbounded"),
+                                                     New IdNameStruct(Machining.MPAR_RIBSTYPE.SUPPORT, "Support")})
             Dim nSelValue As Integer = 0
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSTYPE, nSelValue)
             m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
@@ -762,12 +780,18 @@ Public Class CurrComboMachiningParam
             Dim nSelValue As Integer = 0
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKTYPE, nSelValue)
             m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
+         Case Params.DYNAMIC_MODE
+            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_DYNAMIC_MODE.STANDARD, "Standard"),
+                                                     New IdNameStruct(Machining.MPAR_DYNAMIC_MODE.FAST, "Fast")})
+            Dim nSelValue As Integer = 0
+            bReadFromPart = EgtGetInfo(nPartId, MAC_DYNAMICMODE, nSelValue)
+            m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
       End Select
       m_OrigSelValue = m_SelValue
       If nIndex > 0 Then
          Dim DbMachining As Machining = Map.refMachiningDbVM.MachiningList.FirstOrDefault(Function(x) x.nIndex = nIndex)
          Select Case Type
-            Case Params.SLICINGTYPE, Params.STRANDORDER, Params.DIRECTION
+            Case Params.SLICINGTYPE, Params.STRANDORDER, Params.DIRECTION, Params.DYNAMIC_MODE
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
             Case Params.LINKTYPE, Params.LEADIN, Params.LEADOUT
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.LINK).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
@@ -783,6 +807,9 @@ Public Class CurrComboMachiningParam
       ElseIf Type = Params.RIBSTYPE AndAlso Not bReadFromPart Then
          m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_RIBSTYPE.INTERNAL)
          m_SelValue = m_OrigSelValue
+      ElseIf Type = Params.DYNAMIC_MODE AndAlso Not bReadFromPart Then
+         m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_DYNAMIC_MODE.STANDARD)
+         m_SelValue = m_OrigSelValue
       End If
    End Sub
 
@@ -808,6 +835,8 @@ Public Class CurrComboMachiningParam
             EgtSetInfo(nPartId, MAC_AUXSOLIDSSTRANDORDER, m_SelValue.Id)
          Case Params.AUXSOLIDSLINKTYPE
             EgtSetInfo(nPartId, MAC_AUXSOLIDSLINKTYPE, m_SelValue.Id)
+         Case Params.DYNAMIC_MODE
+            EgtSetInfo(nPartId, MAC_DYNAMICMODE, m_SelValue.Id)
       End Select
    End Sub
 
@@ -887,6 +916,8 @@ Public Class CurrCheckMachiningParam
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTORDER, m_bValue)
          Case Params.RIBSINVERTDIRECTION
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_bValue)
+         Case Params.RIBSINVERTSTRANDORDER
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTSTRANDORDER, m_bValue)
          Case Params.RIBSLEADININVERT
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADININVERT, m_bValue)
          Case Params.RIBSLEADOUTINVERT
@@ -898,7 +929,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.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT
+            Case Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
          End Select
          If bForceFromDb OrElse Not bReadFromPart Then
@@ -918,6 +949,8 @@ Public Class CurrCheckMachiningParam
             EgtSetInfo(nPartId, MAC_RIBSINVERTORDER, If(m_bValue, 1, 0))
          Case Params.RIBSINVERTDIRECTION
             EgtSetInfo(nPartId, MAC_RIBSINVERTDIRECTION, If(m_bValue, 1, 0))
+         Case Params.RIBSINVERTSTRANDORDER
+            EgtSetInfo(nPartId, MAC_RIBSINVERTSTRANDORDER, If(m_bValue, 1, 0))
          Case Params.RIBSLEADININVERT
             EgtSetInfo(nPartId, MAC_RIBSLEADININVERT, If(m_bValue, 1, 0))
          Case Params.RIBSLEADOUTINVERT
@@ -959,3 +992,107 @@ Public Class CurrCheckMachiningParam
 
 End Class
 
+Public Class CurrOrderedMachiningParam
+   Inherits OrderedMachiningParam
+
+   Private m_DbParam As OrderedMachiningParam
+   Public ReadOnly Property DbParam As OrderedMachiningParam
+      Get
+         Return m_DbParam
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsModifiedFromDb As Boolean
+      Get
+         Return If(Map.refTopPanelVM.SelMachining.sGUID <> Guid.Empty, Value <> m_DbParam.Value, False)
+      End Get
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdResetParam As ICommand
+
+   Sub New(Type As Params, nPartId As Integer, nIndex As Integer, bForceFromDb As Boolean)
+      MyBase.New(Type, nIndex)
+      Dim bReadFromPart As Boolean = False
+      Select Case Type
+         Case Params.PRINT_ORDER
+            m_StandardValueOrderList = New List(Of Integer)({Machining.MPAR_PRINT_ORDER.SHELL,
+                                                             Machining.MPAR_PRINT_ORDER.EXTRA_SHELL,
+                                                             Machining.MPAR_PRINT_ORDER.INFILL,
+                                                             Machining.MPAR_PRINT_ORDER.AUX_SOLID,
+                                                             Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED,
+                                                             Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL,
+                                                             Machining.MPAR_PRINT_ORDER.RIB_INTERNAL,
+                                                             Machining.MPAR_PRINT_ORDER.RIB_SUPPORT})
+            m_ValueList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_PRINT_ORDER.SHELL, "Shell"),
+                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shells"),
+                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infills"),
+                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solids"),
+                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Ribs"),
+                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Ribs"),
+                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Ribs"),
+                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Ribs")})
+            Dim sValue As String = ""
+            bReadFromPart = EgtGetInfo(nPartId, MAC_PRINTORDER, sValue)
+            Value = sValue
+      End Select
+      m_OrigValue = Value
+      If nIndex > 0 Then
+         Dim DbMachining As Machining = Map.refMachiningDbVM.MachiningList.FirstOrDefault(Function(x) x.nIndex = nIndex)
+         Select Case Type
+            Case Params.PRINT_ORDER
+               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
+         End Select
+         If bForceFromDb OrElse Not bReadFromPart Then
+            Value = m_DbParam.OrigValue
+            m_OrigValue = m_DbParam.OrigValue
+         End If
+      ElseIf Type = Params.PRINT_ORDER AndAlso Not bReadFromPart Then
+         Value = ""
+         m_OrigValue = Value
+      End If
+   End Sub
+
+   Friend Overrides Sub WriteParamInPart(nPartId As Integer)
+      Select Case Type
+         Case Params.PRINT_ORDER
+            EgtSetInfo(nPartId, MAC_PRINTORDER, Value)
+      End Select
+   End Sub
+
+   Friend Overrides Sub SaveParam()
+      m_OrigValue = Value
+   End Sub
+
+   Friend Overrides Sub ResetParam()
+      Value = m_OrigValue
+      m_SelValue = Nothing
+      NotifyPropertyChanged(NameOf(ValueList))
+      NotifyPropertyChanged(NameOf(SelValue))
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "ResetParam"
+
+   Public ReadOnly Property ResetParam_Command As ICommand
+      Get
+         If m_cmdResetParam Is Nothing Then
+            m_cmdResetParam = New Command(AddressOf ResetParamCmd)
+         End If
+         Return m_cmdResetParam
+      End Get
+   End Property
+
+   Public Sub ResetParamCmd()
+      Value = DbParam.OrigValue
+      NotifyPropertyChanged(NameOf(Value))
+      NotifyPropertyChanged(NameOf(SelValue))
+      NotifyPropertyChanged(NameOf(bIsModifiedFromDb))
+   End Sub
+
+#End Region    ' ResetParam
+
+#End Region    ' COMMANDS
+
+End Class

Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml

@@ -27,8 +27,7 @@
                         <ItemsControl ItemsSource="{Binding MachiningParamList}">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
-                                 <UniformGrid Columns="1"
+                                 <StackPanel Orientation="Vertical"/>
-                                              HorizontalAlignment="Stretch"/>
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.Resources>
@@ -118,6 +117,44 @@
                                             Style="{StaticResource ToolBar_SmallButton}"/>
                                  </Grid>
                               </DataTemplate>
+                              <DataTemplate DataType="{x:Type PrintApp:OrderedMachiningParam}">
+                                 <Grid>
+                                    <Grid.ColumnDefinitions>
+                                       <ColumnDefinition Width="2*"/>
+                                       <ColumnDefinition Width="1*"/>
+                                       <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{Binding sName}"
+                                               VerticalAlignment="Center"/>
+                                    <ListBox Grid.Column="1"
+                                             ItemsSource="{Binding ValueList}"
+                                             SelectedItem="{Binding SelValue}"/>
+                                    <StackPanel Grid.Column="2"
+                                                Orientation="Vertical"
+                                                VerticalAlignment="Center"
+                                                Margin="5,0,0,0">
+                                       <Button Content="˄"
+                                               Command="{Binding MoveUpOrder_Command}"
+                                               Margin="0"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
+                                       <Button Content="˅"
+                                               Command="{Binding MoveDownOrder_Command}"
+                                               Margin="0"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
+                                       <Button Content="&lt;>"
+                                               Command="{Binding ResetOrder_Command}"
+                                               Margin="0"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
+                                       <Button Content="R"
+                                               Command="{Binding ResetParam_Command}"
+                                               IsEnabled="{Binding bIsModifiedFromDb}"
+                                               VerticalContentAlignment="Center"
+                                               HorizontalContentAlignment="Center"
+                                               Margin="0"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
+                                    </StackPanel>
+                                 </Grid>
+                              </DataTemplate>
                            </ItemsControl.Resources>
                         </ItemsControl>
                      </Expander>

Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb

@@ -59,8 +59,23 @@ Public Class CurrMachiningPanelVM
    End Property
 
    Public Sub Ok()
+      ' verifico se modificata tipologia Ribs
+      Dim bIsModifiedRibsType As Boolean = False
+      Dim RibsCathegory As MachiningCathegory = CurrMachining.CathegoryList.FirstOrDefault(Function(x) x.Type = MachiningCathegory.Cathegories.RIBS)
+      If Not IsNothing(RibsCathegory) Then
+         Dim RibsTypeParam As MachiningParam = RibsCathegory.MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.RIBSTYPE)
+         If Not IsNothing(RibsTypeParam) Then
+            bIsModifiedRibsType = RibsTypeParam.bIsModified
+         End If
+      End If
       ' scrivo i parametri modificati
       m_CurrMachining.WriteCurrParamInPart(Map.refTopPanelVM.SelPart.nPartId)
+      m_CurrMachining.Save()
+      ' se modificata tipologia Ribs, aggiorno posizione riferimento
+      If bIsModifiedRibsType Then
+         Map.refReferencePanelVM.UpdateFramePosition()
+         Map.refDispositionPanelVM.UpdateZPos()
+      End If
       ' ripristino modalita' standard
       Map.refTopPanelVM.SelPage = Pages.MODIFY
    End Sub

Icarus/DispositionPanel/DispositionPanelV.xaml

@@ -28,12 +28,6 @@
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <!--<Border Background="Red"
-           Grid.Column="1"
-           Grid.Row="1"
-           Grid.RowSpan="5"
-           Width="50"
-           VerticalAlignment="Stretch"/>-->
 
    <Border x:Name="PopupBrd" 
            Grid.Column="1"
@@ -97,77 +91,12 @@
       </Grid>
    </Border>
 
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
-          PlacementTarget="{Binding ElementName=MoveBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border x:Name="PopupBrd" Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Margin="0,0,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2.5,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="3"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragMove_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
  
    <ToggleButton x:Name="RotateBtn"
                  Grid.Row="4"
                  Content="Rotate"
                  IsChecked="{Binding bRotate_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <!--<Border Background="Blue"
-           Grid.Column="2"
-           Grid.Row="2"
-           Grid.RowSpan="5"
-           Width="50"
-           VerticalAlignment="Stretch"
-           HorizontalAlignment="Stretch"/>-->
 
    <Border Grid.Column="1"
            Grid.Row="2"
@@ -209,42 +138,4 @@
       </Grid>
    </Border>
 
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
-          Grid.Column="1"
-          PlacementTarget="{Binding ElementName=RotateBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <UniformGrid Columns="3">
-               <RadioButton Content="X"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[0]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-               <RadioButton Content="Y"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[1]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-               <RadioButton Content="Z"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[2]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-            </UniformGrid>
-            <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                   Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                   Margin="0,5,0,0"/>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragRotate_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
 </Grid>

Icarus/DispositionPanel/DispositionPanelVM.vb

@@ -20,13 +20,27 @@ Public Class DispositionPanelVM
          EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
          Dim dNewXPos As Double = ptReference.x
          StringToLen(value, dNewXPos)
-         If dNewXPos >= 0 AndAlso dNewXPos <= CurrentMachine.b3Tab.DimX Then
+         Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
-            EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(dNewXPos, ptReference.y, ptReference.z) - ptReference, GDB_RT.GLOB)
+         Dim dMin As Double = 0
-            Map.refReferencePanelVM.UpdateFramePosition()
+         Dim dMax As Double = CurrentMachine.b3Tab.DimX
-            EgtDraw()
+         If b3Print.Max.x > ptReference.x Then
-         Else
+            dMax -= b3Print.Max.x - ptReference.x
-            NotifyPropertyChanged(NameOf(sXPos))
          End If
+         If b3Print.Min.x < ptReference.x Then
+            dMin += ptReference.x - b3Print.Min.x
+         End If
+         ' riduco a spostamento massimo
+         If dNewXPos < dMin Then
+            dNewXPos = dMin
+         ElseIf dNewXPos > dMax Then
+            dNewXPos = dMax
+         End If
+         EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(dNewXPos, ptReference.y, ptReference.z) - ptReference, GDB_RT.GLOB)
+         Map.refReferencePanelVM.UpdateFramePosition()
+         EgtDraw()
+         NotifyPropertyChanged(NameOf(sXPos))
+         ' Imposto flag di ricalcolo part-program
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_GENERATE, True)
       End Set
    End Property
 
@@ -45,13 +59,27 @@ Public Class DispositionPanelVM
          EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
          Dim dNewYPos As Double = ptReference.y
          StringToLen(value, dNewYPos)
-         If dNewYPos >= 0 AndAlso dNewYPos <= CurrentMachine.b3Tab.DimY Then
+         Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
-            EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(ptReference.x, dNewYPos, ptReference.z) - ptReference, GDB_RT.GLOB)
+         Dim dMin As Double = 0
-            Map.refReferencePanelVM.UpdateFramePosition()
+         Dim dMax As Double = CurrentMachine.b3Tab.DimY
-            EgtDraw()
+         If b3Print.Max.y > ptReference.y Then
-         Else
+            dMax -= b3Print.Max.y - ptReference.y
-            NotifyPropertyChanged(NameOf(sYPos))
          End If
+         If b3Print.Min.y < ptReference.y Then
+            dMin += ptReference.y - b3Print.Min.y
+         End If
+         ' riduco a spostamento massimo
+         If dNewYPos < dMin Then
+            dNewYPos = dMin
+         ElseIf dNewyPos > dMax Then
+            dNewYPos = dMax
+         End If
+         EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(ptReference.x, dNewYPos, ptReference.z) - ptReference, GDB_RT.GLOB)
+         Map.refReferencePanelVM.UpdateFramePosition()
+         EgtDraw()
+         NotifyPropertyChanged(NameOf(sYPos))
+         ' Imposto flag di ricalcolo part-program
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_GENERATE, True)
       End Set
    End Property
 
@@ -70,16 +98,67 @@ Public Class DispositionPanelVM
          EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
          Dim dNewZPos As Double = ptReference.z
          StringToLen(value, dNewZPos)
-         If dNewZPos >= 0 Then
+         Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
-            EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(ptReference.x, ptReference.y, dNewZPos) - ptReference, GDB_RT.GLOB)
+         Dim dMin As Double = 0
-            Map.refReferencePanelVM.UpdateFramePosition()
+         If b3Print.Min.z < ptReference.z Then
-            EgtDraw()
+            dMin += ptReference.z - b3Print.Min.z
-         Else
-            NotifyPropertyChanged(NameOf(sZPos))
          End If
+         ' riduco a spostamento massimo
+         If dNewZPos < dMin Then
+            dNewZPos = dMin
+         End If
+         EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(ptReference.x, ptReference.y, dNewZPos) - ptReference, GDB_RT.GLOB)
+         Map.refReferencePanelVM.UpdateFramePosition()
+         EgtDraw()
+         NotifyPropertyChanged(NameOf(sZPos))
+         ' Imposto flag di ricalcolo part-program
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_GENERATE, True)
       End Set
    End Property
 
+   Friend Sub UpdateZPos()
+      Dim ptReference As New Point3d
+      EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
+      Dim dNewZPos As Double = ptReference.z
+      Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
+      Dim dMin As Double = 0
+      If b3Print.Min.z < ptReference.z Then
+         dMin += ptReference.z - b3Print.Min.z
+      End If
+      If ptReference.z < dMin Then
+         EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(ptReference.x, ptReference.y, dMin) - ptReference, GDB_RT.GLOB)
+         Map.refDispositionPanelVM.RefreshPos()
+         EgtDraw()
+      End If
+      NotifyPropertyChanged(NameOf(sZPos))
+   End Sub
+
+   ' funzione che calcola il box totale del solido da stampare piu' ribs esterne ed unbounded
+   Friend Function GetSolidForReferenceBBox(SelPart As Print3dPartVM) As BBox3d
+      Dim b3Print As New BBox3d
+      EgtGetBBoxGlob(SelPart.nPrintSolidId, GDB_BB.EXACT, b3Print)
+      If EgtGetGroupObjs(SelPart.nRibsLayerId) > 0 Then
+         Dim b3Ribs As New BBox3d()
+         Dim nRibId As Integer = EgtGetFirstInGroup(SelPart.nRibsLayerId)
+         While nRibId <> GDB_ID.NULL
+            Dim nRibType As Integer = Machining.MPAR_RIBSTYPE.INTERNAL
+            If Not EgtGetInfo(nRibId, MAC_RIBSTYPE, nRibType) Then
+               EgtGetInfo(SelPart.nPartId, MAC_RIBSTYPE, nRibType)
+            End If
+            If nRibType = Machining.MPAR_RIBSTYPE.EXTERNAL OrElse nRibType = Machining.MPAR_RIBSTYPE.UNBOUNDED Then
+               Dim b3Rib As New BBox3d
+               EgtGetBBoxGlob(nRibId, GDB_BB.EXACT, b3Rib)
+               b3Ribs.Add(b3Rib)
+            End If
+            nRibId = EgtGetNext(nRibId)
+         End While
+         If Not b3Ribs.IsEmpty() Then
+            b3Print.Add(b3Ribs)
+         End If
+      End If
+      Return b3Print
+   End Function
+
    Private m_RotAxes As Boolean() = { False, False, False}
    Public Property RotX As Boolean
       Get
@@ -131,19 +210,25 @@ Public Class DispositionPanelVM
             Return
          End If
          Dim vtMovedPart As Vector3d
-         if EgtGetInfo(Map.refTopPanelVM.SelPart.nPartId, "MovedPart", vtMovedPart) Then
+         If EgtGetInfo(Map.refTopPanelVM.SelPart.nPartId, KEY_MOVEDPART, vtMovedPart) Then
-            Dim nEntId = EgtGetFirstInGroup( Map.refTopPanelVM.SelPart.nPrintSolidLayerId)
+            Dim nEntId = EgtGetFirstInGroup(Map.refTopPanelVM.SelPart.nPrintSolidLayerId)
             While nEntId <> GDB_ID.NULL
                EgtMove(nEntId, -vtMovedPart, GDB_RT.GLOB)
-               nEntId = EgtGetNext( nEntId)
+               nEntId = EgtGetNext(nEntId)
             End While
-            EgtRemoveInfo(Map.refTopPanelVM.SelPart.nPartId, "MovedPart")
+            EgtRemoveInfo(Map.refTopPanelVM.SelPart.nPartId, KEY_MOVEDPART)
+         End If
+         If EgtGetInfo(Map.refTopPanelVM.SelPart.nPartId, KEY_MOVEDPART2, vtMovedPart) Then
+            EgtMove(Map.refTopPanelVM.SelPart.nPartId, -vtMovedPart, GDB_RT.GLOB)
+            EgtMove(Map.refTopPanelVM.SelPart.nReferenceId, vtMovedPart, GDB_RT.GLOB)
+            EgtRemoveInfo(Map.refTopPanelVM.SelPart.nPartId, KEY_MOVEDPART2)
          End If
          Dim b3PrintSolid As New BBox3d
          EgtGetBBoxGlob(Map.refTopPanelVM.SelPart.nPartId, GDB_BB.STANDARD, b3PrintSolid)
          If EgtRotate(Map.refTopPanelVM.SelPart.nPartId, b3PrintSolid.Center, vtSelRotAxes, dNewAngle, GDB_RT.GLOB) Then
             m_sRotAngle = 0
             Map.refReferencePanelVM.UpdateFramePosition()
+            Map.refDispositionPanelVM.UpdateZPos()
             RefreshPos()
             EgtDraw()
             NotifyPropertyChanged(NameOf(sRotAngle))
@@ -221,6 +306,7 @@ Public Class DispositionPanelVM
       ' seleziono percorso corrente
       EgtDeselectAll()
       EgtSelectObj(Map.refTopPanelVM.SelPart.nPartId)
+      EgtDraw()
    End Sub
 
    Friend Sub UpdateUI()
@@ -229,8 +315,9 @@ Public Class DispositionPanelVM
          m_bRotating = False
          ' ripristino griglia
          EgtSetGridFrame(m_PrevGridOrigin)
-         EgtDraw()
       End If
+      EgtDeselectAll()
+      EgtDraw()
    End Sub
 
    Friend Sub OnKeyDown(Key As Forms.Keys)
@@ -239,8 +326,9 @@ Public Class DispositionPanelVM
             m_bRotating = False
             ' ripristino griglia
             EgtSetGridFrame(m_PrevGridOrigin)
-            EgtDraw()
          End If
+         EgtDeselectAll()
+         EgtDraw()
       End If
    End Sub
 

Icarus/Icarus.vbproj

@@ -209,6 +209,10 @@
       <DependentUpon>RibPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="RibPanel\RibPanelVM.vb" />
+    <Compile Include="RibParamPanel\CopyFromWndV.xaml.vb">
+      <DependentUpon>CopyFromWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="RibParamPanel\CopyFromWndVM.vb" />
     <Compile Include="RibParamPanel\RibParamPanelV.xaml.vb">
       <DependentUpon>RibParamPanelV.xaml</DependentUpon>
     </Compile>
@@ -401,6 +405,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="RibParamPanel\CopyFromWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="RibParamPanel\RibParamPanelV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -671,6 +679,9 @@
   <ItemGroup>
     <Resource Include="Resources\SplashScreen\LogoEgalware.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\Export.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe

Icarus/ImportExportMachiningPanel/ImportExportMachiningPanelVM.vb

@@ -1,15 +1,45 @@
 Imports System.Collections.ObjectModel
+Imports System.Drawing
 Imports System.IO
+Imports System.Reflection
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports Icarus.ImportExportMachiningPanelVM
 
 Public Class ImportExportMachiningPanelVM
    Inherits VMBase
 
+   Private Const m_MaterialDataExtension As String = ".mtd"
+   Public Shared ReadOnly Property MaterialDataExtension As String
+      Get
+         Return m_MaterialDataExtension
+      End Get
+   End Property
+   Private Const m_OriginalMaterialDataExtension As String = ".omtd"
+   Public Shared ReadOnly Property OriginalMaterialDataExtension As String
+      Get
+         Return m_OriginalMaterialDataExtension
+      End Get
+   End Property
+   Private Const m_MachiningDataExtension As String = ".mcd"
+   Public Shared ReadOnly Property MachiningDataExtension As String
+      Get
+         Return m_MachiningDataExtension
+      End Get
+   End Property
+
    ' Modalita' di apertura della finestra
    Public Enum WindowModeEnum As Integer
-      IMPORT
+      IMPORT = 1
-      EXPORT
+      EXPORT = 2
+      IMPORT_ORIG = 3
+      EXPORT_ORIG = 4
+   End Enum
+
+   ' Tipo da importare/esportare
+   Public Enum WindowTypeEnum As Integer
+      MATERIAL = 1
+      MACHINING = 2
    End Enum
 
    Private m_WindowMode As WindowModeEnum
@@ -19,6 +49,13 @@ Public Class ImportExportMachiningPanelVM
       End Get
    End Property
 
+   Private m_WindowType As WindowTypeEnum
+   Public ReadOnly Property WindowType As WindowTypeEnum
+      Get
+         Return m_WindowType
+      End Get
+   End Property
+
    ' Lista delle lavorazioni
    Private m_MachiningList As New ObservableCollection(Of ImpExpMachiningItem)
    Public Property MachiningList As ObservableCollection(Of ImpExpMachiningItem)
@@ -85,22 +122,112 @@ Public Class ImportExportMachiningPanelVM
 #Region "CONSTRUCTOR"
 
    ' export
-   Sub New()
+   Sub New(Type As WindowTypeEnum, Mode As WindowModeEnum, Optional sImportFilePath As String = "")
-      m_WindowMode = WindowModeEnum.EXPORT
+      m_WindowType = Type
+      ImpExpMachiningItem.SetWindowType(m_WindowType)
+      m_WindowMode = Mode
       ' carico lista lavorazioni
       MachiningList.Clear()
-      ' leggo ed aggiungo le altre
+      Select Case Mode
-      Dim nIndex As Integer = 1
+         Case WindowModeEnum.IMPORT
-      Dim sGUID As String = ""
+            Select Case Type
-      Dim sName As String = ""
+               Case WindowTypeEnum.MATERIAL
-      Dim sMaterials As String = ""
+                  m_ImportFilePath = sImportFilePath
-      While ReadMachiningParamString(nIndex, MAC_GUID, "", sGUID) > 0
+                  ' carico lista lavorazioni
-         Dim Guid As Guid = Guid.Empty
+                  MachiningList.Clear()
-         Guid.TryParse(sGUID, Guid)
+                  ' leggo ed aggiungo le altre
-         ReadMachiningParamString(nIndex, MAC_NAME, "", sName)
+                  Dim nIndex As Integer = 1
-         MachiningList.Add(New ImpExpMachiningItem(nIndex, Guid, sName, False))
+                  Dim sGUID As String = ""
-         nIndex += 1
+                  Dim sName As String = ""
-      End While
+                  Dim sMaterials As String = ""
+                  Dim bIsOriginal = False
+                  Dim bIsCustom = False
+                  While ReadMachiningParamString(nIndex, MAT_GUID, "", sGUID, sImportFilePath) > 0
+                     Dim Guid As Guid = Guid.Empty
+                     Guid.TryParse(sGUID, Guid)
+                     ReadMachiningParamString(nIndex, MAT_NAME, "", sName, sImportFilePath)
+                     Dim sOrigGUID As String = ""
+                     ReadMachiningParamString(nIndex, MAT_ORIG, "", sOrigGUID, sImportFilePath)
+                     If sOrigGUID = ORIG_MATERIAL Then
+                        If Not bIsOriginal Then bIsOriginal = True
+                     Else
+                        If Not bIsCustom Then bIsCustom = True
+                     End If
+                     MachiningList.Add(New ImpExpMachiningItem(nIndex, Guid, sName, AlreadyExist(sName)))
+                     nIndex += 1
+                  End While
+                  If bIsOriginal AndAlso bIsCustom Then
+                     MessageBox.Show("Corrupted file! Impossible to import it!")
+                  ElseIf bIsOriginal Then
+                     LoadOriginalMaterial()
+                  End If
+               Case WindowTypeEnum.MACHINING
+                  m_ImportFilePath = sImportFilePath
+                  ' carico lista lavorazioni
+                  MachiningList.Clear()
+                  ' leggo ed aggiungo le altre
+                  Dim nIndex As Integer = 1
+                  Dim sGUID As String = ""
+                  Dim sName As String = ""
+                  Dim sMaterials As String = ""
+                  While ReadMachiningParamString(nIndex, MAC_GUID, "", sGUID, sImportFilePath) > 0
+                     Dim Guid As Guid = Guid.Empty
+                     Guid.TryParse(sGUID, Guid)
+                     ReadMachiningParamString(nIndex, MAC_NAME, "", sName, sImportFilePath)
+                     MachiningList.Add(New ImpExpMachiningItem(nIndex, Guid, sName, AlreadyExist(sName)))
+                     nIndex += 1
+                  End While
+            End Select
+         Case WindowModeEnum.EXPORT
+            Select Case Type
+               Case WindowTypeEnum.MATERIAL
+                  ' leggo ed aggiungo le altre
+                  Dim nIndex As Integer = 1
+                  Dim sGUID As String = ""
+                  Dim sName As String = ""
+                  While ReadMaterialParamString(nIndex, MAC_GUID, "", sGUID) > 0
+                     Dim sOrigGUID As String = ""
+                     ReadMaterialParamString(nIndex, MAT_ORIG, "", sOrigGUID)
+                     If sOrigGUID <> ORIG_MATERIAL Then
+                        Dim Guid As Guid = Guid.Empty
+                        Guid.TryParse(sGUID, Guid)
+                        ReadMaterialParamString(nIndex, MAC_NAME, "", sName)
+                        MachiningList.Add(New ImpExpMachiningItem(nIndex, Guid, sName, False))
+                     End If
+                     nIndex += 1
+                  End While
+               Case WindowTypeEnum.MACHINING
+                  ' leggo ed aggiungo le altre
+                  Dim nIndex As Integer = 1
+                  Dim sGUID As String = ""
+                  Dim sName As String = ""
+                  While ReadMachiningParamString(nIndex, MAC_GUID, "", sGUID) > 0
+                     Dim Guid As Guid = Guid.Empty
+                     Guid.TryParse(sGUID, Guid)
+                     ReadMachiningParamString(nIndex, MAC_NAME, "", sName)
+                     MachiningList.Add(New ImpExpMachiningItem(nIndex, Guid, sName, False))
+                     nIndex += 1
+                  End While
+            End Select
+         Case WindowModeEnum.EXPORT_ORIG
+            If Type = WindowTypeEnum.MATERIAL Then
+               ' leggo ed aggiungo le altre
+               Dim nIndex As Integer = 1
+               Dim sGUID As String = ""
+               Dim sName As String = ""
+               While ReadMaterialParamString(nIndex, MAC_GUID, "", sGUID) > 0
+                  Dim sOrigGUID As String = ""
+                  ReadMaterialParamString(nIndex, MAT_ORIG, "", sOrigGUID)
+                  If sOrigGUID = ORIG_MATERIAL Then
+                     Dim Guid As Guid = Guid.Empty
+                     Guid.TryParse(sGUID, Guid)
+                     ReadMaterialParamString(nIndex, MAC_NAME, "", sName)
+                     MachiningList.Add(New ImpExpMachiningItem(nIndex, Guid, sName, False))
+                  End If
+                  nIndex += 1
+               End While
+            End If
+      End Select
       ImpExpMachiningItem.m_delEnableOkBtn = AddressOf EnableOkBtn
    End Sub
 
@@ -134,9 +261,104 @@ Public Class ImportExportMachiningPanelVM
    End Sub
 
    Private Function AlreadyExist(MachiningName As String) As Boolean
-      Return Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = MachiningName)
+      Select Case m_WindowType
+         Case WindowTypeEnum.MATERIAL
+            Return Map.refMaterialDbVM.MaterialList.Any(Function(x) x.sName = MachiningName)
+         Case WindowTypeEnum.MACHINING
+            Return Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = MachiningName)
+      End Select
    End Function
 
+   Enum MaterialState As Integer
+      NOTFOUND = 1
+      FOUND = 2
+      NOTORIGSAMENAME = 3
+   End Enum
+
+   Private Sub LoadOriginalMaterial()
+      m_WindowMode = WindowModeEnum.IMPORT_ORIG
+      ' verifico se esistono materiali con lo stesso nome ma non originali
+      Dim ImportedMaterialList As New List(Of MaterialState)
+      For Each ImpExpMaterial In m_MachiningList
+         Dim IsNotOrigSameName As MaterialState = MaterialState.NOTFOUND
+         For Each DbMaterial In Map.refMaterialDbVM.MaterialList
+            If DbMaterial.sName = ImpExpMaterial.sName Then
+               Dim sOrigGUID As String = ""
+               ReadMaterialParamString(DbMaterial.nIndex, MAT_ORIG, "", sOrigGUID)
+               If sOrigGUID <> ORIG_MATERIAL Then
+                  If Not IsNotOrigSameName Then IsNotOrigSameName = MaterialState.NOTORIGSAMENAME
+               End If
+            Else
+               IsNotOrigSameName = MaterialState.FOUND
+            End If
+         Next
+         ImportedMaterialList.Add(IsNotOrigSameName)
+      Next
+      If ImportedMaterialList.Contains(True) Then
+         Dim sDuplicatedMaterialList As String = ""
+         For Index = 0 To ImportedMaterialList.Count - 1
+            If ImportedMaterialList(Index) = MaterialState.NOTORIGSAMENAME Then
+               sDuplicatedMaterialList &= " - " & m_MachiningList(Index).sName & Environment.NewLine
+            End If
+         Next
+         MessageBox.Show("Impossible to import the package because materials named:" & Environment.NewLine &
+                         sDuplicatedMaterialList & Environment.NewLine &
+                         "Please modify the names of these machining and then retry to import the materials.")
+         Return
+      End If
+      ' aggiorno/aggiungo materiali
+      Dim OrigFilePath As String = CurrentMachine.sMaterialFilePath
+      Dim NewMaterial As Material = Nothing
+      For Each Material In m_MachiningList
+         Dim nIndex As Integer = Map.refMaterialDbVM.MaterialList.Max(Function(x) x.nIndex) + 1
+         If Material.Active Then
+            CurrentMachine.SetMaterialFilePath(ImportFilePath)
+            ' leggo lavorazione da file di import
+            NewMaterial = New Material(Material.nIndex)
+            ' cambio guid, indice e verifico nome
+            NewMaterial.sGUID = Guid.NewGuid.ToString()
+            NewMaterial.SetIndex(nIndex)
+            If Material.AlreadyExist Then
+               If Material.ChangeName Then
+                  NewMaterial.sName = Material.sName
+                  Map.refMaterialDbVM.MaterialList.Add(NewMaterial)
+               Else
+                  ' sostituisco lavorazione gia' presente con stesso nome
+                  Dim ToSubstituteMaterial As Material = Map.refMaterialDbVM.MaterialList.FirstOrDefault(Function(x) x.sName = Material.sName)
+                  NewMaterial.SetIndex(ToSubstituteMaterial.nIndex)
+                  NewMaterial.sGUID = ToSubstituteMaterial.sGUID
+                  Dim nToReplaceIndex As Integer = Map.refMaterialDbVM.MaterialList.IndexOf(ToSubstituteMaterial)
+                  Map.refMaterialDbVM.MaterialList(nToReplaceIndex) = NewMaterial
+               End If
+            Else
+               Map.refMaterialDbVM.MaterialList.Add(NewMaterial)
+            End If
+            ' ripristino path corretta del Db
+            CurrentMachine.SetMaterialFilePath(OrigFilePath)
+            ' salvo la lavorazione
+            NewMaterial.Save()
+         End If
+      Next
+      ' ripristino path corretta del Db
+      CurrentMachine.SetMaterialFilePath(OrigFilePath)
+      ' seleziono ultima importata
+      If Not IsNothing(NewMaterial) Then
+         Map.refMaterialDbVM.SelMaterial = NewMaterial
+         Map.refMaterialDbVM.NotifyPropertyChanged(NameOf(Map.refMaterialDbVM.SelMaterial))
+      End If
+      ' imposto Db modificato
+      Map.refMaterialDbVM.SetIsModified(True)
+      ' messaggio con modifiche
+      Dim sMaterialList As String = ""
+      For Index = 0 To ImportedMaterialList.Count - 1
+         sMaterialList &= " - " & m_MachiningList(Index).sName & " (" & If(ImportedMaterialList(Index) = MaterialState.NOTFOUND, "New", "Updated") & ")" & Environment.NewLine
+      Next
+      MessageBox.Show("List of the materials:" & Environment.NewLine &
+                      sMaterialList & Environment.NewLine &
+                      "Import successfully completed.")
+      Return
+   End Sub
+
 #End Region     ' METHODS
 
 #Region "COMMANDS"
@@ -159,52 +381,109 @@ Public Class ImportExportMachiningPanelVM
    ''' Manage the MachiningDb closing.  This method is invoked by the CloseMachiningDbCommand.
    ''' </summary>
    Public Sub ConfirmImpExpMachinings(param As Object)
-      Select Case WindowMode
+      Select Case m_WindowMode
          Case WindowModeEnum.IMPORT
-            Dim OrigFilePath As String = CurrentMachine.sMachiningFilePath
+            Select Case m_WindowType
-            Dim NewMachining As Machining = Nothing
+               Case WindowTypeEnum.MATERIAL
-            For Each Machining In m_MachiningList
+                  Dim OrigFilePath As String = CurrentMachine.sMaterialFilePath
-               Dim nIndex As Integer = Map.refMachiningDbVM.MachiningList.Max(Function(x) x.nIndex) + 1
+                  Dim NewMaterial As Material = Nothing
-               If Machining.Active Then
+                  For Each Material In m_MachiningList
-                  CurrentMachine.SetMachiningFilePath(ImportFilePath)
+                     Dim nIndex As Integer = Map.refMaterialDbVM.MaterialList.Max(Function(x) x.nIndex) + 1
-                  ' leggo lavorazione da file di import
+                     If Material.Active Then
-                  NewMachining = New Machining(Machining.nIndex)
+                        CurrentMachine.SetMaterialFilePath(ImportFilePath)
-                  ' cambio guid, indice e verifico nome
+                        ' leggo lavorazione da file di import
-                  NewMachining.sGUID = Guid.NewGuid.ToString()
+                        NewMaterial = New Material(Material.nIndex)
-                  NewMachining.SetIndex(nIndex)
+                        ' cambio guid, indice e verifico nome
-                  If Machining.AlreadyExist Then
+                        NewMaterial.sGUID = Guid.NewGuid.ToString()
-                     If Machining.ChangeName Then
+                        NewMaterial.SetIndex(nIndex)
-                        NewMachining.sName = Machining.sName
+                        If Material.AlreadyExist Then
+                           If Material.ChangeName Then
+                              NewMaterial.sName = Material.sName
+                              Map.refMaterialDbVM.MaterialList.Add(NewMaterial)
+                           Else
+                              ' sostituisco lavorazione gia' presente con stesso nome
+                              Dim ToSubstituteMaterial As Material = Map.refMaterialDbVM.MaterialList.FirstOrDefault(Function(x) x.sName = Material.sName)
+                              NewMaterial.SetIndex(ToSubstituteMaterial.nIndex)
+                              NewMaterial.sGUID = ToSubstituteMaterial.sGUID
+                              Dim nToReplaceIndex As Integer = Map.refMaterialDbVM.MaterialList.IndexOf(ToSubstituteMaterial)
+                              Map.refMaterialDbVM.MaterialList(nToReplaceIndex) = NewMaterial
+                           End If
+                        Else
+                           Map.refMaterialDbVM.MaterialList.Add(NewMaterial)
+                        End If
+                        ' ripristino path corretta del Db
+                        CurrentMachine.SetMaterialFilePath(OrigFilePath)
+                        ' salvo la lavorazione
+                        NewMaterial.Save()
                      End If
+                  Next
+                  ' ripristino path corretta del Db
+                  CurrentMachine.SetMaterialFilePath(OrigFilePath)
+                  ' seleziono ultima importata
+                  If Not IsNothing(NewMaterial) Then
+                     Map.refMaterialDbVM.SelMaterial = NewMaterial
+                     Map.refMaterialDbVM.NotifyPropertyChanged(NameOf(Map.refMaterialDbVM.SelMaterial))
                   End If
-                  Map.refMachiningDbVM.MachiningList.Add(NewMachining)
+                  ' imposto Db modificato
+                  Map.refMaterialDbVM.SetIsModified(True)
+               Case WindowTypeEnum.MACHINING
+                  Dim OrigFilePath As String = CurrentMachine.sMachiningFilePath
+                  Dim NewMachining As Machining = Nothing
+                  For Each Machining In m_MachiningList
+                     Dim nIndex As Integer = Map.refMachiningDbVM.MachiningList.Max(Function(x) x.nIndex) + 1
+                     If Machining.Active Then
+                        CurrentMachine.SetMachiningFilePath(ImportFilePath)
+                        ' leggo lavorazione da file di import
+                        NewMachining = New Machining(Machining.nIndex)
+                        ' cambio guid, indice e verifico nome
+                        NewMachining.sGUID = Guid.NewGuid.ToString()
+                        NewMachining.SetIndex(nIndex)
+                        If Machining.AlreadyExist Then
+                           If Machining.ChangeName Then
+                              NewMachining.sName = Machining.sName
+                              Map.refMachiningDbVM.MachiningList.Add(NewMachining)
+                           Else
+                              ' sostituisco lavorazione gia' presente con stesso nome
+                              Dim ToSubstituteMachining As Machining = Map.refMachiningDbVM.MachiningList.FirstOrDefault(Function(x) x.sName = Machining.sName)
+                              NewMachining.SetIndex(ToSubstituteMachining.nIndex)
+                              NewMachining.sGUID = ToSubstituteMachining.sGUID
+                              Dim nToReplaceIndex As Integer = Map.refMachiningDbVM.MachiningList.IndexOf(ToSubstituteMachining)
+                              Map.refMachiningDbVM.MachiningList(nToReplaceIndex) = NewMachining
+                           End If
+                        Else
+                           Map.refMachiningDbVM.MachiningList.Add(NewMachining)
+                        End If
+                        ' ripristino path corretta del Db
+                        CurrentMachine.SetMachiningFilePath(OrigFilePath)
+                        ' salvo la lavorazione
+                        NewMachining.Save()
+                     End If
+                  Next
                   ' ripristino path corretta del Db
                   CurrentMachine.SetMachiningFilePath(OrigFilePath)
-                  ' salvo la lavorazione
+                  ' seleziono ultima importata
-                  NewMachining.Save()
+                  If Not IsNothing(NewMachining) Then
+                     Map.refMachiningDbVM.SelMachining = NewMachining
+                     Map.refMachiningDbVM.NotifyPropertyChanged(NameOf(Map.refMachiningDbVM.SelMachining))
+                  End If
+                  ' imposto Db modificato
+                  Map.refMachiningDbVM.SetIsModified(True)
+            End Select
+         Case WindowModeEnum.EXPORT, WindowModeEnum.EXPORT_ORIG
+            ' chiedo il nome con cui salvare il file 
+            Dim sExtension As String =""
+            If m_WindowType = WindowTypeEnum.MATERIAL Then
+               If m_WindowMode = WindowModeEnum.EXPORT_ORIG Then
+                  sExtension = OriginalMaterialDataExtension
+               Else
+                  sExtension = MaterialDataExtension
                End If
-            Next
+            Else
-            ' ripristino path corretta del Db
+               sExtension = MachiningDataExtension
-            CurrentMachine.SetMachiningFilePath(OrigFilePath)
-            ' seleziono ultima importata
-            If Not IsNothing(NewMachining) Then
-               Map.refMachiningDbVM.SelMachining = NewMachining
-               Map.refMachiningDbVM.NotifyPropertyChanged(NameOf(Map.refMachiningDbVM.SelMachining))
             End If
-         Case WindowModeEnum.EXPORT
-            ' recupero le lavorazioni checkate
-            Dim FinalNameList As New List(Of String)
-            For Each Machining In MachiningList
-               If Machining.Active Then
-                  FinalNameList.Add(Machining.sName)
-               End If
-            Next
-            If FinalNameList.Count() = 0 Then Return
-            Dim FinalNameArray = FinalNameList.ToArray()
-            ' chiedo il nome con cui salvare il file .data
             Dim SaveFileDlg As New System.Windows.Forms.SaveFileDialog() With {
                .Title = EgtMsg(31451) & " " & EgtMsg(31452),
-               .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
+               .Filter = "File data (*" & sExtension & ")|*" & sExtension,
                .FileName = String.Empty
             }
             If SaveFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
@@ -224,15 +503,25 @@ Public Class ImportExportMachiningPanelVM
                Catch ex As Exception
                End Try
             End If
-            Dim ActiveMachiningList As List(Of Machining) = (From Machining In Map.refMachiningDbVM.MachiningList
+            Select Case m_WindowType
-                                                             Select Machining
+               Case WindowTypeEnum.MATERIAL
-                                                             Where m_MachiningList.Any(Function(x) x.sGUID.ToString() = Machining.sGUID AndAlso x.Active)).ToList()
+                  Dim ActiveMachiningList As List(Of Material) = (From Material In Map.refMaterialDbVM.MaterialList
-            ' salvo tutte le lavorazioni sul Db
+                                                                  Select Material
-            For Index = 0 To ActiveMachiningList.Count - 1
+                                                                  Where m_MachiningList.Any(Function(x) x.sGUID.ToString() = Material.sGUID AndAlso x.Active)).ToList()
-               ActiveMachiningList(Index).WriteParamsOnDb(Index + 1, sFilePath)
+                  ' salvo tutti i materiali sul Db
-            Next
+                  For Index = 0 To ActiveMachiningList.Count - 1
+                     ActiveMachiningList(Index).WriteParamsOnDb(Index + 1, sFilePath)
+                  Next
+               Case WindowTypeEnum.MACHINING
+                  Dim ActiveMachiningList As List(Of Machining) = (From Machining In Map.refMachiningDbVM.MachiningList
+                                                                   Select Machining
+                                                                   Where m_MachiningList.Any(Function(x) x.sGUID.ToString() = Machining.sGUID AndAlso x.Active)).ToList()
+                  ' salvo tutte le lavorazioni sul Db
+                  For Index = 0 To ActiveMachiningList.Count - 1
+                     ActiveMachiningList(Index).WriteParamsOnDb(Index + 1, sFilePath)
+                  Next
+            End Select
       End Select
-
       ' Chiusura finestra
       RaiseEvent m_CloseWindow(True)
    End Sub
@@ -246,13 +535,18 @@ End Class
 Public Class ImpExpMachiningItem
    Inherits VMBase
 
-   Public Const IMPEXTNAME As String = "_imp"
+   Public Const IMPEXPNAME As String = "_imp"
 
    ' Actions
    Friend Shared m_delEnableOkBtn As Action
 
    Private Shared m_Empty As New MachiningIndex(-1, Guid.Empty, "None")
 
+   Private Shared m_WindowType As WindowTypeEnum
+   Friend Shared Sub SetWindowType(value As WindowTypeEnum)
+      m_WindowType = value
+   End Sub
+
    Private m_nIndex As Integer
    Public ReadOnly Property nIndex As Integer
       Get
@@ -284,26 +578,51 @@ Public Class ImpExpMachiningItem
          ' se esiste gia' chiedo se sovrascriverla
          If value Then
             If m_AlreadyExist Then
-               Select Case System.Windows.MessageBox.Show(EgtMsg(31453), "", MessageBoxButton.YesNoCancel)
+               Select Case m_WindowType
-                  Case MessageBoxResult.Yes
+                  Case WindowTypeEnum.MATERIAL
-                     m_ChangeName = False
+                     Select Case System.Windows.MessageBox.Show("Material already existing in Db. Overwrite it?", "", MessageBoxButton.YesNoCancel)
-                     m_Active = True
+                        Case MessageBoxResult.Yes
-                  Case MessageBoxResult.No
+                           m_ChangeName = False
-                     Dim bImpNameAlreadyInList = False
+                           m_Active = True
-                     Dim nImpNameIndex As Integer = 0
+                        Case MessageBoxResult.No
-                     If Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = m_sOrigName & IMPEXTNAME) Then
+                           Dim bImpNameAlreadyInList = False
-                        nImpNameIndex += 1
+                           Dim nImpNameIndex As Integer = 0
-                        While Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = m_sOrigName & IMPEXTNAME & "_" & nImpNameIndex)
+                           If Map.refMaterialDbVM.MaterialList.Any(Function(x) x.sName = m_sOrigName & IMPEXPNAME) Then
-                           nImpNameIndex += 1
+                              nImpNameIndex += 1
-                        End While
+                              While Map.refMaterialDbVM.MaterialList.Any(Function(x) x.sName = m_sOrigName & IMPEXPNAME & "_" & nImpNameIndex)
-                     End If
+                                 nImpNameIndex += 1
-                     m_sName = m_sOrigName & IMPEXTNAME & If(nImpNameIndex > 0, "_" & nImpNameIndex, "")
+                              End While
-                     System.Windows.MessageBox.Show("Machining will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
+                           End If
-                     NotifyPropertyChanged(NameOf(sName))
+                           m_sName = m_sOrigName & IMPEXPNAME & If(nImpNameIndex > 0, "_" & nImpNameIndex, "")
-                     m_ChangeName = True
+                           System.Windows.MessageBox.Show("Material will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
-                     m_Active = True
+                           NotifyPropertyChanged(NameOf(sName))
-                  Case Else
+                           m_ChangeName = True
-                     m_Active = False
+                           m_Active = True
+                        Case Else
+                           m_Active = False
+                     End Select
+                  Case WindowTypeEnum.MACHINING
+                     Select Case System.Windows.MessageBox.Show("Machining already existing in Db. Overwrite it?", "", MessageBoxButton.YesNoCancel)
+                        Case MessageBoxResult.Yes
+                           m_ChangeName = False
+                           m_Active = True
+                        Case MessageBoxResult.No
+                           Dim bImpNameAlreadyInList = False
+                           Dim nImpNameIndex As Integer = 0
+                           If Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = m_sOrigName & IMPEXPNAME) Then
+                              nImpNameIndex += 1
+                              While Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = m_sOrigName & IMPEXPNAME & "_" & nImpNameIndex)
+                                 nImpNameIndex += 1
+                              End While
+                           End If
+                           m_sName = m_sOrigName & IMPEXPNAME & If(nImpNameIndex > 0, "_" & nImpNameIndex, "")
+                           System.Windows.MessageBox.Show("Machining will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
+                           NotifyPropertyChanged(NameOf(sName))
+                           m_ChangeName = True
+                           m_Active = True
+                        Case Else
+                           m_Active = False
+                     End Select
                End Select
                NotifyPropertyChanged(NameOf(Active))
             Else
@@ -360,82 +679,3 @@ Public Class ImpExpMachiningItem
    End Function
 
 End Class
-
-Public Class MachiningItem
-   Inherits VMBase
-
-   ' Actions
-   Friend Shared m_delEnableOkBtn As Action
-
-   Private m_Name As String
-   Public Property Name As String
-      Get
-         If m_ChangeName Then
-            Return m_Name & "_imp"
-         Else
-            Return m_Name
-         End If
-      End Get
-      Set(value As String)
-         m_Name = value
-      End Set
-   End Property
-
-   Private m_Active As Boolean
-   Public Property Active As Boolean
-      Get
-         Return m_Active
-      End Get
-      Set(value As Boolean)
-         ' se esiste gia' chiedo se sovrascriverla
-         If value Then
-            If m_AlreadyExist Then
-               Select Case System.Windows.MessageBox.Show(EgtMsg(31453), "", MessageBoxButton.YesNoCancel)
-                  Case MessageBoxResult.Yes
-                     m_ChangeName = False
-                     m_Active = True
-                  Case MessageBoxResult.No
-                     System.Windows.MessageBox.Show(EgtMsg(31454), "", MessageBoxButton.OK)
-                     m_ChangeName = True
-                     m_Active = True
-                  Case Else
-                     m_Active = False
-               End Select
-               NotifyPropertyChanged("Active")
-            Else
-               m_Active = True
-            End If
-         Else
-            m_ChangeName = False
-            m_Active = False
-         End If
-         If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn()
-      End Set
-   End Property
-
-   ' Parametro che indica se questo item da importare esiste gia'
-   Private m_AlreadyExist As Boolean
-   Friend ReadOnly Property AlreadyExist As Boolean
-      Get
-         Return m_AlreadyExist
-      End Get
-   End Property
-
-   ' Parametro che indica se cambiare il nome di un item che esiste gia' o sovrascriverlo
-   Private m_ChangeName As Boolean
-   Friend Property ChangeName As Boolean
-      Get
-         Return m_ChangeName
-      End Get
-      Set(value As Boolean)
-         m_ChangeName = value
-         NotifyPropertyChanged("Name")
-      End Set
-   End Property
-
-   Sub New(Name As String, AlreadyExist As Boolean)
-      m_Name = Name
-      m_AlreadyExist = AlreadyExist
-   End Sub
-
-End Class

Icarus/ImportPanel/ImportPanelV.xaml

@@ -1,109 +0,0 @@
-<UserControl x:Class="ImportPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Icarus"
-             Width="150"
-             Margin="5,0,0,0">
-   <Grid DockPanel.Dock="Left">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Border Style="{StaticResource LeftPanelTitle_Border}">
-         <TextBlock Text="New part list"
-                    FontWeight="DemiBold"
-                    FontSize="14"/>
-      </Border>
-      <DockPanel Grid.Row="1">
-         <Button DockPanel.Dock="Left"
-                 Content="+"
-                 FontSize="20"
-                 Command="{Binding AddPart_Command}"
-                 Style="{StaticResource LeftPanel_Button}"/>
-         <Button DockPanel.Dock="Left"
-                 Content="-"
-                 FontSize="20"
-                 Command="{Binding RemovePart_Command}"
-                 Style="{StaticResource LeftPanel_Button}"/>
-         <Button Content="Reference"
-                 Command="{Binding SetReference_Command}"
-                 Style="{StaticResource LeftPanel_TextButton}"/>
-      </DockPanel>
-      <TreeView Grid.Row="2" 
-                ItemsSource="{Binding ImportPartList}"
-                MinHeight="300">
-         <TreeView.Resources>
-            <HierarchicalDataTemplate DataType="{x:Type local:ImportPart}" 
-                                      ItemsSource="{Binding LayerList}">
-               <StackPanel Orientation="Horizontal">
-                  <Image Source="/Resources/TreeView/Folder.png" 
-                         Height="15"/>
-                  <TextBlock Text="{Binding ghName}" />
-               </StackPanel>
-            </HierarchicalDataTemplate>
-            <HierarchicalDataTemplate DataType="{x:Type local:ImportLayer}" 
-                                      ItemsSource="{Binding EntityList, UpdateSourceTrigger=PropertyChanged}">
-               <StackPanel Orientation="Horizontal">
-                  <Image Source="/Resources/TreeView/Folder.png"
-                         Height="15"/>
-                  <TextBlock Text="{Binding sName}" />
-               </StackPanel>
-            </HierarchicalDataTemplate>
-            <HierarchicalDataTemplate DataType="{x:Type local:GeomEntity}">
-               <StackPanel Orientation="Horizontal">
-                  <!--<Image Source="/WpfTutorialSamples;component/Images/user.png" Margin="0,0,5,0" />-->
-                  <TextBlock Text="{Binding ghName}" />
-                  <TextBlock Text="{Binding ghReference, UpdateSourceTrigger=PropertyChanged}"/>
-               </StackPanel>
-            </HierarchicalDataTemplate>
-         </TreeView.Resources>
-         <TreeView.ItemContainerStyle>
-            <Style TargetType="{x:Type TreeViewItem}">
-               <Setter Property="IsSelected" Value="{Binding bIsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-               <Setter Property="IsExpanded" Value="True" />
-            </Style>
-         </TreeView.ItemContainerStyle>
-      </TreeView>
-      <Border Grid.Row="3"
-              Style="{StaticResource LeftPanelTitle_Border}">
-         <TextBlock Text="Imported entity list"
-                    FontWeight="DemiBold"
-                    FontSize="14"/>
-      </Border>
-      <ListBox Grid.Row="4" 
-               ItemsSource="{Binding ImportedEntityList, UpdateSourceTrigger=PropertyChanged}"
-               SelectedItem="{Binding SelImportedEntity}"
-               MinHeight="200">
-         <ListBox.ItemContainerStyle>
-            <Style TargetType="ListBoxItem">
-               <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-            </Style>
-         </ListBox.ItemContainerStyle>
-         <ListBox.ItemTemplate>
-            <DataTemplate>
-               <Grid HorizontalAlignment="Stretch">
-                  <Grid.InputBindings>
-                     <MouseBinding Gesture="LeftDoubleClick"
-                                   Command="{Binding ImportedEntity_DoubleClick}"/>
-                  </Grid.InputBindings>
-                  <TextBlock Text="{Binding ghName}">
-                  </TextBlock>
-               </Grid>
-            </DataTemplate>
-         </ListBox.ItemTemplate>
-      </ListBox>
-      <UniformGrid Grid.Row="5"
-                   Rows="1">
-         <Button Content="Ok"
-                 Command="{Binding Ok_Command}"
-                 Style="{StaticResource LeftPanel_TextButton}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 Style="{StaticResource LeftPanel_TextButton}"/>
-      </UniformGrid>
-   </Grid>
-</UserControl>

Icarus/ImportPanel/ImportPanelV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class ImportPanelV
-
-End Class

Icarus/ImportPanel/ImportPanelVM.vb

@@ -1,443 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class ImportPanelVM
-   Inherits VMBase
-
-   Private m_nImportedPartId As Integer = GDB_ID.NULL
-   Friend ReadOnly Property nImportedPartId As Integer
-      Get
-         Return m_nImportedPartId
-      End Get
-   End Property
-
-   Private m_ImportedEntityList As New ObservableCollection(Of GeomEntity)
-   Public Property ImportedEntityList As ObservableCollection(Of GeomEntity)
-      Get
-         Return m_ImportedEntityList
-      End Get
-      Set(value As ObservableCollection(Of GeomEntity))
-         m_ImportedEntityList = value
-      End Set
-   End Property
-
-   Private m_SelImportedEntity As GeomEntity
-   Public Property SelImportedEntity As GeomEntity
-      Get
-         Return m_SelImportedEntity
-      End Get
-      Set(value As GeomEntity)
-         m_SelImportedEntity = value
-         EgtDeselectAll()
-         If Not IsNothing(m_SelImportedEntity) Then
-            EgtSelectObj(m_SelImportedEntity.nId)
-         End If
-         EgtDraw()
-      End Set
-   End Property
-   Friend Sub SetSelImportedEntity(nId As Integer)
-      m_SelImportedEntity = Map.refImportPanelVM.ImportedEntityList.FirstOrDefault(Function(x) x.nId = nId)
-      EgtDeselectAll()
-      If Not IsNothing(m_SelImportedEntity) Then
-            EgtSelectObj(m_SelImportedEntity.nId)
-         End If
-         EgtDraw()
-      NotifyPropertyChanged(NameOf(SelImportedEntity))
-   End Sub
-
-   Private m_ImportPartList As New ObservableCollection(Of ImportPart)
-   Public ReadOnly Property ImportPartList As ObservableCollection(Of ImportPart)
-      Get
-         Return m_ImportPartList
-      End Get
-   End Property
-
-   Private m_SelImportPart As ImportPart
-   Friend Sub SetSelImportPart(SelImportPart As ImportPart)
-      m_SelImportPart = SelImportPart
-      m_SelImportLayer = Nothing
-   End Sub
-   Public ReadOnly Property SelImportPart As ImportPart
-      Get
-         Return m_SelImportPart
-      End Get
-   End Property
-
-   Private m_SelImportLayer As ImportLayer
-   Public ReadOnly Property SelImportLayer As ImportLayer
-      Get
-         Return m_SelImportLayer
-      End Get
-   End Property
-   Friend Sub SetSelImportLayer(SelImportLayer As ImportLayer)
-      m_SelImportPart = m_ImportPartList.FirstOrDefault(Function(x) x.LayerList.Contains(SelImportLayer))
-      m_SelImportLayer = SelImportLayer
-   End Sub
-
-   Private m_SelGeomEntity As GeomEntity
-   Public ReadOnly Property SelGeomEntity As GeomEntity
-      Get
-         Return m_SelGeomEntity
-      End Get
-   End Property
-   Friend Sub SetSelGeomEntity(SelGeomEntity As GeomEntity)
-      For Each CurrPart In m_ImportPartList
-         Dim CurrLayer As ImportLayer = CurrPart.LayerList.FirstOrDefault(Function(x) x.EntityList.Contains(SelGeomEntity))
-         If Not IsNothing(CurrLayer) Then
-            m_SelImportPart = CurrPart
-            m_SelImportLayer = CurrLayer
-            Exit For
-         End If
-      Next
-      m_SelGeomEntity = SelGeomEntity
-   End Sub
-
-   ' Definizione comandi
-   Private m_cmdSetReference As ICommand
-   Private m_cmdAddPart As ICommand
-   Private m_cmdRemovePart As ICommand
-   Private m_cmdOk As ICommand
-   Private m_cmdCancel As ICommand
-
-   Sub New()
-      ' Creo riferimento a questa classe in EgtCAM5Map
-      Map.SetRefImportPanelVM(Me)
-   End Sub
-
-#Region "METHODS"
-
-   Friend Sub Init()
-      m_ImportedEntityList.Clear()
-      m_ImportPartList.Clear()
-      ' aggiungo geometrie importate a lista
-      m_nImportedPartId = EgtGetLastPart()
-      Dim nLayerId As Integer = EgtGetFirstLayer(m_nImportedPartId)
-      Dim nGeometryId As Integer = EgtGetFirstInGroup(nLayerId)
-      While nGeometryId <> GDB_ID.NULL
-         Dim sGeometryName As String = ""
-         EgtGetName(nGeometryId, sGeometryName)
-         m_ImportedEntityList.Add(New GeomEntity(nGeometryId, sGeometryName))
-         nGeometryId = EgtGetNext(nGeometryId)
-      End While
-      ' aggiungo primo pezzo
-      m_ImportPartList.Add(New ImportPart())
-      m_ImportPartList(0).LayerList.FirstOrDefault(Function(x) x.Type = ImportLayer.LayerType.PRINT_SOLID).bIsSelected = True
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#Region "SetReference"
-
-   Public ReadOnly Property SetReference_Command As ICommand
-      Get
-         If m_cmdSetReference Is Nothing Then
-            m_cmdSetReference = New Command(AddressOf SetReference)
-         End If
-         Return m_cmdSetReference
-      End Get
-   End Property
-
-   Public Sub SetReference()
-      If Not IsNothing(SelGeomEntity) Then
-         Dim ChooseReferenceWndVM As New ChooseReferenceWndVM
-         Dim ChooseReferenceWndV As New ChooseReferenceWndV(Application.Current.MainWindow, ChooseReferenceWndVM)
-         If Not ChooseReferenceWndV.ShowDialog() Then Return
-         SelGeomEntity.Reference = ChooseReferenceWndVM.SelReference
-      End If
-   End Sub
-
-#End Region    ' SetReference
-
-#Region "AddPart"
-
-   Public ReadOnly Property AddPart_Command As ICommand
-      Get
-         If m_cmdAddPart Is Nothing Then
-            m_cmdAddPart = New Command(AddressOf AddPart)
-         End If
-         Return m_cmdAddPart
-      End Get
-   End Property
-
-   Public Sub AddPart()
-      m_ImportPartList.Add(New ImportPart)
-   End Sub
-
-#End Region    ' AddPart
-
-#Region "RemovePart"
-
-   Public ReadOnly Property RemovePart_Command As ICommand
-      Get
-         If m_cmdRemovePart Is Nothing Then
-            m_cmdRemovePart = New Command(AddressOf RemovePart)
-         End If
-         Return m_cmdRemovePart
-      End Get
-   End Property
-
-   Public Sub RemovePart()
-      If IsNothing(SelImportLayer) Then
-         ' rimuovo pezzo
-         m_ImportPartList.Remove(SelImportPart)
-      Else
-         ' rimuovo geometria
-         Dim CurrEntity As GeomEntity = m_SelGeomEntity
-         SelImportLayer.EntityList.Remove(m_SelGeomEntity)
-         ' la rimetto in lista importati
-         ImportedEntityList.Add(CurrEntity)
-      End If
-   End Sub
-
-#End Region    ' RemovePart
-
-#Region "Ok"
-
-   Public ReadOnly Property Ok_Command As ICommand
-      Get
-         If m_cmdOk Is Nothing Then
-            m_cmdOk = New Command(AddressOf Ok)
-         End If
-         Return m_cmdOk
-      End Get
-   End Property
-
-   Public Sub Ok()
-      Dim sErr As New List(Of String)
-      ' verifico che tutti i pezzi abbiano una superficie da stampare nel layer apposito
-      For Each CurrPart In m_ImportPartList
-         For Each CurrLayer In CurrPart.LayerList
-            Select Case CurrLayer.Type
-               Case ImportLayer.LayerType.PRINT_SOLID
-                  If CurrLayer.EntityList.Count = 0 Then
-                     If sErr.Count > 0 Then sErr(sErr.Count - 1) &= Environment.NewLine
-                     sErr.Add(CurrPart.ghName & " - No print surface defined!")
-                  End If
-            End Select
-         Next
-      Next
-      If sErr.Count > 0 Then
-         MessageBox.Show(String.Concat(sErr), "Error")
-         Return
-      Else
-         ' Creo pezzi e layer necessari
-         For ImportPartIndex = 0 To m_ImportPartList.Count - 1
-            Dim ImportPart As ImportPart = m_ImportPartList(ImportPartIndex)
-            Dim frImportedPart As New Frame3d
-            EgtGetGroupGlobFrame(m_nImportedPartId, frImportedPart)
-            Dim nPartId As Integer = EgtCreateGroup(GDB_ID.ROOT, frImportedPart)
-            EgtSetName(nPartId, PART)
-            Dim nFrameId As Integer = GDB_ID.NULL
-            Dim b3PrintSolid As New BBox3d
-            Dim nPrintPartLayerId As Integer = GDB_ID.NULL
-            Dim PrintSolidEntity As GeomEntity = Nothing
-            Dim nOriginalPartLayerId As Integer = GDB_ID.NULL
-            Dim nRibsLayerId As Integer = GDB_ID.NULL
-            Dim nShellNumberLayerId As Integer = GDB_ID.NULL
-            Dim nAuxSolidsLayerId As Integer = GDB_ID.NULL
-            Dim nMachStartLayerId As Integer = GDB_ID.NULL
-            Dim nOthersLayerId As Integer = GDB_ID.NULL
-            For Each ImportLayer In ImportPart.LayerList
-               Select Case ImportLayer.Type
-                  Case ImportLayer.LayerType.PRINT_SOLID
-                     nPrintPartLayerId = EgtCreateGroup(nPartId)
-                     EgtSetName(nPrintPartLayerId, PRINT_SOLID)
-                     If ImportLayer.EntityList.Count > 0 Then
-                        PrintSolidEntity = ImportLayer.EntityList(0)
-                        EgtRelocateGlob(PrintSolidEntity.nId, nPrintPartLayerId, GDB_POS.LAST_SON)
-                        ' calcolo box superficie per creazione riferimento
-                        EgtGetBBoxGlob(PrintSolidEntity.nId, GDB_BB.STANDARD, b3PrintSolid)
-                     End If
-                     'Case ImportLayer.LayerType.ORIGINAL_SOLID
-                     '   nOriginalPartLayerId = EgtCreateGroup(nPartId)
-                     '   EgtSetName(nOriginalPartLayerId, ORIGINAL_SOLID)
-                     '   For Each GeomEntity In ImportLayer.EntityList
-                     '      EgtRelocateGlob(GeomEntity.nId, nOriginalPartLayerId, GDB_POS.LAST_SON)
-                     '   Next
-                  Case ImportLayer.LayerType.MACH_START
-                     nMachStartLayerId = EgtCreateGroup(nPartId)
-                     EgtSetName(nMachStartLayerId, LAY_MACH_START)
-                     Dim nMachStartId As Integer = GDB_ID.NULL
-                     If ImportLayer.EntityList.Count > 0 Then
-                        For Each GeomEntity In ImportLayer.EntityList
-                           ' se punto o curva compo
-                           Dim EntityType As GDB_TY = EgtGetType(GeomEntity.nId)
-                           Select Case EntityType
-                              Case GDB_TY.GEO_POINT, GDB_TY.CRV_COMPO
-                                 ' gli cambio layer
-                                 EgtRelocateGlob(GeomEntity.nId, nMachStartLayerId, GDB_POS.LAST_SON)
-                                 nMachStartId = GeomEntity.nId
-                              Case GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_LINE
-                                 ' altrimenti la trasformo in curva compo
-                                 nMachStartId = EgtCreateCurveCompo(nMachStartLayerId, GeomEntity.nId, True)
-                           End Select
-                           EgtSetName(nMachStartId, START_GEOM)
-                           ' coloro l'entita' di rosso
-                           Dim c3Red As Color3d
-                           c3Red.FromColor(System.Drawing.Color.Red)
-                           EgtSetColor(nMachStartId, c3Red)
-                        Next
-                     Else
-                        ' creo punto di partenza
-                        Dim ptStart As Point3d = b3PrintSolid.Center() - 0.6 * b3PrintSolid.DimY() * Vector3d.Y_AX() - 0.5 * b3PrintSolid.DimZ() * Vector3d.Z_AX()
-                        nMachStartId = EgtCreateGeoPoint(nMachStartLayerId, ptStart, GDB_RT.GLOB)
-                        EgtSetName(nMachStartId, START_GEOM)
-                        ' coloro l'entita' di rosso
-                        Dim c3Red As Color3d
-                        c3Red.FromColor(System.Drawing.Color.Red)
-                        EgtSetColor(nMachStartId, c3Red)
-                     End If
-                  Case ImportLayer.LayerType.RIBS
-                     nRibsLayerId = EgtCreateGroup(nPartId)
-                     EgtSetName(nRibsLayerId, LAY_RIBS)
-                     For Each GeomEntity In ImportLayer.EntityList
-                        EgtSetInfo(GeomEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
-                        EgtRelocateGlob(GeomEntity.nId, nRibsLayerId, GDB_POS.LAST_SON)
-                        ' coloro l'entita' di viola
-                        Dim c3LightBlue As Color3d
-                        c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
-                        EgtSetColor(GeomEntity.nId, c3LightBlue)
-                     Next
-                  Case ImportLayer.LayerType.SHELL_NUMBER
-                     nShellNumberLayerId = EgtCreateGroup(nPartId)
-                     EgtSetName(nShellNumberLayerId, LAY_SHELL_NBR)
-                     For Each GeomEntity In ImportLayer.EntityList
-                        EgtSetInfo(GeomEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
-                        EgtRelocateGlob(GeomEntity.nId, nShellNumberLayerId, GDB_POS.LAST_SON)
-                        ' coloro l'entita' di verde
-                        Dim c3LightBlue As Color3d
-                        c3LightBlue.FromColor(System.Drawing.Color.Lime)
-                        EgtSetColor(GeomEntity.nId, c3LightBlue)
-                     Next
-                  Case ImportLayer.LayerType.AUX_SOLIDS
-                     nAuxSolidsLayerId = EgtCreateGroup(nPartId)
-                     EgtSetName(nAuxSolidsLayerId, LAY_AUX_SOLIDS)
-                     For Each GeomEntity In ImportLayer.EntityList
-                        EgtSetInfo(GeomEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
-                        EgtRelocateGlob(GeomEntity.nId, nAuxSolidsLayerId, GDB_POS.LAST_SON)
-                        ' coloro l'entita' di oro
-                        Dim c3LightBlue As Color3d
-                        c3LightBlue.FromColor(System.Drawing.Color.DarkGoldenrod)
-                        EgtSetColor(GeomEntity.nId, c3LightBlue)
-                     Next
-                  Case ImportLayer.LayerType.OTHERS
-                     nOthersLayerId = EgtCreateGroup(nPartId)
-                     EgtSetName(nOthersLayerId, LAY_OTHERS)
-                     For Each GeomEntity In ImportLayer.EntityList
-                        EgtRelocateGlob(GeomEntity.nId, nOthersLayerId, GDB_POS.LAST_SON)
-                     Next
-                     If ImportPartIndex = 0 Then
-                        For Each GeomEntity In ImportedEntityList
-                           ' se curva
-                           Dim EntityType As GDB_TY = EgtGetType(GeomEntity.nId)
-                           Select Case EntityType
-                              Case GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_LINE
-                                 '  la trasformo in curva compo
-                                 EgtCreateCurveCompo(nOthersLayerId, GeomEntity.nId, True)
-                              Case Else
-                                 ' altrimenti la sposto solamente
-                                 EgtRelocateGlob(GeomEntity.nId, nOthersLayerId, GDB_POS.LAST_SON)
-                           End Select
-                        Next
-                     End If
-               End Select
-            Next
-            ' aggiungo riferimento
-            Dim nReferenceLayerId As Integer = EgtCreateGroup(nPartId)
-            EgtSetName(nReferenceLayerId, LAY_REFERENCE)
-            ' Creo riferimento 
-            Dim ptOrig As New Point3d(b3PrintSolid.Min())
-            Select Case PrintSolidEntity.Reference
-               Case ChooseReferenceWndVM.References.TL
-                  ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX
-               Case ChooseReferenceWndVM.References.TR
-                  ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
-               Case ChooseReferenceWndVM.References.BL
-               Case ChooseReferenceWndVM.References.BR
-                  ptOrig += b3PrintSolid.DimX() * Vector3d.X_AX
-               Case ChooseReferenceWndVM.References.TC
-                  ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
-               Case ChooseReferenceWndVM.References.ML
-                  ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX
-               Case ChooseReferenceWndVM.References.MR
-                  ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
-               Case ChooseReferenceWndVM.References.TC
-                  ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
-               Case ChooseReferenceWndVM.References.MR
-                  ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
-               Case ChooseReferenceWndVM.References.BC
-                  ptOrig += b3PrintSolid.DimX() / 2 * Vector3d.X_AX
-               Case ChooseReferenceWndVM.References.MC
-                  ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
-            End Select
-            Dim frPrintSolid As New Frame3d(ptOrig)
-            nFrameId = EgtCreateGeoFrame(nReferenceLayerId, frPrintSolid, GDB_RT.GLOB)
-            If nFrameId Then
-               EgtSetName(nFrameId, FRAME_PART)
-               EgtSetMode(nFrameId, GDB_MD.LOCKED)
-            End If
-            EgtSetInfo(nReferenceLayerId, KEY_REFERENCE, PrintSolidEntity.Reference)
-            ' appoggio il pezzo sulla tavola
-            EgtMove(nPartId, New Vector3d(0, 0, -b3PrintSolid.Min.z))
-            ' lo aggiungo a lista pezzi 
-            Dim sFilePath As String = ""
-            EgtGetInfo(m_nImportedPartId, FILE_PATH, sFilePath)
-            EgtSetInfo(nPartId, FILE_PATH, sFilePath)
-            EgtSetInfo(nPartId, "PartOnTable", 1)
-            Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, PrintSolidEntity.nId, nOriginalPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
-            Map.refTopPanelVM.PartList.Add(NewPart)
-         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()
-      ' elimino vecchio pezzo d'importazione
-      EgtErase(m_nImportedPartId)
-
-      EgtDraw()
-      ' ripristino modalita' standard
-      Map.refTopPanelVM.SelPage = Pages.MODIFY
-   End Sub
-
-#End Region    ' Ok
-
-#Region "Cancel"
-
-   Public ReadOnly Property Cancel_Command As ICommand
-      Get
-         If m_cmdCancel Is Nothing Then
-            m_cmdCancel = New Command(AddressOf Cancel)
-         End If
-         Return m_cmdCancel
-      End Get
-   End Property
-
-   Public Sub Cancel()
-      ' elimino pezzo importato
-      EgtErase(m_nImportedPartId)
-      EgtDraw()
-      ' se ci sono pezzi
-      If Map.refTopPanelVM.PartList.Count > 0 Then
-         ' ripristino modalita' standard
-         Map.refTopPanelVM.SelPage = Pages.MODIFY
-      Else
-         Map.refTopPanelVM.SelPage = Pages.NULL
-      End If
-   End Sub
-
-#End Region    ' Cancel
-
-#End Region    ' COMMANDS
-
-End Class

Icarus/ImportPanel/ImportUtility.vb

@@ -1,231 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class GeomEntity
-   Inherits VMBase
-
-   Private m_bIsSelected As Boolean
-   Public Property bIsSelected As Boolean
-      Get
-         Return m_bIsSelected
-      End Get
-      Set(value As Boolean)
-         m_bIsSelected = value
-         ' seleziono in scena
-         EgtDeselectAll()
-         If Not IsNothing(value) Then
-            EgtSelectObj(m_nId)
-         End If
-         EgtDraw()
-         ' segno come elemento selezionato in treeview
-         Map.refImportPanelVM.SetSelGeomEntity(Me)
-      End Set
-   End Property
-
-   Private m_nId As Integer = GDB_ID.NULL
-   Public ReadOnly Property nId As Integer
-      Get
-         Return m_nId
-      End Get
-   End Property
-
-   Private m_sName As String
-   Public ReadOnly Property sName As String
-      Get
-         Return m_sName
-      End Get
-   End Property
-
-   Public ReadOnly Property ghName As String
-      Get
-         Return m_nId & If(Not String.IsNullOrWhiteSpace(m_sName), " - " & m_sName, "")
-      End Get
-   End Property
-
-   Private m_Reference As ChooseReferenceWndVM.References = ChooseReferenceWndVM.References.BL
-   Public Property Reference As ChooseReferenceWndVM.References
-      Get
-         Return m_Reference
-      End Get
-      Set(value As ChooseReferenceWndVM.References)
-         m_Reference = value
-         NotifyPropertyChanged(NameOf(ghReference))
-      End Set
-   End Property
-   Public ReadOnly Property ghReference As String
-      Get
-         Select Case m_Reference
-            Case ChooseReferenceWndVM.References.TL
-               Return "┌"
-            Case ChooseReferenceWndVM.References.TR
-               Return "┐"
-            Case ChooseReferenceWndVM.References.BL
-               Return "└"
-            Case ChooseReferenceWndVM.References.BR
-               Return "┘"
-            Case ChooseReferenceWndVM.References.TC
-               Return "┬"
-            Case ChooseReferenceWndVM.References.ML
-               Return "├"
-            Case ChooseReferenceWndVM.References.MR
-               Return "┤"
-            Case ChooseReferenceWndVM.References.BC
-               Return "┴"
-            Case ChooseReferenceWndVM.References.MC
-               Return "┼"
-            Case Else
-               Return "X"
-         End Select
-      End Get
-   End Property
-
-   ' Definizione comandi
-   Private m_cmdImportedEntity As ICommand
-
-   Sub New(nId As Integer, sName As String)
-      m_nId = nId
-      m_sName = sName
-   End Sub
-
-#Region "COMMANDS"
-
-#Region "ImportedEntity"
-
-   Public ReadOnly Property ImportedEntity_DoubleClick As ICommand
-      Get
-         If m_cmdImportedEntity Is Nothing Then
-            m_cmdImportedEntity = New Command(AddressOf ImportedEntity)
-         End If
-         Return m_cmdImportedEntity
-      End Get
-   End Property
-
-   Public Sub ImportedEntity()
-      If Not IsNothing(Map.refImportPanelVM.SelImportLayer) Then
-         Map.refImportPanelVM.ImportedEntityList.Remove(Me)
-         Map.refImportPanelVM.SelImportLayer.EntityList.Add(Me)
-      End If
-   End Sub
-
-#End Region    ' ImportedEntity
-
-#End Region    ' COMMANDS
-End Class
-
-Public Class ImportPart
-   Inherits VMBase
-
-   Private m_bIsSelected As Boolean
-   Public Property bIsSelected As Boolean
-      Get
-         Return m_bIsSelected
-      End Get
-      Set(value As Boolean)
-         m_bIsSelected = value
-         Map.refImportPanelVM.SetSelImportPart(Me)
-      End Set
-   End Property
-
-   Private m_nId As Integer
-   Public ReadOnly Property nId As Integer
-      Get
-         Return m_nId
-      End Get
-   End Property
-
-   Private m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Public ReadOnly Property ghName As String
-      Get
-         Return If(Not String.IsNullOrWhiteSpace(m_sName), m_nId & " - " & m_sName, "Part" & m_nId)
-      End Get
-   End Property
-
-   Private m_LayerList As New ObservableCollection(Of ImportLayer)
-   Public ReadOnly Property LayerList As ObservableCollection(Of ImportLayer)
-      Get
-         Return m_LayerList
-      End Get
-   End Property
-
-   Sub New()
-      m_nId = If(Map.refImportPanelVM.ImportPartList.Count = 0, 1, Map.refImportPanelVM.ImportPartList.Max(Function(x) x.m_nId) + 1)
-      m_LayerList.Add(New ImportLayer(ImportLayer.LayerType.PRINT_SOLID, "Print"))
-      m_LayerList.Add(New ImportLayer(ImportLayer.LayerType.MACH_START, "Layer Start"))
-      'm_LayerList.Add(New ImportLayer(ImportLayer.LayerType.ORIGINAL_SOLID, "Original Solid"))
-      m_LayerList.Add(New ImportLayer(ImportLayer.LayerType.RIBS, "Ribs"))
-      m_LayerList.Add(New ImportLayer(ImportLayer.LayerType.SHELL_NUMBER, "Reduce Shell Number"))
-      m_LayerList.Add(New ImportLayer(ImportLayer.LayerType.AUX_SOLIDS, "Filled Solids"))
-      m_LayerList.Add(New ImportLayer(ImportLayer.LayerType.OTHERS, "Others"))
-   End Sub
-
-End Class
-
-Public Class ImportLayer
-   Inherits VMBase
-
-   Public Enum LayerType As Integer
-      PRINT_SOLID = 1
-      MACH_START = 2
-      RIBS = 3
-      SHELL_NUMBER = 4
-      AUX_SOLIDS = 5
-      OTHERS = 7
-   End Enum
-
-   Private m_bIsSelected As Boolean
-   Public Property bIsSelected As Boolean
-      Get
-         Return m_bIsSelected
-      End Get
-      Set(value As Boolean)
-         m_bIsSelected = value
-         Map.refImportPanelVM.SetSelImportLayer(Me)
-      End Set
-   End Property
-
-   Private m_Type As LayerType
-   Public Property Type As LayerType
-      Get
-         Return m_Type
-      End Get
-      Set(value As LayerType)
-         m_Type = value
-      End Set
-   End Property
-
-   Private m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Private m_EntityList As New ObservableCollection(Of GeomEntity)
-   Public Property EntityList As ObservableCollection(Of GeomEntity)
-      Get
-         Return m_EntityList
-      End Get
-      Set(value As ObservableCollection(Of GeomEntity))
-         m_EntityList = value
-      End Set
-   End Property
-
-   Sub New(Type As LayerType, sName As String)
-      m_Type = Type
-      m_sName = sName
-   End Sub
-
-End Class

Icarus/ImportWnd/ImportSceneHostV.xaml

@@ -1,10 +0,0 @@
-<UserControl x:Class="ImportSceneHostV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:EgtUILib="clr-namespace:EgtUILib;assembly=EgtUILib">
-   
-   <WindowsFormsHost>
-      <EgtUILib:Scene x:Name="MainScene"/>
-   </WindowsFormsHost>
-   
-</UserControl>

Icarus/ImportWnd/ImportSceneHostV.xaml.vb

@@ -1,33 +0,0 @@
-Imports System.Windows.Interop
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class ImportSceneHostV
-
-   Private m_ImportSceneHostVM As ImportSceneHostVM
-
-   Sub New()
-      ' This call is required by the designer.
-      InitializeComponent()
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      Me.DataContext = New ImportSceneHostVM
-      m_ImportSceneHostVM = DirectCast(Me.DataContext, ImportSceneHostVM)
-      m_ImportSceneHostVM.SetMainScene(MainScene)
-   End Sub
-
-   Private Sub MainScene_GotFocus() Handles MainScene.GotFocus
-      m_ImportSceneHostVM.SetIsFocused(True)
-      EgtOutLog("MainScene_GotFocus")
-      ' Map.refSecondaryWindowV.Topmost = True
-      'Map.refSecondaryWindowVM.SetVisibility(True)
-   End Sub
-
-   Private Sub MainScene_LostFocus() Handles MainScene.LostFocus
-      m_ImportSceneHostVM.SetIsFocused(False)
-      EgtOutLog("MainScene_LostFocus")
-      ' Map.refSecondaryWindowV.Topmost = False
-      'Map.refSecondaryWindowVM.SetVisibility(False)
-   End Sub
-
-End Class

Icarus/ImportWnd/ImportSceneHostVM.vb

@@ -1,722 +0,0 @@
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
-Imports Microsoft.Win32
-
-Public Class ImportSceneHostVM
-   Inherits EgtWPFLib5.SceneHostVM
-
-   Friend m_bIsFocused As Boolean
-   Friend Sub SetIsFocused(bValue As Boolean)
-      m_bIsFocused = bValue
-   End Sub
-
-   ' Identificativi per pezzo da selezionare/deselezionare
-   Private m_nIdToSel As Integer = GDB_ID.NULL
-   Private m_nIdToDesel As Integer = GDB_ID.NULL
-   ' Dati movimento
-   Private m_dMaxStep As Double = 0
-   ' Dati per Drag
-   Private m_nRestRadius As Integer = 5
-   Private m_bDrag As Boolean = False
-   Private m_bDragToStart As Boolean = False
-   Private m_bVerify As Boolean = False
-   Private m_bFromParking As Boolean = False
-   Private m_bDragging As Boolean = False
-   Private m_locPrev As System.Drawing.Point
-   Private m_ptPrev As Point3d
-   Private m_vtTotMove As Vector3d
-   Private m_dSnapDist As Double = 0
-
-   Private bReducedCut As Boolean = False
-   Private m_bMagnetic As Boolean
-
-   ' punto di snap per inizializzazione
-   Private m_SnapType As SP
-   Friend ReadOnly Property SnapType As SP
-      Get
-         Return m_SnapType
-      End Get
-   End Property
-
-#Region "CONSTRUCTOR"
-
-   Sub New()
-      MyBase.New()
-      AddHandler MainController.OnNewProject, AddressOf OnNewProject
-      AddHandler MainController.OnOpenProject, AddressOf OnOpenProject
-      AddHandler MainController.OnSavingProject, AddressOf OnSavingProject
-      AddHandler MainController.OnSavedProject, AddressOf OnSavedProject
-      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
-      AddHandler MainController.AddInputBoxCombo, AddressOf AddInputBoxCombo
-      AddHandler MainController.UpdateUI, AddressOf UpdateUI
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Overrides Sub InitScene()
-      InitSceneEvents()
-      ' Inizializzazione Scena
-      PreInitializeScene()
-      ' Se tutto bene
-      If MainScene.Init() And Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT._3DPRINT) Then
-         PostInitializeScene()
-         ' Imposto stato gestione mouse diretto della scena a nessuno
-         MainScene.SetStatusNull()
-         EgtSetCurrentContext(MainScene.GetCtx())
-         ' inizializzo gestore lavorazioni
-         EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
-         Return
-      End If
-      ' 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)
-         MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-         ' Altrimenti manca la licenza
-      Else
-         EgtOutLog("Problems with Licence")
-         ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
-         If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
-            ' Apro dialogo per richiesta file licenza
-            Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
-               .DefaultExt = ".lic",
-               .Filter = "Licences (.lic)|*.lic",
-               .CheckFileExists = True,
-               .ValidateNames = True
-            }
-            If LicDlg.ShowDialog() = True Then
-               ' Recupero il direttorio del file
-               Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
-               ' Se il file non è già nel direttorio di configurazione lo copio
-               If Not String.Equals(Path.GetFullPath(sDir), Path.GetFullPath(Map.refMainWindowVM.MainWindowM.sConfigDir), StringComparison.OrdinalIgnoreCase) Then
-                  Try
-                     File.Copy(LicDlg.FileName, Path.Combine(Map.refMainWindowVM.MainWindowM.sConfigDir, LicDlg.SafeFileName), True)
-                  Catch ex As Exception
-                  End Try
-               End If
-               ' Imposto il nuovo file di licenza nell'Ini
-               WriteMainPrivateProfileString(S_GENERAL, K_LICENCE, LicDlg.SafeFileName)
-            End If
-         End If
-      End If
-      ' Chiudo il programma
-      End
-   End Sub
-
-   Public Overrides Sub InitSceneEvents()
-      AddHandler MainScene.OnCursorPos, AddressOf OnCursorPos
-      AddHandler MainScene.OnMouseSetObjFilterForSelect, AddressOf OnMouseSetObjFilterForSelect
-      AddHandler MainScene.OnMouseSelectedAll, AddressOf OnMouseSelectedAll
-      AddHandler MainScene.OnMouseDeselectedAll, AddressOf OnMouseDeselectedAll
-      AddHandler MainScene.OnMouseDownScene, AddressOf OnMouseDownScene
-      AddHandler MainScene.OnMouseMoveScene, AddressOf OnMouseMoveScene
-      AddHandler MainScene.OnMouseUpScene, AddressOf OnMouseUpScene
-      AddHandler MainScene.OnMouseSelectedObj, AddressOf OnMouseSelectedObj
-      AddHandler MainScene.OnMouseSelectedPart, AddressOf OnMouseSelectedPart
-      AddHandler MainScene.OnMouseSelectedLayer, AddressOf OnMouseSelectedLayer
-      AddHandler MainScene.OnMouseSelectedPath, AddressOf OnMouseSelectedPath
-      AddHandler MainScene.OnMousePointFromSelection, AddressOf OnMousePointFromSelection
-      AddHandler MainScene.OnMouseDone, AddressOf OnMouseDone
-      AddHandler MainScene.OnMouseSelectedPoint, AddressOf OnMouseSelectedPoint
-      AddHandler MainScene.OnMouseSelectedDir, AddressOf OnMouseSelectedDir
-      AddHandler MainScene.OnMouseMoveSelPoint, AddressOf OnMouseMoveSelPoint
-      AddHandler MainScene.OnShowDistance, AddressOf OnShowDistance
-      AddHandler MainScene.KeyDown, AddressOf OnKeyDown
-      AddHandler MainScene.OnCloseGetDist, AddressOf OnCloseGetDist
-      AddHandler MainScene.OnChangedSnapPointType, AddressOf OnChangedSnapPointType
-   End Sub
-
-   Private Sub PreInitializeScene()
-      ' imposto colore di default
-      Dim DefColor As New Color3d(0, 0, 0)
-      GetMainPrivateProfileColor(S_GEOMDB, K_DEFAULTCOLOR, DefColor)
-      MainScene.SetDefaultMaterial(DefColor)
-      ' imposto colori sfondo
-      Dim BackTopColor As New Color3d(192, 192, 192)
-      GetMainPrivateProfileColor(S_SCENE, K_BACKTOP, BackTopColor)
-      Dim BackBotColor As New Color3d(BackTopColor)
-      GetMainPrivateProfileColor(S_SCENE, K_BACKBOTTOM, BackBotColor)
-      MainScene.SetViewBackground(BackTopColor, BackBotColor)
-      ' imposto spessore linee
-      Dim nLineWidth As Integer = 1
-      nLineWidth = GetMainPrivateProfileInt(S_SCENE, K_LINEWIDTH, nLineWidth)
-      MainScene.SetLineWidth(nLineWidth)
-      ' imposto colore di evidenziazione
-      Dim MarkColor As New Color3d(255, 255, 0)
-      GetMainPrivateProfileColor(S_SCENE, K_MARK, MarkColor)
-      MainScene.SetMarkMaterial(MarkColor)
-      ' imposto colore per superfici selezionate
-      Dim SelSurfColor As New Color3d(255, 255, 192)
-      GetMainPrivateProfileColor(S_SCENE, K_SELSURF, SelSurfColor)
-      MainScene.SetSelSurfMaterial(SelSurfColor)
-      ' imposto tipo e colore del rettangolo di zoom
-      Dim bOutline As Boolean = True
-      Dim ZwColor As New Color3d(0, 0, 0)
-      GetMainPrivateProfileZoomWin(S_SCENE, K_ZOOMWIN, bOutline, ZwColor)
-      MainScene.SetZoomWinAttribs(bOutline, ZwColor)
-      ' imposto colore della linea di distanza
-      Dim DstLnColor As New Color3d(255, 0, 0)
-      GetMainPrivateProfileColor(S_SCENE, K_DISTLINE, DstLnColor)
-      MainScene.SetDistLineMaterial(DstLnColor)
-      ' imposto parametri OpenGL
-      Dim nDriver As Integer = GetMainPrivateProfileInt(S_OPENGL, K_DRIVER, 3)
-      Dim b2Buff As Boolean = (GetMainPrivateProfileInt(S_OPENGL, K_DOUBLEBUFFER, 1) <> 0)
-      Dim nColorBits As Integer = GetMainPrivateProfileInt(S_OPENGL, K_COLORBITS, 32)
-      Dim nDepthBits As Integer = GetMainPrivateProfileInt(S_OPENGL, K_DEPTHBITS, 32)
-      MainScene.SetViewAttributes(nDriver, b2Buff, nColorBits, nDepthBits)
-   End Sub
-
-   Private Sub PostInitializeScene()
-      ' Impostazioni Controller
-      MainController.SetScene(MainScene)
-      MainController.SetSurfTmTolerance(0.05)
-      MainController.SetUseCustomColors(True, S_SCENE, K_CUSTOMCOLORS)
-      ' imposto unità di misura per interfaccia utente
-      Dim nMeasureUnit As Integer = GetMainPrivateProfileInt(S_SCENE, K_MMUNITS, 1)
-      EgtSetUiUnits(nMeasureUnit <> 0)
-      'Map.refMyStatusBarVM.SetMeasureUnit(nMeasureUnit <> 0)
-      ' imposto visualizzazione riferimento globale
-      EgtSetGlobFrameShow(True)
-      ' imposto i dati della griglia
-      'LoadGridData()
-      EgtSetGridFrame(Frame3d.GLOB)
-      EgtSetGridGeo(10, 10, 100, 484)
-      EgtSetGridColor(New Color3d(160, 160, 160), New Color3d(160, 160, 160))
-      EgtSetGridShow(True, False)
-      ' imposto tipo coordinate
-      MainScene.SetGridCursorPos(True)
-      ' modo di visualizzazione
-      Dim nShowMode As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWMODE, SM.SHADING)
-      '''Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM))
-      ' visualizzazione avanzata dei triangoli costituenti le superfici
-      Dim bShowTriaAdv As Boolean = (GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
-      EgtSetShowTriaAdv(bShowTriaAdv)
-      ' tipo visualizzazione per Zmap
-      Dim nShowZmap As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWZMAP, 1)
-      EgtSetShowZmap(DirectCast(nShowZmap, ZSM), False)
-      ' dimensione lineare max in pixel delle textures
-      Dim nTxrMaxLinPix As Integer = GetMainPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096)
-      EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
-      ' tipo snap point
-      MainScene.SetSnapPointType(SP.PT_SKETCH)
-      ' visualizzazione assemblato
-      Dim nShowBuilding As Boolean = GetMainPrivateProfileInt(S_SCENE, K_SHOWBUILDING, 0) <> 0
-      '''Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding)
-      ' nascondo input box
-      '''Map.refFreeContourInputVM.ResetInputBox()
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "ProjectManager"
-
-   Public Overrides Sub NewProject()
-      EgtSetCurrentContext(MainScene.GetCtx())
-      Dim bOk As Boolean = MainController.NewProject()
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub OpenProject(sFilePath As String)
-      EgtSetCurrentContext(MainScene.GetCtx())
-      Dim bOk As Boolean = False
-      If String.IsNullOrEmpty(sFilePath) Then
-         ' Recupero cartella dell'ultimo progetto aperto
-         Dim sDir As String = MainController.GetCurrFile()
-         If String.IsNullOrWhiteSpace(sDir) Then
-            GetMainPrivateProfileString(S_MRUFILES, K_FILE, "", sDir)
-         End If
-         If Not String.IsNullOrWhiteSpace(sDir) Then
-            sDir = Path.GetDirectoryName(sDir)
-         End If
-         bOk = MainController.OpenProject(sDir)
-      Else
-         bOk = MainController.OpenProject(sFilePath, False)
-      End If
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub SaveProject()
-      MyBase.SaveProject()
-      ' Imposto stato gestione mouse diretto della scena a nessuno
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub SaveAsProject()
-      MyBase.SaveAsProject()
-      ' Imposto stato gestione mouse diretto della scena a nessuno
-      MainScene.SetStatusNull()
-   End Sub
-
-   Public Overrides Sub InsertProject()
-      ' eseguo
-      Dim sDir As String = String.Empty
-      GetMainPrivateProfileString(S_MRUIMPORT, K_FILE & "1", "", sDir)
-      Dim OpenFileDialog As New OpenFileDialog With {.Title = "Insert",
-                                                     .Filter = "Stereolithography (*.stl)|*.stl" &
-                                                               "|New geometry EgalTech(*.nge)|*.nge" &
-                                                               "|All Files (*.*)|*.*",
-                                                     .FilterIndex = 1,
-                                                     .InitialDirectory = sDir}
-      If Not OpenFileDialog.ShowDialog Then
-         Return
-      End If
-      Dim sFile As String = String.Empty
-      sFile = OpenFileDialog.FileName
-      Dim ChooseReferenceWndVM As New ChooseReferenceWndVM
-      Dim ChooseReferenceWndV As New ChooseReferenceWndV(Application.Current.MainWindow, ChooseReferenceWndVM)
-      If Not ChooseReferenceWndV.ShowDialog() Then Return
-
-      Dim nImportContext As Integer = EgtInitContext()
-      MainController.InsertProject(sFile, False)
-   End Sub
-
-   Public Overrides Sub ImportProject()
-      Dim sDir As String = String.Empty
-      GetMainPrivateProfileString(S_MRUIMPORT, K_FILE & "1", "", sDir)
-      If Not String.IsNullOrWhiteSpace(sDir) Then
-         sDir = Path.GetDirectoryName(sDir)
-      End If
-      sDir.TrimEnd("\"c)
-      MainController.ImportProject(sDir)
-      ' Imposto stato gestione mouse diretto della scena a nessuno
-      MainScene.SetStatusNull()
-   End Sub
-
-   Friend Sub PreExecScript(bScriptInMru As Boolean)
-      'm_bScriptInMru = bScriptInMru
-   End Sub
-
-   Friend Sub ExecScript(sFilePath As String)
-      If String.IsNullOrEmpty(sFilePath) Then
-         Dim sDir As String = String.Empty
-         'GetMainPrivateProfileString(S_GENERAL, K_LASTLUADIR, "", sDir)
-         MainController.Exec(sDir)
-      Else
-         MainController.Exec(sFilePath, False)
-      End If
-      Dim bMachiningMode As Boolean = EgtGetCurrMachGroup() <> GDB_ID.NULL
-      If Not bMachiningMode And EgtGetCurrLayer() = GDB_ID.NULL Then
-         Dim nCurrPart As Integer = EgtGetCurrPart()
-         If nCurrPart = GDB_ID.NULL Or Not EgtSetCurrPartLayer(nCurrPart, EgtGetFirstLayer(nCurrPart, True)) Then
-            EgtResetCurrPartLayer()
-         End If
-      End If
-   End Sub
-
-#End Region    ' ProjectManager
-
-#Region "SCENE EVENTS"
-
-   Private Sub OnCursorPos(ByVal sender As Object, ByVal sCursorPos As String)
-      Map.refMyStatusBarVM.SetCurrPos(sCursorPos)
-   End Sub
-
-   Private Sub OnMouseSetObjFilterForSelect(sender As Object, bZeroDim As Boolean, bCurve As Boolean,
-                                            bSurf As Boolean, bVolume As Boolean, bExtra As Boolean)
-   End Sub
-
-   Private Sub OnMouseSelectedAll(ByVal sender As Object, bOnlyVisble As Boolean)
-   End Sub
-
-   Private Sub OnMouseDeselectedAll(ByVal sender As Object)
-   End Sub
-
-   Private Sub OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
-      If e.Button = Forms.MouseButtons.Middle Then Return
-      If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
-      Basic_OnMouseDownScene(sender, e)
-      'Select Case Map.refMainMenuVM.SelPage
-      '   Case Pages.VIEW
-      '      If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
-      '         If Map.refFreeContourManagerVM.bIsActive Then Return
-      '         If Map.refShowBeamPanelVM.bShowAll Then
-      '            View_Part_OnMouseDownScene(sender, e)
-      '         Else
-      '            View_Feature_OnMouseDownScene(sender, e)
-      '         End If
-      '      End If
-      '   Case Pages.MACHINING
-      '      If Not IsNothing(Map.refMachGroupPanelVM) AndAlso Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
-      '         Dim SelectedMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
-      '         If EgtGetCurrMachGroup() = GDB_ID.NULL Then Return
-      '         If SelectedMachGroup.nType = BWType.BEAM Then
-      '            Beam_OnMouseDownScene(sender, e)
-      '         ElseIf SelectedMachGroup.nType = BWType.WALL Then
-      '            Wall_OnMouseDownScene(sender, e)
-      '         End If
-      '      End If
-      'End Select
-   End Sub
-
-   Private Sub OnMouseMoveScene(sender As Object, e As Forms.MouseEventArgs)
-      If e.Button = Forms.MouseButtons.Middle Then Return
-      If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
-      Basic_OnMouseMoveScene(sender, e)
-      'Select Case Map.refMainMenuVM.SelPage
-      '   Case Pages.VIEW
-      '      If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
-      '         If Map.refFreeContourManagerVM.bIsActive Then Return
-      '         If Map.refShowBeamPanelVM.bShowAll Then
-      '            View_Part_OnMouseMoveScene(sender, e)
-      '         Else
-      '            View_Feature_OnMouseMoveScene(sender, e)
-      '         End If
-      '      End If
-      '   Case Pages.MACHINING
-      '      If Not IsNothing(Map.refMachGroupPanelVM) AndAlso Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
-      '         Dim SelectedMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
-      '         If EgtGetCurrMachGroup() = GDB_ID.NULL Then Return
-      '         If SelectedMachGroup.nType = BWType.BEAM Then
-      '            Beam_OnMouseMoveScene(sender, e)
-      '         ElseIf SelectedMachGroup.nType = BWType.WALL Then
-      '            Wall_OnMouseMoveScene(sender, e)
-      '         End If
-      '      End If
-      'End Select
-   End Sub
-
-   Private Sub OnMouseUpScene(sender As Object, e As Forms.MouseEventArgs)
-      If e.Button = Forms.MouseButtons.Middle Then Return
-      If Map.refInstrumentPanelVM.GetDistIsChecked Then Return
-      Basic_OnMouseUpScene(sender, e)
-      'Select Case Map.refMainMenuVM.SelPage
-      '   Case Pages.VIEW
-      '      If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
-      '         If Map.refFreeContourManagerVM.bIsActive Then Return
-      '         If Map.refShowBeamPanelVM.bShowAll Then
-      '            View_Part_OnMouseUpScene(sender, e)
-      '         Else
-      '            View_Feature_OnMouseUpScene(sender, e)
-      '         End If
-      '      End If
-      '   Case Pages.MACHINING
-      '      If Not IsNothing(Map.refMachGroupPanelVM) AndAlso Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
-      '         Dim SelectedMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
-      '         If EgtGetCurrMachGroup() = GDB_ID.NULL Then Return
-      '         If SelectedMachGroup.nType = BWType.BEAM Then
-      '            Beam_OnMouseUpScene(sender, e)
-      '         ElseIf SelectedMachGroup.nType = BWType.WALL Then
-      '            Wall_OnMouseUpScene(sender, e)
-      '         End If
-      '      End If
-      'End Select
-   End Sub
-
-   Private Sub OnMouseSelectedObj(ByVal sender As Object, ByVal nId As Integer, ByVal bLast As Boolean)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   ' se sto editando testo angoli
-      '   If Map.refFreeContourManagerVM.bIsModifyingTextAngle Then
-      '      ' passo testo selezionato
-      '      Map.refFreeContourManagerVM.TextAngleSelected(nId)
-      '   End If
-      '   MainController.MouseSelectedObj(nId, bLast)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedPart(ByVal sender As Object, ByVal nId As Integer)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.MouseSelectedPart(nId)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedLayer(ByVal sender As Object, ByVal nId As Integer)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.MouseSelectedLayer(nId)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedPath(ByVal sender As Object, ByVal nId As Integer, ByVal bHaltOnFork As Boolean)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.MouseSelectedPath(nId, bHaltOnFork)
-      'End If
-   End Sub
-
-   Private Sub OnMousePointFromSelection(ByVal sender As Object, ByVal nId As Integer, ByVal PtP As Point3d, ByVal nAux As Integer)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.SetPointFromSelection(nId, PtP, nAux)
-      'End If
-   End Sub
-
-   Private Sub OnMouseDone(ByVal sender As Object)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.Done(Map.refFreeContourInputVM.Text)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedPoint(ByVal sender As Object, ByVal PtP As Point3d, ByVal nSep As SEP, ByVal nId As Integer)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   Dim bDone As Boolean = (Keyboard.Modifiers And ModifierKeys.Control) <> ModifierKeys.Control
-      '   MainController.MouseSelectedPoint(PtP, nSep, nId, bDone)
-      'End If
-   End Sub
-
-   Private Sub OnMouseSelectedDir(ByVal sender As Object, ByVal VtDir As Vector3d)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.SetLastVector3d(VtDir)
-      'End If
-   End Sub
-
-   Private Sub OnMouseMoveSelPoint(ByVal sender As Object, ByVal PtP As Point3d)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   MainController.MouseMoveInSelectionPoint(PtP)
-      'End If
-   End Sub
-
-   Private Sub OnShowDistance(ByVal sender As Object, ByVal sDistance As String)
-      Map.refMyStatusBarVM.SetOutputMessage(sDistance)
-   End Sub
-
-   Private Sub OnKeyDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.KeyEventArgs)
-      '' Se in modalità edit L250
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
-      '   ' Con DEL eseguo cancellazione delle entità selezionate
-      '   If e.KeyData = System.Windows.Forms.Keys.Delete Then
-      '      MainController.SetLastInteger(GDB_ID.SEL)
-      '      MainController.ExecuteCommand(Controller.CMD.DELETE)
-      '      ' Con SPAZIO ripeto l'ultimo comando
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.Space Then
-      '      MainController.RepeatLastCommand()
-      '      ' Con 'A' e in modalità continuazione, forzo il passaggio ad arco
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.A And MainController.GetContinue() Then
-      '      MainController.ContinueArcPDP()
-      '      ' Con 'L'  e in modalità continuazione, forzo il passaggio a retta
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.L And MainController.GetContinue() Then
-      '      MainController.ContinueLine2P()
-      '      ' Con 'V' cambio lo stato del check
-      '   ElseIf e.KeyData = System.Windows.Forms.Keys.V Then
-      '      Map.refFreeContourInputVM.ChangeInputBoxCheck()
-      '   End If
-      'End If
-   End Sub
-
-   Private Sub OnCloseGetDist(sender As System.Object)
-      Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
-   End Sub
-
-   Friend Sub OnChangedSnapPointType(ByVal sender As Object, ByVal nSpType As SP, ByVal bUser As Boolean)
-      m_SnapType = nSpType
-      If Not IsNothing(Map.refMyStatusBarVM) Then Map.refMyStatusBarVM.SetSnapPointType(nSpType)
-   End Sub
-
-#End Region    ' SCENE EVENTS
-
-#Region "CONTROLLER EVENTS"
-
-   Private Sub OnNewProject(sender As Object, bOk As Boolean)
-      CurrentMachine.CreateMachineTable()
-      If Not bOk Then
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10002), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)  ' Error on new file  - Error
-      End If
-      EgtZoom(ZM.ALL)
-      MainScene.SetStatusNull()
-   End Sub
-
-   Private Sub OnOpenProject(sender As Object, sFile As String, bOk As Boolean)
-      EgtZoom(ZM.ALL)
-      WriteMainPrivateProfileString(S_GENERAL, K_LASTNGEDIR, Path.GetDirectoryName(sFile))
-      If bOk Then
-         Map.refProjManagerVM.MruFiles.Add(sFile)
-      Else
-         Map.refProjManagerVM.MruFiles.Remove(sFile)
-         Dim sMsg As String
-         If My.Computer.FileSystem.FileExists(sFile) Then
-            sMsg = EgtMsg(10003) & " '" & sFile & "'"            'Error opening file
-         Else
-            sMsg = EgtMsg(10009) & " '" & sFile & "'"            'Missing file
-         End If
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-      End If
-      MainScene.SetStatusNull()
-   End Sub
-
-   Private Sub OnSavingProject(ByVal sender As Object, sFile As String)
-   End Sub
-
-   Private Sub OnSavedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
-      WriteMainPrivateProfileString(S_GENERAL, K_LASTNGEDIR, Path.GetDirectoryName(sFile))
-      If bOk Then
-         Map.refProjManagerVM.MruFiles.Add(sFile)
-      Else
-         Map.refProjManagerVM.MruFiles.Remove(sFile)
-         Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'"            'Error saving file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
-      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
-         Dim sMsg As String = EgtMsg(10006) & " '" & sFile & "'"            'Error importing file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
-      Else
-         ' lo aggiungo alla lista pezzi
-         Map.refProjectVM.AddNewPart(sFile)
-      End If
-      EgtDraw()
-      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.refFreeContourInputVM.PrepareInputBox(sTitle, sLabel, sCheckLabel, bShowCombo, bShowBtn)
-   End Sub
-
-   Private Sub SetInputBoxText(ByVal sText As String)
-      'Map.refFreeContourInputVM.SetInputBoxText(sText)
-   End Sub
-
-   Private Sub SetInputBoxCheck(ByVal bCheck As Boolean)
-      'Map.refFreeContourInputVM.SetInputBoxCheck(bCheck)
-   End Sub
-
-   Private Sub AddInputBoxCombo(ByVal sText As String, ByVal bSelected As Boolean)
-      'Map.refFreeContourInputVM.AddInputBoxCombo(sText, bSelected)
-   End Sub
-
-   Private Sub UpdateUI(ByVal sender As Object, ByVal bReloadUI As Boolean)
-      '' pulisco input e relativi messaggi
-      'Map.refFreeContourInputVM.ResetInputBox()
-      If MainController.GetContinue() Then
-         Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(399))      ' Continue : 'L' with line, 'A' with arc
-      Else
-         Map.refMyStatusBarVM.ClearOutputMessage()
-      End If
-   End Sub
-
-#End Region    ' CONTROLLER EVENTS
-
-#Region "Part"
-
-   Friend Sub Basic_OnMouseDownScene(sender As Object, e As Forms.MouseEventArgs)
-      ' Verifico se selezionato indicativo di pezzo
-      EgtSetObjFilterForSelWin(True, True, True, True, True)
-      Dim nSel As Integer
-      EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
-      Dim nId As Integer = EgtGetFirstObjInSelWin()
-      While nId <> GDB_ID.NULL
-         ' Recupero l'identificativo del pezzo cui appartiene
-         Dim nPartId As Integer = EgtGetParent(EgtGetParent(nId))
-         Dim bFound As Boolean = False
-         If EgtIsPart(nPartId) Then bFound = True
-         If Not bFound Then
-            nId = EgtGetNextObjInSelWin()
-            Continue While
-         End If
-         Dim nStat As Integer = GDB_ST.ON_
-         EgtGetStatus(nPartId, nStat)
-         ' Se già selezionato
-         If nStat = GDB_ST.SEL Then
-            ' Memorizzo Id da deselezionare
-            m_nIdToDesel = nPartId
-         Else
-            ' Memorizzo Id da selezionare
-            m_nIdToSel = nPartId
-         End If
-         Exit While
-         nId = EgtGetNextObjInSelWin()
-      End While
-      ' Dati per drag
-      m_bDragToStart = True
-   End Sub
-
-   Friend Sub Basic_OnMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
-      ' Se drag non abilitato o già in esecuzione, esco
-      If Not m_bDragToStart Then Return
-      ' Se primo movimento di drag, verifico di aver superato la soglia di movimento in pixel
-      If m_bDragToStart Then
-         If Math.Abs(e.Location.X - m_locPrev.X) < m_nRestRadius And
-            Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
-            Return
-         End If
-         m_bDragToStart = False
-      End If
-   End Sub
-
-   Friend Sub Basic_OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
-      ' Se eseguito drag
-      If Not m_bDragToStart Then
-         ' Se selezione da eseguire
-      ElseIf m_nIdToSel <> GDB_ID.NULL Then
-         ' Se pezzo da selezionare non è già selezionato
-         'If EgtIsSelectedObj(m_nIdToSel) Then
-         ' Eseguo la selezione
-         Map.refProjectVM.SelPartFromId(m_nIdToSel)
-         'EgtDeselectAll()
-         'EgtSelectPartObjs(m_nIdToSel)
-         'EgtSelectObj(m_nIdToSel)
-         'EgtSetMark(m_nIdToSel)
-         'End If
-         'If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId <> m_nIdToSel Then
-         '      ' Eseguo la selezione
-         '      For Each BTLPart In Map.refProjectVM.BTLStructureVM.BTLPartVMList
-         '         If BTLPart.nPartId = m_nIdToSel Then
-         '            BTLPart.SetIsSelected(True)
-         '         ElseIf BTLPart.IsSelected Then
-         '            BTLPart.SetIsSelected(False)
-         '         End If
-         '      Next
-         '   End If
-      End If
-      ' Reset
-      m_bDrag = False
-      m_nIdToSel = GDB_ID.NULL
-      m_nIdToDesel = GDB_ID.NULL
-      EgtDraw()
-   End Sub
-
-#End Region       ' Part
-
-End Class

Icarus/ImportWnd/ImportWndV.xaml

@@ -1,33 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="ImportWndV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:local="clr-namespace:Icarus">
-   <DockPanel>
-      <Grid DockPanel.Dock="Left">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-         <ListBox ItemsSource="{Binding ImportedEntityList}"
-               SelectedItem="{Binding SelImportedEntity}"/>
-         <StackPanel Grid.Row="1"
-            Orientation="Horizontal">
-            <Button Content="+"
-                    Command="{Binding AddPart_Command}"
-                    Style="{StaticResource ToolBar_Button}"/>
-            <Button Content="-"
-                    Command="{Binding RemovePart_Command}"
-                    Style="{StaticResource ToolBar_Button}"/>
-            <Button Content="Ref"
-                    Command="{Binding ChangeReference_Command}"
-                    Style="{StaticResource ToolBar_Button}"/>
-         </StackPanel>
-         <ListBox Grid.Row="2" 
-               ItemsSource="{Binding ImportPartList}"
-               SelectedItem="{Binding SelImportPartList}"/>
-      </Grid>
-      <!--<local:ImportSceneHostV/>-->
-   </DockPanel>
-</EgtWPFLib5:EgtCustomWindow>

Icarus/ImportWnd/ImportWndV.xaml.vb

@@ -1,18 +0,0 @@
-Public Class ImportWndV
-
-   Private WithEvents m_ImportWndVM As ImportWndVM
-
-   Sub New(Owner As Window, ImportWndVM As ImportWndVM)
-      MyBase.New(Owner)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = ImportWndVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_ImportWndVM = ImportWndVM
-   End Sub
-
-   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ImportWndVM.m_CloseWindow
-   '   Me.DialogResult = bDialogResult
-   'End Sub
-
-End Class

Icarus/ImportWnd/ImportWndVM.vb

@@ -1,106 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtWPFLib5
-Imports EgtUILib
-
-Public Class ImportWndVM
-   Inherits VMBase
-
-   Private m_ImportedEntityList As ObservableCollection(Of GeomEntity)
-   Public ReadOnly Property ImportedEntityList As ObservableCollection(Of GeomEntity)
-      Get
-         Return m_ImportedEntityList
-      End Get
-   End Property
-
-   Private m_SelImportedEntity As GeomEntity
-   Public Property SelImportedEntity As GeomEntity
-      Get
-         Return m_SelImportedEntity
-      End Get
-      Set(value As GeomEntity)
-         m_SelImportedEntity = value
-      End Set
-   End Property
-
-   Private m_ImportPartList As ObservableCollection(Of ImportPart)
-   Public ReadOnly Property ImportPartList As ObservableCollection(Of ImportPart)
-      Get
-         Return m_ImportPartList
-      End Get
-   End Property
-
-   Private m_SelImportPartList As ImportPart
-   Public Property SelImportPartList As ImportPart
-      Get
-         Return m_SelImportPartList
-      End Get
-      Set(value As ImportPart)
-         m_SelImportPartList = value
-      End Set
-   End Property
-
-   Sub New(sFilePath As String)
-
-   End Sub
-
-End Class
-
-Public Class GeomEntity
-
-   Private m_nId As Integer = GDB_ID.NULL
-   Public ReadOnly Property nId As Integer
-      Get
-         Return m_nId
-      End Get
-   End Property
-
-   Private m_sName As String
-   Public ReadOnly Property sName As String
-      Get
-         Return m_sName
-      End Get
-   End Property
-
-End Class
-
-Public Class ImportPart
-
-   Private m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Private m_LayerList As List(Of ImportLayer)
-   Public ReadOnly Property LayerList As List(Of ImportLayer)
-      Get
-         Return m_LayerList
-      End Get
-   End Property
-
-End Class
-
-Public Class ImportLayer
-
-   Private m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Private m_EntityList As List(Of GeomEntity)
-   Public ReadOnly Property EntityList As List(Of GeomEntity)
-      Get
-         Return m_EntityList
-      End Get
-   End Property
-
-End Class

Icarus/InstrumentPanel/MyInstrumentPanelVM.vb

@@ -6,6 +6,20 @@ Imports EgtWPFLib5
 Public Class MyInstrumentPanelVM
    Inherits InstrumentPanelVM
 
+   Private m_PrevSelObjs As New List(Of Integer)
+   Friend ReadOnly Property PrevSelObjs As List(Of Integer)
+      Get
+         Return m_PrevSelObjs
+      End Get
+   End Property
+
+   Private m_PrevPage As Pages
+   Friend ReadOnly Property PrevPage As Pages
+      Get
+         Return m_PrevPage
+      End Get
+   End Property
+
    Private m_InstrumentPanel_IsEnabled As Boolean = True
    Public Property InstrumentPanel_IsEnabled As Boolean
       Get
@@ -16,6 +30,114 @@ Public Class MyInstrumentPanelVM
       End Set
    End Property
 
+   Private m_bEdgeAnalysis_IsChecked As Boolean
+   Public Property bEdgeAnalysis_IsChecked As Boolean
+      Get
+         Return m_bEdgeAnalysis_IsChecked
+      End Get
+      Set(value As Boolean)
+         ' verifico che non sia in corso un altro comando
+         If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+         m_bEdgeAnalysis_IsChecked = value
+         If value Then
+            ' salvo pagina precedente ed imposto pagina nulla
+            m_PrevPage = Map.refTopPanelVM.SelPage
+            Map.refTopPanelVM.SelPage = Pages.NULL
+            ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+            Map.refProjManagerVM.SetProjCmdIsEnabled(False)
+            Map.refTopPanelVM.SetTopPanelIsEnabled(False)
+            Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(False)
+            Map.refSliceManagerVM.SetButtonsIsEnabled(False)
+            Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
+            Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+            ' Disabilito segnalazione modificato
+            Dim DisableMgr As New DisableModifiedMgr
+            ' salvo selezione precedente e deseleziono altri oggetti
+            Dim nSelObjId As Integer = EgtGetFirstSelectedObj()
+            While nSelObjId <> GDB_ID.NULL
+               m_PrevSelObjs.Add(nSelObjId)
+               nSelObjId = EgtGetNextSelectedObj()
+            End While
+            ' eseguo comando su tutti i pezzi
+            Dim sResult As String = "Chunk Number for every part:"
+            For Each CurrPart In Map.refTopPanelVM.PartList
+               EgtDeselectAll()
+               Dim nPrintSolidId As Integer = EgtGetFirstInGroup(CurrPart.nPrintSolidLayerId)
+               Dim nChunkLayerId As Integer = EgtGetFirstNameInGroup(CurrPart.nPartId, LAY_CHUNKS)
+               If nChunkLayerId = GDB_ID.NULL Then
+                  nChunkLayerId = EgtCreateGroup(CurrPart.nPartId)
+                  EgtSetName(nChunkLayerId, LAY_CHUNKS)
+               End If
+               EgtSelectObj(nPrintSolidId)
+               EgtSetCurrPartLayer(CurrPart.nPartId, nChunkLayerId)
+               ' estraggo bordi superficie
+               Dim nCount As Integer = 0
+               If EgtGetType(nPrintSolidId) = GDB_TY.SRF_FRGN Then
+                  For nChunk As Integer = 0 To EgtSurfFrChunkCount(nPrintSolidId) - 1
+                     EgtExtractSurfFrChunkLoops(nPrintSolidId, nChunk, nChunkLayerId, nCount)
+                  Next
+               ElseIf EgtGetType(nPrintSolidId) = GDB_TY.SRF_MESH Then
+                  EgtExtractSurfTmLoops(nPrintSolidId, nChunkLayerId, nCount)
+               ElseIf EgtGetType(nPrintSolidId) = GDB_TY.SRF_BEZ Then
+                  EgtExtractSurfBezierLoops(nPrintSolidId, nChunkLayerId, nCount)
+               End If
+               sResult &= Environment.NewLine & CurrPart.sName & " = " & nCount
+            Next
+            EgtDeselectAll()
+            ' li seleziono per evidenziarli
+            For Each CurrPart In Map.refTopPanelVM.PartList
+               Dim nChunkLayerId As Integer = EgtGetFirstNameInGroup(CurrPart.nPartId, LAY_CHUNKS)
+               Dim nChunkId As Integer = EgtGetFirstInGroup(nChunkLayerId)
+               While nChunkId <> GDB_ID.NULL
+                  EgtSelectObj(nChunkId)
+                  nChunkId = EgtGetNext(nChunkId)
+               End While
+            Next
+            EgtDraw()
+            ' Ripristino stato segnalazione modifica
+            DisableMgr.ReEnable()
+            MessageBox.Show(sResult)
+         Else
+            ' Disabilito segnalazione modificato
+            Dim DisableMgr As New DisableModifiedMgr
+            ' cancello tutti i gruppi con i chunk
+            For Each CurrPart In Map.refTopPanelVM.PartList
+               Dim nChunkLayerId As Integer = EgtGetFirstNameInGroup(CurrPart.nPartId, LAY_CHUNKS)
+               If nChunkLayerId <> GDB_ID.NULL Then EgtErase(nChunkLayerId)
+            Next
+            ' ripristino selezioni precedenti
+            For Each Id In m_PrevSelObjs
+               EgtSelectObj(Id)
+            Next
+            ' Ripristino stato segnalazione modifica
+            DisableMgr.ReEnable()
+            EgtDraw()
+            ' ripristino pagina precedente
+            Map.refTopPanelVM.SelPage = m_PrevPage
+            ' riabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+            Map.refProjManagerVM.SetProjCmdIsEnabled(True)
+            Map.refTopPanelVM.SetTopPanelIsEnabled(True)
+            Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
+            Map.refSliceManagerVM.SetButtonsIsEnabled(True)
+            Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
+            Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
+         End If
+      End Set
+   End Property
+
+   Private m_bEdgeAnalysis_IsEnabled As Boolean = True
+   Public Property bEdgeAnalysis_IsEnabled As Boolean
+      Get
+         Return m_bEdgeAnalysis_IsEnabled
+      End Get
+      Set(value As Boolean)
+         m_bEdgeAnalysis_IsEnabled = value
+      End Set
+   End Property
+   Friend Sub SetEdgeAnalysisIsEnabled(value As Boolean)
+      m_bEdgeAnalysis_IsEnabled = value
+      NotifyPropertyChanged(NameOf(bEdgeAnalysis_IsEnabled))
+   End Sub
 
 #Region "CONSTRUCTORS"
 

Icarus/MachiningDb/Machining.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.Collections.Specialized
 Imports System.ComponentModel
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -39,6 +40,7 @@ Public Class Machining
       INTERNAL = 1
       EXTERNAL = 2
       UNBOUNDED = 3
+      SUPPORT = 4
    End Enum
 
    Public Enum MPAR_INFILL As Integer
@@ -47,6 +49,22 @@ Public Class Machining
       ZIGZAG = 3
    End Enum
 
+   Public Enum MPAR_DYNAMIC_MODE As Integer
+      STANDARD = 1
+      FAST = 2
+   End Enum
+
+   Public Enum MPAR_PRINT_ORDER As Integer
+      SHELL = 1
+      EXTRA_SHELL = 2
+      INFILL = 3
+      AUX_SOLID = 4
+      RIB_UNBOUNDED = 5
+      RIB_EXTERNAL = 6
+      RIB_INTERNAL = 7
+      RIB_SUPPORT = 8
+   End Enum
+
    Protected m_CathegoryList As New ObservableCollection(Of MachiningCathegory)
    Public ReadOnly Property CathegoryList As ObservableCollection(Of MachiningCathegory)
       Get
@@ -119,7 +137,7 @@ Public Class Machining
       Else
          nIndex = -1
          m_sGUID = Guid.NewGuid.ToString()
-         m_sName = "PrintingParam"
+         m_sName = "New Machining"
       End If
       m_sOrigName = m_sName
       m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.GENERAL, nIndex))
@@ -154,7 +172,7 @@ Public Class Machining
       NotifyPropertyChanged(NameOf(ghName))
    End Sub
 
-   Friend Sub Save()
+   Friend Overridable Sub Save()
       If bIsModified Then
          ' salvo tutti i parametri su orig
          SaveParams()
@@ -165,7 +183,7 @@ Public Class Machining
       End If
    End Sub
 
-   Private Sub SaveParams()
+   Protected Overridable Sub SaveParams()
       SaveName()
       For Each Cathegory In m_CathegoryList
          Cathegory.SaveParams()
@@ -198,8 +216,9 @@ Public Class Machining
 
    Friend Overridable Sub OnMachiningParamPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       Select Case e.PropertyName
-         Case NameOf(sender.dValue), NameOf(sender.sValue), NameOf(sender.bValue), NameOf(sender.SelValue)
+         Case NameOf(sender.dValue), NameOf(sender.sValue), NameOf(sender.bValue), NameOf(sender.SelValue), NameOf(sender.Value)
             UpdateIsModified()
+            Map.refMachiningDbVM.NotifyPropertyChanged(NameOf(Map.refMachiningDbVM.ImpExp_IsEnabled))
       End Select
    End Sub
 
@@ -309,7 +328,9 @@ Public Class MachiningCathegory
                                                                 New NumericMachiningParam(MachiningParam.Params.G0FEED, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.G0FEEDZ, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.TOOLDIAM, nIndex),
-                                                                New NumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nIndex)})
+                                                                New NumericMachiningParam(MachiningParam.Params.FLOWRATE_PC, nIndex),
+                                                                New ComboMachiningParam(MachiningParam.Params.DYNAMIC_MODE, nIndex),
+                                                                New OrderedMachiningParam(MachiningParam.Params.PRINT_ORDER, nIndex)})
          Case Cathegories.LINK
             m_sName = "Shell"
             m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.LINKTYPE, nIndex),
@@ -325,8 +346,8 @@ Public Class MachiningCathegory
                                                                 New NumericMachiningParam(MachiningParam.Params.COASTINGLEN, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.COASTINGFEED_PC, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.WIPELEN, nIndex),
-                                                                New NumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.WIPEFEED_PC, nIndex)})
-                                                                New NumericMachiningParam(MachiningParam.Params.WIPEDIR, nIndex)})
+                                                                'New NumericMachiningParam(MachiningParam.Params.WIPEDIR, nIndex)})
          Case Cathegories.RIBS
             m_sName = "Ribs"
             m_MachiningParamList = New List(Of MachiningParam)({New ComboMachiningParam(MachiningParam.Params.RIBSTYPE, nIndex),
@@ -335,6 +356,7 @@ Public Class MachiningCathegory
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSLINK, nIndex),
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nIndex),
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nIndex),
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nIndex),
                                                                 New CheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nIndex),
@@ -452,9 +474,12 @@ Public MustInherit Class MachiningParam
       AUXSOLIDSWIPELEN = 53
       AUXSOLIDSWIPEDIR = 54
       SPIRALVASE = 55
-      WIPEDIR = 56
+      'WIPEDIR = 56
       STRANDOVERLAP = 57
       FLOWRATE_PC = 58
+      DYNAMIC_MODE = 59
+      PRINT_ORDER = 60
+      RIBSINVERTSTRANDORDER = 61
       MATERIALS = 100
    End Enum
 
@@ -541,6 +566,8 @@ Public MustInherit Class MachiningParam
             m_sName = "Invert Order"
          Case Params.RIBSINVERTDIRECTION
             m_sName = "Invert Direction"
+         Case Params.RIBSINVERTSTRANDORDER
+            m_sName = "Invert Strand Order"
          Case Params.RIBSLEADININVERT
             m_sName = "Lead In Invert"
          Case Params.RIBSLEADINLEN
@@ -583,12 +610,16 @@ Public MustInherit Class MachiningParam
             m_sName = "Wipe Direction [deg]"
          Case Params.SPIRALVASE
             m_sName = "Spiral Vase"
-         Case Params.WIPEDIR
+         'Case Params.WIPEDIR
-            m_sName = "Wipe Direction [deg]"
+         '   m_sName = "Wipe Direction [deg]"
          Case Params.STRANDOVERLAP
             m_sName = "Strand Overlap [%]"
          Case Params.FLOWRATE_PC
             m_sName = "Flow rate [%]"
+         Case Params.DYNAMIC_MODE
+            m_sName = "Dynamic Mode"
+         Case Params.PRINT_ORDER
+            m_sName = "Print Order"
       End Select
    End Sub
 
@@ -627,7 +658,6 @@ Public Class NumericMachiningParam
             StringToDouble(value, m_dValue)
          End If
          NotifyPropertyChanged(NameOf(sValue))
-         Map.refMachiningDbVM.NotifyPropertyChanged(NameOf(Map.refMachiningDbVM.ImpExp_IsEnabled))
       End Set
    End Property
 
@@ -663,13 +693,13 @@ Public Class NumericMachiningParam
                m_bIsLen = True
             Case Params.STRANDCOUNT
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_STRANDCOUNT, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.OFFSET
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_OFFSET, 0)
                m_bIsLen = True
             Case Params.STRANDOVERLAP
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_STRANDOVERLAP, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.STARTPOINTOFFSETONSLICE
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_STARTPOINTOFFSETONSLICE, 0)
                m_bIsLen = True
@@ -706,27 +736,27 @@ Public Class NumericMachiningParam
             Case Params.WIPEFEED_PC
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_WIPEFEEDPU, 0)
                m_bIsLen = False
-            Case Params.WIPEDIR
+            'Case Params.WIPEDIR
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_WIPEDIR, 0)
+            '   m_dValue = ReadMachiningParamDouble(nIndex, MAC_WIPEDIR, 0)
-               m_bIsLen = True
+            '   m_bIsLen = True
             Case Params.FLOORCOUNT
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_FLOORCOUNT, 0)
                m_bIsLen = False
             Case Params.G0FEED
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEED, 0)
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEED, 10000)
                m_bIsLen = True
             Case Params.G0FEEDZ
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEEDZ, 0)
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEEDZ, 1000)
                m_bIsLen = True
             Case Params.TOOLDIAM
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_TOOLDIAM, 0)
                m_bIsLen = True
             Case Params.RIBSOVERLAP
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSOVERLAP, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.RIBSSTRANDCOUNT
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSSTRANDCOUNT, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.RIBSLEADINLEN
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADINLEN, 0)
                m_bIsLen = True
@@ -741,10 +771,10 @@ Public Class NumericMachiningParam
                m_bIsLen = True
             Case Params.RIBSLEADOUTWIPEDIR
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADOUTWIPEDIR, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.SHELLNBRDIFFERENCE
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_SHELLNBRDIFFERENCE, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.SHELLNBRCOASTING
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_SHELLNBRCOASTING, 0)
                m_bIsLen = True
@@ -753,10 +783,10 @@ Public Class NumericMachiningParam
                m_bIsLen = True
             Case Params.SHELLNBRWIPEDIR
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_SHELLNBRWIPEDIR, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.AUXSOLIDSOVERLAP
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSOVERLAP, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.AUXSOLIDSLINKPARAM
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSLINKPARAM, 0)
                m_bIsLen = True
@@ -771,7 +801,7 @@ Public Class NumericMachiningParam
                m_bIsLen = True
             Case Params.AUXSOLIDSWIPEDIR
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSWIPEDIR, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.FLOWRATE_PC
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_CONSTANT, 100)
                m_bIsLen = False
@@ -822,8 +852,8 @@ Public Class NumericMachiningParam
             WriteMachiningParam(nIndex, MAC_WIPELEN, sWriteValue, sFilePath)
          Case Params.WIPEFEED_PC
             WriteMachiningParam(nIndex, MAC_WIPEFEEDPU, sWriteValue, sFilePath)
-         Case Params.WIPEDIR
+         'Case Params.WIPEDIR
-            WriteMachiningParam(nIndex, MAC_WIPEDIR, sWriteValue, sFilePath)
+         '   WriteMachiningParam(nIndex, MAC_WIPEDIR, sWriteValue, sFilePath)
          Case Params.FLOORCOUNT
             WriteMachiningParam(nIndex, MAC_FLOORCOUNT, sWriteValue, sFilePath)
          Case Params.G0FEED
@@ -893,7 +923,6 @@ Public Class StringMachiningParam
       Set(value As String)
          m_sValue = value
          NotifyPropertyChanged(NameOf(sValue))
-         Map.refMachiningDbVM.NotifyPropertyChanged(NameOf(Map.refMachiningDbVM.ImpExp_IsEnabled))
       End Set
    End Property
 
@@ -952,7 +981,6 @@ Public Class ComboMachiningParam
       Set(value As IdNameStruct)
          m_SelValue = value
          NotifyPropertyChanged(NameOf(SelValue))
-         Map.refMachiningDbVM.NotifyPropertyChanged(NameOf(Map.refMachiningDbVM.ImpExp_IsEnabled))
       End Set
    End Property
 
@@ -1001,46 +1029,51 @@ Public Class ComboMachiningParam
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
             Case Params.STRANDORDER
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_STRANDORDERS.OUTTOIN, "From Outside To Inside"),
-                                                     New IdNameStruct(Machining.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside")})
+                                                        New IdNameStruct(Machining.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_STRANDORDER, 0))
             Case Params.DIRECTION
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_DIRECTIONS.CCW, "Counterclockwise"),
-                                                     New IdNameStruct(Machining.MPAR_DIRECTIONS.CW, "Clockwise")})
+                                                        New IdNameStruct(Machining.MPAR_DIRECTIONS.CW, "Clockwise")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_DIRECTION, 0))
             Case Params.LINKTYPE
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LINKTYPES.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
+                                                        New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
-                                                     New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
+                                                        New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LINKTYPE, 0))
             Case Params.LEADIN
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LEADINOUT.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_LEADINOUT.LINEAR, "Linear"),
+                                                        New IdNameStruct(Machining.MPAR_LEADINOUT.LINEAR, "Linear"),
-                                                     New IdNameStruct(Machining.MPAR_LEADINOUT.ARC, "Arc")})
+                                                        New IdNameStruct(Machining.MPAR_LEADINOUT.ARC, "Arc")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LEADIN, 0))
             Case Params.LEADOUT
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LEADINOUT.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_LEADINOUT.LINEAR, "Linear"),
+                                                        New IdNameStruct(Machining.MPAR_LEADINOUT.LINEAR, "Linear"),
-                                                     New IdNameStruct(Machining.MPAR_LEADINOUT.ARC, "Arc")})
+                                                        New IdNameStruct(Machining.MPAR_LEADINOUT.ARC, "Arc")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_LEADOUT, 0))
             Case Params.RIBSTYPE
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_RIBSTYPE.INTERNAL, "Internal"),
-                                                     New IdNameStruct(Machining.MPAR_RIBSTYPE.EXTERNAL, "External"),
+                                                        New IdNameStruct(Machining.MPAR_RIBSTYPE.EXTERNAL, "External"),
-                                                     New IdNameStruct(Machining.MPAR_RIBSTYPE.UNBOUNDED, "Unbounded")})
+                                                        New IdNameStruct(Machining.MPAR_RIBSTYPE.UNBOUNDED, "Unbounded"),
+                                                        New IdNameStruct(Machining.MPAR_RIBSTYPE.SUPPORT, "Support")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_RIBSTYPE, 1))
             Case Params.AUXSOLIDSINFILL
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
+                                                        New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
-                                                     New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
+                                                        New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSINFILL, 0))
             Case Params.AUXSOLIDSSTRANDORDER
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_STRANDORDERS.OUTTOIN, "From Outside To Inside"),
-                                                     New IdNameStruct(Machining.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside")})
+                                                        New IdNameStruct(Machining.MPAR_STRANDORDERS.INTOOUT, "From Inside To Outside")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSSTRANDORDER, 0))
             Case Params.AUXSOLIDSLINKTYPE
                m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LINKTYPES.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
+                                                        New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
-                                                     New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
+                                                        New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
                m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSLINKTYPE, 0))
+            Case Params.DYNAMIC_MODE
+               m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_DYNAMIC_MODE.STANDARD, "Standard"),
+                                                        New IdNameStruct(Machining.MPAR_DYNAMIC_MODE.FAST, "Fast")})
+               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = ReadMachiningParamDouble(nIndex, MAC_DYNAMICMODE, 1))
          End Select
       End If
       m_OrigSelValue = m_SelValue
@@ -1068,6 +1101,8 @@ Public Class ComboMachiningParam
             WriteMachiningParam(nIndex, MAC_AUXSOLIDSSTRANDORDER, m_SelValue.Id, sFilePath)
          Case Params.AUXSOLIDSLINKTYPE
             WriteMachiningParam(nIndex, MAC_AUXSOLIDSLINKTYPE, m_SelValue.Id, sFilePath)
+         Case Params.DYNAMIC_MODE
+            WriteMachiningParam(nIndex, MAC_DYNAMICMODE, m_SelValue.Id, sFilePath)
       End Select
    End Sub
 
@@ -1093,7 +1128,6 @@ Public Class CheckMachiningParam
       Set(value As Boolean)
          m_bValue = value
          NotifyPropertyChanged(NameOf(bValue))
-         Map.refMachiningDbVM.NotifyPropertyChanged(NameOf(Map.refMachiningDbVM.ImpExp_IsEnabled))
       End Set
    End Property
 
@@ -1128,6 +1162,8 @@ Public Class CheckMachiningParam
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTORDER, 0)
             Case Params.RIBSINVERTDIRECTION
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTDIRECTION, 0)
+            Case Params.RIBSINVERTSTRANDORDER
+               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTSTRANDORDER, 0)
             Case Params.RIBSLEADININVERT
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADININVERT, 0)
             Case Params.RIBSLEADOUTINVERT
@@ -1147,6 +1183,8 @@ Public Class CheckMachiningParam
             WriteMachiningParam(nIndex, MAC_RIBSINVERTORDER, If(m_bValue, 1, 0), sFilePath)
          Case Params.RIBSINVERTDIRECTION
             WriteMachiningParam(nIndex, MAC_RIBSINVERTDIRECTION, If(m_bValue, 1, 0), sFilePath)
+         Case Params.RIBSINVERTSTRANDORDER
+            WriteMachiningParam(nIndex, MAC_RIBSINVERTSTRANDORDER, If(m_bValue, 1, 0), sFilePath)
          Case Params.RIBSLEADININVERT
             WriteMachiningParam(nIndex, MAC_RIBSLEADININVERT, If(m_bValue, 1, 0), sFilePath)
          Case Params.RIBSLEADOUTINVERT
@@ -1186,7 +1224,6 @@ Public Class MaterialMachiningParam
       Set(value As Boolean)
          m_bValue = value
          NotifyPropertyChanged(NameOf(bValue))
-         Map.refMachiningDbVM.NotifyPropertyChanged(NameOf(Map.refMachiningDbVM.ImpExp_IsEnabled))
       End Set
    End Property
 
@@ -1240,3 +1277,239 @@ Public Class MaterialMachiningParam
 
 End Class
 
+Public Class OrderedMachiningParam
+   Inherits MachiningParam
+
+   Protected m_StandardValueOrderList As List(Of Integer)
+
+   Protected m_ValueList As ObservableCollection(Of IdNameStruct)
+   Public ReadOnly Property ValueList As ObservableCollection(Of IdNameStruct)
+      Get
+         Return m_ValueList
+      End Get
+   End Property
+
+   Protected m_SelValue As IdNameStruct
+   Public Overridable Property SelValue As IdNameStruct
+      Get
+         Return m_SelValue
+      End Get
+      Set(value As IdNameStruct)
+         m_SelValue = value
+      End Set
+   End Property
+
+   Protected m_OrigValue As String
+   Public ReadOnly Property OrigValue As String
+      Get
+         Return m_OrigValue
+      End Get
+   End Property
+
+   Public Property Value As String
+      Get
+         Dim Temp As String = ""
+         For Each Item In m_ValueList
+            Temp &= Item.Id & ","
+         Next
+         Return Temp.TrimEnd(","c)
+      End Get
+      Set(value As String)
+         Select Case Type
+            Case Params.PRINT_ORDER
+               Dim StringValueList() As String
+               Dim IntegerValueList As New List(Of Integer)
+               If value.Length = 15 Then
+                  StringValueList = value.Split(","c)
+                  For Each StringValue In StringValueList
+                     Dim IntegerValue As Integer = 0
+                     If Integer.TryParse(StringValue, IntegerValue) Then
+                        IntegerValueList.Add(IntegerValue)
+                     End If
+                  Next
+               End If
+               If IntegerValueList.Count <> 8 Then
+                  IntegerValueList = m_StandardValueOrderList
+               End If
+               If Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.SHELL) OrElse
+                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL) OrElse
+                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.INFILL) OrElse
+                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.AUX_SOLID) OrElse
+                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED) OrElse
+                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL) OrElse
+                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL) OrElse
+                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT) Then
+                  IntegerValueList = m_StandardValueOrderList
+               End If
+               OrderByReference(m_ValueList, IntegerValueList)
+         End Select
+      End Set
+   End Property
+
+   Public Shared Sub OrderByReference(collection As ObservableCollection(Of IdNameStruct), comparison As List(Of Integer))
+      For i As Integer = 0 To comparison.Count - 1
+         Dim Index As Integer = i
+         If Not comparison.ElementAt(i).Equals(collection.ElementAt(i)) Then
+            collection.Move(collection.IndexOf(collection.FirstOrDefault(Function(x) x.Id = comparison(Index))), i)
+         End If
+      Next
+   End Sub
+
+   Public Overrides ReadOnly Property bIsModified As Boolean
+      Get
+         Return Value <> m_OrigValue
+      End Get
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdMoveUpOrder As ICommand
+   Private m_cmdMoveDownOrder As ICommand
+   Private m_cmdResetOrder As ICommand
+
+   Sub New(Type As Params)
+      MyBase.New(Type)
+   End Sub
+
+   Sub New(Type As Params, nIndex As Integer)
+      MyBase.New(Type)
+      If nIndex = 0 Then
+         Select Case Type
+            Case Params.PRINT_ORDER
+               m_StandardValueOrderList = New List(Of Integer)({Machining.MPAR_PRINT_ORDER.SHELL,
+                                                                Machining.MPAR_PRINT_ORDER.EXTRA_SHELL,
+                                                                Machining.MPAR_PRINT_ORDER.INFILL,
+                                                                Machining.MPAR_PRINT_ORDER.AUX_SOLID,
+                                                                Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED,
+                                                                Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL,
+                                                                Machining.MPAR_PRINT_ORDER.RIB_INTERNAL,
+                                                                Machining.MPAR_PRINT_ORDER.RIB_SUPPORT})
+               m_ValueList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_PRINT_ORDER.SHELL, "Shell"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shells"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infills"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solids"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Ribs"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Ribs"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Ribs"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Ribs")})
+               m_SelValue = Nothing
+         End Select
+      Else
+         Select Case Type
+            Case Params.PRINT_ORDER
+               m_StandardValueOrderList = New List(Of Integer)({Machining.MPAR_PRINT_ORDER.SHELL,
+                                                                Machining.MPAR_PRINT_ORDER.EXTRA_SHELL,
+                                                                Machining.MPAR_PRINT_ORDER.INFILL,
+                                                                Machining.MPAR_PRINT_ORDER.AUX_SOLID,
+                                                                Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED,
+                                                                Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL,
+                                                                Machining.MPAR_PRINT_ORDER.RIB_INTERNAL,
+                                                                Machining.MPAR_PRINT_ORDER.RIB_SUPPORT})
+               m_ValueList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_PRINT_ORDER.SHELL, "Shell"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shells"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infills"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solids"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Ribs"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Ribs"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Ribs"),
+                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Ribs")})
+               ReadMachiningParamString(nIndex, MAC_PRINTORDER, "", Value)
+         End Select
+      End If
+      m_OrigValue = Value
+      m_SelValue = Nothing
+      NotifyPropertyChanged(NameOf(SelValue))
+   End Sub
+
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
+      Select Case Type
+         Case Params.PRINT_ORDER
+            WriteMachiningParam(nIndex, MAC_PRINTORDER, Value, sFilePath)
+      End Select
+   End Sub
+
+   Friend Overrides Sub SaveParam()
+      m_OrigValue = Value
+   End Sub
+
+   Friend Overrides Sub ResetParam()
+      Value = m_OrigValue
+      m_SelValue = Nothing
+      NotifyPropertyChanged(NameOf(ValueList))
+      NotifyPropertyChanged(NameOf(SelValue))
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "MoveUpOrder"
+
+   Public ReadOnly Property MoveUpOrder_Command As ICommand
+      Get
+         If m_cmdMoveUpOrder Is Nothing Then
+            m_cmdMoveUpOrder = New Command(AddressOf MoveUpOrder)
+         End If
+         Return m_cmdMoveUpOrder
+      End Get
+   End Property
+
+   Public Sub MoveUpOrder()
+      If IsNothing(m_SelValue) Then Return
+      Dim nIndex As Integer = m_ValueList.IndexOf(m_SelValue)
+      If nIndex < 0 Then Return
+      If nIndex > 0 Then
+         m_ValueList.Move(nIndex, nIndex - 1)
+         NotifyPropertyChanged(NameOf(Value))
+      End If
+   End Sub
+
+#End Region    ' MoveUpOrder
+
+#Region "MoveDownOrder"
+
+   Public ReadOnly Property MoveDownOrder_Command As ICommand
+      Get
+         If m_cmdMoveDownOrder Is Nothing Then
+            m_cmdMoveDownOrder = New Command(AddressOf MoveDownOrder)
+         End If
+         Return m_cmdMoveDownOrder
+      End Get
+   End Property
+
+   Public Sub MoveDownOrder()
+      If IsNothing(m_SelValue) Then Return
+      Dim nIndex As Integer = m_ValueList.IndexOf(m_SelValue)
+      If nIndex < 0 Then Return
+      If nIndex < m_ValueList.Count - 1 Then
+         m_ValueList.Move(nIndex, nIndex + 1)
+         NotifyPropertyChanged(NameOf(Value))
+      End If
+   End Sub
+
+#End Region    ' MoveDownOrder
+
+#Region "ResetOrder"
+
+   Public ReadOnly Property ResetOrder_Command As ICommand
+      Get
+         If m_cmdResetOrder Is Nothing Then
+            m_cmdResetOrder = New Command(AddressOf ResetOrder)
+         End If
+         Return m_cmdResetOrder
+      End Get
+   End Property
+
+   Public Sub ResetOrder()
+      Dim CurrValue As String = Value
+      OrderByReference(m_ValueList, m_StandardValueOrderList)
+      m_ValueList = New ObservableCollection(Of IdNameStruct)(m_ValueList.OrderBy(Function(x) x.Id))
+      If Value <> CurrValue Then
+         NotifyPropertyChanged(NameOf(ValueList))
+         NotifyPropertyChanged(NameOf(Value))
+         NotifyPropertyChanged(NameOf(SelValue))
+      End If
+   End Sub
+
+#End Region    ' ResetOrder
+
+#End Region    ' COMMANDS
+
+End Class

Icarus/MachiningDb/MachiningDbV.xaml

@@ -8,7 +8,6 @@
            Style="{StaticResource RightPanel_Border}">
       <Grid>
          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="1*"/>
@@ -63,6 +62,7 @@
                       Visibility="{Binding Combo_Visibility}"
                       Style="{StaticResource FeatureComboBox}"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
+                                   ExplicitUpdateSource="EnterKeyPressOrLostFocus"
                                    IsExplicitFocused="{Binding UserShouldEditValueNow}"
                                    Visibility="{Binding Name_Visibility}"
                                    Style="{StaticResource OptionTextBox}"/>
@@ -72,7 +72,7 @@
                <Image Source="/Resources/TopPanel/Edit.png"/>
             </Button>
          </Grid>
-         <ScrollViewer Grid.Row="3"
+         <ScrollViewer Grid.Row="2"
                        VerticalScrollBarVisibility="Auto"
                        HorizontalScrollBarVisibility="Disabled">
             <ItemsControl Grid.Row="1"
@@ -91,8 +91,7 @@
                         <ItemsControl ItemsSource="{Binding MachiningParamList}">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
-                                 <UniformGrid Columns="1"
+                                 <StackPanel Orientation="Vertical"/>
-                                              HorizontalAlignment="Stretch"/>
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.Resources>
@@ -186,6 +185,38 @@
                                             Style="{StaticResource ToolBar_SmallButton}"/>-->
                                  </Grid>
                               </DataTemplate>
+                              <DataTemplate DataType="{x:Type PrintApp:OrderedMachiningParam}">
+                                 <Grid>
+                                    <Grid.ColumnDefinitions>
+                                       <ColumnDefinition Width="2*"/>
+                                       <ColumnDefinition Width="1*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{Binding sName}"
+                                               VerticalAlignment="Center"/>
+                                    <Grid Grid.Column="1">
+                                       <Grid.ColumnDefinitions>
+                                          <ColumnDefinition Width="1*"/>
+                                          <ColumnDefinition Width="Auto"/>
+                                       </Grid.ColumnDefinitions>
+                                       <ListBox ItemsSource="{Binding ValueList}"
+                                                SelectedItem="{Binding SelValue}"/>
+                                       <StackPanel Grid.Column="1"
+                                                   Orientation="Vertical"
+                                                   VerticalAlignment="Center"
+                                                   Margin="5,0,0,0">
+                                          <Button Content="˄"
+                                                  Command="{Binding MoveUpOrder_Command}"
+                                                  Style="{StaticResource ToolBar_SmallButton}"/>
+                                          <Button Content="˅"
+                                                  Command="{Binding MoveDownOrder_Command}"
+                                                  Style="{StaticResource ToolBar_SmallButton}"/>
+                                          <Button Content="&lt;>"
+                                                  Command="{Binding ResetOrder_Command}"
+                                                  Style="{StaticResource ToolBar_SmallButton}"/>
+                                       </StackPanel>
+                                    </Grid>
+                                 </Grid>
+                              </DataTemplate>
                            </ItemsControl.Resources>
                         </ItemsControl>
                      </Expander>
@@ -193,7 +224,7 @@
                </ItemsControl.ItemTemplate>
             </ItemsControl>
          </ScrollViewer>
-         <UniformGrid Grid.Row="4" Rows="1">
+         <UniformGrid Grid.Row="3" Rows="1">
             <Button Content="Ok"
                     Command="{Binding Ok_Command}"
                     IsEnabled="{Binding IsEnabled}"

Icarus/MachiningDb/MachiningDbVM.vb

@@ -291,6 +291,9 @@ Public Class MachiningDbVM
          Case MessageBoxResult.Yes
             m_MachiningList.Remove(m_SelMachining)
             SetIsModified(True)
+            If m_MachiningList.Count > 0 Then
+               SelMachining = m_MachiningList(0)
+            End If
          Case MessageBoxResult.No
             Return
       End Select
@@ -330,13 +333,11 @@ Public Class MachiningDbVM
 
    Public Sub Import()
       ' chiedo il nome del file .data da aprire
-      Dim OpenFileDlg As New System.Windows.Forms.OpenFileDialog() With {
+      Dim OpenFileDlg As New System.Windows.Forms.OpenFileDialog() With {.Title = EgtMsg(31451) & " " & EgtMsg(31452),
-               .Title = EgtMsg(31451) & " " & EgtMsg(31452),
+                                                                         .Filter = "File data (*" & ImportExportMachiningPanelVM.MachiningDataExtension & ")|*" & ImportExportMachiningPanelVM.MachiningDataExtension,
-               .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
+                                                                         .FileName = String.Empty}
-               .FileName = String.Empty
-            }
       If OpenFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
-      Dim ImportWindow As New ImportExportMachiningPanelV(Application.Current.MainWindow, New ImportExportMachiningPanelVM(OpenFileDlg.FileName))
+      Dim ImportWindow As New ImportExportMachiningPanelV(Application.Current.MainWindow, New ImportExportMachiningPanelVM(ImportExportMachiningPanelVM.WindowTypeEnum.MACHINING, ImportExportMachiningPanelVM.WindowModeEnum.IMPORT, OpenFileDlg.FileName))
       ImportWindow.ShowDialog()
    End Sub
 
@@ -354,7 +355,7 @@ Public Class MachiningDbVM
    End Property
 
    Public Sub Export()
-      Dim ExportWindow As New ImportExportMachiningPanelV(Application.Current.MainWindow, New ImportExportMachiningPanelVM)
+      Dim ExportWindow As New ImportExportMachiningPanelV(Application.Current.MainWindow, New ImportExportMachiningPanelVM(ImportExportMachiningPanelVM.WindowTypeEnum.MACHINING, ImportExportMachiningPanelVM.WindowModeEnum.EXPORT))
       ExportWindow.ShowDialog()
    End Sub
 

Icarus/MainWindow/MainWindowM.vb

@@ -195,8 +195,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2412, 1, m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(5583, 2502, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2412, 1, m_nKeyOptions)
+                            EgtGetKeyOptions(5583, 2502, 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/ManagePartPanel/ManagePartPanelV.xaml.vb

@@ -12,7 +12,9 @@
             End If
          Case GetType(ManagePart_Layer)
             LayerItem = DirectCast(e.OriginalSource.DataContext, ManagePart_Layer)
-            e.Handled = True
+            If LayerItem.Type <> ManagePart_Layer.LayerType.PRINT_SOLID OrElse LayerItem.MenuList.Count = 0 Then
+               e.Handled = True
+            End If
          Case GetType(PartManager_GeomEntity)
             EntityItem = DirectCast(e.OriginalSource.DataContext, PartManager_GeomEntity)
             If EntityItem.MenuList.Count = 0 Then

Icarus/ManagePartPanel/ManagePartPanelVM.vb

@@ -359,14 +359,17 @@ Public Class ManagePartPanelVM
                            nRibsLayerId = EgtCreateGroup(nPartId)
                            EgtSetName(nRibsLayerId, LAY_RIBS)
                            EgtSetColor(nRibsLayerId, GeomEntityColors.c3Rib)
+                           Dim nRibsIndex As Integer = 1
                            For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
                               EgtSetInfo(PartManager_GeomEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
+                              EgtSetInfo(PartManager_GeomEntity.nId, RIB_ID, nRibsIndex)
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nRibsLayerId, GDB_POS.LAST_SON)
                               ' elimino colore entita'
                               EgtResetColor(PartManager_GeomEntity.nId)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
+                              nRibsIndex += 1
                            Next
                         Case ManagePart_Layer.LayerType.SHELL_NUMBER
                            nShellNumberLayerId = EgtCreateGroup(nPartId)
@@ -432,17 +435,9 @@ Public Class ManagePartPanelVM
                            End If
                      End Select
                   Next
-                  ' aggiungo riferimento
+                  ' aggiungo layer riferimento
                   Dim nReferenceLayerId As Integer = EgtCreateGroup(nPartId)
                   EgtSetName(nReferenceLayerId, LAY_REFERENCE)
-                  ' Creo riferimento 
-                  Dim ptOrig As New Point3d(b3PrintSolid.Min())
-                  Dim frPrintSolid As New Frame3d(ptOrig)
-                  nFrameId = EgtCreateGeoFrame(nReferenceLayerId, frPrintSolid, GDB_RT.GLOB)
-                  If nFrameId Then
-                     EgtSetName(nFrameId, FRAME_PART)
-                     EgtSetMode(nFrameId, GDB_MD.LOCKED)
-                  End If
                   EgtSetInfo(nReferenceLayerId, KEY_REFERENCE, ReferenceBtn.References.BL)
                   ' appoggio il pezzo sulla tavola
                   EgtMove(nPartId, New Vector3d(0, 0, -b3PrintSolid.Min.z))
@@ -454,6 +449,8 @@ Public Class ManagePartPanelVM
                   EgtSetInfo(nPartId, "PartOnTable", 1)
                   Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
                   Map.refTopPanelVM.PartList.Add(NewPart)
+                  ' aggiorno riferimento
+                  Map.refReferencePanelVM.UpdateFramePosition(NewPart)
                Next
             End If
             'EgtAddMachGroup("3dPrint")

Icarus/ManagePartPanel/ManagePartUtility.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -375,10 +376,11 @@ Public Class ManagePart_Layer
 
    Public Enum LayerType As Integer
       PRINT_SOLID = 1
-      MACH_START = 2
+      'REFERENCE = 2
-      RIBS = 3
+      MACH_START = 3
-      SHELL_NUMBER = 4
+      RIBS = 4
-      AUX_SOLIDS = 5
+      SHELL_NUMBER = 5
+      AUX_SOLIDS = 6
       OTHERS = 7
       CHANGENAME = 15
       DELETE = 16
@@ -394,6 +396,11 @@ Public Class ManagePart_Layer
    End Property
 
    Private m_nLayerId As Integer
+   Friend ReadOnly Property nLayerId As Integer
+      Get
+         Return m_nLayerId
+      End Get
+   End Property
 
    Private m_bIsSelected As Boolean
    Public Property bIsSelected As Boolean
@@ -426,6 +433,16 @@ Public Class ManagePart_Layer
       End Set
    End Property
 
+   Private m_MenuList As New List(Of ManagerLayer_MenuItem)
+   Public Property MenuList As List(Of ManagerLayer_MenuItem)
+      Get
+         Return m_MenuList
+      End Get
+      Set(value As List(Of ManagerLayer_MenuItem))
+         m_MenuList = value
+      End Set
+   End Property
+
    Private m_EntityList As New ObservableCollection(Of PartManager_GeomEntity)
    Public Property EntityList As ObservableCollection(Of PartManager_GeomEntity)
       Get
@@ -440,6 +457,10 @@ Public Class ManagePart_Layer
       m_OrigPart = OrigPart
       m_Type = Type
       m_sName = sName
+      If Map.refManagePartPanelVM.Type = ManagePartPanelVM.ManagePartType.MODIFY Then
+         ' creo context menu per importazione solido da stampare
+         m_MenuList.Add(New ManagerLayer_MenuItem(Me, ManagerLayer_MenuItem.LayerMenuCmd.IMPORTPRINT))
+      End If
    End Sub
 
    Sub New(OrigPart As ManagePart_Part, Type As LayerType, sName As String, PrintPart As Print3dPartVM)
@@ -453,6 +474,11 @@ Public Class ManagePart_Layer
             If nEntityId <> GDB_ID.NULL Then
                m_EntityList.Add(New PartManager_GeomEntity(Me, nEntityId))
             End If
+            ' se sono in modifica
+            If Map.refManagePartPanelVM.Type = ManagePartPanelVM.ManagePartType.MODIFY Then
+               ' creo context menu per importazione solido da stampare
+               m_MenuList.Add(New ManagerLayer_MenuItem(Me, ManagerLayer_MenuItem.LayerMenuCmd.IMPORTPRINT))
+            End If
          Case LayerType.MACH_START
             m_nLayerId = PrintPart.nMachStartLayerId
             Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
@@ -613,6 +639,9 @@ Public Class GeomEntity_MenuItem
                ' altrimenti lo elimino dalla lista entita' importate
                Map.refManagePartPanelVM.ImportedEntityList.Remove(m_OrigEntity)
             End If
+            ' se e' presente elimino flag di spostamento a 45 gradi
+            Dim nPartId As Integer = EgtGetParent(EgtGetParent(m_OrigEntity.nId))
+            EgtRemoveInfo(nPartId, KEY_MOVEDPART)
             EgtDraw()
             ' aggiorno riferimenti nel context menu item
             Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
@@ -639,6 +668,8 @@ Public Class GeomEntity_MenuItem
                      NewLayer.EntityList.Add(m_OrigEntity)
                      ' aggiorno riferimenti nell'entita'
                      m_OrigEntity.UpdateOrigLayer(NewLayer)
+                     ' aggiorno colore
+                     EgtSetColor(m_OrigEntity.nId, GetColor(LayerType.PRINTPART))
                   End If
                End If
                ' aggiorno i contextmenu di tutti gli entity
@@ -657,44 +688,38 @@ Public Class GeomEntity_MenuItem
                ' creo layer solido di stampa
                Dim nPrintPartLayerId As Integer = EgtCreateGroup(nPartId)
                EgtSetName(nPrintPartLayerId, PRINT_SOLID)
+               EgtSetColor(nPrintPartLayerId, GeomEntityColors.c3Print)
                EgtRelocateGlob(m_OrigEntity.nId, nPrintPartLayerId, GDB_POS.LAST_SON)
                ' calcolo box superficie per creazione riferimento
                EgtGetBBoxGlob(m_OrigEntity.nId, GDB_BB.STANDARD, b3PrintSolid)
-               ' coloro l'entita'
-               EgtSetColor(m_OrigEntity.nId, GeomEntityColors.c3Print)
                ' creo layer mach start
                Dim nMachStartLayerId As Integer = EgtCreateGroup(nPartId)
                EgtSetName(nMachStartLayerId, LAY_MACH_START)
+               EgtSetColor(nMachStartLayerId, GeomEntityColors.c3MachStart)
                Dim nMachStartId As Integer = GDB_ID.NULL
                ' creo punto di partenza
                Dim ptStart As Point3d = b3PrintSolid.Center() - 0.6 * b3PrintSolid.DimY() * Vector3d.Y_AX() - 0.5 * b3PrintSolid.DimZ() * Vector3d.Z_AX()
                nMachStartId = EgtCreateGeoPoint(nMachStartLayerId, ptStart, GDB_RT.GLOB)
                EgtSetName(nMachStartId, START_GEOM)
-               ' coloro l'entita' di rosso
-               EgtSetColor(nMachStartId, GeomEntityColors.c3MachStart)
                ' creo layer ribs
                Dim nRibsLayerId As Integer = EgtCreateGroup(nPartId)
                EgtSetName(nRibsLayerId, LAY_RIBS)
+               EgtSetColor(nRibsLayerId, GeomEntityColors.c3Rib)
                ' creo layer shell number
                Dim nShellNumberLayerId As Integer = EgtCreateGroup(nPartId)
                EgtSetName(nShellNumberLayerId, LAY_SHELL_NBR)
+               EgtSetColor(nShellNumberLayerId, GeomEntityColors.c3ShellNumber)
                ' creo layer aux
                Dim nAuxSolidsLayerId As Integer = EgtCreateGroup(nPartId)
                EgtSetName(nAuxSolidsLayerId, LAY_AUX_SOLIDS)
+               EgtSetColor(nAuxSolidsLayerId, GeomEntityColors.c3AuxSolids)
                ' creo layer others
                Dim nOthersLayerId As Integer = EgtCreateGroup(nPartId)
                EgtSetName(nOthersLayerId, LAY_OTHERS)
+               EgtSetColor(nOthersLayerId, GeomEntityColors.c3Others)
                ' aggiungo riferimento
                Dim nReferenceLayerId As Integer = EgtCreateGroup(nPartId)
                EgtSetName(nReferenceLayerId, LAY_REFERENCE)
-               ' Creo riferimento 
-               Dim ptOrig As New Point3d(b3PrintSolid.Min())
-               Dim frPrintSolid As New Frame3d(ptOrig)
-               nFrameId = EgtCreateGeoFrame(nReferenceLayerId, frPrintSolid, GDB_RT.GLOB)
-               If nFrameId Then
-                  EgtSetName(nFrameId, FRAME_PART)
-                  EgtSetMode(nFrameId, GDB_MD.LOCKED)
-               End If
                EgtSetInfo(nReferenceLayerId, KEY_REFERENCE, ReferenceBtn.References.BL)
                ' appoggio il pezzo sulla tavola
                EgtMove(nPartId, New Vector3d(0, 0, -b3PrintSolid.Min.z))
@@ -703,6 +728,8 @@ Public Class GeomEntity_MenuItem
                EgtSetInfo(nPartId, "PartOnTable", 1)
                Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
                Map.refTopPanelVM.PartList.Add(NewPart)
+               ' aggiorno riferimento
+               Map.refReferencePanelVM.UpdateFramePosition(NewPart)
                Dim ManagePart_Part As ManagePart_Part = New ManagePart_Part(NewPart)
                ' elimino da posizione originale
                m_OrigEntity.OrigLayer.EntityList.Remove(m_OrigEntity)
@@ -714,9 +741,10 @@ Public Class GeomEntity_MenuItem
                ' Imposto flag di ricalcolo slice
                EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
          End Select
-         '' aggiorno visibilita' da check di categoria
+         ' aggiorno visibilita' da check di categoria
-         'Dim PrintLayer As ViewLayer = Map.refViewLayerManagerVM.LayerList.FirstOrDefault(Function(x) x.Type = ViewLayer.ViewLayerType.PRINT_SOLID)
+         Dim PrintViewlayer As ViewLayer = Map.refViewLayerManagerVM.LayerList.FirstOrDefault(Function(x) x.Type = ViewLayer.ViewLayerType.PRINT_SOLID)
-         'EgtSetStatus(m_OrigEntity.nId, If(IsNothing(PrintLayer.bIsVisible) OrElse PrintLayer.bIsVisible, GDB_ST.ON_, GDB_ST.OFF))
+         EgtSetStatus(m_OrigEntity.nId, If(IsNothing(PrintViewlayer.bIsVisible) OrElse PrintViewlayer.bIsVisible, GDB_ST.ON_, GDB_ST.OFF))
+         EgtDraw()
          Return
       End If
       Select Case Map.refManagePartPanelVM.Type
@@ -736,11 +764,18 @@ Public Class GeomEntity_MenuItem
                   NewLayer.EntityList.Add(m_OrigEntity)
                   ' aggiorno riferimenti nell'entita'
                   m_OrigEntity.UpdateOrigLayer(NewLayer)
+                  ' aggiorno colore
+                  EgtSetColor(m_OrigEntity.nId, GetColor(m_Type))
+                  ' aggiorno visibilita' da check di categoria
+                  Dim PrintViewlayer As ViewLayer = Map.refViewLayerManagerVM.LayerList.FirstOrDefault(Function(x) x.Type = m_Type)
+                  EgtSetStatus(m_OrigEntity.nId, If(IsNothing(PrintViewlayer.bIsVisible) OrElse PrintViewlayer.bIsVisible, GDB_ST.ON_, GDB_ST.OFF))
+                  EgtDraw()
                End If
             End If
             ' aggiorno riferimenti nel context menu item
             m_OrigEntity.UpdateContextMenu()
          Case ManagePartPanelVM.ManagePartType.MODIFY
+            Dim bIsMovedRib As Boolean = False
             ' recupero layer da pezzo
             Dim nLayerId As Integer = GDB_ID.NULL
             Select Case m_Type
@@ -762,18 +797,20 @@ Public Class GeomEntity_MenuItem
                ' elimino info vecchio layer
                Select Case m_OrigEntity.OrigLayer.Type
                   Case ManagePart_Layer.LayerType.PRINT_SOLID
-                     EgtResetMark(m_OrigEntity.nId)
+                     'EgtResetMark(m_OrigEntity.nId)
                      ' se e' presente flag di spostamento a 45 gradi
                      Dim nPartId As Integer = EgtGetParent(EgtGetParent(m_OrigEntity.nId))
                      Dim vtMoved As Vector3d
-                     If EgtGetInfo(nPartId, "MovedPart", vtMoved) Then
+                     If EgtGetInfo(nPartId, KEY_MOVEDPART, vtMoved) Then
                         ' lo sposto e rimuovo info
                         EgtMove(m_OrigEntity.nId, -vtMoved, GDB_RT.GLOB)
-                        EgtRemoveInfo(nPartId, "MovedPart")
+                        EgtRemoveInfo(nPartId, KEY_MOVEDPART)
                      End If
                   Case ManagePart_Layer.LayerType.MACH_START
                   Case ManagePart_Layer.LayerType.RIBS
                      EgtRemoveInfo(m_OrigEntity.nId, KEY_RIB_TYPE)
+                     EgtRemoveInfo(m_OrigEntity.nId, RIB_ID)
+                     bIsMovedRib = True
                   Case ManagePart_Layer.LayerType.SHELL_NUMBER
                      EgtRemoveInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE)
                   Case ManagePart_Layer.LayerType.AUX_SOLIDS
@@ -799,14 +836,16 @@ Public Class GeomEntity_MenuItem
                      EgtSetName(m_OrigEntity.nId, PRINT_SOLID)
                      EgtSetColor(m_OrigEntity.nId, c3Print)
                      ' rimuovo eventuale nota spostamento per 45 gradi
-                     EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, "MovedPart")
+                     EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, KEY_MOVEDPART)
                   Case ManagePart_Layer.LayerType.MACH_START
                      EgtSetName(m_OrigEntity.nId, LAY_MACH_START)
                      EgtSetColor(m_OrigEntity.nId, c3MachStart)
                   Case ManagePart_Layer.LayerType.RIBS
                      EgtSetName(m_OrigEntity.nId, LAY_RIBS)
                      EgtSetInfo(m_OrigEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
+                     EgtSetInfo(m_OrigEntity.nId, RIB_ID, RibPanelVM.GetNextRibIndex())
                      EgtSetColor(m_OrigEntity.nId, c3Rib)
+                     bIsMovedRib = True
                   Case ManagePart_Layer.LayerType.SHELL_NUMBER
                      EgtSetName(m_OrigEntity.nId, LAY_SHELL_NBR)
                      EgtSetInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
@@ -819,6 +858,11 @@ Public Class GeomEntity_MenuItem
                      EgtSetName(m_OrigEntity.nId, LAY_OTHERS)
                      EgtSetColor(m_OrigEntity.nId, c3Others)
                End Select
+               ' se spostato un Rib, aggiorno posizione riferimento e pezzo
+               If bIsMovedRib Then
+                  Map.refReferencePanelVM.UpdateFramePosition(NewPart.PrintPart)
+                  Map.refDispositionPanelVM.UpdateZPos()
+               End If
                EgtDraw()
                ' aggiorno riferimenti nel context menu item
                If bUpdateAllContextMenu Then
@@ -897,7 +941,8 @@ Public Class ManagerPart_MenuItem
             Select Case Map.refManagePartPanelVM.Type
                Case ManagePartPanelVM.ManagePartType.IMPORT
                   For Each Layer In m_OrigPart.LayerList
-                     For Each Entity In Layer.EntityList
+                     For EntityIndex = Layer.EntityList.Count - 1 To 0 Step -1
+                        Dim Entity As PartManager_GeomEntity = Layer.EntityList(EntityIndex)
                         ' le rimuovo da lista entita' pezzo
                         Layer.EntityList.Remove(Entity)
                         ' la rimetto in lista importati
@@ -920,7 +965,82 @@ Public Class ManagerPart_MenuItem
             ' aggiorno riferimenti nel context menu item
             Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
             ' Imposto flag di ricalcolo slice
-            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+            If Not IsNothing(Map.refTopPanelVM.SelPart) Then      ' in prima importazione non c'e' alcun pezzo selezionato
+               EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+            End If
+      End Select
+   End Sub
+
+#End Region ' Command
+
+End Class
+
+Public Class ManagerLayer_MenuItem
+   Inherits VMBase
+
+   Public Enum LayerMenuCmd
+      IMPORTPRINT = 1
+   End Enum
+
+   Private m_OrigLayer As ManagePart_Layer
+   Friend ReadOnly Property OrigLayer As ManagePart_Layer
+      Get
+         Return m_OrigLayer
+      End Get
+   End Property
+
+   ' tipo del comando
+   Private m_Type As LayerMenuCmd
+   Public Property Type As LayerMenuCmd
+      Get
+         Return m_Type
+      End Get
+      Set(value As LayerMenuCmd)
+         m_Type = value
+      End Set
+   End Property
+
+   Public ReadOnly Property sMsg As String
+      Get
+         Select Case m_Type
+            Case Else   ' PartMenuCmd.IMPORTPRINT
+               Return "Import Print"
+         End Select
+      End Get
+   End Property
+
+   ' Definizione comando
+   Private m_cmdCommand As ICommand
+
+   Sub New(OrigLayer As ManagePart_Layer, Type As LayerMenuCmd)
+      m_OrigLayer = OrigLayer
+      m_Type = Type
+   End Sub
+
+#Region "Command"
+
+   Public ReadOnly Property MenuItem_Command As ICommand
+      Get
+         If m_cmdCommand Is Nothing Then
+            m_cmdCommand = New Command(AddressOf Command)
+         End If
+         Return m_cmdCommand
+      End Get
+   End Property
+
+   Public Sub Command()
+      If Map.refSceneHostVM.MainController.GetStep <> 0 Then Return
+      Select Case m_Type
+         Case Else   ' PartMenuCmd.IMPORTPRINT
+            Dim bDeleteOldPrint As Boolean = False
+            If m_OrigLayer.EntityList.Count > 0 Then
+               If MessageBox.Show("Importing a new print solid the current one will be deleted. Are you sure you want to proced?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
+                  Return
+               Else
+                  bDeleteOldPrint = True
+               End If
+            End If
+            Map.refSceneHostVM.InsertPrint(Me)
       End Select
    End Sub
 

Icarus/MaterialDb/Material.vb

@@ -21,7 +21,7 @@ Public Class Material
       End Get
    End Property
    Friend Sub UpdateIsModified()
-      m_bIsModified = m_CathegoryList.Any(Function(x) x.MaterialParamList.Any(Function(y) y.bIsModified))
+      m_bIsModified = m_CathegoryList.Any(Function(x) x.MaterialParamList.Any(Function(y) y.bIsModified)) OrElse bIsModifiedName
       NotifyPropertyChanged(NameOf(ghName))
    End Sub
 
@@ -31,23 +31,32 @@ Public Class Material
          Return m_nIndex
       End Get
    End Property
+   Friend Sub SetIndex(nValue As Integer)
+      m_nIndex = nValue
+   End Sub
 
    Private m_sGUID As String
-   Public ReadOnly Property sGUID As String
+   Public Property sGUID As String
       Get
          Return m_sGUID
       End Get
+      Set(value As String)
+         m_sGUID = value
+      End Set
    End Property
 
+   Private m_sOrigName As String = ""
    Private m_sName As String
    Public Property sName As String
       Get
          Return m_sName
       End Get
       Set(value As String)
+         Dim bIsModified As Boolean = m_sName <> value
          m_sName = value
          Map.refMaterialDbVM.SetNameVisibility(False)
-         NotifyPropertyChanged(NameOf(ghName))
+         If bIsModified Then UpdateIsModified()
+         Map.refMaterialDbVM.SetIsEnabled(True)
       End Set
    End Property
    Public ReadOnly Property ghName As String
@@ -55,95 +64,9 @@ Public Class Material
          Return m_sName & If(m_bIsModified, "*", "")
       End Get
    End Property
-
+   Public ReadOnly Property bIsModifiedName As Boolean
-   Private m_dK As Double
-   Public ReadOnly Property dK As Double
       Get
-         Return m_dK
+         Return m_sName <> m_sOrigName
-      End Get
-   End Property
-
-   Private m_dC1 As Double
-   Public ReadOnly Property dC1 As Double
-      Get
-         Return m_dC1
-      End Get
-   End Property
-
-   Private m_dC2 As Double
-   Public ReadOnly Property dC2 As Double
-      Get
-         Return m_dC2
-      End Get
-   End Property
-
-   Private m_dDensity As Double
-   Public ReadOnly Property dDensity As Double
-      Get
-         Return m_dDensity
-      End Get
-   End Property
-
-   Private m_dAMax As Double
-   Public ReadOnly Property dAMax As Double
-      Get
-         Return m_dAMax
-      End Get
-   End Property
-
-   Private m_dATrg As Double
-   Public ReadOnly Property dATrg As Double
-      Get
-         Return m_dATrg
-      End Get
-   End Property
-
-   Private m_dAMin As Double
-   Public ReadOnly Property dAMin As Double
-      Get
-         Return m_dAMin
-      End Get
-   End Property
-
-   Private m_dBMax As Double
-   Public ReadOnly Property dBMax As Double
-      Get
-         Return m_dBMax
-      End Get
-   End Property
-
-   Private m_dBTrg As Double
-   Public ReadOnly Property dBTrg As Double
-      Get
-         Return m_dBTrg
-      End Get
-   End Property
-
-   Private m_dBMin As Double
-   Public ReadOnly Property dBMin As Double
-      Get
-         Return m_dBMin
-      End Get
-   End Property
-
-   Private m_dKW As Double
-   Friend ReadOnly Property dKW As Double
-      Get
-         Return m_dKW
-      End Get
-   End Property
-
-   Private m_dKZ As Double
-   Friend ReadOnly Property dKZ As Double
-      Get
-         Return m_dKZ
-      End Get
-   End Property
-
-   Private m_dKN As Double
-   Friend ReadOnly Property dKN As Double
-      Get
-         Return m_dKN
       End Get
    End Property
 
@@ -152,6 +75,7 @@ Public Class Material
       m_nIndex = nIndex
       ReadMaterialParamString(nIndex, MAT_GUID, "", m_sGUID)
       ReadMaterialParamString(nIndex, MAT_NAME, "", m_sName)
+      m_sOrigName = m_sName
       'EgtGetStringUtf8FromIni(nIndex, MAT_NAME, "", m_sName, sMatIniFilePath)
       m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.GENERAL, nIndex))
       m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.TEMPERATURES, nIndex))
@@ -167,7 +91,8 @@ Public Class Material
    Sub New()
       m_nIndex = Map.refMaterialDbVM.MaterialList.Max(Function(x) x.nIndex) + 1
       m_sGUID = Guid.NewGuid.ToString()
-      m_sName = "New Material Param"
+      m_sName = "New Material"
+      m_sOrigName = m_sName
       Dim nCopyIndex As Integer = Map.refMaterialDbVM.SelMaterial.m_nIndex
       m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.GENERAL, nCopyIndex))
       Dim Orig As StringMaterialParam = m_CathegoryList(0).MaterialParamList.FirstOrDefault(Function(x) x.Type = MaterialParam.Params.ORIG)
@@ -184,25 +109,6 @@ Public Class Material
       m_bIsModified = True
    End Sub
 
-   Sub New(nIndex As Integer, sGUID As String, sName As String)
-      m_nIndex = nIndex
-      m_sName = sName
-      m_sGUID = sGUID
-      m_dK = ReadMaterialParamDouble(m_nIndex, MAT_K, 0)
-      m_dC1 = ReadMaterialParamDouble(m_nIndex, MAT_C1, 0)
-      m_dC2 = ReadMaterialParamDouble(m_nIndex, MAT_C2, 0)
-      m_dDensity = ReadMaterialParamDouble(m_nIndex, MAT_DENSITY, 0)
-      m_dAMax = ReadMaterialParamDouble(m_nIndex, MAT_AMAX, 0)
-      m_dATrg = ReadMaterialParamDouble(m_nIndex, MAT_ATRG, 0)
-      m_dAMin = ReadMaterialParamDouble(m_nIndex, MAT_AMIN, 0)
-      m_dBMax = ReadMaterialParamDouble(m_nIndex, MAT_BMAX, 0)
-      m_dBTrg = ReadMaterialParamDouble(m_nIndex, MAT_BTRG, 0)
-      m_dBMin = ReadMaterialParamDouble(m_nIndex, MAT_BMIN, 0)
-      m_dKW = ReadMaterialParamDouble(m_nIndex, MAT_KW, 0)
-      m_dKZ = ReadMaterialParamDouble(m_nIndex, MAT_KZ, 0)
-      m_dKN = ReadMaterialParamDouble(m_nIndex, MAT_KN, 0)
-   End Sub
-
    Private Sub ReadAllParams()
       'm_nSlicingType = ReadMaterialParamDouble(m_nIndex, MAC_SLICINGTYPE, 0, CurrentMachine.sMachiningFilePath)
       'm_dStrandH = ReadMaterialParamDouble(m_nIndex, MAC_STRANDH, 0, CurrentMachine.sMachiningFilePath)
@@ -243,6 +149,16 @@ Public Class Material
       'm_dRibsLeadOutWipeDir = ReadMaterialParamDouble(m_nIndex, MAC_RIBSLEADOUTWIPEDIR, 0, CurrentMachine.sMachiningFilePath)
    End Sub
 
+   Private Sub SaveName()
+      m_sOrigName = m_sName
+   End Sub
+
+   Private Sub ResetName()
+      m_sName = m_sOrigName
+      NotifyPropertyChanged(NameOf(ghName))
+      NotifyPropertyChanged(NameOf(sName))
+   End Sub
+
    Friend Sub Save()
       If bIsModified Then
          ' salvo tutti i parametri su orig
@@ -255,15 +171,17 @@ Public Class Material
    End Sub
 
    Private Sub SaveParams()
+      SaveName()
       For Each Cathegory In m_CathegoryList
          Cathegory.SaveParams()
       Next
    End Sub
 
    Friend Sub ResetModification()
+      ResetName()
       If bIsModified Then
          ' annullo le modifiche di tutti i parametri
-         SaveParams()
+         ResetParams()
          ' resetto stato di modificata
          UpdateIsModified()
       End If
@@ -275,12 +193,12 @@ Public Class Material
       Next
    End Sub
 
-   Friend Sub WriteParamsOnDb(nIndex As Integer)
+   Friend Sub WriteParamsOnDb(nIndex As Integer, Optional sFilePath As String = "")
-      WriteMaterialParam(nIndex, MAT_GUID, m_sGUID)
+      WriteMaterialParam(nIndex, MAT_GUID, m_sGUID, sFilePath)
-      WriteMaterialParam(nIndex, MAT_NAME, m_sName)
+      WriteMaterialParam(nIndex, MAT_NAME, m_sName, sFilePath)
       ' EgtWriteStringUtf8toIni(nIndex, MAT_NAME, m_sName)
       For Each Cathegory In m_CathegoryList
-         Cathegory.WriteParamOnDb(nIndex)
+         Cathegory.WriteParamOnDb(nIndex, sFilePath)
       Next
    End Sub
 
@@ -323,6 +241,54 @@ Public Class MaterialIndex
       m_sName = sName
    End Sub
 
+   Friend Function GetSelMaterialData(Param As MaterialParam.Params) As Double
+      Dim sParamKey As String = ""
+      Dim dDefault As Double = 0
+      Select Case Param
+         Case MaterialParam.Params.T1
+            sParamKey = MAT_T1
+         Case MaterialParam.Params.T2
+            sParamKey = MAT_T2
+         Case MaterialParam.Params.T3
+            sParamKey = MAT_T3
+         Case MaterialParam.Params.T4
+            sParamKey = MAT_T4
+         Case MaterialParam.Params.T5
+            sParamKey = MAT_T5
+         Case MaterialParam.Params.K_EXTRUSION
+            sParamKey = MAT_KEXTRUSION
+            dDefault = 100
+         Case MaterialParam.Params.K_LAY_TIME
+            sParamKey = MAT_KLAYERTIME
+            dDefault = 100
+         Case MaterialParam.Params.C1
+            sParamKey = MAT_C1
+         Case MaterialParam.Params.C2
+            sParamKey = MAT_C2
+         Case MaterialParam.Params.DENSITY
+            sParamKey = MAT_DENSITY
+         Case MaterialParam.Params.AMAX
+            sParamKey = MAT_AMAX
+         Case MaterialParam.Params.ATRG
+            sParamKey = MAT_ATRG
+         Case MaterialParam.Params.AMIN
+            sParamKey = MAT_AMIN
+         Case MaterialParam.Params.BMAX
+            sParamKey = MAT_BMAX
+         Case MaterialParam.Params.BTRG
+            sParamKey = MAT_BTRG
+         Case MaterialParam.Params.BMIN
+            sParamKey = MAT_BMIN
+         Case MaterialParam.Params.KW
+            sParamKey = MAT_KW
+         Case MaterialParam.Params.KZ
+            sParamKey = MAT_KZ
+         Case MaterialParam.Params.KN
+            sParamKey = MAT_KN
+      End Select
+      Return ReadMaterialParamDouble(m_nIndex, sParamKey, dDefault)
+   End Function
+
 End Class
 
 Public Class MaterialCathegory
@@ -377,7 +343,8 @@ Public Class MaterialCathegory
       Select Case m_Type
          Case Cathegories.GENERAL
             m_sName = "General"
-            m_MaterialParamList = New List(Of MaterialParam)({New NumericMaterialParam(MaterialParam.Params.K, nIndex),
+            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 StringMaterialParam(MaterialParam.Params.ORIG, nIndex)})
             m_Cathegory_Visibility = Visibility.Visible
@@ -419,9 +386,9 @@ Public Class MaterialCathegory
       Next
    End Sub
 
-   Friend Sub WriteParamOnDb(nIndex As Integer)
+   Friend Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
       For Each Param In m_MaterialParamList
-         Param.WriteParamOnDb(nIndex)
+         Param.WriteParamOnDb(nIndex, sFilePath)
       Next
    End Sub
 
@@ -437,20 +404,21 @@ Public MustInherit Class MaterialParam
       T3 = 5
       T4 = 6
       T5 = 7
-      K = 8
+      K_EXTRUSION = 8
-      C1 = 9
+      K_LAY_TIME = 9
-      C2 = 10
+      C1 = 10
-      DENSITY = 11
+      C2 = 11
-      AMAX = 12
+      DENSITY = 12
-      ATRG = 13
+      AMAX = 13
-      AMIN = 14
+      ATRG = 14
-      BMAX = 15
+      AMIN = 15
-      BTRG = 16
+      BMAX = 16
-      BMIN = 17
+      BTRG = 17
-      KW = 18
+      BMIN = 18
-      KZ = 19
+      KW = 19
-      KN = 20
+      KZ = 20
-      ORIG = 21
+      KN = 21
+      ORIG = 22
    End Enum
 
    Private m_Type As Params
@@ -482,8 +450,10 @@ Public MustInherit Class MaterialParam
             m_sName = "Temperature 4"
          Case Params.T5
             m_sName = "Temperature 5"
-         Case Params.K
+         Case Params.K_EXTRUSION
-            m_sName = "Constant"
+            m_sName = "Flow Multiplier [%]"
+         Case Params.K_LAY_TIME
+            m_sName = "Layer Time Multiplier [%]"
          Case Params.C1
             m_sName = "C1"
          Case Params.C2
@@ -514,7 +484,7 @@ Public MustInherit Class MaterialParam
    End Sub
 
 
-   Friend MustOverride Sub WriteParamOnDb(nIndex As Integer)
+   Friend MustOverride Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
    Friend MustOverride Sub SaveParam()
    Friend MustOverride Sub ResetParam()
 
@@ -571,8 +541,11 @@ Public Class NumericMaterialParam
          Case Params.T5
             m_dValue = ReadMaterialParamDouble(nIndex, MAT_T5, 0)
             m_bIsLen = False
-         Case Params.K
+         Case Params.K_EXTRUSION
-            m_dValue = ReadMaterialParamDouble(nIndex, MAT_K, 0)
+            m_dValue = ReadMaterialParamDouble(nIndex, MAT_KEXTRUSION, 100)
+            m_bIsLen = False
+         Case Params.K_LAY_TIME
+            m_dValue = ReadMaterialParamDouble(nIndex, MAT_KLAYERTIME, 100)
             m_bIsLen = False
          Case Params.C1
             m_dValue = ReadMaterialParamDouble(nIndex, MAT_C1, 0)
@@ -614,7 +587,7 @@ Public Class NumericMaterialParam
       m_dOrigValue = m_dValue
    End Sub
 
-   Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
       Dim sWriteValue As String = ""
       If m_bIsLen Then
          sWriteValue = LenToString(m_dValue, 5)
@@ -623,41 +596,43 @@ Public Class NumericMaterialParam
       End If
       Select Case Type
          Case Params.T1
-            WriteMaterialParam(nIndex, MAT_T1, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_T1, sWriteValue, sFilePath)
          Case Params.T2
-            WriteMaterialParam(nIndex, MAT_T2, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_T2, sWriteValue, sFilePath)
          Case Params.T3
-            WriteMaterialParam(nIndex, MAT_T3, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_T3, sWriteValue, sFilePath)
          Case Params.T4
-            WriteMaterialParam(nIndex, MAT_T4, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_T4, sWriteValue, sFilePath)
          Case Params.T5
-            WriteMaterialParam(nIndex, MAT_T5, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_T5, sWriteValue, sFilePath)
-         Case Params.K
+         Case Params.K_EXTRUSION
-            WriteMaterialParam(nIndex, MAT_K, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_KEXTRUSION, sWriteValue, sFilePath)
+         Case Params.K_LAY_TIME
+            WriteMaterialParam(nIndex, MAT_KLAYERTIME, sWriteValue, sFilePath)
          Case Params.C1
-            WriteMaterialParam(nIndex, MAT_C1, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_C1, sWriteValue, sFilePath)
          Case Params.C2
-            WriteMaterialParam(nIndex, MAT_C2, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_C2, sWriteValue, sFilePath)
          Case Params.DENSITY
-            WriteMaterialParam(nIndex, MAT_DENSITY, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_DENSITY, sWriteValue, sFilePath)
          Case Params.AMAX
-            WriteMaterialParam(nIndex, MAT_AMAX, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_AMAX, sWriteValue, sFilePath)
          Case Params.ATRG
-            WriteMaterialParam(nIndex, MAT_ATRG, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_ATRG, sWriteValue, sFilePath)
          Case Params.AMIN
-            WriteMaterialParam(nIndex, MAT_AMIN, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_AMIN, sWriteValue, sFilePath)
          Case Params.BMAX
-            WriteMaterialParam(nIndex, MAT_BMAX, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_BMAX, sWriteValue, sFilePath)
          Case Params.BTRG
-            WriteMaterialParam(nIndex, MAT_BTRG, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_BTRG, sWriteValue, sFilePath)
          Case Params.BMIN
-            WriteMaterialParam(nIndex, MAT_BMIN, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_BMIN, sWriteValue, sFilePath)
          Case Params.KW
-            WriteMaterialParam(nIndex, MAT_KW, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_KW, sWriteValue, sFilePath)
          Case Params.KZ
-            WriteMaterialParam(nIndex, MAT_KZ, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_KZ, sWriteValue, sFilePath)
          Case Params.KN
-            WriteMaterialParam(nIndex, MAT_KN, sWriteValue)
+            WriteMaterialParam(nIndex, MAT_KN, sWriteValue, sFilePath)
       End Select
    End Sub
 
@@ -674,8 +649,6 @@ End Class
 Public Class StringMaterialParam
    Inherits MaterialParam
 
-   Public Const DEFAULT_MATERIAL As String = "***"
-
    Private m_sGUID As String
    Public Property sGUID As String
       Get
@@ -740,9 +713,9 @@ Public Class StringMaterialParam
          Case Params.ORIG
             Dim sOrigGUID As String = ""
             ReadMaterialParamString(nIndex, MAT_ORIG, "", sOrigGUID)
-            If sOrigGUID = DEFAULT_MATERIAL Then
+            If sOrigGUID = ORIG_MATERIAL Then
-               m_sGUID = DEFAULT_MATERIAL
+               m_sGUID = ORIG_MATERIAL
-               m_sValue = DEFAULT_MATERIAL
+               m_sValue = ORIG_MATERIAL
                ' se livello alto, lo visualizzo comunque
                If Map.refMainWindowVM.MainWindowM.nUserLevel >= 5 Then
                   m_String_Visibility = Visibility.Visible
@@ -767,10 +740,10 @@ Public Class StringMaterialParam
       m_sOrigValue = m_sValue
    End Sub
 
-   Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
       Select Case Type
          Case Params.ORIG
-            WriteMaterialParam(nIndex, MAT_ORIG, m_sGUID)
+            WriteMaterialParam(nIndex, MAT_ORIG, m_sGUID, sFilePath)
       End Select
    End Sub
 
@@ -797,8 +770,8 @@ Public Class StringMaterialParam
 
    Public Sub Original()
       If MessageBox.Show("Are you sure you want to set this material as original?", "Original material confirmation", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
-         m_sGUID = DEFAULT_MATERIAL
+         m_sGUID = ORIG_MATERIAL
-         m_sValue = DEFAULT_MATERIAL
+         m_sValue = ORIG_MATERIAL
          NotifyPropertyChanged(NameOf(sValue))
       End If
    End Sub
@@ -854,10 +827,10 @@ Public Class ComboMaterialParam
       m_OrigSelValue = m_SelValue
    End Sub
 
-   Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
       Select Case Type
          'Case Params.STRANDORDER
-         '   WriteMaterialParam(nIndex, MAC_STRANDORDER, m_SelValue.Id)
+         '   WriteMaterialParam(nIndex, MAC_STRANDORDER, m_SelValue.Id, sFilePath)
       End Select
    End Sub
 
@@ -905,7 +878,7 @@ Public Class CheckMaterialParam
       m_bOrigValue = m_bValue
    End Sub
 
-   Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
       Select Case Type
       End Select
    End Sub

Icarus/MaterialDb/MaterialDbV.xaml

@@ -13,39 +13,70 @@
             <RowDefinition Height="1*"/>
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
-         <UniformGrid Rows="1">
+         <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
             <Button Content="Copy"
                     Command="{Binding Copy_Command}"
+                    IsEnabled="{Binding IsEnabled}"
                     Style="{StaticResource ToolBar_TextButton}"/>
-            <Button Content="Save"
+            <Button Grid.Column="1"
+                    Content="Save"
                     Command="{Binding Save_Command}"
+                    IsEnabled="{Binding IsEnabled}"
                     Style="{StaticResource ToolBar_TextButton}"/>
-            <Button Content="Delete"
+            <Button Grid.Column="2" Content="Delete"
                     Command="{Binding Delete_Command}"
                     IsEnabled="{Binding Delete_IsEnabled}"
                     Style="{StaticResource ToolBar_TextButton}"/>
-         </UniformGrid>
+            <Button Grid.Column="3"
-         <ComboBox Grid.Row="1"
+                    Command="{Binding Import_Command}"
-                   Name="MaterialCombo" 
+                    ToolTip="{Binding ImportToolTip}"
-                   ItemsSource="{Binding MaterialList}"
+                    IsEnabled="{Binding ImpExp_IsEnabled}"
-                   SelectedItem="{Binding SelMaterial}"
+                    Style="{StaticResource ToolBar_Button}">
-                   DisplayMemberPath="ghName"/>
+               <Image Source="/Resources/MachiningDB/Import.png" Stretch="Uniform"/>
-         <Grid Grid.Row="2"
+            </Button>
-               Visibility="{Binding Name_Visibility}">
+            <Button Grid.Column="4"
+                    Command="{Binding Export_Command}"
+                    ToolTip="{Binding ImportToolTip}"
+                    IsEnabled="{Binding ImpExp_IsEnabled}"
+                    Style="{StaticResource ToolBar_Button}">
+               <Image Source="/Resources/MachiningDB/Export.png" Stretch="Uniform"/>
+            </Button>
+         </Grid>
+         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <TextBlock Text="{Binding Name_Msg}"/>
+            <ComboBox Grid.Row="1"
-            <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                      Name="MaterialCombo" 
-                     Text="{Binding SelectedItem.sName, ElementName=MaterialCombo, UpdateSourceTrigger=Explicit}"/>
+                      ItemsSource="{Binding MaterialList}"
+                      SelectedItem="{Binding SelMaterial}"
+                      DisplayMemberPath="ghName"
+                      Visibility="{Binding Combo_Visibility}"
+                      Style="{StaticResource FeatureComboBox}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MaterialCombo, UpdateSourceTrigger=Explicit}"
+                                   ExplicitUpdateSource="EnterKeyPressOrLostFocus"
+                                   IsExplicitFocused="{Binding UserShouldEditValueNow}"
+                                   Visibility="{Binding Name_Visibility}"/>
+            <Button Grid.Column="1"
+                    Command="{Binding EditName_Command}"
+                    Style="{StaticResource ToolBar_Button}">
+               <Image Source="/Resources/TopPanel/Edit.png"/>
+            </Button>
          </Grid>
-         <ScrollViewer Grid.Row="3"
+         <ScrollViewer Grid.Row="2"
                        VerticalScrollBarVisibility="Auto"
                        HorizontalScrollBarVisibility="Disabled">
             <ItemsControl Grid.Row="1"
-                          ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MaterialCombo}">
+                          ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MaterialCombo}"
+                          IsEnabled="{Binding IsEnabled}">
                <ItemsControl.ItemsPanel>
                   <ItemsPanelTemplate>
                      <StackPanel Orientation="Vertical"/>
@@ -80,15 +111,6 @@
                                     <TextBlock Text="{Binding sName}"/>
                                     <TextBox Grid.Column="1"
                                              Text="{Binding dValue}"/>
-                                    <!--<Button Grid.Column="2"
-                                            Content="R"
-                                            Command="{Binding ResetParam_Command}"
-                                            CommandParameter="dCurrStrandH"
-                                            IsEnabled="{Binding bCurrStrandH_IsModified}"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>-->
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:StringMaterialParam}">
@@ -117,22 +139,12 @@
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
-                                       <!--<ColumnDefinition Width="Auto"/>-->
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding sName}"/>
                                     <ComboBox Grid.Column="1"
                                               ItemsSource="{Binding ValueList}"
                                               SelectedItem="{Binding SelValue}"
                                               HorizontalAlignment="Stretch"/>
-                                    <!--<Button Grid.Column="1"
-                                            Content="R"
-                                            Command="{Binding ResetParam_Command}"
-                                            CommandParameter="dCurrStrandH"
-                                            IsEnabled="{Binding bCurrStrandH_IsModified}"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>-->
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:CheckMaterialParam}">
@@ -140,22 +152,12 @@
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
-                                       <!--<ColumnDefinition Width="Auto"/>-->
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding sName}"/>
                                     <CheckBox Grid.Column="1"
                                               IsChecked="{Binding bValue}"
                                               HorizontalAlignment="Center"
                                               VerticalAlignment="Center"/>
-                                    <!--<Button Grid.Column="1"
-                                            Content="R"
-                                            Command="{Binding ResetParam_Command}"
-                                            CommandParameter="dCurrStrandH"
-                                            IsEnabled="{Binding bCurrStrandH_IsModified}"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>-->
                                  </Grid>
                               </DataTemplate>
                            </ItemsControl.Resources>
@@ -165,9 +167,10 @@
                </ItemsControl.ItemTemplate>
             </ItemsControl>
          </ScrollViewer>
-         <UniformGrid Grid.Row="4" Rows="1">
+         <UniformGrid Grid.Row="3" Rows="1">
             <Button Content="Ok"
                     Command="{Binding Ok_Command}"
+                    IsEnabled="{Binding IsEnabled}"
                     Style="{StaticResource ToolBar_TextButton}"/>
          </UniformGrid>
       </Grid>

Icarus/MaterialDb/MaterialDbVM.vb

@@ -60,10 +60,13 @@ Public Class MaterialDbVM
          Return m_Name_Visibility
       End Get
    End Property
-   Friend Sub SetNameVisibility(bValue As Boolean)
+
-      m_Name_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+   Private m_Combo_Visibility As Visibility = Visibility.Visible
-      NotifyPropertyChanged(NameOf(Name_Visibility))
+   Public ReadOnly Property Combo_Visibility As Visibility
-   End Sub
+      Get
+         Return m_Combo_Visibility
+      End Get
+   End Property
 
    ' variabile che indica se una qualunque lavorazione e' stata modificata
    Private m_bIsModified As Boolean
@@ -76,10 +79,22 @@ Public Class MaterialDbVM
       m_bIsModified = value
    End Sub
 
+   Private m_IsEnabled As Boolean = True
+   Public ReadOnly Property IsEnabled As Boolean
+      Get
+         Return m_IsEnabled
+      End Get
+   End Property
+   Friend Sub SetIsEnabled(value As Boolean)
+      m_IsEnabled = value
+      NotifyPropertyChanged(NameOf(IsEnabled))
+      NotifyPropertyChanged(NameOf(Delete_IsEnabled))
+   End Sub
+
    Private m_Delete_IsEnabled As Boolean = True
    Public ReadOnly Property Delete_IsEnabled As Boolean
       Get
-         Return m_Delete_IsEnabled
+         Return m_IsEnabled AndAlso m_Delete_IsEnabled
       End Get
    End Property
    Friend Sub SetDeleteIsEnabled(value As Boolean)
@@ -91,11 +106,36 @@ Public Class MaterialDbVM
       NotifyPropertyChanged(NameOf(Delete_IsEnabled))
    End Sub
 
+   Private m_UserShouldEditValueNow As Boolean = False
+   Public Property UserShouldEditValueNow As Boolean
+      Get
+         Return m_UserShouldEditValueNow
+      End Get
+      Set(value As Boolean)
+         m_UserShouldEditValueNow = value
+      End Set
+   End Property
+   Friend Sub SetUserShouldEditValueNow()
+      m_UserShouldEditValueNow = True
+      NotifyPropertyChanged(NameOf(UserShouldEditValueNow))
+      m_UserShouldEditValueNow = False
+      NotifyPropertyChanged(NameOf(UserShouldEditValueNow))
+   End Sub
+
+   Public ReadOnly Property ImpExp_IsEnabled As Boolean
+      Get
+         Return m_IsEnabled AndAlso (IsNothing(m_SelMaterial) OrElse Not m_SelMaterial.bIsModified)
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdOk As ICommand
    Private m_cmdCopy As ICommand
    Private m_cmdSave As ICommand
    Private m_cmdDelete As ICommand
+   Private m_cmdEditName As ICommand
+   Private m_cmdImport As ICommand
+   Private m_cmdExport As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -133,6 +173,14 @@ Public Class MaterialDbVM
       End If
    End Sub
 
+   Friend Sub SetNameVisibility(bValue As Boolean)
+      m_Name_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      m_Combo_Visibility = If(Not bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(Name_Visibility))
+      NotifyPropertyChanged(NameOf(Combo_Visibility))
+      If bValue Then SetUserShouldEditValueNow()
+   End Sub
+
    Private Function SelMaterialIsOriginal() As Boolean
       If IsNothing(m_SelMaterial) Then Return False
       ' verifico abilitazione delete
@@ -140,7 +188,7 @@ Public Class MaterialDbVM
       If Not IsNothing(General) Then
          Dim Original As MaterialParam = General.MaterialParamList.FirstOrDefault(Function(x) x.Type = MaterialParam.Params.ORIG)
          If Not IsNothing(Original) Then
-            If DirectCast(Original, StringMaterialParam).sValue = StringMaterialParam.DEFAULT_MATERIAL Then
+            If DirectCast(Original, StringMaterialParam).sValue = ORIG_MATERIAL Then
                Return True
             End If
          End If
@@ -176,7 +224,7 @@ Public Class MaterialDbVM
          End Select
       End If
       If m_bIsModified Then
-         Dim sBakMatIniFilePath As String = Path.ChangeExtension(CurrentMachine.sMaterialsFilePath, ".bak")
+         Dim sBakMatIniFilePath As String = Path.ChangeExtension(CurrentMachine.sMaterialFilePath, ".bak")
          If File.Exists(sBakMatIniFilePath) Then
             Try
                ' cambio estensione in bak a file Db vecchio
@@ -184,24 +232,24 @@ Public Class MaterialDbVM
             Catch ex As Exception
             End Try
          End If
-         If File.Exists(CurrentMachine.sMaterialsFilePath) Then
+         If File.Exists(CurrentMachine.sMaterialFilePath) Then
             Try
                ' cambio estensione in bak a file Db vecchio
-               File.Move(CurrentMachine.sMaterialsFilePath, sBakMatIniFilePath)
+               File.Move(CurrentMachine.sMaterialFilePath, sBakMatIniFilePath)
             Catch ex As Exception
             End Try
          End If
          ' se ancora esiste lo elimino
-         If File.Exists(CurrentMachine.sMaterialsFilePath) Then
+         If File.Exists(CurrentMachine.sMaterialFilePath) Then
             Try
-               File.Delete(CurrentMachine.sMaterialsFilePath)
+               File.Delete(CurrentMachine.sMaterialFilePath)
             Catch ex As Exception
             End Try
          End If
          ' creo nuovo file
-         If Not File.Exists(CurrentMachine.sMaterialsFilePath) Then
+         If Not File.Exists(CurrentMachine.sMaterialFilePath) Then
             Try
-               File.WriteAllLines(CurrentMachine.sMaterialsFilePath, {"; Commento per evitare BOM con UTF-8"})
+               File.WriteAllLines(CurrentMachine.sMaterialFilePath, {"; Commento per evitare BOM con UTF-8"})
             Catch ex As Exception
             End Try
          End If
@@ -222,6 +270,8 @@ Public Class MaterialDbVM
             Map.refTopPanelVM.SelMaterial = Nothing
             Map.refTopPanelVM.NotifyPropertyChanged(NameOf(Map.refTopPanelVM.SelMaterial))
          End If
+         ' ricarico lavorazioni per aggiorno liste materiali all'interno
+         Map.refMachiningDbVM.Init()
       End If
       ' ripristino modalita' standard
       Map.refTopPanelVM.SelPage = Pages.MODIFY
@@ -289,12 +339,28 @@ Public Class MaterialDbVM
    End Property
 
    Public Sub Delete()
+      Dim sCheckMessage As String = "Are you sure you want to delete selected material?"
       ' se materiale originale, esco
-      If SelMaterialIsOriginal() Then Return
+      If SelMaterialIsOriginal() Then
+         If Map.refMainWindowVM.MainWindowM.nUserLevel >= 5 Then
+            If MessageBox.Show("Trying to delete an Original Material! Are you sure you want to delete it?", "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
+               Return
+            End If
+            sCheckMessage = "Trying to delete an Original Material! Are you ABSOLUTELY sure you want to delete it?"
+         Else
+            MessageBox.Show("Original material impossible to delete!")
+            Return
+         End If
+      End If
       ' chiedo conferma
-      Select Case MessageBox.Show("Are you sure you want to delete selected material?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
+      Select Case MessageBox.Show(sCheckMessage, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
          Case MessageBoxResult.Yes
             m_MaterialList.Remove(m_SelMaterial)
+            SetIsModified(True)
+            If m_MaterialList.Count > 0 Then
+               SelMaterial = m_MaterialList(0)
+               NotifyPropertyChanged(NameOf(SelMaterial))
+            End If
             ' segno Db come modificato
             Map.refMaterialDbVM.SetIsModified(True)
          Case MessageBoxResult.No
@@ -304,6 +370,78 @@ Public Class MaterialDbVM
 
 #End Region    ' Delete
 
+#Region "EditName"
+
+   Public ReadOnly Property EditName_Command As ICommand
+      Get
+         If m_cmdEditName Is Nothing Then
+            m_cmdEditName = New Command(AddressOf EditName)
+         End If
+         Return m_cmdEditName
+      End Get
+   End Property
+
+   Public Sub EditName()
+      If IsNothing(m_SelMaterial) Then Return
+      SetNameVisibility(True)
+      SetIsEnabled(False)
+   End Sub
+
+#End Region    ' EditName
+
+#Region "Import"
+
+   Public ReadOnly Property Import_Command As ICommand
+      Get
+         If m_cmdImport Is Nothing Then
+            m_cmdImport = New Command(AddressOf Import)
+         End If
+         Return m_cmdImport
+      End Get
+   End Property
+
+   Public Sub Import()
+      ' chiedo il nome del file .data da aprire
+      Dim OpenFileDlg As New System.Windows.Forms.OpenFileDialog() With {.Title = EgtMsg(31451) & " " & EgtMsg(31452),
+                                                                         .Filter = "Material file data (*" & ImportExportMachiningPanelVM.MaterialDataExtension & ")|*" & ImportExportMachiningPanelVM.MaterialDataExtension &
+                                                                                   "|Original Material file data (*" & ImportExportMachiningPanelVM.OriginalMaterialDataExtension & ")|*" & ImportExportMachiningPanelVM.OriginalMaterialDataExtension &
+                                                                                   "|All Material file data (*" & ImportExportMachiningPanelVM.MaterialDataExtension & "," & ImportExportMachiningPanelVM.OriginalMaterialDataExtension & ")|*" &
+                                                                                                                  ImportExportMachiningPanelVM.MaterialDataExtension & ";*" & ImportExportMachiningPanelVM.OriginalMaterialDataExtension,
+                                                                         .FilterIndex = 3,
+                                                                         .FileName = String.Empty}
+      If OpenFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
+      Dim ImportWindowVM As New ImportExportMachiningPanelVM(ImportExportMachiningPanelVM.WindowTypeEnum.MATERIAL, ImportExportMachiningPanelVM.WindowModeEnum.IMPORT, OpenFileDlg.FileName)
+      If ImportWindowVM.WindowMode <> ImportExportMachiningPanelVM.WindowModeEnum.IMPORT_ORIG Then
+         Dim ImportWindowV As New ImportExportMachiningPanelV(Application.Current.MainWindow, ImportWindowVM)
+         ImportWindowV.ShowDialog()
+      End If
+   End Sub
+
+#End Region    ' Import
+
+#Region "Export"
+
+   Public ReadOnly Property Export_Command As ICommand
+      Get
+         If m_cmdExport Is Nothing Then
+            m_cmdExport = New Command(AddressOf Export)
+         End If
+         Return m_cmdExport
+      End Get
+   End Property
+
+   Public Sub Export()
+      Dim ExportMode As ImportExportMachiningPanelVM.WindowModeEnum = ImportExportMachiningPanelVM.WindowModeEnum.EXPORT
+      If Map.refMainWindowVM.MainWindowM.nUserLevel >= 5 AndAlso (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+         ExportMode = ImportExportMachiningPanelVM.WindowModeEnum.EXPORT_ORIG
+      End If
+      Dim ExportWindowVM As New ImportExportMachiningPanelVM(ImportExportMachiningPanelVM.WindowTypeEnum.MATERIAL, ExportMode)
+      Dim ExportWindowV As New ImportExportMachiningPanelV(Application.Current.MainWindow, ExportWindowVM)
+      ExportWindowV.ShowDialog()
+   End Sub
+
+#End Region    ' Export
+
 #End Region    ' COMMANDS
 
 End Class

Icarus/ModifyPartPanel/ModifyPartPanelV.xaml

@@ -1,120 +0,0 @@
-<UserControl x:Class="ModifyPartPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Icarus"
-             Width="150"
-             Margin="5,0,0,0">
-   <Grid DockPanel.Dock="Left">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Border Style="{StaticResource LeftPanelTitle_Border}">
-         <TextBlock Text="Part entity list"
-                    FontWeight="DemiBold"
-                    FontSize="14"/>
-      </Border>
-      <!--<DockPanel Grid.Row="1">
-         <Button DockPanel.Dock="Left"
-                 Content="+"
-                 FontSize="20"
-                 Command="{Binding AddPart_Command}"
-                 Style="{StaticResource LeftPanel_Button}"/>
-         <Button DockPanel.Dock="Left"
-                 Content="-"
-                 FontSize="20"
-                 Command="{Binding RemovePart_Command}"
-                 Style="{StaticResource LeftPanel_Button}"/>
-         <Button Content="Reference"
-                 Command="{Binding SetReference_Command}"
-                 Style="{StaticResource LeftPanel_TextButton}"/>
-      </DockPanel>-->
-      <TreeView Grid.Row="2" 
-                ItemsSource="{Binding ModifyPartList}"
-                MinHeight="300">
-         <TreeView.Resources>
-            <HierarchicalDataTemplate DataType="{x:Type local:ModifyPart}" 
-                                      ItemsSource="{Binding LayerList}">
-               <StackPanel Orientation="Horizontal">
-                  <Image Source="/Resources/TreeView/Folder.png" 
-                         Height="15"/>
-                  <TextBlock Text="{Binding ghName}" />
-               </StackPanel>
-            </HierarchicalDataTemplate>
-            <HierarchicalDataTemplate DataType="{x:Type local:ModifyLayer}" 
-                                      ItemsSource="{Binding EntityList, UpdateSourceTrigger=PropertyChanged}">
-               <StackPanel Orientation="Horizontal">
-                  <Image Source="/Resources/TreeView/Folder.png"
-                         Height="15"/>
-                  <TextBlock Text="{Binding sName}" />
-               </StackPanel>
-            </HierarchicalDataTemplate>
-            <HierarchicalDataTemplate DataType="{x:Type local:ModifyEntity}">
-               <StackPanel Orientation="Horizontal">
-                  <!--<Image Source="/WpfTutorialSamples;component/Images/user.png" Margin="0,0,5,0" />-->
-                  <TextBlock Text="{Binding ghName}" />
-                  <TextBlock Text="{Binding ghReference, UpdateSourceTrigger=PropertyChanged}"/>
-               </StackPanel>
-            </HierarchicalDataTemplate>
-            <!-- Menu' tasto destro -->
-            <ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}" >
-               <ContextMenu.ItemContainerStyle>
-                  <Style TargetType="MenuItem">
-                     <Setter Property="Command" Value="{Binding MenuItem_Command}"/>
-                     <Setter Property="CommandParameter" Value="{Binding MenuItem_Command}"/>
-                     <Setter Property="Header" Value="{Binding sMsg}"/>
-                  </Style>
-               </ContextMenu.ItemContainerStyle>
-            </ContextMenu>
-         </TreeView.Resources>
-         <TreeView.ItemContainerStyle>
-            <Style TargetType="{x:Type TreeViewItem}">
-               <Setter Property="IsSelected" Value="{Binding bIsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-               <Setter Property="IsExpanded" Value="True" />
-               <Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
-            </Style>
-         </TreeView.ItemContainerStyle>
-      </TreeView>
-      <!--<Border Grid.Row="3"
-              Style="{StaticResource LeftPanelTitle_Border}">
-         <TextBlock Text="Lista entità importate"
-                    FontWeight="DemiBold"
-                    FontSize="14"/>
-      </Border>
-      <ListBox Grid.Row="4" 
-               ItemsSource="{Binding ImportedEntityList, UpdateSourceTrigger=PropertyChanged}"
-               SelectedItem="{Binding SelImportedEntity}"
-               MinHeight="200">
-         <ListBox.ItemContainerStyle>
-            <Style TargetType="ListBoxItem">
-               <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-            </Style>
-         </ListBox.ItemContainerStyle>
-         <ListBox.ItemTemplate>
-            <DataTemplate>
-               <Grid HorizontalAlignment="Stretch">
-                  <Grid.InputBindings>
-                     <MouseBinding Gesture="LeftDoubleClick"
-                                   Command="{Binding ImportedEntity_DoubleClick}"/>
-                  </Grid.InputBindings>
-                  <TextBlock Text="{Binding ghName}">
-                  </TextBlock>
-               </Grid>
-            </DataTemplate>
-         </ListBox.ItemTemplate>
-      </ListBox>-->
-      <UniformGrid Grid.Row="5"
-                   Rows="1">
-         <Button Content="Ok"
-                 Command="{Binding Ok_Command}"
-                 Style="{StaticResource LeftPanel_TextButton}"/>
-         <!--<Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 Style="{StaticResource LeftPanel_TextButton}"/>-->
-      </UniformGrid>
-   </Grid>
-</UserControl>

Icarus/ModifyPartPanel/ModifyPartPanelV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class ModifyPartPanelV
-
-End Class

Icarus/ModifyPartPanel/ModifyPartPanelVM.vb

@@ -1,407 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class ModifyPartPanelVM
-   Inherits VMBase
-
-   'Private m_nImportedPartId As Integer = GDB_ID.NULL
-   'Friend ReadOnly Property nImportedPartId As Integer
-   '   Get
-   '      Return m_nImportedPartId
-   '   End Get
-   'End Property
-
-   'Private m_ImportedEntityList As New ObservableCollection(Of GeomEntity)
-   'Public Property ImportedEntityList As ObservableCollection(Of GeomEntity)
-   '   Get
-   '      Return m_ImportedEntityList
-   '   End Get
-   '   Set(value As ObservableCollection(Of GeomEntity))
-   '      m_ImportedEntityList = value
-   '   End Set
-   'End Property
-
-   'Private m_SelImportedEntity As GeomEntity
-   'Public Property SelImportedEntity As GeomEntity
-   '   Get
-   '      Return m_SelImportedEntity
-   '   End Get
-   '   Set(value As GeomEntity)
-   '      m_SelImportedEntity = value
-   '      EgtDeselectAll()
-   '      If Not IsNothing(m_SelImportedEntity) Then
-   '         EgtSelectObj(m_SelImportedEntity.nId)
-   '      End If
-   '      EgtDraw()
-   '   End Set
-   'End Property
-   'Friend Sub SetSelImportedEntity(nId As Integer)
-   '   m_SelImportedEntity = Map.refImportPanelVM.ImportedEntityList.FirstOrDefault(Function(x) x.nId = nId)
-   '   EgtDeselectAll()
-   '   If Not IsNothing(m_SelImportedEntity) Then
-   '         EgtSelectObj(m_SelImportedEntity.nId)
-   '      End If
-   '      EgtDraw()
-   '   NotifyPropertyChanged(NameOf(SelImportedEntity))
-   'End Sub
-
-   Private m_ModifyPartList As New ObservableCollection(Of ModifyPart)
-   Public ReadOnly Property ModifyPartList As ObservableCollection(Of ModifyPart)
-      Get
-         Return m_ModifyPartList
-      End Get
-   End Property
-
-   Private m_SelModifyPart As ModifyPart
-   Friend Sub SetSelModifyPart(SelModifyPart As ModifyPart)
-      m_SelModifyPart = SelModifyPart
-      m_SelModifyLayer = Nothing
-   End Sub
-   Public ReadOnly Property SelModifyPart As ModifyPart
-      Get
-         Return m_SelModifyPart
-      End Get
-   End Property
-
-   Private m_SelModifyLayer As ModifyLayer
-   Public ReadOnly Property SelModifyLayer As ModifyLayer
-      Get
-         Return m_SelModifyLayer
-      End Get
-   End Property
-   Friend Sub SetSelModifyLayer(SelModifyLayer As ModifyLayer)
-      m_SelModifyPart = m_ModifyPartList.FirstOrDefault(Function(x) x.LayerList.Contains(SelModifyLayer))
-      m_SelModifyLayer = SelModifyLayer
-   End Sub
-
-   Private m_SelModifyEntity As ModifyEntity
-   Public ReadOnly Property SelModifyEntity As ModifyEntity
-      Get
-         Return m_SelModifyEntity
-      End Get
-   End Property
-   Friend Sub SetSelModifyEntity(SelModifyEntity As ModifyEntity)
-      For Each CurrPart In m_ModifyPartList
-         Dim CurrLayer As ModifyLayer = CurrPart.LayerList.FirstOrDefault(Function(x) x.EntityList.Contains(SelModifyEntity))
-         If Not IsNothing(CurrLayer) Then
-            m_SelModifyPart = CurrPart
-            m_SelModifyLayer = CurrLayer
-            Exit For
-         End If
-      Next
-      m_SelModifyEntity = SelModifyEntity
-   End Sub
-
-   ' Definizione comandi
-   Private m_cmdOk As ICommand
-   Private m_cmdCancel As ICommand
-
-   Sub New()
-      ' Creo riferimento a questa classe in EgtCAM5Map
-      Map.SetRefModifyPartPanelVM(Me)
-   End Sub
-
-#Region "METHODS"
-
-   Friend Sub Init()
-      m_ModifyPartList.Clear()
-      ' carico pezzi in lista
-      For Each PrintPart In Map.refTopPanelVM.PartList
-         m_ModifyPartList.Add(New ModifyPart(PrintPart))
-      Next
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-   '#Region "SetReference"
-
-   '   Public ReadOnly Property SetReference_Command As ICommand
-   '      Get
-   '         If m_cmdSetReference Is Nothing Then
-   '            m_cmdSetReference = New Command(AddressOf SetReference)
-   '         End If
-   '         Return m_cmdSetReference
-   '      End Get
-   '   End Property
-
-   '   Public Sub SetReference()
-   '      If Not IsNothing(SelGeomEntity) Then
-   '         Dim ChooseReferenceWndVM As New ChooseReferenceWndVM
-   '         Dim ChooseReferenceWndV As New ChooseReferenceWndV(Application.Current.MainWindow, ChooseReferenceWndVM)
-   '         If Not ChooseReferenceWndV.ShowDialog() Then Return
-   '         SelGeomEntity.Reference = ChooseReferenceWndVM.SelReference
-   '      End If
-   '   End Sub
-
-   '#End Region    ' SetReference
-
-   '#Region "AddPart"
-
-   '   Public ReadOnly Property AddPart_Command As ICommand
-   '      Get
-   '         If m_cmdAddPart Is Nothing Then
-   '            m_cmdAddPart = New Command(AddressOf AddPart)
-   '         End If
-   '         Return m_cmdAddPart
-   '      End Get
-   '   End Property
-
-   '   Public Sub AddPart()
-   '      m_ImportPartList.Add(New ImportPart)
-   '   End Sub
-
-   '#End Region    ' AddPart
-
-   '#Region "RemovePart"
-
-   '   Public ReadOnly Property RemovePart_Command As ICommand
-   '      Get
-   '         If m_cmdRemovePart Is Nothing Then
-   '            m_cmdRemovePart = New Command(AddressOf RemovePart)
-   '         End If
-   '         Return m_cmdRemovePart
-   '      End Get
-   '   End Property
-
-   '   Public Sub RemovePart()
-   '      If IsNothing(SelImportLayer) Then
-   '         ' rimuovo pezzo
-   '         m_ImportPartList.Remove(SelImportPart)
-   '      Else
-   '         ' rimuovo geometria
-   '         Dim CurrEntity As GeomEntity = m_SelGeomEntity
-   '         SelImportLayer.EntityList.Remove(m_SelGeomEntity)
-   '         ' la rimetto in lista importati
-   '         ImportedEntityList.Add(CurrEntity)
-   '      End If
-   '   End Sub
-
-   '#End Region    ' RemovePart
-
-#Region "Ok"
-
-   Public ReadOnly Property Ok_Command As ICommand
-      Get
-         If m_cmdOk Is Nothing Then
-            m_cmdOk = New Command(AddressOf Ok)
-         End If
-         Return m_cmdOk
-      End Get
-   End Property
-
-   Public Sub Ok()
-      'Dim sErr As New List(Of String)
-      '' verifico che tutti i pezzi abbiano una superficie da stampare nel layer apposito
-      'For Each CurrPart In m_ImportPartList
-      '   For Each CurrLayer In CurrPart.LayerList
-      '      Select Case CurrLayer.Type
-      '         Case ImportLayer.LayerType.PRINT_SOLID
-      '            If CurrLayer.EntityList.Count = 0 Then
-      '               If sErr.Count > 0 Then sErr(sErr.Count - 1) &= Environment.NewLine
-      '               sErr.Add(CurrPart.ghName & " - No print surface defined!")
-      '            End If
-      '      End Select
-      '   Next
-      'Next
-      'If sErr.Count > 0 Then
-      '   MessageBox.Show(String.Concat(sErr), "Error")
-      '   Return
-      'Else
-      '   ' Creo pezzi e layer necessari
-      '   For Each ImportPart In m_ImportPartList
-      '      Dim frImportedPart As New Frame3d
-      '      EgtGetGroupGlobFrame(m_nImportedPartId, frImportedPart)
-      '      Dim nPartId As Integer = EgtCreateGroup(GDB_ID.ROOT, frImportedPart)
-      '      EgtSetName(nPartId, PART)
-      '      Dim nFrameId As Integer = GDB_ID.NULL
-      '      Dim b3PrintSolid As New BBox3d
-      '      Dim nPrintPartLayerId As Integer = GDB_ID.NULL
-      '      Dim PrintSolidEntity As GeomEntity = Nothing
-      '      Dim nOriginalPartLayerId As Integer = GDB_ID.NULL
-      '      Dim nRibsLayerId As Integer = GDB_ID.NULL
-      '      Dim nShellNumberLayerId As Integer = GDB_ID.NULL
-      '      Dim nAuxSolidsLayerId As Integer = GDB_ID.NULL
-      '      Dim nMachStartLayerId As Integer = GDB_ID.NULL
-      '      Dim nOthersLayerId As Integer = GDB_ID.NULL
-      '      For Each ImportLayer In ImportPart.LayerList
-      '         Select Case ImportLayer.Type
-      '            Case ImportLayer.LayerType.PRINT_SOLID
-      '               nPrintPartLayerId = EgtCreateGroup(nPartId)
-      '               EgtSetName(nPrintPartLayerId, PRINT_SOLID)
-      '               If ImportLayer.EntityList.Count > 0 Then
-      '                  PrintSolidEntity = ImportLayer.EntityList(0)
-      '                  EgtRelocateGlob(PrintSolidEntity.nId, nPrintPartLayerId, GDB_POS.LAST_SON)
-      '                  ' calcolo box superficie per creazione riferimento
-      '                  EgtGetBBoxGlob(PrintSolidEntity.nId, GDB_BB.STANDARD, b3PrintSolid)
-      '               End If
-      '               'Case ImportLayer.LayerType.ORIGINAL_SOLID
-      '               '   nOriginalPartLayerId = EgtCreateGroup(nPartId)
-      '               '   EgtSetName(nOriginalPartLayerId, ORIGINAL_SOLID)
-      '               '   For Each GeomEntity In ImportLayer.EntityList
-      '               '      EgtRelocateGlob(GeomEntity.nId, nOriginalPartLayerId, GDB_POS.LAST_SON)
-      '               '   Next
-      '            Case ImportLayer.LayerType.MACH_START
-      '               nMachStartLayerId = EgtCreateGroup(nPartId)
-      '               EgtSetName(nMachStartLayerId, LAY_MACH_START)
-      '               Dim nMachStartId As Integer = GDB_ID.NULL
-      '               If ImportLayer.EntityList.Count > 0 Then
-      '                  For Each GeomEntity In ImportLayer.EntityList
-      '                     ' se punto o curva compo
-      '                     Dim EntityType As GDB_TY = EgtGetType(GeomEntity.nId)
-      '                     Select Case EntityType
-      '                        Case GDB_TY.GEO_POINT, GDB_TY.CRV_COMPO
-      '                           ' gli cambio layer
-      '                           EgtRelocateGlob(GeomEntity.nId, nMachStartLayerId, GDB_POS.LAST_SON)
-      '                           nMachStartId = GeomEntity.nId
-      '                        Case GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_LINE
-      '                           ' altrimenti la trasformo in curva compo
-      '                           nMachStartId = EgtCreateCurveCompo(nMachStartLayerId, GeomEntity.nId, True)
-      '                     End Select
-      '                     EgtSetName(nMachStartId, START_GEOM)
-      '                     ' coloro l'entita' di rosso
-      '                     Dim c3Red As Color3d
-      '                     c3Red.FromColor(System.Drawing.Color.Red)
-      '                     EgtSetColor(nMachStartId, c3Red)
-      '                  Next
-      '               Else
-      '                  ' creo punto di partenza
-      '                  Dim ptStart As Point3d = b3PrintSolid.Center() - 0.6 * b3PrintSolid.DimY() * Vector3d.Y_AX() - 0.5 * b3PrintSolid.DimZ() * Vector3d.Z_AX()
-      '                  nMachStartId = EgtCreateGeoPoint(nMachStartLayerId, ptStart, GDB_RT.GLOB)
-      '                  EgtSetName(nMachStartId, START_GEOM)
-      '                  ' coloro l'entita' di rosso
-      '                  Dim c3Red As Color3d
-      '                  c3Red.FromColor(System.Drawing.Color.Red)
-      '                  EgtSetColor(nMachStartId, c3Red)
-      '               End If
-      '            Case ImportLayer.LayerType.RIBS
-      '               nRibsLayerId = EgtCreateGroup(nPartId)
-      '               EgtSetName(nRibsLayerId, LAY_RIBS)
-      '               For Each GeomEntity In ImportLayer.EntityList
-      '                  EgtSetInfo(GeomEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
-      '                  EgtRelocateGlob(GeomEntity.nId, nRibsLayerId, GDB_POS.LAST_SON)
-      '                  ' coloro l'entita' di viola
-      '                  Dim c3LightBlue As Color3d
-      '                  c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
-      '                  EgtSetColor(GeomEntity.nId, c3LightBlue)
-      '               Next
-      '            Case ImportLayer.LayerType.SHELL_NUMBER
-      '               nShellNumberLayerId = EgtCreateGroup(nPartId)
-      '               EgtSetName(nShellNumberLayerId, LAY_SHELL_NBR)
-      '               For Each GeomEntity In ImportLayer.EntityList
-      '                  EgtSetInfo(GeomEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
-      '                  EgtRelocateGlob(GeomEntity.nId, nShellNumberLayerId, GDB_POS.LAST_SON)
-      '                  ' coloro l'entita' di verde
-      '                  Dim c3LightBlue As Color3d
-      '                  c3LightBlue.FromColor(System.Drawing.Color.Lime)
-      '                  EgtSetColor(GeomEntity.nId, c3LightBlue)
-      '               Next
-      '            Case ImportLayer.LayerType.AUX_SOLIDS
-      '               nAuxSolidsLayerId = EgtCreateGroup(nPartId)
-      '               EgtSetName(nAuxSolidsLayerId, LAY_AUX_SOLIDS)
-      '               For Each GeomEntity In ImportLayer.EntityList
-      '                  EgtSetInfo(GeomEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
-      '                  EgtRelocateGlob(GeomEntity.nId, nAuxSolidsLayerId, GDB_POS.LAST_SON)
-      '                  ' coloro l'entita' di oro
-      '                  Dim c3LightBlue As Color3d
-      '                  c3LightBlue.FromColor(System.Drawing.Color.DarkGoldenrod)
-      '                  EgtSetColor(GeomEntity.nId, c3LightBlue)
-      '               Next
-      '            Case ImportLayer.LayerType.OTHERS
-      '               nOthersLayerId = EgtCreateGroup(nPartId)
-      '               EgtSetName(nOthersLayerId, LAY_OTHERS)
-      '               For Each GeomEntity In ImportLayer.EntityList
-      '                  EgtRelocateGlob(GeomEntity.nId, nOthersLayerId, GDB_POS.LAST_SON)
-      '               Next
-      '         End Select
-      '      Next
-      '      ' aggiungo riferimento
-      '      Dim nReferenceLayerId As Integer = EgtCreateGroup(nPartId)
-      '      EgtSetName(nReferenceLayerId, LAY_REFERENCE)
-      '      ' Creo riferimento 
-      '      Dim ptOrig As New Point3d(b3PrintSolid.Min())
-      '      Select Case PrintSolidEntity.Reference
-      '         Case ChooseReferenceWndVM.References.TL
-      '            ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX
-      '         Case ChooseReferenceWndVM.References.TR
-      '            ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
-      '         Case ChooseReferenceWndVM.References.BL
-      '         Case ChooseReferenceWndVM.References.BR
-      '            ptOrig += b3PrintSolid.DimX() * Vector3d.X_AX
-      '         Case ChooseReferenceWndVM.References.TC
-      '            ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
-      '         Case ChooseReferenceWndVM.References.ML
-      '            ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX
-      '         Case ChooseReferenceWndVM.References.MR
-      '            ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
-      '         Case ChooseReferenceWndVM.References.TC
-      '            ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
-      '         Case ChooseReferenceWndVM.References.MR
-      '            ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
-      '         Case ChooseReferenceWndVM.References.BC
-      '            ptOrig += b3PrintSolid.DimX() / 2 * Vector3d.X_AX
-      '         Case ChooseReferenceWndVM.References.MC
-      '            ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
-      '      End Select
-      '      Dim frPrintSolid As New Frame3d(ptOrig)
-      '      nFrameId = EgtCreateGeoFrame(nReferenceLayerId, frPrintSolid, GDB_RT.GLOB)
-      '      If nFrameId Then
-      '         EgtSetName(nFrameId, FRAME_PART)
-      '         EgtSetMode(nFrameId, GDB_MD.LOCKED)
-      '      End If
-      '      EgtSetInfo(nReferenceLayerId, KEY_REFERENCE, PrintSolidEntity.Reference)
-      '      ' appoggio il pezzo sulla tavola
-      '      EgtMove( nPartId, New Vector3d(0, 0, -b3PrintSolid.Min.z))
-      '      ' lo aggiungo a lista pezzi 
-      '      Dim sFilePath As String = ""
-      '      EgtGetInfo(m_nImportedPartId, FILE_PATH, sFilePath)
-      '      EgtSetInfo(nPartId, FILE_PATH, sFilePath)
-      '      EgtSetInfo(nPartId, "PartOnTable", 1)
-      '      Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, PrintSolidEntity.nId, nOriginalPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
-      '      Map.refTopPanelVM.PartList.Add(NewPart)
-      '   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()
-      '' elimino vecchio pezzo d'importazione
-      'EgtErase(m_nImportedPartId)
-
-      'EgtDraw()
-      ' ripristino modalita' standard
-      Map.refTopPanelVM.SelPage = Pages.MODIFY
-   End Sub
-
-#End Region    ' Ok
-
-#Region "Cancel"
-
-   Public ReadOnly Property Cancel_Command As ICommand
-      Get
-         If m_cmdCancel Is Nothing Then
-            m_cmdCancel = New Command(AddressOf Cancel)
-         End If
-         Return m_cmdCancel
-      End Get
-   End Property
-
-   Public Sub Cancel()
-      ' ripristino modalita' standard
-      Map.refTopPanelVM.SelPage = Pages.MODIFY
-   End Sub
-
-#End Region    ' Cancel
-
-#End Region    ' COMMANDS
-
-End Class

Icarus/ModifyPartPanel/ModifyPartUtility.vb

@@ -1,435 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class ModifyEntity
-   Inherits VMBase
-
-   ' layer sotto cui e' questa entita'
-   Private m_OrigLayer As ModifyLayer
-   Friend ReadOnly Property OrigLayer As ModifyLayer
-      Get
-         Return m_OrigLayer
-      End Get
-   End Property
-
-   Private m_bIsSelected As Boolean
-   Public Property bIsSelected As Boolean
-      Get
-         Return m_bIsSelected
-      End Get
-      Set(value As Boolean)
-         m_bIsSelected = value
-         ' seleziono in scena
-         EgtDeselectAll()
-         If Not IsNothing(value) Then
-            EgtSelectObj(m_nId)
-         End If
-         EgtDraw()
-         ' segno come elemento selezionato in treeview
-         Map.refModifyPartPanelVM.SetSelModifyEntity(Me)
-      End Set
-   End Property
-
-   Private m_nId As Integer = GDB_ID.NULL
-   Public ReadOnly Property nId As Integer
-      Get
-         Return m_nId
-      End Get
-   End Property
-
-   Private m_sName As String
-   Public ReadOnly Property sName As String
-      Get
-         Return m_sName
-      End Get
-   End Property
-
-   Public ReadOnly Property ghName As String
-      Get
-         Return m_nId
-      End Get
-   End Property
-
-   Private m_MenuList As New List(Of MenuItemVm)
-   Public Property MenuList As List(Of MenuItemVm)
-      Get
-         Return m_MenuList
-      End Get
-      Set(value As List(Of MenuItemVm))
-         m_MenuList = value
-      End Set
-   End Property
-
-   Sub New(nId As Integer, sName As String, OrigLayer As ModifyLayer)
-      m_nId = nId
-      m_sName = sName
-      m_OrigLayer = OrigLayer
-      ' aggiungo voci layer a contextmenu
-      CreateContextMenu(OrigLayer)
-   End Sub
-
-   Friend Sub UpdateContextMenu(OrigLayer As ModifyLayer)
-      m_MenuList.Clear()
-      ' aggiungo voci layer a contextmenu
-      CreateContextMenu(OrigLayer)
-   End Sub
-
-   Friend Sub CreateContextMenu(OrigLayer As ModifyLayer)
-      For Each ProjectPart In Map.refTopPanelVM.PartList
-         ' verifico in quali layer puo' andare questo elemento
-         Dim EntityType As GDB_TY = EgtGetType(nId)
-         Select Case EntityType
-            Case GDB_TY.GEO_POINT, GDB_TY.CRV_COMPO, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_LINE
-               ' recupero i layer
-               If OrigLayer.Type <> ModifyLayer.LayerType.MACH_START Then m_MenuList.Add(New MenuItemVm(Me, OrigLayer, ModifyLayer.LayerType.MACH_START, ProjectPart))
-               If OrigLayer.Type <> ModifyLayer.LayerType.OTHERS Then m_MenuList.Add(New MenuItemVm(Me, OrigLayer, ModifyLayer.LayerType.OTHERS, ProjectPart))
-            Case GDB_TY.SRF_MESH
-               ' verifico se volume chiuso
-               If OrigLayer.Type <> ModifyLayer.LayerType.PRINT_SOLID Then m_MenuList.Add(New MenuItemVm(Me, OrigLayer, ModifyLayer.LayerType.PRINT_SOLID, ProjectPart))
-               If OrigLayer.Type <> ModifyLayer.LayerType.SHELL_NUMBER Then m_MenuList.Add(New MenuItemVm(Me, OrigLayer, ModifyLayer.LayerType.SHELL_NUMBER, ProjectPart))
-               If OrigLayer.Type <> ModifyLayer.LayerType.AUX_SOLIDS Then m_MenuList.Add(New MenuItemVm(Me, OrigLayer, ModifyLayer.LayerType.AUX_SOLIDS, ProjectPart))
-               If OrigLayer.Type <> ModifyLayer.LayerType.RIBS Then m_MenuList.Add(New MenuItemVm(Me, OrigLayer, ModifyLayer.LayerType.RIBS, ProjectPart))
-               If OrigLayer.Type <> ModifyLayer.LayerType.OTHERS Then m_MenuList.Add(New MenuItemVm(Me, OrigLayer, ModifyLayer.LayerType.OTHERS, ProjectPart))
-         End Select
-      Next
-   End Sub
-
-   Friend Sub UpdateOrigLayer(NewLayer As ModifyLayer)
-      m_OrigLayer = NewLayer
-   End Sub
-
-End Class
-
-Public Class ModifyPart
-   Inherits VMBase
-
-   Private m_bIsSelected As Boolean
-   Public Property bIsSelected As Boolean
-      Get
-         Return m_bIsSelected
-      End Get
-      Set(value As Boolean)
-         m_bIsSelected = value
-         Map.refModifyPartPanelVM.SetSelModifyPart(Me)
-      End Set
-   End Property
-
-   Private m_PrintPart As Print3dPartVM
-   Public ReadOnly Property PrintPart As Print3dPartVM
-      Get
-         Return m_PrintPart
-      End Get
-   End Property
-
-   Private m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Public ReadOnly Property ghName As String
-      Get
-         Return m_PrintPart.sImportedFileName
-      End Get
-   End Property
-
-   Private m_LayerList As New ObservableCollection(Of ModifyLayer)
-   Public ReadOnly Property LayerList As ObservableCollection(Of ModifyLayer)
-      Get
-         Return m_LayerList
-      End Get
-   End Property
-
-   Sub New(PrintPart As Print3dPartVM)
-      m_PrintPart = PrintPart
-      m_LayerList.Add(New ModifyLayer(ModifyLayer.LayerType.PRINT_SOLID, "Print", PrintPart))
-      m_LayerList.Add(New ModifyLayer(ModifyLayer.LayerType.MACH_START, "Layer Start", PrintPart))
-      m_LayerList.Add(New ModifyLayer(ModifyLayer.LayerType.RIBS, "Ribs", PrintPart))
-      m_LayerList.Add(New ModifyLayer(ModifyLayer.LayerType.SHELL_NUMBER, "Reduce Shell Number", PrintPart))
-      m_LayerList.Add(New ModifyLayer(ModifyLayer.LayerType.AUX_SOLIDS, "Filled Solids", PrintPart))
-      m_LayerList.Add(New ModifyLayer(ModifyLayer.LayerType.OTHERS, "Others", PrintPart))
-   End Sub
-
-End Class
-
-Public Class ModifyLayer
-   Inherits VMBase
-
-   Public Enum LayerType As Integer
-      PRINT_SOLID = 1
-      MACH_START = 2
-      RIBS = 3
-      SHELL_NUMBER = 4
-      AUX_SOLIDS = 5
-      OTHERS = 6
-   End Enum
-
-   Private m_nLayerId As Integer
-
-   Private m_bIsSelected As Boolean
-   Public Property bIsSelected As Boolean
-      Get
-         Return m_bIsSelected
-      End Get
-      Set(value As Boolean)
-         m_bIsSelected = value
-         Map.refModifyPartPanelVM.SetSelModifyLayer(Me)
-      End Set
-   End Property
-
-   Private m_Type As LayerType
-   Public Property Type As LayerType
-      Get
-         Return m_Type
-      End Get
-      Set(value As LayerType)
-         m_Type = value
-      End Set
-   End Property
-
-   Private m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Private m_EntityList As New ObservableCollection(Of ModifyEntity)
-   Public Property EntityList As ObservableCollection(Of ModifyEntity)
-      Get
-         Return m_EntityList
-      End Get
-      Set(value As ObservableCollection(Of ModifyEntity))
-         m_EntityList = value
-      End Set
-   End Property
-
-   Sub New(Type As LayerType, sName As String)
-      m_Type = Type
-      m_sName = sName
-   End Sub
-
-   Sub New(Type As LayerType, sName As String, PrintPart As Print3dPartVM)
-      m_Type = Type
-      m_sName = sName
-      Select Case Type
-         Case LayerType.PRINT_SOLID
-            m_nLayerId = PrintPart.nPrintSolidLayerId
-            Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
-            Dim sEntitytName As String = ""
-            EgtGetName(nEntityId, sEntitytName)
-            m_EntityList.Add(New ModifyEntity(nEntityId, sEntitytName, Me))
-         Case LayerType.MACH_START
-            m_nLayerId = PrintPart.nMachStartLayerId
-            Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
-            Dim sEntitytName As String = ""
-            EgtGetName(nEntityId, sEntitytName)
-            While nEntityId <> GDB_ID.NULL
-               m_EntityList.Add(New ModifyEntity(nEntityId, sEntitytName, Me))
-               nEntityId = EgtGetNext(nEntityId)
-               EgtGetName(nEntityId, sEntitytName)
-            End While
-         Case LayerType.RIBS
-            m_nLayerId = PrintPart.nRibsLayerId
-            Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
-            Dim sEntitytName As String = ""
-            EgtGetName(nEntityId, sEntitytName)
-            While nEntityId <> GDB_ID.NULL
-               Dim RibType As Integer = RibEntity.RibTypes.FROMDRAW
-               EgtGetInfo(nEntityId, KEY_RIB_TYPE, RibType)
-               If RibType = RibEntity.RibTypes.FROMIMPORT Then
-                  m_EntityList.Add(New ModifyEntity(nEntityId, sEntitytName, Me))
-               End If
-               nEntityId = EgtGetNext(nEntityId)
-               EgtGetName(nEntityId, sEntitytName)
-            End While
-         Case LayerType.SHELL_NUMBER
-            m_nLayerId = PrintPart.nShellNumberLayerId
-            Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
-            Dim sEntitytName As String = ""
-            EgtGetName(nEntityId, sEntitytName)
-            While nEntityId <> GDB_ID.NULL
-               Dim ShellType As Integer = ShellNumberEntity.ShellNumberTypes.FROMDRAW
-               EgtGetInfo(nEntityId, KEY_SHELLNBR_TYPE, ShellType)
-               If ShellType = ShellNumberEntity.ShellNumberTypes.FROMIMPORT Then
-                  m_EntityList.Add(New ModifyEntity(nEntityId, sEntitytName, Me))
-               End If
-               nEntityId = EgtGetNext(nEntityId)
-               EgtGetName(nEntityId, sEntitytName)
-            End While
-         Case LayerType.AUX_SOLIDS
-            m_nLayerId = PrintPart.nAuxSolidsLayerId
-            Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
-            Dim sEntitytName As String = ""
-            EgtGetName(nEntityId, sEntitytName)
-            While nEntityId <> GDB_ID.NULL
-               'Dim ShellType As Integer = ShellNumberEntity.ShellNumberTypes.FROMDRAW
-               'EgtGetInfo(nEntityId, KEY_SHELLNBR_TYPE, ShellType)
-               'If ShellType = ShellNumberEntity.ShellNumberTypes.FROMIMPORT Then
-               m_EntityList.Add(New ModifyEntity(nEntityId, sEntitytName, Me))
-               'End If
-               nEntityId = EgtGetNext(nEntityId)
-               EgtGetName(nEntityId, sEntitytName)
-            End While
-         Case LayerType.OTHERS
-            m_nLayerId = PrintPart.nOthersLayerId
-            Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
-            Dim sEntitytName As String = ""
-            EgtGetName(nEntityId, sEntitytName)
-            While nEntityId <> GDB_ID.NULL
-               m_EntityList.Add(New ModifyEntity(nEntityId, sEntitytName, Me))
-               nEntityId = EgtGetNext(nEntityId)
-               EgtGetName(nEntityId, sEntitytName)
-            End While
-      End Select
-   End Sub
-
-End Class
-
-Public Class MenuItemVm
-   Inherits VMBase
-
-   ' enita' di origine
-   Private m_OrigEntity As ModifyEntity
-   Private m_OrigLayer As ModifyLayer
-
-   ' pezzo in cui spostare
-   Private m_Part As Print3dPartVM
-
-   ' tipo del layer indicato
-   Private m_Type As ModifyLayer.LayerType
-   Public Property Type As ModifyLayer.LayerType
-      Get
-         Return m_Type
-      End Get
-      Set(value As ModifyLayer.LayerType)
-         m_Type = value
-      End Set
-   End Property
-
-   Public ReadOnly Property sMsg As String
-      Get
-         Dim sType As String = ""
-         Select Case m_Type
-            Case ModifyLayer.LayerType.PRINT_SOLID
-               sType = "Print"
-            Case ModifyLayer.LayerType.MACH_START
-               sType = "Layer Start"
-            Case ModifyLayer.LayerType.RIBS
-               sType = "Ribs"
-            Case ModifyLayer.LayerType.SHELL_NUMBER
-               sType = "Reduce shell number"
-            Case ModifyLayer.LayerType.AUX_SOLIDS
-               sType = "Filled Solids"
-            Case ModifyLayer.LayerType.OTHERS
-               sType = "Others"
-         End Select
-         Return "Move to " & sType
-      End Get
-   End Property
-
-   ' Definizione comando
-   Private m_cmdCommand As ICommand
-
-   Sub New(OrigEntity As ModifyEntity, OrigLayer As ModifyLayer, Type As ModifyLayer.LayerType, Part As Print3dPartVM)
-      m_OrigEntity = OrigEntity
-      m_OrigLayer = OrigLayer
-      m_Type = Type
-      m_Part = Part
-   End Sub
-
-#Region "Command"
-
-   Public ReadOnly Property MenuItem_Command As ICommand
-      Get
-         If m_cmdCommand Is Nothing Then
-            m_cmdCommand = New Command(AddressOf Command)
-         End If
-         Return m_cmdCommand
-      End Get
-   End Property
-
-   Public Sub Command()
-      ' recupero layer da pezzo
-      Dim nLayerId As Integer = GDB_ID.NULL
-      Select Case m_Type
-         Case ModifyLayer.LayerType.PRINT_SOLID
-            nLayerId = m_Part.nPrintSolidLayerId
-         Case ModifyLayer.LayerType.MACH_START
-            nLayerId = m_Part.nMachStartLayerId
-         Case ModifyLayer.LayerType.RIBS
-            nLayerId = m_Part.nRibsLayerId
-         Case ModifyLayer.LayerType.SHELL_NUMBER
-            nLayerId = m_Part.nShellNumberLayerId
-         Case ModifyLayer.LayerType.AUX_SOLIDS
-            nLayerId = m_Part.nAuxSolidsLayerId
-         Case ModifyLayer.LayerType.OTHERS
-            nLayerId = m_Part.nOthersLayerId
-      End Select
-      ' sposto entita'
-      If EgtRelocateGlob(m_OrigEntity.nId, nLayerId) Then
-         ' elimino info vecchio layer
-         Select Case m_OrigLayer.Type
-            Case ModifyLayer.LayerType.PRINT_SOLID
-               EgtResetMark(m_OrigEntity.nId)
-            Case ModifyLayer.LayerType.MACH_START
-            Case ModifyLayer.LayerType.RIBS
-               EgtRemoveInfo(m_OrigEntity.nId, KEY_RIB_TYPE)
-            Case ModifyLayer.LayerType.SHELL_NUMBER
-               EgtRemoveInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE)
-            Case ModifyLayer.LayerType.AUX_SOLIDS
-               EgtRemoveInfo(m_OrigEntity.nId, KEY_AUXSOLID_TYPE)
-            Case ModifyLayer.LayerType.OTHERS
-         End Select
-         ' sposto in lista
-         m_OrigLayer.EntityList.Remove(m_OrigEntity)
-         Dim NewPart As ModifyPart = Map.refModifyPartPanelVM.ModifyPartList.FirstOrDefault(Function(x) x.PrintPart.nPartId = m_Part.nPartId)
-         If Not IsNothing(NewPart) Then
-            Dim NewLayer As ModifyLayer = NewPart.LayerList.FirstOrDefault(Function(x) x.Type = m_Type)
-            If Not IsNothing(NewLayer) Then
-               NewLayer.EntityList.Add(m_OrigEntity)
-               ' aggiorno riferimenti nell'entita'
-               m_OrigEntity.UpdateOrigLayer(NewLayer)
-            End If
-         End If
-         ' aggiungo info nuovo layer
-         Select Case m_Type
-            Case ModifyLayer.LayerType.PRINT_SOLID
-               EgtSetName(m_OrigEntity.nId, PRINT_SOLID)
-               EgtSetColor(m_OrigEntity.nId, c3Print)
-            Case ModifyLayer.LayerType.MACH_START
-               EgtSetName(m_OrigEntity.nId, LAY_MACH_START)
-               EgtSetColor(m_OrigEntity.nId, c3MachStart)
-            Case ModifyLayer.LayerType.RIBS
-               EgtSetName(m_OrigEntity.nId, LAY_RIBS)
-               EgtSetInfo(m_OrigEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
-               EgtSetColor(m_OrigEntity.nId, c3Rib)
-            Case ModifyLayer.LayerType.SHELL_NUMBER
-               EgtSetName(m_OrigEntity.nId, LAY_SHELL_NBR)
-               EgtSetInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
-               EgtSetColor(m_OrigEntity.nId, c3ShellNumber)
-            Case ModifyLayer.LayerType.AUX_SOLIDS
-               EgtSetName(m_OrigEntity.nId, LAY_AUX_SOLIDS)
-               EgtSetInfo(m_OrigEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
-               EgtSetColor(m_OrigEntity.nId, c3AuxSolids)
-            Case ModifyLayer.LayerType.OTHERS
-               EgtSetName(m_OrigEntity.nId, LAY_OTHERS)
-               EgtSetColor(m_OrigEntity.nId, c3Others)
-         End Select
-         EgtDraw()
-         ' aggiorno riferimenti nel context menu item
-         m_OrigEntity.UpdateContextMenu(m_OrigEntity.OrigLayer)
-      End If
-   End Sub
-
-#End Region ' Command
-
-End Class

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 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2022-2023 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.4.12.3")>
+<Assembly: AssemblyVersion("2.5.2.2")>
-<Assembly: AssemblyFileVersion("2.4.12.3")>
+<Assembly: AssemblyFileVersion("2.5.2.2")>

Icarus/OptionsWindow/OptionWindowVM.vb

@@ -1162,11 +1162,12 @@ Public Class LayerColor
 
    Public Enum LayerType As Integer
       PRINTPART = 1
-      RIBS = 2
+      'REFERENCE = 2
-      SHELLNUMBERS = 3
+      MACHSTART = 3
-      AUXSOLIDS = 4
+      RIBS = 4
-      MACHSTART = 5
+      SHELLNUMBERS = 5
-      OTHERS = 6
+      AUXSOLIDS = 6
+      OTHERS = 7
    End Enum
 
    Private m_Type As LayerType
@@ -1229,6 +1230,8 @@ Public Class LayerColor
                Return "Layer Start"
             Case LayerType.OTHERS
                Return "Others"
+            Case Else
+               Return ""
          End Select
       End Get
    End Property

Icarus/ProjManager/ProjManagerV.xaml

@@ -49,6 +49,12 @@
            Style="{StaticResource ToolBar_Button}">
       <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
    </Button>
+   <Button Command="{Binding ExportCommand}"
+           ToolTip="{Binding ExportToolTip}"
+           IsEnabled="{Binding ProjCmd_IsEnabled}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/ProjectManager/Export.png" Stretch="Uniform"/>
+   </Button>
    <!--<Button Command="{Binding ExportCommand}" ToolTip="{Binding ExportToolTip}"
          IsEnabled="{Binding DrawIsChecked}">
       <Image Source="/Resources/ProjectManager/Export.png" Stretch="Uniform"/>

Icarus/ProjManager/ProjManagerVM.vb

@@ -60,6 +60,7 @@ Public Class ProjManagerVM
    Private m_cmdSave As ICommand
    Private m_cmdSaveAs As ICommand
    Private m_cmdImport As ICommand
+   Private m_cmdExport As ICommand
    Private m_cmdOptions As ICommand
    Private m_cmdSendFeedback As ICommand
 
@@ -319,6 +320,29 @@ Public Class ProjManagerVM
 
 #End Region ' Import
 
+#Region "ExportCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Export.
+   ''' </summary>
+   Public ReadOnly Property ExportCommand As ICommand
+      Get
+         If m_cmdExport Is Nothing Then
+            m_cmdExport = New Command(AddressOf Export)
+         End If
+         Return m_cmdExport
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Export.  This method is invoked by the ExportCommand.
+   ''' </summary>
+   Public Sub Export(ByVal param As Object)
+      Map.refSceneHostVM.ExportProject()
+   End Sub
+
+#End Region ' ExportCommand
+
 #Region "Options"
 
    ''' <summary>

Icarus/ReferencePanel/ReferencePanelVM.vb

@@ -30,6 +30,7 @@ Public Class ReferencePanelVM
       End Get
       Set(value As ReferenceBtn)
          m_SelReference = value.Type
+         EgtSetInfo(Map.refTopPanelVM.SelPart.nReferenceLayerId, KEY_REFERENCE, value.Type)
          UpdateFramePosition()
       End Set
    End Property
@@ -42,6 +43,7 @@ Public Class ReferencePanelVM
          If value Then
             m_SelReference = ReferenceBtn.References.FROM_IMPORT
             NotifyPropertyChanged(NameOf(ghSelReference))
+            EgtSetInfo(Map.refTopPanelVM.SelPart.nReferenceLayerId, KEY_REFERENCE, ReferenceBtn.References.FROM_IMPORT)
             UpdateFramePosition()
          End If
       End Set
@@ -67,54 +69,61 @@ Public Class ReferencePanelVM
       NotifyPropertyChanged(NameOf(ghSelReference))
    End Sub
 
-   Friend Sub UpdateFramePosition()
+   Friend Sub UpdateFramePosition(Optional SelPart As Print3dPartVM = Nothing)
+      Dim SelReference As Integer = ReferenceBtn.References.BL
+      If IsNothing(SelPart) Then
+         SelPart = Map.refTopPanelVM.SelPart
+      End If
+      EgtGetInfo(SelPart.nReferenceLayerId, KEY_REFERENCE, SelReference)
       ' elimino precedente
-      EgtEmptyGroup(Map.refTopPanelVM.SelPart.nReferenceLayerId)
+      EgtEmptyGroup(SelPart.nReferenceLayerId)
       ' Creo riferimento 
       Dim frPrintSolid As New Frame3d()
-      If m_SelReference = ReferenceBtn.References.FROM_IMPORT Then
+      If SelReference = ReferenceBtn.References.FROM_IMPORT Then
-         EgtGetGlobFrame(Map.refTopPanelVM.SelPart.nPrintSolidId, frPrintSolid)
+         EgtGetGlobFrame(SelPart.nPrintSolidId, frPrintSolid)
          frPrintSolid.Setup(New Point3d(frPrintSolid.Orig.x, frPrintSolid.Orig.y, 0))
       Else
-         Dim b3PrintSolid As New BBox3d
+         Dim b3ToBePrintSolid As BBox3d = Map.refDispositionPanelVM.GetSolidForReferenceBBox(SelPart)
-         EgtGetBBoxGlob(Map.refTopPanelVM.SelPart.nPrintSolidId, GDB_BB.STANDARD, b3PrintSolid)
          ' Creo riferimento 
-         Dim ptOrig As New Point3d(b3PrintSolid.Min())
+         Dim ptOrig As New Point3d(b3ToBePrintSolid.Min())
-         Select Case m_SelReference
+         Select Case SelReference
             Case ReferenceBtn.References.TL
-               ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX
+               ptOrig += b3ToBePrintSolid.DimY() * Vector3d.Y_AX
             Case ReferenceBtn.References.TR
-               ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
+               ptOrig += b3ToBePrintSolid.DimY() * Vector3d.Y_AX + b3ToBePrintSolid.DimX() * Vector3d.X_AX
             Case ReferenceBtn.References.BL
             Case ReferenceBtn.References.BR
-               ptOrig += b3PrintSolid.DimX() * Vector3d.X_AX
+               ptOrig += b3ToBePrintSolid.DimX() * Vector3d.X_AX
             Case ReferenceBtn.References.TC
-               ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
+               ptOrig += b3ToBePrintSolid.DimY() * Vector3d.Y_AX + b3ToBePrintSolid.DimX() / 2 * Vector3d.X_AX
             Case ReferenceBtn.References.ML
-               ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX
+               ptOrig += b3ToBePrintSolid.DimY() / 2 * Vector3d.Y_AX
             Case ReferenceBtn.References.MR
-               ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
+               ptOrig += b3ToBePrintSolid.DimY() / 2 * Vector3d.Y_AX + b3ToBePrintSolid.DimX() * Vector3d.X_AX
             Case ReferenceBtn.References.TC
-               ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
+               ptOrig += b3ToBePrintSolid.DimY() * Vector3d.Y_AX + b3ToBePrintSolid.DimX() / 2 * Vector3d.X_AX
             Case ReferenceBtn.References.MR
-               ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
+               ptOrig += b3ToBePrintSolid.DimY() / 2 * Vector3d.Y_AX + b3ToBePrintSolid.DimX() * Vector3d.X_AX
             Case ReferenceBtn.References.BC
-               ptOrig += b3PrintSolid.DimX() / 2 * Vector3d.X_AX
+               ptOrig += b3ToBePrintSolid.DimX() / 2 * Vector3d.X_AX
             Case ReferenceBtn.References.MC
-               ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
+               ptOrig += b3ToBePrintSolid.DimY() / 2 * Vector3d.Y_AX + b3ToBePrintSolid.DimX() / 2 * Vector3d.X_AX
          End Select
          Dim vtMovedPart As Vector3d
-         EgtGetInfo(Map.refTopPanelVM.SelPart.nPartId, "MovedPart", vtMovedPart)
+         If EgtGetInfo(SelPart.nPartId, KEY_MOVEDPART, vtMovedPart) Then
-         ptOrig = ptOrig - vtMovedPart
+            ptOrig = ptOrig - vtMovedPart
+         ElseIf EgtGetInfo(SelPart.nPartId, KEY_MOVEDPART2, vtMovedPart) Then
+            ptOrig = ptOrig - vtMovedPart
+         End If
          frPrintSolid = New Frame3d(ptOrig)
       End If
-      Dim nFrameId As Integer = EgtCreateGeoFrame(Map.refTopPanelVM.SelPart.nReferenceLayerId, frPrintSolid, GDB_RT.GLOB)
+      Dim nFrameId As Integer = EgtCreateGeoFrame(SelPart.nReferenceLayerId, frPrintSolid, GDB_RT.GLOB)
       If nFrameId Then
          EgtSetName(nFrameId, FRAME_PART)
          EgtSetMode(nFrameId, GDB_MD.LOCKED)
-         Map.refTopPanelVM.SelPart.UpdateReferenceId(nFrameId)
+         SelPart.UpdateReferenceId(nFrameId)
       End If
-      EgtSetInfo(Map.refTopPanelVM.SelPart.nReferenceLayerId, KEY_REFERENCE, m_SelReference)
+      Map.refDispositionPanelVM.RefreshPos()
       EgtDraw()
    End Sub
 

Icarus/RibPanel/RibPanelVM.vb

@@ -1,8 +1,10 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.Globalization
+Imports System.Windows.Markup
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports Icarus.RibEntity
 
 Public Class RibPanelVM
    Inherits VMBase
@@ -73,7 +75,16 @@ Public Class RibPanelVM
          EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewXPos As Double = b3Reference.Min.x
          StringToLen(value, dNewXPos)
-         If dNewXPos >= 0 AndAlso dNewXPos <= CurrentMachine.b3Tab.DimX Then
+         Dim dMin As Double = 0
+         Dim dMax As Double = CurrentMachine.b3Tab.DimX
+         Dim nRibType As Integer = Machining.MPAR_RIBSTYPE.INTERNAL
+         EgtGetInfo(m_SelRib.nExtrusionId, MAC_RIBSTYPE, nRibType)
+         If nRibType = Machining.MPAR_RIBSTYPE.EXTERNAL OrElse nRibType = Machining.MPAR_RIBSTYPE.UNBOUNDED Then
+            dMax -= b3Reference.DimX
+         Else
+            dMin -= b3Reference.DimX
+         End If
+         If dNewXPos >= dMin AndAlso dNewXPos <= dMax Then
             EgtMove(m_SelRib.nCurveId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
             EgtMove(m_SelRib.nExtrusionId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
             EgtDraw()
@@ -102,7 +113,16 @@ Public Class RibPanelVM
          EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewYPos As Double = b3Reference.Min.y
          StringToLen(value, dNewYPos)
-         If dNewYPos >= 0 AndAlso dNewYPos <= CurrentMachine.b3Tab.DimY Then
+         Dim dMin As Double = 0
+         Dim dMax As Double = CurrentMachine.b3Tab.DimY
+         Dim nRibType As Integer = Machining.MPAR_RIBSTYPE.INTERNAL
+         EgtGetInfo(m_SelRib.nExtrusionId, MAC_RIBSTYPE, nRibType)
+         If nRibType = Machining.MPAR_RIBSTYPE.EXTERNAL OrElse nRibType = Machining.MPAR_RIBSTYPE.UNBOUNDED Then
+            dMax -= b3Reference.DimY
+         Else
+            dMin -= b3Reference.DimY
+         End If
+         If dNewYPos >= dMin AndAlso dNewYPos <= dMax Then
             EgtMove(m_SelRib.nCurveId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
             EgtMove(m_SelRib.nExtrusionId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
             EgtDraw()
@@ -131,7 +151,7 @@ Public Class RibPanelVM
          EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewZPos As Double = b3Reference.Min.y
          StringToLen(value, dNewZPos)
-         If dNewZPos >= 0 Then
+         If dNewZPos >= -1000 Then
             EgtMove(m_SelRib.nCurveId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min, GDB_RT.GLOB)
             EgtMove(m_SelRib.nExtrusionId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min, GDB_RT.GLOB)
             EgtDraw()
@@ -484,6 +504,7 @@ Public Class RibPanelVM
          Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
          Map.refRibPanelVM.ResetMachParamIsChecked()
       End If
+      EgtDeselectAll()
       EgtDraw()
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub
@@ -675,6 +696,20 @@ Public Class RibPanelVM
       NotifyPropertyChanged(NameOf(SelRib))
    End Sub
 
+   Friend Shared Function GetNextRibIndex()
+      Dim nRibIndex As Integer = 0
+      Dim nRibId As Integer = EgtGetFirstInGroup(Map.refTopPanelVM.SelPart.nRibsLayerId)
+      While nRibId <> GDB_ID.NULL
+         Dim nCurrIndex As Integer = GDB_ID.NULL
+         EgtGetInfo(nRibId, RIB_ID, nCurrIndex)
+         If nCurrIndex > nRibIndex Then
+            nRibIndex = nCurrIndex
+         End If
+         nRibId = EgtGetNext(nRibId)
+      End While
+      Return nRibIndex + 1
+   End Function
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -1200,7 +1235,7 @@ Public Class RibPanelVM
       End While
       EgtDeselectAll()
       m_bCPlaneObj_IsActive = True
-    '  Map.refControllerInputPanelVM.PrepareInputBox("Grid from Selection", "Select the face of the object where to place the grid", "", False, False)
+      '  Map.refControllerInputPanelVM.PrepareInputBox("Grid from Selection", "Select the face of the object where to place the grid", "", False, False)
    End Sub
 
 #End Region ' CPlaneObj
@@ -1331,7 +1366,10 @@ Public Class RibEntity
    End Property
 
    Sub New(Type As RibTypes, nId As Integer)
-      m_nIndex = nSharedIndex
+      If Not EgtGetInfo(nId, RIB_ID, m_nIndex) Then
+         m_nIndex = RibPanelVM.GetNextRibIndex()
+         EgtSetInfo(nId, RIB_ID, m_nIndex)
+      End If
       m_Type = Type
       EgtSetInfo(nId, KEY_RIB_TYPE, Type)
       Select Case Type

Icarus/RibParamPanel/CopyFromWndV.xaml

@@ -0,0 +1,35 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="CopyFromWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
+                            WindowStyle="None" ResizeMode="NoResize" IsClosable="False"
+                            WindowStartupLocation="CenterOwner"
+                            SizeToContent="WidthAndHeight">
+   <Grid Margin="5">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <TextBlock Text="Select Rib to Copy"
+               HorizontalAlignment="Center"
+               Margin="0,0,0,2.5"/>
+      <ComboBox Grid.Row="1"
+                ItemsSource="{Binding RibList}"
+                SelectedItem="{Binding SelRib}"
+                DisplayMemberPath="ghName"
+                Margin="0,2.5,0,2.5"/>
+      <UniformGrid Grid.Row="2"
+                   Rows="1"
+                   Margin="0,2.5,0,0">
+         <Button Content="Ok"
+                    Command="{Binding Ok_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
+         <Button Content="Cancel"
+                    Command="{Binding Cancel_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
+      </UniformGrid>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

Icarus/RibParamPanel/CopyFromWndV.xaml.vb

@@ -0,0 +1,18 @@
+Public Class CopyFromWndV
+
+   Private WithEvents m_CopyFromWndVM As CopyFromWndVM
+
+   Sub New(Owner As Window, CopyFromWndVM As CopyFromWndVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = CopyFromWndVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_CopyFromWndVM = CopyFromWndVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_CopyFromWndVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class

Icarus/RibParamPanel/CopyFromWndVM.vb

@@ -0,0 +1,182 @@
+Imports System.Collections.ObjectModel
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class CopyFromWndVM
+   Inherits VMBase
+
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
+
+   Private m_RibList As ObservableCollection(Of RibEntity)
+   Public ReadOnly Property RibList As ObservableCollection(Of RibEntity)
+      Get
+         Return m_RibList
+      End Get
+   End Property
+
+   Private m_SelRib As RibEntity
+   Public Property SelRib As RibEntity
+      Get
+         Return m_SelRib
+      End Get
+      Set(value As RibEntity)
+         m_SelRib = value
+      End Set
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+
+   Sub New()
+      m_RibList = New ObservableCollection(Of RibEntity)(Map.refRibPanelVM.RibList)
+      m_RibList.Remove(m_RibList.FirstOrDefault(Function(x) x.nExtrusionId = Map.refRibPanelVM.SelRib.nExtrusionId))
+      If m_RibList.Count > 0 Then
+         m_SelRib = m_RibList(0)
+      End If
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "Ok"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      If IsNothing(m_SelRib) Then
+         MessageBox.Show("Please select the rib from which to copy the parameters!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         Return
+      End If
+      ' copio i parametri nella rib corrente
+      Dim ParamList As New List(Of MachiningParam.Params)({MachiningParam.Params.RIBSTYPE,
+                                                           MachiningParam.Params.RIBSOVERLAP,
+                                                           MachiningParam.Params.RIBSSTRANDCOUNT,
+                                                           MachiningParam.Params.RIBSLINK,
+                                                           MachiningParam.Params.RIBSINVERTDIRECTION,
+                                                           MachiningParam.Params.RIBSINVERTSTRANDORDER,
+                                                           MachiningParam.Params.RIBSLEADININVERT,
+                                                           MachiningParam.Params.RIBSLEADINLEN,
+                                                           MachiningParam.Params.RIBSLEADOUTINVERT,
+                                                           MachiningParam.Params.RIBSLEADOUTLEN,
+                                                           MachiningParam.Params.RIBSLEADOUTCOASTING,
+                                                           MachiningParam.Params.RIBSLEADOUTWIPE,
+                                                           MachiningParam.Params.RIBSLEADOUTWIPEDIR})
+      For Each Param In ParamList
+         Select Case Map.refRibPanelVM.SelRib.Type
+            'Case RibEntity.RibTypes.FROMDRAW
+            '   CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nCurveId)
+            '   CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nExtrusionId)
+            Case RibEntity.RibTypes.FROMIMPORT
+               CopyParam(Param, m_SelRib.nExtrusionId, Map.refRibPanelVM.SelRib.nExtrusionId)
+         End Select
+      Next
+      '' ricarico i parametri
+      'Map.refRibParamPanelVM.Init()
+      RaiseEvent m_CloseWindow(True)
+   End Sub
+
+   Private Sub CopyParam(Type As MachiningParam.Params, nFromId As Integer, nToId As Integer)
+      Dim bRead As Boolean = False
+      Select Case Type
+         Case MachiningParam.Params.RIBSTYPE
+            Dim RibTypeParam As RibComboMachiningParam = Nothing
+            Dim nRibParam As Integer = 0
+            Select Case Type
+               Case MachiningParam.Params.RIBSTYPE
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSTYPE)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSTYPE, nRibParam)
+            End Select
+            If Not IsNothing(RibTypeParam) AndAlso bRead Then
+               RibTypeParam.SelValue = RibTypeParam.ValueList.FirstOrDefault(Function(x) x.Id = nRibParam)
+            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
+            Dim RibTypeParam As RibNumericMachiningParam = Nothing
+            Dim dRibParam As Double = 0
+            Select Case Type
+               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.RIBSSTRANDCOUNT
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSSTRANDCOUNT)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSSTRANDCOUNT, dRibParam)
+               Case MachiningParam.Params.RIBSLEADINLEN
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADINLEN)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLEADINLEN, dRibParam)
+               Case MachiningParam.Params.RIBSLEADOUTLEN
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADOUTLEN)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLEADOUTLEN, dRibParam)
+               Case MachiningParam.Params.RIBSLEADOUTCOASTING
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADOUTCOASTING)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLEADOUTCOASTING, dRibParam)
+               Case MachiningParam.Params.RIBSLEADOUTWIPE
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADOUTWIPE)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLEADOUTWIPE, dRibParam)
+               Case MachiningParam.Params.RIBSLEADOUTWIPEDIR
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADOUTWIPEDIR)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLEADOUTWIPEDIR, 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
+            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.RIBSINVERTDIRECTION
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSINVERTDIRECTION)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSINVERTDIRECTION, bRibParam)
+               Case MachiningParam.Params.RIBSINVERTSTRANDORDER
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSINVERTSTRANDORDER)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSINVERTSTRANDORDER, bRibParam)
+               Case MachiningParam.Params.RIBSLEADININVERT
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADININVERT)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLEADININVERT, bRibParam)
+               Case MachiningParam.Params.RIBSLEADOUTINVERT
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADOUTINVERT)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSLEADOUTINVERT, bRibParam)
+            End Select
+            If Not IsNothing(RibTypeParam) AndAlso bRead Then
+               RibTypeParam.bValue = bRibParam
+            Else
+               RibTypeParam.bValue = RibTypeParam.bPartValue
+            End If
+      End Select
+   End Sub
+
+#End Region    ' Ok
+
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      RaiseEvent m_CloseWindow(False)
+   End Sub
+
+#End Region    ' Cancel
+
+#End Region    ' COMMANDS
+
+End Class

Icarus/RibParamPanel/RibParamPanelV.xaml

@@ -120,6 +120,9 @@
             <Button Content="Cancel"
                     Command="{Binding Cancel_Command}"
                     Style="{StaticResource ToolBar_TextButton}"/>
+            <Button Content="Copy From"
+                    Command="{Binding CopyFrom_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
          </UniformGrid>
       </Grid>
    </Border>

Icarus/RibParamPanel/RibParamPanelVM.vb

@@ -10,6 +10,7 @@ Public Class RibParamPanelVM
    ' Definizione comandi
    Private m_cmdOk As ICommand
    Private m_cmdCancel As ICommand
+   Private m_cmdCopyFrom As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -46,6 +47,7 @@ Public Class RibParamPanelVM
                                                           New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId),
                                                           New RibCheckMachiningParam(MachiningParam.Params.RIBSLINK, nRibId, nPartId),
                                                           New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nRibId, nPartId),
                                                           New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId),
                                                           New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nRibId, nPartId),
                                                           New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nRibId, nPartId),
@@ -111,6 +113,12 @@ Public Class RibParamPanelVM
 
    Public Sub Ok()
       If Not IsNothing(Map.refRibPanelVM.SelRib) Then
+         ' verifico se modificata tipologia Ribs
+         Dim bIsModifiedRibsType As Boolean = False
+         Dim RibsTypeParam As MachiningParam = MachiningParamList.FirstOrDefault(Function(y) y.Type = MachiningParam.Params.RIBSTYPE)
+         If Not IsNothing(RibsTypeParam) Then
+            bIsModifiedRibsType = RibsTypeParam.bIsModified
+         End If
          ' scrivo i parametri modificati
          Select Case Map.refRibPanelVM.SelRib.Type
             Case RibEntity.RibTypes.FROMDRAW
@@ -119,6 +127,12 @@ Public Class RibParamPanelVM
             Case RibEntity.RibTypes.FROMIMPORT
                WriteParamsInRib(Map.refRibPanelVM.SelRib.nExtrusionId)
          End Select
+         SaveCurrParams()
+         ' se modificata tipologia Ribs, aggiorno posizione riferimento e pezzo
+         If bIsModifiedRibsType Then
+            Map.refReferencePanelVM.UpdateFramePosition()
+            Map.refDispositionPanelVM.UpdateZPos()
+         End If
       End If
       ' ripristino modalita' standard
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
@@ -146,6 +160,26 @@ Public Class RibParamPanelVM
 
 #End Region    ' Cancel
 
+#Region "CopyFrom"
+
+   Public ReadOnly Property CopyFrom_Command As ICommand
+      Get
+         If m_cmdCopyFrom Is Nothing Then
+            m_cmdCopyFrom = New Command(AddressOf CopyFrom)
+         End If
+         Return m_cmdCopyFrom
+      End Get
+   End Property
+
+   Public Sub CopyFrom()
+      Dim CopyFromWndVM As New CopyFromWndVM
+      Dim CopyFromWndV As New CopyFromWndV(Application.Current.MainWindow, CopyFromWndVM)
+      CopyFromWndV.ShowDialog()
+      Dim x = CopyFromWndVM.SelRib
+   End Sub
+
+#End Region    ' CopyFrom
+
 #End Region    ' COMMANDS
 
 End Class
@@ -167,6 +201,11 @@ Public Class RibNumericMachiningParam
          NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
       End Set
    End Property
+   Friend Sub SetValue(value As Double)
+      m_dValue = value
+      NotifyPropertyChanged(NameOf(sValue))
+      NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
+   End Sub
 
    Private m_dPartValue As Double
    Public ReadOnly Property dPartValue As Double
@@ -200,6 +239,10 @@ Public Class RibNumericMachiningParam
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTDIRECTION, m_dValue)
             EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_dPartValue)
             m_bIsLen = True
+         Case Params.RIBSINVERTSTRANDORDER
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTSTRANDORDER, m_dValue)
+            EgtGetInfo(nPartId, MAC_RIBSINVERTSTRANDORDER, m_dPartValue)
+            m_bIsLen = True
          Case Params.RIBSLEADININVERT
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADININVERT, m_dValue)
             EgtGetInfo(nPartId, MAC_RIBSLEADININVERT, m_dPartValue)
@@ -262,6 +305,12 @@ Public Class RibNumericMachiningParam
             Else
                EgtRemoveInfo(nRibId, MAC_RIBSINVERTDIRECTION)
             End If
+         Case Params.RIBSINVERTSTRANDORDER
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSINVERTSTRANDORDER, sWriteValue)
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSINVERTSTRANDORDER)
+            End If
          Case Params.RIBSLEADININVERT
             If bIsModifiedFromPart Then
                EgtSetInfo(nRibId, MAC_RIBSLEADININVERT, sWriteValue)
@@ -378,7 +427,8 @@ Public Class RibComboMachiningParam
          Case Params.RIBSTYPE
             m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_RIBSTYPE.INTERNAL, "Internal"),
                                                      New IdNameStruct(Machining.MPAR_RIBSTYPE.EXTERNAL, "External"),
-                                                     New IdNameStruct(Machining.MPAR_RIBSTYPE.UNBOUNDED, "Unbounded")})
+                                                     New IdNameStruct(Machining.MPAR_RIBSTYPE.UNBOUNDED, "Unbounded"),
+                                                     New IdNameStruct(Machining.MPAR_RIBSTYPE.SUPPORT, "Support")})
             Dim nSelValue As Integer = 1
             bReadFromRib = EgtGetInfo(nRibId, MAC_RIBSTYPE, nSelValue)
             If bReadFromRib Then
@@ -484,6 +534,9 @@ Public Class RibCheckMachiningParam
          Case Params.RIBSINVERTDIRECTION
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTDIRECTION, m_bValue)
             EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_bPartValue)
+         Case Params.RIBSINVERTSTRANDORDER
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTSTRANDORDER, m_bValue)
+            EgtGetInfo(nPartId, MAC_RIBSINVERTSTRANDORDER, m_bPartValue)
          Case Params.RIBSLEADININVERT
             bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADININVERT, m_bValue)
             EgtGetInfo(nPartId, MAC_RIBSLEADININVERT, m_bPartValue)
@@ -512,6 +565,12 @@ Public Class RibCheckMachiningParam
             Else
                EgtRemoveInfo(nRibId, MAC_RIBSINVERTDIRECTION)
             End If
+         Case Params.RIBSINVERTSTRANDORDER
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSINVERTSTRANDORDER, If(m_bValue, 1, 0))
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSINVERTSTRANDORDER)
+            End If
          Case Params.RIBSLEADININVERT
             If bIsModifiedFromPart Then
                EgtSetInfo(nRibId, MAC_RIBSLEADININVERT, If(m_bValue, 1, 0))

Icarus/SceneHost/MySceneHostVM.vb

@@ -69,7 +69,7 @@ Public Class MySceneHostVM
       ' Inizializzazione Scena
       PreInitializeScene()
       ' Se tutto bene
-      If MainScene.Init() And Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT._3DPRINT) Then
+      If MainScene.Init() And Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.BASE) Then
          PostInitializeScene()
          ' Imposto stato gestione mouse diretto della scena a nessuno
          MainScene.SetStatusNull()
@@ -384,10 +384,8 @@ Public Class MySceneHostVM
                      nNewRib = EgtCopy(nNewEntityId, Map.refRibPanelVM.nRibLayerId, GDB_POS.LAST_SON)
                   End If
                   EgtSetName(nNewRib, RIB_CURVE)
-                  ' coloro l'entita' di blu
+                  ' elimino colore entita'
-                  Dim c3LightBlue As Color3d
+                  EgtResetColor(nNewEntityId)
-                  c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
-                  EgtSetColor(nNewRib, c3LightBlue)
                   ' lo aggiungo alla lista
                   Dim NewEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMIMPORT, nNewRib)
                   Map.refRibPanelVM.RibList.Add(NewEntity)
@@ -396,10 +394,8 @@ Public Class MySceneHostVM
                   ' lo copio nel layer dei rib
                   nNewRib = EgtCopy(nNewEntityId, Map.refRibPanelVM.nRibLayerId, GDB_POS.LAST_SON)
                   EgtSetName(nNewRib, RIB_EXTRUSION)
-                  ' coloro l'entita' di blu
+                  ' elimino colore entita'
-                  Dim c3LightBlue As Color3d
+                  EgtResetColor(nNewEntityId)
-                  c3LightBlue.FromColor(System.Drawing.Color.MediumOrchid)
-                  EgtSetColor(nNewRib, c3LightBlue)
                   ' lo aggiungo alla lista
                   Dim NewEntity As RibEntity = New RibEntity(RibEntity.RibTypes.FROMIMPORT, nNewRib)
                   Map.refRibPanelVM.RibList.Add(NewEntity)
@@ -415,6 +411,61 @@ Public Class MySceneHostVM
       End If
    End Sub
 
+   Public Sub InsertPrint(MenuItem As ManagerLayer_MenuItem)
+      ' Recupero cartella dell'ultimo progetto aperto
+      Dim sDir As String = MainController.GetCurrFile()
+      If String.IsNullOrWhiteSpace(sDir) Then
+         GetMainPrivateProfileString(S_MRUIMPORTFILES, K_FILE & 1, "", sDir)
+      End If
+      If Not String.IsNullOrWhiteSpace(sDir) Then
+         sDir = Path.GetDirectoryName(sDir)
+      End If
+      If Not Directory.Exists(sDir) Then sDir = ""
+      Dim OpenFileDialog As New OpenFileDialog With {.Title = "Insert",
+                                                     .Filter = "Stereolithography (*.stl)|*.stl" &
+                                                               "|Iges files (*.igs;*.iges)|*.igs;*.iges" &
+                                                               "|Step files (*.stp;*.step)|*.stp;*.step" &
+                                                               "|3D Manufacturing format (*.3mf)|*.3mf" &
+                                                               "|New geometry EgalTech(*.nge)|*.nge" &
+                                                               "|All Files (*.*)|*.*",
+                                                     .FilterIndex = 1,
+                                                     .InitialDirectory = sDir}
+      If Not OpenFileDialog.ShowDialog Then
+         Return
+      End If
+      Dim sFile As String = String.Empty
+      sFile = OpenFileDialog.FileName
+      ' importo la nuova geometria
+      If MainController.InsertProject(sFile, False) Then
+         ' sposto le nuove geometrie nel layer rib del pezzo
+         Dim nNewPartId As Integer = EgtGetLastPart()
+         Dim nNewLayerId As Integer = EgtGetFirstGroupInGroup(nNewPartId)
+         ' verifico che ci sia una sola entita'
+         If EgtGetGroupObjs(nNewLayerId) <> 1 Then
+            MessageBox.Show("Impossible importing file that contains more than one entity.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            ' elimino eventuale entita' vecchia
+            If MenuItem.OrigLayer.EntityList.Count > 0 AndAlso MenuItem.OrigLayer.EntityList(0).nId <> GDB_ID.NULL Then EgtErase(MenuItem.OrigLayer.EntityList(0).nId)
+            Dim nNewEntityId As Integer = EgtGetFirstInGroup(nNewLayerId)
+            EgtRelocate(nNewEntityId, MenuItem.OrigLayer.nLayerId, GDB_POS.LAST_SON)
+            ' elimino colore entita'
+            EgtResetColor(nNewEntityId)
+            ' aggiorno riferimento pezzo
+            Map.refReferencePanelVM.UpdateFramePosition()
+            Map.refDispositionPanelVM.UpdateZPos()
+            ' elimino eventuale flag di spostamento a 45 gradi
+            EgtRemoveInfo(MenuItem.OrigLayer.OrigPart.PrintPart.nPartId, KEY_MOVEDPART)
+            ' elimino vecchio elemento ed aggiungo nuovo
+            MenuItem.OrigLayer.EntityList.Clear()
+            MenuItem.OrigLayer.EntityList.Add(New PartManager_GeomEntity(MenuItem.OrigLayer, nNewEntityId))
+            ' Imposto flag di ricalcolo slice
+            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+         End If
+         EgtErase(nNewPartId)
+         EgtDraw()
+      End If
+   End Sub
+
    Public Sub InsertShellNumber()
       ' Recupero cartella dell'ultimo progetto aperto
       Dim sDir As String = MainController.GetCurrFile()
@@ -457,10 +508,8 @@ Public Class MySceneHostVM
                      nNewShellNumberId = EgtCopy(nNewEntityId, Map.refShellNumberPanelVM.nShellNumberLayerId, GDB_POS.LAST_SON)
                   End If
                   EgtSetName(nNewShellNumberId, RIB_CURVE)
-                  ' coloro l'entita' di verde
+                  ' elimino colore entita'
-                  Dim c3LightBlue As Color3d
+                  EgtResetColor(nNewEntityId)
-                  c3LightBlue.FromColor(System.Drawing.Color.Lime)
-                  EgtSetColor(nNewShellNumberId, c3LightBlue)
                   ' lo aggiungo alla lista
                   Dim NewEntity As ShellNumberEntity = New ShellNumberEntity(ShellNumberEntity.ShellNumberTypes.FROMIMPORT, nNewShellNumberId)
                   Map.refShellNumberPanelVM.ShellNumberList.Add(NewEntity)
@@ -469,10 +518,8 @@ Public Class MySceneHostVM
                   ' lo copio nel layer dei rib
                   nNewShellNumberId = EgtCopy(nNewEntityId, Map.refShellNumberPanelVM.nShellNumberLayerId, GDB_POS.LAST_SON)
                   EgtSetName(nNewShellNumberId, RIB_EXTRUSION)
-                  ' coloro l'entita' di verde
+                  ' elimino colore entita'
-                  Dim c3LightBlue As Color3d
+                  EgtResetColor(nNewEntityId)
-                  c3LightBlue.FromColor(System.Drawing.Color.Lime)
-                  EgtSetColor(nNewShellNumberId, c3LightBlue)
                   ' lo aggiungo alla lista
                   Dim NewEntity As ShellNumberEntity = New ShellNumberEntity(ShellNumberEntity.ShellNumberTypes.FROMIMPORT, nNewShellNumberId)
                   Map.refShellNumberPanelVM.ShellNumberList.Add(NewEntity)
@@ -500,6 +547,23 @@ Public Class MySceneHostVM
       MainScene.SetStatusNull()
    End Sub
 
+   Public Overrides Sub ExportProject()
+      ' Reset controller e scena
+      MainController.ResetStatus()
+      'Assegnazione nome file con dialogo
+      Dim SaveFileDialog As New SaveFileDialog With {
+         .Title = "Export",
+         .Filter = "3D Manufacturing format (*.3mf)|*.3mf" &
+                   "|Stereolithography (*.stl)|*.stl",
+         .FilterIndex = 1,
+         .FileName = Path.ChangeExtension(MainController.GetCurrFile(), "").TrimEnd("."c)
+      }
+      Dim DialogResult As Boolean? = SaveFileDialog.ShowDialog
+      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+      MainController.SetDefaultFilterForExport(EEX_FLT.DEFAULT + EEX_FLT.LEV_TEMP)
+      MainController.ExportProject(SaveFileDialog.FileName, False)
+   End Sub
+
    Friend Shadows Sub ExecScript(sFilePath As String)
       If String.IsNullOrEmpty(sFilePath) Then
          Dim sDir As String = String.Empty
@@ -881,7 +945,7 @@ Public Class MySceneHostVM
       Dim nTabPartId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, TABLE)
       If nTabPartId <> GDB_ID.NULL Then
          Dim sMachineName As String = ""
-         if Not EgtGetInfo(nTabPartId, KEY_MACHINE_NAME, sMachineName) Then sMachineName = "Cms-Kreator" 
+         If Not EgtGetInfo(nTabPartId, KEY_MACHINE_NAME, sMachineName) Then sMachineName = "Cms-Kreator"
          Dim ProjectMachine As Machine = Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = sMachineName)
          If Not IsNothing(ProjectMachine) Then
             ' imposto la macchina
@@ -907,6 +971,11 @@ Public Class MySceneHostVM
          If Not IsNothing(ProjectMaterial) Then
             Map.refTopPanelVM.SetSelMaterial(ProjectMaterial, True)
             Map.refTopPanelVM.NotifyPropertyChanged(NameOf(Map.refTopPanelVM.SelMaterial))
+         Else
+            Dim sMaterialName As String = ""
+            EgtGetInfo(nTabPartId, KEY_MATERIAL_NAME, sMaterialName)
+            MessageBox.Show("Project material (Guid:" & sMaterialGuid & " Name:""" & sMaterialName & """) not found!" & Environment.NewLine &
+                            "Please select another material!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
          End If
       End If
       ' leggo pezzi
@@ -1247,7 +1316,7 @@ Public Class MySceneHostVM
       While nId <> GDB_ID.NULL
          ' Se per Griglia da faccia di oggetto
          If Map.refStartMachPanelVM.bCPlaneObj_IsActive Then
-            If EgtGetType( nId) = GDB_TY.SRF_MESH Then
+            If EgtGetType(nId) = GDB_TY.SRF_MESH Then
                m_nIdToSel = nId
                Exit While
             End If
@@ -1293,7 +1362,7 @@ Public Class MySceneHostVM
       ' Se eseguito drag
       If Not m_bDragToStart Then
 
-      ' Se selezione da eseguire
+         ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          If Map.refStartMachPanelVM.bCPlaneObj_IsActive Then
             ' eseguo comando
@@ -1329,7 +1398,7 @@ Public Class MySceneHostVM
       While nId <> GDB_ID.NULL
          ' Se per Griglia da faccia di oggetto
          If Map.refRibPanelVM.bCPlaneObj_IsActive Then
-            If EgtGetType( nId) = GDB_TY.SRF_MESH Then
+            If EgtGetType(nId) = GDB_TY.SRF_MESH Then
                m_nIdToSel = nId
                Exit While
             End If
@@ -1374,7 +1443,7 @@ Public Class MySceneHostVM
       ' Se eseguito drag
       If Not m_bDragToStart Then
 
-      ' Se selezione da eseguire
+         ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          If Map.refRibPanelVM.bCPlaneObj_IsActive Then
             ' eseguo comando
@@ -1411,7 +1480,7 @@ Public Class MySceneHostVM
       While nId <> GDB_ID.NULL
          ' Se per Griglia da faccia di oggetto
          If Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
-            If EgtGetType( nId) = GDB_TY.SRF_MESH Then
+            If EgtGetType(nId) = GDB_TY.SRF_MESH Then
                m_nIdToSel = nId
                Exit While
             End If
@@ -1456,7 +1525,7 @@ Public Class MySceneHostVM
       ' Se eseguito drag
       If Not m_bDragToStart Then
 
-      ' Se selezione da eseguire
+         ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          If Map.refShellNumberPanelVM.bCPlaneObj_IsActive Then
             ' eseguo comando

Icarus/ShellNumberPanel/ShellNumberPanelVM.vb

@@ -73,7 +73,7 @@ Public Class ShellNumberPanelVM
          EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewXPos As Double = b3Reference.Min.x
          StringToLen(value, dNewXPos)
-         If dNewXPos >= 0 AndAlso dNewXPos <= CurrentMachine.b3Tab.DimX Then
+         If dNewXPos >= -b3Reference.DimX AndAlso dNewXPos <= CurrentMachine.b3Tab.DimX - b3Reference.DimX Then
             EgtMove(m_SelShellNumber.nCurveId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
             EgtMove(m_SelShellNumber.nExtrusionId, New Point3d(dNewXPos, b3Reference.Min.y, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
             EgtDraw()
@@ -102,7 +102,7 @@ Public Class ShellNumberPanelVM
          EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewYPos As Double = b3Reference.Min.y
          StringToLen(value, dNewYPos)
-         If dNewYPos >= 0 AndAlso dNewYPos <= CurrentMachine.b3Tab.DimY Then
+         If dNewYPos >= -b3Reference.DimY AndAlso dNewYPos <= CurrentMachine.b3Tab.DimY - b3Reference.DimY Then
             EgtMove(m_SelShellNumber.nCurveId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
             EgtMove(m_SelShellNumber.nExtrusionId, New Point3d(b3Reference.Min.x, dNewYPos, b3Reference.Min.z) - b3Reference.Min, GDB_RT.GLOB)
             EgtDraw()
@@ -131,7 +131,7 @@ Public Class ShellNumberPanelVM
          EgtGetBBoxGlob(nId, GDB_BB.STANDARD, b3Reference)
          Dim dNewZPos As Double = b3Reference.Min.y
          StringToLen(value, dNewZPos)
-         If dNewZPos >= 0 Then
+         If dNewZPos >= -1000 Then
             EgtMove(m_SelShellNumber.nCurveId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min, GDB_RT.GLOB)
             EgtMove(m_SelShellNumber.nExtrusionId, New Point3d(b3Reference.Min.x, b3Reference.Min.y, dNewZPos) - b3Reference.Min, GDB_RT.GLOB)
             EgtDraw()
@@ -484,6 +484,7 @@ Public Class ShellNumberPanelVM
          Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
          Map.refShellNumberPanelVM.ResetMachParamIsChecked()
       End If
+      EgtDeselectAll()
       EgtDraw()
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub

Icarus/SimulationPanel/SimulationPanelVM.vb

@@ -154,6 +154,14 @@ Public Class SimulationPanelVM
       Map.refViewLayerManagerVM.SetViewLayerManagerVisibility(False)
       ' disattivo comandi progetto
       Map.refProjManagerVM.SetProjCmdIsEnabled(False)
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(False)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(False)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(False)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(False)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
    End Sub
 
    Private Function LoadCurrTools() As Boolean
@@ -198,8 +206,14 @@ Public Class SimulationPanelVM
       Map.refViewLayerManagerVM.SetViewLayerManagerVisibility(True)
       ' disattivo comandi progetto
       Map.refProjManagerVM.SetProjCmdIsEnabled(True)
-      '' Riabilito Machine Panel (utensili, lavoraz...)
+      ' riabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
-      'OmagOFFICEMap.refMachinePanelVM.MachPanel_IsEnabled = True
+      Map.refProjManagerVM.SetProjCmdIsEnabled(True)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(True)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(True)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
    End Sub
 
 #End Region    ' METHODS

Icarus/SliceManager/SliceManagerVM.vb

@@ -376,7 +376,8 @@ Public Class SliceManagerVM
          ' verifico esistenza e correttezza machgroup
          InitMachGroup(True)
          ' eseguo generazione CN
-         bOk = ExecGenerate()
+         Dim sMsg As String = ""
+         bOk = ExecGenerate(sMsg)
          ' leggo stima tempo e la riporto in layer di calcolo
          EgtGetInfo(EgtGetFirstMachGroup(), "Ttot", m_dTime)
          NotifyPropertyChanged(NameOf(ghTime))
@@ -391,7 +392,13 @@ Public Class SliceManagerVM
                nCurrPartId = EgtGetNextPart(nCurrPartId)
             End While
          Else
-            MessageBox.Show("Error in NC code generation! See log file.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            Dim sOut As String = "Error in NC code generation : "
+            If String.IsNullOrWhiteSpace(sMsg) Then
+               sOut &= "See log file."
+            Else
+               sOut &= sMsg
+            End If
+            MessageBox.Show(sOut, "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          End If
       End If
       ' Aggiorno intestazione programma
@@ -587,7 +594,7 @@ Public Class SliceManagerVM
       If String.IsNullOrWhiteSpace(sExtension) Then
          sExtension = ".cnc"
       End If
-      If bShiftPressed Then
+      If bCtrlPressed Then
          Dim sCurrFilePath As String = ""
          Dim sInitialDirectory As String = ""
          EgtGetCurrFilePath(sCurrFilePath)
@@ -625,7 +632,7 @@ Public Class SliceManagerVM
       End If
       ' eseguo calcoli
       CalcSlice(True, True)
-      If bCtrlPressed Then
+      If bShiftPressed Then
          ' Se esiste ne lancio l'editing
          If File.Exists(sIsoFilePath) Then
             Process.Start("Notepad.exe", sIsoFilePath)

Icarus/SplashScreen/SplashScreen.xaml

@@ -30,7 +30,7 @@
                 Height="180"
                 Width="92"
                 Stretch="UniformToFill"/>
-         <TextBlock Text="2022"
+         <TextBlock Text="2022-2023"
                     FontSize="12"
                     FontFamily="/Resources/Fonts/#Roboto"
                     HorizontalAlignment="Center"

Icarus/StartMachPanel/StartMachPanelVM.vb

@@ -117,7 +117,7 @@ Public Class StartMachPanelVM
          EgtStartPoint(m_SelStart.nId, GDB_ID.ROOT, ptReference)
          Dim dNewZPos As Double = ptReference.z
          StringToLen(value, dNewZPos)
-         If dNewZPos >= 0 Then
+         If dNewZPos >= -1000 Then
             EgtMove(m_SelStart.nId, New Point3d(ptReference.x, ptReference.y, dNewZPos) - ptReference, GDB_RT.GLOB)
             EgtDraw()
          Else
@@ -370,6 +370,7 @@ Public Class StartMachPanelVM
    Friend Sub Dispose()
       ' ripristino frame originale
       EgtSetGridFrame(m_OriginalGridFrame)
+      EgtDeselectAll()
       EgtDraw()
       Map.refSceneHostVM.MainScene.SetStatusNull()
    End Sub

Icarus/StatusBar/StatusBarV.xaml

@@ -109,10 +109,16 @@
          <UniformGrid Rows="1"
                       DataContext="{StaticResource InstrumentPanelVM}">
             <ToggleButton ToolTip="{Binding GetDistToolTip}"
-                       Style="{StaticResource ToolBar_ToggleButton}"
+                          Style="{StaticResource ToolBar_ToggleButton}"
-                       IsChecked="{Binding GetDistIsChecked}">
+                          IsChecked="{Binding GetDistIsChecked}">
                <Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
             </ToggleButton>
+            <ToggleButton ToolTip="{Binding EdgeAnalysisToolTip}"
+                          Style="{StaticResource ToolBar_ToggleButton}"
+                          IsChecked="{Binding bEdgeAnalysis_IsChecked}"
+                          IsEnabled="{Binding bEdgeAnalysis_IsEnabled}">
+               <Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
+            </ToggleButton>
          </UniformGrid>
       </StackPanel>
    </StatusBarItem>

Icarus/TSFEditor/TFSEditorV.xaml

@@ -88,6 +88,22 @@
                            Margin="2.5,0,2.5,0"
                            Style="{StaticResource ControllerInputPanel_TextBox}"/>
                </Grid>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <TextBlock Text="Increment:"
+                             Visibility="{Binding FeedIncrement_Visibility}"
+                             Margin="2.5,0,2.5,0"
+                             Style="{StaticResource TSFEditor_TextBlock}"/>
+                  <TextBox Grid.Column="1"
+                           Text="{Binding sFeedIncrement}"
+                           Width="50"
+                           Visibility="{Binding FeedIncrement_Visibility}"
+                           Margin="2.5,0,2.5,0"
+                           Style="{StaticResource ControllerInputPanel_TextBox}"/>
+               </Grid>
                <StackPanel Grid.Column="1"
                            Orientation="Horizontal">
                   <Button Content="Set"

Icarus/TSFEditor/TFSEditorVM.vb

@@ -17,6 +17,7 @@ Public Class TFSEditorVM
       SECTIONCHANGE = 2
       SELECTION = 3
       SELECTION_WAIT = 4
+      FEED_INCREMENT = 5
    End Enum
 
    Public Enum Filters As Integer
@@ -59,7 +60,7 @@ Public Class TFSEditorVM
       End Set
    End Property
 
-   Private m_MediaTypeList As New List(Of String)({"Slice Number", "Section change", "Selection", "Selection Wait"})
+   Private m_MediaTypeList As New List(Of String)({"Slice Number", "Section change", "Selection", "Selection Wait", "Feed Increment"})
    Public ReadOnly Property MediaTypeList As List(Of String)
       Get
          Return m_MediaTypeList
@@ -79,6 +80,7 @@ Public Class TFSEditorVM
                SetFCurrVisibility(False)
                SetDifference_Visibility(False)
                SetWaitVisibility(False)
+               SetFeedIncrementVisibility(False)
                SetSetVisibility(False)
                SetMediaVisibility(True)
             Case MediaTypes.SECTIONCHANGE
@@ -86,6 +88,7 @@ Public Class TFSEditorVM
                SetFCurrVisibility(False)
                SetDifference_Visibility(True)
                SetWaitVisibility(False)
+               SetFeedIncrementVisibility(False)
                SetSetVisibility(False)
                SetMediaVisibility(True)
             Case MediaTypes.SELECTION
@@ -93,6 +96,7 @@ Public Class TFSEditorVM
                SetFCurrVisibility(True)
                SetDifference_Visibility(False)
                SetWaitVisibility(False)
+               SetFeedIncrementVisibility(False)
                SetSetVisibility(True)
                SetMediaVisibility(True)
             Case MediaTypes.SELECTION_WAIT
@@ -100,6 +104,15 @@ Public Class TFSEditorVM
                SetFCurrVisibility(False)
                SetDifference_Visibility(False)
                SetWaitVisibility(True)
+               SetFeedIncrementVisibility(False)
+               SetSetVisibility(True)
+               SetMediaVisibility(False)
+            Case MediaTypes.FEED_INCREMENT
+               SetMediaHeightVisibility(False)
+               SetFCurrVisibility(False)
+               SetDifference_Visibility(False)
+               SetWaitVisibility(False)
+               SetFeedIncrementVisibility(True)
                SetSetVisibility(True)
                SetMediaVisibility(False)
          End Select
@@ -210,6 +223,32 @@ Public Class TFSEditorVM
       NotifyPropertyChanged(NameOf(Wait_Visibility))
    End Sub
 
+   Private m_dFeedIncrement As Double
+   Public Property sFeedIncrement As String
+      Get
+         Return DoubleToString(m_dFeedIncrement, 0)
+      End Get
+      Set(value As String)
+         Dim nNewValue As Integer = 0
+         If StringToLen(value, nNewValue) Then
+            m_dFeedIncrement = nNewValue
+         Else
+            NotifyPropertyChanged(NameOf(sFeedIncrement))
+         End If
+      End Set
+   End Property
+
+   Private m_FeedIncrement_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property FeedIncrement_Visibility As Visibility
+      Get
+         Return m_FeedIncrement_Visibility
+      End Get
+   End Property
+   Private Sub SetFeedIncrementVisibility(bValue As Boolean)
+      m_FeedIncrement_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(FeedIncrement_Visibility))
+   End Sub
+
    Private m_Media_Visibility As Visibility = Visibility.Visible
    Public ReadOnly Property Media_Visibility As Visibility
       Get
@@ -286,6 +325,10 @@ Public Class TFSEditorVM
          Else
             EgtRemoveInfo(nLayTFSCalcId, KEY_EMITWAITINGTIME)
          End If
+         ' aggiorno background di tutte le righe
+         For Each Layer In m_LayerList
+            Layer.NotifyPropertyChanged(NameOf(Layer.Background))
+         Next
          NotifyPropertyChanged(NameOf(ColWait_Visibility))
       End Set
    End Property
@@ -423,6 +466,10 @@ Public Class TFSEditorVM
             For Each Layer In m_SelLayers
                Layer.SetTWait(m_dWait)
             Next
+         Case MediaTypes.FEED_INCREMENT
+            For Each Layer In m_SelLayers
+               Layer.SetFCurr(Layer.dFCurr * (m_dFeedIncrement / 100))
+            Next
       End Select
       '' salvo selezione corrente
       'Dim SelIndexList As New List(Of Integer)
@@ -749,6 +796,11 @@ Public Class TFSLayer
       NotifyPropertyChanged(NameOf(Background))
       NotifyPropertyChanged(NameOf(sFCurr))
    End Sub
+   Public ReadOnly Property dFCurr As Double
+      Get
+         Return m_dFCurr
+      End Get
+   End Property
 
    Private m_bFCurr_IsModified As Boolean
    Public ReadOnly Property bFCurr_IsModified As Boolean
@@ -780,11 +832,10 @@ Public Class TFSLayer
       Get
          If m_bFCurr_IsModified OrElse m_bTWait_IsModified Then
             Return Brushes.White
-         ElseIf m_dTCurr < m_dTMin Then
+         ElseIf (Not Map.refTFSEditorVM.bWaitingTime AndAlso m_dTCurr + 1 < m_dTMin) OrElse (Map.refTFSEditorVM.bWaitingTime AndAlso m_dTCurr + m_dTWait + 1 < m_dTMin) Then
             Return Brushes.Red
-         ElseIf m_dTCurr > m_dTMax Then
+         ElseIf m_dTCurr - 1 > m_dTMax Then
             Return Brushes.MediumOrchid
-            '  Return Brushes.MediumSlateBlue
          Else
             Return Brushes.LightGreen
          End If

Icarus/Themes/Generic.xaml

@@ -1,19 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:Icarus">
-
-
-    <Style TargetType="{x:Type local:AirspacePopup}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:AirspacePopup}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>

Icarus/TopPanel/TopPanelVM.vb

@@ -166,14 +166,14 @@ Public Class TopPanelVM
       End Get
       Set(value As Print3dPartVM)
          If Not IsNothing(m_SelPart) Then
-            ' deseleziono eventuale pezzo precedente
+            '' deseleziono eventuale pezzo precedente
-            EgtResetMark(m_SelPart.nPrintSolidId)
+            'EgtResetMark(m_SelPart.nPrintSolidId)
          End If
          m_SelPart = value
          If Not IsNothing(value) Then
             ' Eseguo la selezione
             EgtDeselectAll()
-            EgtSetMark(m_SelPart.nPrintSolidId)
+            ' EgtSetMark(m_SelPart.nPrintSolidId)
             EgtDraw()
             ' imposto lavorazione e materiale del pezzo selezionato
             Map.refCurrMachiningPanelVM.ReadMachParamFromSelPart()
@@ -276,12 +276,19 @@ Public Class TopPanelVM
          ' e la rimuovo
          m_MachiningList.Remove(MachiningIndex.Empty())
       End If
-      ' se nuova lavorazione e' none
+      ' se nuova lavorazione e' none o non è presente in lista
-      If Not IsNothing(m_SelMachining) AndAlso SelMachining.sGUID = Guid.Empty AndAlso Not MachiningList.Any(Function(x) x.sGUID = MachiningIndex.Empty.sGUID) Then
+      If (IsNothing(SelMachining) OrElse SelMachining.sGUID = Guid.Empty OrElse Not MachiningList.Any(Function(x) x.sGUID = SelMachining.sGUID)) AndAlso Not MachiningList.Any(Function(x) x.sGUID = MachiningIndex.Empty.sGUID) Then
-         ' aggiungo lavorazione vuota
+         ' aggiungo lavorazione vuota e la seleziono
          MachiningList.Insert(0, MachiningIndex.Empty())
+         m_SelMachining = MachiningList(0)
+         '   ' se lavorazione da selezionare non trovata
+         'ElseIf (SelMachining.sGUID = Guid.Empty OrElse Not MachiningList.Any(Function(x) x.sGUID = SelMachining.sGUID)) AndAlso Not MachiningList.Any(Function(x) x.sGUID = MachiningIndex.Empty.sGUID) Then
+         '   ' aggiungo lavorazione vuota e la seleziono
+         '   MachiningList.Insert(0, MachiningIndex.Empty())
+         '   m_SelMachining = SelMachining
+      Else
+         m_SelMachining = SelMachining
       End If
-      m_SelMachining = SelMachining
       NotifyPropertyChanged(NameOf(SelMachining))
    End Sub
 
@@ -351,10 +358,6 @@ Public Class TopPanelVM
       NotifyPropertyChanged(NameOf(SelMaterial))
    End Sub
 
-   Friend Function GetSelMaterialData() As Material
-      Return New Material(m_SelMaterial.nIndex, m_SelMaterial.sGUID, m_SelMaterial.sName)
-   End Function
-
 #End Region    ' Materials
 
 #Region "Machining"
@@ -409,6 +412,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(False)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
       ' imposto pagina
       Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.IMPORT)
       ''Map.refImportPanelVM.Init()
@@ -422,6 +426,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(True)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
       Return True
    End Function
 
@@ -443,6 +448,7 @@ Public Class TopPanelVM
       Map.refSliderManagerVM.SetSliderVisibility(True)
       Map.refSliderManagerVM.SetLayerIndexToMax()
       Map.refViewLayerManagerVM.UpdateIsVisibleFromIni()
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
       EgtDeselectAll()
    End Sub
 
@@ -450,6 +456,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.UpdateState(False)
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
       Map.refSliderManagerVM.SetSliderVisibility(False)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
       SelPart = SelPart
       Return True
    End Function
@@ -471,6 +478,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(False)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
       ' imposto pagina
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.MATERIALDB)
    End Sub
@@ -483,6 +491,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(True)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
       Return True
    End Function
 
@@ -494,6 +503,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(False)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
       ' imposto pagina
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.PRINTPARAMDB)
    End Sub
@@ -506,6 +516,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(True)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
       Return True
    End Function
 
@@ -517,6 +528,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(False)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
       ' imposto pagina
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.CURRPRINTPARAM)
    End Sub
@@ -529,6 +541,7 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(True)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
       Return True
    End Function
 
@@ -539,10 +552,11 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(False)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
-      ' tolgo mark da pezzo selezionato
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
-      If Not IsNothing(SelPart) Then
+      '' tolgo mark da pezzo selezionato
-         EgtResetMark(SelPart.nPrintSolidId)
+      'If Not IsNothing(SelPart) Then
-      End If
+      '   EgtResetMark(SelPart.nPrintSolidId)
+      'End If
       ' imposto pagina
       Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.MODIFYPART)
    End Sub
@@ -554,10 +568,11 @@ Public Class TopPanelVM
       Map.refSliceManagerVM.SetButtonsIsEnabled(True)
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
-      ' ripristino mark su pezzo selezionato
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
-      If Not IsNothing(SelPart) Then
+      '' ripristino mark su pezzo selezionato
-         EgtSetMark(SelPart.nPrintSolidId)
+      'If Not IsNothing(SelPart) Then
-      End If
+      '   EgtSetMark(SelPart.nPrintSolidId)
+      'End If
       Return True
    End Function
 

Icarus/Utility/CurrentMachine.vb

@@ -46,12 +46,15 @@ Public Module CurrentMachine
       m_sMachiningFilePath = sValue
    End Sub
    ' Cartella dei materiali
-   Private m_sMaterialsFilePath As String = String.Empty
+   Private m_sMaterialFilePath As String = String.Empty
-   Friend ReadOnly Property sMaterialsFilePath As String
+   Friend ReadOnly Property sMaterialFilePath As String
       Get
-         Return m_sMaterialsFilePath
+         Return m_sMaterialFilePath
       End Get
    End Property
+   Friend Sub SetMaterialFilePath(sValue As String)
+      m_sMaterialFilePath = sValue
+   End Sub
 
    ' box della tavola macchina
    Private m_b3Tab As New BBox3d
@@ -75,7 +78,7 @@ Public Module CurrentMachine
       ' impostazione cartella lavorazioni
       m_sMachiningFilePath = sMachinesRootDir & "\" & sMachineName & "\Machinings\Machinings.ini"
       ' impostazione cartella materiali
-      m_sMaterialsFilePath = sMachinesRootDir & "\" & sMachineName & "\Materials\Materials.ini"
+      m_sMaterialFilePath = sMachinesRootDir & "\" & sMachineName & "\Materials\Materials.ini"
       ' Disabilito segnalazione modificato
       Dim DisableMgr As New DisableModifiedMgr
       ' recupero box macchina
@@ -180,7 +183,7 @@ Public Module CurrentMachine
    End Function
 
    Friend Function ReadMaterialParamString(lpAppName As String, lpKeyName As String, lpDefault As String, ByRef lpString As String, Optional sFilePath As String = "") As Integer
-      Dim nResult As Integer = GetPrivateProfileString(lpAppName, lpKeyName, lpDefault, lpString, If(Not String.IsNullOrWhiteSpace(sFilePath), sFilePath, m_sMaterialsFilePath))
+      Dim nResult As Integer = GetPrivateProfileString(lpAppName, lpKeyName, lpDefault, lpString, If(Not String.IsNullOrWhiteSpace(sFilePath), sFilePath, m_sMaterialFilePath))
       If Not String.IsNullOrWhiteSpace(lpString) Then
          lpString = EgwCrypto.PowerDecryptString(lpString, m_Salt)
       Else
@@ -198,7 +201,7 @@ Public Module CurrentMachine
    End Function
 
    Friend Function WriteMaterialParam(lpAppName As String, lpKeyName As String, lpString As String, Optional sFilePath As String = "") As Boolean
-      Return WritePrivateProfileString(lpAppName, lpKeyName, EgwCrypto.PowerEncryptString(lpString, m_Salt), If(Not String.IsNullOrWhiteSpace(sFilePath), sFilePath, m_sMaterialsFilePath))
+      Return WritePrivateProfileString(lpAppName, lpKeyName, EgwCrypto.PowerEncryptString(lpString, m_Salt), If(Not String.IsNullOrWhiteSpace(sFilePath), sFilePath, m_sMaterialFilePath))
    End Function
 
 #End Region 'Methods

Icarus/Utility/GeomEntityColors.vb

@@ -5,11 +5,12 @@ Module GeomEntityColors
 
    Public Enum LayerType As Integer
       PRINTPART = 1
-      RIBS = 2
+      'REFERENCE = 2
-      SHELLNUMBERS = 3
+      MACHSTART = 3
-      AUXSOLIDS = 4
+      RIBS = 4
-      MACHSTART = 5
+      SHELLNUMBERS = 5
-      OTHERS = 6
+      AUXSOLIDS = 6
+      OTHERS = 7
       ALL = 10
    End Enum
 
@@ -97,7 +98,7 @@ Module GeomEntityColors
 
    Friend Sub SetColor(Type As LayerType, c3Color As Color3d)
       Dim c3Temp As Color3d
-      Dim sIniKey As String
+      Dim sIniKey As String = ""
       Select Case Type
          Case LayerType.PRINTPART
             c3Temp = c3Print
@@ -124,9 +125,26 @@ Module GeomEntityColors
       WritePrivateProfileColor(S_COLORS, sIniKey, c3Temp)
       UpdateColors(Type)
    End Sub
+   Friend Function GetColor(Type As LayerType) As Color3d
+      Dim sIniKey As String = ""
+      Select Case Type
+         Case LayerType.PRINTPART
+            Return c3Print
+         Case LayerType.RIBS
+            Return c3Rib
+         Case LayerType.SHELLNUMBERS
+            Return c3ShellNumber
+         Case LayerType.AUXSOLIDS
+            Return c3AuxSolids
+         Case LayerType.MACHSTART
+            Return c3MachStart
+         Case LayerType.OTHERS
+            Return c3Others
+      End Select
+   End Function
    Friend Sub SetAlpha(Type As LayerType, dAlpha As Double)
       Dim c3Temp As Color3d = c3Print
-      Dim sIniKey As String
+      Dim sIniKey As String = ""
       Select Case Type
          Case LayerType.PRINTPART
             c3Temp = c3Print
@@ -222,12 +240,21 @@ Module GeomEntityColors
             End While
             EgtSetColor(nOthersLayerId, GeomEntityColors.c3Others)
          End If
-
          ' Ripristino stato segnalazione modifica
          DisableMgr.ReEnable()
-
          nPartId = EgtGetNextPart(nPartId)
       End While
+      ' se in import, aggiorno anche i pezzi di import
+      If Map.refTopPanelVM.SelPage = Pages.IMPORT Then
+         For Each ImportPart In Map.refManagePartPanelVM.ManagerPartList
+            Dim Layer As ManagePart_Layer = ImportPart.LayerList.FirstOrDefault(Function(x) x.Type = Type)
+            If Not IsNothing(Layer) Then
+               For Each Entity In Layer.EntityList
+                  EgtSetColor(Entity.nId, GetColor(Type))
+               Next
+            End If
+         Next
+      End If
       EgtDraw()
    End Sub