- apertura file pdf come risorsa di progetto

Icarus/AboutBoxWindow/AboutBoxV.xaml

@@ -1,81 +1,52 @@
 <Window x:Class="AboutBoxV"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="AboutBox" 
+    Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-        Height="486" 
+    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
-        Width="735"
-        WindowStyle="None" 
-        ResizeMode="NoResize"
-        AllowsTransparency="True"
-        Background="Transparent"
-        ShowInTaskbar="False"
-        WindowStartupLocation="CenterOwner">
 
-   <Border Style="{StaticResource WhiteBottomBlueRow_Border}">
+   <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="2*"/>
             <ColumnDefinition Width="0.5*"/>
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.25*"/>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="2.5*"/>
+            <RowDefinition Height="0.35*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.35*"/>
          </Grid.RowDefinitions>
 
-         <Grid Grid.Column="3" Grid.Row="1">
+         <Grid Grid.Column="1" Grid.Row="1">
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="50"/>
+               <ColumnDefinition Width="3*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
+            <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <RowDefinition Height="0.5*"/>
+               <Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
-               <RowDefinition Height="0.5*"/>
+            </Border>
-            </Grid.RowDefinitions>
-            <Image Grid.RowSpan="2"
-                   Source="/Resources/AboutBox/IcarusLogo.png"
-                   Height="65"
-                   Style="{StaticResource Button_Image}"/>
-            <TextBlock Grid.Column="2"
-                       Name="DescriptionLbl"
-                       VerticalAlignment="Bottom"
-                       Style="{StaticResource Version_AboutBox_TextBlock}"/>
-            <TextBlock Grid.Column="2"
-                       Grid.Row="1" 
-                       Name="VersionLbl"
-                       VerticalAlignment="Top"
-                       Style="{StaticResource Version_AboutBox_TextBlock}"/>
          </Grid>
-         <Image Grid.Column="1"
+         <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-                Grid.Row="3"
+               VerticalAlignment="Center" FontSize="18" />
-                Source="/Resources/AboutBox/EgalwareLogo.png" 
+         <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-                Height="190"
+               VerticalAlignment="Center" FontSize="18"/>
-                Style="{StaticResource Button_Image}"/>
+         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-         <TextBox Name="InfoLbl"
+               VerticalAlignment="Center" FontSize="12" />
-                  Grid.Column="3"
+         <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-                  Grid.Row="3"
+               VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
-                  Style="{StaticResource AboutBox_TextBox}"/>
+         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-         <TextBlock Name="CopyrightLbl" 
+            Margin="100,0"/>
-                    Grid.Column="3" 
+
-                    Grid.Row="5"
-                    Style="{StaticResource Copyright_AboutBox_TextBlock}"/>
-         <Button Grid.Column="3" 
-                 Grid.Row="7" 
-                 IsCancel="True"
-                 HorizontalAlignment="Right"
-                 Style="{StaticResource RightPanel_HalfRound_Button}">
-            <Image Source="\Resources\Common\Ok.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
       </Grid>
+
    </Border>
+
 </Window>

Icarus/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -17,28 +17,29 @@ Public Class AboutBoxV
       Dim sOpts As String = Map.refMainWindowVM.MainWindowM.nKeyOptions.ToString()
       Dim sLeftDays As String = ""
       Dim nLeftDays As Integer 
-      If EgtGetKeyLeftDays(nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays = " (" & nLeftDays.ToString() & ")"
+      if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
-      sInfo = If(EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "")
+      sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") 
       sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
                "  Inst" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() &
                " Ulv" & Map.refMainWindowVM.MainWindowM.nUserLevel.ToString() &
-               " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine
+               " Dbg" &  Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine
       sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
       sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
       sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
       Dim sOpSys As String = String.Empty
-      EgtGetOsInfo(sOpSys)
+      EgtGetOsInfo( sOpSys)
       sInfo &= sOpSys & Environment.NewLine
       Dim sCPU As String = String.Empty
-      EgtGetCpuInfo(sCPU)
+      EgtGetCpuInfo( sCPU)
       sInfo &= sCPU & Environment.NewLine
       Dim sMem As String = String.Empty
-      EgtGetMemoryInfo(sMem)
+      EgtGetMemoryInfo( sMem)
       sInfo &= sMem & Environment.NewLine
       Dim sScene As String = String.Empty
       EgtGetSceneInfo(sScene)
       sInfo &= sScene
       InfoLbl.Text = sInfo
+      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
    End Sub
 
 End Class

Icarus/AttachedProperties/TreeViewItemHelper.vb

@@ -1,165 +0,0 @@
-Imports System.Globalization
-Imports System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox
-Imports System.Windows.Media.Media3D
-
-Public Module TreeViewItemHelper
-
-   ' Gestione MouseOver come in ListBox
-   Private CurrentItem As TreeViewItem
-   Private ReadOnly UpdateOverItemEvent As RoutedEvent = EventManager.RegisterRoutedEvent("UpdateOverItem", RoutingStrategy.Bubble, GetType(RoutedEventHandler), GetType(TreeViewItemHelper))
-   Private ReadOnly IsMouseDirectlyOverItemKey As DependencyPropertyKey = DependencyProperty.RegisterAttachedReadOnly("IsMouseDirectlyOverItem", GetType(Boolean), GetType(TreeViewItemHelper), New FrameworkPropertyMetadata(Nothing, New CoerceValueCallback(AddressOf CalculateIsMouseDirectlyOverItem)))
-   Public ReadOnly IsMouseDirectlyOverItemProperty As DependencyProperty = IsMouseDirectlyOverItemKey.DependencyProperty
-
-   Sub New()
-      EventManager.RegisterClassHandler(GetType(TreeViewItem), UIElement.MouseEnterEvent, New MouseEventHandler(AddressOf OnMouseTransition), True)
-      EventManager.RegisterClassHandler(GetType(TreeViewItem), UIElement.MouseLeaveEvent, New MouseEventHandler(AddressOf OnMouseTransition), True)
-      EventManager.RegisterClassHandler(GetType(TreeViewItem), UpdateOverItemEvent, New RoutedEventHandler(AddressOf OnUpdateOverItem))
-   End Sub
-
-   Function GetIsMouseDirectlyOverItem(ByVal obj As DependencyObject) As Boolean
-      Return CBool(obj.GetValue(IsMouseDirectlyOverItemProperty))
-   End Function
-
-   Private Function CalculateIsMouseDirectlyOverItem(ByVal item As DependencyObject, ByVal value As Object) As Object
-      Return item Is CurrentItem
-   End Function
-
-   Private Sub OnUpdateOverItem(ByVal sender As Object, ByVal e As RoutedEventArgs)
-      CurrentItem = TryCast(sender, TreeViewItem)
-      CurrentItem.InvalidateProperty(IsMouseDirectlyOverItemProperty)
-      e.Handled = True
-   End Sub
-
-   Private Sub OnMouseTransition(ByVal sender As Object, ByVal e As MouseEventArgs)
-      SyncLock IsMouseDirectlyOverItemProperty
-
-         If Not IsNothing(CurrentItem) Then
-            Dim oldItem As DependencyObject = CurrentItem
-            CurrentItem = Nothing
-            oldItem.InvalidateProperty(IsMouseDirectlyOverItemProperty)
-         End If
-
-         Mouse.DirectlyOver?.RaiseEvent(New RoutedEventArgs(UpdateOverItemEvent))
-      End SyncLock
-   End Sub
-
-   ' Gestione click destro del mouse che seleziona l'elemento
-   Public ReadOnly SelectItemOnRightClickProperty As DependencyProperty = DependencyProperty.RegisterAttached("SelectItemOnRightClick", GetType(Boolean), GetType(TreeViewItemHelper), New UIPropertyMetadata(False, AddressOf OnSelectItemOnRightClickChanged))
-
-   Public Function GetSelectItemOnRightClick(ByVal d As DependencyObject) As Boolean
-      Return CBool(d.GetValue(SelectItemOnRightClickProperty))
-   End Function
-
-   Public Sub SetSelectItemOnRightClick(ByVal d As DependencyObject, ByVal value As Boolean)
-      d.SetValue(SelectItemOnRightClickProperty, value)
-   End Sub
-
-   Private Sub OnSelectItemOnRightClickChanged(ByVal d As DependencyObject, ByVal e As DependencyPropertyChangedEventArgs)
-      Dim selectItemOnRightClick As Boolean = CBool(e.NewValue)
-      Dim treeView As TreeView = TryCast(d, TreeView)
-
-      If treeView IsNot Nothing Then
-
-         If selectItemOnRightClick Then
-            AddHandler treeView.PreviewMouseRightButtonDown, AddressOf OnPreviewMouseRightButtonDown
-         Else
-            RemoveHandler treeView.PreviewMouseRightButtonDown, AddressOf OnPreviewMouseRightButtonDown
-         End If
-      End If
-   End Sub
-
-   Private Sub OnPreviewMouseRightButtonDown(ByVal sender As Object, ByVal e As MouseButtonEventArgs)
-      Dim treeViewItem As TreeViewItem = VisualUpwardSearch(Of TreeViewItem)(TryCast(e.OriginalSource, DependencyObject))
-      If treeViewItem IsNot Nothing Then
-         treeViewItem.IsSelected = True
-         Dim Tree As TreeView = VisualUpwardSearch(Of TreeView)(TryCast(treeViewItem, DependencyObject))
-         If Not IsNothing(Tree) Then
-            Dim myTransform As GeneralTransform = treeViewItem.TransformToAncestor(Tree)
-
-            Dim myOffset As Point = myTransform.Transform(New Point(0, 0))
-            treeViewItem.ContextMenu.HorizontalOffset = -treeViewItem.ActualWidth + (-myOffset.X) + Tree.ActualWidth - 3
-            treeViewItem.ContextMenu.VerticalOffset = -3
-         End If
-         e.Handled = True
-      End If
-   End Sub
-
-   Private Function VisualUpwardSearch(Of T As DependencyObject)(ByVal source As DependencyObject) As T
-      Dim returnVal As DependencyObject = source
-
-      While returnVal IsNot Nothing AndAlso Not (TypeOf returnVal Is T)
-         Dim tempReturnVal As DependencyObject = Nothing
-
-         If TypeOf returnVal Is Visual OrElse TypeOf returnVal Is Visual3D Then
-            tempReturnVal = VisualTreeHelper.GetParent(returnVal)
-         End If
-
-         If tempReturnVal Is Nothing Then
-            returnVal = LogicalTreeHelper.GetParent(returnVal)
-         Else
-            returnVal = tempReturnVal
-         End If
-      End While
-
-      Return TryCast(returnVal, T)
-   End Function
-
-   ' Gestione indentazione sottoelementi
-   Public Function GetDepth(item As TreeViewItem) As Integer
-      Dim parent As TreeViewItem = GetParent(item)
-
-      If Not IsNothing(parent) Then Return GetDepth(parent) + 1
-
-      Return 0
-   End Function
-
-   Private Function GetParent(item As TreeViewItem) As TreeViewItem
-      Dim parent As DependencyObject = If(Not IsNothing(item), VisualTreeHelper.GetParent(item), Nothing)
-
-      While Not IsNothing(parent) AndAlso Not (TypeOf parent Is TreeViewItem OrElse TypeOf parent Is TreeView)
-         parent = VisualTreeHelper.GetParent(parent)
-      End While
-
-      Return TryCast(parent, TreeViewItem)
-   End Function
-
-   Private Function GetTreeParent(item As TreeViewItem) As TreeViewItem
-      Dim parent As DependencyObject = If(Not IsNothing(item), VisualTreeHelper.GetParent(item), Nothing)
-
-      While Not IsNothing(parent) AndAlso Not (TypeOf parent Is TreeViewItem OrElse TypeOf parent Is TreeView)
-         parent = VisualTreeHelper.GetParent(parent)
-      End While
-
-      Return TryCast(parent, TreeViewItem)
-   End Function
-
-   ' Gestione indentazione sottoelementi
-   Public Function GetHeight(Item As TreeViewItem, SearchedItem As TreeViewItem, ByRef nHeight As Integer) As Boolean
-      Dim Index As Integer = 0
-      While Index <= Item.Items.Count - 1
-         If GetHeight(Item.Items(Index), SearchedItem, nHeight) Then
-            nHeight += 1
-            Return True
-         End If
-         Index += 1
-      End While
-      Return False
-   End Function
-
-End Module
-
-Public Class LeftMarginMultiplierConverter
-   Implements IValueConverter
-
-   Public Property Length As Double
-
-   Public Function Convert(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.Convert
-      Dim item As TreeViewItem = TryCast(value, TreeViewItem)
-      If item Is Nothing Then Return New Thickness(0)
-      Return New Thickness(Length * GetDepth(item), 0, 0, 0)
-   End Function
-
-   Public Function ConvertBack(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
-      Throw New System.NotImplementedException()
-   End Function
-End Class

Icarus/Constants/Const3dPrint.vb

@@ -5,7 +5,6 @@
    Public Const PART = "Part"
    Public Const PRINT_SOLID = "PrintSolid"
    Public Const LAY_MACH_START = "MachStart"
-   Public Const LAY_PARTREFERENCE = "PartFrame"
    Public Const LAY_REFERENCE = "Frame"
    Public Const LAY_OTHERS = "Aux"
    Public Const LAY_RIBS = "Ribs"
@@ -16,8 +15,6 @@
    Public Const RIB_EXTRUSION = "RibExtrusion"
    Public Const RIB_CURVE = "RibCurve"
    Public Const RIB_ID = "RibId"
-   Public Const SHELLNUMBER_ID = "ShellNumberId"
-   Public Const FILLEDSOLID_ID = "FilledSolidId"
    Public Const VIEWPARAMS = "ViewParams"
    Public Const IMPORTED_SOLID = "ImportedSolid"
    Public Const RESULT_READ_PROG = "ResultReadProg"
@@ -110,7 +107,6 @@
    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"
@@ -118,7 +114,6 @@
    Public Const MAC_RIBSLEADOUTCOASTING = "RibsLeadOutCoasting"
    Public Const MAC_RIBSLEADOUTWIPE = "RibsLeadOutWipe"
    Public Const MAC_RIBSLEADOUTWIPEDIR = "RibsLeadOutWipeDir"
-   Public Const MAC_RIBSLIMITUNBOUNDEDWITHSOLID = "LimitUnboundedRibsWithSolid"
    Public Const MAC_SHELLNBRDIFFERENCE = "ShellNbrDifference"
    Public Const MAC_SHELLNBRCOASTING = "ShellNbrCoasting"
    Public Const MAC_SHELLNBRWIPE = "ShellNbrWipe"
@@ -158,19 +153,11 @@
    ' 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/ConstIni.vb

@@ -105,7 +105,6 @@ Public Module ConstIni
    'Public Const S_SIMUL As String = "Simul"
    'Public Const K_SLIDERX As String = "SliderX"
    'Public Const K_SLIDERVAL As String = "SliderVal"
-   Public Const K_MACHVIEWMODE As String = "MachViewMode"
 
    Public Const S_PRINTING3D As String = "3dPrinting"
    Public Const K_3PRNBASEDIR As String = "BaseDir"

Icarus/ControllerInputPanel/ControllerInputPanelV.xaml

@@ -1,16 +1,10 @@
-<Border x:Class="ControllerInputPanelV"
+<UserControl x:Class="ControllerInputPanelV"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-        Height="38"
+             Height="32">
-        Visibility="{Binding DoneBtn_Visibility}"
-        HorizontalAlignment="Left"
-        Margin="45,0,0,0"
-        Padding="0"
-        Style="{StaticResource ViewLayerManager_Border}">
 
-   <StackPanel Orientation="Horizontal"
+   <StackPanel Orientation="Horizontal">
-               Margin="2.5">
       <StackPanel.Style>
          <Style TargetType="{x:Type StackPanel}">
             <Style.Triggers>
@@ -22,46 +16,31 @@
       </StackPanel.Style>
       <TextBlock Text="{Binding Message}"
                  Visibility="{Binding Message_Visibility}"
-                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource OptionTextBlock}"/>
-                 Style="{StaticResource ControllerInput_TextBlock}"/>
       <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}"
-               Width="150"
+               Width="200"
-               Visibility="{Binding Text_Visibility}" 
+               Visibility="{Binding Text_Visibility}" Margin="5,0,5,0"
-               Margin="2.5,0,2.5,0"
                Style="{StaticResource ControllerInputPanel_TextBox}">
          <TextBox.InputBindings>
             <KeyBinding Key="Enter" Command="{Binding Done_Command, UpdateSourceTrigger=PropertyChanged}"/>
             <KeyBinding Key="S" Modifiers="Control" Command="{Binding Show_Command}"/>
          </TextBox.InputBindings>
       </TextBox>
-      <CheckBox Content="{Binding CheckBoxText}"
+      <CheckBox Content="{Binding CheckBoxText}" IsChecked="{Binding IsChecked}"
-                IsChecked="{Binding IsChecked}"
+                   Visibility="{Binding Check_Visibility}" Margin="5,0,5,0"
-                Visibility="{Binding Check_Visibility}" 
-                Margin="2.5,0,2.5,0"
                 VerticalAlignment="Center"/>
-      <ComboBox ItemsSource="{Binding ComboItemsList}" 
+      <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
-                SelectedIndex="{Binding ComboSelectedIndex}"
+                   Visibility="{Binding Combo_Visibility}" Margin="5,0,5,0"/>
-                Visibility="{Binding Combo_Visibility}" 
+      <Grid Margin="5,0,5,0">
-                Margin="2.5,0,2.5,0"/>
-      <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Button Command="{Binding Show_Command}" 
+         <Button Command="{Binding Show_Command}" Visibility="{Binding ShowBtn_Visibility}"
-                 Visibility="{Binding ShowBtn_Visibility}"
+                 Content="{Binding ShowMsg}" Style="{StaticResource EgtWPFLib5_InputButton}"/>
-                 Content="{Binding ShowMsg}" 
+         <Button Command="{Binding Done_Command}" Visibility="{Binding DoneBtn_Visibility}"
-                 Margin="2.5,0,2.5,0"
+                 Grid.Column="1"
-                 Style="{StaticResource RightPanel_Button}"/>
+                 Content="{Binding OkMsg}" Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Grid.Column="1"
-                 Command="{Binding Done_Command}"
-                 Visibility="{Binding DoneBtn_Visibility}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource RightPanel_Button}">
-            <Image Source="\Resources\Common\Ok.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
       </Grid>
    </StackPanel>
-   
+</UserControl>
-</Border>

Icarus/CurrMachiningPanel/CurrMachining.vb

@@ -163,21 +163,6 @@ Public Class CurrMachining
       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
@@ -241,15 +226,13 @@ 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),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb),
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb)})
-                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb)})
          Case Cathegories.SHELL_NUMBER
             m_sName = "Reduce Shell Number"
             m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nPartId, nIndex, bForceFromDb),
@@ -270,6 +253,12 @@ 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()
@@ -917,14 +906,10 @@ 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
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADOUTINVERT, m_bValue)
-         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
-            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, m_bValue)
       End Select
       m_bOrigValue = m_bValue
       If nIndex > 0 Then
@@ -932,7 +917,7 @@ Public Class CurrCheckMachiningParam
          Select Case Type
             Case Params.SPIRALVASE
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT, Params.RIBSLIMITUNBOUNDEDWITHSOLID
+            Case Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, 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
@@ -952,14 +937,10 @@ 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
             EgtSetInfo(nPartId, MAC_RIBSLEADOUTINVERT, If(m_bValue, 1, 0))
-         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
-            EgtSetInfo(nPartId, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, If(m_bValue, 1, 0))
       End Select
    End Sub
 
@@ -1021,22 +1002,7 @@ Public Class CurrOrderedMachiningParam
       Dim bReadFromPart As Boolean = False
       Select Case Type
          Case Params.PRINT_ORDER
-            m_StandardValueOrderList = New List(Of Integer)({Machining.MPAR_PRINT_ORDER.SHELL,
+            m_ValueList = New ObservableCollection(Of IdNameStruct)
-                                                             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 Shell"),
-                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infill"),
-                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solid"),
-                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Rib"),
-                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Rib"),
-                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Rib"),
-                                                                     New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Rib")})
             Dim sValue As String = ""
             bReadFromPart = EgtGetInfo(nPartId, MAC_PRINTORDER, sValue)
             Value = sValue
@@ -1090,6 +1056,7 @@ Public Class CurrOrderedMachiningParam
    End Property
 
    Public Sub ResetParamCmd()
+      m_SelValue = Nothing
       Value = DbParam.OrigValue
       NotifyPropertyChanged(NameOf(Value))
       NotifyPropertyChanged(NameOf(SelValue))

Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml

@@ -1,30 +1,17 @@
-<Grid x:Class="CurrMachiningPanelV"
+<UserControl x:Class="CurrMachiningPanelV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:PrintApp="clr-namespace:Icarus"
+             xmlns:PrintApp="clr-namespace:Icarus"
-      Width="310"
+             Width="300">
-      VerticalAlignment="Center">
+   <Border VerticalAlignment="Center" 
-   <Grid.RowDefinitions>
+           Style="{StaticResource RightPanel_Border}">
-      <RowDefinition Height="Auto"/>
+      <Grid>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <Border Margin="0,0,0,2.5" 
-           Style="{StaticResource Title_Border}">
-      <TextBlock Text="CURRENT MACHINING"
-                 Style="{StaticResource Title_TextBlock}"/>
-   </Border>
-   <Border Grid.Row="1"
-           VerticalAlignment="Center"
-           Margin="0,2.5,0,0"
-           Style="{StaticResource BottomGrayRow_Border}">
-      <Grid Margin="2.5,2.5,2.5,0">
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
          <ScrollViewer VerticalScrollBarVisibility="Auto"
-                       HorizontalScrollBarVisibility="Disabled"
+                       HorizontalScrollBarVisibility="Disabled">
-                       Margin="1,0,0,2.5">
             <ItemsControl Grid.Row="1"
                           ItemsSource="{Binding CurrMachining.CathegoryList}">
                <ItemsControl.ItemsPanel>
@@ -40,154 +27,134 @@
                         <ItemsControl ItemsSource="{Binding MachiningParamList}">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
-                                 <StackPanel Orientation="Vertical"
+                                 <StackPanel Orientation="Vertical"/>
-                                             Margin="0"/>
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.Resources>
                               <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <TextBox Grid.Column="1"
-                                             Text="{Binding sValue}"
+                                             Text="{Binding sValue}"/>
-                                             Margin="2.5,0,2.5,0"
-                                             Style="{StaticResource ParameterList_TextBox}"/>
                                     <Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
                                             IsEnabled="{Binding bIsModifiedFromDb}"
                                             VerticalContentAlignment="Center"
                                             HorizontalContentAlignment="Center"
-                                            Margin="2.5,0,0,0"
+                                            Margin="5,0,0,0"
                                             Style="{StaticResource ToolBar_SmallButton}"/>
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid>
                                     <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="1*"/>
+                                       <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <ComboBox Grid.Column="1"
                                               ItemsSource="{Binding ValueList}"
                                               SelectedItem="{Binding SelValue}"
-                                              HorizontalAlignment="Stretch"
+                                              HorizontalAlignment="Stretch"/>
-                                              Margin="2.5,0,2.5,0"
-                                              Style="{StaticResource RightPanel_ComboBox}"/>
                                     <Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
                                             IsEnabled="{Binding bIsModifiedFromDb}"
                                             VerticalContentAlignment="Center"
                                             HorizontalContentAlignment="Center"
-                                            Margin="2.5,0,0,0"
+                                            Margin="5,0,0,0"
                                             Style="{StaticResource ToolBar_SmallButton}"/>
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
-                                 <Grid Height="22"
+                                 <Grid>
-                                       Margin="0,1,2.5,1">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <CheckBox Grid.Column="1"
                                               IsChecked="{Binding bValue}"
                                               HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"
+                                              VerticalAlignment="Center"/>
-                                              Margin="2.5,0,0,0"/>
                                     <Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
                                             IsEnabled="{Binding bIsModifiedFromDb}"
                                             VerticalContentAlignment="Center"
                                             HorizontalContentAlignment="Center"
-                                            Margin="2.5,0,0,0"
+                                            Margin="5,0,0,0"
                                             Style="{StaticResource ToolBar_SmallButton}"/>
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
-                                 <Grid Height="22"
+                                 <Grid>
-                                       Margin="0,1,2.5,1">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <CheckBox Grid.Column="1"
                                               IsChecked="{Binding bValue}"
                                               HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"
+                                              VerticalAlignment="Center"/>
-                                              Margin="2.5,0,2.5,0"/>
                                     <Button Grid.Column="2"
-                                             Content="R"
+                                            Content="R"
-                                             Command="{Binding ResetParam_Command}"
+                                            Command="{Binding ResetParam_Command}"
-                                             IsEnabled="{Binding bIsModifiedFromDb}"
+                                            IsEnabled="{Binding bIsModifiedFromDb}"
-                                             VerticalContentAlignment="Center"
+                                            VerticalContentAlignment="Center"
-                                             HorizontalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
-                                             Margin="2.5,0,0,0"
+                                            Margin="5,0,0,0"
-                                             Style="{StaticResource ToolBar_SmallButton}"/>
+                                            Style="{StaticResource ToolBar_SmallButton}"/>
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:OrderedMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid>
                                     <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <Grid.RowDefinitions>
-                                               Margin="0,0,2.5,0"
+                                       <RowDefinition Height="Auto"/>
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
+                                       <RowDefinition Height="Auto"/>
-                                    <ListBox Grid.Column="1"
+                                    </Grid.RowDefinitions>
-                                             ItemsSource="{Binding ValueList}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                             SelectedItem="{Binding SelValue}"
+                                    <StackPanel Grid.Column="1"
-                                             Margin="2.5,0,2.5,0"/>
+                                                Orientation="Horizontal"
-                                    <StackPanel Grid.Column="2"
+                                                HorizontalAlignment="Right">
-                                                Orientation="Vertical"
-                                                VerticalAlignment="Center"
-                                                Margin="2.5,0,0,0">
-                                       <Button Content="˄"
-                                                Command="{Binding MoveUpOrder_Command}"
-                                                Margin="0,0,0,2.5"
-                                                Style="{StaticResource ToolBar_SmallButton}"/>
-                                       <Button Content="˅"
-                                                Command="{Binding MoveDownOrder_Command}"
-                                                Margin="0,2.5,0,2.5"
-                                                Style="{StaticResource ToolBar_SmallButton}"/>
                                        <Button Content="&lt;>"
-                                                Command="{Binding ResetOrder_Command}"
+                                               Command="{Binding ResetOrder_Command}"
-                                                Margin="0,2.5,0,2.5"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
-                                                Style="{StaticResource ToolBar_SmallButton}"/>
+                                       <Button Content="˄"
-                                       <Button Content="R"
+                                               Command="{Binding MoveUpOrder_Command}"
-                                                Command="{Binding ResetParam_Command}"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
-                                                IsEnabled="{Binding bIsModifiedFromDb}"
+                                       <Button Content="˅"
-                                                VerticalContentAlignment="Center"
+                                               Command="{Binding MoveDownOrder_Command}"
-                                                HorizontalContentAlignment="Center"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
-                                                Margin="0,2.5,0,0"
+                                       <Button Grid.Column="2"
-                                                Style="{StaticResource ToolBar_SmallButton}"/>
+                                            Content="R"
+                                            Command="{Binding ResetParam_Command}"
+                                            IsEnabled="{Binding bIsModifiedFromDb}"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            Margin="5,0,0,0"
+                                            Style="{StaticResource ToolBar_SmallButton}"/>
                                     </StackPanel>
+                                    <ListBox Grid.ColumnSpan="2"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding ValueList}"
+                                             SelectedItem="{Binding SelValue}"/>
                                  </Grid>
                               </DataTemplate>
-
                            </ItemsControl.Resources>
                         </ItemsControl>
                      </Expander>
@@ -195,29 +162,17 @@
                </ItemsControl.ItemTemplate>
             </ItemsControl>
          </ScrollViewer>
-         <UniformGrid Grid.Row="1" 
+         <UniformGrid Grid.Row="1" Rows="1">
-                      Rows="1"
+            <Button Content="Ok"
-                      Margin="0,2.5,0,0">
+                    Command="{Binding Ok_Command}"
-            <Button Command="{Binding Ok_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                    Margin="0,0,2.5,0"
+            <Button Content="Cancel"
-                    Style="{StaticResource RightPanel_HalfRound_Button}">
+                    Command="{Binding Cancel_Command}"
-               <Image Source="\Resources\Common\Ok.png"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                      Style="{StaticResource Button_Image}"/>
+            <Button Content="Save in Db"
-            </Button>
+                    Command="{Binding SaveInDb_Command}"
-            <Button Command="{Binding Cancel_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                    Margin="0,0,2.5,0"
-                    Style="{StaticResource RightPanel_HalfRound_Button}">
-               <Image Source="\Resources\Common\Cancel.png"
-                      Style="{StaticResource Button_Image}"/>
-            </Button>
-            <Button Command="{Binding SaveInDb_Command}"
-                    ToolTip="{Binding SaveInDb_ToolTip}"
-                    Margin="0,0,2.5,0"
-                    Style="{StaticResource RightPanel_HalfRound_Button}">
-               <Image Source="\Resources\CurrMachining\SaveInDb.png"
-                      Style="{StaticResource Button_Image}"/>
-            </Button>
          </UniformGrid>
       </Grid>
    </Border>
-</Grid>
+</UserControl>

Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb

@@ -18,16 +18,6 @@ Public Class CurrMachiningPanelVM
       Map.refTopPanelVM.UpdateCurrMachining()
    End Sub
 
-#Region "Tooltip"
-
-   Public ReadOnly Property SaveInDb_ToolTip As String
-      Get
-         Return "Save in Db"
-      End Get
-   End Property
-
-#End Region    ' Tooltip
-
    ' Definizione comandi
    Private m_cmdOk As ICommand
    Private m_cmdCancel As ICommand
@@ -69,24 +59,8 @@ 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()
-         Map.refSliceManagerVM.UpdateDimensions()
-      End If
       ' ripristino modalita' standard
       Map.refTopPanelVM.SelPage = Pages.MODIFY
    End Sub

Icarus/CustomControls/CheckedImageRadioButton.xaml

@@ -1,49 +0,0 @@
-<RadioButton x:Class="CheckedImageRadioButton"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <RadioButton.Resources>
-      <SolidColorBrush x:Key="RadioButton.MouseOver.Background" Color="White"/>
-      <SolidColorBrush x:Key="RadioButton.MouseOver.Border" Color="#FF5593FF"/>
-      <SolidColorBrush x:Key="RadioButton.Pressed.Background" Color="#afcfe9"/>
-      <SolidColorBrush x:Key="RadioButton.Pressed.Border" Color="#FF3C77DD"/>
-      <SolidColorBrush x:Key="RadioButton.Disabled.Background" Color="#FFE6E6E6"/>
-      <SolidColorBrush x:Key="RadioButton.Disabled.Border" Color="#FFBCBCBC"/>
-   </RadioButton.Resources>
-   <RadioButton.Template>
-      <ControlTemplate TargetType="{x:Type RadioButton}">
-         <Border x:Name="RadioButtonBorder" 
-                 CornerRadius="4" 
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}" 
-                 BorderThickness="{TemplateBinding BorderThickness}" 
-                 SnapsToDevicePixels="True">
-            <Image x:Name="RadioButtonImage" 
-                   Source="{Binding ImageSource, RelativeSource={RelativeSource AncestorType={x:Type ToggleButton}}}"
-                   Stretch="Uniform"
-                   Focusable="False"
-                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                   Margin="{TemplateBinding Padding}"
-                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-         </Border>
-         <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-               <Setter Property="Background" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.MouseOver.Background}"/>
-               <Setter Property="BorderBrush" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.MouseOver.Border}"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-               <Setter Property="Background" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.Disabled.Background}"/>
-               <Setter Property="BorderBrush" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.Disabled.Border}"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="true">
-               <Setter Property="Background" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.Pressed.Background}"/>
-               <Setter Property="BorderBrush" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.Pressed.Border}"/>
-            </Trigger>
-            <Trigger Property="IsChecked" Value="true">
-               <Setter Property="Source" TargetName="RadioButtonImage" Value="{Binding CheckedImageSource, RelativeSource={RelativeSource AncestorType={x:Type ToggleButton}}}"/>
-               <Setter Property="Background" TargetName="RadioButtonBorder" Value="{StaticResource Icarus_Gray}"/>
-            </Trigger>
-         </ControlTemplate.Triggers>
-      </ControlTemplate>
-   </RadioButton.Template>
-</RadioButton>

