diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml index 45cccd40..2dbbe774 100644 --- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml +++ b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml @@ -12,9 +12,10 @@ - + + Margin="0,0,0,5" + Foreground="{StaticResource BeamWall_Corduroy}"> - + + Margin="0,0,0,5" + Foreground="{StaticResource BeamWall_Corduroy}"> - - + + - - + + - + - + @@ -63,8 +65,7 @@ - + @@ -107,10 +108,11 @@ Orientation="Horizontal"> + + + diff --git a/EgtBEAMWALL.Supervisor/CALCPanel/OnlyProdCalcPanelV.xaml.vb b/EgtBEAMWALL.Supervisor/CALCPanel/OnlyProdCalcPanelV.xaml.vb new file mode 100644 index 00000000..79f7176f --- /dev/null +++ b/EgtBEAMWALL.Supervisor/CALCPanel/OnlyProdCalcPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class OnlyProdCalcPanelV + +End Class diff --git a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb index 59b404f7..88fbb2fe 100644 --- a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb +++ b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb @@ -20,11 +20,10 @@ Public Class ConfigurationPageVM Set(value As Integer) m_SelConfigSubPage = value If m_SelConfigSubPage = ConfigSubPages.GENERAL Then - m_bGeneral_Visibility = Visibility.Visible + SetGeneral_Visibility(Visibility.Visible) ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then - m_bGeneral_Visibility = Visibility.Collapsed + SetGeneral_Visibility(Visibility.Collapsed) End If - NotifyPropertyChanged(NameOf(General_Visibility)) End Set End Property @@ -109,26 +108,26 @@ Public Class ConfigurationPageVM End Property Private m_bGeneral_Visibility As Visibility = Visibility.Visible - Public Property General_Visibility As Visibility + Public ReadOnly Property General_Visibility As Visibility Get Return m_bGeneral_Visibility End Get - Set(value As Visibility) - m_bGeneral_Visibility = value - NotifyPropertyChanged(NameOf(General_Visibility)) - End Set End Property + Friend Sub SetGeneral_Visibility(value As Visibility) + m_bGeneral_Visibility = value + NotifyPropertyChanged(NameOf(General_Visibility)) + End Sub Private m_bMachine_Visibility As Visibility = Visibility.Collapsed - Public Property Machine_Visibility As Visibility + Public ReadOnly Property Machine_Visibility As Visibility Get Return m_bMachine_Visibility End Get - Set(value As Visibility) - m_bMachine_Visibility = value - NotifyPropertyChanged(NameOf(Machine_Visibility)) - End Set End Property + Friend Sub SetMachine_Visibility(value As Visibility) + m_bMachine_Visibility = value + NotifyPropertyChanged(NameOf(Machine_Visibility)) + End Sub Private m_SectionTime As Double Public Property SectionTime As String @@ -185,15 +184,15 @@ Public Class ConfigurationPageVM End Property Private m_MachineParameter_Visibility As Visibility = Visibility.Collapsed - Public Property MachineParameter_Visibility As Visibility + Public ReadOnly Property MachineParameter_Visibility As Visibility Get Return m_MachineParameter_Visibility End Get - Set(value As Visibility) - m_MachineParameter_Visibility = value - NotifyPropertyChanged(NameOf(MachineParameter_Visibility)) - End Set End Property + Friend Sub SetMachineParameter_Visibility(value As Visibility) + m_MachineParameter_Visibility = value + NotifyPropertyChanged(NameOf(MachineParameter_Visibility)) + End Sub ' Definizione comandi Private m_cmdSave As ICommand @@ -402,10 +401,8 @@ Public Class ConfigurationPageVM Dim nDefaultReminderFrequency As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_REMINDERFREQUENCY, 1) SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency) ' rendo invisibile la sezione Offset presente nel tab Macchine - m_MachineParameter_Visibility = Visibility.Collapsed - m_bMachine_Visibility = Visibility.Collapsed - NotifyPropertyChanged(NameOf(MachineParameter_Visibility)) - NotifyPropertyChanged(NameOf(Machine_Visibility)) + SetMachineParameter_Visibility(Visibility.Collapsed) + SetMachine_Visibility(Visibility.Collapsed) End Sub #End Region ' Constructor diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj index c14cb222..bb3c5780 100644 --- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj +++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj @@ -211,6 +211,7 @@ ..\packages\NLog.5.0.1\lib\net46\NLog.dll + ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll @@ -318,16 +319,31 @@ AxesPanelV.xaml + + OnlyProdAxesPanelV.xaml + CalcPanelV.xaml + + OnlyProdCalcPanelV.xaml + + + OnlyProdPartInRawPartListV.xaml + + + OnlyProdRawPartListV.xaml + + + OnlyProdLeftPanelV.xaml + MachineLogPageV.xaml @@ -386,6 +402,9 @@ + + OnlyProdProjectV.xaml + ProjectV.xaml @@ -394,6 +413,9 @@ SceneHostV.xaml + + OnlyProdShowPanelV.xaml + ShowPanelV.xaml @@ -401,6 +423,9 @@ StatusBarV.xaml + + OnlyProdSupervisorManagerV.xaml + SupervisorManagerV.xaml @@ -422,6 +447,9 @@ + + OnlyProdViewPanelV.xaml + ViewPanelV.xaml @@ -438,10 +466,30 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + MSBuild:Compile Designer + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -498,6 +546,10 @@ MainWindowV.xaml Code + + Designer + MSBuild:Compile + Designer XamlIntelliSenseFileGenerator @@ -506,6 +558,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -514,6 +570,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -526,6 +586,10 @@ Designer XamlIntelliSenseFileGenerator + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml new file mode 100644 index 00000000..814ddc0e --- /dev/null +++ b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml.vb b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml.vb new file mode 100644 index 00000000..d2f5a3d3 --- /dev/null +++ b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdPartInRawPartListV.xaml.vb @@ -0,0 +1,3 @@ +Public Class OnlyProdPartInRawPartListV + +End Class diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml new file mode 100644 index 00000000..0947548e --- /dev/null +++ b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml.vb b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml.vb new file mode 100644 index 00000000..a800da9d --- /dev/null +++ b/EgtBEAMWALL.Supervisor/ItemParamList/OnlyProdRawPartListV.xaml.vb @@ -0,0 +1,45 @@ +Imports EgtBEAMWALL.Core +Imports System.ComponentModel + +Public Class OnlyProdRawPartListV + + Sub New() + + ' This call is required by the designer. + InitializeComponent() + + ' Add any initialization after the InitializeComponent() call. + MyComparer.SetDataGrid(MachGroupDataGrid) + AddHandler MachGroupDataGrid.ResetSort, AddressOf MachGroupDataGrid_ResetSort + End Sub + + ' funzione che permette di selezionare un RawPart anche quando gia' selezionato + Private Sub RawPartRow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs) + If TypeOf sender Is DataGridRow Then + Dim Row As DataGridRow = DirectCast(sender, DataGridRow) + Dim RowVM As MyMachGroupVM = DirectCast(Row.DataContext, MyMachGroupVM) + ' se gia' selezionato rifaccio selezione perche' potrbbe essere selezionato un BTLPart + If Not IsNothing(Row) AndAlso Row.IsSelected Then + Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup = Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup + End If + End If + End Sub + + Private Sub MachGroupVMList_Sorting(sender As Object, e As DataGridSortingEventArgs) + ' aggiorno direziona colonna + Dim column As DataGridColumn = e.Column + column.SortDirection = If((column.SortDirection <> ListSortDirection.Ascending), ListSortDirection.Ascending, ListSortDirection.Descending) + ' ricalcolo colonne sort + Dim datagrid As DataGrid = sender + MyComparer.RefreshColumns() + ' lancio sort custom + Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort() + e.Handled = True + End Sub + + Private Sub MachGroupDataGrid_ResetSort() + MyComparer.RefreshColumns() + Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort() + End Sub + +End Class diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml b/EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml new file mode 100644 index 00000000..4718314b --- /dev/null +++ b/EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml.vb b/EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml.vb new file mode 100644 index 00000000..c991aa65 --- /dev/null +++ b/EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class OnlyProdLeftPanelV + +End Class diff --git a/EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb b/EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb index e2386272..52ba33eb 100644 --- a/EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb +++ b/EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb @@ -361,8 +361,8 @@ Public Class MachinePanelVM End Property Public Sub ParameterMachineVisibility() - Map.refConfigurationPageVM.MachineParameter_Visibility = Visibility.Visible - Map.refConfigurationPageVM.Machine_Visibility = Visibility.Visible + Map.refConfigurationPageVM.SetMachineParameter_Visibility(Visibility.Visible) + Map.refConfigurationPageVM.SetMachine_Visibility(Visibility.Visible) End Sub #End Region ' ParameterMachine diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml index 560b1c1a..48be20bf 100644 --- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml +++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml @@ -30,7 +30,8 @@ - + + diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb index 6471ce05..94b89087 100644 --- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb +++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb @@ -41,6 +41,12 @@ Public Class MainWindowVM End Set End Property + Public ReadOnly Property ProjectContent As Object + Get + Return If(Map.refMainWindowVM.MainWindowM.bOnlyProd, New OnlyProdProjectV(), New ProjectV()) + End Get + End Property + ' Definizione comandi Private m_cmdAboutBox As ICommand Private m_cmdCloseApplication As ICommand diff --git a/EgtBEAMWALL.Supervisor/Project/OnlyProdProjectV.xaml b/EgtBEAMWALL.Supervisor/Project/OnlyProdProjectV.xaml new file mode 100644 index 00000000..55c974d6 --- /dev/null +++ b/EgtBEAMWALL.Supervisor/Project/OnlyProdProjectV.xaml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EgtBEAMWALL.Supervisor/Project/OnlyProdProjectV.xaml.vb b/EgtBEAMWALL.Supervisor/Project/OnlyProdProjectV.xaml.vb new file mode 100644 index 00000000..b60c4a3d --- /dev/null +++ b/EgtBEAMWALL.Supervisor/Project/OnlyProdProjectV.xaml.vb @@ -0,0 +1,3 @@ +Public Class OnlyProdProjectV + +End Class diff --git a/EgtBEAMWALL.Supervisor/Project/ProjectV.xaml b/EgtBEAMWALL.Supervisor/Project/ProjectV.xaml index cabcc68e..b35069a5 100644 --- a/EgtBEAMWALL.Supervisor/Project/ProjectV.xaml +++ b/EgtBEAMWALL.Supervisor/Project/ProjectV.xaml @@ -3,12 +3,12 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5" xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core" - xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"> + xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor" + DataContext="{StaticResource ProjectVM}"> - + @@ -19,9 +19,9 @@ + DataContext="{StaticResource LeftPanelVM}" + Tag="{Binding DataContext.SupervisorMachGroupPanelVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}" + Visibility="{Binding DataContext.LeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/> @@ -75,11 +75,11 @@ - + + + + + diff --git a/EgtBEAMWALL.Supervisor/SupervisorManager/OnlyProdSupervisorManagerV.xaml.vb b/EgtBEAMWALL.Supervisor/SupervisorManager/OnlyProdSupervisorManagerV.xaml.vb new file mode 100644 index 00000000..ab29826c --- /dev/null +++ b/EgtBEAMWALL.Supervisor/SupervisorManager/OnlyProdSupervisorManagerV.xaml.vb @@ -0,0 +1,3 @@ +Public Class OnlyProdSupervisorManagerV + +End Class diff --git a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml index a70f8630..54c81cfc 100644 --- a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml +++ b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml @@ -18,7 +18,7 @@ @@ -32,5 +32,4 @@ - diff --git a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml index 58560cf3..b5fce909 100644 --- a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml +++ b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml @@ -1,11 +1,13 @@ - + + + + + + + @@ -62,6 +67,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89,32 +168,42 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -195,6 +575,9 @@ @@ -429,7 +815,7 @@ - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml b/EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml new file mode 100644 index 00000000..80740a51 --- /dev/null +++ b/EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml @@ -0,0 +1,44 @@ + + + + + + + + + + + diff --git a/EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml.vb b/EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml.vb new file mode 100644 index 00000000..366de359 --- /dev/null +++ b/EgtBEAMWALL.Supervisor/ViewPanel/OnlyProdViewPanelV.xaml.vb @@ -0,0 +1,3 @@ +Public Class OnlyProdViewPanelV + +End Class diff --git a/EgtBEAMWALL.Supervisor/ViewPanel/ViewPanelV.xaml b/EgtBEAMWALL.Supervisor/ViewPanel/ViewPanelV.xaml index 0caf70a0..cab9c958 100644 --- a/EgtBEAMWALL.Supervisor/ViewPanel/ViewPanelV.xaml +++ b/EgtBEAMWALL.Supervisor/ViewPanel/ViewPanelV.xaml @@ -1,9 +1,9 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5" + IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False" + IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}"> + VerticalAlignment="Center" + Background="Transparent" + BorderBrush="Transparent" + Foreground="{StaticResource BeamWall_Kashmir}"> + FontWeight="Bold" + Margin="0,-5,0,-2"/> diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml index ee0de37d..b4d89051 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml @@ -42,7 +42,8 @@ + VerticalAlignment="Center" + HorizontalAlignment="Center"/> @@ -67,7 +68,7 @@ + Style="{StaticResource OnlyProd_TextBlock}"> diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb index 18fa7e1f..ef0210bf 100644 --- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb @@ -55,15 +55,15 @@ Public Class LeftPanelVM End Sub Private m_OnlyProdPartManagerVisibility As Visibility = Visibility.Collapsed - Public Property OnlyProdPartManagerVisibility As Visibility + Public ReadOnly Property OnlyProdPartManagerVisibility As Visibility Get Return m_OnlyProdPartManagerVisibility End Get - Set(value As Visibility) - m_OnlyProdPartManagerVisibility = value - NotifyPropertyChanged(NameOf(OnlyProdPartManagerVisibility)) - End Set End Property + Friend Sub SetOnlyProdPartManager_Visibility(value As Visibility) + m_OnlyProdPartManagerVisibility = value + NotifyPropertyChanged(NameOf(OnlyProdPartManagerVisibility)) + End Sub ' Definizione comandi Private m_cmdData As ICommand @@ -73,7 +73,7 @@ Public Class LeftPanelVM Public ReadOnly Property SearchFilter_Msg As String Get - Return "Search & Filter" + Return EgtMsg(61949) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml index eef59a03..9d23e595 100644 --- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml @@ -11,6 +11,13 @@ + + + + + + + + + + + + + + diff --git a/EgtBEAMWALL.ViewerOptimizer/MainMenu/OnlyProdMainMenuV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/MainMenu/OnlyProdMainMenuV.xaml.vb new file mode 100644 index 00000000..61ae84b7 --- /dev/null +++ b/EgtBEAMWALL.ViewerOptimizer/MainMenu/OnlyProdMainMenuV.xaml.vb @@ -0,0 +1,3 @@ +Public Class OnlyProdMainMenuV + +End Class diff --git a/EgtBEAMWALL.ViewerOptimizer/PdfViewer/PdfViewer.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/PdfViewer/PdfViewer.xaml.vb index 7395aaf1..0d065cb1 100644 --- a/EgtBEAMWALL.ViewerOptimizer/PdfViewer/PdfViewer.xaml.vb +++ b/EgtBEAMWALL.ViewerOptimizer/PdfViewer/PdfViewer.xaml.vb @@ -7,22 +7,6 @@ Imports Windows.Storage.Streams Partial Public Class PdfViewer Inherits UserControl - 'Public Property PdfPath As String - ' Get - ' Return CStr(GetValue(PdfPathProperty)) - ' End Get - ' Set(value As String) - ' SetValue(PdfPathProperty, value) - ' End Set - 'End Property - - 'Private Shared m_Items As New List(Of Image) - 'Public Shared ReadOnly Property Items As List(Of Image) - ' Get - ' Return m_Items - ' End Get - 'End Property - Public Property PdfPath As String Get Return CStr(GetValue(PdfPathProperty)) @@ -32,11 +16,6 @@ Partial Public Class PdfViewer End Set End Property - 'Public Shared ReadOnly PdfPathProperty As DependencyProperty = DependencyProperty.Register("PdfPath", - ' GetType(String), - ' GetType(PdfViewer), - ' New FrameworkPropertyMetadata(String.Empty, New PropertyChangedCallback(AddressOf OnPdfPathChanged))) - Public Shared ReadOnly PdfPathProperty As DependencyProperty = DependencyProperty.Register("PdfPath", GetType(String), GetType(PdfViewer), @@ -51,43 +30,10 @@ Partial Public Class PdfViewer End If End Sub - 'Private Shared Sub OnPdfPathChanged(d As DependencyObject, e As DependencyPropertyChangedEventArgs) - ' Dim pdfDrawer As PdfViewer = CType(d, PdfViewer) - ' If Not String.IsNullOrEmpty(pdfDrawer.PdfPath) Then - ' Dim path = System.IO.Path.GetFullPath(pdfDrawer.PdfPath) - ' StorageFile.GetFileFromPathAsync(path).AsTask().ContinueWith(Function(t) PdfDocument.LoadFromFileAsync(t.Result).AsTask()).Unwrap().ContinueWith(Function(t2) PdfToImages(t2.Result), TaskScheduler.FromCurrentSynchronizationContext()) - ' End If - 'End Sub - Sub New() InitializeComponent() End Sub - '''' - '''' Funzione che trasforma le pagine del pdf in immagine - '''' - '''' Singola pagina del PDf - '''' - 'Private Shared Async Function PdfToImages(pdfDoc As PdfDocument) As Task - ' 'Dim items As ItemCollection = pdfViewer.PagesContainer.Items - ' Items.Clear() - - ' If IsNothing(pdfDoc) Then Return - - ' For i As Integer = 0 To pdfDoc.PageCount - 1 - ' Using page As PdfPage = pdfDoc.GetPage(i) - ' Dim bitmap As BitmapImage = Await PageToBitmapAsync(page) - ' Dim image As New Image With { - ' .Source = bitmap, - ' .HorizontalAlignment = HorizontalAlignment.Center, - ' .Width = bitmap.Width, - ' .Height = bitmap.Height - ' } - ' Items.Add(image) - ' End Using - ' Next - 'End Function - ''' ''' Funzione che trasforma le pagine del pdf in immagine ''' diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml index fb9f435f..834c326e 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml +++ b/EgtBEAMWALL.ViewerOptimizer/ProdProjManager/ProdProjManagerV.xaml @@ -4,6 +4,13 @@ xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer" DataContext="{StaticResource ProdProjManagerVM}" SelectedIndex="{Binding SelProdProj}"> + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1836,50 +1904,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2175,21 +2150,16 @@ - - - - - - - - - - - - @@ -2435,48 +2366,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -