- cambio nome del progetto in Icarus

- gestione ribs completata
- nuove funzionalita' introdotte su tabella TFS
- correzioni e migliorie varie

3dPrintApp/MachiningManager/CurrMachiningPanelVM.vb

@@ -1,89 +0,0 @@
-Imports EgtWPFLib5
-
-Public Class CurrMachiningPanelVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_CurrMachining As CurrMachining
-   Public ReadOnly Property CurrMachining As CurrMachining
-      Get
-         Return m_CurrMachining
-      End Get
-   End Property
-   Friend Sub SetCurrMachining(CurrMachining As CurrMachining)
-      m_CurrMachining = CurrMachining
-      NotifyPropertyChanged(NameOf(CurrMachining))
-      Map.refTopPanelVM.UpdateCurrMachining()
-   End Sub
-
-   ' 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 Map
-      Map.SetRefCurrMachiningPanelVM(Me)
-   End Sub
-
-#End Region    ' CONSTRUCTORS
-
-   Friend Sub ReadMachParamFromSelPart()
-      If IsNothing(Map.refTopPanelVM.SelPart) Then Return
-      Dim nData As Integer = 0
-      m_CurrMachining = New CurrMachining(Map.refTopPanelVM.SelPart.nPartId)
-      SetCurrMachining(m_CurrMachining)
-      ' aggiorno parametri mostrati nella barra
-      NotifyPropertyChanged(NameOf(CurrMachining))
-      Map.refTopPanelVM.UpdateCurrMachining()
-   End Sub
-
-
-#Region "COMMANDS"
-
-#Region "Ok"
-
-   Public ReadOnly Property Ok_Command As ICommand
-      Get
-         If m_cmdOk Is Nothing Then
-            m_cmdOk = New Command(AddressOf Ok)
-         End If
-         Return m_cmdOk
-      End Get
-   End Property
-
-   Public Sub Ok()
-      ' scrivo i parametri modificati
-      m_CurrMachining.WriteCurrParamInPart(Map.refTopPanelVM.SelPart.nPartId)
-      ' ripristino modalita' standard
-      Map.refTopPanelVM.SelPage = Pages.MODIFY
-   End Sub
-
-#End Region    ' Ok
-
-#Region "Cancel"
-
-   Public ReadOnly Property Cancel_Command As ICommand
-      Get
-         If m_cmdCancel Is Nothing Then
-            m_cmdCancel = New Command(AddressOf Cancel)
-         End If
-         Return m_cmdCancel
-      End Get
-   End Property
-
-   Public Sub Cancel()
-      ' ripristino modalita' standard
-      Map.refTopPanelVM.SelPage = Pages.MODIFY
-   End Sub
-
-#End Region    ' Cancel
-
-#End Region    ' COMMANDS
-
-End Class
-

3dPrintApp/TSFEditor/TFSEditorV.xaml

@@ -1,117 +0,0 @@
-<UserControl x:Class="TFSEditorV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:_3dPrintApp"
-             MaxHeight="600"
-             MaxWidth="600">
-   <Border VerticalAlignment="Center"
-           Style="{StaticResource RightPanel_Border}">
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-         <StackPanel Orientation="Horizontal">
-            <ComboBox ItemsSource="{Binding MediaTypeList}"
-                      SelectedIndex="{Binding ghSelMediaType}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
-            <TextBlock Text="Slice Number:"
-                       Visibility="{Binding MediaHeight_Visibility}"
-                       Style="{StaticResource OptionTextBlock}"/>
-            <TextBox Text="{Binding sMediaHeight}"
-                     Width="50"
-                     Visibility="{Binding MediaHeight_Visibility}"
-                     Style="{StaticResource ControllerInputPanel_TextBox}"/>
-            <TextBlock Text="Difference:"
-                       Visibility="{Binding Difference_Visibility}"
-                       Style="{StaticResource OptionTextBlock}"/>
-            <TextBox Text="{Binding sDifference}"
-                     Width="50"
-                     Visibility="{Binding Difference_Visibility}"
-                     Style="{StaticResource ControllerInputPanel_TextBox}"/>
-            <TextBlock Text="F:"
-                       Visibility="{Binding FCurr_Visibility}"
-                       Style="{StaticResource OptionTextBlock}"/>
-            <TextBox Text="{Binding sFCurr}"
-                     Width="50"
-                     Visibility="{Binding FCurr_Visibility}"
-                     Style="{StaticResource ControllerInputPanel_TextBox}"/>
-            <Button Content="Set"
-                    Command="{Binding Set_Command}"
-                    Visibility="{Binding FCurr_Visibility}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-            <Button Content="Media"
-                    Command="{Binding Media_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-            <Button Content="Reset"
-                    Command="{Binding Reset_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-         </StackPanel>
-         <DataGrid Grid.Row="1"
-                   ItemsSource="{Binding LayerList}"
-                   PrintApp:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding SelLayers}"
-                   SelectedItem="{Binding SelLayer}"
-                   CanUserAddRows="False"
-                   AutoGenerateColumns="False"
-                   CanUserResizeRows="False"
-                   SelectionMode="Extended"
-                   ScrollViewer.CanContentScroll="True" 
-                   ScrollViewer.VerticalScrollBarVisibility="Auto"
-                   ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                   Margin="0,0,0,5">
-            <DataGrid.Columns>
-               <DataGridTextColumn Header="Index" 
-                                   Binding="{Binding nIndex}"
-                                   IsReadOnly="True"
-                                   Width="Auto"/>
-               <DataGridTextColumn Header="Length"
-                                   Binding="{Binding sLength}"
-                                   IsReadOnly="True"
-                                   Width="2*"/>
-               <DataGridTextColumn Header="TMin" 
-                                   Binding="{Binding dTMin}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="TTrg" 
-                                   Binding="{Binding dTTrg}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="TMax" 
-                                   Binding="{Binding dTMax}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="TCurr" 
-                                   Binding="{Binding dTCurr}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="FMin" 
-                                   Binding="{Binding dFMin}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="FTrg" 
-                                   Binding="{Binding dFTrg}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="FMax" 
-                                   Binding="{Binding dFMax}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="FCurr" 
-                                   Binding="{Binding dFCurr}"
-                                   Width="1*"/>
-               <DataGridTextColumn Header="Speed" 
-                                   Binding="{Binding dSpeed}"
-                                   IsReadOnly="True"
-                                   Width="1*"/>
-            </DataGrid.Columns>
-            <DataGrid.RowStyle>
-               <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
-                  <Setter Property="Background" Value="{Binding Background}"/>
-                  <!--<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>-->
-               </Style>
-            </DataGrid.RowStyle>
-
-         </DataGrid>
-      </Grid>
-   </Border>
-</UserControl>

