From bd6327586e08cc64628bcead372dfdaa81132d61 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Wed, 19 Oct 2022 09:00:43 +0200
Subject: [PATCH 1/3] - Modifica del nome lavorazione

---
 Icarus/MachiningDb/Machining.vb      | 70 ++++++++--------------------
 Icarus/MachiningDb/MachiningDbV.xaml | 33 +++++++++----
 Icarus/MachiningDb/MachiningDbVM.vb  | 39 ++++++++++++++--
 3 files changed, 78 insertions(+), 64 deletions(-)

diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb
index 066c953..16ddae9 100644
--- a/Icarus/MachiningDb/Machining.vb
+++ b/Icarus/MachiningDb/Machining.vb
@@ -48,7 +48,7 @@ Public Class Machining
       End Get
    End Property
    Friend Sub UpdateIsModified()
-      m_bIsModified = m_CathegoryList.Any(Function(x) x.MachiningParamList.Any(Function(y) y.bIsModified))
+      m_bIsModified = m_CathegoryList.Any(Function(x) x.MachiningParamList.Any(Function(y) y.bIsModified)) OrElse bIsModifiedName
       NotifyPropertyChanged(NameOf(ghName))
    End Sub
 
@@ -69,6 +69,7 @@ Public Class Machining
       End Set
    End Property
 
+   Private m_sOrigName As String = ""
    Protected m_sName As String = ""
    Public Property sName As String
       Get
@@ -77,7 +78,7 @@ Public Class Machining
       Set(value As String)
          m_sName = value
          Map.refMachiningDbVM.SetNameVisibility(False)
-         NotifyPropertyChanged(NameOf(ghName))
+         UpdateIsModified()
       End Set
    End Property
    Public ReadOnly Property ghName As String
@@ -85,6 +86,11 @@ Public Class Machining
          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
 
    Sub New()
    End Sub
@@ -98,6 +104,7 @@ Public Class Machining
          m_sGUID = Guid.NewGuid.ToString()
          m_sName = "PrintingParam"
       End If
+      m_sOrigName = m_sName
       m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.GENERAL, nIndex))
       m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.LINK, nIndex))
       m_CathegoryList.Add(New MachiningCathegory(MachiningCathegory.Cathegories.RIBS, nIndex))
@@ -111,13 +118,6 @@ Public Class Machining
       Next
    End Sub
 