Icarus/CustomControls/CheckedImageRadioButton.xaml.vb

@@ -1,25 +0,0 @@
-Public Class CheckedImageRadioButton
-
-   Public Shared ReadOnly ImageSourceProperty As DependencyProperty = DependencyProperty.Register("ImageSource", GetType(String), GetType(CheckedImageRadioButton), New FrameworkPropertyMetadata(""))
-
-   Public Shadows Property ImageSource As String
-      Get
-         Return CStr(MyBase.GetValue(ImageSourceProperty))
-      End Get
-      Set(value As String)
-         MyBase.SetValue(ImageSourceProperty, value)
-      End Set
-   End Property
-
-   Public Shared ReadOnly CheckedImageSourceProperty As DependencyProperty = DependencyProperty.Register("CheckedImageSource", GetType(String), GetType(CheckedImageRadioButton), New FrameworkPropertyMetadata(""))
-
-   Public Shadows Property CheckedImageSource As String
-      Get
-         Return CStr(MyBase.GetValue(CheckedImageSourceProperty))
-      End Get
-      Set(value As String)
-         MyBase.SetValue(ImageSourceProperty, value)
-      End Set
-   End Property
-
-End Class

Icarus/CustomControls/CheckedImageToggleButton.xaml

@@ -1,47 +0,0 @@
-<ToggleButton x:Class="CheckedImageToggleButton"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <ToggleButton.Template>
-      <ControlTemplate TargetType="{x:Type ToggleButton}">
-         <Border Name="ToggleButtonBorder" 
-                 CornerRadius="4"
-                 Background="{TemplateBinding Background}" 
-                 BorderBrush="{TemplateBinding BorderBrush}" 
-                 BorderThickness="{TemplateBinding BorderThickness}" 
-                 SnapsToDevicePixels="true">
-            <Image Name="ToggleButtonImage" 
-                   Height="{DynamicResource ToggleButton.Image.Height}"
-                   Width="{DynamicResource ToggleButton.Image.Width}"
-                   Stretch="Uniform"
-                   Source="{Binding ImageSource, RelativeSource={RelativeSource AncestorType={x:Type ToggleButton}}}" 
-                   Focusable="False" 
-                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                   Margin="{TemplateBinding Padding}" 
-                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-         </Border>
-         <ControlTemplate.Triggers>
-            <Trigger Property="Button.IsDefaulted" Value="true">
-               <Setter Property="BorderBrush" TargetName="ToggleButtonBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-               <Setter Property="Background" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.MouseOver.Background}"/>
-               <Setter Property="BorderBrush" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.MouseOver.Border}"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="true">
-               <Setter Property="Background" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.Pressed.Background}"/>
-               <Setter Property="BorderBrush" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.Pressed.Border}"/>
-            </Trigger>
-            <Trigger Property="IsChecked" Value="true">
-               <Setter Property="Source" TargetName="ToggleButtonImage" Value="{Binding CheckedImageSource, RelativeSource={RelativeSource AncestorType={x:Type ToggleButton}}}"/>
-               <Setter Property="Background" TargetName="ToggleButtonBorder" Value="{StaticResource Icarus_Gray}"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-               <!--<Setter Property="Background" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.Disabled.Background}"/>-->
-               <Setter Property="BorderBrush" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.Disabled.Border}"/>
-               <Setter Property="OpacityMask" Value="#54707070"/>
-            </Trigger>
-         </ControlTemplate.Triggers>
-      </ControlTemplate>
-   </ToggleButton.Template>
-</ToggleButton>

Icarus/CustomControls/CheckedImageToggleButton.xaml.vb

@@ -1,25 +0,0 @@
-Public Class CheckedImageToggleButton
-
-   Public Shared ReadOnly ImageSourceProperty As DependencyProperty = DependencyProperty.Register("ImageSource", GetType(String), GetType(CheckedImageToggleButton), New FrameworkPropertyMetadata(""))
-
-   Public Shadows Property ImageSource As String
-      Get
-         Return CStr(MyBase.GetValue(ImageSourceProperty))
-      End Get
-      Set(value As String)
-         MyBase.SetValue(ImageSourceProperty, value)
-      End Set
-   End Property
-
-   Public Shared ReadOnly CheckedImageSourceProperty As DependencyProperty = DependencyProperty.Register("CheckedImageSource", GetType(String), GetType(CheckedImageToggleButton), New FrameworkPropertyMetadata(""))
-
-   Public Shadows Property CheckedImageSource As String
-      Get
-         Return CStr(MyBase.GetValue(CheckedImageSourceProperty))
-      End Get
-      Set(value As String)
-         MyBase.SetValue(ImageSourceProperty, value)
-      End Set
-   End Property
-
-End Class

Icarus/DispositionPanel/DispositionPanelV.xaml

@@ -1,15 +1,14 @@
 <Grid x:Class="DispositionPanelV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-      xmlns:PrintApp="clr-namespace:Icarus"
+            xmlns:PrintApp="clr-namespace:Icarus"
       VerticalAlignment="Stretch"
-      Margin="5,0,0,0">
+            Margin="5">
-   
    <Grid.Resources>
+      <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
       <PrintApp:FromBooleanToVisibility x:Key="FromBooleanToVisibility"/>
    </Grid.Resources>
-   
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="Auto"/>
       <ColumnDefinition Width="Auto"/>
@@ -24,21 +23,26 @@
       <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
       <RowDefinition Height="1*"/>
    </Grid.RowDefinitions>
-
    <ToggleButton x:Name="MoveBtn" 
                  Grid.Row="3"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
-                 Margin="0,0,0,2.5"
+                 Style="{StaticResource ToolBar_TextToggleButton}"/>
-                 Style="{StaticResource LeftPanel_ToggleButton}"/>
+   <!--<Border Background="Red"
+           Grid.Column="1"
+           Grid.Row="1"
+           Grid.RowSpan="5"
+           Width="50"
+           VerticalAlignment="Stretch"/>-->
 
    <Border x:Name="PopupBrd" 
            Grid.Column="1"
            Grid.Row="1"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
+           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanel_Popup_Border}">
+           Style="{StaticResource LeftPanelPopup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -52,65 +56,132 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="X"
-                       Style="{StaticResource Move_TextBlock}"/>
+                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox2 Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
+            <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                    Grid.Column="1" 
+                                      Grid.Column="1" 
-                                    Margin="5,0,0,0"
+                                      Margin="5,0,0,0"
-                                    Style="{StaticResource LeftPanel_TextBox2}"/>
+                                      Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="1"
-               Margin="0,2.5,0,2.5">
+                  Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Y"
-                       Style="{StaticResource Move_TextBlock}"/>
+                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox2 Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
+            <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                    Grid.Column="1" 
+                                      Grid.Column="1" 
-                                    Margin="5,0,0,0"
+                                      Margin="5,0,0,0"
-                                    Style="{StaticResource LeftPanel_TextBox2}"/>
+                                      Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="2"
-               Margin="0,2.5,0,2.5">
+                  Margin="0,2.5,0,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Z"
-                       Style="{StaticResource Move_TextBlock}"/>
+                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox2 Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
+            <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                    Grid.Column="1" 
+                                      Grid.Column="1" 
-                                    Margin="5,0,0,0"
+                                      Margin="5,0,0,0"
-                                    Style="{StaticResource LeftPanel_TextBox2}"/>
+                                      Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="3"
-               Margin="0,2.5,0,0">
+                  Margin="0,2.5,0,0">
             <Button Content="Drag"
-                    Command="{Binding DragMove_Command}"
+                       Command="{Binding DragMove_Command}"
-                    Style="{StaticResource LeftPanel_TextButton}"/>
+                       Style="{StaticResource LeftPanel_TextButton}"/>
          </Grid>
       </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}"
-                 Margin="0,2.5,0,0"
+                 Style="{StaticResource ToolBar_TextToggleButton}"/>
-                 Style="{StaticResource LeftPanel_ToggleButton}"/>
+   <!--<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"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
+           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           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"
@@ -126,17 +197,54 @@
                             IsChecked="{Binding RotZ}"
                             Style="{StaticResource ToolBar_ToggleButton}"/>
          </UniformGrid>
-         <EgtWPFLib5:EgtTextBox2 Grid.Row="1"
+         <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                 Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
+                                   Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                 ResetValueOnLostFocus="False"
+                                   Margin="0,5,0,0"/>
-                                 Margin="0,5,0,2.5"/>
          <Grid Grid.Row="2"
-               Margin="0,2.5,0,0">
+                  Margin="0,2.5,0,0">
             <Button Content="Drag"
-                    Command="{Binding DragRotate_Command}"
+                       Command="{Binding DragRotate_Command}"
-                    Style="{StaticResource LeftPanel_TextButton}"/>
+                       Style="{StaticResource LeftPanel_TextButton}"/>
          </Grid>
       </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,7 +20,25 @@ Public Class DispositionPanelVM
          EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
          Dim dNewXPos As Double = ptReference.x
          StringToLen(value, dNewXPos)
-         Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
+         Dim b3Print As New BBox3d
+         EgtGetBBoxGlob(Map.refTopPanelVM.SelPart.nPrintSolidId, GDB_BB.EXACT, b3Print)
+         If EgtGetGroupObjs(Map.refTopPanelVM.SelPart.nRibsLayerId) > 0 Then
+            Dim b3Ribs As New BBox3d()
+            Dim nRibId As Integer = EgtGetFirstInGroup(Map.refTopPanelVM.SelPart.nRibsLayerId)
+            While nRibId <> GDB_ID.NULL
+               Dim nRibType As Integer = Machining.MPAR_RIBSTYPE.INTERNAL
+               EgtGetInfo(nRibId, MAC_RIBSTYPE, nRibType)
+               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 b3Ribs.Min.x <> INFINITO Then
+               b3Print.Add(b3Ribs)
+            End If
+         End If
          Dim dMin As Double = 0
          Dim dMax As Double = CurrentMachine.b3Tab.DimX
          If b3Print.Max.x > ptReference.x Then
@@ -29,18 +47,13 @@ Public Class DispositionPanelVM
          If b3Print.Min.x < ptReference.x Then
             dMin += ptReference.x - b3Print.Min.x
          End If
-         ' riduco a spostamento massimo
+         If dNewXPos >= dMin AndAlso dNewXPos <= dMax Then
-         If dNewXPos < dMin Then
+            EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(dNewXPos, ptReference.y, ptReference.z) - ptReference, GDB_RT.GLOB)
-            dNewXPos = dMin
+            Map.refReferencePanelVM.UpdateFramePosition()
-         ElseIf dNewXPos > dMax Then
+            EgtDraw()
-            dNewXPos = dMax
+         Else
+            NotifyPropertyChanged(NameOf(sXPos))
          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
 
@@ -59,7 +72,25 @@ Public Class DispositionPanelVM
          EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
          Dim dNewYPos As Double = ptReference.y
          StringToLen(value, dNewYPos)
-         Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
+         Dim b3Print As New BBox3d
+         EgtGetBBoxGlob(Map.refTopPanelVM.SelPart.nPrintSolidId, GDB_BB.EXACT, b3Print)
+         If EgtGetGroupObjs(Map.refTopPanelVM.SelPart.nRibsLayerId) > 0 Then
+            Dim b3Ribs As New BBox3d()
+            Dim nRibId As Integer = EgtGetFirstInGroup(Map.refTopPanelVM.SelPart.nRibsLayerId)
+            While nRibId <> GDB_ID.NULL
+               Dim nRibType As Integer = Machining.MPAR_RIBSTYPE.INTERNAL
+               EgtGetInfo(nRibId, MAC_RIBSTYPE, nRibType)
+               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 b3Ribs.Min.x <> INFINITO Then
+               b3Print.Add(b3Ribs)
+            End If
+         End If
          Dim dMin As Double = 0
          Dim dMax As Double = CurrentMachine.b3Tab.DimY
          If b3Print.Max.y > ptReference.y Then
@@ -68,18 +99,13 @@ Public Class DispositionPanelVM
          If b3Print.Min.y < ptReference.y Then
             dMin += ptReference.y - b3Print.Min.y
          End If
-         ' riduco a spostamento massimo
+         If dNewYPos >= dMin AndAlso dNewYPos <= dMax Then
-         If dNewYPos < dMin Then
+            EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(ptReference.x, dNewYPos, ptReference.z) - ptReference, GDB_RT.GLOB)
-            dNewYPos = dMin
+            Map.refReferencePanelVM.UpdateFramePosition()
-         ElseIf dNewyPos > dMax Then
+            EgtDraw()
-            dNewYPos = dMax
+         Else
+            NotifyPropertyChanged(NameOf(sYPos))
          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
 
@@ -87,7 +113,7 @@ Public Class DispositionPanelVM
       Get
          If Not IsNothing(Map.refTopPanelVM.SelPart) Then
             Dim ptReference As New Point3d
-            EgtStartPoint(Map.refTopPanelVM.SelPart.nPartReferenceId, GDB_ID.ROOT, ptReference)
+            EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
             Return LenToString(ptReference.z, 1)
          Else
             Return ""
@@ -95,70 +121,19 @@ Public Class DispositionPanelVM
       End Get
       Set(value As String)
          Dim ptReference As New Point3d
-         EgtStartPoint(Map.refTopPanelVM.SelPart.nPartReferenceId, GDB_ID.ROOT, ptReference)
+         EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
          Dim dNewZPos As Double = ptReference.z
          StringToLen(value, dNewZPos)
-         Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
+         If dNewZPos >= 0 Then
-         Dim dMin As Double = 0
+            EgtMove(Map.refTopPanelVM.SelPart.nPartId, New Point3d(ptReference.x, ptReference.y, dNewZPos) - ptReference, GDB_RT.GLOB)
-         If b3Print.Min.z < ptReference.z Then
+            Map.refReferencePanelVM.UpdateFramePosition()
-            dMin += ptReference.z - b3Print.Min.z
+            EgtDraw()
+         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.nPartReferenceId, 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
@@ -210,25 +185,19 @@ Public Class DispositionPanelVM
             Return
          End If
          Dim vtMovedPart As Vector3d
-         If EgtGetInfo(Map.refTopPanelVM.SelPart.nPartId, KEY_MOVEDPART, vtMovedPart) Then
+         if EgtGetInfo(Map.refTopPanelVM.SelPart.nPartId, "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, KEY_MOVEDPART)
+            EgtRemoveInfo(Map.refTopPanelVM.SelPart.nPartId, "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))
@@ -395,6 +364,26 @@ Public Class DispositionPanelVM
 
 End Class
 
+Public Class CenterToolTipConverter
+   Implements IMultiValueConverter
+
+   Public Function Convert(ByVal values As Object(), ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IMultiValueConverter.Convert
+      For Each value In values
+         If TypeOf (value) IsNot Double Then
+            Return Double.NaN
+         End If
+      Next
+      Dim placementTargetHeight As Double = CDbl(values(0))
+      Dim toolTipHeight As Double = CDbl(values(1))
+      Return (placementTargetHeight / 2.0) - (toolTipHeight / 2.0)
+   End Function
+
+   Public Function ConvertBack(ByVal value As Object, ByVal targetTypes As Type(), ByVal parameter As Object, ByVal culture As CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
+      Throw New NotSupportedException()
+   End Function
+
+End Class
+
 Public Class FromBooleanToVisibility
    Implements IValueConverter
 

Icarus/FilledSolidPanel/FilledSolidPanelV.xaml

@@ -1,361 +0,0 @@
-<Grid x:Class="FilledSolidPanelV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-            xmlns:PrintApp="clr-namespace:Icarus"
-            Margin="5">
-   <Grid.Resources>
-      <PrintApp:FromBooleanToVisibility x:Key="FromBooleanToVisibility"/>
-   </Grid.Resources>
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="Auto"/>
-      <ColumnDefinition Width="Auto"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
-      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
-      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
-      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <ComboBox Grid.Row="3"
-             ItemsSource="{Binding FilledSolidList}"
-             SelectedItem="{Binding SelFilledSolid}"
-             IsEnabled="{Binding FilledSolidList_IsEnabled}"
-             DisplayMemberPath="ghName"
-             Style="{StaticResource LeftPanel_ComboBox}"/>
-   <!--Add Button-->
-   <ToggleButton x:Name="AddBtn" 
-                 Grid.Row="4"
-                 Content="Add"
-                 IsChecked="{Binding bAdd_IsChecked}"
-                 Margin="0,2.5,0,2.5"
-                 Style="{StaticResource LeftPanel_ToggleButton}"/>
-   <Border Grid.Column="1"
-           Grid.Row="3"
-           Grid.RowSpan="3"
-           VerticalAlignment="Center"
-           Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanel_PopupButton_Border}">
-      <Grid>
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Button Grid.Column="0"
-                 Command="{Binding Import_Command}"
-                 ToolTip="{Binding Import_ToolTip}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/ProjectManager/Import.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="1"
-                 Command="{Binding Line2P_Command}"
-                 ToolTip="{Binding Line2P_ToolTip}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Line2P.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-      </Grid>
-   </Border>
-   <!--Edit Button-->
-   <ToggleButton x:Name="EditBtn"
-                 Grid.Row="5"
-                 Content="Edit"
-                 IsChecked="{Binding bEdit_IsChecked}"
-                 Margin="0,2.5,0,2.5"
-                 Style="{StaticResource LeftPanel_ToggleButton}"/>
-   <Border Grid.Column="1"
-           Grid.Row="4"
-           Grid.RowSpan="3"
-           VerticalAlignment="Center"
-           Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanel_PopupButton_Border}">
-      <Grid>
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Button Grid.Column="0"
-                 Command="{Binding Delete_Command}"
-                 ToolTip="{Binding Delete_ToolTip}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Delete.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="1"
-                 Command="{Binding ModifyCurve_Command}"
-                 ToolTip="{Binding ModifyCurve_ToolTip}"
-                 Visibility="{Binding Compo_Visibility}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/ModifyCurve.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="2"
-                 Command="{Binding AddPointCurve_Command}"
-                 ToolTip="{Binding AddPointCurve_ToolTip}"
-                 Visibility="{Binding Compo_Visibility}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/AddPointCurve.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="3"
-                 Command="{Binding RemovePointCurve_Command}"
-                 ToolTip="{Binding RemovePointCurve_ToolTip}"
-                 Visibility="{Binding Compo_Visibility}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/RemovePointCurve.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="4"
-                 Command="{Binding Extrude_Command}"
-                 ToolTip="{Binding Extrude_ToolTip}"
-                 Visibility="{Binding Compo_Visibility}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Extrude.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-      </Grid>
-   </Border>
-   <!--Grid Button-->
-   <ToggleButton x:Name="GridBtn"
-                 Grid.Row="6"
-                 Content="Grid"
-                 IsChecked="{Binding bGrid_IsChecked}"
-                 IsEnabled="{Binding bGrid_IsEnabled}"
-                 Margin="0,2.5,0,2.5"
-                 Style="{StaticResource LeftPanel_ToggleButton}"/>
-   <Border Grid.Column="1"
-           Grid.Row="5"
-           Grid.RowSpan="3"
-           VerticalAlignment="Center"
-           Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanel_PopupButton_Border}">
-      <Grid>
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Button Command="{Binding CPlaneTop_Command}" 
-                 ToolTip="{Binding CPlaneTop_ToolTip}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="1"
-                 Command="{Binding CPlaneFront_Command}" 
-                 ToolTip="{Binding CPlaneFront_ToolTip}" 
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="2" 
-                 Command="{Binding CPlaneRight_Command}" 
-                 ToolTip="{Binding CPlaneRight_ToolTip}" 
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="3"
-                 Command="{Binding CPlaneBack_Command}" 
-                 ToolTip="{Binding CPlaneBack_ToolTip}" 
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="4"
-                 Command="{Binding CPlaneLeft_Command}"
-                 ToolTip="{Binding CPlaneLeft_ToolTip}" 
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="5"
-                 Command="{Binding CPlaneBottom_Command}"
-                 ToolTip="{Binding CPlaneBottom_ToolTip}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="6" 
-                 Command="{Binding CPlaneElevation_Command}" 
-                 ToolTip="{Binding CPlaneElevation_ToolTip}" 
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="7"
-                 Command="{Binding CPlaneOrigin_Command}"
-                 ToolTip="{Binding CPlaneOrigin_ToolTip}" 
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <Button Grid.Column="8"
-                 Command="{Binding CPlaneObj_Command}"
-                 ToolTip="{Binding CPlaneObj_ToolTip}" 
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-      </Grid>
-   </Border>
-   <!--Move Button-->
-   <ToggleButton x:Name="MoveBtn" 
-                 Grid.Row="7"
-                 Content="Move"
-                 IsChecked="{Binding bMove_IsChecked}"
-                 Margin="0,2.5,0,2.5"
-                 Style="{StaticResource LeftPanel_ToggleButton}"/>
-   <Border Grid.Column="1"
-           Grid.Row="5"
-           Grid.RowSpan="5"
-           VerticalAlignment="Center"
-           Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanel_Popup_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"
-                       Style="{StaticResource Move_TextBlock}"/>
-            <EgtWPFLib5:EgtTextBox2 Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                    Grid.Column="1" 
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource LeftPanel_TextBox2}"/>
-         </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"
-                       Style="{StaticResource Move_TextBlock}"/>
-            <EgtWPFLib5:EgtTextBox2 Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                    Grid.Column="1" 
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource LeftPanel_TextBox2}"/>
-         </Grid>
-         <Grid Grid.Row="2"
-               Margin="0,2.5,0,2.5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <TextBlock Text="Z"
-                       Style="{StaticResource Move_TextBlock}"/>
-            <EgtWPFLib5:EgtTextBox2 Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                    Grid.Column="1" 
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource LeftPanel_TextBox2}"/>
-         </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>
-   <!--Rotate Button-->
-   <ToggleButton x:Name="RotateBtn"
-                 Grid.Row="8"
-                 Content="Rotate"
-                 IsChecked="{Binding bRotate_IsChecked}"
-                 Margin="0,2.5,0,2.5"
-                 Style="{StaticResource LeftPanel_ToggleButton}"/>
-   <Border Grid.Column="1"
-           Grid.Row="6"
-           Grid.RowSpan="5"
-           VerticalAlignment="Center"
-           Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanel_Popup_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 RotX}"
-                         Style="{StaticResource ToolBar_ToggleButton}"/>
-            <RadioButton Content="Y"
-                         GroupName="Axes"
-                         IsChecked="{Binding RotY}"
-                         Style="{StaticResource ToolBar_ToggleButton}"/>
-            <RadioButton Content="Z"
-                         GroupName="Axes"
-                         IsChecked="{Binding RotZ}"
-                         Style="{StaticResource ToolBar_ToggleButton}"/>
-         </UniformGrid>
-         <EgtWPFLib5:EgtTextBox2 Grid.Row="1"
-                                 Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                 ResetValueOnLostFocus="False"
-                                 Margin="0,5,0,2.5"/>
-         <Grid Grid.Row="2"
-               Margin="0,2.5,0,0">
-            <Button Content="Drag"
-                    Command="{Binding DragRotate_Command}"
-                    Style="{StaticResource LeftPanel_TextButton}"/>
-         </Grid>
-      </Grid>
-   </Border>
-   <!--Parameters Button-->
-   <ToggleButton Content="Parameters"
-                 Grid.Row="9"
-                 IsChecked="{Binding bMachParam_IsChecked}"
-                 Margin="0,2.5,0,2.5"
-                 Style="{StaticResource LeftPanel_Parameters_ToggleButton}"/>
-
-</Grid>

