-aggiunto messaggi di errore per feature

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -179,7 +179,7 @@ Public Module CalcIntegration
                   ' se terminato con successo
                   If vProc(j).Proc.ExitCode = 0 Then
                      ' salvo il risultato
-                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(nCurrBar).nCmdType = CmdTypes.CHECKNOSIM Then
+                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKNOSIM Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
                      ElseIf vBar(vProc(j).nBar).nCmdType = CmdTypes.GENERATE Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
@@ -201,7 +201,7 @@ Public Module CalcIntegration
                      ' altrimenti (errore generico di esecuzione)
                   Else
                      ' salvo il risultato
-                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(nCurrBar).nCmdType = CmdTypes.CHECKNOSIM Then
+                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKNOSIM Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
                      ElseIf vBar(vProc(j).nBar).nCmdType = CmdTypes.GENERATE Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))

EgtBEAMWALL.Optimizer/FeatureListManager/OnlyProdFeatureListManagerV.xaml

@@ -2,6 +2,7 @@
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             DataContext="{StaticResource FeatureListManagerVM}"
+            HorizontalAlignment="Left"
             Style="{StaticResource OnlyProdFeatureListManager_StackPanel}">
    
    <Button Command="{Binding CopyFeature_Command}"

EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml

@@ -19,11 +19,11 @@
                   <StackPanel Orientation="Horizontal">
                      <RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                   GroupName="ForcedStrategy"/>
-                     <Image Source="{Binding sImageStrategy}"
+                     <Image Source="{Binding sStrategyImagePath}"
                             Stretch="Uniform"
                             Width="100"
                             Height="100"/>
-                     <TextBlock Text="{Binding sStrategyID}"
+                     <TextBlock Text="{Binding sStrategyName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
                </DataTemplate>

EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLVM.vb

@@ -127,7 +127,7 @@ Public Class ForcedStrategyBTLVM
 
       End If
       ' aggiungo strategia automatica
-      m_StrategyList.Insert(0, New Strategy() With {.sStrategyID = AUTOMATICSTRATEGYID})
+      m_StrategyList.Insert(0, New Strategy() With {.sStrategyID = AUTOMATICSTRATEGYID, .sStrategyName = AUTOMATICSTRATEGYID})
       NotifyPropertyChanged(NameOf(StrategyList))
       Return True
    End Function

EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml

@@ -25,11 +25,11 @@
                   <StackPanel Orientation="Horizontal">
                      <RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                   GroupName="ForcedStrategy"/>
-                     <Image Source="{Binding sImageStrategy}"
+                     <Image Source="{Binding sStrategyImagePath}"
                          Stretch="Uniform"
                          Width="100"
                          Height="100"/>
-                     <TextBlock Text="{Binding sStrategyID}"
+                     <TextBlock Text="{Binding sStrategyName}"
                              Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
                </DataTemplate>

EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb

@@ -127,7 +127,7 @@ Public Class ForcedStrategyPanelVM
 
       End If
       ' aggiungo strategia automatica
-      m_StrategyList.Insert(0, New Strategy() With {.sStrategyID = AUTOMATICSTRATEGYID})
+      m_StrategyList.Insert(0, New Strategy() With {.sStrategyID = AUTOMATICSTRATEGYID, .sStrategyName = AUTOMATICSTRATEGYID})
       NotifyPropertyChanged(NameOf(StrategyList))
       Return True
    End Function

EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml

@@ -51,10 +51,10 @@
                   <Setter Property="Template">
                      <Setter.Value>
                         <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
+                           <Expander IsExpanded="True" >
                               <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}"
+                                 <StackPanel Orientation="Horizontal" >
+                                    <TextBlock Text="{Binding Path=Name}" 
                                                Margin="0,0,5,0" FontSize="14"/>
                                     <TextBlock Text="{Binding Path=Name, Converter={StaticResource ProjIdToBtlFileName}}"
                                                Margin="0,0,5,0" FontSize="14"/>
@@ -65,7 +65,6 @@
                                             Style="{StaticResource OnlyProdLeftPanel_Button}">
                                        <Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
                                     </Button>
-
                                     <Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             Height="20" Width="20" Margin="5,0,0,0" 

EgtBEAMWALL.Optimizer/OnlyProdProject/OnlyProdProjectV.xaml

@@ -131,10 +131,27 @@
                   
                   <EgtBEAMWALL:OnlyProdFeatureListManagerV Grid.Row="1" Grid.ColumnSpan="2"/>
 
-                  <EgtBEAMWALL:OnlyProdFeatureListV Grid.Row="2" Grid.ColumnSpan="2"
-                                                    DataContext="{StaticResource FeatureListVM}"
-                                                    Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                                    Margin="2,0,2,0"/>
+                  <Grid Grid.Row="2" Grid.ColumnSpan="2">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <EgtBEAMWALL:OnlyProdFeatureListV DataContext="{StaticResource FeatureListVM}"
+                                                       Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
+                                                       Margin="2,0,2,0"/>
+                     <StackPanel Orientation="Vertical"
+                                 Grid.Column="1"
+                                 Width="250">
+                        <TextBlock Text="{Binding DataContext.BTLStructureVM.SelBTLPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
+                                   Foreground="{Binding DataContext.BTLStructureVM.SelBTLPart.CALC_ERR_Foreground, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"   
+                                   Margin="5,0,5,0"
+                                   Visibility="{Binding DataContext.BTLStructureVM.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
+                        <TextBlock Text="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
+                                   Foreground="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"   
+                                   Margin="5,0,5,0"/>
+
+                     </StackPanel>
+                  </Grid>
                </Grid>
 
             </TabItem.Content>
@@ -164,7 +181,6 @@
             Grid.Column="2">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TabControl BorderThickness="0"
                      Margin="0,-3.8,0,-2"
@@ -177,9 +193,29 @@
                </Style>
             </TabControl.ItemContainerStyle>-->
             <TabItem Header="FEATURERAWPARTMANAGER" Visibility="{Binding DataContext.RawPartManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}">
-               <EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}"
-                                                                Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                                                Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}"
+                                                                   Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
+                                                                   Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
+                  <StackPanel Orientation="Vertical"
+                              Grid.Column="1"
+                              Width="250" >
+                     <TextBlock 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 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 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}}}"/>
+
+                  </StackPanel>
+               </Grid>
             </TabItem>
             <TabItem Header="FEATUREMANAGERBTL" Visibility="{Binding DataContext.StrategyManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}">
                <TabItem.Content>
@@ -208,7 +244,6 @@
                </TabItem.Content>
             </TabItem>
          </TabControl>
-         <TextBlock Grid.Column="1" Width="200" Text="LOG FILE"/>
       </Grid>
 
       <Grid Grid.Row="3">