Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-inizio nuova grafica

Browse Source
This commit is contained in:
Demetrio Cassarino
2025-04-03 11:51:44 +02:00
parent 5abbb927a7
commit 43268045a1
5 changed files with 122 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.ViewerOptimizer/MainMenu/OnlyProdMainMenuV.xaml
+30 -14
View File
@@ -1,28 +1,44 @@
<StackPanel x:Class="OnlyProdMainMenuV" <StackPanel x:Class="OnlyProdMainMenuV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
Orientation="Horizontal" Orientation="Horizontal"
IsEnabled="{Binding MainMenu_IsEnabled}" IsEnabled="{Binding MainMenu_IsEnabled}"
DataContext="{StaticResource MainMenuVM}"> DataContext="{StaticResource MainMenuVM}">
<!--Barra superiore dei comandi--> <!--Barra superiore dei comandi-->
<UniformGrid Rows="1"> <Grid>
<RadioButton Content="{Binding OnlyProdPage_Msg}" <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<EgtBEAMWALL:OnlyProdManagerV DataContext="{StaticResource OnlyProdManagerVM}"
Visibility="{Binding DataContext.OnlyProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdMainMenuV}}}"/>
<!--<RadioButton Content="{Binding OnlyProdPage_Msg}"
IsChecked="{Binding OnlyProdPage_IsChecked}" IsChecked="{Binding OnlyProdPage_IsChecked}"
Visibility="{Binding OnlyProdPage_Visibility}" Visibility="{Binding OnlyProdPage_Visibility}"
Style="{StaticResource OnlyProdMainMenu_ToggleButton}" Style="{StaticResource OnlyProdMainMenu_ToggleButton}"
Width="120"/> Width="120"/>-->
<Button Content="{Binding Supervisor_Msg}" <Button Grid.Column="3"
Content="{Binding Supervisor_Msg}"
Command="{Binding Supervisor_Command}" Command="{Binding Supervisor_Command}"
Visibility="{Binding Supervisor_Visibility}" Visibility="{Binding Supervisor_Visibility}"
Style="{StaticResource OnlyProdMainMenu_Button}" Style="{StaticResource OnlyProdMainMenu_Button}"/>
Margin="-42.5,0,0,0"/>
<RadioButton Content="{Binding Configuration_Msg}" <EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2"
DataContext="{StaticResource StatisticsTimePanelVM}"
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdMainMenuV}}}"/>
<RadioButton Grid.Column="1"
Content="{Binding Configuration_Msg}"
IsChecked="{Binding Config_IsChecked}" IsChecked="{Binding Config_IsChecked}"
Style="{StaticResource OnlyProdMainMenu_ToggleButton}" Style="{StaticResource OnlyProdMainMenu_ToggleButton}"
Margin="-89.5,0,0,0"
Width="120"/> Width="120"/>
<Button Command="{Binding SendFeedbackCommand}"
<!--<Button Command="{Binding SendFeedbackCommand}"
ToolTip="{Binding SendFeedbackToolTip}" ToolTip="{Binding SendFeedbackToolTip}"
Style="{StaticResource OnlyProdMainMenu_Button}" Style="{StaticResource OnlyProdMainMenu_Button}"
IsEnabled="{Binding SendFeedbackIsEnabled}" IsEnabled="{Binding SendFeedbackIsEnabled}"
@@ -30,13 +46,13 @@
Width="40" Width="40"
Margin="-46.5,0,0,0"> Margin="-46.5,0,0,0">
<Image Source="/Resources/MainMenu/Send.png" Stretch="Uniform"/> <Image Source="/Resources/MainMenu/Send.png" Stretch="Uniform"/>
</Button> </Button>-->
<StackPanel Orientation="Horizontal" Margin="-130,0,0,0"> <!--<StackPanel Orientation="Horizontal" Margin="-130,0,0,0">
<TextBlock Text="{Binding NVersion_Msg}" <TextBlock Text="{Binding NVersion_Msg}"
Style="{StaticResource OptionTextBlockVersion_OnlyProd}"/> Style="{StaticResource OptionTextBlockVersion_OnlyProd}"/>
<TextBlock Text="{Binding NumVersion}" <TextBlock Text="{Binding NumVersion}"
Style="{StaticResource OptionTextBlockVersion_OnlyProd}" Style="{StaticResource OptionTextBlockVersion_OnlyProd}"
Margin="5,0,0,0"/> Margin="5,0,0,0"/>
</StackPanel> </StackPanel>-->
</UniformGrid> </Grid>
</StackPanel> </StackPanel>
EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerV.xaml
+2 -2
View File
@@ -36,7 +36,7 @@
Style="{StaticResource ToolBarOnlyProdManager_Button}"> Style="{StaticResource ToolBarOnlyProdManager_Button}">
<Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/> <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
</Button> </Button>
<Button Command="{Binding AddProj_Command}" <!--<Button Command="{Binding AddProj_Command}"
ToolTip="{Binding AddProj_ToolTip}" ToolTip="{Binding AddProj_ToolTip}"
Visibility="{Binding AddProj_Visibility}" Visibility="{Binding AddProj_Visibility}"
Style="{StaticResource ToolBarOnlyProdManager_Button}"> Style="{StaticResource ToolBarOnlyProdManager_Button}">
@@ -68,5 +68,5 @@
Visibility="{Binding GoToSupervisor_Visibility}" Visibility="{Binding GoToSupervisor_Visibility}"
Style="{StaticResource ToolBarOnlyProdManagerGoToSupervisor_Button}"> Style="{StaticResource ToolBarOnlyProdManagerGoToSupervisor_Button}">
<Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/> <Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/>
</Button> </Button>-->
</EgtFloating:EgtFloatingPanel> </EgtFloating:EgtFloatingPanel>
EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
+86 -21
View File
@@ -12,17 +12,17 @@
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<EgtBEAMWALL:OnlyProdManagerV DataContext="{StaticResource OnlyProdManagerVM}" HorizontalAlignment="Center" <!--<EgtBEAMWALL:OnlyProdManagerV DataContext="{StaticResource OnlyProdManagerVM}" HorizontalAlignment="Center"
Visibility="{Binding DataContext.OnlyProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}" Visibility="{Binding DataContext.OnlyProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="0,10,0,10" /> Margin="0,10,0,10" />-->
<EgtBEAMWALL:OnlyProdOptimizePanelV Grid.Column="1" <EgtBEAMWALL:OnlyProdOptimizePanelV Grid.Column="1"
DataContext="{StaticResource OptimizePanelVM}" DataContext="{StaticResource OptimizePanelVM}"
Visibility="{Binding DataContext.OnlyProdOptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}" Visibility="{Binding DataContext.OnlyProdOptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="40,10,0,10"/> Margin="40,10,0,10"/>
<EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2" <!--<EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2"
DataContext="{StaticResource StatisticsTimePanelVM}" DataContext="{StaticResource StatisticsTimePanelVM}"
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}" Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Margin="150,10,0,10"/> Margin="150,10,0,10"/>-->
</Grid> </Grid>
</EgtFloating:EgtFloatingTray> </EgtFloating:EgtFloatingTray>
@@ -32,21 +32,42 @@
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="{Binding GridDims[1].GridLen, Mode=TwoWay}"/> <RowDefinition Height="{Binding GridDims[1].GridLen, Mode=TwoWay}"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding GridDims[2].GridLen, Mode=TwoWay}"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="{Binding GridDims[3].GridLen, Mode=TwoWay}"/>
</Grid.ColumnDefinitions>
<!--<Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding GridDims[2].GridLen, Mode=TwoWay}"/> <ColumnDefinition Width="{Binding GridDims[2].GridLen, Mode=TwoWay}"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="{Binding GridDims[3].GridLen, Mode=TwoWay}"/> <ColumnDefinition Width="{Binding GridDims[3].GridLen, Mode=TwoWay}"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>-->
<EgtBEAMWALL:OnlyProdLeftPanelV DataContext="{StaticResource LeftPanelVM}" <EgtBEAMWALL:OnlyProdLeftPanelV DataContext="{StaticResource LeftPanelVM}"
Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}" Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
Visibility="{Binding DataContext.OnlyProdLeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/> Visibility="{Binding DataContext.OnlyProdLeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<GridSplitter Grid.Column="1" <GridSplitter Grid.Column="1"
Style="{StaticResource Width_GridSplitter}" Grid.RowSpan="4"
Background="Transparent"/> Style="{StaticResource Width_GridSplitter}"/>
<Grid Grid.Column="2"> <WrapPanel Grid.Column="2"
Width="{Binding ActualWidth, ElementName=TOPTRAY}"
Style="{StaticResource OnlyProdProject_WrapPanel}">
<EgtBEAMWALL:OnlyProdInstrumentPanelV TitleBarOrientation="Vertical"
DataContext="{StaticResource InstrumentPanelVM}"/>
<EgtBEAMWALL:OnlyProdCalcPanelV TitleBarOrientation="Vertical"
DataContext="{StaticResource CALCPanelVM}"/>
<EgtBEAMWALL:OnlyProdSpecialPanelV TitleBarOrientation="Vertical"
DataContext="{StaticResource SpecialPanelVM}"
Visibility="{Binding DataContext.SpecialPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<EgtBEAMWALL:OnlyProdFreeContourManagerV TitleBarOrientation="Vertical"
DataContext="{StaticResource FreeContourManagerVM}"
Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
</WrapPanel>
<!--<Grid Grid.Column="2">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
@@ -71,25 +92,68 @@
<EgtBEAMWALL:SceneHostV Grid.Row="1"/> <EgtBEAMWALL:SceneHostV Grid.Row="1"/>
</Grid> </Grid>-->
</Grid> <!--</Grid>-->
<GridSplitter Grid.Row="1" <GridSplitter Grid.Row="1"
Grid.ColumnSpan="3"
Style="{StaticResource Height_GridSplitter}"/> Style="{StaticResource Height_GridSplitter}"/>
<EgtBEAMWALL:ProdProjManagerV Grid.Row="2" Visibility="Collapsed" Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<Grid Grid.Row="2"> <Grid Grid.Row="2">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<WrapPanel Grid.Column="1"
Width="{Binding ActualWidth, ElementName=TOPTRAY}"
Style="{StaticResource OnlyProdProject_WrapPanel}">
<EgtBEAMWALL:OnlyProdShowPanelV TitleBarOrientation="Vertical" DataContext="{StaticResource ShowPanelVM}"/>
<EgtBEAMWALL:OnlyProdShowBeamPanelV TitleBarOrientation="Vertical" DataContext="{StaticResource ShowBeamPanelVM}"
Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<EgtBEAMWALL:OnlyProdViewPanelV TitleBarOrientation="Vertical" DataContext="{StaticResource ViewPanelVM}"/>
</WrapPanel>
<EgtBEAMWALL:SceneHostV/>
</Grid>
<Grid Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2">
<Grid.RowDefinitions>
<RowDefinition Height="{Binding GridDims[4].GridLen, Mode=TwoWay}"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="{Binding GridDims[5].GridLen, Mode=TwoWay}"/>
</Grid.RowDefinitions>
<EgtBEAMWALL:RawPartManagerWndV Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
<GridSplitter Grid.Row="1"
Grid.ColumnSpan="2"
Style="{StaticResource Height_GridSplitter}"/>
<EgtBEAMWALL:PartInRawPartManagerWndV Grid.Row="2"
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
</Grid>
<!--<Grid Grid.Row="2">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding GridDims[4].GridLen, Mode=TwoWay}"/> <ColumnDefinition Width="{Binding GridDims[4].GridLen, Mode=TwoWay}"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="{Binding GridDims[5].GridLen, Mode=TwoWay}"/> <ColumnDefinition Width="{Binding GridDims[5].GridLen, Mode=TwoWay}"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<EgtBEAMWALL:ProdProjManagerV Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/> -->
<!--<EgtBEAMWALL:ProdProjManagerV Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>-->
<GridSplitter Grid.Column="1" <!--<GridSplitter Grid.Column="1" Background="Red"
Style="{StaticResource Width_GridSplitter}"/> Style="{StaticResource Width_GridSplitter}"/>-->
<Grid Grid.Column="2"> <!--<Grid Grid.Column="2">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="{Binding GridDims[6].GridLen, Mode=TwoWay}"/> <RowDefinition Height="{Binding GridDims[6].GridLen, Mode=TwoWay}"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
@@ -105,8 +169,9 @@
<EgtBEAMWALL:PartInRawPartManagerWndV Grid.Row="2" <EgtBEAMWALL:PartInRawPartManagerWndV Grid.Row="2"
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/> Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
</Grid> </Grid>-->
</Grid> <!--
</Grid>-->
</Grid> </Grid>
</EgtFloating:EgtFloatingManager> </EgtFloating:EgtFloatingManager>
EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/OnlyProdShowBeamPanelV.xaml
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5" xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False" IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" IsRightDockable="False"
Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}"> Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProd}">
<Button Command="{Binding ShowAll_Command}" <Button Command="{Binding ShowAll_Command}"
EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+3 -6
View File
@@ -2521,7 +2521,7 @@
<Style x:Key="ToolBarOnlyProdManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}"> <Style x:Key="ToolBarOnlyProdManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
<Setter Property="Height" Value="30"/> <Setter Property="Height" Value="30"/>
<Setter Property="Width" Value="30"/> <Setter Property="Width" Value="30"/>
<Setter Property="Margin" Value="120,2.5,2.5,2.5"/> <Setter Property="Margin" Value="2,2.5,2.5,2.5"/>
</Style> </Style>
<Style x:Key="ToolBarOnlyProdManagerGoToSupervisor_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}"> <Style x:Key="ToolBarOnlyProdManagerGoToSupervisor_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
@@ -2861,7 +2861,7 @@
<!--#region EgtCustomWindow--> <!--#region EgtCustomWindow-->
<Style x:Key="OnlyProd_EgtCustomWindow" TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}"> <Style x:Key="OnlyProd_EgtCustomWindow" TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
<Setter Property="TitleBarHeight" Value="32"/> <Setter Property="TitleBarHeight" Value="40"/>
<Setter Property="TitleBarBrush" Value="{StaticResource BeamWall_Glacier}"/> <Setter Property="TitleBarBrush" Value="{StaticResource BeamWall_Glacier}"/>
<Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/> <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
<Setter Property="TitleBarForeground" Value="{StaticResource BeamWall_White}"/> <Setter Property="TitleBarForeground" Value="{StaticResource BeamWall_White}"/>
@@ -3257,10 +3257,7 @@
<!--#region WrapPanel--> <!--#region WrapPanel-->
<Style x:Key="OnlyProdProject_WrapPanel" TargetType="{x:Type WrapPanel}"> <Style x:Key="OnlyProdProject_WrapPanel" TargetType="{x:Type WrapPanel}">
<Setter Property="Orientation" Value="Horizontal"/> <Setter Property="Orientation" Value="Vertical"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="Margin" Value="5"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style> </Style>
<Style x:Key="MacroCustom_WrapPanel" TargetType="{x:Type WrapPanel}"> <Style x:Key="MacroCustom_WrapPanel" TargetType="{x:Type WrapPanel}">