-   'Sub New(nIndex As Integer, sGUID As String, sName As String)
-   '   m_nIndex = nIndex
-   '   m_sName = sName
-   '   m_sGUID = sGUID
-   '   ReadAllParams()
-   'End Sub
-
    Sub New(sName As String, bSlicing45 As Boolean, dStrandH As Double, dStrandW As Double, nStrandCount As Integer, dOffset As Double, dStartPointOffsetOnSlice As Double,
            dStrandOrder As MPAR_STRANDORDERS, dDirection As MPAR_DIRECTIONS, dLinkType As MPAR_LINKTYPES, dLinkParam As Double, dLinkZup As Double, dOffsetLeadPoint As Double,
            dLeadIn As MPAR_LEADINOUT, dLeadInTangDist As Double, dLeadInOrthoDist As Double, dLeadOut As MPAR_LEADINOUT, dLeadOutTangDist As Double, dLeadOutOrthoDist As Double,
@@ -128,45 +128,14 @@ Public Class Machining
 
    End Sub
 
-   'Private Sub ReadAllParams()
-   '   m_bSlicing45 = ReadMachiningParamDouble(m_nIndex, MAC_SLICING45, 0)
-   '   m_dStrandH = ReadMachiningParamDouble(m_nIndex, MAC_STRANDH, 0)
-   '   m_dStrandW = ReadMachiningParamDouble(m_nIndex, MAC_STRANDW, 0)
-   '   m_nStrandCount = ReadMachiningParamDouble(m_nIndex, MAC_STRANDCOUNT, 0)
-   '   m_dOffset = ReadMachiningParamDouble(m_nIndex, MAC_OFFSET, 0)
-   '   m_dStartPointOffsetOnSlice = ReadMachiningParamDouble(m_nIndex, MAC_STARTPOINTOFFSETONSLICE, 0)
-   '   m_dStrandOrder = ReadMachiningParamDouble(m_nIndex, MAC_STRANDORDER, 0)
-   '   m_dDirection = ReadMachiningParamDouble(m_nIndex, MAC_DIRECTION, 0)
-   '   m_dLinkType = ReadMachiningParamDouble(m_nIndex, MAC_LINKTYPE, 0)
-   '   m_dLinkParam = ReadMachiningParamDouble(m_nIndex, MAC_LINKPARAM, 0)
-   '   m_dLinkZup = ReadMachiningParamDouble(m_nIndex, MAC_LINKZUP, 0)
-   '   m_dOffsetLeadPoint = ReadMachiningParamDouble(m_nIndex, MAC_OFFSETLEADPOINT, 0)
-   '   m_dLeadIn = ReadMachiningParamDouble(m_nIndex, MAC_LEADIN, 0)
-   '   m_dLeadInTangDist = ReadMachiningParamDouble(m_nIndex, MAC_LEADINTANGDIST, 0)
-   '   m_dLeadInOrthoDist = ReadMachiningParamDouble(m_nIndex, MAC_LEADINORTHODIST, 0)
-   '   m_dLeadOut = ReadMachiningParamDouble(m_nIndex, MAC_LEADOUT, 0)
-   '   m_dLeadOutTangDist = ReadMachiningParamDouble(m_nIndex, MAC_LEADOUTTANGDIST, 0)
-   '   m_dLeadOutOrthoDist = ReadMachiningParamDouble(m_nIndex, MAC_LEADOUTORTHODIST, 0)
-   '   m_dCoastingLen = ReadMachiningParamDouble(m_nIndex, MAC_COASTINGLEN, 0)
-   '   m_dCoastingFeed = ReadMachiningParamDouble(m_nIndex, MAC_COASTINGFEED, 0)
-   '   m_dWipeLen = ReadMachiningParamDouble(m_nIndex, MAC_WIPELEN, 0)
-   '   m_dWipeFeedPu = ReadMachiningParamDouble(m_nIndex, MAC_WIPEFEEDPU, 0)
-   '   m_dFloorCount = ReadMachiningParamDouble(m_nIndex, MAC_FLOORCOUNT, 0)
-   '   m_dG0Feed = ReadMachiningParamDouble(m_nIndex, MAC_G0FEED, 0)
-   '   m_dToolDiam = ReadMachiningParamDouble(m_nIndex, MAC_TOOLDIAM, 0)
-   '   m_dRibsOverlap = ReadMachiningParamDouble(m_nIndex, MAC_RIBSOVERLAP, 0)
-   '   m_dRibsStrandCount = ReadMachiningParamDouble(m_nIndex, MAC_RIBSSTRANDCOUNT, 0)
-   '   m_dRibsLink = ReadMachiningParamDouble(m_nIndex, MAC_RIBSLINK, 0)
-   '   m_dRibsInvertOrder = ReadMachiningParamDouble(m_nIndex, MAC_RIBSINVERTORDER, 0)
-   '   m_dRibsInvertDirection = ReadMachiningParamDouble(m_nIndex, MAC_RIBSINVERTDIRECTION, 0)
-   '   m_dRibsLeadInInvert = ReadMachiningParamDouble(m_nIndex, MAC_RIBSLEADININVERT, 0)
-   '   m_dRibsLeadInLen = ReadMachiningParamDouble(m_nIndex, MAC_RIBSLEADINLEN, 0)
-   '   m_dRibsLeadOutInvert = ReadMachiningParamDouble(m_nIndex, MAC_RIBSLEADOUTINVERT, 0)
-   '   m_dRibsLeadOutLen = ReadMachiningParamDouble(m_nIndex, MAC_RIBSLEADOUTLEN, 0)
-   '   m_dRibsLeadOutCoasting = ReadMachiningParamDouble(m_nIndex, MAC_RIBSLEADOUTCOASTING, 0)
-   '   m_dRibsLeadOutWipe = ReadMachiningParamDouble(m_nIndex, MAC_RIBSLEADOUTWIPE, 0)
-   '   m_dRibsLeadOutWipeDir = ReadMachiningParamDouble(m_nIndex, MAC_RIBSLEADOUTWIPEDIR, 0)
-   'End Sub
+   Private Sub SaveName()
+      m_sOrigName = m_sName
+   End Sub
+
+   Private Sub ResetName()
+      m_sName = m_sOrigName
+      NotifyPropertyChanged(NameOf(ghName))
+   End Sub
 
    Friend Sub Save()
       If bIsModified Then
@@ -180,12 +149,14 @@ Public Class Machining
    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()
@@ -211,8 +182,7 @@ Public Class Machining
    Friend Overridable Sub OnMachiningParamPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       Select Case e.PropertyName
          Case NameOf(sender.dValue), NameOf(sender.sValue), NameOf(sender.bValue), NameOf(sender.SelValue)
-            m_bIsModified = m_CathegoryList.Any(Function(x) x.MachiningParamList.Any(Function(y) y.bIsModified))
-            NotifyPropertyChanged(NameOf(ghName))
+            UpdateIsModified()
       End Select
    End Sub
 
diff --git a/Icarus/MachiningDb/MachiningDbV.xaml b/Icarus/MachiningDb/MachiningDbV.xaml
index 077db9b..e20c538 100644
--- a/Icarus/MachiningDb/MachiningDbV.xaml
+++ b/Icarus/MachiningDb/MachiningDbV.xaml
@@ -25,12 +25,27 @@
                     Command="{Binding Delete_Command}"
                     Style="{StaticResource ToolBar_TextButton}"/>
          </UniformGrid>
-         <ComboBox Grid.Row="1"
-                   Name="MachiningCombo" 
-                   ItemsSource="{Binding MachiningList}"
-                   SelectedItem="{Binding SelMachining}"
-                   DisplayMemberPath="ghName"/>
-         <Grid Grid.Row="2"
+         <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <ComboBox Name="MachiningCombo" 
+                      ItemsSource="{Binding MachiningList}"
+                      SelectedItem="{Binding SelMachining}"
+                      DisplayMemberPath="ghName"
+                      Visibility="{Binding Combo_Visibility}"
+                      Style="{StaticResource FeatureComboBox}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
+                                   Visibility="{Binding Name_Visibility}"
+                                   Style="{StaticResource OptionTextBox}"/>
+            <Button Grid.Column="1"
+                    Command="{Binding EditName_Command}"
+                    Style="{StaticResource ToolBar_Button}">
+               <Image Source="/Resources/TopPanel/Edit.png"/>
+            </Button>
+         </Grid>
+         <!--<Grid Grid.Row="2"
                Visibility="{Binding Name_Visibility}">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="2*"/>
@@ -40,7 +55,7 @@
             <TextBlock Text="{Binding Name_Msg}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
                      Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"/>
-            <!--<Button Grid.Column="2"
+            --><!--<Button Grid.Column="2"
                                             Content="R"
                                             Command="{Binding ResetParam_Command}"
                                             CommandParameter="dCurrStrandH"
@@ -48,8 +63,8 @@
                                             VerticalContentAlignment="Center"
                                             HorizontalContentAlignment="Center"
                                             Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>-->
-         </Grid>
+                                            Style="{StaticResource ToolBar_SmallButton}"/>--><!--
+         </Grid>-->
          <ScrollViewer Grid.Row="3"
                        VerticalScrollBarVisibility="Auto"
                        HorizontalScrollBarVisibility="Disabled">
diff --git a/Icarus/MachiningDb/MachiningDbVM.vb b/Icarus/MachiningDb/MachiningDbVM.vb
index 8d7f237..b637160 100644
--- a/Icarus/MachiningDb/MachiningDbVM.vb
+++ b/Icarus/MachiningDb/MachiningDbVM.vb
@@ -59,10 +59,13 @@ Public Class MachiningDbVM
          Return m_Name_Visibility
       End Get
    End Property
-   Friend Sub SetNameVisibility(bValue As Boolean)
-      m_Name_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
-      NotifyPropertyChanged(NameOf(Name_Visibility))
-   End Sub
+
+   Private m_Combo_Visibility As Visibility = Visibility.Visible
+   Public ReadOnly Property Combo_Visibility As Visibility
+      Get
+         Return m_Combo_Visibility
+      End Get
+   End Property
 
    ' variabile che indica se una qualunque lavorazione e' stata modificata
    Private m_bIsModified As Boolean = False
@@ -80,6 +83,7 @@ Public Class MachiningDbVM
    Private m_cmdNew As ICommand
    Private m_cmdSave As ICommand
    Private m_cmdDelete As ICommand
+   Private m_cmdEditName As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -109,6 +113,13 @@ Public Class MachiningDbVM
       NotifyPropertyChanged(NameOf(SelMachining))
    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))
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -234,7 +245,7 @@ Public Class MachiningDbVM
    End Property
 
    Public Sub Delete()
