Optimizer 2.7.10.5
-sistemato finestra statistic per salvataggio colonne in json
This commit is contained in:
Demetrio Cassarino
@@ -250,11 +250,8 @@
|
||||
<DependentUpon>StatisticsTimePanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="StatisticsTimePanel\StatisticsTimePanelVM.vb" />
|
||||
<Compile Include="StatisticsWnd\OptimizerStatisticsWndV.xaml.vb">
|
||||
<DependentUpon>OptimizerStatisticsWndV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="StatisticsWnd\StatisticsWndV.xaml.vb">
|
||||
<DependentUpon>StatisticsWndV.xaml</DependentUpon>
|
||||
<Compile Include="StatisticsWnd\StatisticWndV.xaml.vb">
|
||||
<DependentUpon>StatisticWndV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Statistics\OptimizerStatisticsV.xaml.vb">
|
||||
<DependentUpon>OptimizerStatisticsV.xaml</DependentUpon>
|
||||
@@ -721,11 +718,7 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="StatisticsWnd\OptimizerStatisticsWndV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="StatisticsWnd\StatisticsWndV.xaml">
|
||||
<Page Include="StatisticsWnd\StatisticWndV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
|
||||
@@ -262,7 +262,7 @@ Public Class GeneralParametersWndVM
|
||||
|
||||
Public Sub Ok()
|
||||
SaveProjectParameters()
|
||||
Map.refOnlyProdManagerVM.Save()
|
||||
Map.refProdManagerVM.Save()
|
||||
' Chiudo finestra
|
||||
RaiseEvent m_CloseWindow(DialogResult.OK)
|
||||
End Sub
|
||||
|
||||
@@ -196,31 +196,8 @@ Public Class BTLPartListVM
|
||||
' creo riferimento in Map
|
||||
Map.SetRefPartListVM(Me)
|
||||
|
||||
'Dim NewColumnList As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colPDN", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colCALC", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colDO", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colW", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colH", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colNAM", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colMATERIAL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colCNT", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colADDED", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colINPROD", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colDONE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colGROUP", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colSTOREY", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colROT", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colFLIP", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colVERIFY", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colADD", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colSETTING", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True)})
|
||||
'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTLIST, NewColumnList)
|
||||
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTLIST, PartColumns)
|
||||
' GetPrivateProfileColumns(S_PARTLIST, PartColumns)
|
||||
' recupero riferimento a colonna Do
|
||||
m_colPart_Do = PartColumns.FirstOrDefault(Function(x) x.Key = COL_DO)
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -63,19 +63,8 @@ Public Class FeatureInPartInRawPartListVM
|
||||
' creo riferimento in Map
|
||||
Map.SetRefFeatureInPartInRawPartListVM(Me)
|
||||
|
||||
'Dim NewColumnList As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colDO", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colCALC", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colPRIORITY", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colDESC", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colSTRATEGY", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True)})
|
||||
'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_FEATUREINPARTINRAWPARTLIST, NewColumnList)
|
||||
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_FEATUREINPARTINRAWPARTLIST, FeatureInPartInRawPartColumns)
|
||||
|
||||
'' carico le colonne della datagrid
|
||||
'GetPrivateProfileColumns(S_FEATUREINPARTINRAWPARTLIST, FeatureInPartInRawPartColumns)
|
||||
' recupero riferimento a colonna Do
|
||||
m_colFeatureInPartInRawPart_Do = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_DO)
|
||||
m_colFeatureInPartInRawPart_Priority = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_PRIORITY)
|
||||
End Sub
|
||||
|
||||
@@ -213,36 +213,8 @@ Public Class RawPartListVM
|
||||
' Aggiungo riferimento a Map
|
||||
Map.SetRefRawPartListVM(Me)
|
||||
|
||||
'Dim NewColumnList As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colNAME", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colCALC", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colSTARTCUT", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colW", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colH", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colMATERIAL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colUSAGE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colWASTE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colVERIFY", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colSIMUL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colPROD", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colSETTING", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True)})
|
||||
'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_BEAM, NewColumnList)
|
||||
|
||||
'Dim NewColumnListPart As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colPDN", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colCALC", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colNAM", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colROT", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colFLIP", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colOFFSET", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colGROUP", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colSTOREY", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colMOVEUP", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colMOVEDOWN", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colREMOVE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True)})
|
||||
'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_BEAM, NewColumnListPart)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_BEAM, RawPartColumns)
|
||||
'' carico le colonne della datagrid BEAM
|
||||
'EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_BEAM, RawPartColumns)
|
||||
End Sub
|
||||
|
||||
#End Region ' CONSTRUCTOR
|
||||
@@ -251,44 +223,27 @@ Public Class RawPartListVM
|
||||
|
||||
Friend Sub UpdateColumns(nProjectType As BWType)
|
||||
If nProjectType = BWType.BEAM Then
|
||||
'RawPartColumns.Clear()
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_BEAM, RawPartColumns)
|
||||
'GetPrivateProfileColumns(S_RAWPARTLIST_BEAM, RawPartColumns)
|
||||
PartInRawPartColumns.Clear()
|
||||
'GetPrivateProfileColumns(S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
|
||||
ElseIf nProjectType = BWType.WALL Then
|
||||
RawPartColumns.Clear()
|
||||
'GetPrivateProfileColumns(S_RAWPARTLIST_WALL, RawPartColumns)
|
||||
PartInRawPartColumns.Clear()
|
||||
'GetPrivateProfileColumns(S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_WALL, RawPartColumns)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
|
||||
End If
|
||||
' recupero riferimento a colonna StartCut
|
||||
m_colRawPart_StartCut = RawPartColumns.FirstOrDefault(Function(x) x.Key = COL_STARTCUT)
|
||||
m_colRawPart_W = RawPartColumns.FirstOrDefault(Function(x) x.Key = COL_W)
|
||||
m_colRawPart_L = RawPartColumns.FirstOrDefault(Function(x) x.Key = COL_L)
|
||||
m_colRawPart_PosZ = RawPartColumns.FirstOrDefault(Function(x) x.Key = COL_POSZ)
|
||||
'' aggiorno la visibilità delle colonne
|
||||
'For Each col In RawPartColumns
|
||||
'col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
|
||||
'Next
|
||||
' recupero riferimento a colonne Offset, Rot, Flip, PosX, PosY
|
||||
m_colPartInRawPart_Offset = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_OFFSET)
|
||||
m_colPartInRawPart_Rot = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_ROT)
|
||||
m_colPartInRawPart_Flip = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_FLIP)
|
||||
m_colPartInRawPart_PosX = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_POSX)
|
||||
m_colPartInRawPart_PosY = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_POSY)
|
||||
'' aggiorno la visibilità delle colonne
|
||||
'For Each col In PartInRawPartColumns
|
||||
'If nProjectType = BWType.WALL AndAlso (col.Name.Equals(COL_ROT) OrElse col.Name.Equals(COL_FLIP)) Then
|
||||
' col.Visible = False
|
||||
'Else
|
||||
' col.Visible = True
|
||||
'End If
|
||||
'col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
|
||||
'Next
|
||||
End Sub
|
||||
|
||||
#End Region ' Methods
|
||||
|
||||
@@ -408,10 +408,7 @@ Public Class MainWindowVM
|
||||
{S_RAWPARTLIST_BEAM, Map.refRawPartListVM.RawPartColumns},
|
||||
{S_PARTINRAWPARTLIST_BEAM, Map.refRawPartListVM.PartInRawPartColumns},
|
||||
{S_FEATUREINPARTINRAWPARTLIST, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns},
|
||||
{S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns},
|
||||
{S_STATISTICS, Map.refStatisticsVM.StatisticsColumns},
|
||||
{S_OPTIMIZERSTATISTICS, Map.refStatisticsVM.OptimizerStatisticsColumns},
|
||||
{S_RAWPARTSTATISTICS, Map.refStatisticsVM.RawPartStatisticsColumns}}
|
||||
{S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns}}
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
|
||||
' Termino il Model
|
||||
m_MainWindowM.Close()
|
||||
|
||||
@@ -67,5 +67,5 @@ Imports System.Windows
|
||||
' Revision
|
||||
'
|
||||
|
||||
<Assembly: AssemblyVersion("2.7.10.4")>
|
||||
<Assembly: AssemblyVersion("2.7.10.5")>
|
||||
<Assembly: AssemblyFileVersion("2.7.10.4")>
|
||||
|
||||
@@ -39,20 +39,13 @@
|
||||
DataContext="{StaticResource StatisticsTimePanelVM}"
|
||||
Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:ProjectV}}}"/>
|
||||
|
||||
<StackPanel Grid.Column="4"
|
||||
Orientation="Horizontal"
|
||||
HorizontalAlignment="Right">
|
||||
<Button Command="{Binding Visualization_Command}"
|
||||
ToolTip="{Binding Statistics_Msg}"
|
||||
Style="{StaticResource ToolBarViewPanel_Button}">
|
||||
<Image Source="/Resources/InstrumentPanel/Vis.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
<Button Command="{Binding Optimizer_Command}"
|
||||
ToolTip="{Binding Statistics_Msg}"
|
||||
Style="{StaticResource ToolBarViewPanel_Button}">
|
||||
<Image Source="/Resources/InstrumentPanel/Statistics.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
<Button Grid.Column="4"
|
||||
HorizontalAlignment="Right"
|
||||
Command="{Binding Optimizer_Command}"
|
||||
ToolTip="{Binding Statistics_Msg}"
|
||||
Style="{StaticResource ToolBarViewPanel_Button}">
|
||||
<Image Source="/Resources/InstrumentPanel/Statistics.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Row="1">
|
||||
|
||||
@@ -13,8 +13,7 @@
|
||||
MinHeight="170"
|
||||
TitleBarHeight="30"
|
||||
Title="SaveAsStrategy"
|
||||
Style="{StaticResource OnlyProd_EgtCustomWindow}"
|
||||
CloseCommand="{Binding Close_Command, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}">
|
||||
Style="{StaticResource OnlyProd_EgtCustomWindow}">
|
||||
<Grid HorizontalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
Imports System.Collections.ObjectModel
|
||||
Imports System.IO
|
||||
Imports System.Windows.Forms
|
||||
Imports EgtBEAMWALL.Core
|
||||
Imports EgtUILib
|
||||
Imports EgtWPFLib5
|
||||
@@ -83,6 +85,7 @@ Public Class StatisticsVM
|
||||
Private m_cmdPrintPDF As ICommand
|
||||
Private m_cmdPrintOptPDF As ICommand
|
||||
Private m_cmdOk As ICommand
|
||||
Private m_cmdCloseCommand As ICommand
|
||||
|
||||
#Region "Messages"
|
||||
|
||||
@@ -288,48 +291,10 @@ Public Class StatisticsVM
|
||||
' Aggiungo riferimento a Map
|
||||
Map.SetRefStatisticsVM(Me)
|
||||
|
||||
'Dim NewColumnList As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colPDN", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colW", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colH", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colDESC", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colMATERIAL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colCNT", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colADDED", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colINPROD", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colDONE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colUNITVOLUME", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colTOTVOLUME", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colUNITTIME", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colTOTTIME", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True)})
|
||||
'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_STATISTICS, NewColumnList)
|
||||
|
||||
'Dim NewColumnList1 As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colNAME", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colW", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colH", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colMATERIAL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colUSAGE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colWASTE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colUNITTIME", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True)})
|
||||
'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPTIMIZERSTATISTICS, NewColumnList1)
|
||||
|
||||
'Dim NewColumnList2 As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colW", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colH", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colMATERIAL", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, False, True),
|
||||
' New EgwWPFBaseLib.ColumnLayout("colQTY", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True)})
|
||||
'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTSTATISTICS, NewColumnList2)
|
||||
|
||||
'carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_STATISTICS, StatisticsColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTSTATISTICS, RawPartStatisticsColumns)
|
||||
|
||||
'' carico le colonne della datagrid
|
||||
'GetPrivateProfileColumns(S_STATISTICS, StatisticsColumns)
|
||||
'GetPrivateProfileColumns(S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns)
|
||||
'GetPrivateProfileColumns(S_RAWPARTSTATISTICS, RawPartStatisticsColumns)
|
||||
End Sub
|
||||
|
||||
#End Region ' CONSTRUCTOR
|
||||
@@ -415,6 +380,29 @@ Public Class StatisticsVM
|
||||
|
||||
#End Region ' PrintOptPDF
|
||||
|
||||
#Region "CloseCommand"
|
||||
|
||||
Public ReadOnly Property CloseCommand As ICommand
|
||||
Get
|
||||
If m_cmdCloseCommand Is Nothing Then
|
||||
m_cmdCloseCommand = New Command(AddressOf Close)
|
||||
End If
|
||||
Return m_cmdCloseCommand
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Close()
|
||||
' Salvo modifiche a colonne
|
||||
Dim DataGridColumnDictionary As New Dictionary(Of String, ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) From {{S_STATISTICS, StatisticsColumns},
|
||||
{S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns},
|
||||
{S_RAWPARTSTATISTICS, RawPartStatisticsColumns}}
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
|
||||
' Chiudo finestra senza fare niente
|
||||
RaiseEvent m_CloseWindow(DialogResult.Cancel)
|
||||
End Sub
|
||||
|
||||
#End Region ' CloseCommand
|
||||
|
||||
#End Region ' COMMANDS
|
||||
|
||||
End Class
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
<EgtWPFLib5:EgtCustomWindow x:Class="OptimizerStatisticsWndV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||
Style="{StaticResource OnlyProd_EgtCustomWindow}"
|
||||
WindowStyle="None" ResizeMode="NoResize"
|
||||
SizeToContent="Height"
|
||||
WindowStartupLocation="CenterOwner"
|
||||
IsClosable="True"
|
||||
IsMinimizable="False"
|
||||
IsResizable="False"
|
||||
Title="OptimizerStatisticsWndV"
|
||||
Name="OptimizerStatisticsWndV"
|
||||
MaxHeight="600"
|
||||
Width="1300">
|
||||
|
||||
<OPTIMIZER:OptimizerStatisticsV Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:OptimizerStatisticsWndV}}}"/>
|
||||
|
||||
</EgtWPFLib5:EgtCustomWindow>
|
||||
@@ -1,25 +0,0 @@
|
||||
Imports EgtBEAMWALL.Core
|
||||
Imports System.IO
|
||||
|
||||
Public Class OptimizerStatisticsWndV
|
||||
|
||||
Private WithEvents m_StatisticsVM As StatisticsVM
|
||||
|
||||
Sub New(Owner As Window, StatisticsVM As StatisticsVM)
|
||||
MyBase.New(Owner)
|
||||
' This call is required by the designer.
|
||||
InitializeComponent()
|
||||
' Add any initialization after the InitializeComponent() call.
|
||||
Me.DataContext = StatisticsVM
|
||||
Me.Tag = Map.refProjectVM
|
||||
' Assegno al riferimento locale al VM il VM preso dal DataContext
|
||||
m_StatisticsVM = StatisticsVM
|
||||
End Sub
|
||||
|
||||
Private Sub CloseWindow(bDialogResult As Boolean) Handles m_StatisticsVM.m_CloseWindow
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPTIMIZERSTATISTICS, Map.refStatisticsVM.OptimizerStatisticsColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPTIMIZERSTATISTICS, Map.refStatisticsVM.RawPartStatisticsColumns)
|
||||
Me.DialogResult = bDialogResult
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
@@ -2,7 +2,7 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
||||
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||
Style="{StaticResource OnlyProd_EgtCustomWindow}"
|
||||
WindowStyle="None" ResizeMode="NoResize"
|
||||
SizeToContent="Height"
|
||||
@@ -12,18 +12,19 @@
|
||||
IsResizable="False"
|
||||
Title="StatisticWnd"
|
||||
MaxHeight="600"
|
||||
Width="1300">
|
||||
|
||||
<TabControl Name="Statistic_TabControl"
|
||||
BorderThickness="0"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="Statistic_TabControl_SelectionChanged">
|
||||
Width="1300"
|
||||
CloseCommand="{Binding CloseCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
|
||||
|
||||
<TabControl Name="Statistic_TabControl"
|
||||
BorderThickness="0"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="Statistic_TabControl_SelectionChanged">
|
||||
<TabItem Header="STATISTICS">
|
||||
<EgtBEAMWALL:OnlyProdStatisticsV Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:StatisticWndV}}}"/>
|
||||
<OPTIMIZER:StatisticsV Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticWndV}}}"/>
|
||||
</TabItem>
|
||||
<TabItem Header="OPTIMIZER STATISTICS">
|
||||
<EgtBEAMWALL:OnlyProdOptimizerStatisticsV Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:StatisticWndV}}}"/>
|
||||
<OPTIMIZER:OptimizerStatisticsV Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticWndV}}}"/>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
|
||||
|
||||
</EgtWPFLib5:EgtCustomWindow>
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
<EgtWPFLib5:EgtCustomWindow x:Class="StatisticsWndV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||
Style="{StaticResource OnlyProd_EgtCustomWindow}"
|
||||
WindowStyle="None" ResizeMode="NoResize"
|
||||
SizeToContent="Height"
|
||||
WindowStartupLocation="CenterOwner"
|
||||
IsClosable="True"
|
||||
IsMinimizable="False"
|
||||
IsResizable="False"
|
||||
Title="StatisticsWndV"
|
||||
Name="StatisticsWndV"
|
||||
MaxHeight="600"
|
||||
Width="1300">
|
||||
|
||||
<OPTIMIZER:StatisticsV Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:StatisticsWndV}}}"/>
|
||||
|
||||
</EgtWPFLib5:EgtCustomWindow>
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
Imports System.Windows.Forms
|
||||
|
||||
Public Class StatisticsWndV
|
||||
|
||||
Private WithEvents m_StatisticsVM As StatisticsVM
|
||||
|
||||
Sub New(Owner As Window, StatisticsVM As StatisticsVM)
|
||||
MyBase.New(Owner)
|
||||
' This call is required by the designer.
|
||||
InitializeComponent()
|
||||
' Add any initialization after the InitializeComponent() call.
|
||||
Me.DataContext = StatisticsVM
|
||||
Me.Tag = Map.refProjectVM.BTLStructureVM
|
||||
' Assegno al riferimento locale al VM il VM preso dal DataContext
|
||||
m_StatisticsVM = StatisticsVM
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
Reference in New Issue
Block a user