Icarus/FilledSolidPanel/FilledSolidPanelV.xaml.vb

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

Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml

@@ -1,100 +0,0 @@
-<Grid x:Class="FilledSolidParamPanelV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:PrintApp="clr-namespace:Icarus"
-      Width="310"
-      VerticalAlignment="Center">
-   <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <Border Margin="0,0,0,2.5"
-           Style="{StaticResource Title_Border}">
-      <TextBlock Text="REDUCE SHELL NUMBER PARAMETERS"
-                 Style="{StaticResource Title_TextBlock}"/>
-   </Border>
-   <Border Grid.Row="1"
-           Padding="0,2.5,0,0"
-           Margin="0,2.5,0,0"
-           Style="{StaticResource BottomGrayRow_Border}">
-      <Grid Margin="2.5,2.5,2.5,0">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
-         <ScrollViewer VerticalScrollBarVisibility="Auto"
-                       HorizontalScrollBarVisibility="Disabled">
-            <ItemsControl ItemsSource="{Binding MachiningParamList}">
-               <ItemsControl.ItemsPanel>
-                  <ItemsPanelTemplate>
-                     <UniformGrid Columns="1"
-                                    HorizontalAlignment="Stretch"/>
-                  </ItemsPanelTemplate>
-               </ItemsControl.ItemsPanel>
-               <ItemsControl.Resources>
-                  <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                     <Grid Margin="0,1,2.5,1">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="2*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="{Binding sName}"
-                                   Margin="0,0,2.5,0"
-                                   Style="{StaticResource ParameterList_TextBlock}"/>
-                        <TextBox Grid.Column="1"
-                                 Text="{Binding sValue}"
-                                 Margin="2.5,0,2.5,0"
-                                 Style="{StaticResource ParameterList_TextBox}"/>
-                        <Button Grid.Column="2"
-                                Content="R"
-                                Command="{Binding ResetParam_Command}"
-                                IsEnabled="{Binding bIsModifiedFromPart}"
-                                VerticalContentAlignment="Center"
-                                HorizontalContentAlignment="Center"
-                                Margin="2.5,0,0,0"
-                                Style="{StaticResource ToolBar_SmallButton}"/>
-                     </Grid>
-                  </DataTemplate>
-                  <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                     <Grid Margin="0,1,2.5,1">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="2*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="{Binding sName}"
-                                   Margin="0,0,2.5,0"
-                                   Style="{StaticResource ParameterList_TextBlock}"/>
-                        <ComboBox Grid.Column="1"
-                                  ItemsSource="{Binding ValueList}"
-                                  SelectedItem="{Binding SelValue}"
-                                  HorizontalAlignment="Stretch"
-                                  Margin="2.5,0,2.5,0"
-                                  Style="{StaticResource RightPanel_ComboBox}"/>
-                        <Button Grid.Column="2"
-                                Content="R"
-                                Command="{Binding ResetParam_Command}"
-                                IsEnabled="{Binding bIsModifiedFromPart}"
-                                VerticalContentAlignment="Center"
-                                HorizontalContentAlignment="Center"
-                                Margin="2.5,0,0,0"
-                                Style="{StaticResource ToolBar_SmallButton}"/>
-                     </Grid>
-                  </DataTemplate>
-               </ItemsControl.Resources>
-            </ItemsControl>
-         </ScrollViewer>
-         <UniformGrid Grid.Row="1"
-                      Rows="1"
-                      Margin="0,2.5,0,0">
-            <Button Content="Ok"
-                    Command="{Binding Ok_Command}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            <Button Content="Cancel"
-                    Command="{Binding Cancel_Command}"
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
-         </UniformGrid>
-      </Grid>
-   </Border>
-</Grid>

Icarus/FilledSolidParamPanel/FilledSolidParamPanelV.xaml.vb

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

Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb

@@ -1,441 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.Reflection
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class FilledSolidParamPanelVM
-   Inherits MachiningCathegory
-
-#Region "FIELDS & PROPERTIES"
-
-   ' Definizione comandi
-   Private m_cmdOk As ICommand
-   Private m_cmdCancel As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTORS"
-
-   Sub New()
-      ' Creo riferimento a questa classe in EgtCAM5Map
-      Map.SetRefFilledSolidParamPanelVM(Me)
-   End Sub
-
-#End Region    ' CONSTRUCTORS
-
-#Region "METHODS"
-
-   Friend Sub Init()
-      If IsNothing(Map.refFilledSolidPanelVM.SelFilledSolid) Then
-         ' ripristino modalita' standard
-         Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
-         Return
-      End If
-      Dim nPartId As Integer = Map.refTopPanelVM.SelPart.nPartId
-      Dim nFilledSolidId As Integer = GDB_ID.NULL
-      Select Case Map.refFilledSolidPanelVM.SelFilledSolid.Type
-         Case RibEntity.RibTypes.FROMDRAW
-            nFilledSolidId = Map.refFilledSolidPanelVM.SelFilledSolid.nCurveId
-         Case RibEntity.RibTypes.FROMIMPORT
-            nFilledSolidId = Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId
-      End Select
-
-      m_Type = Cathegories.AUX_SOLID
-      m_sName = "Filled Solid"
-      m_MachiningParamList = New List(Of MachiningParam)({New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSOVERLAP, nFilledSolidId, nPartId),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSINFILL, nFilledSolidId, nPartId),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSSTRANDORDER, nFilledSolidId, nPartId),
-                                                          New FilledSolidComboMachiningParam(MachiningParam.Params.AUXSOLIDSLINKTYPE, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSLINKPARAM, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSCOASTINGLEN, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPELEN, nFilledSolidId, nPartId),
-                                                          New FilledSolidNumericMachiningParam(MachiningParam.Params.AUXSOLIDSWIPEDIR, nFilledSolidId, nPartId)})
-      NotifyPropertyChanged(NameOf(MachiningParamList))
-      NotifyPropertyChanged(NameOf(sName))
-   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()
-      Next
-   End Sub
-
-   Friend Sub WriteParamsInFilledSolid(nRibId As Integer)
-      ' se parametri modificati
-      Dim bModified As Boolean = False
-      For Each Param In m_MachiningParamList
-         Select Case Param.GetType()
-            Case GetType(FilledSolidNumericMachiningParam)
-               Dim NumericParam As FilledSolidNumericMachiningParam = TryCast(Param, FilledSolidNumericMachiningParam)
-               If NumericParam.bIsModified AndAlso Not bModified Then bModified = True
-               NumericParam.WriteParamInFilledSolid(nRibId)
-            Case GetType(FilledSolidComboMachiningParam)
-               Dim NumericParam As FilledSolidComboMachiningParam = TryCast(Param, FilledSolidComboMachiningParam)
-               If NumericParam.bIsModified AndAlso Not bModified Then bModified = True
-               NumericParam.WriteParamInFilledSolid(nRibId)
-         End Select
-      Next
-      If bModified Then
-         ' Imposto flag di ricalcolo slice
-         EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
-      End If
-   End Sub
-
-#End Region    ' METHODS
-
-#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 Not IsNothing(Map.refFilledSolidPanelVM.SelFilledSolid) Then
-         ' scrivo i parametri modificati
-         Select Case Map.refFilledSolidPanelVM.SelFilledSolid.Type
-            Case FilledSolidEntity.FilledSolidTypes.FROMDRAW
-               WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nCurveId)
-               WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId)
-            Case FilledSolidEntity.FilledSolidTypes.FROMIMPORT
-               WriteParamsInFilledSolid(Map.refFilledSolidPanelVM.SelFilledSolid.nExtrusionId)
-         End Select
-      End If
-      ' ripristino modalita' standard
-      Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
-      Map.refFilledSolidPanelVM.ResetMachParamIsChecked()
-   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.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.NULL)
-      Map.refFilledSolidPanelVM.ResetMachParamIsChecked()
-   End Sub
-
-#End Region    ' Cancel
-
-#End Region    ' COMMANDS
-
-End Class
-
-Public Class FilledSolidNumericMachiningParam
-   Inherits NumericMachiningParam
-
-   Public Overrides Property sValue As String
-      Get
-         Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue)
-      End Get
-      Set(value As String)
-         If m_bIsLen Then
-            StringToLen(value, m_dValue)
-         Else
-            m_dValue = value
-         End If
-         NotifyPropertyChanged(NameOf(sValue))
-         NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
-      End Set
-   End Property
-
-   Private m_dPartValue As Double
-   Public ReadOnly Property dPartValue As Double
-      Get
-         Return m_dPartValue
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsModifiedFromPart As Boolean
-      Get
-         Return m_dValue <> m_dPartValue
-      End Get
-   End Property
-
-   ' Definizione comandi
-   Private m_cmdResetParam As ICommand
-
-   Sub New(Type As Params, nFilledSolidId As Integer, nPartId As Integer)
-      MyBase.New(Type)
-      Dim bReadFromPart As Boolean = False
-      Select Case Type
-         Case Params.AUXSOLIDSOVERLAP
-            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, m_dValue)
-            EgtGetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, m_dPartValue)
-            m_bIsLen = True
-         Case Params.AUXSOLIDSLINKPARAM
-            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM, m_dValue)
-            EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKPARAM, m_dPartValue)
-            m_bIsLen = True
-         Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
-            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dValue)
-            EgtGetInfo(nPartId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, m_dPartValue)
-            m_bIsLen = True
-         Case Params.AUXSOLIDSCOASTINGLEN
-            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN, m_dValue)
-            EgtGetInfo(nPartId, MAC_AUXSOLIDSCOASTINGLEN, m_dPartValue)
-            m_bIsLen = True
-         Case Params.AUXSOLIDSWIPELEN
-            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN, m_dValue)
-            EgtGetInfo(nPartId, MAC_AUXSOLIDSWIPELEN, m_dPartValue)
-            m_bIsLen = True
-         Case Params.AUXSOLIDSWIPEDIR
-            bReadFromPart = EgtGetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR, m_dValue)
-            EgtGetInfo(nPartId, MAC_AUXSOLIDSWIPEDIR, m_dPartValue)
-            m_bIsLen = True
-      End Select
-      m_dOrigValue = m_dValue
-      If Not bReadFromPart Then
-         m_dValue = m_dPartValue
-         m_dOrigValue = m_dPartValue
-      End If
-   End Sub
-
-   Friend Sub WriteParamInFilledSolid(nFilledSolidId As Integer)
-      Dim sWriteValue As String = ""
-      If m_bIsLen Then
-         sWriteValue = LenToString(m_dValue, 2)
-      Else
-         sWriteValue = DoubleToString(m_dValue, 2)
-      End If
-      Select Case Type
-         Case Params.AUXSOLIDSOVERLAP
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP, sWriteValue)
-            Else
-               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSOVERLAP)
-            End If
-         Case Params.AUXSOLIDSLINKPARAM
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM, sWriteValue)
-            Else
-               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSLINKPARAM)
-            End If
-         Case Params.AUXSOLIDSSTARTPOINTOFFSETONSLICE
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE, sWriteValue)
-            Else
-               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSSTARTPOINTOFFSETONSLICE)
-            End If
-         Case Params.AUXSOLIDSCOASTINGLEN
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN, sWriteValue)
-            Else
-               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSCOASTINGLEN)
-            End If
-         Case Params.AUXSOLIDSWIPELEN
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN, sWriteValue)
-            Else
-               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSWIPELEN)
-            End If
-         Case Params.AUXSOLIDSWIPEDIR
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR, sWriteValue)
-            Else
-               EgtRemoveInfo(nFilledSolidId, MAC_AUXSOLIDSWIPEDIR)
-            End If
-      End Select
-   End Sub
-
-   Friend Overrides Sub SaveParam()
-      m_dOrigValue = m_dValue
-   End Sub
-
-   Friend Overrides Sub ResetParam()
-      m_dValue = m_dOrigValue
-   End Sub
-
-#Region "COMMANDS"
-
-#Region "ResetParam"
-
-   Public ReadOnly Property ResetParam_Command As ICommand
-      Get
-         If m_cmdResetParam Is Nothing Then
-            m_cmdResetParam = New Command(AddressOf ResetParamCmd)
-         End If
-         Return m_cmdResetParam
-      End Get
-   End Property
-
-   Public Sub ResetParamCmd()
-      m_dValue = m_dPartValue
-      NotifyPropertyChanged(NameOf(sValue))
-      NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
-   End Sub
-
-#End Region    ' ResetParam
-
-#End Region    ' COMMANDS
-
-End Class
-
-Public Class FilledSolidComboMachiningParam
-   Inherits ComboMachiningParam
-
-   Public Overrides Property SelValue As IdNameStruct
-      Get
-         Return m_SelValue
-      End Get
-      Set(value As IdNameStruct)
-         m_SelValue = value
-         NotifyPropertyChanged(NameOf(SelValue))
-         NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
-      End Set
-   End Property
-
-   Protected m_PartSelValue As IdNameStruct
-   Public ReadOnly Property PartSelValue As IdNameStruct
-      Get
-         Return m_PartSelValue
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsModifiedFromPart As Boolean
-      Get
-         Return m_SelValue.Id <> m_PartSelValue.Id
-      End Get
-   End Property
-
-   ' Definizione comandi
-   Private m_cmdResetParam As ICommand
-
-   Sub New(Type As Params, nRibId As Integer, nPartId As Integer)
-      MyBase.New(Type)
-      Dim bReadFromRib As Boolean = False
-      Dim bReadFromPart As Boolean = False
-      Select Case Type
-         Case Params.AUXSOLIDSINFILL
-            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_INFILL.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_INFILL.OFFSET, "Offset"),
-                                                     New IdNameStruct(Machining.MPAR_INFILL.ZIGZAG, "ZigZag")})
-            Dim nSelValue As Integer = 1
-            bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSINFILL, nSelValue)
-            If bReadFromRib Then
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
-            End If
-            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSINFILL, nSelValue)
-            m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
-         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")})
-            Dim nSelValue As Integer = 1
-            bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER, nSelValue)
-            If bReadFromRib Then
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
-            End If
-            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSSTRANDORDER, nSelValue)
-            m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
-         Case Params.AUXSOLIDSLINKTYPE
-            m_ValueList = New List(Of IdNameStruct)({New IdNameStruct(Machining.MPAR_LINKTYPES.NONE, "None"),
-                                                     New IdNameStruct(Machining.MPAR_LINKTYPES.LINEAR, "Linear"),
-                                                     New IdNameStruct(Machining.MPAR_LINKTYPES.BIARC, "Biarc")})
-            Dim nSelValue As Integer = 1
-            bReadFromRib = EgtGetInfo(nRibId, MAC_AUXSOLIDSLINKTYPE, nSelValue)
-            If bReadFromRib Then
-               m_SelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
-            End If
-            bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKTYPE, nSelValue)
-            m_PartSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = nSelValue)
-      End Select
-      m_OrigSelValue = m_SelValue
-      If Not bReadFromRib Then
-         If bReadFromPart Then
-            m_SelValue = m_PartSelValue
-            m_OrigSelValue = m_PartSelValue
-         Else
-            Select Case Type
-               Case Params.AUXSOLIDSINFILL
-                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_INFILL.NONE)
-                  m_SelValue = m_OrigSelValue
-               Case Params.AUXSOLIDSSTRANDORDER
-                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_STRANDORDERS.OUTTOIN)
-                  m_SelValue = m_OrigSelValue
-               Case Params.AUXSOLIDSLINKTYPE
-                  m_OrigSelValue = m_ValueList.FirstOrDefault(Function(x) x.Id = Machining.MPAR_LINKTYPES.NONE)
-                  m_SelValue = m_OrigSelValue
-            End Select
-         End If
-      End If
-   End Sub
-
-   Friend Sub WriteParamInFilledSolid(nRibId As Integer)
-      Select Case Type
-         Case Params.AUXSOLIDSINFILL
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nRibId, MAC_AUXSOLIDSINFILL, m_SelValue.Id)
-            Else
-               EgtRemoveInfo(nRibId, MAC_AUXSOLIDSINFILL)
-            End If
-         Case Params.AUXSOLIDSSTRANDORDER
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER, m_SelValue.Id)
-            Else
-               EgtRemoveInfo(nRibId, MAC_AUXSOLIDSSTRANDORDER)
-            End If
-         Case Params.AUXSOLIDSLINKTYPE
-            If bIsModifiedFromPart Then
-               EgtSetInfo(nRibId, MAC_AUXSOLIDSLINKTYPE, m_SelValue.Id)
-            Else
-               EgtRemoveInfo(nRibId, MAC_AUXSOLIDSLINKTYPE)
-            End If
-      End Select
-   End Sub
-
-   Friend Overrides Sub SaveParam()
-      m_OrigSelValue = m_SelValue
-   End Sub
-
-   Friend Overrides Sub ResetParam()
-      m_SelValue = m_OrigSelValue
-   End Sub
-
-#Region "COMMANDS"
-
-#Region "ResetParam"
-
-   Public ReadOnly Property ResetParam_Command As ICommand
-      Get
-         If m_cmdResetParam Is Nothing Then
-            m_cmdResetParam = New Command(AddressOf ResetParamCmd)
-         End If
-         Return m_cmdResetParam
-      End Get
-   End Property
-
-   Public Sub ResetParamCmd()
-      m_SelValue = m_PartSelValue
-      NotifyPropertyChanged(NameOf(SelValue))
-      NotifyPropertyChanged(NameOf(bIsModifiedFromPart))
-   End Sub
-
-#End Region    ' ResetParam
-
-#End Region    ' COMMANDS
-
-
-End Class

Icarus/HelpWnd/HelpWndV.xaml

@@ -0,0 +1,19 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="HelpWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:CefSharpWpf="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:local="clr-namespace:Icarus"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
+                            MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize">
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <local:CustomMenuHandler x:Key="CustomMenuHandler"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+   <CefSharpWpf:ChromiumWebBrowser x:Name="Browser"
+                                   MenuHandler="{StaticResource CustomMenuHandler}"/>
+   <!--<CefSharpWpf:ChromiumWebBrowser x:Name="Browser"
+                                   Address="c:\EgtData\Icarus\Help\lm_1170\\index.html"
+                                   MenuHandler="{StaticResource CustomMenuHandler}"/>-->
+
+</EgtWPFLib5:EgtCustomWindow>

Icarus/HelpWnd/HelpWndV.xaml.vb