-      If IsNothing( m_SelMachining) Then Return
+      If IsNothing(m_SelMachining) Then Return
       ' chiedo conferma
       Select Case MessageBox.Show("Sei sicuro di voler cancellare la lavorazione selezionata?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
          Case MessageBoxResult.Yes
@@ -247,6 +258,24 @@ Public Class MachiningDbVM
 
 #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_SelMachining) Then Return
+      SetNameVisibility(True)
+   End Sub
+
+#End Region    ' EditName
+
 #End Region    ' COMMANDS
 
 End Class

From 708ffc576db71f4fd35627c69436ed64021b30c0 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Thu, 20 Oct 2022 20:40:53 +0200
Subject: [PATCH 2/3] - Gestione disattivazione interfaccia per db materiali e
 lavorazioni - Focus su nome lavorazione per edit

---
 Icarus/MachiningDb/Machining.vb      |  1 +
 Icarus/MachiningDb/MachiningDbV.xaml | 28 ++++++------------------
 Icarus/MachiningDb/MachiningDbVM.vb  | 29 +++++++++++++++++++++++++
 Icarus/TopPanel/TopPanelVM.vb        | 32 ++++++++++++++++++++++++++--
 4 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb
index 16ddae9..80b2252 100644
--- a/Icarus/MachiningDb/Machining.vb
+++ b/Icarus/MachiningDb/Machining.vb
@@ -79,6 +79,7 @@ Public Class Machining
          m_sName = value
          Map.refMachiningDbVM.SetNameVisibility(False)
          UpdateIsModified()
+         Map.refMachiningDbVM.SetIsEnabled(True)
       End Set
    End Property
    Public ReadOnly Property ghName As String
diff --git a/Icarus/MachiningDb/MachiningDbV.xaml b/Icarus/MachiningDb/MachiningDbV.xaml
index e20c538..35c7ca0 100644
--- a/Icarus/MachiningDb/MachiningDbV.xaml
+++ b/Icarus/MachiningDb/MachiningDbV.xaml
@@ -17,12 +17,15 @@
          <UniformGrid Rows="1">
             <Button Content="New"
                     Command="{Binding New_Command}"
+                    IsEnabled="{Binding IsEnabled}"
                     Style="{StaticResource ToolBar_TextButton}"/>
             <Button Content="Save"
                     Command="{Binding Save_Command}"
+                    IsEnabled="{Binding IsEnabled}"
                     Style="{StaticResource ToolBar_TextButton}"/>
             <Button Content="Delete"
                     Command="{Binding Delete_Command}"
+                    IsEnabled="{Binding IsEnabled}"
                     Style="{StaticResource ToolBar_TextButton}"/>
          </UniformGrid>
          <Grid Grid.Row="1">
@@ -37,6 +40,7 @@
                       Visibility="{Binding Combo_Visibility}"
                       Style="{StaticResource FeatureComboBox}"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
+                                   IsExplicitFocused="{Binding UserShouldEditValueNow}"
                                    Visibility="{Binding Name_Visibility}"
                                    Style="{StaticResource OptionTextBox}"/>
             <Button Grid.Column="1"
@@ -45,31 +49,12 @@
                <Image Source="/Resources/TopPanel/Edit.png"/>
             </Button>
          </Grid>
-         <!--<Grid Grid.Row="2"
-               Visibility="{Binding Name_Visibility}">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <TextBlock Text="{Binding Name_Msg}"/>
-            <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                     Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"/>
-            --><!--<Button Grid.Column="2"
-                                            Content="R"
-                                            Command="{Binding ResetParam_Command}"
-                                            CommandParameter="dCurrStrandH"
-                                            IsEnabled="{Binding bCurrStrandH_IsModified}"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>--><!--
-         </Grid>-->
          <ScrollViewer Grid.Row="3"
                        VerticalScrollBarVisibility="Auto"
                        HorizontalScrollBarVisibility="Disabled">
             <ItemsControl Grid.Row="1"
-                          ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}">
+                          ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}"
+                          IsEnabled="{Binding IsEnabled}">
                <ItemsControl.ItemsPanel>
                   <ItemsPanelTemplate>
                      <StackPanel Orientation="Vertical"/>