Icarus.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32002.261
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "3dPrintApp", "3dPrintApp.vbproj", "{BCDE0368-2C69-4948-8723-D0FE71417986}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Icarus", "Icarus/Icarus.vbproj", "{BCDE0368-2C69-4948-8723-D0FE71417986}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Icarus/AirspacePopup.vb

@@ -4,14 +4,14 @@
 ' Add this XmlNamespace attribute to the root element of the markup file where it is 
 ' to be used:
 '
-'     xmlns:MyNamespace="clr-namespace:_3dPrintApp"
+'     xmlns:MyNamespace="clr-namespace:Icarus"
 '
 '
 ' Step 1b) Using this custom control in a XAML file that exists in a different project.
 ' Add this XmlNamespace attribute to the root element of the markup file where it is 
 ' to be used:
 '
-'     xmlns:MyNamespace="clr-namespace:_3dPrintApp;assembly=_3dPrintApp"
+'     xmlns:MyNamespace="clr-namespace:Icarus;assembly=Icarus"
 '
 ' You will also need to add a project reference from the project where the XAML file lives
 ' to this project and Rebuild to avoid compilation errors:

Icarus/Constants/Const3dPrint.vb

@@ -100,8 +100,13 @@
 
    ' parametri StartMach
    Public Const LAY_NEWSTART = "NewStart"
+
+   ' parametri Rib
    Public Const LAY_NEWRIB = "NewRib"
    Public Const LAY_NEWEXTRUSION = "NewExtrusion"
+   Public Const KEY_EXTRUSION_ID = "ExtrusionId"
+   Public Const KEY_EXTRUSION_LENGTH = "ExtrusionLength"
+   Public Const KEY_RIB_TYPE = "RibType"
 
    Public Const FILE_PATH = "FilePath"
 

Icarus/Constants/ConstGen.vb

@@ -19,7 +19,7 @@ Public Module ConstGen
    Public Const K_DATAROOT As String = "DataRoot"
 
    ' File con dati di licenza
-   Public Const LIC_FILE_NAME As String = "3dPrintApp.lic"
+   Public Const LIC_FILE_NAME As String = "Icarus.lic"
    Public Const S_LICENCE As String = "Licence"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
@@ -64,7 +64,7 @@ Public Module ConstGen
    End Enum
 
    ' File di log generale
-   Public Const GENLOG_FILE_NAME As String = "3dPrintApp#.txt"
+   Public Const GENLOG_FILE_NAME As String = "Icarus#.txt"
 
    ' Sottodirettorio di configurazione
    Public Const CONF_DIR As String = "Config"
@@ -77,7 +77,7 @@ Public Module ConstGen
    ' Sottodirettorio materiali
    Public Const MATERIALS_DIR As String = "Materials"
    ' Sottodirettorio per lavorazioni travi
-   Public Const _3DPRINTING_DIR As String = "3dPrintApp"
+   Public Const _3DPRINTING_DIR As String = "Icarus"
    ' Sottodirettorio di default per le macchine
    Public Const MACHINES_DFL_DIR As String = "Machines"
    ' Sottodirettorio di default per toolmakers

Icarus/Constants/ConstIni.vb

@@ -13,7 +13,7 @@
 
 Public Module ConstIni
 
-   Public Const INI_FILE_NAME As String = "3dPrintApp.ini"
+   Public Const INI_FILE_NAME As String = "Icarus.ini"
 
    'Public Const S_GENERAL As String = "General"
    'Public Const K_DEBUG As String = "Debug"

Icarus/Constants/ConstMachIni.vb

