From b290bdf8a1959776684e33223663db65b80cc794 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Wed, 12 Jun 2024 10:34:20 +0200 Subject: [PATCH] -aggiunto messaggi ok, annulla in AddFeature -modificato grafica finestra newaddfeature -modificato stile onlyprodoptimizestatistics e onlyprodstatistics --- ...OnlyProdQParameter_ConfigurationPageV.xaml | 3 + .../ItemParamList/OnlyProd_QParamListV.xaml | 4 +- .../OnlyProdOpenProjectFileDialogV.xaml | 2 +- .../SupervisorManager/SupervisorManagerVM.vb | 7 +- .../Utility/Dictionary.xaml | 66 ++++++++- .../AddFeatureWnd/AddFeatureWndVM.vb | 12 ++ .../AddFeatureWnd/NewAddFeatureWndV.xaml | 135 ++++++++++-------- .../AddRawPartWnd/OnlyProdAddRawPartWndV.xaml | 20 ++- .../BTLPartManager/BTLPartManagerVM.vb | 1 - .../BTLViewModel/BTLPartVM.vb | 4 +- .../EgtBEAMWALL.ViewerOptimizer.vbproj | 3 + .../OnlyProdQParameterListV.xaml | 2 +- .../LeftPanel/OnlyProdLeftPanelV.xaml | 14 +- .../MachGroupPanel/MyMachGroupPanelVM.vb | 4 +- .../OnlyProdMovePartInRawPartWndV.xaml | 15 +- .../OnlyProdProject/OnlyProdProjectV.xaml | 3 +- .../PartInRawPartManagerWndV.xaml | 7 + .../RawPartManager/RawPartManagerWndV.xaml | 7 + .../Resources/PDFEditor/PDFPreview.png | Bin 0 -> 10375 bytes .../OnlyProdOptimizerStatisticsV.xaml | 123 ++++++++++------ .../Statistics/OnlyProdPDFEditorV.xaml | 9 +- .../Statistics/OnlyProdStatisticsV.xaml | 66 +++++---- .../StatisticsTimePanelVM.vb | 32 ++--- .../OptimizerStatisticsWndV.xaml | 2 +- .../StatisticsWnd/StatisticsWndV.xaml | 2 +- .../Utility/Dictionary.xaml | 57 ++------ .../WarehouseWnd/OnlyProdWarehouseWndV.xaml | 6 +- 27 files changed, 357 insertions(+), 249 deletions(-) create mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/PDFEditor/PDFPreview.png diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml index bc23f1fd..9fb0d98a 100644 --- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml +++ b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml @@ -10,6 +10,9 @@ + + + - - @@ -2266,6 +2260,66 @@ + + + + + + + + + + + + + + + + diff --git a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb index ff981be2..6a818d66 100644 --- a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb @@ -192,6 +192,18 @@ Public Class AddFeatureWndVM End Get End Property + Public ReadOnly Property OK_Msg As String + Get + Return EgtMsg(91651) + End Get + End Property + + Public ReadOnly Property Cancel_Msg As String + Get + Return EgtMsg(91652) + End Get + End Property + #End Region #End Region ' FIELDS & PROPERTIES diff --git a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml index 4e8062b6..d1246f13 100644 --- a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml @@ -22,76 +22,97 @@ + - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - + + + + + + + diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml index 12a89163..f6c8517e 100644 --- a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml @@ -132,10 +132,15 @@ - + + + + + + diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml index 7f42f7c5..cf36a8fb 100644 --- a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml @@ -19,7 +19,18 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="0,0,0,5" - BindingColumns="{Binding StatisticsColumns}"> + BindingColumns="{Binding StatisticsColumns}" + AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" + AlternationCount="2" + ColumnHeaderBackground="{StaticResource BeamWall_Teal}" + ColumnHeaderForeground="{StaticResource BeamWall_White}" + ColumnHeaderHorizontalContentAlignment="Center" + ColumnHeaderFontWeight="Bold" + ColumnHeaderFontSize="15" + ColumnHeaderPadding="0,2,0,2" + CellStyle="{StaticResource CellDataGrid_CustomHighLight}" + RowStyle="{StaticResource RowDataGrid_CustomHighLight}" + Style="{StaticResource DataGrid_OnlyProd}"> @@ -138,46 +149,51 @@ - + - - - - + + + + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}" + Margin="10,5,5,5"/> - - + + + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}" + Margin="10,5,5,5"/> - - + + + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}" + Margin="10,5,5,5"/> - - + + + RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}" + Margin="10,5,5,5"/> - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb index be6b03b0..eb9af7ab 100644 --- a/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb @@ -10,20 +10,8 @@ Public Class StatisticsTimePanelVM #Region "FIELDS & PROPERTIES" - 'Public ReadOnly Property ViewPage_Visibility As Visibility - ' Get - ' Return If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed) - ' End Get - 'End Property - - 'Public ReadOnly Property MachiningPage_Visibility As Visibility - ' Get - ' Return If(Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed) - ' End Get - 'End Property - Private m_ViewPage_Visibility As Visibility = Visibility.Collapsed - Public Property ViewPage_Visibility As Visibility + Public ReadOnly Property ViewPage_Visibility As Visibility Get If Map.refMainMenuVM.SelPage = Pages.VIEW Then Return Visibility.Visible @@ -31,14 +19,14 @@ Public Class StatisticsTimePanelVM Return m_ViewPage_Visibility End If End Get - Set(value As Visibility) - m_ViewPage_Visibility = value - NotifyPropertyChanged(NameOf(ViewPage_Visibility)) - End Set End Property + Friend Sub SetViewPage_Visibility(value As Visibility) + m_ViewPage_Visibility = value + NotifyPropertyChanged(NameOf(ViewPage_Visibility)) + End Sub Private m_MachiningPage_Visibility As Visibility = Visibility.Collapsed - Public Property MachiningPage_Visibility As Visibility + Public ReadOnly Property MachiningPage_Visibility As Visibility Get If Map.refMainMenuVM.SelPage = Pages.MACHINING Then Return Visibility.Visible @@ -46,11 +34,11 @@ Public Class StatisticsTimePanelVM Return m_MachiningPage_Visibility End If End Get - Set(value As Visibility) - m_MachiningPage_Visibility = value - NotifyPropertyChanged(NameOf(MachiningPage_Visibility)) - End Set End Property + Friend Sub SetMachiningPage_Visibility(value As Visibility) + m_MachiningPage_Visibility = value + NotifyPropertyChanged(NameOf(MachiningPage_Visibility)) + End Sub #Region "ToolTip" diff --git a/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/OptimizerStatisticsWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/OptimizerStatisticsWndV.xaml index dc6a6d6b..46e6c783 100644 --- a/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/OptimizerStatisticsWndV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/OptimizerStatisticsWndV.xaml @@ -4,7 +4,7 @@ xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer" xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core" - Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" + Style="{StaticResource OnlyProd_EgtCustomWindow}" WindowStyle="None" ResizeMode="NoResize" SizeToContent="Height" WindowStartupLocation="CenterOwner" diff --git a/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/StatisticsWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/StatisticsWndV.xaml index 1f07a1aa..f4f4ef79 100644 --- a/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/StatisticsWndV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/StatisticsWndV.xaml @@ -4,7 +4,7 @@ xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer" xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core" - Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" + Style="{StaticResource OnlyProd_EgtCustomWindow}" WindowStyle="None" ResizeMode="NoResize" SizeToContent="Height" WindowStartupLocation="CenterOwner" diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml index e9a42197..18def84b 100644 --- a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml @@ -172,8 +172,6 @@ --> - - @@ -324,6 +322,7 @@ + - + + @@ -3066,7 +3029,7 @@ - + diff --git a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml index e305f896..c5fe1609 100644 --- a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml @@ -5,7 +5,7 @@ Width="{Binding WarehouseWnd_Width, Mode=TwoWay}" xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer" xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core" - Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" + Style="{StaticResource OnlyProd_EgtCustomWindow}" WindowStyle="None" ResizeMode="NoResize" SizeToContent="Height" MinHeight="300" @@ -247,7 +247,7 @@ - -