@@ -0,0 +1,26 @@
+Imports System.Diagnostics.Eventing
+Imports System.IO
+Imports System.Reflection
+
+Public Class HelpWndV
+
+   Private WithEvents m_HelpWndVM As HelpWndVM
+
+   Sub New(Owner As Window, HelpWndVM As HelpWndVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = HelpWndVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_HelpWndVM = HelpWndVM
+      'm_HelpWndVM.SetWebBrowser(WebBrowser)
+      Browser.ResourceRequestHandlerFactory = New ResourceHandlerFactory
+
+      Browser.Address = "Icarus.pdf#toolbar=0"
+   End Sub
+
+   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_HelpWndVM.m_CloseWindow
+   '   Me.DialogResult = bDialogResult
+   'End Sub
+
+End Class

Icarus/HelpWnd/HelpWndVM.vb

@@ -0,0 +1,20 @@
+Public Class HelpWndVM
+
+   'Private m_WebBrowser As WebBrowser
+   'Public ReadOnly Property WebBrowser As WebBrowser
+   '   Get
+   '      Return m_WebBrowser
+   '   End Get
+   'End Property
+   'Friend Sub SetWebBrowser(value As WebBrowser)
+   '   m_WebBrowser = value
+   'End Sub
+
+   Sub New()
+   End Sub
+
+   Friend Sub LoadHtml()
+      'm_WebBrowser.Source = New Uri("c:\EgtData\Icarus\Help\lm_1170\index.html")
+   End Sub
+
+End Class

Icarus/HelpWnd/ResourceHandler.vb

@@ -0,0 +1,145 @@
+Imports System.Collections.Specialized
+Imports System.IO
+Imports System.Runtime.InteropServices
+Imports System.Windows.Forms
+Imports CefSharp
+Imports CefSharp.Callback
+
+Public Class ResourceHandler
+   Implements IResourceHandler
+
+   Public Const DefaultMimeType As String = "text/html"
+   Private tempBuffer As Byte()
+   Public Property Charset As String
+   Public Property MimeType As String
+   Public Property Stream As Stream
+   Public Property StatusCode As Integer
+   Public Property StatusText As String
+   Public Property m_ResponseLength As Long?
+   Public Property Headers As NameValueCollection
+   Public Property AutoDisposeStream As Boolean
+   Public Property ErrorCode As CefErrorCode?
+   Private disposedValue As Boolean
+
+   Public Sub New(ByVal Optional mimeType As String = DefaultMimeType, ByVal Optional stream As Stream = Nothing, ByVal Optional autoDisposeStream As Boolean = False, ByVal Optional charset As String = Nothing)
+      If String.IsNullOrEmpty(mimeType) Then
+         Throw New ArgumentNullException("mimeType", "Please provide a valid mimeType")
+      End If
+
+      StatusCode = 200
+      StatusText = "OK"
+      mimeType = "application/pdf"
+      Headers = New NameValueCollection()
+      stream = stream
+      autoDisposeStream = autoDisposeStream
+      charset = charset
+      Headers.Add("Access-Control-Allow-Origin", "*")
+   End Sub
+   Public Sub GetResponseHeaders(response As IResponse, ByRef responseLength As Long, ByRef redirectUrl As String) Implements IResourceHandler.GetResponseHeaders
+      redirectUrl = Nothing
+      responseLength = -1
+      'response.MimeType = MimeType
+      response.MimeType = "application/pdf"
+      response.StatusCode = StatusCode
+      response.StatusText = StatusText
+      response.Headers = Headers
+
+      If Not String.IsNullOrEmpty(Charset) Then
+         response.Charset = Charset
+      End If
+
+      If Not IsNothing(m_ResponseLength) Then
+         responseLength = m_ResponseLength
+      End If
+
+      If Stream IsNot Nothing AndAlso Stream.CanSeek Then
+
+         If m_ResponseLength Is Nothing OrElse responseLength = 0 Then
+            responseLength = Stream.Length
+         End If
+
+         Stream.Position = 0
+      End If
+   End Sub
+
+   Public Sub Cancel() Implements IResourceHandler.Cancel
+      Return
+   End Sub
+
+   Public Function Open(request As IRequest, ByRef handleRequest As Boolean, callback As ICallback) As Boolean Implements IResourceHandler.Open
+      Dim assembly = Reflection.Assembly.GetExecutingAssembly()
+      Dim resourceName = "Icarus.Icarus.pdf"
+
+      Stream = assembly.GetManifestResourceStream(resourceName)
+      callback.Continue()
+      Return True
+   End Function
+
+   Public Function ProcessRequest(request As IRequest, callback As ICallback) As Boolean Implements IResourceHandler.ProcessRequest
+      Return True
+   End Function
+
+   Public Function Skip(bytesToSkip As Long, ByRef bytesSkipped As Long, callback As IResourceSkipCallback) As Boolean Implements IResourceHandler.Skip
+      callback.Dispose()
+
+      If Stream Is Nothing OrElse Not Stream.CanSeek Then
+         bytesSkipped = -2
+         Return False
+      End If
+
+      bytesSkipped = bytesToSkip
+      Stream.Seek(bytesToSkip, SeekOrigin.Current)
+      Return True
+   End Function
+
+   Public Function Read(dataOut As Stream, ByRef bytesRead As Integer, callback As IResourceReadCallback) As Boolean Implements IResourceHandler.Read
+      bytesRead = 0
+      callback.Dispose()
+
+      If Stream Is Nothing Then
+         Return False
+      End If
+
+      If tempBuffer Is Nothing OrElse tempBuffer.Length < dataOut.Length Then
+         tempBuffer = New Byte(dataOut.Length - 1) {}
+      End If
+
+      bytesRead = Stream.Read(tempBuffer, 0, CInt(dataOut.Length))
+
+      If bytesRead = 0 Then
+         Return False
+      End If
+
+      dataOut.Write(tempBuffer, 0, bytesRead)
+      Return bytesRead > 0
+   End Function
+
+   Public Function ReadResponse(dataOut As Stream, ByRef bytesRead As Integer, callback As ICallback) As Boolean Implements IResourceHandler.ReadResponse
+      Throw New NotImplementedException()
+   End Function
+
+   Protected Overridable Sub Dispose(disposing As Boolean)
+      If Not disposedValue Then
+         If disposing Then
+            ' TODO: dispose managed state (managed objects)
+         End If
+
+         ' TODO: free unmanaged resources (unmanaged objects) and override finalizer
+         ' TODO: set large fields to null
+         disposedValue = True
+      End If
+   End Sub
+
+   ' ' TODO: override finalizer only if 'Dispose(disposing As Boolean)' has code to free unmanaged resources
+   ' Protected Overrides Sub Finalize()
+   '     ' Do not change this code. Put cleanup code in 'Dispose(disposing As Boolean)' method
+   '     Dispose(disposing:=False)
+   '     MyBase.Finalize()
+   ' End Sub
+
+   Public Sub Dispose() Implements IDisposable.Dispose
+      ' Do not change this code. Put cleanup code in 'Dispose(disposing As Boolean)' method
+      Dispose(disposing:=True)
+      GC.SuppressFinalize(Me)
+   End Sub
+End Class

Icarus/HelpWnd/ResourceHandlerFactory.vb

@@ -0,0 +1,16 @@
+Imports CefSharp
+
+Public Class ResourceHandlerFactory
+   Implements IResourceRequestHandlerFactory
+
+   Public ReadOnly Property HasHandlers As Boolean Implements IResourceRequestHandlerFactory.HasHandlers
+      Get
+         Return True
+      End Get
+   End Property
+
+   Public Function GetResourceRequestHandler(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest, isNavigation As Boolean, isDownload As Boolean, requestInitiator As String, ByRef disableDefaultHandling As Boolean) As IResourceRequestHandler Implements IResourceRequestHandlerFactory.GetResourceRequestHandler
+      Return New ResourceRequestHandler
+   End Function
+
+End Class

Icarus/HelpWnd/ResourceRequestHandler.vb

@@ -0,0 +1,67 @@
+Imports System.IO
+Imports CefSharp
+Imports CefSharp.Callback
+
+Public Class ResourceRequestHandler
+   Implements IResourceRequestHandler
+
+   Private disposedValue As Boolean
+
+   Public Sub OnResourceRedirect(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest, response As IResponse, ByRef newUrl As String) Implements IResourceRequestHandler.OnResourceRedirect
+      Throw New NotImplementedException()
+   End Sub
+
+   Public Sub OnResourceLoadComplete(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest, response As IResponse, status As UrlRequestStatus, receivedContentLength As Long) Implements IResourceRequestHandler.OnResourceLoadComplete
+
+   End Sub
+
+   Public Function GetCookieAccessFilter(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest) As ICookieAccessFilter Implements IResourceRequestHandler.GetCookieAccessFilter
+      Return Nothing
+   End Function
+
+   Public Function OnBeforeResourceLoad(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest, callback As IRequestCallback) As CefReturnValue Implements IResourceRequestHandler.OnBeforeResourceLoad
+      Return CefReturnValue.Continue
+   End Function
+
+   Public Function GetResourceHandler(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest) As IResourceHandler Implements IResourceRequestHandler.GetResourceHandler
+      Return New ResourceHandler
+   End Function
+
+   Public Function OnResourceResponse(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest, response As IResponse) As Boolean Implements IResourceRequestHandler.OnResourceResponse
+      Return True
+   End Function
+
+   Public Function GetResourceResponseFilter(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest, response As IResponse) As IResponseFilter Implements IResourceRequestHandler.GetResourceResponseFilter
+      Return Nothing
+   End Function
+
+   Public Function OnProtocolExecution(chromiumWebBrowser As IWebBrowser, browser As IBrowser, frame As IFrame, request As IRequest) As Boolean Implements IResourceRequestHandler.OnProtocolExecution
+      Throw New NotImplementedException()
+   End Function
+
+   Protected Overridable Sub Dispose(disposing As Boolean)
+      'If Not disposedValue Then
+      '   If disposing Then
+      '      ' TODO: dispose managed state (managed objects)
+      '   End If
+
+      '   ' TODO: free unmanaged resources (unmanaged objects) and override finalizer
+      '   ' TODO: set large fields to null
+      '   disposedValue = True
+      'End If
+   End Sub
+
+   ' ' TODO: override finalizer only if 'Dispose(disposing As Boolean)' has code to free unmanaged resources
+   ' Protected Overrides Sub Finalize()
+   '     ' Do not change this code. Put cleanup code in 'Dispose(disposing As Boolean)' method
+   '     Dispose(disposing:=False)
+   '     MyBase.Finalize()
+   ' End Sub
+
+   Public Sub Dispose() Implements IDisposable.Dispose
+      ' Do not change this code. Put cleanup code in 'Dispose(disposing As Boolean)' method
+      Dispose(disposing:=True)
+      GC.SuppressFinalize(Me)
+   End Sub
+
+End Class

Icarus/Icarus.vbproj

@@ -1,4 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" />
+  <Import Project="..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" />
+  <Import Project="..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +15,8 @@
     <MyType>Custom</MyType>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
@@ -76,6 +81,15 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CefSharp, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\CefSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="CefSharp.Core, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\CefSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="CefSharp.Wpf, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\packages\CefSharp.Wpf.109.1.110\lib\net462\CefSharp.Wpf.dll</HintPath>
+    </Reference>
     <Reference Include="EgtUILib, Version=2.4.7.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
@@ -87,7 +101,6 @@
     <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
       <HintPath>..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
     </Reference>
-    <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -113,11 +126,14 @@
     <Compile Include="AboutBoxWindow\AboutBoxV.xaml.vb">
       <DependentUpon>AboutBoxV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="AttachedProperties\TreeViewItemHelper.vb" />
     <Compile Include="ChooseMachineWnd\ChooseMachineWndV.xaml.vb">
       <DependentUpon>ChooseMachineWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="ChooseMachineWnd\ChooseMachineWndVM.vb" />
+    <Compile Include="ChooseReferenceWnd\ChooseReferenceWndV.xaml.vb">
+      <DependentUpon>ChooseReferenceWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ChooseReferenceWnd\ChooseReferenceWndVM.vb" />
     <Compile Include="Constants\Const3dPrint.vb" />
     <Compile Include="Constants\ConstBeam.vb" />
     <Compile Include="Constants\ConstColumns.vb" />
@@ -136,12 +152,6 @@
       <DependentUpon>CurrLayerSliderV.xaml</DependentUpon>
     </Compile>
     <Compile Include="CurrLayerSlider\CurrLayerSliderVM.vb" />
-    <Compile Include="CustomControls\CheckedImageRadioButton.xaml.vb">
-      <DependentUpon>CheckedImageRadioButton.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="CustomControls\CheckedImageToggleButton.xaml.vb">
-      <DependentUpon>CheckedImageToggleButton.xaml</DependentUpon>
-    </Compile>
     <Compile Include="DataGridMultiselectManaging\IListItemConverter.vb" />
     <Compile Include="DataGridMultiselectManaging\MultiSelectorBehaviours.vb" />
     <Compile Include="DataGridMultiselectManaging\TwoListSynchronizer.vb" />
@@ -149,14 +159,13 @@
       <DependentUpon>DispositionPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="DispositionPanel\DispositionPanelVM.vb" />
-    <Compile Include="FilledSolidPanel\FilledSolidPanelV.xaml.vb">
+    <Compile Include="HelpWnd\HelpWndV.xaml.vb">
-      <DependentUpon>FilledSolidPanelV.xaml</DependentUpon>
+      <DependentUpon>HelpWndV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="FilledSolidPanel\FilledSolidPanelVM.vb" />
+    <Compile Include="HelpWnd\HelpWndVM.vb" />
-    <Compile Include="FilledSolidParamPanel\FilledSolidParamPanelV.xaml.vb">
+    <Compile Include="HelpWnd\ResourceHandler.vb" />
-      <DependentUpon>FilledSolidParamPanelV.xaml</DependentUpon>
+    <Compile Include="HelpWnd\ResourceRequestHandler.vb" />
-    </Compile>
+    <Compile Include="HelpWnd\ResourceHandlerFactory.vb" />
-    <Compile Include="FilledSolidParamPanel\FilledSolidParamPanelVM.vb" />
     <Compile Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml.vb">
       <DependentUpon>ImportExportMachiningPanelV.xaml</DependentUpon>
     </Compile>
@@ -173,10 +182,6 @@
       <DependentUpon>MachinePanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="MachinePanel\MachinePanelVM.vb" />
-    <Compile Include="MachineViewPanel\MachineViewPanelV.xaml.vb">
-      <DependentUpon>MachineViewPanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MachineViewPanel\MachineViewPanelVM.vb" />
     <Compile Include="MachiningDb\MachiningDbV.xaml.vb">
       <DependentUpon>MachiningDbV.xaml</DependentUpon>
     </Compile>
@@ -256,7 +261,6 @@
     <Compile Include="ShowPanel\ShowPanelV.xaml.vb">
       <DependentUpon>ShowPanelV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ShowPanel\ShowPanelVM.vb" />
     <Compile Include="ShowValueSlider\ShowValueSlider.xaml.vb">
       <DependentUpon>ShowValueSlider.xaml</DependentUpon>
     </Compile>
@@ -289,9 +293,6 @@
       <DependentUpon>StartMachPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="StartMachPanel\StartMachPanelVM.vb" />
-    <Compile Include="StatusBar\MessagePanelV.xaml.vb">
-      <DependentUpon>MessagePanelV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="StatusBar\MyStatusBarVM.vb" />
     <Compile Include="StatusBar\StatusBarV.xaml.vb">
       <DependentUpon>StatusBarV.xaml</DependentUpon>
@@ -305,6 +306,7 @@
       <DependentUpon>TFSEditorV.xaml</DependentUpon>
     </Compile>
     <Compile Include="Utility\CurrentMachine.vb" />
+    <Compile Include="Utility\CustomMenuHandler.vb" />
     <Compile Include="Utility\Dictionary.xaml.vb">
       <DependentUpon>Dictionary.xaml</DependentUpon>
     </Compile>
@@ -333,6 +335,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="ChooseReferenceWnd\ChooseReferenceWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ControllerInputPanel\ControllerInputPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -341,29 +347,17 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="CustomControls\CheckedImageRadioButton.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="CustomControls\CheckedImageToggleButton.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="DispositionPanel\DispositionPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="FilledSolidPanel\FilledSolidPanelV.xaml">
+    <Page Include="HelpWnd\HelpWndV.xaml">
-      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
-    </Page>
-    <Page Include="FilledSolidParamPanel\FilledSolidParamPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
     </Page>
     <Page Include="ImportExportMachiningPanel\ImportExportMachiningPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
     <Page Include="InstrumentPanel\InstrumentPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -377,10 +371,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MachineViewPanel\MachineViewPanelV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="MachiningDb\MachiningDbV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -505,10 +495,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="StatusBar\MessagePanelV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="StatusBar\StatusBarV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -576,17 +562,98 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <EmbeddedResource Include="Icarus.pdf" />
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
+    <Resource Include="Resources\Manual\Icarus.pdf" />
     <None Include="app.manifest" />
     <None Include="My Project\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
     <None Include="packages.config" />
+    <None Include="Resources\Manual\Demo\templates\default\delos.css.map" />
+    <None Include="Resources\Manual\Demo\templates\default\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\bootstrap-variables.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\color.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\deprecated.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\focus-mixin.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\font.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Bibliographic\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Blog\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\BookingManager\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Chatroom\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Course\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\DataCollection\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Excercise\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Forum\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\LearningModule\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\LearningSequence\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\LTIConsumer\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\MediaPool\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Poll\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Portfolio\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\ScormAicc\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Survey\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Test\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\Wiki\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Modules\WorkspaceFolder\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\multi-line-cap.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\reset.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\screenreader-only-mixins.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Accordion\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Awareness\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Badge\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Block\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Bookmarks\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Calendar\bootstrap-datetimepicker.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Calendar\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Captcha\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Certificate\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Chart\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Container\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\COPage\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\FileUpload\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Form\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Help\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\InfoScreen\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Init\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\LearningHistory\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Like\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Mail\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\MainMenu\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\MediaObjects\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Membership\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Navigation\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\News\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Notes\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Object\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\OnScreenChat\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Preview\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Rating\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Search\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Skill\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Style\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Table\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\Tags\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\TermsOfService\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\AdvancedSelectionList\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\Button\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\Checklist\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\Explorer2\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\GroupedList\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\Lightbox\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\Modal\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\ProgressBar\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\Tabs\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\Toolbar\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\UIComponent\Tooltip\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\User\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\Services\WebDAV\delos.less" />
+    <None Include="Resources\Manual\Demo\templates\default\less\variables.less" />
     <Resource Include="Resources\Fonts\Roboto-Regular.ttf" />
     <Resource Include="Resources\Fonts\Roboto-Light.ttf" />
   </ItemGroup>
@@ -598,12 +665,16 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ProjectManager\ExportProject.png" />
+    <Resource Include="Resources\ProjectManager\GoToProd.png" />
+    <Resource Include="Resources\ProjectManager\GoToProj.png" />
+    <Resource Include="Resources\ProjectManager\ImportBTL.png" />
     <Resource Include="Resources\ProjectManager\ImportProject.png" />
     <Resource Include="Resources\ProjectManager\New.png" />
     <Resource Include="Resources\ProjectManager\Open.png" />
     <Resource Include="Resources\ProjectManager\Options.png" />
     <Resource Include="Resources\ProjectManager\Save.png" />
     <Resource Include="Resources\ProjectManager\SaveAs.png" />
+    <Resource Include="Resources\ProjectManager\UpdateBTL.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ProjectManager\Import.png" />
@@ -615,11 +686,16 @@
     <Resource Include="Resources\ViewPanel\LookFromBACK.png" />
     <Resource Include="Resources\ViewPanel\LookFromBOTTOM.png" />
     <Resource Include="Resources\ViewPanel\LookFromFRONT.png" />
+    <Resource Include="Resources\ViewPanel\LookFromISO_NE.png" />
+    <Resource Include="Resources\ViewPanel\LookFromISO_NW.png" />
+    <Resource Include="Resources\ViewPanel\LookFromISO_SE.png" />
     <Resource Include="Resources\ViewPanel\LookFromISO_SW.png" />
     <Resource Include="Resources\ViewPanel\LookFromLEFT.png" />
     <Resource Include="Resources\ViewPanel\LookFromRIGHT.png" />
     <Resource Include="Resources\ViewPanel\LookFromTOP.png" />
     <Resource Include="Resources\ViewPanel\ZoomAll.png" />
+    <Resource Include="Resources\ViewPanel\ZoomIn.png" />
+    <Resource Include="Resources\ViewPanel\ZoomOut.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ShowPanel\CurveDir.png" />
@@ -628,7 +704,10 @@
     <Resource Include="Resources\ShowPanel\RenderingWF.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\InstrumentPanel\Analyze.png" />
+    <Resource Include="Resources\InstrumentPanel\ChangeParam.png" />
     <Resource Include="Resources\InstrumentPanel\GetDist.png" />
+    <Resource Include="Resources\InstrumentPanel\Statistics.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\TreeView\Folder.png" />
@@ -640,6 +719,7 @@
     <Resource Include="Resources\DrawPanel\Line2P.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\GridViewPanel\Cplane3POINTS.png" />
     <Resource Include="Resources\GridViewPanel\CplaneBACK.png" />
     <Resource Include="Resources\GridViewPanel\CplaneBOTTOM.png" />
     <Resource Include="Resources\GridViewPanel\CplaneELEVATION.png" />
@@ -647,8 +727,11 @@
     <Resource Include="Resources\GridViewPanel\CplaneLEFT.png" />
     <Resource Include="Resources\GridViewPanel\CplaneOBJECT.png" />
     <Resource Include="Resources\GridViewPanel\CplaneORIGIN.png" />
+    <Resource Include="Resources\GridViewPanel\CplanePERPCURVE.png" />
     <Resource Include="Resources\GridViewPanel\CplaneRIGHT.png" />
+    <Resource Include="Resources\GridViewPanel\CplaneROTATE.png" />
     <Resource Include="Resources\GridViewPanel\CplaneTOP.png" />
+    <Resource Include="Resources\GridViewPanel\CplaneView.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\DrawPanel\Delete.png" />
@@ -693,102 +776,38 @@
   <ItemGroup>
     <Resource Include="Resources\TopPanel\Edit.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\MachiningDb\Export.png" />
+    <Resource Include="Resources\MachiningDb\Import.png" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\SplashScreen\GoldSplashscreen.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\SplashScreen\LogoEgalware.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\TopPanel\ManagePart.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\TopPanel\MaterialDb.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\TopPanel\MachiningDb.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\StatusBar\GridVisibility.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\InstrumentPanel\EdgeAnalysis.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ViewPanel\CplaneView.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\StatusBar\GridVisibilityWhite.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\MachiningDb\MachiningExport.png" />
-    <Resource Include="Resources\MachiningDb\MachiningImport.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\TFSEditor\Expand.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\SliderManager\FromSelected.png" />
-    <Resource Include="Resources\SliderManager\OnlySelected.png" />
-    <Resource Include="Resources\SliderManager\UntilSelected.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ProjectManager\Export.png" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
-    <Resource Include="Resources\ShowPanel\CurveDir_White.png" />
+    <EmbeddedResource Include="Resources\Manual\Demo\index.html" />
-  </ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\buttons.js" />
-  <ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\default.css" />
-    <Resource Include="Resources\ShowPanel\RenderingHL_White.png" />
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\delos.css" />
-  </ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\delos_cont.css" />
-  <ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\template.xml" />
-    <Resource Include="Resources\ShowPanel\RenderingSH_White.png" />
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.adm_content.html" />
-  </ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.buttons.html" />
-  <ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.error.html" />
-    <Resource Include="Resources\ShowPanel\RenderingWF_White.png" />
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.explorer.html" />
-  </ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.frameset.html" />
-  <ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.main.html" />
-    <Resource Include="Resources\InstrumentPanel\EdgeAnalysis_White.png" />
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.obj_tbl_rows.html" />
-  </ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.page_content.html" />
-  <ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.page_content_bak.html" />
-    <Resource Include="Resources\InstrumentPanel\GetDist_White.png" />
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.statusline.html" />
-  </ItemGroup>
+    <EmbeddedResource Include="Resources\Manual\Demo\templates\default\tpl.table.html" />
-  <ItemGroup>
-    <Resource Include="Resources\MachiningDb\Edit.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\TopPanel\Offset.png" />
-    <Resource Include="Resources\TopPanel\SlicingDirection.png" />
-    <Resource Include="Resources\TopPanel\StrandCount.png" />
-    <Resource Include="Resources\TopPanel\StrandH.png" />
-    <Resource Include="Resources\TopPanel\StrandW.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Common\Cancel.png" />
-    <Resource Include="Resources\Common\Ok.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\SimulationPanel\HeadMode.png" />
-    <Resource Include="Resources\SimulationPanel\MachMode.png" />
-    <Resource Include="Resources\SimulationPanel\ToolMode.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\AboutBox\EgalwareLogo.png" />
-    <Resource Include="Resources\AboutBox\IcarusLogo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\CurrMachining\SaveInDb.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\MaterialDb\Edit.png" />
-    <Resource Include="Resources\MaterialDb\MaterialExport.png" />
-    <Resource Include="Resources\MaterialDb\MaterialImport.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ViewPanel\LookFromISO_SE.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\SliceManager\StopCalculation.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
@@ -797,4 +816,14 @@ IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPa
 IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR64.exe
 IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Icarus\IcarusD64.exe</PostBuildEvent>
   </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props'))" />
+    <Error Condition="!Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets'))" />
+  </Target>
+  <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" />
 </Project>

Icarus/ImportExportMachiningPanel/ImportExportMachiningPanelVM.vb

@@ -1,45 +1,15 @@
 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 = 1
+      IMPORT
-      EXPORT = 2
+      EXPORT
-      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
@@ -49,13 +19,6 @@ 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)
@@ -122,112 +85,22 @@ Public Class ImportExportMachiningPanelVM
 #Region "CONSTRUCTOR"
 
    ' export
-   Sub New(Type As WindowTypeEnum, Mode As WindowModeEnum, Optional sImportFilePath As String = "")
+   Sub New()
-      m_WindowType = Type
+      m_WindowMode = WindowModeEnum.EXPORT
-      ImpExpMachiningItem.SetWindowType(m_WindowType)
-      m_WindowMode = Mode
       ' carico lista lavorazioni
       MachiningList.Clear()
-      Select Case Mode
+      ' leggo ed aggiungo le altre
-         Case WindowModeEnum.IMPORT
+      Dim nIndex As Integer = 1
-            Select Case Type
+      Dim sGUID As String = ""
-               Case WindowTypeEnum.MATERIAL
+      Dim sName As String = ""
-                  m_ImportFilePath = sImportFilePath
+      Dim sMaterials As String = ""
-                  ' carico lista lavorazioni
+      While ReadMachiningParamString(nIndex, MAC_GUID, "", sGUID) > 0
-                  MachiningList.Clear()
+         Dim Guid As Guid = Guid.Empty
-                  ' leggo ed aggiungo le altre
+         Guid.TryParse(sGUID, Guid)
-                  Dim nIndex As Integer = 1
+         ReadMachiningParamString(nIndex, MAC_NAME, "", sName)
-                  Dim sGUID As String = ""
+         MachiningList.Add(New ImpExpMachiningItem(nIndex, Guid, sName, False))
-                  Dim sName As String = ""
+         nIndex += 1
-                  Dim sMaterials As String = ""
+      End While
-                  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
 
@@ -261,104 +134,9 @@ Public Class ImportExportMachiningPanelVM
    End Sub
 
    Private Function AlreadyExist(MachiningName As String) As Boolean
-      Select Case m_WindowType
+      Return Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = MachiningName)
-         Case WindowTypeEnum.MATERIAL
-            Return Map.refMaterialDbVM.MaterialList.Any(Function(x) x.sName = MachiningName)
-         Case Else  ' 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"
@@ -381,109 +159,52 @@ Public Class ImportExportMachiningPanelVM
    ''' Manage the MachiningDb closing.  This method is invoked by the CloseMachiningDbCommand.
    ''' </summary>
    Public Sub ConfirmImpExpMachinings(param As Object)
-      Select Case m_WindowMode
+      Select Case WindowMode
          Case WindowModeEnum.IMPORT
-            Select Case m_WindowType
+            Dim OrigFilePath As String = CurrentMachine.sMachiningFilePath
-               Case WindowTypeEnum.MATERIAL
+            Dim NewMachining As Machining = Nothing
-                  Dim OrigFilePath As String = CurrentMachine.sMaterialFilePath
+            For Each Machining In m_MachiningList
-                  Dim NewMaterial As Material = Nothing
+               Dim nIndex As Integer = Map.refMachiningDbVM.MachiningList.Max(Function(x) x.nIndex) + 1
-                  For Each Material In m_MachiningList
+               If Machining.Active Then
-                     Dim nIndex As Integer = Map.refMaterialDbVM.MaterialList.Max(Function(x) x.nIndex) + 1
+                  CurrentMachine.SetMachiningFilePath(ImportFilePath)
-                     If Material.Active Then
+                  ' leggo lavorazione da file di import
-                        CurrentMachine.SetMaterialFilePath(ImportFilePath)
+                  NewMachining = New Machining(Machining.nIndex)
-                        ' leggo lavorazione da file di import
+                  ' cambio guid, indice e verifico nome
-                        NewMaterial = New Material(Material.nIndex)
+                  NewMachining.sGUID = Guid.NewGuid.ToString()
-                        ' cambio guid, indice e verifico nome
+                  NewMachining.SetIndex(nIndex)
-                        NewMaterial.sGUID = Guid.NewGuid.ToString()
+                  If Machining.AlreadyExist Then
-                        NewMaterial.SetIndex(nIndex)
+                     If Machining.ChangeName Then
-                        If Material.AlreadyExist Then
+                        NewMachining.sName = Machining.sName
-                           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.refMachiningDbVM.MachiningList.Add(NewMachining)
-                  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)
-                  ' seleziono ultima importata
+                  ' salvo la lavorazione
-                  If Not IsNothing(NewMachining) Then
+                  NewMachining.Save()
-                     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
-            Else
+            Next
-               sExtension = MachiningDataExtension
+            ' ripristino path corretta del Db
+            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 (*" & sExtension & ")|*" & sExtension,
+               .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
                .FileName = String.Empty
             }
             If SaveFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
@@ -503,25 +224,15 @@ Public Class ImportExportMachiningPanelVM
                Catch ex As Exception
                End Try
             End If
-            Select Case m_WindowType
+            Dim ActiveMachiningList As List(Of Machining) = (From Machining In Map.refMachiningDbVM.MachiningList
-               Case WindowTypeEnum.MATERIAL
+                                                             Select Machining
-                  Dim ActiveMachiningList As List(Of Material) = (From Material In Map.refMaterialDbVM.MaterialList
+                                                             Where m_MachiningList.Any(Function(x) x.sGUID.ToString() = Machining.sGUID AndAlso x.Active)).ToList()
-                                                                  Select Material
+            ' salvo tutte le lavorazioni sul Db
-                                                                  Where m_MachiningList.Any(Function(x) x.sGUID.ToString() = Material.sGUID AndAlso x.Active)).ToList()
+            For Index = 0 To ActiveMachiningList.Count - 1
-                  ' salvo tutti i materiali sul Db
+               ActiveMachiningList(Index).WriteParamsOnDb(Index + 1, sFilePath)
-                  For Index = 0 To ActiveMachiningList.Count - 1
+            Next
-                     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
@@ -535,18 +246,13 @@ End Class
 Public Class ImpExpMachiningItem
    Inherits VMBase
 
-   Public Const IMPEXPNAME As String = "_imp"
+   Public Const IMPEXTNAME 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
@@ -578,51 +284,26 @@ Public Class ImpExpMachiningItem
          ' se esiste gia' chiedo se sovrascriverla
          If value Then
             If m_AlreadyExist Then
-               Select Case m_WindowType
+               Select Case System.Windows.MessageBox.Show(EgtMsg(31453), "", MessageBoxButton.YesNoCancel)
-                  Case WindowTypeEnum.MATERIAL
+                  Case MessageBoxResult.Yes
-                     Select Case System.Windows.MessageBox.Show("Material already existing in Db. Overwrite it?", "", MessageBoxButton.YesNoCancel)
+                     m_ChangeName = False
-                        Case MessageBoxResult.Yes
+                     m_Active = True
-                           m_ChangeName = False
+                  Case MessageBoxResult.No
-                           m_Active = True
+                     Dim bImpNameAlreadyInList = False
-                        Case MessageBoxResult.No
+                     Dim nImpNameIndex As Integer = 0
-                           Dim bImpNameAlreadyInList = False
+                     If Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = m_sOrigName & IMPEXTNAME) Then
-                           Dim nImpNameIndex As Integer = 0
+                        nImpNameIndex += 1
-                           If Map.refMaterialDbVM.MaterialList.Any(Function(x) x.sName = m_sOrigName & IMPEXPNAME) Then
+                        While Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = m_sOrigName & IMPEXTNAME & "_" & nImpNameIndex)
-                              nImpNameIndex += 1
+                           nImpNameIndex += 1
-                              While Map.refMaterialDbVM.MaterialList.Any(Function(x) x.sName = m_sOrigName & IMPEXPNAME & "_" & nImpNameIndex)
+                        End While
-                                 nImpNameIndex += 1
+                     End If
-                              End While
+                     m_sName = m_sOrigName & IMPEXTNAME & If(nImpNameIndex > 0, "_" & nImpNameIndex, "")
-                           End If
+                     System.Windows.MessageBox.Show("Machining will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
-                           m_sName = m_sOrigName & IMPEXPNAME & If(nImpNameIndex > 0, "_" & nImpNameIndex, "")
+                     NotifyPropertyChanged(NameOf(sName))
-                           System.Windows.MessageBox.Show("Material will be imported with the name: " & m_sName, "", MessageBoxButton.OK)
+                     m_ChangeName = True
-                           NotifyPropertyChanged(NameOf(sName))
+                     m_Active = True
-                           m_ChangeName = True
+                  Case Else
-                           m_Active = True
+                     m_Active = False
-                        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
@@ -679,3 +360,82 @@ 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/InstrumentPanel/InstrumentPanelV.xaml

@@ -1,29 +1,14 @@
-<StackPanel x:Class="InstrumentPanelV"
+<EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-            xmlns:local="clr-namespace:Icarus"
+   IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
-            Orientation="Horizontal">
+   IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
 
-   <local:CheckedImageToggleButton ToolTip="{Binding GetDist_ToolTip}"
+   <ToggleButton ToolTip="{Binding GetDistToolTip}"
-                                   IsChecked="{Binding GetDistIsChecked}"
+                 Style="{StaticResource ToolBar_ToggleButton}"
-                                   ImageSource="/Resources/InstrumentPanel/GetDist.png"
+                 IsChecked="{Binding GetDistIsChecked}">
-                                   CheckedImageSource="/Resources/InstrumentPanel/GetDist_White.png"
+      <Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
-                                   Width="15"
+   </ToggleButton>
-                                   Margin="2.5,0,2.5,0"
-                                   Style="{StaticResource BottomPanel_ToggleButton}">
-      <local:CheckedImageToggleButton.Resources>
-         <sys:Double x:Key="ToggleButton.Image.Height">25</sys:Double>
-         <sys:Double x:Key="ToggleButton.Image.Width">25</sys:Double>
-      </local:CheckedImageToggleButton.Resources>
-   </local:CheckedImageToggleButton>
-   <local:CheckedImageToggleButton ToolTip="{Binding EdgeAnalysis_ToolTip}"
-                                   IsChecked="{Binding bEdgeAnalysis_IsChecked}"
-                                   IsEnabled="{Binding bEdgeAnalysis_IsEnabled}"
-                                   ImageSource="/Resources/InstrumentPanel/EdgeAnalysis.png"
-                                   CheckedImageSource="/Resources/InstrumentPanel/EdgeAnalysis_White.png"
-                                   Margin="2.5,0,2.5,0"
-                                   Style="{StaticResource BottomPanel_ToggleButton}">
-   </local:CheckedImageToggleButton>
    
-</StackPanel>
+</EgtFloating:EgtFloatingPanel>

Icarus/InstrumentPanel/MyInstrumentPanelVM.vb

@@ -139,22 +139,6 @@ Public Class MyInstrumentPanelVM
       NotifyPropertyChanged(NameOf(bEdgeAnalysis_IsEnabled))
    End Sub
 
-#Region "Tooltip"
-
-   Public ReadOnly Property GetDist_ToolTip As String
-      Get
-         Return "Distance"
-      End Get
-   End Property
-
-   Public ReadOnly Property EdgeAnalysis_ToolTip As String
-      Get
-         Return "Edge Analysis"
-      End Get
-   End Property
-
-#End Region    ' Tooltip
-
 #Region "CONSTRUCTORS"
 
    Sub New()

Icarus/LeftPanel/LeftPanelV.xaml

@@ -1,14 +1,12 @@
 <UserControl x:Class="LeftPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+               xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-             xmlns:PrintApp="clr-namespace:Icarus"
+               xmlns:PrintApp="clr-namespace:Icarus"
-             Margin="5,0,5,0">
+               Margin="5">
    <TabControl SelectedIndex="{Binding SelPanel}"
                Background="Transparent"
-               BorderThickness="0"
+               BorderThickness="0">
-               Margin="0"
-               Padding="0">
       <TabControl.ItemContainerStyle>
          <Style TargetType="{x:Type TabItem}">
             <Setter Property="Visibility" Value="Collapsed"/>
@@ -36,7 +34,7 @@
          <PrintApp:ShellNumberPanelV DataContext="{StaticResource ShellNumberPanelVM}"/>
       </TabItem>
       <TabItem Header="AUXSOLIDS">
-         <PrintApp:FilledSolidPanelV DataContext="{StaticResource FilledSolidPanelVM}"/>
+         <Button Height="100"/>
       </TabItem>
       <TabItem Header="MODIFYPART">
          <!--<PrintApp:ModifyPartPanelV DataContext="{StaticResource ModifyPartPanelVM}"/>-->

Icarus/LeftPanel/LeftPanelVM.vb

@@ -39,8 +39,6 @@ Public Class LeftPanelVM
             Map.refRibPanelVM.Dispose()
          Case Panels.SHELLNUMBER
             Map.refShellNumberPanelVM.Dispose()
-         Case Panels.AUXSOLIDS
-            Map.refFilledSolidPanelVM.Dispose()
       End Select
       m_SelPanel = Panel
       Select Case Panel
@@ -56,12 +54,11 @@ Public Class LeftPanelVM
             Map.refRibPanelVM.Init()
          Case Panels.SHELLNUMBER
             Map.refShellNumberPanelVM.Init()
-         Case Panels.AUXSOLIDS
-            Map.refFilledSolidPanelVM.Init()
          Case Panels.MODIFYPART
+            ''Map.refModifyPartPanelVM.Init()
             Map.refManagePartPanelVM.Init(ManagePartPanelVM.ManagePartType.MODIFY)
       End Select
-      If Not IsNothing(Map.refViewLayerManagerVM) Then Map.refViewLayerManagerVM.UpdateForced()
+      Map.refViewLayerManagerVM.UpdateForced()
       NotifyPropertyChanged(NameOf(SelPanel))
    End Sub
 

Icarus/MachinePanel/MachinePanelV.xaml

@@ -4,9 +4,52 @@
    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
    IsEnabled="{Binding MachPanel_IsEnabled}">
 
+   <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="1*"/>
+      <ColumnDefinition Width="1*"/>
+   </Grid.ColumnDefinitions>
+
+   <Grid Margin="0,0,5,0">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="Auto"/>
+      </Grid.ColumnDefinitions>
+      <!--<TextBlock Grid.Row="0" Grid.Column="0" Text="Macchina corrente" VerticalAlignment="Center"  Margin="0,0,5,0"/>-->
+      <!--Combobox per selezionare la macchina corrente-->
+      <!--<ComboBox ItemsSource="{Binding Path=MachineList}" 
+                SelectedItem="{Binding Path=SelectedMachine}" 
+                DisplayMemberPath="Name"
+                SelectedValuePath="Name"
+                Height="22" Width="150"
+                Grid.Row="0" Grid.Column="1"/>-->
+      <!--<Rectangle HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch"
+                 Fill="LightGray"/>-->
       <TextBlock Text="{Binding SelectedMachine.Name}"
-                 FontSize="18"
+                 Style="{StaticResource OptionTextBlock}"/>
-                 HorizontalAlignment="Center"
+   </Grid>
-                 Style="{StaticResource BaseTextBlock}"/>
+   <!--<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
+      <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}"
+           Style="{StaticResource ToolBar_TextButton}" Content="{Binding ToolDBMsg}"/>
+      <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
+           Style="{StaticResource ToolBar_TextButton}" Content="{Binding MachiningDbMsg}"/>
+      --><!--<Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
+           Style="{StaticResource ToolBar_TextButton}" Content="{Binding SetUpMsg}"
+           Background="{Binding SetUp_Background}"/>--><!--
+      <Button ToolTip="{Binding BeamTable_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding BeamTable_Command}"
+           Visibility="{Binding BeamTable_Visibility}">
+         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
+      </Button>
+      <Button ToolTip="{Binding WallTable_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding WallTable_Command}"
+           Visibility="{Binding WallTable_Visibility}">
+         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
+      </Button>
+      --><!--<Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}">
+      <Image Source="/Resources/ProjectManager/Options.png" Height="22" />
+   </Button>--><!--
+   </StackPanel>-->
 
 </Grid>