@@ -24,4 +24,8 @@
 
    Public Const TS3DATA_FILE As String = "Ts3Data.lua"
 
+   ' Public Const S_PRINTING3D As String = "3dPrinting"
+   Public Const K_SPEED_MIN As String = "SpeedMin"
+   Public Const K_SPEED_MAX As String = "SpeedMax"
+
 End Module

Icarus/DispositionPanel/DispositionPanelV.xaml

@@ -2,7 +2,7 @@
             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:_3dPrintApp"
+            xmlns:PrintApp="clr-namespace:Icarus"
             Margin="5">
    <StackPanel.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>

Icarus/DispositionPanel/DispositionPanelVM.vb

@@ -259,7 +259,7 @@ Public Class DispositionPanelVM
       Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.ROTATE)
    End Sub
 
-#End Region    ' DragMove
+#End Region    ' DragRotate
 
 #End Region    ' COMMANDS
 

Icarus/Icarus.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32002.261
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "3dPrintApp", "3dPrintApp/3dPrintApp.vbproj", "{BCDE0368-2C69-4948-8723-D0FE71417986}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Icarus", "Icarus.vbproj", "{BCDE0368-2C69-4948-8723-D0FE71417986}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Icarus/Icarus.vbproj

@@ -6,8 +6,8 @@
     <ProjectGuid>{BCDE0368-2C69-4948-8723-D0FE71417986}</ProjectGuid>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>_3dPrintApp</RootNamespace>
-    <AssemblyName>3dPrintApp</AssemblyName>
+    <RootNamespace>Icarus</RootNamespace>
+    <AssemblyName>Icarus</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <MyType>Custom</MyType>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -30,7 +30,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>3dPrintApp.xml</DocumentationFile>
+    <DocumentationFile>Icarus.xml</DocumentationFile>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -39,7 +39,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>3dPrintApp.xml</DocumentationFile>
+    <DocumentationFile>Icarus.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -136,6 +136,10 @@
     </Compile>
     <Compile Include="MachiningManager\CurrMachiningPanelVM.vb" />
     <Compile Include="MachiningManager\Machining.vb" />
+    <Compile Include="MachSaveInDbWnd\MachSaveInDbWindowV.xaml.vb">
+      <DependentUpon>MachSaveInDbWindowV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MachSaveInDbWnd\MachSaveInDbWndVM.vb" />
     <Compile Include="MaterialDb\Material.vb" />
     <Compile Include="MaterialDb\MaterialDbV.xaml.vb">
       <DependentUpon>MaterialDbV.xaml</DependentUpon>
@@ -153,6 +157,10 @@
       <DependentUpon>RibPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="RibPanel\RibPanelVM.vb" />
+    <Compile Include="RibParamPanel\RibParamPanelV.xaml.vb">
+      <DependentUpon>RibParamPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="RibParamPanel\RibParamPanelVM.vb" />
     <Compile Include="RightPanel\RightPanelV.xaml.vb">
       <DependentUpon>RightPanelV.xaml</DependentUpon>
     </Compile>
@@ -255,6 +263,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MachSaveInDbWnd\MachSaveInDbWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -287,6 +299,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="RibParamPanel\RibParamPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="RightPanel\RightPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -493,9 +509,12 @@
   <ItemGroup>
     <Resource Include="Resources\DrawPanel\Rotate.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\Extrude.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\3dPrintApp\3dPrintAppR64.exe
-IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\3dPrintApp\3dPrintAppD64.exe</PostBuildEvent>
+    <PostBuildEvent>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>
 </Project>

Icarus/ImportPanel/ImportPanelV.xaml

@@ -1,7 +1,7 @@
 <UserControl x:Class="ImportPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:_3dPrintApp"
+             xmlns:local="clr-namespace:Icarus"
              Width="150"
              Margin="5,0,0,0">
    <Grid DockPanel.Dock="Left">

Icarus/ImportPanel/ImportPanelVM.vb

@@ -211,7 +211,9 @@ Public Class ImportPanelVM
       Else
          ' Creo pezzi e layer necessari
          For Each ImportPart In m_ImportPartList
-            Dim nPartId As Integer = EgtCreateGroup(GDB_ID.ROOT)
+            Dim frImportedPart As New Frame3d
+            EgtGetGroupGlobFrame(m_nImportedPartId, frImportedPart)
+            Dim nPartId As Integer = EgtCreateGroup(GDB_ID.ROOT, frImportedPart)
             EgtSetName(nPartId, PART)
             Dim nFrameId As Integer = GDB_ID.NULL
             Dim b3PrintSolid As New BBox3d

Icarus/ImportWnd/ImportWndV.xaml

@@ -2,7 +2,7 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:local="clr-namespace:_3dPrintApp">
+                            xmlns:local="clr-namespace:Icarus">
    <DockPanel>
       <Grid DockPanel.Dock="Left">
          <Grid.RowDefinitions>

Icarus/LeftPanel/LeftPanelV.xaml

@@ -2,7 +2,7 @@
             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:_3dPrintApp"
+            xmlns:PrintApp="clr-namespace:Icarus"
             Margin="5">
    <TabControl SelectedIndex="{Binding SelPanel}"
                Background="Transparent"

Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml

