Optimizer 2.7.11.14
-suddiviso project in pannelli
This commit is contained in:
Demetrio Cassarino
@@ -169,6 +169,21 @@
|
||||
<DependentUpon>NestingRunningWndV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
|
||||
<Compile Include="Panel\LeftPanelBottomV.xaml.vb">
|
||||
<DependentUpon>LeftPanelBottomV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Panel\LeftPanelTopV.xaml.vb">
|
||||
<DependentUpon>LeftPanelTopV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Panel\RightPanelBottomV.xaml.vb">
|
||||
<DependentUpon>RightPanelBottomV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Panel\RightPanelTopV.xaml.vb">
|
||||
<DependentUpon>RightPanelTopV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Panel\TopPanelV.xaml.vb">
|
||||
<DependentUpon>TopPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ProdManager\ProdManagerV.xaml.vb">
|
||||
<DependentUpon>ProdManagerV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -637,6 +652,26 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="Panel\LeftPanelBottomV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Panel\LeftPanelTopV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Panel\RightPanelBottomV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Panel\RightPanelTopV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Panel\TopPanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="ProdManager\ProdManagerV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
|
||||
@@ -275,7 +275,7 @@ Public Class MainWindowVM
|
||||
Case 2 ' apri pagina specifica senza progetto specifico
|
||||
' recupero secondo parametro
|
||||
Dim sPage As String = Environment.GetCommandLineArgs(2)
|
||||
If Not Integer.TryParse(sPage, nPage) OrElse (nPage <> Pages.VIEW AndAlso nPage <> Pages.MACHINING AndAlso Pages.OPTIMIZERPAGE) Then Return False
|
||||
If Not Integer.TryParse(sPage, nPage) OrElse (nPage <> Pages.OPTIMIZERPAGE) Then Return False
|
||||
Return True
|
||||
End Select
|
||||
Return False
|
||||
@@ -304,7 +304,7 @@ Public Class MainWindowVM
|
||||
Map.refInstrumentPanelVM.SetGetDistance_IsChecked(False)
|
||||
End If
|
||||
' se Reset Macchina è aperto
|
||||
If nSelTabPage = Pages.OPTIMIZERPAGE AndAlso Map.refCALCPanelVM.ChooseMachine_Visibility = Visibility.Visible Then
|
||||
If Map.refCALCPanelVM.ChooseMachine_Visibility = Visibility.Visible Then
|
||||
Map.refCALCPanelVM.CloseResetMachine()
|
||||
End If
|
||||
' pulisco output
|
||||
|
||||
@@ -67,5 +67,5 @@ Imports System.Windows
|
||||
' Revision
|
||||
'
|
||||
|
||||
<Assembly: AssemblyVersion("2.7.11.13")>
|
||||
<Assembly: AssemblyVersion("2.7.11.14")>
|
||||
<Assembly: AssemblyFileVersion("2.7.11.13")>
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
<Grid x:Class="LeftPanelBottomV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||
Style="{StaticResource Left_Grid}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border Grid.ColumnSpan="2"
|
||||
Style="{StaticResource Optimizer_Border}"/>
|
||||
|
||||
<WrapPanel Grid.Column="1"
|
||||
Width="{Binding ActualWidth}"
|
||||
Style="{StaticResource Bottom_WrapPanel}">
|
||||
<OPTIMIZER:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
|
||||
<OPTIMIZER:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
|
||||
<OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
|
||||
Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelBottomV}}}"/>
|
||||
<OPTIMIZER:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
|
||||
</WrapPanel>
|
||||
|
||||
<OPTIMIZER:SceneHostV Margin="4,4,0,4"/>
|
||||
</Grid>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class LeftPanelBottomV
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,19 @@
|
||||
<Grid x:Class="LeftPanelTopV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||
Style="{StaticResource Left_Grid}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<OPTIMIZER:LeftPanelV DataContext="{StaticResource LeftPanelVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
|
||||
Visibility="{Binding DataContext.LeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
|
||||
IsEnabled="{Binding DataContext.LeftPanel_IsEnabled, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
|
||||
Opacity="{Binding DataContext.LeftPanel_Opacity, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"/>
|
||||
|
||||
<OPTIMIZER:OptimizePanelV Grid.Column="1"
|
||||
DataContext="{StaticResource OptimizePanelVM}"
|
||||
Visibility="{Binding DataContext.OptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"/>
|
||||
</Grid>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class LeftPanelTopV
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,51 @@
|
||||
<Grid x:Class="RightPanelBottomV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TabControl Grid.RowSpan="2"
|
||||
SelectedIndex="{Binding SelFeatureManagerTab}"
|
||||
Style="{StaticResource Feature_TabControl}">
|
||||
<TabControl.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type TabItem}">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
</Style>
|
||||
</TabControl.ItemContainerStyle>
|
||||
<TabItem Header="FEATURERAWPARTMANAGER"
|
||||
Visibility="{Binding DataContext.RawPartManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
|
||||
Style="{StaticResource Feature_TabItem}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Grid.ColumnSpan="3"
|
||||
Style="{StaticResource Optimizer_Border}"
|
||||
Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"/>
|
||||
<OPTIMIZER:FeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}" Margin="5"
|
||||
Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
|
||||
Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"/>
|
||||
<StackPanel Grid.Column="1"
|
||||
Style="{StaticResource Message_StackPanel}">
|
||||
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
|
||||
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
|
||||
Style="{StaticResource Message_TextBlock}"/>
|
||||
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
|
||||
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
|
||||
Style="{StaticResource Message_TextBlock}"/>
|
||||
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
|
||||
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}"
|
||||
Style="{StaticResource Message_TextBlock}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="STRATEGYMANAGERBTL" Visibility="{Binding DataContext.StrategyManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelBottomV}}}">
|
||||
<TabItem.Content>
|
||||
<OPTIMIZER:ForcedStrategyBTLV DataContext="{StaticResource ForcedStrategyPanelVM}"/>
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
|
||||
</Grid>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class RightPanelBottomV
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,144 @@
|
||||
<TabControl x:Class="RightPanelTopV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||
SelectedIndex="{Binding SelManagerTab}"
|
||||
Visibility="{Binding DataContext.ManagerTabVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Style="{StaticResource Project_TabControl}">
|
||||
<TabControl.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type TabItem}">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
</Style>
|
||||
</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>
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
<TabItem Header="FEATUREMANAGER">
|
||||
<TabItem.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="0.9*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border Grid.RowSpan="3"
|
||||
Grid.ColumnSpan="3"
|
||||
Style="{StaticResource Optimizer_Border}"/>
|
||||
|
||||
<OPTIMIZER:PartManagerV Grid.Row="1"
|
||||
DataContext="{StaticResource PartManagerVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
|
||||
|
||||
<Grid Grid.Row="2"
|
||||
Style="{StaticResource ProjectParamters_Grid}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ComboBox Grid.ColumnSpan="2"
|
||||
ItemsSource="{Binding StrategySetupList}"
|
||||
SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource StrategySetup_ComboBox}"/>
|
||||
<OPTIMIZER:ProjectParametersV Grid.Row="1"
|
||||
Tag="{Binding GeneralParametersList}"
|
||||
IsEnabled="{Binding GeneralParametersIsEnable}"/>
|
||||
<UniformGrid Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Rows="2"
|
||||
Style="{StaticResource BTLDataWnd_UniformGrid}">
|
||||
<CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource Project_CheckBox}"/>
|
||||
<Button Command="{Binding Ok_Command}"
|
||||
ToolTip="{Binding SaveAsToolTip}"
|
||||
Style="{StaticResource SaveAs_Button}">
|
||||
<Image Source="/Resources/NewPage/Ok.png"
|
||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||
</Button>
|
||||
</UniformGrid>
|
||||
</Grid>
|
||||
|
||||
<Border Grid.ColumnSpan="2"
|
||||
Background="{StaticResource BeamWall_Glacier}"
|
||||
Style="{StaticResource Project_Border}">
|
||||
<TextBlock Grid.ColumnSpan="2"
|
||||
Text="{Binding BTLStructureVM.SelBTLPart.sNAM}"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{StaticResource BeamWall_White}"
|
||||
Style="{StaticResource Macro_TextBlock}"/>
|
||||
</Border>
|
||||
|
||||
<Button Grid.Column="2"
|
||||
Command="{Binding Parameter_Command}"
|
||||
ToolTip="{Binding Parameters_ToolTip}"
|
||||
Style="{StaticResource Parameter_Button}">
|
||||
<Image Source="/Resources/InstrumentPanel/Analyze.png"
|
||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||
</Button>
|
||||
|
||||
<Image Grid.RowSpan="3"
|
||||
Grid.Column="1"
|
||||
Source="/Resources/NewPage/pezzo.png"
|
||||
Style="{StaticResource Piece_Image}"/>
|
||||
|
||||
<Button Grid.Row="2"
|
||||
Grid.Column="3"
|
||||
Command="{Binding Back_Command}"
|
||||
ToolTip="{Binding Back_Msg}"
|
||||
Style="{StaticResource Back_Button}">
|
||||
<Image Source="/Resources/NewPage/MoveLeft.png"
|
||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
<TabItem Header="STRATEGYMANAGER">
|
||||
<TabItem.Content>
|
||||
<OPTIMIZER:ForcedStrategyPanelV DataContext="{StaticResource ForcedStrategyPanelVM}"/>
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
<TabItem Header="FEATUREMANAGERBTL" Visibility="{Binding DataContext.StrategyManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}">
|
||||
<TabItem.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Border Grid.RowSpan="2"
|
||||
Grid.ColumnSpan="2"
|
||||
Style="{StaticResource Optimizer_Border}"/>
|
||||
|
||||
<OPTIMIZER:FeatureManagerV DataContext="{StaticResource FeatureManagerVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"/>
|
||||
|
||||
<OPTIMIZER:PParameterListV Grid.Row="1"
|
||||
DataContext="{StaticResource PParameterListVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RightPanelTopV}}}"
|
||||
Margin="5"/>
|
||||
</Grid>
|
||||
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class RightPanelTopV
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,35 @@
|
||||
<Grid x:Class="TopPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||
Style="{StaticResource Project_Grid}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"
|
||||
Visibility="{Binding DataContext.ProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:TopPanelV}}}"/>
|
||||
|
||||
<OPTIMIZER:CalcPanelV Grid.Column="1"
|
||||
DataContext="{DynamicResource CALCPanelVM}"/>
|
||||
|
||||
<OPTIMIZER:SpecialPanelV Grid.Column="2"
|
||||
DataContext="{DynamicResource SpecialPanelVM}"
|
||||
Visibility="{Binding DataContext.SpecialPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:TopPanelV}}}"/>
|
||||
|
||||
<OPTIMIZER:StatisticsTimePanelV Grid.Column="3"
|
||||
HorizontalAlignment="Center"
|
||||
DataContext="{StaticResource StatisticsTimePanelVM}"
|
||||
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:TopPanelV}}}"/>
|
||||
|
||||
<Button Grid.Column="4"
|
||||
Command="{Binding Optimizer_Command}"
|
||||
ToolTip="{Binding Statistics_Msg}"
|
||||
Style="{StaticResource Optmizer_Button}">
|
||||
<Image Source="/Resources/InstrumentPanel/Statistics.png"
|
||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class TopPanelV
|
||||
|
||||
End Class
|
||||
@@ -15,203 +15,18 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding GridDims[2].GridLen, Mode=TwoWay}"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid Grid.ColumnSpan="3"
|
||||
Style="{StaticResource Project_Grid}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"
|
||||
Visibility="{Binding DataContext.ProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
|
||||
<OPTIMIZER:TopPanelV Grid.ColumnSpan="3" DataContext="{StaticResource ProjectVM}"/>
|
||||
|
||||
<OPTIMIZER:CalcPanelV Grid.Column="1"
|
||||
DataContext="{DynamicResource CALCPanelVM}"/>
|
||||
|
||||
<OPTIMIZER:SpecialPanelV Grid.Column="2"
|
||||
DataContext="{DynamicResource SpecialPanelVM}"
|
||||
Visibility="{Binding DataContext.SpecialPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
|
||||
<OPTIMIZER:StatisticsTimePanelV Grid.Column="3"
|
||||
HorizontalAlignment="Center"
|
||||
DataContext="{StaticResource StatisticsTimePanelVM}"
|
||||
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
|
||||
<Button Grid.Column="4"
|
||||
Command="{Binding Optimizer_Command}"
|
||||
ToolTip="{Binding Statistics_Msg}"
|
||||
Style="{StaticResource Optmizer_Button}">
|
||||
<Image Source="/Resources/InstrumentPanel/Statistics.png"
|
||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Row="1"
|
||||
Style="{StaticResource Left_Grid}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<OPTIMIZER:LeftPanelV DataContext="{StaticResource LeftPanelVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Visibility="{Binding DataContext.LeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
IsEnabled="{Binding DataContext.LeftPanel_IsEnabled, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Opacity="{Binding DataContext.LeftPanel_Opacity, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
|
||||
<OPTIMIZER:OptimizePanelV Grid.Column="1"
|
||||
DataContext="{StaticResource OptimizePanelVM}"
|
||||
Visibility="{Binding DataContext.OptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
</Grid>
|
||||
<OPTIMIZER:LeftPanelTopV Grid.Row="1" DataContext="{StaticResource ProjectVM}"/>
|
||||
|
||||
<GridSplitter Grid.Column="1"
|
||||
Grid.RowSpan="4"
|
||||
Style="{StaticResource Width_GridSplitter}"/>
|
||||
|
||||
<TabControl Grid.Row="1"
|
||||
Grid.Column="2"
|
||||
SelectedIndex="{Binding SelManagerTab}"
|
||||
Visibility="{Binding DataContext.ManagerTabVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Style="{StaticResource Project_TabControl}">
|
||||
<TabControl.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type TabItem}">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
</Style>
|
||||
</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:ProjectV}}}"/>
|
||||
|
||||
<OPTIMIZER:RawPartManagerWndV Grid.Column="1"
|
||||
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
</Grid>
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
<TabItem Header="FEATUREMANAGER">
|
||||
<TabItem.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="0.5*"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="0.9*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border Grid.RowSpan="3"
|
||||
Grid.ColumnSpan="3"
|
||||
Style="{StaticResource Optimizer_Border}"/>
|
||||
|
||||
<OPTIMIZER:PartManagerV Grid.Row="1"
|
||||
DataContext="{StaticResource PartManagerVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
|
||||
<Grid Grid.Row="2"
|
||||
Style="{StaticResource ProjectParamters_Grid}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ComboBox Grid.ColumnSpan="2"
|
||||
ItemsSource="{Binding StrategySetupList}"
|
||||
SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource StrategySetup_ComboBox}"/>
|
||||
<OPTIMIZER:ProjectParametersV Grid.Row="1"
|
||||
Tag="{Binding GeneralParametersList}"
|
||||
IsEnabled="{Binding GeneralParametersIsEnable}"/>
|
||||
<UniformGrid Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Rows="2"
|
||||
Style="{StaticResource BTLDataWnd_UniformGrid}">
|
||||
<CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource Project_CheckBox}"/>
|
||||
<Button Command="{Binding Ok_Command}"
|
||||
ToolTip="{Binding SaveAsToolTip}"
|
||||
Style="{StaticResource SaveAs_Button}">
|
||||
<Image Source="/Resources/NewPage/Ok.png"
|
||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||
</Button>
|
||||
</UniformGrid>
|
||||
</Grid>
|
||||
|
||||
<Border Grid.ColumnSpan="2"
|
||||
Background="{StaticResource BeamWall_Glacier}"
|
||||
Style="{StaticResource Project_Border}">
|
||||
<TextBlock Grid.ColumnSpan="2"
|
||||
Text="{Binding BTLStructureVM.SelBTLPart.sNAM}"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{StaticResource BeamWall_White}"
|
||||
Style="{StaticResource Macro_TextBlock}"/>
|
||||
</Border>
|
||||
|
||||
<Button Grid.Column="2"
|
||||
Command="{Binding Parameter_Command}"
|
||||
ToolTip="{Binding Parameters_ToolTip}"
|
||||
Style="{StaticResource Parameter_Button}">
|
||||
<Image Source="/Resources/InstrumentPanel/Analyze.png"
|
||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||
</Button>
|
||||
|
||||
<Image Grid.RowSpan="3"
|
||||
Grid.Column="1"
|
||||
Source="/Resources/NewPage/pezzo.png"
|
||||
Style="{StaticResource Piece_Image}"/>
|
||||
|
||||
<Button Grid.Row="2"
|
||||
Grid.Column="3"
|
||||
Command="{Binding Back_Command}"
|
||||
ToolTip="{Binding Back_Msg}"
|
||||
Style="{StaticResource Back_Button}">
|
||||
<Image Source="/Resources/NewPage/MoveLeft.png"
|
||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
<TabItem Header="STRATEGYMANAGER">
|
||||
<TabItem.Content>
|
||||
<OPTIMIZER:ForcedStrategyPanelV DataContext="{StaticResource ForcedStrategyPanelVM}"/>
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
<TabItem Header="FEATUREMANAGERBTL" Visibility="{Binding DataContext.StrategyManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}">
|
||||
<TabItem.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="1*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Border Grid.RowSpan="2"
|
||||
Grid.ColumnSpan="2"
|
||||
Style="{StaticResource Optimizer_Border}"/>
|
||||
|
||||
<OPTIMIZER:FeatureManagerV DataContext="{StaticResource FeatureManagerVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
|
||||
<OPTIMIZER:PParameterListV Grid.Row="1"
|
||||
DataContext="{StaticResource PParameterListVM}"
|
||||
Tag="{Binding DataContext.BTLStructureVM.SelBTLPart.SelBTLFeatureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Margin="5"/>
|
||||
</Grid>
|
||||
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
|
||||
<OPTIMIZER:RightPanelTopV Grid.Row="1"
|
||||
Grid.Column="2" DataContext="{StaticResource ProjectVM}"/>
|
||||
|
||||
<OPTIMIZER:SceneBuildingV Grid.Row="1"
|
||||
Grid.Column="2"
|
||||
Grid.RowSpan="4"
|
||||
@@ -223,77 +38,11 @@
|
||||
Grid.ColumnSpan="3"
|
||||
Style="{StaticResource HeightBottom_GridSplitter}"/>
|
||||
|
||||
<Grid Grid.Row="3"
|
||||
Grid.Column="2">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TabControl Grid.RowSpan="2"
|
||||
SelectedIndex="{Binding SelFeatureManagerTab}"
|
||||
Style="{StaticResource Feature_TabControl}">
|
||||
<TabControl.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type TabItem}">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
</Style>
|
||||
</TabControl.ItemContainerStyle>
|
||||
<TabItem Header="FEATURERAWPARTMANAGER"
|
||||
Visibility="{Binding DataContext.RawPartManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Style="{StaticResource Feature_TabItem}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Grid.ColumnSpan="3"
|
||||
Style="{StaticResource Optimizer_Border}"
|
||||
Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
<OPTIMIZER:FeatureInPartInRawPartListV DataContext="{StaticResource FeatureInPartInRawPartListVM}" Margin="5"
|
||||
Tag="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Visibility="{Binding DataContext.FeatureList_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
<StackPanel Grid.Column="1"
|
||||
Style="{StaticResource Message_StackPanel}">
|
||||
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Style="{StaticResource Message_TextBlock}"/>
|
||||
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Style="{StaticResource Message_TextBlock}"/>
|
||||
<TextBlock Text="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Foreground="{Binding DataContext.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.Calc_Background, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"
|
||||
Style="{StaticResource Message_TextBlock}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="STRATEGYMANAGERBTL" Visibility="{Binding DataContext.StrategyManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}">
|
||||
<TabItem.Content>
|
||||
<OPTIMIZER:ForcedStrategyBTLV DataContext="{StaticResource ForcedStrategyPanelVM}"/>
|
||||
</TabItem.Content>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</Grid>
|
||||
<OPTIMIZER:RightPanelBottomV Grid.Row="3"
|
||||
Grid.Column="2"
|
||||
DataContext="{StaticResource ProjectVM}"/>
|
||||
|
||||
<Grid Grid.Row="3"
|
||||
Style="{StaticResource Left_Grid}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border Grid.ColumnSpan="2"
|
||||
Style="{StaticResource Optimizer_Border}"/>
|
||||
|
||||
<WrapPanel Grid.Column="1"
|
||||
Width="{Binding ActualWidth, ElementName=TOPTRAY}"
|
||||
Style="{StaticResource Bottom_WrapPanel}">
|
||||
<OPTIMIZER:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
|
||||
<OPTIMIZER:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
|
||||
<OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
|
||||
Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
<OPTIMIZER:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
|
||||
</WrapPanel>
|
||||
|
||||
<OPTIMIZER:SceneHostV Margin="4,4,0,4"/>
|
||||
</Grid>
|
||||
<OPTIMIZER:LeftPanelBottomV Grid.Row="3" DataContext="{StaticResource ProjectVM}"/>
|
||||
|
||||
</Grid>
|
||||
|
||||
|
||||
@@ -97,8 +97,6 @@ Public Class ProjectVM
|
||||
NotifyPropertyChanged(NameOf(FreeContourManager_Visibility))
|
||||
End Sub
|
||||
|
||||
' OnlyProdProject
|
||||
|
||||
Private m_ProdManager_Visibility As Boolean = True
|
||||
Public Property ProdManager_Visibility As Visibility
|
||||
Get
|
||||
|
||||
Reference in New Issue
Block a user