@@ -188,6 +173,7 @@
          <UniformGrid Grid.Row="4" Rows="1">
             <Button Content="Ok"
                     Command="{Binding Ok_Command}"
+                    IsEnabled="{Binding IsEnabled}"
                     Style="{StaticResource ToolBar_TextButton}"/>
          </UniformGrid>
       </Grid>
diff --git a/Icarus/MachiningDb/MachiningDbVM.vb b/Icarus/MachiningDb/MachiningDbVM.vb
index b637160..ef3f380 100644
--- a/Icarus/MachiningDb/MachiningDbVM.vb
+++ b/Icarus/MachiningDb/MachiningDbVM.vb
@@ -78,6 +78,33 @@ Public Class MachiningDbVM
       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))
+   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
+
    ' Definizione comandi
    Private m_cmdOk As ICommand
    Private m_cmdNew As ICommand
@@ -118,6 +145,7 @@ Public Class MachiningDbVM
       m_Combo_Visibility = If(Not bValue, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(Name_Visibility))
       NotifyPropertyChanged(NameOf(Combo_Visibility))
+      If bValue Then SetUserShouldEditValueNow()
    End Sub
 
 #End Region    ' METHODS
@@ -272,6 +300,7 @@ Public Class MachiningDbVM
    Public Sub EditName()
       If IsNothing(m_SelMachining) Then Return
       SetNameVisibility(True)
+      SetIsEnabled(False)
    End Sub
 
 #End Region    ' EditName
diff --git a/Icarus/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb
index 8ca4f64..d190a0f 100644
--- a/Icarus/TopPanel/TopPanelVM.vb
+++ b/Icarus/TopPanel/TopPanelVM.vb
@@ -440,20 +440,48 @@ Public Class TopPanelVM
    End Function
 
    Private Sub InitMATERIALDB()
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(False)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(False)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(False)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(False)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+      ' imposto pagina
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.MATERIALDB)
    End Sub
 
    Private Function ExitMATERIALDB()
