From d06929d1dd7962d8b9e70c217ae6b96a3b5401e5 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Tue, 21 Nov 2023 09:48:06 +0100
Subject: [PATCH 1/2] - sistemato stampa pdf ottimizzatore

---
 EgtBEAMWALL.ViewerOptimizer/Statistics/PDFHelper.vb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/PDFHelper.vb b/EgtBEAMWALL.ViewerOptimizer/Statistics/PDFHelper.vb
index 3fe43b3b..8b234ca2 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Statistics/PDFHelper.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/PDFHelper.vb
@@ -140,6 +140,7 @@ Module PDFHelper
          Case ListTypes.MACHGROUP
             Itemlist = Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
          Case ListTypes.RAWPART
+            If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refStatisticsVM.LoadRawPart()
             Itemlist = Map.refStatisticsVM.RawPartList
       End Select
       'If m_ActivePage = Pages.VIEW Then

From 9caa404aa573900a47af7d003056c6aa0e6168ff Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Fri, 24 Nov 2023 10:14:38 +0100
Subject: [PATCH 2/2] -crezione pagina contenente il tabcontrol -creazione
 pagine PartInRawPartManagerWnd e RawPartManagerWnd

---
 .../BTLViewModel/BTLStructureVM.vb            |  24 ++-
 .../EgtBEAMWALL.ViewerOptimizer.vbproj        |  37 +++++
 .../FreeContourManagerVM.vb                   |  12 +-
 .../ItemParamList/BTLPartListV.xaml.vb        |   3 +-
 .../ItemParamList/OnlyProdFeatureListV.xaml   |  22 +--
 .../MachGroupPanel/MyMachGroupVM.vb           |   3 +-
 .../OnlyProdProject/OnlyProdProjectV.xaml     | 148 +-----------------
 .../PartInRawPartManagerWndV.xaml             |  17 ++
 .../PartInRawPartManagerWndV.xaml.vb          |   3 +
 .../ProdProjManager/ProdProjManagerV.xaml     |  26 +++
 .../ProdProjManager/ProdProjManagerV.xaml.vb  |   3 +
 .../ProdProjManager/ProdProjManagerVM.vb      |  43 +++++
 .../Project/ProjectVM.vb                      |  28 +---
 .../RawPartManager/RawPartManagerWndV.xaml    |  17 ++
 .../RawPartManager/RawPartManagerWndV.xaml.vb |   3 +
 .../ShowBeamPanel/ShowBeamPanelVM.vb          |   3 +-
 .../TabWnd/ProdWndV.xaml                      |  52 ++++++
 .../TabWnd/ProdWndV.xaml.vb                   |   3 +
 .../TabWnd/ProjWndV.xaml                      |  72 +++++++++
 .../TabWnd/ProjWndV.xaml.vb                   |   3 +
 .../TabWnd/ProjWndVM.vb                       |  21 +++
 .../Utility/Dictionary.xaml                   |   1 +
 EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb    |  16 +-
 23 files changed, 364 insertions(+), 196 deletions(-)
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml.vb
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml.vb
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerVM.vb
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml.vb
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml.vb
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml.vb
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndVM.vb

diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
index 7dfe2782..47d295f9 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
@@ -84,7 +84,8 @@ Public Class BTLStructureVM
       Select Case m_SelectionType
          Case SelectionTypes.SELECT_
             ' imposto modalita' proj su vista feature
-            Map.refProjectVM.SelProdProj = ProdProj.PROJ
+            'Map.refProjectVM.SelProdProj = ProdProj.PROJ
+            Map.refProdProjManagerVM.SelProdProj = ProdProj.PROJ
             ' rendo enable bottone parameters
             Map.refLeftPanelVM.SetParametersIsEnabled(True)
             ' verifico reset mark su tutti i pezzi
@@ -92,10 +93,12 @@ Public Class BTLStructureVM
                EgtResetMark(BTLPart.nPartId)
             Next
             ' mostro barra di gestione pezzo
-            Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+            'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+            Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
          Case SelectionTypes.HIGHLIGHT
             ' imposto modalita' nulla su vista feature