Icarus/MachineViewPanel/MachineViewPanelV.xaml

@@ -1,22 +0,0 @@
-<UserControl x:Class="MachineViewPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             VerticalContentAlignment="Top">
-   <ComboBox SelectedIndex="{Binding ghSelMachView}"
-             Height="40"
-             Width="40"
-             Style="{StaticResource SelViewSlider_ComboBox}">
-      <ComboBoxItem>
-         <Image Source="\Resources\SimulationPanel\HeadMode.png"
-                Style="{StaticResource ComboBox.Image}"/>
-      </ComboBoxItem>
-      <ComboBoxItem>
-         <Image Source="\Resources\SimulationPanel\HeadMode.png"
-                Style="{StaticResource ComboBox.Image}"/>
-      </ComboBoxItem>
-      <ComboBoxItem>
-         <Image Source="\Resources\SimulationPanel\MachMode.png"
-                Style="{StaticResource ComboBox.Image}"/>
-      </ComboBoxItem>
-   </ComboBox>
-</UserControl>

Icarus/MachineViewPanel/MachineViewPanelV.xaml.vb

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

Icarus/MachineViewPanel/MachineViewPanelVM.vb

@@ -1,35 +0,0 @@
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MachineViewPanelVM
-   Inherits VMBase
-
-   Private m_nSelMachView As MCH_LOOK
-   Public Property ghSelMachView As Integer
-      Get
-         Return m_nSelMachView - 1
-      End Get
-      Set(value As Integer)
-         m_nSelMachView = value + 1
-         If Not IsNothing(Map.refSimulationPanelVM) Then
-            Dim MySimul As SimulationVM = Map.refSimulationPanelVM.MySimul
-            MySimul.SetMachLook(m_nSelMachView)
-            ' aggiorno lo stato della macchina e la sua visualizzazione
-            EgtSetMachineLook(MySimul.GetMachLook())
-            WriteMainPrivateProfileString(S_SIMUL, K_MACHVIEWMODE, m_nSelMachView)
-         End If
-         EgtDraw()
-      End Set
-   End Property
-   Friend Sub SetSelViewSlider(value As MCH_LOOK)
-      m_nSelMachView = value
-      NotifyPropertyChanged(NameOf(ghSelMachView))
-   End Sub
-
-   Sub New()
-      ' leggo vista macchina da ini e la imposto
-      Dim DefaultMachViewMode As Integer = GetMainPrivateProfileInt(S_SIMUL, K_MACHVIEWMODE, 3)
-      SetSelViewSlider(DefaultMachViewMode)
-   End Sub
-
-End Class

Icarus/MachiningDb/Machining.vb

@@ -59,10 +59,7 @@ Public Class Machining
       EXTRA_SHELL = 2
       INFILL = 3
       AUX_SOLID = 4
-      RIB_UNBOUNDED = 5
+      RIB = 5
-      RIB_EXTERNAL = 6
-      RIB_INTERNAL = 7
-      RIB_SUPPORT = 8
    End Enum
 
    Protected m_CathegoryList As New ObservableCollection(Of MachiningCathegory)
@@ -137,7 +134,7 @@ Public Class Machining
       Else
          nIndex = -1
          m_sGUID = Guid.NewGuid.ToString()
-         m_sName = "New Machining"
+         m_sName = "PrintingParam"
       End If
       m_sOrigName = m_sName
       m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.GENERAL, nIndex))
@@ -172,7 +169,7 @@ Public Class Machining
       NotifyPropertyChanged(NameOf(ghName))
    End Sub
 
-   Friend Overridable Sub Save()
+   Friend Sub Save()
       If bIsModified Then
          ' salvo tutti i parametri su orig
          SaveParams()
@@ -183,7 +180,7 @@ Public Class Machining
       End If
    End Sub
 
-   Protected Overridable Sub SaveParams()
+   Private Sub SaveParams()
       SaveName()
       For Each Cathegory In m_CathegoryList
          Cathegory.SaveParams()
@@ -356,15 +353,13 @@ 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),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nIndex),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nIndex),
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nIndex)})
-                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nIndex)})
          Case Cathegories.SHELL_NUMBER
             m_sName = "Reduce Shell Number"
             m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nIndex),
@@ -421,67 +416,66 @@ Public MustInherit Class MachiningParam
    Inherits VMBase
 
    Public Enum Params As Integer
-      SLICINGTYPE = 1
+      NAME = 2
-      SPIRALVASE = 2
+      SLICINGTYPE = 3
-      STRANDH = 3
+      STRANDH = 4
-      STRANDW = 4
+      STRANDW = 5
-      STRANDCOUNT = 5
+      STRANDCOUNT = 6
-      OFFSET = 6
+      OFFSET = 7
-      STRANDOVERLAP = 7
       STARTPOINTOFFSETONSLICE = 8
       STRANDORDER = 9
       DIRECTION = 10
-      FLOORCOUNT = 11
+      LINKTYPE = 11
-      G0FEED = 12
+      LINKPARAM = 12
-      G0FEEDZ = 13
+      LINKZUP = 13
-      TOOLDIAM = 14
+      OFFSETLEADPOINT = 14
-      FLOWRATE_PC = 15
+      LEADIN = 15
-      DYNAMIC_MODE = 16
+      LEADINTANGDIST = 16
-      PRINT_ORDER = 17
+      LEADINORTHODIST = 17
-      LINKTYPE = 51
+      LEADOUT = 18
-      LINKPARAM = 52
+      LEADOUTTANGDIST = 19
-      LINKZUP = 53
+      LEADOUTORTHODIST = 20
-      LEADIN = 54
+      COASTINGLEN = 21
-      LEADINTANGDIST = 55
+      COASTINGFEED_PC = 22
-      LEADINORTHODIST = 56
+      WIPELEN = 23
-      OFFSETLEADPOINT = 57
+      WIPEFEED_PC = 24
-      LEADOUT = 58
+      FLOORCOUNT = 25
-      LEADOUTTANGDIST = 59
+      G0FEED = 26
-      LEADOUTORTHODIST = 60
+      G0FEEDZ = 27
-      COASTINGLEN = 61
+      TOOLDIAM = 28
-      COASTINGFEED_PC = 62
+      RIBSTYPE = 29
-      WIPELEN = 63
+      RIBSOVERLAP = 30
-      WIPEFEED_PC = 64
+      RIBSSTRANDCOUNT = 31
-      'WIPEDIR = 65
+      RIBSLINK = 32
-      RIBSTYPE = 101
+      RIBSINVERTORDER = 33
-      RIBSOVERLAP = 102
+      RIBSINVERTDIRECTION = 34
-      RIBSSTRANDCOUNT = 103
+      RIBSLEADININVERT = 35
-      RIBSLINK = 104
+      RIBSLEADINLEN = 36
-      RIBSINVERTORDER = 105
+      RIBSLEADOUTINVERT = 37
-      RIBSINVERTDIRECTION = 106
+      RIBSLEADOUTLEN = 38
-      RIBSINVERTSTRANDORDER = 107
+      RIBSLEADOUTCOASTING = 39
-      RIBSLEADININVERT = 108
+      RIBSLEADOUTWIPE = 40
-      RIBSLEADINLEN = 109
+      RIBSLEADOUTWIPEDIR = 41
-      RIBSLEADOUTINVERT = 110
+      SHELLNBRDIFFERENCE = 42
-      RIBSLEADOUTLEN = 111
+      SHELLNBRCOASTING = 43
-      RIBSLEADOUTCOASTING = 112
+      SHELLNBRWIPE = 44
-      RIBSLEADOUTWIPE = 113
+      SHELLNBRWIPEDIR = 45
-      RIBSLEADOUTWIPEDIR = 114
+      AUXSOLIDSOVERLAP = 46
-      RIBSLIMITUNBOUNDEDWITHSOLID = 115
+      AUXSOLIDSINFILL = 47
-      SHELLNBRDIFFERENCE = 151
+      AUXSOLIDSSTRANDORDER = 48
-      SHELLNBRCOASTING = 152
+      AUXSOLIDSLINKTYPE = 49
-      SHELLNBRWIPE = 153
+      AUXSOLIDSLINKPARAM = 50
-      SHELLNBRWIPEDIR = 154
+      AUXSOLIDSSTARTPOINTOFFSETONSLICE = 51
-      AUXSOLIDSOVERLAP = 201
+      AUXSOLIDSCOASTINGLEN = 52
-      AUXSOLIDSINFILL = 202
+      AUXSOLIDSWIPELEN = 53
-      AUXSOLIDSSTRANDORDER = 203
+      AUXSOLIDSWIPEDIR = 54
-      AUXSOLIDSLINKTYPE = 204
+      SPIRALVASE = 55
-      AUXSOLIDSLINKPARAM = 205
+      'WIPEDIR = 56
-      AUXSOLIDSSTARTPOINTOFFSETONSLICE = 206
+      STRANDOVERLAP = 57
-      AUXSOLIDSCOASTINGLEN = 207
+      FLOWRATE_PC = 58
-      AUXSOLIDSWIPELEN = 208
+      DYNAMIC_MODE = 59
-      AUXSOLIDSWIPEDIR = 209
+      PRINT_ORDER = 60
-      MATERIALS = 250
+      MATERIALS = 100
    End Enum
 
    Protected m_Type As Params
@@ -567,8 +561,6 @@ 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,8 +575,6 @@ Public MustInherit Class MachiningParam
             m_sName = "Lead Out Wipe"
          Case Params.RIBSLEADOUTWIPEDIR
             m_sName = "Lead Out Wipe Dir [deg]"
-         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
-            m_sName = "Limit Unbounded With Solid"
          Case Params.SHELLNBRDIFFERENCE
             m_sName = "Difference"
          Case Params.SHELLNBRCOASTING
@@ -1165,14 +1155,10 @@ 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
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADOUTINVERT, 0)
-            Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
-               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, 0)
          End Select
       End If
       m_bOrigValue = m_bValue
@@ -1188,14 +1174,10 @@ 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
             WriteMachiningParam(nIndex, MAC_RIBSLEADOUTINVERT, If(m_bValue, 1, 0), sFilePath)
-         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
-            WriteMachiningParam(nIndex, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, If(m_bValue, 1, 0), sFilePath)
       End Select
    End Sub
 
@@ -1287,8 +1269,6 @@ 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
@@ -1324,44 +1304,48 @@ Public Class OrderedMachiningParam
       Set(value As String)
          Select Case Type
             Case Params.PRINT_ORDER
-               Dim StringValueList() As String
+               Dim StandardValueList() As String = {Machining.MPAR_PRINT_ORDER.SHELL,
-               Dim IntegerValueList As New List(Of Integer)
+                                                    Machining.MPAR_PRINT_ORDER.EXTRA_SHELL,
-               If value.Length = 15 Then
+                                                    Machining.MPAR_PRINT_ORDER.INFILL,
+                                                    Machining.MPAR_PRINT_ORDER.AUX_SOLID,
+                                                    Machining.MPAR_PRINT_ORDER.RIB}
+               Dim StringValueList() As String = StandardValueList
+               If value.Length = 9 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
+               If StringValueList.Count <> 5 Then
-                  IntegerValueList = m_StandardValueOrderList
+                  StringValueList = StandardValueList
                End If
-               If Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.SHELL) OrElse
+               If Not StringValueList.Contains(Machining.MPAR_PRINT_ORDER.SHELL) OrElse
-                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL) OrElse
+                  Not StringValueList.Contains(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL) OrElse
-                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.INFILL) OrElse
+                  Not StringValueList.Contains(Machining.MPAR_PRINT_ORDER.INFILL) OrElse
-                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.AUX_SOLID) OrElse
+                  Not StringValueList.Contains(Machining.MPAR_PRINT_ORDER.AUX_SOLID) OrElse
-                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED) OrElse
+                  Not StringValueList.Contains(Machining.MPAR_PRINT_ORDER.RIB) Then
-                  Not IntegerValueList.Contains(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL) OrElse
+                  StringValueList = StandardValueList
-                  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)
+               m_ValueList.Clear()
+               For Each StringValue In StringValueList
+                  Dim nValue As Integer = -1
+                  Integer.TryParse(StringValue, nValue)
+                  Dim ItemList As IdNameStruct
+                  Select Case nValue
+                     Case Machining.MPAR_PRINT_ORDER.SHELL
+                        ItemList = New IdNameStruct(Machining.MPAR_PRINT_ORDER.SHELL, "Shell")
+                     Case Machining.MPAR_PRINT_ORDER.EXTRA_SHELL
+                        ItemList = New IdNameStruct(Machining.MPAR_PRINT_ORDER.EXTRA_SHELL, "Extra Shell")
+                     Case Machining.MPAR_PRINT_ORDER.INFILL
+                        ItemList = New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infill")
+                     Case Machining.MPAR_PRINT_ORDER.AUX_SOLID
+                        ItemList = New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solids")
+                     Case Machining.MPAR_PRINT_ORDER.RIB
+                        ItemList = New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB, "Ribs")
+                  End Select
+                  m_ValueList.Add(ItemList)
+               Next
          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
@@ -1380,45 +1364,12 @@ Public Class OrderedMachiningParam
    Sub New(Type As Params, nIndex As Integer)
       MyBase.New(Type)
       If nIndex = 0 Then
-         Select Case Type
+         m_ValueList = New ObservableCollection(Of IdNameStruct)
-            Case Params.PRINT_ORDER
+         m_SelValue = Nothing
-               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 Shell"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infill"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solid"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Rib"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Rib"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Rib"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Rib")})
-               m_SelValue = Nothing
-         End Select
       Else
          Select Case Type
             Case Params.PRINT_ORDER
-               m_StandardValueOrderList = New List(Of Integer)({Machining.MPAR_PRINT_ORDER.SHELL,
+               m_ValueList = New ObservableCollection(Of IdNameStruct)
-                                                                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 Shell"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.INFILL, "Infill"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.AUX_SOLID, "Filled Solid"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_UNBOUNDED, "Unbounded Rib"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_EXTERNAL, "External Rib"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_INTERNAL, "Internal Rib"),
-                                                                        New IdNameStruct(Machining.MPAR_PRINT_ORDER.RIB_SUPPORT, "Support Rib")})
                ReadMachiningParamString(nIndex, MAC_PRINTORDER, "", Value)
          End Select
       End If
@@ -1506,9 +1457,9 @@ Public Class OrderedMachiningParam
 
    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
+         SelValue = Nothing
          NotifyPropertyChanged(NameOf(ValueList))
          NotifyPropertyChanged(NameOf(Value))
          NotifyPropertyChanged(NameOf(SelValue))

Icarus/MachiningDb/MachiningDbV.xaml

@@ -1,32 +1,20 @@
-<Grid x:Class="MachiningDbV"
+<UserControl x:Class="MachiningDbV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-      xmlns:PrintApp="clr-namespace:Icarus"
+             xmlns:PrintApp="clr-namespace:Icarus"
-      Width="310"
+             Width="300">
-      VerticalAlignment="Center">
+   <Border VerticalAlignment="Center"
-   <Grid.RowDefinitions>
+           Style="{StaticResource RightPanel_Border}">
-      <RowDefinition Height="Auto"/>
+      <Grid>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <Border Margin="0,0,0,2.5" 
-           Style="{StaticResource Title_Border}">
-      <TextBlock Text="MACHINING DATABASE"
-                 Style="{StaticResource Title_TextBlock}"/>
-   </Border>
-   <Border Grid.Row="1"
-           VerticalAlignment="Center"
-           Margin="0,2.5,0,0"
-           Style="{StaticResource BottomGrayRow_Border}">
-      <Grid Margin="2.5,2.5,2.5,0">
          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
-         <Grid HorizontalAlignment="Center" 
+         <Grid>
-               Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="Auto"/>
@@ -37,41 +25,33 @@
             <Button Content="New"
                     Command="{Binding New_Command}"
                     IsEnabled="{Binding IsEnabled}"
-                    Margin="2.5,0,2.5,0"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                    Style="{StaticResource RightPanel_Button}"/>
             <Button Content="Save"
                     Grid.Column="1"
                     Command="{Binding Save_Command}"
                     IsEnabled="{Binding IsEnabled}"
-                    Margin="2.5,0,2.5,0"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                    Style="{StaticResource RightPanel_Button}"/>
             <Button Content="Delete"
                     Grid.Column="2"
                     Command="{Binding Delete_Command}"
                     IsEnabled="{Binding IsEnabled}"
-                    Margin="2.5,0,2.5,0"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                    Style="{StaticResource RightPanel_Button}"/>
             <Button Grid.Column="3"
                     Command="{Binding Import_Command}"
-                    ToolTip="{Binding Import_ToolTip}"
+                    ToolTip="{Binding ImportToolTip}"
                     IsEnabled="{Binding ImpExp_IsEnabled}"
-                    Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/MachiningDB/MachiningImport.png"
+               <Image Source="/Resources/MachiningDB/Import.png" Stretch="Uniform"/>
-                      Style="{StaticResource Button_Image}"/>
             </Button>
             <Button Grid.Column="4"
                     Command="{Binding Export_Command}"
-                    ToolTip="{Binding Export_ToolTip}"
+                    ToolTip="{Binding ImportToolTip}"
                     IsEnabled="{Binding ImpExp_IsEnabled}"
-                    Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/MachiningDB/MachiningExport.png"
+               <Image Source="/Resources/MachiningDB/Export.png" Stretch="Uniform"/>
-                      Style="{StaticResource Button_Image}"/>
             </Button>
          </Grid>
-         <Grid Grid.Row="1"
+         <Grid Grid.Row="1">
-               Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="Auto"/>
@@ -81,40 +61,26 @@
                       SelectedItem="{Binding SelMachining}"
                       DisplayMemberPath="ghName"
                       Visibility="{Binding Combo_Visibility}"
-                      HorizontalAlignment="Stretch"
+                      Style="{StaticResource FeatureComboBox}"/>
-                      Margin="2.5,0,2.5,0"
+            <EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
-                      Style="{StaticResource RightPanel_ComboBox}"/>
+                                   IsExplicitFocused="{Binding UserShouldEditValueNow}"
-            <EgtWPFLib5:EgtTextBox2 Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
+                                   Visibility="{Binding Name_Visibility}"
-                                    ExplicitUpdateSource="EnterKeyPressOrLostFocus"
+                                   Style="{StaticResource OptionTextBox}"/>
-                                    IsExplicitFocused="{Binding UserShouldEditValueNow}"
-                                    Visibility="{Binding Name_Visibility}"
-                                    Margin="2.5,0,2.5,0"
-                                    Style="{StaticResource OptionTextBox2}"/>
             <Button Grid.Column="1"
                     Command="{Binding EditName_Command}"
-                    ToolTip="{Binding EditName_ToolTip}"
-                    Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/MachiningDB/Edit.png"
+               <Image Source="/Resources/TopPanel/Edit.png"/>
-                      Style="{StaticResource Button_Image}"/>
             </Button>
          </Grid>
-         <ScrollViewer Grid.Row="2"
+         <ScrollViewer Grid.Row="3"
-                       IsEnabled="{Binding IsEnabled}"
                        VerticalScrollBarVisibility="Auto"
-                       HorizontalScrollBarVisibility="Disabled"
+                       HorizontalScrollBarVisibility="Disabled">
-                       Margin="1,0,0,2.5"
+            <ItemsControl Grid.Row="1"
-                       Padding="0"
+                          ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}"
-                       BorderThickness="0"
+                          IsEnabled="{Binding IsEnabled}">
-                       Style="{StaticResource RightPanel_ScrollViewer}">
-            <ItemsControl ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}"
-                          BorderThickness="0"
-                          Margin="0"
-                          Padding="0">
                <ItemsControl.ItemsPanel>
                   <ItemsPanelTemplate>
-                     <StackPanel Orientation="Vertical"
+                     <StackPanel Orientation="Vertical"/>
-                                 Margin="0"/>
                   </ItemsPanelTemplate>
                </ItemsControl.ItemsPanel>
                <ItemsControl.ItemTemplate>
@@ -122,118 +88,131 @@
                      <Expander Header="{Binding sName}"
                                IsExpanded="{Binding Cathegory_IsExpanded}"
                                VerticalContentAlignment="Top">
-                        <ItemsControl ItemsSource="{Binding MachiningParamList}"
+                        <ItemsControl ItemsSource="{Binding MachiningParamList}">
-                                      BorderThickness="0"
-                                      Margin="0"
-                                      Padding="0">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
-                                 <StackPanel Orientation="Vertical"
+                                 <StackPanel Orientation="Vertical"/>
-                                             Margin="0"/>
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.Resources>
                               <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
+                                       <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <TextBox Grid.Column="1"
-                                             Text="{Binding sValue}"
+                                                           Text="{Binding sValue}"/>
-                                             Margin="2.5,0,0,0"
+                                    <!--<Button Grid.Column="2"
-                                             Style="{StaticResource ParameterList_TextBox}"/>
+                                            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:ComboMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid>
                                     <Grid.ColumnDefinitions>
+                                       <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
-                                       <ColumnDefinition Width="1*"/>
+                                       <!--<ColumnDefinition Width="Auto"/>-->
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <ComboBox Grid.Column="1"
                                               ItemsSource="{Binding ValueList}"
                                               SelectedItem="{Binding SelValue}"
-                                              HorizontalAlignment="Stretch"
+                                              HorizontalAlignment="Stretch"/>
-                                              Margin="2.5,0,0,0"
+                                    <!--<Button Grid.Column="1"
-                                              Style="{StaticResource RightPanel_ComboBox}"/>
+                                            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:CheckMachiningParam}">
-                                 <Grid Height="22"
+                                 <Grid>
-                                       Margin="0,1,2.5,1">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
+                                       <!--<ColumnDefinition Width="Auto"/>-->
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <CheckBox Grid.Column="1"
                                               IsChecked="{Binding bValue}"
                                               HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"
+                                              VerticalAlignment="Center"/>
-                                              Margin="2.5,0,0,0"/>
+                                    <!--<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:MaterialMachiningParam}">
-                                 <Grid Height="22"
+                                 <Grid>
-                                       Margin="0,1,2.5,1">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
+                                       <!--<ColumnDefinition Width="Auto"/>-->
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <CheckBox Grid.Column="1"
                                               IsChecked="{Binding bValue}"
                                               HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"