-
+      ' riabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(True)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(True)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(True)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
       Return True
    End Function
 
    Private Sub InitMACHININGDB()
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(False)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(False)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(False)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(False)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+      ' imposto pagina
       Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.PRINTPARAMDB)
    End Sub
 
    Private Function ExitMACHININGDB()
-
+      ' riabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(True)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(True)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(True)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
       Return True
    End Function
 

From 82fd57d838d929c5602f3ee0c9aef1f6581a357d Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 24 Oct 2022 11:42:45 +0200
Subject: [PATCH 3/3] - Sostituiti menu' popup con border per eliminare
 problema focus delle textbox

---
 .../DispositionPanel/DispositionPanelV.xaml   | 152 +++++++-
 Icarus/DispositionPanel/DispositionPanelVM.vb |  16 +
 Icarus/LeftPanel/LeftPanelV.xaml              |  10 +-
 Icarus/RibPanel/RibPanelV.xaml                | 333 +++++++++++++++++-
 .../ShellNumberPanel/ShellNumberPanelV.xaml   | 331 ++++++++++++++++-
 Icarus/StartMachPanel/StartMachPanelV.xaml    | 254 ++++++++++++-
 6 files changed, 1031 insertions(+), 65 deletions(-)

diff --git a/Icarus/DispositionPanel/DispositionPanelV.xaml b/Icarus/DispositionPanel/DispositionPanelV.xaml
index 548b092..5f6b70f 100644
--- a/Icarus/DispositionPanel/DispositionPanelV.xaml
+++ b/Icarus/DispositionPanel/DispositionPanelV.xaml
@@ -1,17 +1,103 @@
-<StackPanel x:Class="DispositionPanelV"
+<Grid x:Class="DispositionPanelV"
             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"
+      VerticalAlignment="Stretch"
             Margin="5">
-   <StackPanel.Resources>
+   <Grid.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
-   </StackPanel.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="Auto"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="1*"/>
+   </Grid.RowDefinitions>
    <ToggleButton x:Name="MoveBtn" 
+                 Grid.Row="3"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
+   <!--<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 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 IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
           PlacementTarget="{Binding ElementName=MoveBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border x:Name="PopupBrd" Style="{StaticResource LeftPanelPopup_Border}">
@@ -68,12 +154,62 @@
             </Grid>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
+ 
    <ToggleButton x:Name="RotateBtn"
+                 Grid.Row="4"
                  Content="Rotate"
                  IsChecked="{Binding bRotate_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
+   <!--<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 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 IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
           Grid.Column="1"
           PlacementTarget="{Binding ElementName=RotateBtn}"
           Style="{StaticResource LeftPanel_Popup}">
@@ -110,5 +246,5 @@
             </Grid>
          </Grid>
       </Border>
-   </Popup>
-</StackPanel>
+   </Popup>-->
+</Grid>
diff --git a/Icarus/DispositionPanel/DispositionPanelVM.vb b/Icarus/DispositionPanel/DispositionPanelVM.vb
index 26d0073..715e347 100644
--- a/Icarus/DispositionPanel/DispositionPanelVM.vb
+++ b/Icarus/DispositionPanel/DispositionPanelVM.vb
@@ -298,3 +298,19 @@ Public Class CenterToolTipConverter
    End Function
 
 End Class
+
+Public Class FromBooleanToVisibility
+   Implements IValueConverter
+
+   Public Function Convert(ByVal value As Object, ByVal targetType As Type, ByVal parameter As Object, ByVal culture As CultureInfo) As Object Implements IValueConverter.Convert
+      If IsNothing(value) OrElse TypeOf value IsNot Boolean Then
+         Return Visibility.Collapsed
+      End If
+      Return If(CBool(value), Visibility.Visible, Visibility.Collapsed)
+   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 NotSupportedException()
+   End Function
+
+End Class
diff --git a/Icarus/LeftPanel/LeftPanelV.xaml b/Icarus/LeftPanel/LeftPanelV.xaml
index 377cf51..81d4ae5 100644
--- a/Icarus/LeftPanel/LeftPanelV.xaml
+++ b/Icarus/LeftPanel/LeftPanelV.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="LeftPanelV"
-            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">
+               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">
    <TabControl SelectedIndex="{Binding SelPanel}"
                Background="Transparent"
                BorderThickness="0">
diff --git a/Icarus/RibPanel/RibPanelV.xaml b/Icarus/RibPanel/RibPanelV.xaml
index 5138853..644d7b4 100644
--- a/Icarus/RibPanel/RibPanelV.xaml
+++ b/Icarus/RibPanel/RibPanelV.xaml
@@ -1,22 +1,71 @@
-<StackPanel x:Class="RibPanelV"
+<Grid x:Class="RibPanelV"
             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">