-            Map.refProjectVM.SelProdProj = ProdProj.NULL
+            'Map.refProjectVM.SelProdProj = ProdProj.NULL
+            Map.refProdProjManagerVM.SelProdProj = ProdProj.NULL
             ' rendo disable bottone parameters
             Map.refLeftPanelVM.SetParametersIsEnabled(False)
             If m_PrevSelectionType = SelectionTypes.SELECT_ Then
@@ -111,7 +114,8 @@ Public Class BTLStructureVM
             ' se attivata opzione, li assemblo
             Map.refProjectVM.BTLStructureVM.ShowBuilding(If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Map.refShowBeamPanelVM.ShowBuilding_IsChecked, False), False)
             ' nascondo barra di gestione pezzo
-            Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+            'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+            Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
       End Select
       ' aggiornamento grafica
       'Map.refLeftPanelVM.PartShowAllChanged()
@@ -120,7 +124,8 @@ Public Class BTLStructureVM
       'Map.refLeftPanelVM.FeatureSelectionChanged()
       If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
       Map.refCALCPanelVM.SetIsEnabledForSelPart()
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
    End Sub
 
    Private m_SelBTLParts As New PartsObservableCollection(Of BTLPartVM)
@@ -148,7 +153,8 @@ Public Class BTLStructureVM
          Map.refFeatureListManagerVM.FeatureSelectionChanged()
          'Map.refLeftPanelVM.FeatureSelectionChanged()
          Map.refCALCPanelVM.SetIsEnabledForSelPart()
-         Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+         'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+         Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
       End If
       If nSelCount = 1 Then
          If bByOptim Then
@@ -436,7 +442,8 @@ Public Class BTLStructureVM
                ' seleziono pagina BottomPanel
                Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
                ' mostro barra di gestione pezzo
-               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+               'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
                ' deseleziono le feature
                If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
                ' aggiorno stato selezionato tutto
@@ -480,7 +487,8 @@ Public Class BTLStructureVM
                ' seleziono pagina BottomPanel
                Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
                ' mostro barra di gestione pezzo
-               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+               'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
                ' deseleziono le feature
                If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
                ' aggiorno stato selezionato tutto
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index d59e35cc..c0a8744d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -271,6 +271,18 @@
       <DependentUpon>FeatureListManagerV.xaml</DependentUpon>
     </Compile>
     <Compile Include="FeatureListManager\FeatureListManagerVM.vb" />
+    <Compile Include="PartInRawPartManager\PartInRawPartManagerWndV.xaml.vb">
+      <DependentUpon>PartInRawPartManagerWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="RawPartManager\RawPartManagerWndV.xaml.vb">
+      <DependentUpon>RawPartManagerWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TabWnd\ProdWndV.xaml.vb">
+      <DependentUpon>ProdWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TabWnd\ProjWndV.xaml.vb">
+      <DependentUpon>ProjWndV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ItemParamList\OnlyProdFeatureListV.xaml.vb">
       <DependentUpon>OnlyProdFeatureListV.xaml</DependentUpon>
     </Compile>
@@ -366,6 +378,10 @@
       <DependentUpon>PartParametersWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="PartParametersWnd\PartParametersWndVM.vb" />
+    <Compile Include="ProdProjManager\ProdProjManagerV.xaml.vb">
+      <DependentUpon>ProdProjManagerV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ProdProjManager\ProdProjManagerVM.vb" />
     <Compile Include="ProjectManager\ProjectManagerVM.vb" />
     <Compile Include="ProjectTypeWnd\ProjectTypeWndV.xaml.vb">
       <DependentUpon>ProjectTypeWndV.xaml</DependentUpon>
@@ -402,6 +418,7 @@
     <Compile Include="Statistics\StatisticsUtility.vb" />
     <Compile Include="SupervisorCommThread\SupervisorComm.vb" />
     <Compile Include="SupervisorCommThread\SupervisorCommThread.vb" />
+    <Compile Include="TabWnd\ProjWndVM.vb" />
     <Compile Include="ToolsDbWindow\MyToolDbWindowVM.vb" />
     <Compile Include="ToolsDbWindow\ToolsUpdate.vb" />
     <Compile Include="UpdateBTLWnd\UpdateOrAppendWndVM.vb" />