@@ -0,0 +1,50 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="MachSaveInDbWndV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Title="Machining Param Name" 
+                            Height="150" Width="300"
+                            WindowStartupLocation="CenterOwner"
+                            Icon="/Resources/EgtBEAMWALL.ico"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            ShowInTaskbar="False"
+                            IsMinimizable="False">
+   <Grid>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="10"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <TextBlock Grid.Column="1"
+                 Grid.Row="1"
+                 Text="Name"
+                 Margin="0,0,10,0"
+                 Style="{Binding OptionTextBlock}"/>
+      <EgtWPFLib5:EgtTextBox Grid.Column="2"
+                             Grid.Row="1"
+                             Width="180"
+                             Text="{Binding sName}"
+                             Style="{StaticResource LeftPanel_TextBox}"/>
+      <UniformGrid Grid.Column="1"
+                   Grid.ColumnSpan="2"
+                   Grid.Row="3" 
+                   Rows="1">
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Style="{StaticResource ToolBar_TextButton}"/>
+         <Button Content="Cancel"
+                 Command="{Binding Cancel_Command}"
+                 Style="{StaticResource ToolBar_TextButton}"/>
+      </UniformGrid>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml.vb

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

Icarus/MachSaveInDbWnd/MachSaveInDbWndVM.vb