-   <StackPanel.Resources>
+   <Grid.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
-   </StackPanel.Resources>
-   <ComboBox ItemsSource="{Binding RibList}"
+      <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 RibList}"
              SelectedItem="{Binding SelRib}"
              IsEnabled="{Binding RibList_IsEnabled}"
-             DisplayMemberPath="ghName"/>
+             DisplayMemberPath="ghName"
+             Style="{StaticResource FeatureComboBox}"/>
     <!--Add Button--> 
    <ToggleButton x:Name="AddBtn" 
+                 Grid.Row="4"
                  Content="Add"
                  IsChecked="{Binding bAdd_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="3"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_Border}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Button Grid.Column="0"
+                    Command="{Binding Import_Command}"
+                    ToolTip="{Binding Import_ToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding Line2P_Command}"
+                    ToolTip="{Binding Line2P_ToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
           PlacementTarget="{Binding ElementName=AddBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -39,13 +88,68 @@
             </Button>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
     <!--Edit Button--> 
    <ToggleButton x:Name="EditBtn"
+                 Grid.Row="5"
                  Content="Edit"
                  IsChecked="{Binding bEdit_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="4"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_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}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding ModifyCurve_Command}"
+                    ToolTip="{Binding ModifyCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="2"
+                    Command="{Binding AddPointCurve_Command}"
+                    ToolTip="{Binding AddPointCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="3"
+                    Command="{Binding RemovePointCurve_Command}"
+                    ToolTip="{Binding RemovePointCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="4"
+                    Command="{Binding Extrude_Command}"
+                    ToolTip="{Binding Extrude_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
           PlacementTarget="{Binding ElementName=EditBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -96,13 +200,102 @@
             </Button>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
     <!--Grid Button--> 
    <ToggleButton x:Name="GridBtn"
+                 Grid.Row="6"
                  Content="Grid"
                  IsChecked="{Binding bGrid_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="5"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_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 CPlaneTopToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding CPlaneFront_Command}" 
+                    ToolTip="{Binding CPlaneFrontToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="2" 
+                    Command="{Binding CPlaneRight_Command}" 
+                    ToolTip="{Binding CPlaneRightToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="3"
+                    Command="{Binding CPlaneBack_Command}" 
+                    ToolTip="{Binding CPlaneBackToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="4"
+                    Command="{Binding CPlaneLeft_Command}"
+                    ToolTip="{Binding CPlaneLeftToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="5"
+                    Command="{Binding CPlaneBottom_Command}"
+                    ToolTip="{Binding CPlaneBottomToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="6" 
+                    Command="{Binding CPlaneElevation_Command}" 
+                    ToolTip="{Binding CPlaneElevationToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="7" 
+                    Command="{Binding CPlaneRotate_Command}" 
+                    ToolTip="{Binding CPlaneRotateToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="8"
+                    Command="{Binding CPlane3P_Command}"
+                    ToolTip="{Binding CPlane3PToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CPlane3POINTS.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="9"
+                    Command="{Binding CPlanePerpObj_Command}"
+                    ToolTip="{Binding CPlanePerpObjToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CPlanePERPCURVE.png" Stretch="Uniform"/>
+         </Button>
+         <!--<Button Grid.Column="10"
+                    Command="{Binding CPlaneObj_Command}"
+                    ToolTip="{Binding CPlaneObjToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+               <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
+            </Button>-->
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
           PlacementTarget="{Binding ElementName=GridBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -179,21 +372,82 @@
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/GridViewPanel/CPlanePERPCURVE.png" Stretch="Uniform"/>
             </Button>
-            <!--<Button Grid.Column="10"
+            --><!--<Button Grid.Column="10"
                     Command="{Binding CPlaneObj_Command}"
                     ToolTip="{Binding CPlaneObjToolTip}" 
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
-            </Button>-->
+            </Button>--><!--
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
     <!--Move Button--> 
-   <ToggleButton x:Name="MoveBtn" 
+   <ToggleButton x:Name="MoveBtn"
+                 Grid.Row="7"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="5"
+           Grid.RowSpan="5"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           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 IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
           PlacementTarget="{Binding ElementName=MoveBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -250,12 +504,52 @@
             </Grid>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
    <ToggleButton x:Name="RotateBtn"
+                 Grid.Row="8"
                  Content="Rotate"
                  IsChecked="{Binding bRotate_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="6"
+           Grid.RowSpan="5"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           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 IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
           Grid.Column="1"
           PlacementTarget="{Binding ElementName=RotateBtn}"
           Style="{StaticResource LeftPanel_Popup}">
@@ -292,9 +586,10 @@
             </Grid>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
    <ToggleButton Content="Parameters"
+                 Grid.Row="9"
                  IsChecked="{Binding bMachParam_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
 