@@ -529,6 +546,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PartInRawPartManager\PartInRawPartManagerWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RawPartManager\RawPartManagerWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TabWnd\ProdWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TabWnd\ProjWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ItemParamList\OnlyProdFeatureListV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -629,6 +662,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ProdProjManager\ProdProjManagerV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ProjectTypeWnd\ProjectTypeWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb
index d5172fcb..1b72b0ab 100644
--- a/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb
@@ -321,7 +321,8 @@ Public Class FreeContourManagerVM
       nSideAngTextLayer = GDB_ID.NULL
       SideAngValues.Clear()
       ' nascondo PartManager
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
       ' verifico se solido attivo
       m_bPrevShowSolid = Map.refShowBeamPanelVM.ShowSolid_IsChecked
       If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
@@ -437,7 +438,8 @@ Public Class FreeContourManagerVM
       ' attivo bottoni save e cancel
       SelFeature.RefreshFCMBtnVisibility()
       ' nascondo Part Manager
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
       ' attivo pannello
       Map.refProjectVM.SetFreeContourManager_Visibility(True)
       EgtDraw()
@@ -537,7 +539,8 @@ Public Class FreeContourManagerVM
       nSelFeatureId = GDB_ID.NULL
       nProcessingLayerId = GDB_ID.NULL
       ' riattivo Part Manager
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
       ' disattivo modifiche su scena
       Map.refSceneHostVM.MainScene.SetStatusNull()
       If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
@@ -557,7 +560,8 @@ Public Class FreeContourManagerVM
       Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
       EgtZoom(ZM.ALL)
       ' rimetto PartManager
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
    End Sub
 
    ' funzione lanciata su fine creazione percorso
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml.vb
index 51f1ad96..805258d5 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml.vb
@@ -47,7 +47,8 @@ Public Class BTLPartListV
             e.Handled = True
          ElseIf e.ChangedButton = m_HighlightBtn Then
             Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.HIGHLIGHT)
-            Map.refProjectVM.SelProdProj = ProdProj.NULL
+            'Map.refProjectVM.SelProdProj = ProdProj.NULL
+            Map.refProdProjManagerVM.SelProdProj = ProdProj.NULL
          End If
          ' imposto tipo di grid selezionata
          If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.PARTLIST)
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
index 58996db6..a85ef74c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml
@@ -4,10 +4,8 @@
              xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer" 
              xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
 
-   <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.BTLFeatureVMList,
-                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
-                                SelectedItem="{Binding Tag.SelBTLFeatureVM,
-                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
+   <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.BTLFeatureVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
+                                SelectedItem="{Binding Tag.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
                                 CanUserAddRows="False"
                                 AutoGenerateColumns="False"
                                 CanUserResizeRows="False"
@@ -57,16 +55,6 @@
                                    FontWeight="Bold"
                                    FontSize="12"
                                    Margin="0,-6,0,-2"/>
-                        <!--<Ellipse Width="5"
-                                 Height="5"
-                                 Fill="Red"
-                                 Visibility="{Binding CALC_ROT_Visibility}"/>
-                        <TextBlock Text="{Binding CALC_ERR_Letter}"
-                                   Foreground="{Binding CALC_ERR_Foreground}"
-                                   FontWeight="Bold"
-                                   FontSize="10"/>-->
-                        <!--<TextBlock Text="&#x2794;"
-                                   Visibility="{Binding CALC_FALL_Visibility}"/>-->
                      </Grid>
                   </Grid>
                </DataTemplate>
@@ -75,7 +63,7 @@
          <!--Descrizione-->
          <DataGridTextColumn x:Key="colDESC" Binding="{Binding sDesc}">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding DataContext.Description_Msg, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               <TextBlock Text="{Binding DataContext.Description_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"/>
             </DataGridTextColumn.Header>
             <DataGridTextColumn.CellStyle>
                <Style TargetType="{x:Type DataGridCell}">
@@ -98,7 +86,7 @@
                                     </ToolTip.Content>
                                  </ToolTip>
                               </TextBlock.ToolTip>
-               </TextBlock>
+                           </TextBlock>
                         </ControlTemplate>
                      </Setter.Value>
                   </Setter>
@@ -132,5 +120,5 @@
       </DataGrid.RowStyle>
 
    </EgtBEAMWALLCORE:EgtDataGrid>
-   
+
 </UserControl>