@@ -0,0 +1,78 @@
+Imports EgtWPFLib5
+
+Public Class MachSaveInDbWndVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
+
+   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)
+         m_sName = value
+      End Set
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTORS"
+
+   Sub New(sOrigName As String)
+      m_sOrigName = sOrigName
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+#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 Map.refTopPanelVM.MachiningList.Any(Function(x As MachiningIndex) x.sName = m_sName) Then
+         MessageBox.Show("Name already used in Db! Please insert a different name.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         Return
+      End If
+      RaiseEvent m_CloseWindow(True)
+   End Sub
+
+#End Region    ' Ok
+
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      RaiseEvent m_CloseWindow(False)
+   End Sub
+
+#End Region    ' Cancel
+
+#End Region    ' COMMANDS
+
+End Class

Icarus/MachiningDb/MachiningDbV.xaml

@@ -2,7 +2,7 @@
              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:_3dPrintApp"
+             xmlns:PrintApp="clr-namespace:Icarus"
              Width="300">
    <Border VerticalAlignment="Center"
            Style="{StaticResource RightPanel_Border}">

Icarus/MachiningDb/MachiningDbVM.vb

@@ -21,29 +21,35 @@ Public Class MachiningDbVM
          Return m_SelMachining
       End Get
       Set(value As Machining)
-         ' verifico se modificato
-         If m_SelMachining.bIsModified Then
-            ' chiedo se salvare
-            Select Case MessageBox.Show("Salvare le modifiche apportate alla lavorazione selezionata?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
-               Case MessageBoxResult.Yes
-                  m_SelMachining.Save()
-               Case MessageBoxResult.No
-                  m_SelMachining.ResetModification()
-               Case MessageBoxResult.Cancel
-                  NotifyPropertyChanged(NameOf(SelMachining))
-                  Return
-            End Select
-         End If
-         ' recupero stato IsExpanded di tutte le categorie
          Dim IsExpandedList As New List(Of Boolean)
-         For Each Cathegory In m_SelMachining.CathegoryList
-            IsExpandedList.Add(Cathegory.Cathegory_IsExpanded)
-         Next
+         If Not IsNothing(m_SelMachining) Then
+            ' verifico se modificato
+            If m_SelMachining.bIsModified Then
+               ' chiedo se salvare
+               Select Case MessageBox.Show("Salvare le modifiche apportate alla lavorazione selezionata?", "Info", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+                  Case MessageBoxResult.Yes
+                     m_SelMachining.Save()
+                  Case MessageBoxResult.No
+                     m_SelMachining.ResetModification()
+                  Case MessageBoxResult.Cancel
+                     NotifyPropertyChanged(NameOf(SelMachining))
+                     Return
+               End Select
+            End If
+            ' recupero stato IsExpanded di tutte le categorie
+            For Each Cathegory In m_SelMachining.CathegoryList
+               IsExpandedList.Add(Cathegory.Cathegory_IsExpanded)
+            Next
+         End If
          m_SelMachining = value
          ' ripristino stato IsExpanded di tutte le categorie
-         For Index = 0 To m_SelMachining.CathegoryList.Count - 1
-            m_SelMachining.CathegoryList(Index).Cathegory_IsExpanded = IsExpandedList(Index)
-         Next
+         If Not IsNothing(m_SelMachining) Then
+            For Index = 0 To m_SelMachining.CathegoryList.Count - 1
+               If IsExpandedList.Count() >= Index + 1 Then
+                  m_SelMachining.CathegoryList(Index).Cathegory_IsExpanded = IsExpandedList(Index)
+               End If
+            Next
+         End If
       End Set
    End Property
 
@@ -90,7 +96,7 @@ Public Class MachiningDbVM
 
 #Region "METHODS"
 
-   Private Sub Init()
+   Friend Sub Init()
       Dim sMachiningIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMachiningsDir & "/Machinings.ini"
       MachiningList.Clear()
       Dim nIndex As Integer = 1
@@ -102,7 +108,7 @@ Public Class MachiningDbVM
       End While
       Dim sCurrMachining As String = ""
       GetMainPrivateProfileString(S_PRINTING3D, K_CURRMACHINING, "", sCurrMachining)
-      m_SelMachining = MachiningList.FirstOrDefault(Function(x) x.sName = sCurrMachining)
+      m_SelMachining = MachiningList.FirstOrDefault(Function(x) x.sGUID = sCurrMachining)
    End Sub
 
 #End Region    ' METHODS
@@ -123,7 +129,7 @@ Public Class MachiningDbVM
    Public Sub Ok()
       If m_SelMachining.bIsModified Then
          ' chiedo se salvare
-         Select Case MessageBox.Show("Salvare le modifiche apportate alla lavorazione selezionata?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
+         Select Case MessageBox.Show("Do you want to save modified parameters?", "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
             Case MessageBoxResult.Yes
                m_SelMachining.Save()
             Case MessageBoxResult.No

Icarus/MachiningManager/CurrMachining.vb

@@ -658,7 +658,12 @@ Public Class CurrMachining
       EgtGetInfo(nPartId, MAC_GUID, m_sCurrGUID)
       If Not String.IsNullOrWhiteSpace(m_sCurrGUID) Then
          Dim CurrMachiningInDb As MachiningIndex = Map.refTopPanelVM.MachiningList.FirstOrDefault(Function(x) x.sGUID = m_sCurrGUID)
-         m_nIndex = CurrMachiningInDb.nIndex
+         If IsNothing(CurrMachiningInDb) Then
+            MessageBox.Show("Machining not found in Db!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            m_nIndex = 0
+         Else
+            m_nIndex = CurrMachiningInDb.nIndex
+         End If
       Else
          m_nIndex = 0
       End If

Icarus/MachiningManager/CurrMachiningPanelV - Copy.xaml

@@ -1,7 +1,7 @@
 <UserControl x:Class="CurrMachiningPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:_3dPrintApp">
+             xmlns:PrintApp="clr-namespace:Icarus">
    <Border VerticalAlignment="Center" 
            Style="{StaticResource RightPanel_Border}">
       <Grid>

Icarus/MachiningManager/CurrMachiningPanelV.xaml

@@ -1,7 +1,7 @@
 <UserControl x:Class="CurrMachiningPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:_3dPrintApp"
+             xmlns:PrintApp="clr-namespace:Icarus"
              Width="300">
    <Border VerticalAlignment="Center" 
            Style="{StaticResource RightPanel_Border}">
@@ -41,7 +41,7 @@
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding sName}"/>
                                     <TextBox Grid.Column="1"
-                                                           Text="{Binding dValue}"/>
+                                             Text="{Binding dValue}"/>
                                     <Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
@@ -132,6 +132,9 @@
             <Button Content="Cancel"
                     Command="{Binding Cancel_Command}"
                     Style="{StaticResource ToolBar_TextButton}"/>
+            <Button Content="Save in Db"
+                    Command="{Binding SaveInDb_Command}"
+                    Style="{StaticResource ToolBar_TextButton}"/>
          </UniformGrid>
       </Grid>
    </Border>

Icarus/MachiningManager/CurrMachiningPanelVM.vb

@@ -0,0 +1,142 @@
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class CurrMachiningPanelVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_CurrMachining As CurrMachining
+   Public ReadOnly Property CurrMachining As CurrMachining
+      Get
+         Return m_CurrMachining
+      End Get
+   End Property
+   Friend Sub SetCurrMachining(CurrMachining As CurrMachining)
+      m_CurrMachining = CurrMachining
+      NotifyPropertyChanged(NameOf(CurrMachining))
+      Map.refTopPanelVM.UpdateCurrMachining()
+   End Sub
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+   Private m_cmdSaveInDb As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTORS"
+
+   Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefCurrMachiningPanelVM(Me)
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+   Friend Sub ReadMachParamFromSelPart()
+      If IsNothing(Map.refTopPanelVM.SelPart) Then Return
+      Dim nData As Integer = 0
+      m_CurrMachining = New CurrMachining(Map.refTopPanelVM.SelPart.nPartId)
+      SetCurrMachining(m_CurrMachining)
+      ' aggiorno parametri mostrati nella barra
+      NotifyPropertyChanged(NameOf(CurrMachining))
+      Map.refTopPanelVM.UpdateCurrMachining()
+   End Sub
+
+
+#Region "COMMANDS"
+
+#Region "Ok"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      ' scrivo i parametri modificati
+      m_CurrMachining.WriteCurrParamInPart(Map.refTopPanelVM.SelPart.nPartId)
+      ' ripristino modalita' standard
+      Map.refTopPanelVM.SelPage = Pages.MODIFY
+   End Sub
+
+#End Region    ' Ok
+
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      ' ripristino modalita' standard
+      Map.refTopPanelVM.SelPage = Pages.MODIFY
+   End Sub
+
+#End Region    ' Cancel
+
+#Region "SaveInDb"
+
+   Public ReadOnly Property SaveInDb_Command As ICommand
+      Get
+         If m_cmdSaveInDb Is Nothing Then
+            m_cmdSaveInDb = New Command(AddressOf SaveInDb)
+         End If
+         Return m_cmdSaveInDb
+      End Get
+   End Property
+
+   Public Sub SaveInDb()
+      If IsNothing(m_CurrMachining) Then Return
+      ' apro finestra di scelta nome
+      Dim SaveInDbWndVM As New MachSaveInDbWndVM(Map.refTopPanelVM.SelMachining.sName)
+      Dim SaveInDbWndV As New MachSaveInDbWndV(Application.Current.MainWindow, SaveInDbWndVM)
+      If SaveInDbWndV.ShowDialog Then
+         ' recupero primo indice libero
+         Dim sMachiningIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMachiningsDir & "/Machinings.ini"
+         Dim nIndex As Integer = 1
+         Dim sGUID As String = ""
+         While GetPrivateProfileString(nIndex, MAC_GUID, "", sGUID, sMachiningIniFilePath) > 0
+            nIndex += 1
+         End While
+         Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMachiningsDir & "/Machinings.ini"
+         Dim sNewMachGUID As String = Guid.NewGuid.ToString()
+         WritePrivateProfileString(nIndex, MAC_GUID, sNewMachGUID, sMacIniFilePath)
+         WritePrivateProfileString(nIndex, MAC_NAME, SaveInDbWndVM.sName, sMacIniFilePath)
+         ' creo categoria materiali con attivo materiale corrente
+         Dim MaterialCathegory As New MachiningCathegory(MachiningCathegory.Cathegories.MATERIALS, 0)
+         Dim SelMaterialParam As MaterialMachiningParam = MaterialCathegory.MachiningParamList.FirstOrDefault(Function(x As MaterialMachiningParam) x.sGUID = Map.refTopPanelVM.SelMaterial.sGUID)
+         If Not IsNothing(SelMaterialParam) Then
+            SelMaterialParam.bValue = True
+         End If
+         ' aggiungo categoria materiali a lavorazione corrente
+         m_CurrMachining.CathegoryList.Add(MaterialCathegory)
+         ' scrivo parametri nuova lavorazione in Db
+         For Each Cathegory In m_CurrMachining.CathegoryList
+            Cathegory.WriteParamOnDb(nIndex)
+         Next
+         ' ricarico lista lavorazioni top panel e db
+         Map.refTopPanelVM.InitMachiningsList()
+         Map.refMachiningDbVM.Init()
+         ' seleziono quella appena creata
+         Map.refTopPanelVM.SelMachining = Map.refTopPanelVM.MachiningList.FirstOrDefault(Function(x) x.sGUID = sNewMachGUID)
+         Map.refTopPanelVM.NotifyPropertyChanged(NameOf(Map.refTopPanelVM.SelMachining))
+      End If
+   End Sub
+
+#End Region    ' SaveInDb
+
+#End Region    ' COMMANDS
+
+End Class
+

Icarus/MachiningManager/Machining.vb

@@ -580,6 +580,10 @@ Public Class NumericMachiningParam
       End Get
    End Property
 
+   Sub New(Type As Params)
+      MyBase.New(Type)
+   End Sub
+
    Sub New(Type As Params, nIndex As Integer)
       MyBase.New(Type)
       Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMachiningsDir & "/Machinings.ini"

Icarus/MainWindow.xaml

@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:_3dPrintApp"
+        xmlns:local="clr-namespace:Icarus"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
     <Grid>

Icarus/MainWindow/MainWindowM.vb

@@ -259,7 +259,7 @@ Public Class MainWindowM
    Private Sub ManageInstance()
       Dim bCreated As Boolean
       Try
-         m_objMutex = New Mutex(False, "Global\3dPrintApp", bCreated)
+         m_objMutex = New Mutex(False, "Global\Icarus", bCreated)
       Catch
          bCreated = False
       End Try
@@ -285,7 +285,7 @@ Public Class MainWindowM
             ' porto in primo piano la prima istanza
             Dim bFound As Boolean = False
             ' processi del programma a 32 bit
-            Dim localProc As Process() = Process.GetProcessesByName("3dPrintAppR32")
+            Dim localProc As Process() = Process.GetProcessesByName("IcarusR32")
             For Each p As Process In localProc
                If p.Id <> Process.GetCurrentProcess().Id Then
                   bFound = True
@@ -295,7 +295,7 @@ Public Class MainWindowM
             Next
             ' se non trovati processi a 32 bit provo a 64 bit
             If Not bFound Then
-               localProc = Process.GetProcessesByName("3dPrintAppR64")
+               localProc = Process.GetProcessesByName("IcarusR64")
                For Each p As Process In localProc
                   If p.Id <> Process.GetCurrentProcess().Id Then
                      bFound = True

Icarus/MainWindow/MainWindowV.xaml

@@ -2,7 +2,7 @@
                             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:_3dPrintApp"
+                            xmlns:PrintApp="clr-namespace:Icarus"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             Foreground="Black"
                             Title="Buongiorno" Icon="/Resources/EgtBEAMWALL.ico"

Icarus/MainWindow/MainWindowVM.vb

@@ -178,20 +178,40 @@ Public Class MainWindowVM
    Friend Sub KeyDown(PressedKey As Key)
       ' Con ESC esco dall'azione corrente
       If PressedKey = Key.Escape Then
-         ' reset Azione corrente
-         Map.refSceneHostVM.MainController.ResetStatus()
-         If Not (Not IsNothing(Map.refTopPanelVM.SelPage) AndAlso Map.refTopPanelVM.SelPage AndAlso
-            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS) AndAlso
-            Map.refRibPanelVM.bIsCreatingPath Then
+         ' resetto sempre input box a meno che non sia nelle ribs e stia creando il percorso
+         If Not (Not IsNothing(Map.refTopPanelVM.SelPage) AndAlso Map.refTopPanelVM.SelPage = Pages.MODIFY AndAlso
+            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS AndAlso
+            Map.refRibPanelVM.bIsCreatingPath) Then
             Map.refControllerInputPanelVM.ResetInputBox()
          End If
-         ' se misura attiva, la disattivo
-         If Map.refInstrumentPanelVM.GetDistIsChecked Then
-            Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
+         If Not IsNothing(Map.refTopPanelVM.SelPage) AndAlso Map.refTopPanelVM.SelPage = Pages.MODIFY AndAlso
+            Not IsNothing(Map.refTopPanelVM.SelModifyMode) AndAlso Map.refTopPanelVM.SelModifyMode.ModifyMode = ModifyModes.RIBS Then
+            Dim nNewExtrusionLayerId As Integer = GDB_ID.NULL
+            ' cancello eventuali layer di modifica
+            If Not IsNothing(Map.refTopPanelVM.SelPart) AndAlso Not Map.refRibPanelVM.bIsCreatingPath Then
+               nNewExtrusionLayerId = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWEXTRUSION)
+               If nNewExtrusionLayerId <> GDB_ID.NULL Then
+                  EgtErase(nNewExtrusionLayerId)
+               End If
+               Dim nNewRibLayerId As Integer = EgtGetFirstNameInGroup(Map.refTopPanelVM.SelPart.nPartId, LAY_NEWRIB)
+               If nNewRibLayerId <> GDB_ID.NULL Then
+                  EgtErase(nNewRibLayerId)
+               End If
+            End If
+            ' annullo trasparenza attivata durante edit rib
+            If Not IsNothing(Map.refRibPanelVM.SelRib) Then
+               EgtSetAlpha(Map.refRibPanelVM.SelRib.nExtrusionId, 100)
+            End If
+         End If
+         ' reset Azione corrente
+         Map.refSceneHostVM.MainController.ResetStatus()
+            ' se misura attiva, la disattivo
+            If Map.refInstrumentPanelVM.GetDistIsChecked Then
+               Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
+            End If
+            ' pulisco output
+            Map.refMyStatusBarVM.ClearOutputMessage()
          End If
-         ' pulisco output
-         Map.refMyStatusBarVM.ClearOutputMessage()
-      End If
    End Sub
 
    '   Friend m_ManagingSupervisorStop As Boolean = False

Icarus/MaterialDb/Material.vb

@@ -152,7 +152,7 @@ Public Class Material
       m_nIndex = nIndex
       Dim sMatIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
       GetPrivateProfileString(nIndex, MAT_GUID, "", m_sGUID, sMatIniFilePath)
-      GetPrivateProfileString(nIndex, MAT_NAME, "", m_sName, sMatIniFilePath)
+      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))
       m_CathegoryList.Add(New MaterialCathegory(MaterialCathegory.Cathegories.CONSTANT, nIndex))
@@ -279,8 +279,8 @@ Public Class Material
 
    Friend Sub WriteParamsOnDb(nIndex As Integer)
       Dim sMacIniFilePath As String = Map.refMainWindowVM.MainWindowM.sMaterialsDir & "/Materials.ini"
-      WritePrivateProfileString(nIndex, MAC_GUID, m_sGUID, sMacIniFilePath)
-      WritePrivateProfileString(nIndex, MAC_NAME, m_sName, sMacIniFilePath)
+      WritePrivateProfileString(nIndex, MAT_GUID, m_sGUID, sMacIniFilePath)
+      EgtWriteStringUtf8toIni(nIndex, MAT_NAME, m_sName, sMacIniFilePath)
       For Each Cathegory In m_CathegoryList
          Cathegory.WriteParamOnDb(nIndex)
       Next
@@ -754,8 +754,7 @@ Public Class StringMaterialParam
                Dim OrigMaterial As MaterialIndex = Map.refTopPanelVM.MaterialList.FirstOrDefault(Function(x) x.sGUID = sOrigGUID)
                If Not IsNothing(OrigMaterial) Then
                   m_sGUID = OrigMaterial.sGUID
-                  Dim bytes() = Encoding.Default.GetBytes(OrigMaterial.sName)
-                  m_sValue = Encoding.UTF8.GetString(bytes)
+                  m_sValue = OrigMaterial.sName
                   '    m_sValue = OrigMaterial.sName
                End If
                m_String_Visibility = Visibility.Visible

Icarus/MaterialDb/MaterialDbV.xaml

@@ -2,7 +2,7 @@
              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:_3dPrintApp">
+             xmlns:PrintApp="clr-namespace:Icarus">
    <Border VerticalAlignment="Center"
            Style="{StaticResource RightPanel_Border}">
       <Grid>

Icarus/MaterialDb/MaterialDbVM.vb

@@ -102,7 +102,7 @@ Public Class MaterialDbVM
       End While
       Dim sCurrMaterial As String = ""
       GetMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, "", sCurrMaterial)
-      m_SelMaterial = MaterialList.FirstOrDefault(Function(x) x.sName = sCurrMaterial)
+      m_SelMaterial = MaterialList.FirstOrDefault(Function(x) x.sGUID = sCurrMaterial)
    End Sub
 
 #End Region    ' METHODS

Icarus/My Project/AssemblyInfo.vb

@@ -11,10 +11,10 @@ Imports System.Windows
 
 ' Review the values of the assembly attributes
 
-<Assembly: AssemblyTitle("_3dPrintApp")>
+<Assembly: AssemblyTitle("Icarus")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("_3dPrintApp")>
+<Assembly: AssemblyProduct("Icarus")>
 <Assembly: AssemblyCopyright("Copyright ©  2022")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>

Icarus/My Project/Settings.Designer.vb

@@ -64,9 +64,9 @@ Namespace My
    Friend Module MySettingsProperty
 
       <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
-      Friend ReadOnly Property Settings() As Global._3dPrintApp.My.MySettings
+      Friend ReadOnly Property Settings() As Global.Icarus.My.MySettings
          Get
-            Return Global._3dPrintApp.My.MySettings.Default
+            Return Global.Icarus.My.MySettings.Default
          End Get
       End Property
    End Module

Icarus/Project/ProjectV.xaml

@@ -3,7 +3,7 @@
                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                                 xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                xmlns:PrintApp="clr-namespace:_3dPrintApp">
+                                xmlns:PrintApp="clr-namespace:Icarus">
    <!--<EgtFloating:EgtFloatingTray x:Name="PROJECTTOPTRAY" DockPanel.Dock="Top">
       -->
    <!--<EgtBEAMWALL:ProjManagerV DataContext="{StaticResource ProjManagerVM}"
@@ -33,26 +33,26 @@
                     Width="3"
                     HorizontalAlignment="Center" 
                     VerticalAlignment="Stretch"/>-->
-   <EgtFloating:EgtFloatingTray x:Name="SCENETOPTRAY" 
+   <!--<EgtFloating:EgtFloatingTray x:Name="SCENETOPTRAY" 
                                    DockPanel.Dock="Top"
                                    Background="Transparent">
       <WrapPanel Orientation="Horizontal" Width="{Binding ActualWidth, ElementName=TOPTRAY}">
          <PrintApp:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
-         <!--<EgtBEAMWALL:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
-                                        Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
+         --><!--<EgtBEAMWALL:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
+                                        Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>--><!--
          <PrintApp:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
          <PrintApp:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
-         <!--<EgtBEAMWALL:CalcPanelV DataContext="{StaticResource CALCPanelVM}"/>
+         --><!--<EgtBEAMWALL:CalcPanelV DataContext="{StaticResource CALCPanelVM}"/>
             <EgtBEAMWALL:FreeContourManagerV DataContext="{StaticResource FreeContourManagerVM}"
-                                             Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
+                                             Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>--><!--
          <PrintApp:CurrLayerSliderV DataContext="{StaticResource CurrLayerSliderVM}"
                                     VerticalAlignment="Center"/>
          <PrintApp:Printing3DPanelV DataContext="{StaticResource Printing3DPanelVM}"/>
 
       </WrapPanel>
-   </EgtFloating:EgtFloatingTray>
+   </EgtFloating:EgtFloatingTray>-->
 
-   <Grid DockPanel.Dock="Top">
+   <Grid DockPanel.Dock="Top" Margin="0,20,0,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="0.5*"/>
          <ColumnDefinition Width="5*"/>
@@ -81,8 +81,31 @@
                                         DataContext="{StaticResource SliderManagerVM}"
                                         HorizontalAlignment="Center"/>
       <Grid DockPanel.Dock="Bottom"
-            HorizontalAlignment="Center">
-         <PrintApp:ControllerInputPanelV DataContext="{StaticResource ControllerInputPanelVM}"/>
+            HorizontalAlignment="Stretch">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Grid Width="50"/>
+         <PrintApp:ShowPanelV Grid.Column="1"
+                              DataContext="{StaticResource ShowPanelVM}"/>
+         <PrintApp:ControllerInputPanelV Grid.Column="3"
+                                         DataContext="{StaticResource ControllerInputPanelVM}"/>
+      </Grid>
+      <Grid DockPanel.Dock="Bottom"
+            HorizontalAlignment="Stretch">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <PrintApp:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
+         <PrintApp:InstrumentPanelV Grid.Column="1"
+                                    DataContext="{StaticResource InstrumentPanelVM}"/>
       </Grid>
    </DockPanel>