+                                              VerticalAlignment="Center"/>
-                                              Margin="2.5,0,0,0"/>
+                                    <!--<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:OrderedMachiningParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="1*"/>
-                                       <ColumnDefinition Width="1*"/>
+                                       <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <Grid.RowDefinitions>
-                                               Margin="0,0,2.5,0"
+                                       <RowDefinition Height="Auto"/>
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
+                                       <RowDefinition Height="Auto"/>
-                                    <Grid Grid.Column="1">
+                                    </Grid.RowDefinitions>
-                                       <Grid.ColumnDefinitions>
+                                    <TextBlock Text="{Binding sName}"/>
-                                          <ColumnDefinition Width="1*"/>
+                                    <StackPanel Grid.Column="1"
-                                          <ColumnDefinition Width="Auto"/>
+                                                Orientation="Horizontal"
-                                       </Grid.ColumnDefinitions>
+                                                HorizontalAlignment="Right">
-                                       <ListBox ItemsSource="{Binding ValueList}"
+                                       <Button Content="&lt;>"
-                                                SelectedItem="{Binding SelValue}"
+                                               Command="{Binding ResetOrder_Command}"
-                                                Margin="2.5,0,2.5,0"/>
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
-                                       <StackPanel Grid.Column="1"
+                                       <Button Content="˄"
-                                                   Orientation="Vertical"
+                                               Command="{Binding MoveUpOrder_Command}"
-                                                   VerticalAlignment="Center"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
-                                                   Margin="2.5,0,0,0">
+                                       <Button Content="˅"
-                                          <Button Content="˄"
+                                               Command="{Binding MoveDownOrder_Command}"
-                                                  Command="{Binding MoveUpOrder_Command}"
+                                               Style="{StaticResource ToolBar_SmallButton}"/>
-                                                  Margin="0,0,0,2.5"
+                                    </StackPanel>
-                                                  Style="{StaticResource ToolBar_SmallButton}"/>
+                                    <ListBox Grid.ColumnSpan="2"
-                                          <Button Content="˅"
+                                             Grid.Row="1"
-                                                  Command="{Binding MoveDownOrder_Command}"
+                                             ItemsSource="{Binding ValueList}"
-                                                  Margin="0,2.5,0,2.5"
+                                             SelectedItem="{Binding SelValue}"/>
-                                                  Style="{StaticResource ToolBar_SmallButton}"/>
-                                          <Button Content="&lt;>"
-                                                  Command="{Binding ResetOrder_Command}"
-                                                  Margin="0,2.5,0,0"
-                                                  Style="{StaticResource ToolBar_SmallButton}"/>
-                                       </StackPanel>
-                                    </Grid>
                                  </Grid>
                               </DataTemplate>
                            </ItemsControl.Resources>
@@ -243,14 +222,12 @@
                </ItemsControl.ItemTemplate>
             </ItemsControl>
          </ScrollViewer>
-         <Button Grid.Row="3"
+         <UniformGrid Grid.Row="4" Rows="1">
-                 Command="{Binding Ok_Command}"
+            <Button Content="Ok"
-                 IsEnabled="{Binding IsEnabled}"
+                    Command="{Binding Ok_Command}"
-                 Margin="0,2.5,0,0"
+                    IsEnabled="{Binding IsEnabled}"
-                 Style="{StaticResource RightPanel_HalfRound_Button}">
+                    Style="{StaticResource ToolBar_TextButton}"/>
-            <Image Source="\Resources\Common\Ok.png"
+         </UniformGrid>
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
       </Grid>
    </Border>
-</Grid>
+</UserControl>

Icarus/MachiningDb/MachiningDbVM.vb

@@ -112,28 +112,6 @@ Public Class MachiningDbVM
       End Get
    End Property
 
-#Region "Tooltip"
-
-   Public ReadOnly Property Import_ToolTip As String
-      Get
-         Return "Import"
-      End Get
-   End Property
-
-   Public ReadOnly Property Export_ToolTip As String
-      Get
-         Return "Export"
-      End Get
-   End Property
-
-   Public ReadOnly Property EditName_ToolTip As String
-      Get
-         Return "Edit Name"
-      End Get
-   End Property
-
-#End Region    ' Tooltip
-
    ' Definizione comandi
    Private m_cmdOk As ICommand
    Private m_cmdNew As ICommand
@@ -313,9 +291,6 @@ 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
@@ -355,11 +330,13 @@ Public Class MachiningDbVM
 
    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),
+      Dim OpenFileDlg As New System.Windows.Forms.OpenFileDialog() With {
-                                                                         .Filter = "File data (*" & ImportExportMachiningPanelVM.MachiningDataExtension & ")|*" & ImportExportMachiningPanelVM.MachiningDataExtension,
+               .Title = EgtMsg(31451) & " " & EgtMsg(31452),
-                                                                         .FileName = String.Empty}
+               .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
+               .FileName = String.Empty
+            }
       If OpenFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
-      Dim ImportWindow As New ImportExportMachiningPanelV(Application.Current.MainWindow, New ImportExportMachiningPanelVM(ImportExportMachiningPanelVM.WindowTypeEnum.MACHINING, ImportExportMachiningPanelVM.WindowModeEnum.IMPORT, OpenFileDlg.FileName))
+      Dim ImportWindow As New ImportExportMachiningPanelV(Application.Current.MainWindow, New ImportExportMachiningPanelVM(OpenFileDlg.FileName))
       ImportWindow.ShowDialog()
    End Sub
 
@@ -377,7 +354,7 @@ Public Class MachiningDbVM
    End Property
 
    Public Sub Export()
-      Dim ExportWindow As New ImportExportMachiningPanelV(Application.Current.MainWindow, New ImportExportMachiningPanelVM(ImportExportMachiningPanelVM.WindowTypeEnum.MACHINING, ImportExportMachiningPanelVM.WindowModeEnum.EXPORT))
+      Dim ExportWindow As New ImportExportMachiningPanelV(Application.Current.MainWindow, New ImportExportMachiningPanelVM)
       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(5583, 2502, 1, m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(5583, 2501, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5583, 2502, 1, m_nKeyOptions)
+                            EgtGetKeyOptions(5583, 2501, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

Icarus/MainWindow/MainWindowV.xaml

@@ -17,11 +17,7 @@
    </EgtWPFLib5:EgtCustomWindow.TitlePanel>-->
 
    <Grid>
-      <Grid.RowDefinitions>
+      <PrintApp:SceneHostV/>
-         <RowDefinition Height="60"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      <PrintApp:SceneHostV Grid.Row="1"/>
    </Grid>
    <!--Pannello principale --><!--
    <DockPanel>

Icarus/MainWindow/MainWindowVM.vb

@@ -274,10 +274,6 @@ Public Class MainWindowVM
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          Return
       End If
-      ' gestisco la chiusura della simulazione
-      If Map.refRightPanelVM.SelPanel = RightPanelVM.Panels.SIMULATION AndAlso Not IsNothing(Map.refSimulationPanelVM) Then
-         Map.refSimulationPanelVM.MySimul.ResetSimulation()
-      End If
       ' Gestisco eventuale file corrente modificato
       Dim bOk As Boolean = True
       'bOk = ProjFileVM.VerifyProjectModification(Map.refProjManagerVM.CurrProj, ProjectType.PROJ)

Icarus/ManagePartPanel/ManagePartPanelV.xaml

@@ -1,158 +1,147 @@
-<Grid x:Class="ManagePartPanelV"
+<UserControl x:Class="ManagePartPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Icarus"
              xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
              Width="150"
+             Margin="5,0,0,0"
              VerticalAlignment="Stretch">
-   <Grid.RowDefinitions>
+   <Grid DockPanel.Dock="Left">
-      <RowDefinition Height="Auto"/>
+      <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
-   </Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
-   <Border Margin="0,0,0,2.5"
+         <RowDefinition Height="2*"/>
-           Style="{StaticResource Title_Border}">
+         <RowDefinition Height="Auto"/>
-      <TextBlock Text="PART MANAGER"
+         <RowDefinition Height="1*"/>
-                 Style="{StaticResource Title_TextBlock}"/>
+         <RowDefinition Height="Auto"/>
-   </Border>
+      </Grid.RowDefinitions>
-   <Border Grid.Row="1"
+      <Border Style="{StaticResource LeftPanelTitle_Border}">
-           Padding="0,2.5,0,0"
-           Margin="0,2.5,0,0"
-           Style="{StaticResource BottomGrayRow_Border}">
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="2*"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
          <TextBlock Text="Part Entity List"
-                    Margin="0,2.5,0,2.5"
+                    FontWeight="DemiBold"
-                    Style="{StaticResource Title_TextBlock}"/>
+                    FontSize="14"/>
-         <TreeView x:Name="ManagerPartTreeView" 
+      </Border>
-                   Grid.Row="1" 
+      <!--<UniformGrid Grid.Row="1" Rows="1"
-                   ItemsSource="{Binding ManagerPartList}"
+                   IsEnabled="{Binding IsEnabled}">
-                   MinHeight="200"
+         <Button DockPanel.Dock="Left"
-                   IsEnabled="{Binding IsEnabled}"
+                 Content="+"
-                   Margin="0,2.5,0,2.5"
+                 FontSize="20"
-                   FontSize="12"
+                 Command="{Binding AddPart_Command}"
-                   Foreground="{StaticResource Icarus_Gray}">
+                 Style="{StaticResource LeftPanel_Button}"/>
-            <TreeView.Resources>
+         <Button DockPanel.Dock="Left"
-               <HierarchicalDataTemplate DataType="{x:Type local:ManagePart_Part}" 
+                 Content="-"
-                                          ItemsSource="{Binding LayerList}">
+                 FontSize="20"
-                  <StackPanel Orientation="Horizontal">
+                 Command="{Binding RemovePart_Command}"
-                     <!--<Image Source="/Resources/TreeView/Folder.png" 
+                 Style="{StaticResource LeftPanel_Button}"/>
-                              Height="15"/>-->
+      </UniformGrid>-->
-                     <Grid>
+      <TreeView Grid.Row="2" 
-                        <TextBlock Text="{Binding sName}"
+                ItemsSource="{Binding ManagerPartList}"
-                                   Visibility="{Binding TextBlock_Visibility}"
+                MinHeight="200"
-                                   Style="{StaticResource BaseTextBlock}"/>
+                IsEnabled="{Binding IsEnabled}">
-                        <EgtWPFLib5:EgtTextBox Text="{Binding sName, UpdateSourceTrigger=Explicit}"
+         <TreeView.Resources>
-                                               IsExplicitFocused="{Binding UserShouldEditValueNow}"
+            <HierarchicalDataTemplate DataType="{x:Type local:ManagePart_Part}" 
-                                               Visibility="{Binding TextBox_Visibility}"
+                                      ItemsSource="{Binding LayerList}">
-                                               Style="{StaticResource OptionTextBox}"/>
+               <StackPanel Orientation="Horizontal">
-                     </Grid>
+                  <Image Source="/Resources/TreeView/Folder.png" 
-                  </StackPanel>
+                         Height="15"/>
-               </HierarchicalDataTemplate>
-               <HierarchicalDataTemplate DataType="{x:Type local:ManagePart_Layer}" 
-                                         ItemsSource="{Binding EntityList, UpdateSourceTrigger=PropertyChanged}">
-                  <StackPanel Orientation="Horizontal">
-                     <!--<Image Source="/Resources/TreeView/Folder.png"
-                              Height="15"/>-->
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource BaseTextBlock}"/>
-                  </StackPanel>
-               </HierarchicalDataTemplate>
-               <HierarchicalDataTemplate DataType="{x:Type local:PartManager_GeomEntity}">
                   <Grid>
                      <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource BaseTextBlock}"/>
+                                Visibility="{Binding TextBlock_Visibility}"/>
                      <EgtWPFLib5:EgtTextBox Text="{Binding sName, UpdateSourceTrigger=Explicit}"
                                             IsExplicitFocused="{Binding UserShouldEditValueNow}"
                                             Visibility="{Binding TextBox_Visibility}"
                                             Style="{StaticResource OptionTextBox}"/>
                   </Grid>
-               </HierarchicalDataTemplate>
+               </StackPanel>
-               <!-- Menu' tasto destro -->
+            </HierarchicalDataTemplate>
-               <ContextMenu x:Key="RowMenu"
+            <HierarchicalDataTemplate DataType="{x:Type local:ManagePart_Layer}" 
-                              ItemsSource="{Binding MenuList}" 
+                                      ItemsSource="{Binding EntityList, UpdateSourceTrigger=PropertyChanged}">
-                              Style="{StaticResource Icarus_ContextMenu}">
+               <StackPanel Orientation="Horizontal">
-                  <ContextMenu.ItemContainerStyle>
+                  <Image Source="/Resources/TreeView/Folder.png"
-                     <Style TargetType="MenuItem" BasedOn="{StaticResource Icarus_MenuItem}">
+                         Height="15"/>
-                        <Setter Property="Command" Value="{Binding MenuItem_Command}"/>
+                  <TextBlock Text="{Binding sName}" />
-                        <Setter Property="Header" Value="{Binding sMsg}"/>
+               </StackPanel>
-                     </Style>
+            </HierarchicalDataTemplate>
-                  </ContextMenu.ItemContainerStyle>
+            <HierarchicalDataTemplate DataType="{x:Type local:PartManager_GeomEntity}">
-               </ContextMenu>
+               <Grid>
-            </TreeView.Resources>
+                  <TextBlock Text="{Binding sName}" />
-            <TreeView.ItemContainerStyle>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding sName, UpdateSourceTrigger=Explicit}"
-               <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource {x:Type TreeViewItem}}">
+                                         IsExplicitFocused="{Binding UserShouldEditValueNow}"
-                  <Setter Property="IsSelected" Value="{Binding bIsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                         Visibility="{Binding TextBox_Visibility}"
-                  <Setter Property="IsExpanded" Value="True"/>
+                                         Style="{StaticResource OptionTextBox}"/>
-                  <Setter Property="ContextMenu" Value="{StaticResource RowMenu}"/>
+               </Grid>
-                  <Setter Property="ContextMenuService.Placement" Value="Right"/>
+            </HierarchicalDataTemplate>
-                  <EventSetter Event="ContextMenuOpening" Handler="Item_ContextMenuOpening"/>
+            <!-- Menu' tasto destro -->
-               </Style>
+            <ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}" >
-            </TreeView.ItemContainerStyle>
+               <ContextMenu.ItemContainerStyle>
-         </TreeView>
+                  <Style TargetType="MenuItem">
-         <TextBlock Grid.Row="2"
+                     <Setter Property="Command" Value="{Binding MenuItem_Command}"/>
-                    Text="Imported Entity List"
+                     <Setter Property="Header" Value="{Binding sMsg}"/>
-                    Visibility="{Binding IsImport_Visibility}"
+                  </Style>
-                    Margin="0,2.5,0,2.5"
+               </ContextMenu.ItemContainerStyle>
-                    Style="{StaticResource Title_TextBlock}"/>
+            </ContextMenu>
-         <ListBox Grid.Row="3"
+         </TreeView.Resources>
-                  ItemsSource="{Binding ImportedEntityList, UpdateSourceTrigger=PropertyChanged}"
+         <TreeView.ItemContainerStyle>
-                  SelectedItem="{Binding SelImportedEntity}"
+            <Style TargetType="{x:Type TreeViewItem}">
-                  MinHeight="100"
+               <Setter Property="IsSelected" Value="{Binding bIsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-                  IsEnabled="{Binding IsEnabled}"
+               <Setter Property="IsExpanded" Value="True"/>
-                  Visibility="{Binding IsImport_Visibility}"
+               <Setter Property="ContextMenu" Value="{StaticResource RowMenu}"/>
-                  Margin="0,2.5,0,2.5">
+               <EventSetter Event="ContextMenuOpening" Handler="Item_ContextMenuOpening"/>
-            <ListBox.Resources>
+            </Style>
-               <!-- Menu' tasto destro -->
+         </TreeView.ItemContainerStyle>
-               <ContextMenu x:Key="RowMenu" 
+      </TreeView>
-                              ItemsSource="{Binding MenuList}"
+      <Border Grid.Row="3"
-                              Style="{StaticResource Icarus_ContextMenu}">
+              Visibility="{Binding IsImport_Visibility}"
-                  <ContextMenu.ItemContainerStyle>
+              Style="{StaticResource LeftPanelTitle_Border}">
-                     <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource Icarus_MenuItem}">
+         <TextBlock Text="Imported Entity List"
-                        <Setter Property="Command" Value="{Binding MenuItem_Command}"/>
+                    FontWeight="DemiBold"
-                        <Setter Property="Header" Value="{Binding sMsg}"/>
+                    FontSize="14"/>
-                     </Style>
+      </Border>
-                  </ContextMenu.ItemContainerStyle>
+      <ListBox Grid.Row="4" 
-               </ContextMenu>
+               ItemsSource="{Binding ImportedEntityList, UpdateSourceTrigger=PropertyChanged}"
-            </ListBox.Resources>
+               SelectedItem="{Binding SelImportedEntity}"
-            <ListBox.ItemContainerStyle>
+               MinHeight="100"
-               <Style TargetType="ListBoxItem">
+               IsEnabled="{Binding IsEnabled}"
-                  <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+               Visibility="{Binding IsImport_Visibility}">
-                  <Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
+         <ListBox.Resources>
-                  <Setter Property="ContextMenuService.Placement" Value="Right" />
+            <!-- Menu' tasto destro -->
-                  <Setter Property="ContextMenuService.VerticalOffset" Value="-3" />
+            <ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}" >
-               </Style>
+               <ContextMenu.ItemContainerStyle>
-            </ListBox.ItemContainerStyle>
+                  <Style TargetType="MenuItem">
-            <ListBox.ItemTemplate>
+                     <Setter Property="Command" Value="{Binding MenuItem_Command}"/>
-               <DataTemplate>
+                     <Setter Property="Header" Value="{Binding sMsg}"/>
-                  <Grid HorizontalAlignment="Stretch">
+                  </Style>
-                     <Grid.InputBindings>
+               </ContextMenu.ItemContainerStyle>
-                        <MouseBinding Gesture="LeftDoubleClick"
+            </ContextMenu>
-                                       Command="{Binding GeomEntityDoubleClick_Command}"/>
+         </ListBox.Resources>
-                     </Grid.InputBindings>
+         <ListBox.ItemContainerStyle>
-                     <TextBlock Text="{Binding ghName}">
+            <Style TargetType="ListBoxItem">
-                     </TextBlock>
+               <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                  </Grid>
+               <Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
-               </DataTemplate>
+            </Style>
-            </ListBox.ItemTemplate>
+         </ListBox.ItemContainerStyle>
-         </ListBox>
+         <ListBox.ItemTemplate>
-         <UniformGrid Grid.Row="4"
+            <DataTemplate>
-                      Rows="1"
+               <Grid HorizontalAlignment="Stretch">
-                      IsEnabled="{Binding IsEnabled}"
+                  <Grid.InputBindings>
-                      Margin="0,2.5,0,0">
+                     <MouseBinding Gesture="LeftDoubleClick"
-            <Button Content="Ok"
+                                   Command="{Binding GeomEntityDoubleClick_Command}"/>
-                    Command="{Binding Ok_Command}"
+                  </Grid.InputBindings>
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                  <TextBlock Text="{Binding ghName}">
-            <Button Content="Cancel"
+                  </TextBlock>
-                    Command="{Binding Cancel_Command}"
+               </Grid>
-                    Visibility="{Binding IsImport_Visibility}"
+            </DataTemplate>
-                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         </ListBox.ItemTemplate>
-         </UniformGrid>
+      </ListBox>
-      </Grid>
+      <UniformGrid Grid.Row="5"
-   </Border>
+                   Rows="1"
-</Grid>
+                   IsEnabled="{Binding IsEnabled}">
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 Style="{StaticResource ToolBar_TextButton}"/>
+         <Button Content="Cancel"
+                 Command="{Binding Cancel_Command}"
+                 Visibility="{Binding IsImport_Visibility}"
+                 Style="{StaticResource ToolBar_TextButton}"/>
+      </UniformGrid>
+   </Grid>
+</UserControl>

Icarus/ManagePartPanel/ManagePartPanelVM.vb

@@ -316,9 +316,8 @@ Public Class ManagePartPanelVM
                               EgtRelocateGlob(PrintSolidEntity.nId, nPrintPartLayerId, GDB_POS.LAST_SON)
                               ' calcolo box superficie per creazione riferimento
                               EgtGetBBoxGlob(PrintSolidEntity.nId, GDB_BB.STANDARD, b3PrintSolid)
-                              ' elimino colore entita' e rendo visibile
+                              ' elimino colore entita'
                               EgtResetColor(PrintSolidEntity.nId)
-                              EgtSetStatus(PrintSolidEntity.nId, GDB_ST.ON_)
                               If PrintSolidEntity.sName <> PrintSolidEntity.nId.ToString() Then
                                  EgtSetInfo(PrintSolidEntity.nId, ENTITY_NAME, PrintSolidEntity.sName)
                               End If
@@ -342,9 +341,8 @@ Public Class ManagePartPanelVM
                                        nMachStartId = EgtCreateCurveCompo(nMachStartLayerId, PartManager_GeomEntity.nId, True)
                                  End Select
                                  EgtSetName(nMachStartId, START_GEOM)
-                                 ' elimino colore entita' e rendo visibile
+                                 ' elimino colore entita'
                                  EgtResetColor(nMachStartId)
-                                 EgtSetStatus(nMachStartId, GDB_ST.ON_)
                                  If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                     EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                                  End If
@@ -354,60 +352,48 @@ Public Class ManagePartPanelVM
                               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)
-                              ' elimino colore entita' e rendo visibile
+                              ' elimino colore entita'
                               EgtResetColor(nMachStartId)
-                              EgtSetStatus(nMachStartId, GDB_ST.ON_)
                            End If
                         Case ManagePart_Layer.LayerType.RIBS
                            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)
+                              EgtSetInfo(PartManager_GeomEntity.nId, RIB_ID, RibPanelVM.GetNextRibIndex())
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nRibsLayerId, GDB_POS.LAST_SON)
-                              ' elimino colore entita' e rendo visibile
+                              ' elimino colore entita'
                               EgtResetColor(PartManager_GeomEntity.nId)
-                              EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                               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)
                            EgtSetName(nShellNumberLayerId, LAY_SHELL_NBR)
                            EgtSetColor(nShellNumberLayerId, GeomEntityColors.c3ShellNumber)
-                           Dim nShellNumberIndex As Integer = 1
                            For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
                               EgtSetInfo(PartManager_GeomEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
-                              EgtSetInfo(PartManager_GeomEntity.nId, SHELLNUMBER_ID, nShellNumberIndex)
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nShellNumberLayerId, GDB_POS.LAST_SON)
-                              ' elimino colore entita' e rendo visibile
+                              ' elimino colore entita'
                               EgtResetColor(PartManager_GeomEntity.nId)
-                              EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
-                              nShellNumberIndex += 1
                            Next
                         Case ManagePart_Layer.LayerType.AUX_SOLIDS
                            nAuxSolidsLayerId = EgtCreateGroup(nPartId)
                            EgtSetName(nAuxSolidsLayerId, LAY_AUX_SOLIDS)
                            EgtSetColor(nAuxSolidsLayerId, GeomEntityColors.c3AuxSolids)
-                           Dim nFilledSolidIndex As Integer = 1
                            For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
                               EgtSetInfo(PartManager_GeomEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
-                              EgtSetInfo(PartManager_GeomEntity.nId, FILLEDSOLID_ID, nFilledSolidIndex)
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nAuxSolidsLayerId, GDB_POS.LAST_SON)
-                              ' elimino colore entita' e rendo visibile
+                              ' elimino colore entita'
                               EgtResetColor(PartManager_GeomEntity.nId)
-                              EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
-                              nFilledSolidIndex += 1
                            Next
                         Case ManagePart_Layer.LayerType.OTHERS
                            nOthersLayerId = EgtCreateGroup(nPartId)
@@ -415,9 +401,8 @@ Public Class ManagePartPanelVM
                            EgtSetColor(nOthersLayerId, GeomEntityColors.c3Others)
                            For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nOthersLayerId, GDB_POS.LAST_SON)
-                              ' elimino colore entita' e rendo visibile
+                              ' elimino colore entita'
                               EgtResetColor(PartManager_GeomEntity.nId)
-                              EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
@@ -430,18 +415,16 @@ Public Class ManagePartPanelVM
                                     Case GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_LINE
                                        '  la trasformo in curva compo
                                        Dim nOtherId As Integer = EgtCreateCurveCompo(nOthersLayerId, PartManager_GeomEntity.nId, True)
-                                       ' elimino colore entita' e rendo visibile
+                                       ' elimino colore entita'
                                        EgtResetColor(PartManager_GeomEntity.nId)
-                                       EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                                        If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                           EgtSetInfo(nOtherId, ENTITY_NAME, PartManager_GeomEntity.sName)
                                        End If
                                     Case Else
                                        ' altrimenti la sposto solamente
                                        EgtRelocateGlob(PartManager_GeomEntity.nId, nOthersLayerId, GDB_POS.LAST_SON)
-                                       ' elimino colore entita' e rendo visibile
+                                       ' elimino colore entita'
                                        EgtResetColor(PartManager_GeomEntity.nId)
-                                       EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                                        If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                           EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                                        End If
@@ -450,11 +433,17 @@ Public Class ManagePartPanelVM
                            End If
                      End Select
                   Next
-                  ' aggiungo layer riferimento
+                  ' aggiungo riferimento
-                  Dim nPartReferenceLayerId As Integer = EgtCreateGroup(nPartId)
-                  EgtSetName(nPartReferenceLayerId, LAY_PARTREFERENCE)
                   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))
@@ -464,11 +453,8 @@ Public Class ManagePartPanelVM
                   EgtSetInfo(nPartId, FILE_PATH, sFilePath)
                   EgtSetInfo(nPartId, PART_NAME, ManagePart_Part.sName)
                   EgtSetInfo(nPartId, "PartOnTable", 1)
-                  Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nPartReferenceLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
+                  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)
-                  Map.refSliceManagerVM.UpdateDimensions()
                Next
             End If
             'EgtAddMachGroup("3dPrint")

Icarus/ManagePartPanel/ManagePartUtility.vb

@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -376,11 +375,10 @@ Public Class ManagePart_Layer
 
    Public Enum LayerType As Integer
       PRINT_SOLID = 1
-      'REFERENCE = 2
+      MACH_START = 2
-      MACH_START = 3
+      RIBS = 3
-      RIBS = 4
+      SHELL_NUMBER = 4
-      SHELL_NUMBER = 5
+      AUX_SOLIDS = 5
-      AUX_SOLIDS = 6
       OTHERS = 7
       CHANGENAME = 15
       DELETE = 16
@@ -512,11 +510,11 @@ Public Class ManagePart_Layer
             m_nLayerId = PrintPart.nAuxSolidsLayerId
             Dim nEntityId As Integer = EgtGetFirstInGroup(m_nLayerId)
             While nEntityId <> GDB_ID.NULL
-               Dim FIlledSolidType As Integer = FilledSolidEntity.FilledSolidTypes.FROMDRAW
+               'Dim ShellType As Integer = ShellNumberEntity.ShellNumberTypes.FROMDRAW
-               EgtGetInfo(nEntityId, KEY_AUXSOLID_TYPE, FIlledSolidType)
+               'EgtGetInfo(nEntityId, KEY_SHELLNBR_TYPE, ShellType)
-               If FIlledSolidType = FilledSolidEntity.FilledSolidTypes.FROMIMPORT Then
+               'If ShellType = ShellNumberEntity.ShellNumberTypes.FROMIMPORT Then
-                  m_EntityList.Add(New PartManager_GeomEntity(Me, nEntityId))
+               m_EntityList.Add(New PartManager_GeomEntity(Me, nEntityId))
-               End If
+               'End If
                nEntityId = EgtGetNext(nEntityId)
             End While
          Case LayerType.OTHERS
@@ -641,14 +639,12 @@ Public Class GeomEntity_MenuItem
             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)
+            EgtRemoveInfo(nPartId, "MovedPart")
             EgtDraw()
             ' aggiorno riferimenti nel context menu item
             Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
             ' Imposto flag di ricalcolo slice
-            If Map.refManagePartPanelVM.Type = ManagePartPanelVM.ManagePartType.MODIFY Then
+            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
-               EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
-            End If
          End If
          Return
       ElseIf m_Type = ManagePart_Layer.LayerType.NEWPART Then
@@ -670,8 +666,6 @@ 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
@@ -690,50 +684,52 @@ 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 nPartReferenceLayerId As Integer = EgtCreateGroup(nPartId)
-               EgtSetName(nPartReferenceLayerId, LAY_PARTREFERENCE)
                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))
                ' lo aggiungo a lista pezzi 
                EgtSetInfo(nPartId, FILE_PATH, sFilePath)
                EgtSetInfo(nPartId, "PartOnTable", 1)