diff --git a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupVM.vb b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupVM.vb
index 2ba294e0..28c49834 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupVM.vb
@@ -47,7 +47,8 @@ Public Class MyMachGroupVM
          If Not IsNothing(value) Then
             If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
                ' imposto modalita' prod su vista feature
-               Map.refProjectVM.SelProdProj = ProdProj.PROD
+               'Map.refProjectVM.SelProdProj = ProdProj.PROD
+               Map.refProdProjManagerVM.SelProdProj = ProdProj.PROD
                ' deseleziono pezzo in lista BTLPart
                Map.refProjectVM.BTLStructureVM.SelBTLParts.Clear()
             End If
diff --git a/EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml b/EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
index 67cffb0a..6bb0d011 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
@@ -2,7 +2,6 @@
                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                 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:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
                                 DataContext="{StaticResource ProjectVM}">
 
@@ -16,11 +15,6 @@
    </EgtFloating:EgtFloatingTray>
 
    <Grid>
-      <!--<Grid.ColumnDefinitions>
-         <ColumnDefinition Width="{Binding GridDims[0].GridLen, Mode=TwoWay}"/>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="{Binding GridDims[1].GridLen, Mode=TwoWay}"/>
-      </Grid.ColumnDefinitions>-->
       <Grid.RowDefinitions>
          <RowDefinition Height="{Binding GridDims[0].GridLen, Mode=TwoWay}"/>
          <RowDefinition Height="Auto"/>
@@ -70,126 +64,8 @@
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="{Binding GridDims[5].GridLen, Mode=TwoWay}"/>
          </Grid.ColumnDefinitions>
-         <TabControl SelectedIndex="{Binding SelProdProj}">
-            <TabControl.ItemContainerStyle>
-               <Style TargetType="{x:Type TabItem}">
-                  <Setter Property="Visibility" Value="Collapsed"/>
-               </Style>
-            </TabControl.ItemContainerStyle>
-            <TabItem Header="NULL"/>
-            <TabItem Header="PROJ">
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <EgtBEAMWALL:FreeContourInputV DataContext="{StaticResource FreeContourInputVM}"
-                                                 Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-                  <EgtBEAMWALL:PartManagerV DataContext="{StaticResource PartManagerVM}"
-                                            Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                            Visibility="{Binding DataContext.PartManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-                  <Grid Grid.Row="1">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="1*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid>
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto"/>
-                           <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-                        
-                        <EgtBEAMWALL:FeatureListManagerV />
-                        
-                        <EgtBEAMWALL:OnlyProdFeatureListV DataContext="{StaticResource FeatureListVM}"
-                                                          Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                                          Grid.Row="1"/>
-                     </Grid>
 
-                     <GridSplitter Grid.Column="1"
-                                   Width="3"
-                                   HorizontalAlignment="Center" 
-                                   VerticalAlignment="Stretch"/>
-
-                     <Grid Grid.Column="2">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto"/>
-                           <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-                        <EgtBEAMWALL:FeatureManagerV DataContext="{StaticResource FeatureManagerVM}"
-                                                      Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-                        <TabControl Grid.Row="1"
-                                    TabStripPlacement="Left"
-                                    Margin="5,5,2.5,5">
-                           <TabItem Header="P">
-                              <TabItem.Content>
-                                 <EgtBEAMWALL:OnlyProdPParameterListV DataContext="{StaticResource PParameterListVM}"
-                                                                      Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                                                      Margin="5"/>
-                              </TabItem.Content>
-                           </TabItem>
-                           <TabItem Header="Q">
-                              <TabItem.Content>
-                                 <EgtBEAMWALL:OnlyProdQParameterListV DataContext="{StaticResource QParameterListVM}"
-                                                                      Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                                                      Margin="5"/>
-                              </TabItem.Content>
-                           </TabItem>
-                        </TabControl>
-                     </Grid>
-                  </Grid>
-               </Grid>
-
-            </TabItem>
-            <TabItem Header="PROD">
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="Auto"/>
-                  </Grid.RowDefinitions>
-                  <!--<Grid.Resources>
-                     <Style TargetType="TextBlock">
-                        <Style.Triggers>
-                           <Trigger Property="Text" Value="">
-                              <Setter Property="Visibility" Value="Collapsed"/>
-                           </Trigger>
-                        </Style.Triggers>
-                     </Style>
-                  </Grid.Resources>-->
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="{Binding GridDims[8].GridLen, Mode=TwoWay}"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="{Binding GridDims[9].GridLen, Mode=TwoWay}"/>
-                     </Grid.ColumnDefinitions>
-                     <EgtBEAMWALL:FeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}"
-                                                              Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-                     <GridSplitter Grid.Column="1"
-                                   Height="3"
-                                   HorizontalAlignment="Stretch"
-                                   Visibility="{Binding QParSplitter_Visibility}"/>
-                     <EgtBEAMWALL:QParameterListV Grid.Column="2"
-                                                  DataContext="{StaticResource DuploQParameterListVM}"
-                                                  Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-                  </Grid>
-                  <TextBlock Grid.Row="1"
-                             Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                             Margin="5,0,5,0"
-                             Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-                  <TextBlock Grid.Row="2"
-                             Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                             Margin="5,0,5,0"
-                             Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-                  <TextBlock Grid.Row="3"
-                             Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                             Margin="5,0,5,0"
-                             Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-               </Grid>
-            </TabItem>
-         </TabControl>
+         <EgtBEAMWALL:ProdProjManagerV Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
 
          <GridSplitter Grid.Column="1"
                        Width="3"
