Merge remote-tracking branch 'origin/feature/NewGraphicsProgram' into feature/RipristinoSiemens

EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb

@@ -600,6 +600,7 @@ Public Class BTLFeatureVM
       Map.refProjectVM.SetRawPartManagerVisibility(False)
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.FEATUREMANAGERBTL)
       Map.refProjectVM.SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.STRATEGYMANAGERBTL)
+      Map.refFeatureManagerVM.SetEditIsEnabled()
       ' Disabilito LeftPanel
       Map.refProjectVM.SetLeftPanel_IsEnabled(False)
       Map.refProjectVM.SetLeftPanel_Opacity(0.2)

EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml

@@ -1,7 +1,7 @@
 <StackPanel x:Class="FreeContourManagerV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource BTLPartManager_StackPanel}">
+            Style="{StaticResource FreeContourManager_StackPanel}">
 
    <ComboBox ItemsSource="{Binding TypeList}"
              SelectedIndex="{Binding SelType, Delay=1}"

EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml

@@ -12,17 +12,7 @@
    </TabControl.ItemContainerStyle>
    <TabItem Header="RAWPARTMANAGER">
       <TabItem.Content>
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <OPTIMIZER:FreeContourManagerV DataContext="{StaticResource FreeContourManagerVM}"
-                                           Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
-
-            <OPTIMIZER:RawPartManagerWndV Grid.Column="1" 
-                                          Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
-         </Grid>
+         <OPTIMIZER:RawPartManagerWndV Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
       </TabItem.Content>
    </TabItem>
    <TabItem Header="FEATUREMANAGER">
@@ -43,6 +33,14 @@
                     Grid.ColumnSpan="3" 
                     Style="{StaticResource Optimizer_Border}"/>
 
+            <Border Grid.ColumnSpan="2" 
+                    Background="{StaticResource BeamWall_Glacier}" 
+                    Style="{StaticResource Project_Border}">
+               <TextBlock Grid.ColumnSpan="2" 
+                          Text="{Binding BTLStructureVM.SelBTLPart.sNAM}" 
+                          Style="{StaticResource RightPanel_TextBlock}"/>
+            </Border>
+            
             <OPTIMIZER:PartManagerV Grid.Row="1" 
                                     DataContext="{StaticResource PartManagerVM}"
                                     Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
@@ -77,13 +75,6 @@
                          Style="{StaticResource Project_CheckBox}"/>
             </Grid>
 
-            <Border Grid.ColumnSpan="2" 
-                    Background="{StaticResource BeamWall_Glacier}" 
-                    Style="{StaticResource Project_Border}">
-               <TextBlock Grid.ColumnSpan="2" 
-                          Text="{Binding BTLStructureVM.SelBTLPart.sNAM}" 
-                          Style="{StaticResource RightPanel_TextBlock}"/>
-            </Border>
 
             <Button Grid.Column="2" 
                     Command="{Binding Parameter_Command}"
@@ -113,7 +104,7 @@
                        Style="{StaticResource Back_Button}">
                   <Image Source="{StaticResource Delete_Image}"
                          Style="{StaticResource BTLDataWnd_Image}"/>
-               </Button>               
+               </Button>
             </UniformGrid>
          </Grid>
       </TabItem.Content>
@@ -130,15 +121,25 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
 
             <Border Grid.RowSpan="2"
                     Grid.ColumnSpan="2"
                     Style="{StaticResource Optimizer_Border}"/>
 
-            <OPTIMIZER:FeatureManagerV DataContext="{StaticResource FeatureManagerVM}"
+            <OPTIMIZER:FreeContourManagerV Grid.RowSpan="2"
+                                           DataContext="{StaticResource FreeContourManagerVM}"
+                                           Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
+
+            <OPTIMIZER:FeatureManagerV Grid.Column="1"
+                                       DataContext="{StaticResource FeatureManagerVM}"
                                        Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
 
             <OPTIMIZER:PParameterListV Grid.Row="1"
+                                       Grid.Column="1"
                                        DataContext="{StaticResource PParameterListVM}"
                                        Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"
                                        Margin="5"/>

EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb

@@ -695,6 +695,9 @@ Public Class ProdManagerVM
       ' Apro finestra parametri generali
       Dim GeneralParametersWndVM As New GeneralParametersWndVM(nType)
 
+      ' Controllo se la cartella AiSetUp è presente
+      GetFirstAiSetUp(nType)
+
       Dim sDefaultConfigFile As String = String.Empty
       If EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) = 0 Then
          SetFirstStrategy(GeneralParametersWndVM, sDefaultConfigFile)
@@ -1433,6 +1436,20 @@ Public Class ProdManagerVM
       NotifyPropertyChanged(NameOf(Map.refProjectVM.GeneralParametersList))
    End Sub
 
+   Private Sub GetFirstAiSetUp(nType As BWType)
+      Dim sAISetUpDir As String = String.Empty
+      If nType = BWType.BEAM Then
+         sAISetUpDir = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & CurrentMachine.sMachineName & "\" & BEAM_DIR & "\" & AISETUP_DIR
+      ElseIf nType = BWType.WALL Then
+         sAISetUpDir = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & CurrentMachine.sMachineName & "\" & WALL_DIR & "\" & AISETUP_DIR
+      End If
+      ' Controllo se la cartella AISetup è presente
+      If Not Directory.Exists(sAISetUpDir) Then
+         ' Se non esiste, la crea
+         Directory.CreateDirectory(sAISetUpDir)
+      End If
+   End Sub
+
    ''' <summary>
    ''' Funzione che scrive il file json di default se non è presente un file di configurazione
    ''' </summary>

EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml

@@ -1968,6 +1968,10 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
+   <Style x:Key="FreeContourManager_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource BTLPartManager_StackPanel}">
+      <Setter Property="Margin" Value="2,5,2,5"/>
+   </Style>
+
    <!--#endregion BTLPartManager-->
 
    <!--#region PartManager-->