-               Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nPartReferenceLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
+               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)
@@ -745,10 +741,9 @@ 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 PrintViewlayer As ViewLayer = Map.refViewLayerManagerVM.LayerList.FirstOrDefault(Function(x) x.Type = ViewLayer.ViewLayerType.PRINT_SOLID)
+         'Dim PrintLayer As ViewLayer = Map.refViewLayerManagerVM.LayerList.FirstOrDefault(Function(x) x.Type = ViewLayer.ViewLayerType.PRINT_SOLID)
-         EgtSetStatus(m_OrigEntity.nId, If(IsNothing(PrintViewlayer.bIsVisible) OrElse PrintViewlayer.bIsVisible, GDB_ST.ON_, GDB_ST.OFF))
+         'EgtSetStatus(m_OrigEntity.nId, If(IsNothing(PrintLayer.bIsVisible) OrElse PrintLayer.bIsVisible, GDB_ST.ON_, GDB_ST.OFF))
-         EgtDraw()
          Return
       End If
       Select Case Map.refManagePartPanelVM.Type
@@ -768,18 +763,11 @@ 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
-            Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
+            m_OrigEntity.UpdateContextMenu()
          Case ManagePartPanelVM.ManagePartType.MODIFY
-            Dim bIsMovedPartOrRib As Boolean = False
             ' recupero layer da pezzo
             Dim nLayerId As Integer = GDB_ID.NULL
             Select Case m_Type
@@ -801,21 +789,19 @@ 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, KEY_MOVEDPART, vtMoved) Then
+                     If EgtGetInfo(nPartId, "MovedPart", vtMoved) Then
                         ' lo sposto e rimuovo info
                         EgtMove(m_OrigEntity.nId, -vtMoved, GDB_RT.GLOB)
-                        EgtRemoveInfo(nPartId, KEY_MOVEDPART)
+                        EgtRemoveInfo(nPartId, "MovedPart")
                      End If
-                     bIsMovedPartOrRib = True
                   Case ManagePart_Layer.LayerType.MACH_START
                   Case ManagePart_Layer.LayerType.RIBS
                      EgtRemoveInfo(m_OrigEntity.nId, KEY_RIB_TYPE)
                      EgtRemoveInfo(m_OrigEntity.nId, RIB_ID)
-                     bIsMovedPartOrRib = True
                   Case ManagePart_Layer.LayerType.SHELL_NUMBER
                      EgtRemoveInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE)
                   Case ManagePart_Layer.LayerType.AUX_SOLIDS
@@ -839,33 +825,29 @@ Public Class GeomEntity_MenuItem
                Select Case m_Type
                   Case ManagePart_Layer.LayerType.PRINT_SOLID
                      EgtSetName(m_OrigEntity.nId, PRINT_SOLID)
+                     EgtSetColor(m_OrigEntity.nId, c3Print)
                      ' rimuovo eventuale nota spostamento per 45 gradi
-                     EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, KEY_MOVEDPART)
+                     EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, "MovedPart")
-                     bIsMovedPartOrRib = True
                   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())
-                     bIsMovedPartOrRib = True
+                     EgtSetColor(m_OrigEntity.nId, c3Rib)
                   Case ManagePart_Layer.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 ManagePart_Layer.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 ManagePart_Layer.LayerType.OTHERS
                      EgtSetName(m_OrigEntity.nId, LAY_OTHERS)
+                     EgtSetColor(m_OrigEntity.nId, c3Others)
                End Select
-               ' resetto colore entita'
-               EgtResetColor(m_OrigEntity.nId)
-               ' se spostato un Rib, aggiorno posizione riferimento e pezzo
-               If bIsMovedPartOrRib Then
-                  Map.refReferencePanelVM.UpdateFramePosition(NewPart.PrintPart)
-                  Map.refDispositionPanelVM.UpdateZPos()
-                  Map.refSliceManagerVM.UpdateDimensions()
-               End If
                EgtDraw()
                ' aggiorno riferimenti nel context menu item
                If bUpdateAllContextMenu Then
@@ -944,8 +926,7 @@ Public Class ManagerPart_MenuItem
             Select Case Map.refManagePartPanelVM.Type
                Case ManagePartPanelVM.ManagePartType.IMPORT
                   For Each Layer In m_OrigPart.LayerList
-                     For EntityIndex = Layer.EntityList.Count - 1 To 0 Step -1
+                     For Each Entity In Layer.EntityList
-                        Dim Entity As PartManager_GeomEntity = Layer.EntityList(EntityIndex)
                         ' le rimuovo da lista entita' pezzo
                         Layer.EntityList.Remove(Entity)
                         ' la rimetto in lista importati
@@ -968,9 +949,7 @@ Public Class ManagerPart_MenuItem
             ' aggiorno riferimenti nel context menu item
             Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
             ' Imposto flag di ricalcolo slice
-            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)
-               EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
-            End If
       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)) OrElse bIsModifiedName
+      m_bIsModified = m_CathegoryList.Any(Function(x) x.MaterialParamList.Any(Function(y) y.bIsModified))
       NotifyPropertyChanged(NameOf(ghName))
    End Sub
 
@@ -31,32 +31,23 @@ 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 Property sGUID As String
+   Public ReadOnly 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)
-         If bIsModified Then UpdateIsModified()
+         NotifyPropertyChanged(NameOf(ghName))
-         Map.refMaterialDbVM.SetIsEnabled(True)
       End Set
    End Property
    Public ReadOnly Property ghName As String
@@ -64,18 +55,12 @@ Public Class Material
          Return m_sName & If(m_bIsModified, "*", "")
       End Get
    End Property
-   Public ReadOnly Property bIsModifiedName As Boolean
-      Get
-         Return m_sName <> m_sOrigName
-      End Get
-   End Property
 
    ' per lettura da file
    Sub New(nIndex As Integer)
       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))
@@ -91,8 +76,7 @@ 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"
+      m_sName = "New Material Param"
-      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)
@@ -149,16 +133,6 @@ 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
@@ -171,17 +145,15 @@ 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
-         ResetParams()
+         SaveParams()
          ' resetto stato di modificata
          UpdateIsModified()
       End If
@@ -193,12 +165,12 @@ Public Class Material
       Next
    End Sub
 
-   Friend Sub WriteParamsOnDb(nIndex As Integer, Optional sFilePath As String = "")
+   Friend Sub WriteParamsOnDb(nIndex As Integer)
-      WriteMaterialParam(nIndex, MAT_GUID, m_sGUID, sFilePath)
+      WriteMaterialParam(nIndex, MAT_GUID, m_sGUID)
-      WriteMaterialParam(nIndex, MAT_NAME, m_sName, sFilePath)
+      WriteMaterialParam(nIndex, MAT_NAME, m_sName)
       ' EgtWriteStringUtf8toIni(nIndex, MAT_NAME, m_sName)
       For Each Cathegory In m_CathegoryList
-         Cathegory.WriteParamOnDb(nIndex, sFilePath)
+         Cathegory.WriteParamOnDb(nIndex)
       Next
    End Sub
 
@@ -386,9 +358,9 @@ Public Class MaterialCathegory
       Next
    End Sub
 
-   Friend Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
+   Friend Sub WriteParamOnDb(nIndex As Integer)
       For Each Param In m_MaterialParamList
-         Param.WriteParamOnDb(nIndex, sFilePath)
+         Param.WriteParamOnDb(nIndex)
       Next
    End Sub
 
@@ -484,7 +456,7 @@ Public MustInherit Class MaterialParam
    End Sub
 
 
-   Friend MustOverride Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
+   Friend MustOverride Sub WriteParamOnDb(nIndex As Integer)
    Friend MustOverride Sub SaveParam()
    Friend MustOverride Sub ResetParam()
 
@@ -587,7 +559,7 @@ Public Class NumericMaterialParam
       m_dOrigValue = m_dValue
    End Sub
 
-   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
       Dim sWriteValue As String = ""
       If m_bIsLen Then
          sWriteValue = LenToString(m_dValue, 5)
@@ -596,43 +568,43 @@ Public Class NumericMaterialParam
       End If
       Select Case Type
          Case Params.T1
-            WriteMaterialParam(nIndex, MAT_T1, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_T1, sWriteValue)
          Case Params.T2
-            WriteMaterialParam(nIndex, MAT_T2, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_T2, sWriteValue)
          Case Params.T3
-            WriteMaterialParam(nIndex, MAT_T3, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_T3, sWriteValue)
          Case Params.T4
-            WriteMaterialParam(nIndex, MAT_T4, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_T4, sWriteValue)
          Case Params.T5
-            WriteMaterialParam(nIndex, MAT_T5, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_T5, sWriteValue)
          Case Params.K_EXTRUSION
-            WriteMaterialParam(nIndex, MAT_KEXTRUSION, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_KEXTRUSION, sWriteValue)
          Case Params.K_LAY_TIME
-            WriteMaterialParam(nIndex, MAT_KLAYERTIME, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_KLAYERTIME, sWriteValue)
          Case Params.C1
-            WriteMaterialParam(nIndex, MAT_C1, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_C1, sWriteValue)
          Case Params.C2
-            WriteMaterialParam(nIndex, MAT_C2, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_C2, sWriteValue)
          Case Params.DENSITY
-            WriteMaterialParam(nIndex, MAT_DENSITY, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_DENSITY, sWriteValue)
          Case Params.AMAX
-            WriteMaterialParam(nIndex, MAT_AMAX, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_AMAX, sWriteValue)
          Case Params.ATRG
-            WriteMaterialParam(nIndex, MAT_ATRG, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_ATRG, sWriteValue)
          Case Params.AMIN
-            WriteMaterialParam(nIndex, MAT_AMIN, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_AMIN, sWriteValue)
          Case Params.BMAX
-            WriteMaterialParam(nIndex, MAT_BMAX, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_BMAX, sWriteValue)
          Case Params.BTRG
-            WriteMaterialParam(nIndex, MAT_BTRG, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_BTRG, sWriteValue)
          Case Params.BMIN
-            WriteMaterialParam(nIndex, MAT_BMIN, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_BMIN, sWriteValue)
          Case Params.KW
-            WriteMaterialParam(nIndex, MAT_KW, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_KW, sWriteValue)
          Case Params.KZ
-            WriteMaterialParam(nIndex, MAT_KZ, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_KZ, sWriteValue)
          Case Params.KN
-            WriteMaterialParam(nIndex, MAT_KN, sWriteValue, sFilePath)
+            WriteMaterialParam(nIndex, MAT_KN, sWriteValue)
       End Select
    End Sub
 
@@ -649,6 +621,8 @@ End Class
 Public Class StringMaterialParam
    Inherits MaterialParam
 
+   Public Const DEFAULT_MATERIAL As String = "***"
+
    Private m_sGUID As String
    Public Property sGUID As String
       Get
@@ -713,9 +687,9 @@ Public Class StringMaterialParam
          Case Params.ORIG
             Dim sOrigGUID As String = ""
             ReadMaterialParamString(nIndex, MAT_ORIG, "", sOrigGUID)
-            If sOrigGUID = ORIG_MATERIAL Then
+            If sOrigGUID = DEFAULT_MATERIAL Then
-               m_sGUID = ORIG_MATERIAL
+               m_sGUID = DEFAULT_MATERIAL
-               m_sValue = ORIG_MATERIAL
+               m_sValue = DEFAULT_MATERIAL
                ' se livello alto, lo visualizzo comunque
                If Map.refMainWindowVM.MainWindowM.nUserLevel >= 5 Then
                   m_String_Visibility = Visibility.Visible
@@ -740,10 +714,10 @@ Public Class StringMaterialParam
       m_sOrigValue = m_sValue
    End Sub
 
-   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
       Select Case Type
          Case Params.ORIG
-            WriteMaterialParam(nIndex, MAT_ORIG, m_sGUID, sFilePath)
+            WriteMaterialParam(nIndex, MAT_ORIG, m_sGUID)
       End Select
    End Sub
 
@@ -770,8 +744,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 = ORIG_MATERIAL
+         m_sGUID = DEFAULT_MATERIAL
-         m_sValue = ORIG_MATERIAL
+         m_sValue = DEFAULT_MATERIAL
          NotifyPropertyChanged(NameOf(sValue))
       End If
    End Sub
@@ -827,10 +801,10 @@ Public Class ComboMaterialParam
       m_OrigSelValue = m_SelValue
    End Sub
 
-   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
       Select Case Type
          'Case Params.STRANDORDER
-         '   WriteMaterialParam(nIndex, MAC_STRANDORDER, m_SelValue.Id, sFilePath)
+         '   WriteMaterialParam(nIndex, MAC_STRANDORDER, m_SelValue.Id)
       End Select
    End Sub
 
@@ -878,7 +852,7 @@ Public Class CheckMaterialParam
       m_bOrigValue = m_bValue
    End Sub
 
-   Friend Overrides Sub WriteParamOnDb(nIndex As Integer, Optional sFilePath As String = "")
+   Friend Overrides Sub WriteParamOnDb(nIndex As Integer)
       Select Case Type
       End Select
    End Sub

Icarus/MaterialDb/MaterialDbV.xaml

@@ -1,118 +1,54 @@
-<Grid x:Class="MaterialDbV"
+<UserControl x:Class="MaterialDbV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-      xmlns:PrintApp="clr-namespace:Icarus"
+             xmlns:PrintApp="clr-namespace:Icarus">
-      Width="310"
+   <Border VerticalAlignment="Center"
-      VerticalAlignment="Center">
+           Style="{StaticResource RightPanel_Border}">
-   <Grid.RowDefinitions>
+      <Grid>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <Border Margin="0,0,0,2.5" 
-           Style="{StaticResource Title_Border}">
-      <TextBlock Text="MATERIAL DATABASE"
-                 Style="{StaticResource Title_TextBlock}"/>
-   </Border>
-   <Border Grid.Row="1"
-           VerticalAlignment="Center"
-           Margin="0,2.5,0,0"
-           Style="{StaticResource BottomGrayRow_Border}">
-      <Grid Margin="2.5,2.5,2.5,0">
          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
-         <Grid HorizontalAlignment="Center" 
+         <UniformGrid Rows="1">
-               Margin="0,2.5,0,2.5">
-            <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}"/>
-                    Margin="2.5,0,2.5,0"
+            <Button Content="Save"
-                    Style="{StaticResource RightPanel_Button}"/>
-            <Button Grid.Column="1"
-                    Content="Save"
                     Command="{Binding Save_Command}"
-                    IsEnabled="{Binding IsEnabled}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                    Margin="2.5,0,2.5,0"
+            <Button Content="Delete"
-                    Style="{StaticResource RightPanel_Button}"/>
-            <Button Grid.Column="2" Content="Delete"
                     Command="{Binding Delete_Command}"
                     IsEnabled="{Binding Delete_IsEnabled}"
-                    Margin="2.5,0,2.5,0"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                    Style="{StaticResource RightPanel_Button}"/>
+         </UniformGrid>
-            <Button Grid.Column="3"
+         <ComboBox Grid.Row="1"
-                    Command="{Binding Import_Command}"
+                   Name="MaterialCombo" 
-                    ToolTip="{Binding Import_ToolTip}"
+                   ItemsSource="{Binding MaterialList}"
-                    IsEnabled="{Binding ImpExp_IsEnabled}"
+                   SelectedItem="{Binding SelMaterial}"
-                    Margin="2.5,0,2.5,0"
+                   DisplayMemberPath="ghName"/>
-                    Style="{StaticResource ToolBar_Button}">
+         <Grid Grid.Row="2"
-               <Image Source="/Resources/MaterialDB/MaterialImport.png"
+               Visibility="{Binding Name_Visibility}">
-                      Style="{StaticResource Button_Image}"/>
-            </Button>
-            <Button Grid.Column="4"
-                    Command="{Binding Export_Command}"
-                    ToolTip="{Binding Export_ToolTip}"
-                    IsEnabled="{Binding ImpExp_IsEnabled}"
-                    Margin="2.5,0,2.5,0"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/MaterialDB/MaterialExport.png"
-                      Style="{StaticResource Button_Image}"/>
-            </Button>
-         </Grid>
-         <Grid Grid.Row="1"
-               Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <ComboBox Name="MaterialCombo" 
+            <TextBlock Text="{Binding Name_Msg}"/>
-                      ItemsSource="{Binding MaterialList}"
+            <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                      SelectedItem="{Binding SelMaterial}"
+                     Text="{Binding SelectedItem.sName, ElementName=MaterialCombo, UpdateSourceTrigger=Explicit}"/>
-                      DisplayMemberPath="ghName"
-                      Visibility="{Binding Combo_Visibility}"
-                      HorizontalAlignment="Stretch"
-                      Margin="2.5,0,2.5,0"
-                      Style="{StaticResource RightPanel_ComboBox}"/>
-            <EgtWPFLib5:EgtTextBox2 Text="{Binding SelectedItem.sName, ElementName=MaterialCombo, UpdateSourceTrigger=Explicit}"
-                                    ExplicitUpdateSource="EnterKeyPressOrLostFocus"
-                                    IsExplicitFocused="{Binding UserShouldEditValueNow}"
-                                    Visibility="{Binding Name_Visibility}"
-                                    Margin="2.5,0,2.5,0"
-                                    Style="{StaticResource OptionTextBox2}"/>
-            <Button Grid.Column="1"
-                    Command="{Binding EditName_Command}"
-                    ToolTip="{Binding EditName_ToolTip}"
-                    Margin="2.5,0,2.5,0"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/MaterialDB/Edit.png"/>
-            </Button>
          </Grid>
-         <ScrollViewer Grid.Row="2"
+         <ScrollViewer Grid.Row="3"
-                       IsEnabled="{Binding IsEnabled}"
                        VerticalScrollBarVisibility="Auto"
-                       HorizontalScrollBarVisibility="Disabled"
+                       HorizontalScrollBarVisibility="Disabled">
-                       Margin="1,0,0,2.5"
+            <ItemsControl Grid.Row="1"
-                       Padding="0"
+                          ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MaterialCombo}">
-                       BorderThickness="0"
-                       Style="{StaticResource RightPanel_ScrollViewer}">
-            <ItemsControl ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MaterialCombo}"
-                          BorderThickness="0"
-                          Margin="0"
-                          Padding="0">
                <ItemsControl.ItemsPanel>
                   <ItemsPanelTemplate>
-                     <StackPanel Orientation="Vertical"
+                     <StackPanel Orientation="Vertical"/>
-                                 Margin="0"/>
                   </ItemsPanelTemplate>
                </ItemsControl.ItemsPanel>
                <ItemsControl.ItemTemplate>
@@ -121,14 +57,11 @@
                                IsExpanded="{Binding Cathegory_IsExpanded}"
                                VerticalContentAlignment="Top"
                                Visibility="{Binding Cathegory_Visibility}">
-                        <ItemsControl ItemsSource="{Binding MaterialParamList}"
+                        <ItemsControl ItemsSource="{Binding MaterialParamList}">
-                                      BorderThickness="0"
-                                      Margin="0"
-                                      Padding="0">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
-                                 <StackPanel Orientation="Vertical"
+                                 <UniformGrid Columns="1"
-                                             Margin="0"/>
+                                              HorizontalAlignment="Stretch"/>
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
                            <ItemsControl.ItemContainerStyle>
@@ -138,32 +71,34 @@
                            </ItemsControl.ItemContainerStyle>
                            <ItemsControl.Resources>
                               <DataTemplate DataType="{x:Type PrintApp:NumericMaterialParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <TextBox Grid.Column="1"
-                                             Text="{Binding dValue}"
+                                             Text="{Binding dValue}"/>
-                                             Margin="2.5,0,0,0"
+                                    <!--<Button Grid.Column="2"
-                                             Style="{StaticResource ParameterList_TextBox}"/>
+                                            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}">
-                                 <Grid Visibility="{Binding String_Visibility}"
+                                 <Grid Visibility="{Binding String_Visibility}">
-                                       Margin="0,1,2.5,1">
                                     <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="1*"/>
+                                       <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <TextBox Grid.Column="1"
                                              Text="{Binding sValue}"
                                              IsReadOnly="True"/>
@@ -178,37 +113,49 @@
                                  </Grid>
                               </DataTemplate>
                               <DataTemplate DataType="{x:Type PrintApp:ComboMaterialParam}">
-                                 <Grid Margin="0,1,2.5,1">
+                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
+                                       <!--<ColumnDefinition Width="Auto"/>-->
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <ComboBox Grid.Column="1"
                                               ItemsSource="{Binding ValueList}"
                                               SelectedItem="{Binding SelValue}"
-                                              HorizontalAlignment="Stretch"
+                                              HorizontalAlignment="Stretch"/>
-                                              Margin="2.5,0,0,0"
+                                    <!--<Button Grid.Column="1"
-                                              Style="{StaticResource RightPanel_ComboBox}"/>
+                                            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}">
-                                 <Grid Height="22"
+                                 <Grid>
-                                       Margin="0,1,2.5,1">
                                     <Grid.ColumnDefinitions>
                                        <ColumnDefinition Width="2*"/>
                                        <ColumnDefinition Width="1*"/>
+                                       <!--<ColumnDefinition Width="Auto"/>-->
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"
+                                    <TextBlock Text="{Binding sName}"/>
-                                               Margin="0,0,2.5,0"
-                                               Style="{StaticResource ParameterList_TextBlock}"/>
                                     <CheckBox Grid.Column="1"
                                               IsChecked="{Binding bValue}"
                                               HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"
+                                              VerticalAlignment="Center"/>
-                                              Margin="2.5,0,0,0"/>
+                                    <!--<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>
@@ -218,14 +165,11 @@
                </ItemsControl.ItemTemplate>
             </ItemsControl>
          </ScrollViewer>
-         <Button Grid.Row="3"
+         <UniformGrid Grid.Row="4" Rows="1">
-                 Command="{Binding Ok_Command}"
+            <Button Content="Ok"
-                 IsEnabled="{Binding IsEnabled}"
+                    Command="{Binding Ok_Command}"
-                 Margin="0,2.5,0,0"
+                    Style="{StaticResource ToolBar_TextButton}"/>
-                 Style="{StaticResource RightPanel_HalfRound_Button}">
+         </UniformGrid>
-            <Image Source="\Resources\Common\Ok.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
       </Grid>
    </Border>
-</Grid>
+</UserControl>

Icarus/MaterialDb/MaterialDbVM.vb

@@ -60,13 +60,10 @@ Public Class MaterialDbVM
          Return m_Name_Visibility
       End Get
    End Property
-
+   Friend Sub SetNameVisibility(bValue As Boolean)
-   Private m_Combo_Visibility As Visibility = Visibility.Visible
+      m_Name_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
-   Public ReadOnly Property Combo_Visibility As Visibility
+      NotifyPropertyChanged(NameOf(Name_Visibility))
-      Get
+   End Sub
-         Return m_Combo_Visibility
-      End Get
-   End Property
 
    ' variabile che indica se una qualunque lavorazione e' stata modificata
    Private m_bIsModified As Boolean
@@ -79,22 +76,10 @@ 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_IsEnabled AndAlso m_Delete_IsEnabled
+         Return m_Delete_IsEnabled
       End Get
    End Property
    Friend Sub SetDeleteIsEnabled(value As Boolean)
@@ -106,58 +91,11 @@ 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
-
-#Region "Tooltip"
-
-   Public ReadOnly Property Import_ToolTip As String
-      Get
-         Return "Import"
-      End Get
-   End Property
-
-   Public ReadOnly Property Export_ToolTip As String
-      Get
-         Return "Export"
-      End Get
-   End Property
-
-   Public ReadOnly Property EditName_ToolTip As String
-      Get
-         Return "Edit Name"
-      End Get
-   End Property
-
-#End Region    ' Tooltip
-
    ' 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
 
@@ -195,14 +133,6 @@ 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
@@ -210,7 +140,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 = ORIG_MATERIAL Then
+            If DirectCast(Original, StringMaterialParam).sValue = StringMaterialParam.DEFAULT_MATERIAL Then
                Return True
             End If
          End If
@@ -246,7 +176,7 @@ Public Class MaterialDbVM
          End Select
       End If
       If m_bIsModified Then
-         Dim sBakMatIniFilePath As String = Path.ChangeExtension(CurrentMachine.sMaterialFilePath, ".bak")
+         Dim sBakMatIniFilePath As String = Path.ChangeExtension(CurrentMachine.sMaterialsFilePath, ".bak")
          If File.Exists(sBakMatIniFilePath) Then
             Try
                ' cambio estensione in bak a file Db vecchio
@@ -254,24 +184,24 @@ Public Class MaterialDbVM
             Catch ex As Exception
             End Try
          End If
-         If File.Exists(CurrentMachine.sMaterialFilePath) Then
+         If File.Exists(CurrentMachine.sMaterialsFilePath) Then
             Try
                ' cambio estensione in bak a file Db vecchio
-               File.Move(CurrentMachine.sMaterialFilePath, sBakMatIniFilePath)
+               File.Move(CurrentMachine.sMaterialsFilePath, sBakMatIniFilePath)
             Catch ex As Exception
             End Try
          End If
          ' se ancora esiste lo elimino
-         If File.Exists(CurrentMachine.sMaterialFilePath) Then
+         If File.Exists(CurrentMachine.sMaterialsFilePath) Then
             Try
-               File.Delete(CurrentMachine.sMaterialFilePath)
+               File.Delete(CurrentMachine.sMaterialsFilePath)
             Catch ex As Exception
             End Try
          End If
          ' creo nuovo file
-         If Not File.Exists(CurrentMachine.sMaterialFilePath) Then
+         If Not File.Exists(CurrentMachine.sMaterialsFilePath) Then
             Try
-               File.WriteAllLines(CurrentMachine.sMaterialFilePath, {"; Commento per evitare BOM con UTF-8"})
+               File.WriteAllLines(CurrentMachine.sMaterialsFilePath, {"; Commento per evitare BOM con UTF-8"})
             Catch ex As Exception
             End Try
          End If