@@ -202,30 +78,16 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="{Binding GridDims[7].GridLen, Mode=TwoWay}"/>
             </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
 
-            <EgtBEAMWALL:RawPartManagerV />
-
-            <EgtBEAMWALL:RawPartListV Grid.Column="1"
-                                      DataContext="{StaticResource RawPartListVM}"
-                                      Tag="{Binding DataContext.MachGroupPanelVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-            
-            <GridSplitter Grid.Column="1"
-                          Grid.Row="1"
+            <EgtBEAMWALL:RawPartManagerWndV Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
+                        
+            <GridSplitter Grid.Row="1"
                           Height="3" 
                           HorizontalAlignment="Stretch" 
                           Grid.ColumnSpan="2"/>
 
-            <EgtBEAMWALL:PartInRawPartManagerV Grid.Row="2" />
+            <EgtBEAMWALL:PartInRawPartManagerWndV Grid.Row="2" Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
 
-            <EgtBEAMWALL:PartInRawPartListV Grid.Column="1"
-                                            Grid.Row="2"
-                                            DataContext="{StaticResource PartInRawPartListVM}"
-                                            Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                            Margin="0,0,5,0"/>
          </Grid>
       </Grid>
    </Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml
new file mode 100644
index 00000000..dfb4b5ad
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml
@@ -0,0 +1,17 @@
+<Grid x:Class="PartInRawPartManagerWndV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+
+   <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="1*"/>
+   </Grid.ColumnDefinitions>
+
+   <EgtBEAMWALL:PartInRawPartManagerV />
+
+   <EgtBEAMWALL:PartInRawPartListV Grid.Column="1"
+                                   DataContext="{StaticResource PartInRawPartListVM}"
+                                   Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartManagerWndV}}}"
+                                   Margin="0,0,5,0"/>
+</Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml.vb
new file mode 100644
index 00000000..04aa079e
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class PartInRawPartManagerWndV
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml
new file mode 100644
index 00000000..bdfa52bf
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml
@@ -0,0 +1,26 @@
+<TabControl x:Class="ProdProjManagerV"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
+            DataContext="{StaticResource ProdProjManagerVM}"
+            SelectedIndex="{Binding SelProdProj}">
+
+   <TabControl.ItemContainerStyle>
+      <Style TargetType="{x:Type TabItem}">
+         <Setter Property="Visibility" Value="Collapsed"/>
+      </Style>
+   </TabControl.ItemContainerStyle>
+   <TabItem Header="NULL"/>
+   <TabItem Header="PROJ">
+
+      <EgtBEAMWALL:ProjWndV DataContext="{Binding ProjectVM}"
+                            Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdProjManagerV}}}"/>
+
+   </TabItem>
+   <TabItem Header="PROD">
+
+      <EgtBEAMWALL:ProdWndV DataContext="{Binding ProjectVM}"
+                            Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdProjManagerV}}}"/>
+
+   </TabItem>
+</TabControl>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml.vb
new file mode 100644
index 00000000..816dd5c5
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class ProdProjManagerV
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerVM.vb
new file mode 100644
index 00000000..d9302a9a
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerVM.vb
@@ -0,0 +1,43 @@
+Imports EgtBEAMWALL.Core.ConstGen
+Imports EgtWPFLib5
+
+Public Class ProdProjManagerVM
+   Inherits VMBase
+
+#Region "FIELD & PROPERTIES"
+
+   ' Selezione Tab Prod / Proj
+   Private m_SelProdProj As ProdProj
+   Public Property SelProdProj As Integer
+      Get
+         Return m_SelProdProj
+      End Get
+      Set(value As Integer)
+         m_SelProdProj = value
+         NotifyPropertyChanged(NameOf(SelProdProj))
+      End Set
+   End Property
+
+   Public ReadOnly Property PartManager_Visibility As Visibility
+      Get
+         Return If((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+   Public ReadOnly Property FreeContourManager_Visibility As Visibility
+      Get
+         Return Map.refProjectVM.FreeContourManager_Visibility
+      End Get
+   End Property
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+      Map.SetRefProdProjManagerVM(Me)
+   End Sub
+
+#End Region    ' Constructor
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb b/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
index cb7b508c..55325131 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
@@ -11,18 +11,6 @@ Public Class ProjectVM
 
    Private m_Calc_Timer As New DispatcherTimer
 
-   ' Selezione Tab Prod / Proj
-   Private m_SelProdProj As ProdProj
-   Public Property SelProdProj As Integer
-      Get
-         Return m_SelProdProj
-      End Get
-      Set(value As Integer)
-         m_SelProdProj = value
-         NotifyPropertyChanged(NameOf(SelProdProj))
-      End Set
-   End Property
-
    Private Property m_GridDims As New ObservableCollection(Of GridDimension)
    Public Property GridDims As ObservableCollection(Of GridDimension)
       Get
@@ -103,12 +91,12 @@ Public Class ProjectVM
       m_BottomPanel_Visibility = IsVisible
    End Sub
 
-   Private m_PartManager_Visibility As Boolean = True
-   Public ReadOnly Property PartManager_Visibility As Visibility
-      Get
-         Return If((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
+   'Private m_PartManager_Visibility As Boolean = True
+   'Public ReadOnly Property PartManager_Visibility As Visibility
+   '   Get
+   '      Return If((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
+   '   End Get
+   'End Property
 
    Private m_FeatureManager_Visibility As Boolean = True
    Public Property FeatureManager_Visibility As Visibility
@@ -200,7 +188,7 @@ Public Class ProjectVM
    End Property
    Friend Sub SetFreeContourManager_Visibility(IsVisible As Boolean)
       m_FreeContourManager_Visibility = IsVisible
-      NotifyPropertyChanged("FreeContourManager_Visibility")
+      NotifyPropertyChanged(NameOf(FreeContourManager_Visibility))
    End Sub
 
    ' OnlyProdProject
@@ -448,7 +436,7 @@ Public Class ProjectVM
       NotifyPropertyChanged(NameOf(LeftPanel_Visibility))
       NotifyPropertyChanged(NameOf(TopPanel_Visibility))
       NotifyPropertyChanged(NameOf(BottomPanel_Visibility))
-      NotifyPropertyChanged(NameOf(PartManager_Visibility))
+      NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
       NotifyPropertyChanged(NameOf(FeatureManager_Visibility))
       NotifyPropertyChanged(NameOf(ShowBeamPanel_Visibility))
       NotifyPropertyChanged(NameOf(ProjManager_Visibility))
diff --git a/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml
new file mode 100644
index 00000000..1d0e9418
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml
@@ -0,0 +1,17 @@
+<Grid x:Class="RawPartManagerWndV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+
+   <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="1*"/>
+   </Grid.ColumnDefinitions>
+   
+   <EgtBEAMWALL:RawPartManagerV />
+
+   <EgtBEAMWALL:RawPartListV Grid.Column="1"
+                             DataContext="{StaticResource RawPartListVM}"
+                             Tag="{Binding Tag.MachGroupPanelVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartManagerWndV}}}"/>
+   
+</Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml.vb
new file mode 100644
index 00000000..f35aa6e4
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class RawPartManagerWndV
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/ShowBeamPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/ShowBeamPanelVM.vb
index ffe190bb..ae479427 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/ShowBeamPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/ShowBeamPanelVM.vb
@@ -177,7 +177,8 @@ Public Class ShowBeamPanelVM
       End If
       ' nascondo barra del pezzo
       Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.NULL)
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
       ' mostro in parte bassa dati BTL
       If Not IsNothing(Map.refBottomPanelVM) Then Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.STRUCTURE_)
       ' mostro tutti i pezzi
diff --git a/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml
new file mode 100644
index 00000000..5b4fedab
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml
@@ -0,0 +1,52 @@
+<Grid x:Class="ProdWndV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+
+   <Grid.RowDefinitions>
+      <RowDefinition Height="1*"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+   </Grid.RowDefinitions>
+
+   <!--<Grid.Resources>
+                     <Style TargetType="TextBlock">
+                        <Style.Triggers>
+                           <Trigger Property="Text" Value="">
+                              <Setter Property="Visibility" Value="Collapsed"/>
+                           </Trigger>
+                        </Style.Triggers>
+                     </Style>
+                  </Grid.Resources>-->
+   <Grid>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="{Binding GridDims[8].GridLen, Mode=TwoWay}"/>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="{Binding GridDims[9].GridLen, Mode=TwoWay}"/>
+      </Grid.ColumnDefinitions>
+      
+      <EgtBEAMWALL:FeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}"
+                                               Tag="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"/>
+      
+      <GridSplitter Grid.Column="1"
+                    Height="3"
+                    HorizontalAlignment="Stretch"/>
+
+      <EgtBEAMWALL:QParameterListV Grid.Column="2"
+                                   DataContext="{StaticResource DuploQParameterListVM}"
+                                   Tag="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"/>
+   </Grid>
+   <TextBlock Grid.Row="1"
+              Text="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"
+              Margin="5,0,5,0"
+              Foreground="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"/>
+   <TextBlock Grid.Row="2"
+              Text="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"
+              Margin="5,0,5,0"
+              Foreground="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"/>
+   <TextBlock Grid.Row="3"
+              Text="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"
+              Margin="5,0,5,0"
+              Foreground="{Binding Tag.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProdWndV}}}"/>
+</Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml.vb
new file mode 100644
index 00000000..2711a28b
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProdWndV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class ProdWndV
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml
new file mode 100644
index 00000000..1f451aa1
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml
@@ -0,0 +1,72 @@
+<Grid x:Class="ProjWndV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+
+   <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="1*"/>
+   </Grid.RowDefinitions>
+   
+   <EgtBEAMWALL:FreeContourInputV DataContext="{StaticResource FreeContourInputVM}"
+                                  Visibility="{Binding Tag.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"/>
+   <EgtBEAMWALL:PartManagerV DataContext="{StaticResource PartManagerVM}"
+                             Tag="{Binding Tag.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
+                             Visibility="{Binding Tag.PartManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"/>
+
+   <Grid Grid.Row="1">
+
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+         <EgtBEAMWALL:FeatureListManagerV />
+
+         <EgtBEAMWALL:OnlyProdFeatureListV DataContext="{StaticResource FeatureListVM}"
+                                           Tag="{Binding Tag.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
+                                           Grid.Row="1"/>
+      </Grid>
+
+      <GridSplitter Grid.Column="1"
+                 Width="3"
+                 HorizontalAlignment="Center" 
+                 VerticalAlignment="Stretch"/>
+
+      <Grid Grid.Column="2">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+         <EgtBEAMWALL:FeatureManagerV DataContext="{StaticResource FeatureManagerVM}"
+                                      Tag="{Binding Tag.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"/>
+         <TabControl Grid.Row="1"
+                  TabStripPlacement="Left"
+                  Margin="5,5,2.5,5">
+            <TabItem Header="P">
+               <TabItem.Content>
+                  <EgtBEAMWALL:OnlyProdPParameterListV DataContext="{StaticResource PParameterListVM}"
+                                                       Tag="{Binding Tag.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
+                                                       Margin="5"/>
+               </TabItem.Content>
+            </TabItem>
+            <TabItem Header="Q">
+               <TabItem.Content>
+                  <EgtBEAMWALL:OnlyProdQParameterListV DataContext="{StaticResource QParameterListVM}"
+                                                       Tag="{Binding Tag.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjWndV}}}"
+                                                       Margin="5"/>
+               </TabItem.Content>
+            </TabItem>
+         </TabControl>
+      </Grid>
+
+   </Grid>
+   
+</Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml.vb
new file mode 100644
index 00000000..8e3f28ca
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class FeatureV
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndVM.vb
new file mode 100644
index 00000000..33054761
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/TabWnd/ProjWndVM.vb
@@ -0,0 +1,21 @@
+Imports EgtBEAMWALL.Core.ConstGen
+
+Public Class ProjWndVM
+
+#Region "FIELD & PROPERTIES"
+
+   Public ReadOnly Property PartManager_Visibility As Visibility
+      Get
+         Return If((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+   Public ReadOnly Property FreeContourManager_Visibility As Visibility
+      Get
+         Return Map.refProjectVM.FreeContourManager_Visibility
+      End Get
+   End Property
+
+#End Region    ' Fields & Properties
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
index 9b26be6f..e7a5c580 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
@@ -57,6 +57,7 @@
    <EgtBEAMWALL:FeatureListManagerVM x:Key="FeatureListManagerVM"/>
    <EgtBEAMWALL:RawPartManagerVM x:Key="RawPartManagerVM"/>
    <EgtBEAMWALL:PartInRawPartManagerVM x:Key="PartInRawPartManagerVM"/>
+   <EgtBEAMWALL:ProdProjManagerVM x:Key="ProdProjManagerVM"/>
 
    <!--Colori predefiniti-->
    <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb b/EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb
index 4b906b37..f5efcab8 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb
@@ -39,6 +39,7 @@ Module Map
    Private m_refRawPartManagerVM As RawPartManagerVM
    Private m_refPartInRawPartManagerVM As PartInRawPartManagerVM
    Private m_refFeatureListManagerVM As FeatureListManagerVM
+   Private m_refProdProjManagerVM As ProdProjManagerVM
    'Private m_refOpenProjectFileDialogVM As OpenProjectFileDialogVM
    'Private m_refRawPartTabVM As RawPartTabVM
    'Private m_refNestingTabVM As NestingTabVM
@@ -276,6 +277,13 @@ Module Map
       End Get
    End Property
 
+   Public ReadOnly Property refProdProjManagerVM As ProdProjManagerVM
+      Get
+         Return m_refProdProjManagerVM
+      End Get
+   End Property
+
+
    'Public ReadOnly Property refOpenProjectFileDialogVM As OpenProjectFileDialogVM
    '   Get
    '      Return m_refOpenProjectFileDialogVM
@@ -513,6 +521,12 @@ Module Map
       Return Not IsNothing(m_refFeatureListManagerVM)
    End Function
 
+   Friend Function SetRefProdProjManagerVM(ProdProjManagerVM As ProdProjManagerVM) As Boolean
+      m_refProdProjManagerVM = ProdProjManagerVM
+      Return Not IsNothing(m_refProdProjManagerVM)
+   End Function
+
+
    'Friend Function SetRefOpenProjectFileDialogVM(OpenProjectFileDialogVM As OpenProjectFileDialogVM) As Boolean
    '   m_refOpenProjectFileDialogVM = OpenProjectFileDialogVM
    '   Return Not IsNothing(m_refOpenProjectFileDialogVM)
@@ -588,7 +602,7 @@ Module Map
              Not IsNothing(m_refAddSectionXMaterialWndVM) AndAlso Not IsNothing(m_refStatisticsTimePanelVM) AndAlso
              Not IsNothing(m_refOnlyProdManagerVM) AndAlso Not IsNothing(m_refBTLPartManagerVM) AndAlso
              Not IsNothing(m_refRawPartManagerVM) AndAlso Not IsNothing(m_refPartInRawPartManagerVM) AndAlso
-             Not IsNothing(m_refFeatureListManagerVM) AndAlso
+             Not IsNothing(m_refFeatureListManagerVM) AndAlso Not IsNothing(m_refProdProjManagerVM) AndAlso
              LibMap.EndInit()
    End Function