-</StackPanel>
+</Grid>
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml b/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
index 3ac0743..906e4dc 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
@@ -1,22 +1,71 @@
-<StackPanel x:Class="ShellNumberPanelV"
+<Grid x:Class="ShellNumberPanelV"
             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">
-   <StackPanel.Resources>
+   <Grid.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
-   </StackPanel.Resources>
-   <ComboBox ItemsSource="{Binding ShellNumberList}"
+      <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 ShellNumberList}"
              SelectedItem="{Binding SelShellNumber}"
              IsEnabled="{Binding ShellNumberList_IsEnabled}"
-             DisplayMemberPath="ghName"/>
+             DisplayMemberPath="ghName"
+             Style="{StaticResource FeatureComboBox}"/>
     <!--Add Button--> 
    <ToggleButton x:Name="AddBtn" 
+                 Grid.Row="4"
                  Content="Add"
                  IsChecked="{Binding bAdd_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="3"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_Border}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Button Grid.Column="0"
+                    Command="{Binding Import_Command}"
+                    ToolTip="{Binding Import_ToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding Line2P_Command}"
+                    ToolTip="{Binding Line2P_ToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
           PlacementTarget="{Binding ElementName=AddBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -39,13 +88,68 @@
             </Button>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
     <!--Edit Button--> 
    <ToggleButton x:Name="EditBtn"
+                 Grid.Row="5"
                  Content="Edit"
                  IsChecked="{Binding bEdit_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="4"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_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}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding ModifyCurve_Command}"
+                    ToolTip="{Binding ModifyCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="2"
+                    Command="{Binding AddPointCurve_Command}"
+                    ToolTip="{Binding AddPointCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="3"
+                    Command="{Binding RemovePointCurve_Command}"
+                    ToolTip="{Binding RemovePointCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="4"
+                    Command="{Binding Extrude_Command}"
+                    ToolTip="{Binding Extrude_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
           PlacementTarget="{Binding ElementName=EditBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -96,13 +200,102 @@
             </Button>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
     <!--Grid Button--> 
    <ToggleButton x:Name="GridBtn"
+                 Grid.Row="6"
                  Content="Grid"
                  IsChecked="{Binding bGrid_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="5"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_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 CPlaneTopToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding CPlaneFront_Command}" 
+                    ToolTip="{Binding CPlaneFrontToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="2" 
+                    Command="{Binding CPlaneRight_Command}" 
+                    ToolTip="{Binding CPlaneRightToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="3"
+                    Command="{Binding CPlaneBack_Command}" 
+                    ToolTip="{Binding CPlaneBackToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="4"
+                    Command="{Binding CPlaneLeft_Command}"
+                    ToolTip="{Binding CPlaneLeftToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="5"
+                    Command="{Binding CPlaneBottom_Command}"
+                    ToolTip="{Binding CPlaneBottomToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="6" 
+                    Command="{Binding CPlaneElevation_Command}" 
+                    ToolTip="{Binding CPlaneElevationToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="7" 
+                    Command="{Binding CPlaneRotate_Command}" 
+                    ToolTip="{Binding CPlaneRotateToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="8"
+                    Command="{Binding CPlane3P_Command}"
+                    ToolTip="{Binding CPlane3PToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CPlane3POINTS.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="9"
+                    Command="{Binding CPlanePerpObj_Command}"
+                    ToolTip="{Binding CPlanePerpObjToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CPlanePERPCURVE.png" Stretch="Uniform"/>
+         </Button>
+         <!--<Button Grid.Column="10"
+                    Command="{Binding CPlaneObj_Command}"
+                    ToolTip="{Binding CPlaneObjToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+               <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
+            </Button>-->
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
           PlacementTarget="{Binding ElementName=GridBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -179,21 +372,82 @@
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/GridViewPanel/CPlanePERPCURVE.png" Stretch="Uniform"/>
             </Button>
-            <!--<Button Grid.Column="10"
+            --><!--<Button Grid.Column="10"
                     Command="{Binding CPlaneObj_Command}"
                     ToolTip="{Binding CPlaneObjToolTip}" 
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
-            </Button>-->
+            </Button>--><!--
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
     <!--Move Button--> 
    <ToggleButton x:Name="MoveBtn" 
+                 Grid.Row="7"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="5"
+           Grid.RowSpan="5"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           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 IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
           PlacementTarget="{Binding ElementName=MoveBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -250,12 +504,52 @@
             </Grid>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
    <ToggleButton x:Name="RotateBtn"
+                 Grid.Row="8"
                  Content="Rotate"
                  IsChecked="{Binding bRotate_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="6"
+           Grid.RowSpan="5"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           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 IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
           Grid.Column="1"
           PlacementTarget="{Binding ElementName=RotateBtn}"
           Style="{StaticResource LeftPanel_Popup}">
@@ -292,9 +586,10 @@
             </Grid>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
    <ToggleButton Content="Parameters"