@@ -361,28 +291,12 @@ 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
+      If SelMaterialIsOriginal() Then Return
-         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(sCheckMessage, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
+      Select Case MessageBox.Show("Are you sure you want to delete selected material?", "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
@@ -392,78 +306,6 @@ 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/My Project/AssemblyInfo.vb

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

Icarus/OptionsWindow/OptionWindowV-NewGraphics.xaml

@@ -1,223 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OptionWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:Icarus="clr-namespace:Icarus"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            Title="{Binding Title}" Icon="/Resources/Icarus.ico"
-                            Background="Transparent"
-                            AllowsTransparency="True"
-                            BorderThickness="0"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="0" IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            MinWidth="400" MinHeight="382"
-                            Width="400" Height="412">
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      <Border Margin="0,0,0,2.5"
-           Style="{StaticResource Title_Border}">
-         <TextBlock Text="SETTINGS"
-                 Style="{StaticResource Title_TextBlock}"/>
-      </Border>
-
-      <Border Grid.Row="1"
-              Margin="0,2.5,0,0"
-              CornerRadius="4"
-              Style="{StaticResource WhiteBottomBlueRow_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <TabControl Margin="5,5,5,5">
-               <TabItem Header="{Binding GenericMsg}">
-                  <StackPanel Margin="5,5,5,0">
-                     <!--<GroupBox Header="{Binding CurrentLanguageMsg}"
-                               Margin="0,0,0,5">
-                        <UniformGrid Rows="2" Margin="3,3,3,3">
-                           <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
-                                     DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                                     Margin="0,0,0,5"/>
-                           <TextBlock Text="{Binding LanguageAdvertMsg}" TextWrapping="Wrap"
-                           TextAlignment="Center"/>
-                        </UniformGrid>
-                     </GroupBox>-->
-                     <UniformGrid Columns="2"
-                                  Margin="0,0,0,5">
-                        <TextBlock Text="{Binding TopSceneBackgroundMsg}" VerticalAlignment="Center"/>
-                        <Button Background="{Binding TopSceneBackground}"
-                                Command="{Binding TopSceneBackground_Command}"
-                                Style="{StaticResource EgtWPFLib5_InputButton}"/>
-                     </UniformGrid>
-                     <UniformGrid Columns="2"
-                                  Margin="0,0,0,5">
-                        <TextBlock Text="{Binding BotSceneBackgroundMsg}" VerticalAlignment="Center"/>
-                        <Button Background="{Binding BotSceneBackground}"
-                                Command="{Binding BotSceneBackground_Command}"
-                                Style="{StaticResource EgtWPFLib5_InputButton}"/>
-                     </UniformGrid>
-                     <UniformGrid Columns="2"
-                                  Margin="0,0,0,5">
-                        <TextBlock Text="{Binding GridColorMsg}" VerticalAlignment="Center"/>
-                        <Button Background="{Binding GridColor}"
-                                Command="{Binding GridColor_Command}"
-                                Style="{StaticResource EgtWPFLib5_InputButton}"/>
-                     </UniformGrid>
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="2*"/>
-                           <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="1*"/>
-                           <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-                        <TextBlock Text="{Binding ThickLineMsg}" VerticalAlignment="Center"
-                                   Grid.Row="0" Margin="0,5,0,5"/>
-                        <CheckBox IsChecked="{Binding ThickLine}"
-                                   Grid.Column="1" Grid.Row="0" Margin="22,5,0,5" VerticalAlignment="Center"/>
-                        <TextBlock Text="{Binding SmoothTriMeshMsg}" VerticalAlignment="Center"
-                                   Grid.Row="1" Margin="0,5,0,5"/>
-                        <CheckBox IsChecked="{Binding SmoothTriMesh}"
-                                   Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
-                     </Grid>
-                     <Grid Margin="5,5,5,5">
-                        <Button Content="{Binding UpdateLicenceMsg}" Command="{Binding UpdateLicence_Command}"  Height="26" Margin="100,1"/>
-                     </Grid>
-                  </StackPanel>
-               </TabItem>
-               <TabItem Header="{Binding CADMsg}">
-                  <StackPanel Margin="5,5,5,0">
-                     <UniformGrid Grid.ColumnSpan="2" Columns="2"
-                                  Margin="0,0,0,5">
-                        <TextBlock Text="{Binding GeometryToleranceMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding GeometryTolerance}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,0,0,0"/>
-                     </UniformGrid>
-                     <ItemsControl ItemsSource="{Binding LayerColorList}">
-                        <ItemsControl.ItemTemplate>
-                           <DataTemplate>
-                              <UniformGrid Columns="2"
-                                  Margin="0,0,0,5">
-                                 <TextBlock Text="{Binding Color_Msg}" VerticalAlignment="Center"/>
-                                 <Grid Margin="10,0,0,0">
-                                    <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="Auto"/>
-                                       <ColumnDefinition Width="1*"/>
-                                       <ColumnDefinition Width="35"/>
-                                    </Grid.ColumnDefinitions>
-                                    <Button Background="{Binding Background}"
-                                   Command="{Binding Color_Command}"
-                                   Margin="0,0,5,0"
-                                   Style="{StaticResource EgtWPFLib5_InputButton}"/>
-                                    <Slider Grid.Column="1"
-                                   Value="{Binding dAlpha}"
-                                   Minimum="10"
-                                   Maximum="100"
-                                   TickPlacement="BottomRight"
-                                   TickFrequency="10"
-                                   IsSnapToTickEnabled="True"
-                                   Margin="0,0,5,0"/>
-                                    <TextBlock Grid.Column="2"
-                                      Text="{Binding sAlpha}"
-                                      TextAlignment="Right"/>
-                                 </Grid>
-                              </UniformGrid>
-                           </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                     </ItemsControl>
-                  </StackPanel>
-
-               </TabItem>
-               <TabItem Header="{Binding ImportMsg}">
-                  <StackPanel Margin="5,5,5,0">
-                     <Grid Margin="0,5,0,0">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="0.8*"/>
-                           <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="1*"/>
-                           <RowDefinition Height="1*"/>
-                           <RowDefinition Height="1*"/>
-                           <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-                        <TextBlock Grid.Row="0" Grid.Column="1" 
-                                      VerticalAlignment="Center" HorizontalAlignment="Center"  
-                                      Text="{Binding UnitScaleMsg}" />
-                        <TextBlock Grid.Row="0" Grid.Column="2" 
-                                      VerticalAlignment="Center" HorizontalAlignment="Center"  
-                                      Text="{Binding FactorScaleMsg}"/>
-
-                        <TextBlock Grid.Row="1" Grid.Column="0" 
-                                      Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
-                        <ComboBox  Grid.Row="1" Grid.Column="1"
-                                  ItemsSource="{Binding ScaleDXFList, Mode=OneWay}"
-                                  SelectedItem="{Binding SelectedDXFScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
-                                  Margin="10,0,0,5"/>
-                        <TextBox  Grid.Row="1" Grid.Column="2"
-                                 Text="{Binding DxfScaleFactor}" Height="25"
-                                 IsEnabled="{Binding DXFScaleEnable, UpdateSourceTrigger=LostFocus}"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,0,0,5"/>
-                        <TextBlock Grid.Row="2" Grid.Column="0"
-                                 Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
-                        <ComboBox Grid.Row="2" Grid.Column="1"
-                                 ItemsSource="{Binding ScaleSTLList, Mode=OneWay}"
-                                  SelectedItem="{Binding SelectedSTLScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
-                                  Margin="10,0,0,5"/>
-                        <TextBox Grid.Row="2" Grid.Column="2"
-                                 Text="{Binding StlScaleFactor}" Height="25"
-                                 IsEnabled="{Binding STLScaleEnable, UpdateSourceTrigger=LostFocus}"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,0,0,5"/>
-                     </Grid>
-                  </StackPanel>
-               </TabItem>
-               <!--<TabItem Header="{Binding ExportMsg}">
-                  <StackPanel>
-                     <GroupBox Grid.Column="1" Grid.RowSpan="2"
-                               Header="{Binding ImageMsg}"
-                               Margin="5,5,5,0">
-                        <UniformGrid Grid.ColumnSpan="2" Columns="2">
-                           <TextBlock Text="{Binding ImageWidthMsg}" VerticalAlignment="Center"/>
-                           <TextBox Text="{Binding ImageWidth}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,0,0,5"/>
-                           <TextBlock Text="{Binding ImageHeightMsg}" VerticalAlignment="Center"/>
-                           <TextBox Text="{Binding ImageHeight}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,0,0,5"/>
-                        </UniformGrid>
-                     </GroupBox>
-                  </StackPanel>
-               </TabItem>-->
-               <TabItem Header="{Binding CAMMsg}">
-                  <StackPanel>
-                     <Grid Margin="5,5,5,0">
-                        <Button Content="{Binding AddMachineMsg}" Command="{Binding AddMachine_Command}"  Height="26" Margin="100,1"/>
-                     </Grid>
-
-                     <Grid Margin="5,5,5,0">
-                        <Button Content="{Binding ExportMachineMsg}" Command="{Binding ExportMachine_Command}"  Height="26" Margin="100,1"/>
-                     </Grid>
-                  </StackPanel>
-               </TabItem>
-            </TabControl>
-            <Button Grid.Row="1" 
-                    IsCancel="True"
-                    HorizontalAlignment="Center"
-                    Style="{StaticResource RightPanel_HalfRound_Button}">
-               <Image Source="\Resources\Common\Ok.png"
-                      Style="{StaticResource Button_Image}"/>
-            </Button>
-         </Grid>
-      </Border>
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

Icarus/OptionsWindow/OptionWindowVM.vb

@@ -1133,7 +1133,7 @@ Public Class OptionWindowVM
             ' aggiungo i file della Macchina
             Dim sMachineDir As String = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & sCurrMachineName
             If Directory.Exists(sMachineDir) Then
-               zip.AddSelectedFiles( "name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
+               zip.AddItem(sMachineDir, sCurrMachineName)
             End If
             ' salvo lo zip
             zip.Save()
@@ -1162,12 +1162,11 @@ Public Class LayerColor
 
    Public Enum LayerType As Integer
       PRINTPART = 1
-      'REFERENCE = 2
+      RIBS = 2
-      MACHSTART = 3
+      SHELLNUMBERS = 3
-      RIBS = 4
+      AUXSOLIDS = 4
-      SHELLNUMBERS = 5
+      MACHSTART = 5
-      AUXSOLIDS = 6
+      OTHERS = 6
-      OTHERS = 7
    End Enum
 
    Private m_Type As LayerType

Icarus/ProjManager/ProjManagerV.xaml

@@ -9,23 +9,19 @@
    <Button Command="{Binding New_Command}"
            ToolTip="{Binding NewToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Margin="0,0,2.5,0"
+           Style="{StaticResource ToolBar_Button}">
-           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
-      <Image Source="/Resources/ProjectManager/New.png"
-             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding OpenCommand}"
            ToolTip="{Binding OpenToolTip}"
            ContextMenuService.Placement="Bottom" 
            Tag="{Binding}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Margin="2.5,0,2.5,0"
+           Style="{StaticResource ToolBar_Button}">
-           Style="{StaticResource ProjManager_Button}">
       <Button.ContextMenu>
-         <ContextMenu ItemsSource="{Binding MruFileNames}"
+         <ContextMenu ItemsSource="{Binding MruFileNames}">
-                      Style="{StaticResource Icarus_ContextMenu}">
             <ContextMenu.Resources>
-               <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource Icarus_MenuItem}">
+               <Style TargetType="{x:Type MenuItem}">
                   <Setter Property="Command"
                           Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
                   <Setter Property="CommandParameter" Value="{Binding}" />
@@ -33,58 +29,53 @@
             </ContextMenu.Resources>
          </ContextMenu>
       </Button.ContextMenu>
-      <Image Source="/Resources/ProjectManager/Open.png"
+      <Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
-             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding SaveCommand}"
            ToolTip="{Binding SaveToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Margin="2.5,0,2.5,0"
+           Style="{StaticResource ToolBar_Button}">
-           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-      <Image Source="/Resources/ProjectManager/Save.png"
-             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding SaveAsCommand}"
            ToolTip="{Binding SaveAsToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Margin="2.5,0,2.5,0"
+           Style="{StaticResource ToolBar_Button}">
-           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/SaveAs.png" Stretch="Uniform"/>
-      <Image Source="/Resources/ProjectManager/SaveAs.png"
-             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding ImportCommand}"
            ToolTip="{Binding ImportToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Margin="2.5,0,2.5,0"
+           Style="{StaticResource ToolBar_Button}">
-           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
-      <Image Source="/Resources/ProjectManager/Import.png"
-             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding ExportCommand}"
            ToolTip="{Binding ExportToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Margin="2.5,0,2.5,0"
+           Style="{StaticResource ToolBar_Button}">
-           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/Export.png" Stretch="Uniform"/>
-      <Image Source="/Resources/ProjectManager/Export.png"
-             Style="{StaticResource Button_Image}"/>
    </Button>
    <!--<Button Command="{Binding ExportCommand}" ToolTip="{Binding ExportToolTip}"
          IsEnabled="{Binding DrawIsChecked}">
       <Image Source="/Resources/ProjectManager/Export.png" Stretch="Uniform"/>
    </Button>-->
    <Button Command="{Binding OptionsCommand}"
+           Width="30"
            ToolTip="{Binding OptionsToolTip}"
-           Margin="2.5,0,2.5,0"
+           Style="{StaticResource ToolBar_Button}">
-           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/Options.png" Height="22" />
-      <Image Source="/Resources/ProjectManager/Options.png"
+   </Button>
-             Style="{StaticResource Button_Image}"/>
+   <Button Command="{Binding Help_Command}"
+           Width="30"
+           ToolTip="{Binding Help_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/ProjectManager/Send.png" Height="22" />
    </Button>
    <Button Command="{Binding SendFeedbackCommand}"
+           Width="30"
            ToolTip="{Binding SendFeedbackToolTip}"
-           Margin="2.5,0,0,0"
+           Style="{StaticResource ToolBar_Button}">
-           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/Send.png" Height="22" />
-      <Image Source="/Resources/ProjectManager/Send.png"
-             Style="{StaticResource Button_Image}"/>
    </Button>
 
 </StackPanel>

Icarus/ProjManager/ProjManagerVM.vb

@@ -62,6 +62,7 @@ Public Class ProjManagerVM
    Private m_cmdImport As ICommand
    Private m_cmdExport As ICommand
    Private m_cmdOptions As ICommand
+   Private m_cmdHelp As ICommand
    Private m_cmdSendFeedback As ICommand
 
 
@@ -88,24 +89,34 @@ Public Class ProjManagerVM
          Return EgtMsg(MSG_TOPCOMMANDBAR + 4)
       End Get
    End Property
-   Public ReadOnly Property ImportToolTip As String
+   Public ReadOnly Property InsertToolTip As String
       Get
-         Return "Import"
+         Return EgtMsg(MSG_TOPCOMMANDBAR + 5)
       End Get
    End Property
-   Public ReadOnly Property ExportToolTip As String
+   Public ReadOnly Property ImportBTL_ToolTip As String
       Get
-         Return "Export"
+         Return EgtMsg(61840)
       End Get
    End Property
-   Public ReadOnly Property OptionsToolTip As String
+   Public ReadOnly Property UpdateBTL_ToolTip As String
       Get
-         Return "Options"
+         Return EgtMsg(61834)
       End Get
    End Property
-   Public ReadOnly Property SendFeedbackToolTip As String
+   Public ReadOnly Property ExportProject_ToolTip As String
       Get
-         Return "Send Feedback"
+         Return EgtMsg(61838)
+      End Get
+   End Property
+   Public ReadOnly Property ImportProject_ToolTip As String
+      Get
+         Return EgtMsg(61839)
+      End Get
+   End Property
+   Public ReadOnly Property GoToProd_ToolTip As String
+      Get
+         Return EgtMsg(61835)
       End Get
    End Property
 
@@ -359,6 +370,32 @@ Public Class ProjManagerVM
 
 #End Region ' Options
 
+#Region "Help"
+
+   ''' <summary>
+   ''' Returns a command that do Export.
+   ''' </summary>
+   Public ReadOnly Property Help_Command As ICommand
+      Get
+         If m_cmdHelp Is Nothing Then
+            m_cmdHelp = New Command(AddressOf Help)
+         End If
+         Return m_cmdHelp
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Export.  This method is invoked by the ExportCommand.
+   ''' </summary>
+   Public Sub Help(ByVal param As Object)
+      Dim HelpWndVM As New HelpWndVM
+      Dim HelpWnd As New HelpWndV(Application.Current.MainWindow, HelpWndVM)
+      HelpWndVM.LoadHtml()
+      HelpWnd.Show()
+   End Sub
+
+#End Region ' Options
+
 #Region "SendFeedback"
 
    ''' <summary>

Icarus/Project/ProjectV.xaml

@@ -1,119 +1,66 @@
-<DockPanel x:Class="ProjectV"
+<EgtFloating:EgtFloatingManager x:Class="ProjectV"
-           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-           xmlns:PrintApp="clr-namespace:Icarus">
+                                xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                                xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                xmlns:PrintApp="clr-namespace:Icarus">
 
-   <Grid DockPanel.Dock="Top">
+   <Grid DockPanel.Dock="Top" Margin="0,20,0,0">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="0.5*"/>
+         <ColumnDefinition Width="5*"/>
+         <ColumnDefinition Width="0.5*"/>
+      </Grid.ColumnDefinitions>
       <PrintApp:TopPanelV Grid.Column="1"
                           DataContext="{StaticResource TopPanelVM }"/>
    </Grid>
    <Grid DockPanel.Dock="Bottom">
       <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="315"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="315"/>
       </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="67"/>
-      </Grid.RowDefinitions>
-      <PrintApp:LayerAdvancementSliderV Grid.Column="2"
-                                        Grid.ColumnSpan="3"
-                                        DockPanel.Dock="Bottom"
-                                        DataContext="{StaticResource SliderManagerVM}"
-                                        HorizontalAlignment="Stretch"/>
       <!--StatusBar -->
-      <PrintApp:ControllerInputPanelV Grid.Row="1"
+      <PrintApp:StatusBarV DataContext="{StaticResource StatusBarVM}"/>
-                                      Grid.ColumnSpan="2"
+      <PrintApp:MachinePanelV Grid.Column="1"
-                                      DataContext="{StaticResource ControllerInputPanelVM}"/>
+                              DataContext="{StaticResource MachinePanelVM}"/>
-      <PrintApp:MessagePanelV Grid.Row="1"
-                              Grid.ColumnSpan="2"
-                              DataContext="{StaticResource StatusBarVM}"/>
-      <PrintApp:ShowPanelV Grid.Column="2"
-                           Grid.Row="1"
-                           DataContext="{StaticResource ShowPanelVM}"/>
-      <PrintApp:ViewPanelV Grid.Column="3"
-                           Grid.Row="1"
-                           DataContext="{StaticResource ViewPanelVM}"/>
-      <PrintApp:InstrumentPanelV Grid.Column="4"
-                                 Grid.Row="1"
-                                 DataContext="{StaticResource InstrumentPanelVM}"/>
-      <PrintApp:StatusBarV Grid.Column="6"
-                           Grid.Row="1"
-                           DataContext="{StaticResource StatusBarVM}"/>
    </Grid>
 
-   <!--<DockPanel DockPanel.Dock="Bottom"
+   <DockPanel DockPanel.Dock="Bottom"
               LastChildFill="False">
+      <PrintApp:SliceManagerV DockPanel.Dock="Right" 
+                              DataContext="{StaticResource SliceManagerVM}"
+                              Margin="5"/>
       <PrintApp:LayerAdvancementSliderV DockPanel.Dock="Bottom"
                                         DataContext="{StaticResource SliderManagerVM}"
                                         HorizontalAlignment="Center"/>
-      --><!--<Grid DockPanel.Dock="Bottom"
+      <Grid DockPanel.Dock="Bottom"
             HorizontalAlignment="Stretch">
          <PrintApp:ControllerInputPanelV Grid.Column="3"
                                          DataContext="{StaticResource ControllerInputPanelVM}"
                                          HorizontalAlignment="Center"/>
-      </Grid>--><!--
+      </Grid>
-   </DockPanel>-->
+   </DockPanel>
 
+   <PrintApp:ViewLayerManagerV DockPanel.Dock="Bottom"
+                               HorizontalAlignment="Left"
+                               DataContext="{StaticResource ViewLayerManagerVM}"/>
 
    <Grid DockPanel.Dock="Left">
-      <Grid.ColumnDefinitions>
+      <PrintApp:LeftPanelV Grid.Row="1"
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="Auto"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <PrintApp:LeftPanelV Grid.ColumnSpan="2"
                            DataContext="{StaticResource LeftPanelVM}"
                            VerticalAlignment="Center"
                            Visibility="{Binding DataContext.LeftPanel_Visibility, 
                                                 RelativeSource={RelativeSource AncestorType={x:Type PrintApp:ProjectV}}}"/>
-      <PrintApp:ViewLayerManagerV Grid.Row="1"
-                                  VerticalAlignment="Bottom"
-                                  HorizontalAlignment="Left"
-                                  DataContext="{StaticResource ViewLayerManagerVM}"/>
    </Grid>
 
-   <Grid DockPanel.Dock="Right">
+   <PrintApp:RightPanelV DockPanel.Dock="Right" 
-      <Grid.ColumnDefinitions>
+                         DataContext="{StaticResource RightPanelVM}"/>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="Auto"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="40"/>
-         <RowDefinition Height="20*"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Grid.ColumnSpan="2"
-            Grid.Row="1"
-            HorizontalAlignment="Right">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <!--<PrintApp:MachineViewPanelV DataContext="{StaticResource MachineViewPanelVM}"/>-->
-         <PrintApp:LayerIndexSliderV DataContext="{StaticResource SliderManagerVM}"
-                                     VerticalAlignment="Stretch"
-                                     HorizontalAlignment="Right"/>
-         <PrintApp:RightPanelV Grid.Column="1"
-                               DataContext="{StaticResource RightPanelVM}"/>
-      </Grid>
-      <PrintApp:SliceManagerV Grid.Column="1"
-                              Grid.Row="3"
-                              DataContext="{StaticResource SliceManagerVM}"
-                              HorizontalAlignment="Right"/>
-   </Grid>
 
+   <PrintApp:LayerIndexSliderV DockPanel.Dock="Right"
+                               DataContext="{StaticResource SliderManagerVM}"
+                               VerticalAlignment="Stretch"/>
 
    <!-- Grid che occupa lo spazio della scena -->
    <Grid Background="Transparent"/>
 
-</DockPanel>
+</EgtFloating:EgtFloatingManager>

Icarus/ReferencePanel/ReferencePanelV.xaml

@@ -1,8 +1,7 @@
 <UserControl x:Class="ReferencePanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <Border Padding="2.5"
+   <Border Style="{StaticResource LeftPanelPopup_Border}">
-           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -15,13 +14,11 @@
                   Padding="0">
             <ListBox.ItemsPanel>
                <ItemsPanelTemplate>
-                  <UniformGrid Rows="3"
+                  <UniformGrid Rows="3"/>
-                               Margin="0"/>
                </ItemsPanelTemplate>
             </ListBox.ItemsPanel>
             <ListBox.ItemContainerStyle>
                <Style TargetType="ListBoxItem">
-                  <Setter Property="Margin" Value="0"/>
                   <Setter Property="Template">
                      <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -37,7 +34,6 @@
                                IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                FontSize="40"
                                GroupName="ReferenceRadio"
-                               Margin="2.5,2.5,2.5,2.5"
                                Style="{StaticResource OptionPanel_NestingToggleButton}"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
@@ -46,7 +42,6 @@
                       Content="From Import"
                       IsChecked="{Binding FromImport_IsChecked}"
                       GroupName="ReferenceRadio"
-                      Margin="2.5"
                       Style="{StaticResource OptionPanel_ToggleButton}"/>
       </Grid>
    </Border> 

Icarus/ReferencePanel/ReferencePanelVM.vb

@@ -30,7 +30,6 @@ 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
@@ -43,7 +42,6 @@ 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
@@ -70,55 +68,45 @@ Public Class ReferencePanelVM
    End Sub
 
    Friend Sub UpdateFramePosition(Optional SelPart As Print3dPartVM = Nothing)
-      Dim SelReference As Integer = ReferenceBtn.References.BL
+      If IsNothing(SelPart) Then SelPart = Map.refTopPanelVM.SelPart
-      If IsNothing(SelPart) Then
-         SelPart = Map.refTopPanelVM.SelPart
-      End If
-      EgtGetInfo(SelPart.nReferenceLayerId, KEY_REFERENCE, SelReference)
       ' elimino precedente
       EgtEmptyGroup(SelPart.nReferenceLayerId)
       ' Creo riferimento 
       Dim frPrintSolid As New Frame3d()
-      If SelReference = ReferenceBtn.References.FROM_IMPORT Then
+      If m_SelReference = ReferenceBtn.References.FROM_IMPORT Then
          EgtGetGlobFrame(SelPart.nPrintSolidId, frPrintSolid)
          frPrintSolid.Setup(New Point3d(frPrintSolid.Orig.x, frPrintSolid.Orig.y, 0))
       Else
-         Dim b3ToBePrintSolid As BBox3d = Map.refDispositionPanelVM.GetSolidForReferenceBBox(SelPart)
+         Dim b3PrintSolid As New BBox3d
+         EgtGetBBoxGlob(SelPart.nPrintSolidId, GDB_BB.STANDARD, b3PrintSolid)
          ' Creo riferimento 
-         Dim ptOrig As New Point3d(b3ToBePrintSolid.Min())
+         Dim ptOrig As New Point3d(b3PrintSolid.Min())
-         Select Case SelReference
+         Select Case m_SelReference
             Case ReferenceBtn.References.TL
-               ptOrig += b3ToBePrintSolid.DimY() * Vector3d.Y_AX
+               ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX
             Case ReferenceBtn.References.TR
-               ptOrig += b3ToBePrintSolid.DimY() * Vector3d.Y_AX + b3ToBePrintSolid.DimX() * Vector3d.X_AX
+               ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
             Case ReferenceBtn.References.BL
             Case ReferenceBtn.References.BR
-               ptOrig += b3ToBePrintSolid.DimX() * Vector3d.X_AX
+               ptOrig += b3PrintSolid.DimX() * Vector3d.X_AX
             Case ReferenceBtn.References.TC
-               ptOrig += b3ToBePrintSolid.DimY() * Vector3d.Y_AX + b3ToBePrintSolid.DimX() / 2 * Vector3d.X_AX
+               ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
             Case ReferenceBtn.References.ML
-               ptOrig += b3ToBePrintSolid.DimY() / 2 * Vector3d.Y_AX
+               ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX
             Case ReferenceBtn.References.MR
-               ptOrig += b3ToBePrintSolid.DimY() / 2 * Vector3d.Y_AX + b3ToBePrintSolid.DimX() * Vector3d.X_AX
+               ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
             Case ReferenceBtn.References.TC
-               ptOrig += b3ToBePrintSolid.DimY() * Vector3d.Y_AX + b3ToBePrintSolid.DimX() / 2 * Vector3d.X_AX
+               ptOrig += b3PrintSolid.DimY() * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
             Case ReferenceBtn.References.MR
-               ptOrig += b3ToBePrintSolid.DimY() / 2 * Vector3d.Y_AX + b3ToBePrintSolid.DimX() * Vector3d.X_AX
+               ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() * Vector3d.X_AX
             Case ReferenceBtn.References.BC
-               ptOrig += b3ToBePrintSolid.DimX() / 2 * Vector3d.X_AX
+               ptOrig += b3PrintSolid.DimX() / 2 * Vector3d.X_AX
             Case ReferenceBtn.References.MC
-               ptOrig += b3ToBePrintSolid.DimY() / 2 * Vector3d.Y_AX + b3ToBePrintSolid.DimX() / 2 * Vector3d.X_AX
+               ptOrig += b3PrintSolid.DimY() / 2 * Vector3d.Y_AX + b3PrintSolid.DimX() / 2 * Vector3d.X_AX
          End Select
          Dim vtMovedPart As Vector3d
-         If EgtGetInfo(SelPart.nPartId, KEY_MOVEDPART, vtMovedPart) Then
+         EgtGetInfo(SelPart.nPartId, "MovedPart", vtMovedPart)
-            ptOrig = ptOrig - vtMovedPart
+         ptOrig = ptOrig - vtMovedPart
-         ElseIf EgtGetInfo(SelPart.nPartId, KEY_MOVEDPART2, vtMovedPart) Then
-            ptOrig = ptOrig - vtMovedPart
-         End If
-         Dim nPartFrameId As Integer = EgtCreateGeoFrame(SelPart.nPartReferenceLayerId, New Frame3d(ptOrig), GDB_RT.GLOB)
-         EgtSetStatus(nPartFrameId, GDB_ST.OFF)
-         ' elimino componente Z
-         ptOrig = ptOrig + New Vector3d(0, 0, -ptOrig.z)
          frPrintSolid = New Frame3d(ptOrig)
       End If
       Dim nFrameId As Integer = EgtCreateGeoFrame(SelPart.nReferenceLayerId, frPrintSolid, GDB_RT.GLOB)
@@ -127,6 +115,7 @@ Public Class ReferencePanelVM
          EgtSetMode(nFrameId, GDB_MD.LOCKED)
          SelPart.UpdateReferenceId(nFrameId)
       End If
+      EgtSetInfo(SelPart.nReferenceLayerId, KEY_REFERENCE, m_SelReference)
       Map.refDispositionPanelVM.RefreshPos()
       EgtDraw()
    End Sub