+                 Grid.Row="9"
                  IsChecked="{Binding bMachParam_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
 
-</StackPanel>
+</Grid>
diff --git a/Icarus/StartMachPanel/StartMachPanelV.xaml b/Icarus/StartMachPanel/StartMachPanelV.xaml
index 99d455f..b6e15c0 100644
--- a/Icarus/StartMachPanel/StartMachPanelV.xaml
+++ b/Icarus/StartMachPanel/StartMachPanelV.xaml
@@ -1,21 +1,68 @@
-<StackPanel x:Class="StartMachPanelV"
+<Grid x:Class="StartMachPanelV"
             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">
-   <StackPanel.Resources>
+   <Grid.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
-   </StackPanel.Resources>
-   <ComboBox ItemsSource="{Binding StartList}"
+      <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="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
+      <RowDefinition Height="1*"/>
+   </Grid.RowDefinitions>
+   <ComboBox Grid.Row="3"
+             ItemsSource="{Binding StartList}"
              SelectedItem="{Binding SelStart}"
-             DisplayMemberPath="ghName"/>
+             DisplayMemberPath="ghName"
+             Style="{StaticResource FeatureComboBox}"/>
    <!-- Add Button -->
-   <ToggleButton x:Name="AddBtn" 
+   <ToggleButton x:Name="AddBtn"
+                 Grid.Row="4"
                  Content="Add"
                  IsChecked="{Binding bAdd_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="3"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_Border}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Button Grid.Column="0"
+                    Command="{Binding Point_Command}"
+                    ToolTip="{Binding Point_ToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding Line2P_Command}"
+                    ToolTip="{Binding Line2P_ToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
           PlacementTarget="{Binding ElementName=AddBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -38,13 +85,61 @@
             </Button>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
    <!-- Edit Button -->
    <ToggleButton x:Name="EditBtn"
+                 Grid.Row="5"
                  Content="Edit"
                  IsChecked="{Binding bEdit_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="4"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_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}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding ModifyCurve_Command}"
+                    ToolTip="{Binding ModifyCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="2"
+                    Command="{Binding AddPointCurve_Command}"
+                    ToolTip="{Binding AddPointCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="3"
+                    Command="{Binding RemovePointCurve_Command}"
+                    ToolTip="{Binding RemovePointCurve_ToolTip}"
+                    Visibility="{Binding Compo_Visibility}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
           PlacementTarget="{Binding ElementName=EditBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -88,13 +183,81 @@
             </Button>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
    <!-- Grid Button -->
    <ToggleButton x:Name="GridBtn"
+                 Grid.Row="6"
                  Content="Grid"
                  IsChecked="{Binding bGrid_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="5"
+           Grid.RowSpan="3"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           Style="{StaticResource LeftPanelPopup_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 Command="{Binding CPlaneTop_Command}" 
+                    ToolTip="{Binding CPlaneTopToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="1"
+                    Command="{Binding CPlaneFront_Command}" 
+                    ToolTip="{Binding CPlaneFrontToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="2" 
+                    Command="{Binding CPlaneRight_Command}" 
+                    ToolTip="{Binding CPlaneRightToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="3"
+                    Command="{Binding CPlaneBack_Command}" 
+                    ToolTip="{Binding CPlaneBackToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="4"
+                    Command="{Binding CPlaneLeft_Command}"
+                    ToolTip="{Binding CPlaneLeftToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="5"
+                    Command="{Binding CPlaneBottom_Command}"
+                    ToolTip="{Binding CPlaneBottomToolTip}"
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="6" 
+                    Command="{Binding CPlaneElevation_Command}" 
+                    ToolTip="{Binding CPlaneElevationToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
+         </Button>
+         <Button Grid.Column="7"
+                    Command="{Binding CPlaneOrigin_Command}"
+                    ToolTip="{Binding CPlaneOriginToolTip}" 
+                    Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneORIGIN.png" Stretch="Uniform"/>
+         </Button>
+      </Grid>
+   </Border>
+   <!--<Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
           PlacementTarget="{Binding ElementName=GridBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -158,13 +321,74 @@
             </Button>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
    <!-- Move Button -->
    <ToggleButton x:Name="MoveBtn" 
+                 Grid.Row="7"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
                  Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
+   <Border Grid.Column="1"
+           Grid.Row="5"
+           Grid.RowSpan="5"
+           VerticalAlignment="Center"
+           Margin="5,0,0,0"
+           Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
+           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 IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
           PlacementTarget="{Binding ElementName=MoveBtn}"
           Style="{StaticResource LeftPanel_Popup}">
       <Border Style="{StaticResource LeftPanelPopup_Border}">
@@ -221,6 +445,6 @@
             </Grid>
          </Grid>
       </Border>
-   </Popup>
+   </Popup>-->
    
-</StackPanel>
+</Grid>