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

Optimizer 2.7.10.4

Browse Source 
-Elminato qparam
-aggiornato tabelle con EgwWPFBaseLib
This commit is contained in:
Demetrio Cassarino
2025-10-28 15:56:30 +01:00
parent b8ec7661ac
commit 09639dbd81
34 changed files with 278 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb
+4 -1
View File
@@ -393,9 +393,12 @@ Public Module CalcIntegration
Dim sMachGroupName As String = ""
EgtGetMachGroupName(nMachGroupId, sMachGroupName)
Dim sMachGroupFilePath As String = sProjDirPath & "\" & sMachGroupName & ".bwe"
If EgtSaveObjToFile(nMachGroupId, sMachGroupFilePath, NGE.CMPTEXT) Then
If EgtSaveMachGroupToFile(nMachGroupId, {EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO), EgtGetFirstNameInGroup(GDB_ID.ROOT, PROJECTINFO)}, sMachGroupFilePath, NGE.CMPTEXT) Then
Return sMachGroupFilePath
End If
'If EgtSaveObjToFile(nMachGroupId, sMachGroupFilePath, NGE.CMPTEXT) Then
' Return sMachGroupFilePath
'End If
Return String.Empty
End Function
EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
-14
View File
@@ -137,12 +137,6 @@
<Compile Include="ConfigurationPage\Machine_ConfigurationPageV.xaml.vb">
<DependentUpon>Machine_ConfigurationPageV.xaml</DependentUpon>
</Compile>
<Compile Include="ConfigurationPage\OnlyProdQParameter_ConfigurationPageV.xaml.vb">
<DependentUpon>OnlyProdQParameter_ConfigurationPageV.xaml</DependentUpon>
</Compile>
<Compile Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml.vb">
<DependentUpon>QParameter_ConfigurationPageV.xaml</DependentUpon>
</Compile>
<Compile Include="Constants\ConstColumns.vb" />
<Compile Include="Constants\ConstDataGridColumnsIni.vb" />
<Compile Include="Constants\ConstDims.vb" />
@@ -320,14 +314,6 @@
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="ConfigurationPage\OnlyProdQParameter_ConfigurationPageV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="EgtColorPicker\EgtColorPickerV.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb
-18
View File
@@ -374,30 +374,12 @@ Public Class PRC
End Get
End Property
' lista dei parametri Q della feature
Protected m_QBTLParamVMList As List(Of QBTLParamVM)
Public Property QBTLParamVMList As List(Of QBTLParamVM)
Get
Return m_QBTLParamVMList
End Get
Set(value As List(Of QBTLParamVM))
m_QBTLParamVMList = value
End Set
End Property
Sub New(GRP As Integer, PRC As Integer, Name As String)
m_nPRC = PRC
m_sName = Name
m_nGRP = GRP
End Sub
Sub New(GRP As Integer, PRC As Integer, Name As String, QBTLParamList As List(Of QBTLParamVM))
m_nPRC = PRC
m_sName = Name
m_nGRP = GRP
m_QBTLParamVMList = QBTLParamList
End Sub
End Class
Public Class NewMacro
EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb
-69
View File
@@ -152,7 +152,6 @@ Public Class BTLFeatureVM
End If
NotifyPropertyChanged(NameOf(nSelVARIANT))
NotifyPropertyChanged(NameOf(PBTLParamVMList))
NotifyPropertyChanged(NameOf(QBTLParamVMList))
EgtDraw()
End If
End Set
@@ -163,7 +162,6 @@ Public Class BTLFeatureVM
m_BTLFeatureM.CreateFeatureParams(m_BTLFeatureM)
m_BTLFeatureM.SetDefaultValues()
CreatePBTLParamVMList()
CreateQBTLParamVMList()
' aggiorno la feature con nuovo valore
vPar = Nothing
sPar = Nothing
@@ -270,27 +268,6 @@ Public Class BTLFeatureVM
End Set
End Property
Private m_QBTLParamVMList As ObservableCollection(Of BTLParamVM)
Public Property QBTLParamVMList As ObservableCollection(Of BTLParamVM)
Get
Return m_QBTLParamVMList
End Get
Set(value As ObservableCollection(Of BTLParamVM))
m_QBTLParamVMList = value
End Set
End Property
Protected m_SelQParam As BTLParamVM
Public Property SelQBTLParam As BTLParamVM
Get
Return m_SelQParam
End Get
Set(value As BTLParamVM)
m_SelQParam = value
NotifyPropertyChanged(NameOf(SelQBTLParam))
End Set
End Property
Public ReadOnly Property Edit_Visibility As Visibility
Get
Return If(BTLFeatureM.IsFreeContour AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
@@ -341,10 +318,8 @@ Public Class BTLFeatureVM
Sub New(BTLFeatureM As BTLFeatureM, BTLPartM As BTLPartM)
m_BTLFeatureM = BTLFeatureM
AddHandler m_BTLFeatureM.PBTLParamAdded, AddressOf OnPBTLParamAdded
AddHandler m_BTLFeatureM.QBTLParamAdded, AddressOf OnQBTLParamAdded
m_BTLPartM = BTLPartM
CreatePBTLParamVMList()
CreateQBTLParamVMList()
NotifyPropertyChanged(NameOf(Calc_Background))
NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
@@ -354,10 +329,7 @@ Public Class BTLFeatureVM
Sub New(BTLFeatureM As BTLFeatureM)
m_BTLFeatureM = BTLFeatureM
AddHandler m_BTLFeatureM.QBTLParamAdded, AddressOf OnQBTLParamAdded
m_BTLPartM = Nothing
Dim Part As PartM = BTLFeatureM.ParentPart
If Part.nType = BWType.WALL Then CreateQBTLParamVMList()
NotifyPropertyChanged(NameOf(Calc_Background))
NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
@@ -381,18 +353,6 @@ Public Class BTLFeatureVM
End Sub
Private Sub CreateQBTLParamVMList()
Dim all As List(Of BTLParamVM) = (From BTLParamM In m_BTLFeatureM.GetQBTLParams()
Select New BTLParamVM(BTLParamM, m_BTLFeatureM)).ToList()
For Each BTLParamVM As BTLParamVM In all
AddHandler BTLParamVM.PropertyChanged, AddressOf OnQBTLParamVMPropertyChanged
Next
m_QBTLParamVMList = New ObservableCollection(Of BTLParamVM)(all)
AddHandler m_QBTLParamVMList.CollectionChanged, AddressOf OnQBTLParamVMListChanged
End Sub
' funzione che aggiorna lo stato, la rotazione e gli errori dopo calcolo
Friend Sub CalcFeatureUpdate(nProgramPage As Integer, ERR As Integer, ROT As Integer, MSG As String)
EgtSetInfo(nFeatureId, If(nProgramPage = ProjectType.PROJ, ITG_PROJ_ERR, ITG_PROD_ERR), ERR, True)
@@ -481,10 +441,6 @@ Public Class BTLFeatureVM
DestBTLPart.NewProcId(), m_BTLFeatureM.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id)
' se è stata creata
If nNewFeatureId <> GDB_ID.NULL Then
' Riporto eventuali indicazioni di parametri Q custom
For Each QPar In QBTLParamVMList
If QPar.bCustom Then EgtSetInfo(nNewFeatureId, QPar.sName & "A", 1)
Next
' Riporto priority
EgtSetInfo(nNewFeatureId, BTL_FTR_PRIORITY, m_BTLFeatureM.nPriority)
Dim NewFeat As BTLFeatureM = BTLFeatureM.CreateBTLFeature(m_BTLPartM, nNewFeatureId)
@@ -660,10 +616,6 @@ Public Class BTLFeatureVM
Dim BTLParamVM As New BTLParamVM(e.NewBTLParam, m_BTLFeatureM)
PBTLParamVMList.Add(BTLParamVM)
End Sub
Private Sub OnQBTLParamAdded(sender As Object, e As BTLParamAddedEventArgs) Handles m_BTLFeatureM.QBTLParamAdded
Dim BTLParamVM As New BTLParamVM(e.NewBTLParam, m_BTLFeatureM)
QBTLParamVMList.Add(BTLParamVM)
End Sub
Private Sub OnPBTLParamVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
@@ -677,18 +629,6 @@ Public Class BTLFeatureVM
Next
End If
End Sub
Private Sub OnQBTLParamVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
For Each BTLParamVM As BTLParamVM In e.NewItems
AddHandler BTLParamVM.PropertyChanged, AddressOf OnQBTLParamVMPropertyChanged
Next
End If
If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
For Each BTLParamVM As BTLParamVM In e.OldItems
RemoveHandler BTLParamVM.PropertyChanged, AddressOf OnQBTLParamVMPropertyChanged
Next
End If
End Sub
Private Sub OnPBTLParamVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
Select Case e.PropertyName
@@ -699,15 +639,6 @@ Public Class BTLFeatureVM
ResetCalcFeature()
End Select
End Sub
Private Sub OnQBTLParamVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
Select Case e.PropertyName
Case NameOf(sender.dValue), NameOf(sender.sValue)
' riseleziono questa feature
SelGeomFeature()
' rendo non calcolata questa feature
ResetCalcFeature()
End Select
End Sub
#End Region ' EVENTS
EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
-4
View File
@@ -1780,10 +1780,6 @@ Public Class BTLPartVM
AddHandler BTLParamVM.PropertyChanged, AddressOf OnBTLPParamVMPropertyChanged
Next
AddHandler BTLFeatureVM.PBTLParamVMList.CollectionChanged, AddressOf OnBTLPParamVMListChanged
For Each BTLParamVM As BTLParamVM In BTLFeatureVM.QBTLParamVMList
AddHandler BTLParamVM.PropertyChanged, AddressOf OnBTLQParamVMPropertyChanged
Next
AddHandler BTLFeatureVM.QBTLParamVMList.CollectionChanged, AddressOf OnBTLQParamVMListChanged
Next
m_BTLFeatureVMList = New ObservableCollection(Of BTLFeatureVM)(all)
EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
+1 -63
View File
@@ -65,38 +65,12 @@ Public Class ConfigurationPageVM
End Get
End Property
'Private m_ConfigMachTableList As New ObservableCollection(Of MachTable)
'Public Property ConfigMachTableList As ObservableCollection(Of MachTable)
' Get
' Return m_ConfigMachTableList
' End Get
' Set(value As ObservableCollection(Of MachTable))
' m_ConfigMachTableList = value
' End Set
'End Property
Public ReadOnly Property Custom_Visibility As Visibility
Get
If QBTLParamVMList(0).bIsP Then
Return Visibility.Collapsed
Else
Return Visibility.Visible
End If
Return Visibility.Visible
End Get
End Property
' lista dei parametri Q di un Process
Private m_QBTLParamVMList_View As CollectionView = Nothing
Protected m_QBTLParamVMList As New ObservableCollection(Of QBTLParamVM)
Public Property QBTLParamVMList As ObservableCollection(Of QBTLParamVM)
Get
Return m_QBTLParamVMList
End Get
Set(value As ObservableCollection(Of QBTLParamVM))
m_QBTLParamVMList = value
End Set
End Property
Private m_PRCList As New ObservableCollection(Of PRC)
Public ReadOnly Property PRCList As ObservableCollection(Of PRC)
Get
@@ -611,42 +585,6 @@ Public Class ConfigurationPageVM
Return False
End Function
' funzione che crea l'elenco dei parametri P o Q di un Process
Public Function CreateProcessParams(GRPType As Integer, PRC As Integer, IsP As Boolean)
Dim ParamIndex As Integer = 1
Dim TempList As New List(Of QBTLParamVM)
Dim NewBTLParam As BTLParamM = Nothing
' leggo tutti i parametri P o Q del Process
ParamIndex = 1
TempList = New List(Of QBTLParamVM)
If IsP Then
While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, 0, IsP, ParamIndex, Nothing, NewBTLParam)
TempList.Add(New QBTLParamVM(NewBTLParam, GRPType, PRC))
ParamIndex += 1
End While
Else
If CurrentMachine.nType = MachineType.BOTH Then
' se macchina di tipo BOTH carico i Q di tipo BEAM e poi di tipo WALL
While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, IsP, ParamIndex, Nothing, NewBTLParam, MachineType.BEAM)
TempList.Add(New QBTLParamVM(NewBTLParam, GRPType, PRC))
ParamIndex += 1
End While
ParamIndex = 1
While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, IsP, ParamIndex, Nothing, NewBTLParam, MachineType.WALL)
TempList.Add(New QBTLParamVM(NewBTLParam, GRPType, PRC))
ParamIndex += 1
End While
Else
' altrimenti carico solo quelli corrispondenti al tipo della macchina selezionata
While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, IsP, ParamIndex, Nothing, NewBTLParam, CurrentMachine.nType)
TempList.Add(New QBTLParamVM(NewBTLParam, GRPType, PRC))
ParamIndex += 1
End While
End If
End If
Return TempList
End Function
#End Region ' Methods
#Region "COMMANDS"
EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
-24
View File
@@ -414,7 +414,6 @@
<DependentUpon>BTLDataV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\BTLPartListVM.vb" />
<Compile Include="ItemParamList\DuploQParameterListVM.vb" />
<Compile Include="ItemParamList\FeatureInPartInRawPartListVM.vb" />
<Compile Include="ItemParamList\FeatureListVM.vb" />
<Compile Include="ItemParamList\BTLPartListV.xaml.vb">
@@ -432,12 +431,6 @@
<Compile Include="ItemParamList\PParameterListV.xaml.vb">
<DependentUpon>PParameterListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\QParameterListProdV.xaml.vb">
<DependentUpon>QParameterListProdV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\QParameterListV.xaml.vb">
<DependentUpon>QParameterListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\RawPartListV.xaml.vb">
<DependentUpon>RawPartListV.xaml</DependentUpon>
</Compile>
@@ -447,11 +440,6 @@
</Compile>
<Compile Include="ItemParamList\PartParametersVM.vb" />
<Compile Include="ItemParamList\PParameterListVM.vb" />
<Compile Include="ItemParamList\QBTLParamVM.vb" />
<Compile Include="ItemParamList\QParameterListVM.vb" />
<Compile Include="ItemParamList\QParamListV.xaml.vb">
<DependentUpon>QParamListV.xaml</DependentUpon>
</Compile>
<Compile Include="ItemParamList\RawPartListVM.vb" />
<Compile Include="LeftPanel\LeftPanelVM.vb" />
<Compile Include="LeftPanel\LeftPanelV.xaml.vb">
@@ -633,14 +621,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\QParameterListProdV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\QParameterListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\RawPartListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -649,10 +629,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ItemParamList\QParamListV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="LeftPanel\LeftPanelV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerVM.vb
-2
View File
@@ -302,7 +302,6 @@ Public Class FreeContourManagerVM
Map.refPartListVM.SetBTLPartListIsEnabled(False)
Map.refFeatureListVM.SetBTLFeatureListIsEnabled(False)
Map.refPParameterListVM.SetPParameterListIsEnabled(False)
Map.refQParameterListVM.SetQParameterListIsEnabled(False)
Map.refShowBeamPanelVM.SetShowSolid_IsEnabled(False)
Map.refShowBeamPanelVM.SetShowAll_IsEnabled(False)
'resetto tutte le variabili
@@ -542,7 +541,6 @@ Public Class FreeContourManagerVM
Map.refPartListVM.SetBTLPartListIsEnabled(True)
Map.refFeatureListVM.SetBTLFeatureListIsEnabled(True)
Map.refPParameterListVM.SetPParameterListIsEnabled(True)
Map.refQParameterListVM.SetQParameterListIsEnabled(True)
Map.refShowBeamPanelVM.SetShowSolid_IsEnabled(True)
Map.refShowBeamPanelVM.SetShowAll_IsEnabled(True)
' reimposto vista normale per pezzo
EgtBEAMWALL.Optimizer/InstrumentPanel/MyInstrumentPanelVM.vb
+1 -6
View File
@@ -105,12 +105,7 @@ Public Class MyInstrumentPanelVM
If ChangeParameterWndVM.SelParam.BTLParamM.nType = BTLParamType.CHECKBOX AndAlso Feature.bDO = ChangeParameterWndVM.SelParam.bActualValue Then
Feature.bDO = ChangeParameterWndVM.SelParam.bNewValue
Else
Dim ParamList As ObservableCollection(Of BTLParamVM)
If ChangeParameterWndVM.SelParam.BTLParamM.bIsP Then
ParamList = Feature.PBTLParamVMList
Else
ParamList = Feature.QBTLParamVMList
End If
Dim ParamList As ObservableCollection(Of BTLParamVM) = Feature.PBTLParamVMList
For Each Param In ParamList.Where(Function(x) x.sName = ChangeParameterWndVM.SelParam.sName)
Select Case Param.nType
Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+1 -2
View File
@@ -48,8 +48,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GroupItem}">
<Expander IsExpanded="True"
Width="{Binding ActualWidth, Converter={StaticResource ExpanderWidthConverter}, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}}}">
<Expander IsExpanded="True">
<Expander.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Path=Name}"
EgtBEAMWALL.Optimizer/ItemParamList/DuploQParameterListVM.vb
-85
View File
@@ -1,85 +0,0 @@
Imports System.Collections.ObjectModel
Imports EgtBEAMWALL.Core
Imports EgtUILib
Public Class DuploQParameterListVM
#Region "FIELDS & PROPERTIES"
Private m_colQParam_Value As EgtDataGridColumn
Public ReadOnly Property colQParam_Value As EgtDataGridColumn
Get
Return m_colQParam_Value
End Get
End Property
Private m_colQParam_Custom As EgtDataGridColumn
Public ReadOnly Property colQParam_Custom As EgtDataGridColumn
Get
Return m_colQParam_Custom
End Get
End Property
Private m_QParameterListColumns As New ObservableCollection(Of EgtDataGridColumn)
Public Property QParameterListColumns As ObservableCollection(Of EgtDataGridColumn)
Get
Return m_QParameterListColumns
End Get
Set(value As ObservableCollection(Of EgtDataGridColumn))
m_QParameterListColumns = value
End Set
End Property
#Region "Messages"
Public ReadOnly Property Custom_Msg As String
Get
Return EgtMsg(61801)
End Get
End Property
Public ReadOnly Property NAM_Msg As String
Get
Return EgtMsg(61808)
End Get
End Property
Public ReadOnly Property Description_Msg As String
Get
Return EgtMsg(61603)
End Get
End Property
Public ReadOnly Property Value_Msg As String
Get
Return EgtMsg(61615)
End Get
End Property
Public ReadOnly Property Min_Msg As String
Get
Return EgtMsg(61616)
End Get
End Property
Public ReadOnly Property Max_Msg As String
Get
Return EgtMsg(61617)
End Get
End Property
#End Region ' Messages
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New()
' carico le colonne della datagrid
GetPrivateProfileColumns(S_DUPLOPARAMETERLIST_Q, QParameterListColumns)
' recupero riferimento a colonna Value e Custom
m_colQParam_Value = QParameterListColumns.FirstOrDefault(Function(x) x.Name = COL_VALUE)
End Sub
#End Region ' CONSTRUCTOR
End Class
EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
+15 -15
View File
@@ -2,21 +2,21 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib">
<EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.FeatureVMList,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureInPartInRawPartListV}}}"
SelectedItem="{Binding Tag.SelFeatureVM,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureInPartInRawPartListV}}}"
SelectionMode="Single"
Margin="0,0,0,5"
BindingColumns="{Binding FeatureInPartInRawPartColumns}"
BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
Style="{StaticResource DataGrid_OnlyProd}">
<EgwWPFBaseLib:EgwDataGrid ItemsSource="{Binding Tag.FeatureVMList,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureInPartInRawPartListV}}}"
SelectedItem="{Binding Tag.SelFeatureVM,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureInPartInRawPartListV}}}"
SelectionMode="Single"
Margin="0,0,0,5"
ColumnLayouts="{Binding FeatureInPartInRawPartColumns}"
BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
Style="{StaticResource DataGrid_OnlyProd}">
<DataGrid.InputBindings>
<KeyBinding Key="Delete" Command="{Binding Tag.SelFeatureVM.DeleteFeature_Command,
@@ -101,6 +101,6 @@
</DataGridTemplateColumn>
</DataGrid.Resources>
</EgtBEAMWALLCORE:EgtDataGrid>
</EgwWPFBaseLib:EgwDataGrid>
</UserControl>
EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
+23 -11
View File
@@ -2,32 +2,33 @@
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
Imports System.IO
Public Class FeatureInPartInRawPartListVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Private m_colFeatureInPartInRawPart_Do As EgtDataGridColumn
Public ReadOnly Property colFeatureInPartInRawPart_Do As EgtDataGridColumn
Private m_colFeatureInPartInRawPart_Do As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colFeatureInPartInRawPart_Do As EgwWPFBaseLib.ColumnLayout
Get
Return m_colFeatureInPartInRawPart_Do
End Get
End Property
Private m_colFeatureInPartInRawPart_Priority As EgtDataGridColumn
Public ReadOnly Property colFeatureInPartInRawPart_Priority As EgtDataGridColumn
Private m_colFeatureInPartInRawPart_Priority As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colFeatureInPartInRawPart_Priority As EgwWPFBaseLib.ColumnLayout
Get
Return m_colFeatureInPartInRawPart_Priority
End Get
End Property
Private m_FeatureInPartInRawPartColumns As New ObservableCollection(Of EgtDataGridColumn)
Public Property FeatureInPartInRawPartColumns As ObservableCollection(Of EgtDataGridColumn)
Private m_FeatureInPartInRawPartColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
Public Property FeatureInPartInRawPartColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
Get
Return m_FeatureInPartInRawPartColumns
End Get
Set(value As ObservableCollection(Of EgtDataGridColumn))
Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout))
m_FeatureInPartInRawPartColumns = value
End Set
End Property
@@ -61,11 +62,22 @@ Public Class FeatureInPartInRawPartListVM
Sub New()
' 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
GetPrivateProfileColumns(S_FEATUREINPARTINRAWPARTLIST, FeatureInPartInRawPartColumns)
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.Name = COL_DO)
m_colFeatureInPartInRawPart_Priority = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_PRIORITY)
m_colFeatureInPartInRawPart_Do = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_DO)
m_colFeatureInPartInRawPart_Priority = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_PRIORITY)
End Sub
#End Region ' Constructor
@@ -74,7 +86,7 @@ Public Class FeatureInPartInRawPartListVM
Friend Sub UpdateColumns(nProjectType As BWType)
If Not IsNothing(m_colFeatureInPartInRawPart_Priority) Then
m_colFeatureInPartInRawPart_Priority.Visible = (nProjectType = BWType.WALL AndAlso CurrentMachine.bIsEnabledPriority)
m_colFeatureInPartInRawPart_Priority.IsVisible = (nProjectType = BWType.WALL AndAlso CurrentMachine.bIsEnabledPriority)
End If
End Sub
EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
+16 -22
View File
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib">
<Grid Margin="5">
<Grid.RowDefinitions>
@@ -13,18 +13,18 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
SelectionMode="Single"
Margin="0,0,0,5"
ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PParameterListV}}}"
SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PParameterListV}}}"
IsEnabled="{Binding PParameterList_IsEnabled}"
BindingColumns="{Binding PParameterListColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderStyle="{StaticResource PParam_DataGridColumnHeader}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
Style="{StaticResource DataGrid_OnlyProd}">
<EgwWPFBaseLib:EgwDataGrid CanUserDeleteRows="False"
SelectionMode="Single"
Margin="0,0,0,5"
ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PParameterListV}}}"
SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PParameterListV}}}"
IsEnabled="{Binding PParameterList_IsEnabled}"
ColumnLayouts="{Binding PParameterListColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderStyle="{StaticResource PParam_DataGridColumnHeader}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
Style="{StaticResource DataGrid_OnlyProd}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<EventSetter Event="PreviewMouseDown" Handler="PParameterList_PreviewMouseDown"/>
@@ -43,8 +43,8 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
VerticalAlignment="Center"/>
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
VerticalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -75,12 +75,6 @@
<ToolTip.Content>
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProd_TextBlock}"/>
<!--<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProd_TextBlock}"/>
<Image Source="{Binding sDrawPath}"
Style="{StaticResource OnlyProdFeatureList_Image}"/>
</StackPanel>-->
</ToolTip.Content>
</ToolTip>
</TextBlock.ToolTip>
@@ -130,7 +124,7 @@
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
</DataGrid.Resources>
</EgtBEAMWALLCORE:EgtDataGrid>
</EgwWPFBaseLib:EgwDataGrid>
<Image Grid.Column="1" Width="250"
Source="{Binding sCurrDraw}"
EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb
+19 -9
View File
@@ -2,25 +2,26 @@
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
Imports System.IO
Public Class PParameterListVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Private m_colPParam_Value As EgtDataGridColumn
Public ReadOnly Property colPParam_Value As EgtDataGridColumn
Private m_colPParam_Value As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colPParam_Value As EgwWPFBaseLib.ColumnLayout
Get
Return m_colPParam_Value
End Get
End Property
Private m_PParameterListColumns As New ObservableCollection(Of EgtDataGridColumn)
Public Property PParameterListColumns As ObservableCollection(Of EgtDataGridColumn)
Private m_PParameterListColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
Public Property PParameterListColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
Get
Return m_PParameterListColumns
End Get
Set(value As ObservableCollection(Of EgtDataGridColumn))
Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout))
m_PParameterListColumns = value
End Set
End Property
@@ -108,10 +109,21 @@ Public Class PParameterListVM
Sub New()
' Aggiungo riferimento a Map
Map.SetRefPParameterListVM(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("colDESC", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
' New EgwWPFBaseLib.ColumnLayout("colVALUE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True),
' New EgwWPFBaseLib.ColumnLayout("colMIN", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True),
' New EgwWPFBaseLib.ColumnLayout("colMAX", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True)})
'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARAMETERLIST_P, NewColumnList)
' carico le colonne della datagrid
GetPrivateProfileColumns(S_PARAMETERLIST_P, PParameterListColumns)
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARAMETERLIST_P, PParameterListColumns)
'' carico le colonne della datagrid
'GetPrivateProfileColumns(S_PARAMETERLIST_P, PParameterListColumns)
' recupero riferimento a colonna Value
m_colPParam_Value = PParameterListColumns.FirstOrDefault(Function(x) x.Name = COL_VALUE)
m_colPParam_Value = PParameterListColumns.FirstOrDefault(Function(x) x.Key = COL_VALUE)
End Sub
#End Region ' CONSTRUCTOR
@@ -139,11 +151,9 @@ Public Class PParameterListVM
End Property
Public Sub Ok()
'Map.refForcedStrategyBTLVM.ForcedStrategy()
Map.refProdManagerVM.CopyBuilding()
Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.ResetCalcFeature()
Map.refProjectVM.BTLStructureVM.SelBTLPart.ResetCalcPart()
Map.refForcedStrategyPanelVM.ForcedStrategy()
Map.refProjectVM.SetRawPartManagerVisibility(Visibility.Visible)
Map.refProjectVM.SetStrategyManagerVisibility(Visibility.Collapsed)
EgtBEAMWALL.Optimizer/ItemParamList/QBTLParamVM.vb
-54
View File
@@ -1,54 +0,0 @@
Imports EgtBEAMWALL.Core
Public Class QBTLParamVM
Inherits BTLParamVM
#Region "FIELDS & PROPERTIES"
Private m_Process As Integer
Public Property Process As Integer
Get
Return m_Process
End Get
Set(value As Integer)
m_Process = value
End Set
End Property
Private m_GroupType As GRPType
Public ReadOnly Property GroupType As String
Get
If m_GroupType = GRPType.T Then Return "T"
If m_GroupType = GRPType.L Then Return "L"
Return ""
End Get
End Property
Private m_Name As String
Public ReadOnly Property Name As String
Get
Return m_Name
End Get
End Property
Public ReadOnly Property ghDesc As String
Get
Return GroupType & Process.ToString("000") & " " & Name
End Get
End Property
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New(BTLParamM As BTLParamM, GroupType As GRPType, Process As Integer)
MyBase.New(BTLParamM)
m_BTLParamM = BTLParamM
m_Process = Process
m_GroupType = GroupType
m_Name = GetBeamPrivateProfileName(GroupType, Process)
End Sub
#End Region ' CONSTRUCTOR
End Class
EgtBEAMWALL.Optimizer/ItemParamList/QParamListV.xaml
-79
View File
@@ -1,79 +0,0 @@
<DataGrid x:Class="QParamListV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Optimizer"
AutoGenerateColumns="False"
CanUserSortColumns="False"
CanUserResizeColumns="False"
CanUserResizeRows="False"
CanUserReorderColumns="False"
SelectionMode="Single"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
Margin="0,0,0,5">
<DataGrid.Columns>
<!--BWType-->
<DataGridTextColumn Binding="{Binding sBWType}"
Width="40"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Nome-->
<DataGridTextColumn Binding="{Binding sName}"
Width="50"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Descrizione-->
<DataGridTextColumn Binding="{Binding sDescription}"
Width="1*"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Default-->
<DataGridTextColumn Binding="{Binding sDefault}"
Width="65">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Minimo-->
<DataGridTextColumn Binding="{Binding sMin}"
Width="65"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Massimo-->
<DataGridTextColumn Binding="{Binding sMax}"
Width="65"
IsReadOnly="True">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
EgtBEAMWALL.Optimizer/ItemParamList/QParamListV.xaml.vb
-3
View File
@@ -1,3 +0,0 @@
Public Class QParamListV
End Class
EgtBEAMWALL.Optimizer/ItemParamList/QParameterListProdV.xaml
-116
View File
@@ -1,116 +0,0 @@
<UserControl x:Class="QParameterListProdV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Optimizer"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
<EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
SelectionMode="Single"
Margin="0,0,0,5"
ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListProdV}}}"
SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListProdV}}}"
BeginningEdit="QParameterList_BeginningEdit"
IsEnabled="{Binding QParameterList_IsEnabled}"
BindingColumns="{Binding QParameterListColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
CellStyle="{StaticResource CellDataGrid_CustomHighLight_PartList}"
Style="{StaticResource DataGrid_OnlyProd}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<EventSetter Event="PreviewMouseDown" Handler="QParameterList_PreviewMouseDown"/>
</Style>
</DataGrid.RowStyle>
<DataGrid.Resources>
<EgtBEAMWALL:TrimmedTextBlockVisibilityConverter x:Key="TrimToVisConverter" />
<!--Custom-->
<DataGridTemplateColumn x:Key="colCUSTOM">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Custom_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
VerticalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--Nome-->
<DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Descrizione-->
<DataGridTextColumn x:Key="colDESC" Binding="{Binding sDescription}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.CellStyle>
<Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource CellDataGrid_CustomHighLight_PartList}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProdQParameterListProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OnlyProd_ToolTip}">
<ToolTip.Content>
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
<Image Source="{Binding sDrawPath}"
Style="{StaticResource OnlyProdFeatureList_Image}"/>
</StackPanel>
</ToolTip.Content>
</ToolTip>
</TextBlock.ToolTip>
</TextBlock>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</DataGridTextColumn.CellStyle>
</DataGridTextColumn>
<!--Valore-->
<DataGridTextColumn x:Key="colVALUE" Binding="{Binding sValue}" SortMemberPath="dValue">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Value_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
<!--Minimo-->
<DataGridTextColumn x:Key="colMIN" Binding="{Binding sMin}" SortMemberPath="dMin">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Massimo-->
<DataGridTextColumn x:Key="colMAX" Binding="{Binding sMax}" SortMemberPath="dMax">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
</DataGrid.Resources>
</EgtBEAMWALLCORE:EgtDataGrid>
</UserControl>
EgtBEAMWALL.Optimizer/ItemParamList/QParameterListProdV.xaml.vb
-27
View File
@@ -1,27 +0,0 @@
Imports EgtBEAMWALL.Core
Imports EgtBEAMWALL.Core.ConstGen
Public Class QParameterListProdV
Private Sub QParameterList_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
If TypeOf sender Is DataGridRow Then
Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
If Not IsNothing(Row) AndAlso Row.IsSelected AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then
Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SelPBTLParam = Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SelPBTLParam
End If
End If
End Sub
' funzione che impedisce di editare le righe che sono gia' in produzione
Private Sub QParameterList_BeginningEdit(sender As Object, e As DataGridBeginningEditEventArgs)
If IsNothing(e.Row) Then Return
If Map.refMainMenuVM.SelPage <> Pages.MACHINING Then Return
Dim RowVM As BTLParamVM = DirectCast(e.Row.DataContext, BTLParamVM)
' se in produzione impedisco modifica dei parametri
If DirectCast(RowVM.BTLParamM.ParentFeature.ParentPart, PartM).nProductionState > ItemState.ND Then
'For Each cell In Row.Item
e.Cancel = True
End If
End Sub
End Class
EgtBEAMWALL.Optimizer/ItemParamList/QParameterListV.xaml
-116
View File
@@ -1,116 +0,0 @@
<UserControl x:Class="QParameterListV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Optimizer"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
<EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
SelectionMode="Single"
Margin="0,0,0,5"
ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
BeginningEdit="QParameterList_BeginningEdit"
IsEnabled="{Binding QParameterList_IsEnabled}"
BindingColumns="{Binding QParameterListColumns}"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
Style="{StaticResource DataGrid_OnlyProd}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<EventSetter Event="PreviewMouseDown" Handler="QParameterList_PreviewMouseDown"/>
</Style>
</DataGrid.RowStyle>
<DataGrid.Resources>
<EgtBEAMWALL:TrimmedTextBlockVisibilityConverter x:Key="TrimToVisConverter" />
<!--Custom-->
<DataGridTemplateColumn x:Key="colCUSTOM">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Custom_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
VerticalAlignment="Center"
HorizontalAlignment="Center"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--Nome-->
<DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Descrizione-->
<DataGridTextColumn x:Key="colDESC" Binding="{Binding sDescription}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.CellStyle>
<Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource CellDataGrid_CustomHighLight}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
Style="{StaticResource OnlyProd_TextBlock}">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OnlyProd_ToolTip}">
<ToolTip.Content>
<StackPanel Orientation="Vertical">
<TextBlock Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"/>
<Image Source="{Binding sDrawPath}"
Style="{StaticResource OnlyProdFeatureList_Image}"/>
</StackPanel>
</ToolTip.Content>
</ToolTip>
</TextBlock.ToolTip>
</TextBlock>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</DataGridTextColumn.CellStyle>
</DataGridTextColumn>
<!--Valore-->
<DataGridTextColumn x:Key="colVALUE" Binding="{Binding sValue}" SortMemberPath="dValue">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Value_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
</Style>
</DataGridTextColumn.EditingElementStyle>
</DataGridTextColumn>
<!--Minimo-->
<DataGridTextColumn x:Key="colMIN" Binding="{Binding sMin}" SortMemberPath="dMin">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--Massimo-->
<DataGridTextColumn x:Key="colMAX" Binding="{Binding sMax}" SortMemberPath="dMax">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
</DataGrid.Resources>
</EgtBEAMWALLCORE:EgtDataGrid>
</UserControl>
EgtBEAMWALL.Optimizer/ItemParamList/QParameterListV.xaml.vb
-26
View File
@@ -1,26 +0,0 @@
Imports EgtBEAMWALL.Core
Public Class QParameterListV
Private Sub QParameterList_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
If TypeOf sender Is DataGridRow Then
Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
If Not IsNothing(Row) AndAlso Row.IsSelected AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then
Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SelPBTLParam = Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SelPBTLParam
End If
End If
End Sub
' funzione che impedisce di editare le righe che sono gia' in produzione
Private Sub QParameterList_BeginningEdit(sender As Object, e As DataGridBeginningEditEventArgs)
If IsNothing(e.Row) Then Return
If Map.refMainMenuVM.SelPage <> Pages.MACHINING Then Return
Dim RowVM As BTLParamVM = DirectCast(e.Row.DataContext, BTLParamVM)
' se in produzione impedisco modifica dei parametri
If DirectCast(RowVM.BTLParamM.ParentFeature.ParentPart, PartM).nProductionState > ItemState.ND Then
'For Each cell In Row.Item
e.Cancel = True
End If
End Sub
End Class
EgtBEAMWALL.Optimizer/ItemParamList/QParameterListVM.vb
-109
View File
@@ -1,109 +0,0 @@
Imports System.Collections.ObjectModel
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
Public Class QParameterListVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Private m_colQParam_Value As EgtDataGridColumn
Public ReadOnly Property colQParam_Value As EgtDataGridColumn
Get
Return m_colQParam_Value
End Get
End Property
Private m_colQParam_Custom As EgtDataGridColumn
Public ReadOnly Property colQParam_Custom As EgtDataGridColumn
Get
Return m_colQParam_Custom
End Get
End Property
Private m_QParameterListColumns As New ObservableCollection(Of EgtDataGridColumn)
Public Property QParameterListColumns As ObservableCollection(Of EgtDataGridColumn)
Get
Return m_QParameterListColumns
End Get
Set(value As ObservableCollection(Of EgtDataGridColumn))
m_QParameterListColumns = value
End Set
End Property
Private m_QParameterList_IsEnabled As Boolean = True
Public Property QParameterList_IsEnabled As Boolean
Get
Return m_QParameterList_IsEnabled
End Get
Set(value As Boolean)
m_QParameterList_IsEnabled = value
End Set
End Property
#Region "Messages"
Public ReadOnly Property Custom_Msg As String
Get
Return EgtMsg(61801)
End Get
End Property
Public ReadOnly Property NAM_Msg As String
Get
Return EgtMsg(61808)
End Get
End Property
Public ReadOnly Property Description_Msg As String
Get
Return EgtMsg(61603)
End Get
End Property
Public ReadOnly Property Value_Msg As String
Get
Return EgtMsg(61615)
End Get
End Property
Public ReadOnly Property Min_Msg As String
Get
Return EgtMsg(61616)
End Get
End Property
Public ReadOnly Property Max_Msg As String
Get
Return EgtMsg(61617)
End Get
End Property
#End Region ' Messages
#End Region ' FIELDS & PROPERTIES
#Region "CONSTRUCTOR"
Sub New()
' Aggiungo riferimento a Map
Map.SetRefQParameterListVM(Me)
' carico le colonne della datagrid
GetPrivateProfileColumns(S_PARAMETERLIST_Q, QParameterListColumns)
' recupero riferimento a colonna Value e Custom
m_colQParam_Value = QParameterListColumns.FirstOrDefault(Function(x) x.Name = COL_VALUE)
m_colQParam_Custom = QParameterListColumns.FirstOrDefault(Function(x) x.Name = COL_CUSTOM)
End Sub
#End Region ' CONSTRUCTOR
#Region "METHODS"
Friend Sub SetQParameterListIsEnabled(bIsEnabled As Boolean)
m_QParameterList_IsEnabled = bIsEnabled
NotifyPropertyChanged(NameOf(QParameterList_IsEnabled))
End Sub
#End Region ' METHODS
End Class
EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+78 -64
View File
@@ -2,23 +2,23 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib">
<EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.MachGroupVMList,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
SelectedItem="{Binding Tag.SelectedMachGroup,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
CanUserDeleteRows="False"
SelectionMode="Single"
Margin="2.5,0,0,5"
BindingColumns="{Binding RawPartColumns}"
BeginningEdit="RawPartList_BeginningEdit"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
RowBackground="{StaticResource BeamWall_BLackSqueeze}"
Style="{StaticResource DataGrid_OnlyProd}">
<EgwWPFBaseLib:EgwDataGrid ItemsSource="{Binding Tag.MachGroupVMList,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
SelectedItem="{Binding Tag.SelectedMachGroup,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
CanUserDeleteRows="False"
SelectionMode="Single"
Margin="2.5,0,0,5"
ColumnLayouts="{Binding RawPartColumns}"
BeginningEdit="RawPartList_BeginningEdit"
AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
AlternationCount="2"
ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
RowBackground="{StaticResource BeamWall_BLackSqueeze}"
Style="{StaticResource DataGrid_OnlyProd}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Setter Property="Background" Value="{Binding Background}"/>
@@ -35,9 +35,11 @@
<!--ID - Id gruppo-->
<DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}"
SortMemberPath="nName">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.ID_Msg, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
</DataGridTextColumn.Header>
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.ID_Msg, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.CellStyle>
<Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource CellDataGrid_CustomHighLight}">
<Setter Property="BorderBrush" Value="{Binding Search_Background}"/>
@@ -83,7 +85,7 @@
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.StartOffset_Msg,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
@@ -94,10 +96,12 @@
</DataGridTextColumn>
<!--W - Larghezza-->
<DataGridTextColumn x:Key="colW" Binding="{Binding sW}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.W_Msg,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
</DataGridTextColumn.Header>
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.W_Msg,
RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
@@ -106,10 +110,12 @@
</DataGridTextColumn>
<!--H - Altezza-->
<DataGridTextColumn x:Key="colH" Binding="{Binding sH}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.H_Msg,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
</DataGridTextColumn.Header>
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.H_Msg,
RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
@@ -118,10 +124,12 @@
</DataGridTextColumn>
<!--L - Lunghezza-->
<DataGridTextColumn x:Key="colL" Binding="{Binding sL}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.L_Msg,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
</DataGridTextColumn.Header>
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.L_Msg,
RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="Blue" />
@@ -133,7 +141,7 @@
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.PosZ_Msg,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.EditingElementStyle>
@@ -144,24 +152,30 @@
</DataGridTextColumn>
<!--MAT - Materiale-->
<DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.Material_Msg,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
</DataGridTextColumn.Header>
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Material_Msg,
RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--% - % utilizzo-->
<DataGridTextColumn x:Key="colUSAGE" Binding="{Binding sUsage}" SortMemberPath="dUsage">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.Used_Msg,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
</DataGridTextColumn.Header>
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Used_Msg,
RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--S - Scarti-->
<DataGridTextColumn x:Key="colWASTE" Binding="{Binding sWaste}" SortMemberPath="dWaste">
<DataGridTextColumn.Header>
<TextBlock Text="{Binding Path=DataContext.Waste_Msg,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"/>
</DataGridTextColumn.Header>
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=DataContext.Waste_Msg,
RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<!--VER - Verfica-->
<DataGridTemplateColumn x:Key="colVERIFY">
@@ -285,23 +299,23 @@
<DataGrid.RowDetailsTemplate>
<DataTemplate>
<StackPanel>
<EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.SelectedMachGroup.PartVMList,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
SelectedItem="{Binding Tag.SelectedMachGroup.SelPart,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
CanUserDeleteRows="False"
CanUserSortColumns="False"
SelectionMode="Single"
Margin="15,0,0,5"
BeginningEdit="PartInRawPartList_BeginningEdit"
BindingColumns="{Binding DataContext.PartInRawPartColumns, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
ColumnHeaderStyle="{StaticResource RawPart_DataGridColumnHeader}"
GridLinesVisibility="None"
BorderThickness="0"
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
Width="860"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
Style="{StaticResource DataGrid_OnlyProd}">
<EgwWPFBaseLib:EgwDataGrid ItemsSource="{Binding Tag.SelectedMachGroup.PartVMList,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
SelectedItem="{Binding Tag.SelectedMachGroup.SelPart,
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
CanUserDeleteRows="False"
CanUserSortColumns="False"
SelectionMode="Single"
Margin="15,0,0,5"
BeginningEdit="PartInRawPartList_BeginningEdit"
ColumnLayouts="{Binding DataContext.PartInRawPartColumns, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}"
ColumnHeaderStyle="{StaticResource RawPart_DataGridColumnHeader}"
GridLinesVisibility="None"
BorderThickness="0"
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
Width="860"
CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
Style="{StaticResource DataGrid_OnlyProd}">
<DataGrid.RowStyle>
<Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
<Setter Property="Background" Value="{Binding Background}"/>
@@ -576,11 +590,11 @@
RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}" />
</DataGrid.InputBindings>
</EgtBEAMWALLCORE:EgtDataGrid>
</EgwWPFBaseLib:EgwDataGrid>
</StackPanel>
</DataTemplate>
</DataGrid.RowDetailsTemplate>
</EgtBEAMWALLCORE:EgtDataGrid>
</EgwWPFBaseLib:EgwDataGrid>
</UserControl>
EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
+87 -51
View File
@@ -1,90 +1,91 @@
Imports System.Collections.ObjectModel
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports System.IO
Public Class RawPartListVM
#Region "FIELDS & PROPERTIES"
Private m_colRawPart_StartCut As EgtDataGridColumn
Public ReadOnly Property colRawPart_StartCut As EgtDataGridColumn
Private m_colRawPart_StartCut As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colRawPart_StartCut As EgwWPFBaseLib.ColumnLayout
Get
Return m_colRawPart_StartCut
End Get
End Property
Private m_colRawPart_W As EgtDataGridColumn
Public ReadOnly Property colRawPart_W As EgtDataGridColumn
Private m_colRawPart_W As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colRawPart_W As EgwWPFBaseLib.ColumnLayout
Get
Return m_colRawPart_W
End Get
End Property
Private m_colRawPart_L As EgtDataGridColumn
Public ReadOnly Property colRawPart_L As EgtDataGridColumn
Private m_colRawPart_L As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colRawPart_L As EgwWPFBaseLib.ColumnLayout
Get
Return m_colRawPart_L
End Get
End Property
Private m_colRawPart_PosZ As EgtDataGridColumn
Public ReadOnly Property colRawPart_PosZ As EgtDataGridColumn
Private m_colRawPart_PosZ As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colRawPart_PosZ As EgwWPFBaseLib.ColumnLayout
Get
Return m_colRawPart_PosZ
End Get
End Property
Private m_RawPartColumns As New ObservableCollection(Of EgtDataGridColumn)
Public Property RawPartColumns As ObservableCollection(Of EgtDataGridColumn)
Private m_RawPartColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
Public Property RawPartColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
Get
Return m_RawPartColumns
End Get
Set(value As ObservableCollection(Of EgtDataGridColumn))
Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout))
m_RawPartColumns = value
End Set
End Property
Private m_colPartInRawPart_Offset As EgtDataGridColumn
Public ReadOnly Property colPartInRawPart_Offset As EgtDataGridColumn
Private m_colPartInRawPart_Offset As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colPartInRawPart_Offset As EgwWPFBaseLib.ColumnLayout
Get
Return m_colPartInRawPart_Offset
End Get
End Property
Private m_colPartInRawPart_Rot As EgtDataGridColumn
Public ReadOnly Property colPartInRawPart_Rot As EgtDataGridColumn
Private m_colPartInRawPart_Rot As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colPartInRawPart_Rot As EgwWPFBaseLib.ColumnLayout
Get
Return m_colPartInRawPart_Rot
End Get
End Property
Private m_colPartInRawPart_Flip As EgtDataGridColumn
Public ReadOnly Property colPartInRawPart_Flip As EgtDataGridColumn
Private m_colPartInRawPart_Flip As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colPartInRawPart_Flip As EgwWPFBaseLib.ColumnLayout
Get
Return m_colPartInRawPart_Flip
End Get
End Property
Private m_colPartInRawPart_PosX As EgtDataGridColumn
Public ReadOnly Property colPartInRawPart_PosX As EgtDataGridColumn
Private m_colPartInRawPart_PosX As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colPartInRawPart_PosX As EgwWPFBaseLib.ColumnLayout
Get
Return m_colPartInRawPart_PosX
End Get
End Property
Private m_colPartInRawPart_PosY As EgtDataGridColumn
Public ReadOnly Property colPartInRawPart_PosY As EgtDataGridColumn
Private m_colPartInRawPart_PosY As EgwWPFBaseLib.ColumnLayout
Public ReadOnly Property colPartInRawPart_PosY As EgwWPFBaseLib.ColumnLayout
Get
Return m_colPartInRawPart_PosY
End Get
End Property
Private m_PartInRawPartColumns As New ObservableCollection(Of EgtDataGridColumn)
Public Property PartInRawPartColumns As ObservableCollection(Of EgtDataGridColumn)
Private m_PartInRawPartColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
Public Property PartInRawPartColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
Get
Return m_PartInRawPartColumns
End Get
Set(value As ObservableCollection(Of EgtDataGridColumn))
Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout))
m_PartInRawPartColumns = value
End Set
End Property
@@ -211,6 +212,37 @@ Public Class RawPartListVM
Sub New()
' 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)
End Sub
#End Region ' CONSTRUCTOR
@@ -219,40 +251,44 @@ Public Class RawPartListVM
Friend Sub UpdateColumns(nProjectType As BWType)
If nProjectType = BWType.BEAM Then
RawPartColumns.Clear()
GetPrivateProfileColumns(S_RAWPARTLIST_BEAM, RawPartColumns)
'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)
'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)
'GetPrivateProfileColumns(S_RAWPARTLIST_WALL, RawPartColumns)
PartInRawPartColumns.Clear()
GetPrivateProfileColumns(S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
'GetPrivateProfileColumns(S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
End If
' recupero riferimento a colonna StartCut
m_colRawPart_StartCut = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_STARTCUT)
m_colRawPart_W = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_W)
m_colRawPart_L = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_L)
m_colRawPart_PosZ = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSZ)
' aggiorno la visibilità delle colonne
For Each col In RawPartColumns
col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
Next
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.Name = COL_OFFSET)
m_colPartInRawPart_Rot = PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_ROT)
m_colPartInRawPart_Flip = PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_FLIP)
m_colPartInRawPart_PosX = PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSX)
m_colPartInRawPart_PosY = PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = 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
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
EgtBEAMWALL.Optimizer/MachGroupPanel/PartVM.vb
-6
View File
@@ -700,12 +700,6 @@ Public Class PartVM
For Each BTLFeatureVM As BTLFeatureVM In all
AddHandler BTLFeatureVM.PropertyChanged, AddressOf OnBTLFeatureVMPropertyChanged
If ParentMachGroupVM.nType = BWType.WALL Then
For Each BTLParamVM As BTLParamVM In BTLFeatureVM.QBTLParamVMList
AddHandler BTLParamVM.PropertyChanged, AddressOf OnBTLQParamVMPropertyChanged
Next
AddHandler BTLFeatureVM.QBTLParamVMList.CollectionChanged, AddressOf OnBTLQParamVMListChanged
End If
Next
m_FeatureVMList = New ObservableCollection(Of Core.BTLFeatureVM)(all)
EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
+5 -1
View File
@@ -404,7 +404,11 @@ Public Class MainWindowVM
' chiudo esecutore Engine
MyExecProcessManager.Close()
' salvo tabelle
Dim DataGridColumnDictionary As New Dictionary(Of String, ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) From {{S_PARTLIST, Map.refPartListVM.PartColumns}}
Dim DataGridColumnDictionary As New Dictionary(Of String, ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) From {{S_PARTLIST, Map.refPartListVM.PartColumns},
{S_RAWPARTLIST_BEAM, Map.refRawPartListVM.RawPartColumns},
{S_PARTINRAWPARTLIST_BEAM, Map.refRawPartListVM.PartInRawPartColumns},
{S_FEATUREINPARTINRAWPARTLIST, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns},
{S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns}}
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
' Termino il Model
m_MainWindowM.Close()
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("2.7.10.3")>
<Assembly: AssemblyFileVersion("2.7.10.3")>
<Assembly: AssemblyVersion("2.7.10.4")>
<Assembly: AssemblyFileVersion("2.7.10.4")>
EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndVM.vb
-7
View File
@@ -680,13 +680,6 @@ Public Class NestingRunningWndVM
Next
' rileggo ROTATED e INVERTED di tutti i pezzi
Map.refProjectVM.BTLStructureVM.RefreshRotFlip()
'' aggiorno eventuali Q della feature selezionata
If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then
For Each QParam In Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.QBTLParamVMList
QParam.NotifyPropertyChanged(NameOf(QParam.sValue))
QParam.NotifyPropertyChanged(NameOf(QParam.bCustom))
Next
End If
EgtDraw()
' riabilito interfaccia
Map.refProjectVM.SetCalcRunning(False)
EgtBEAMWALL.Optimizer/Project/ProjectVM.vb
+7 -19
View File
@@ -424,12 +424,6 @@ Public Class ProjectVM
If Not IsNothing(Map.refPParameterListVM.colPParam_Value) Then
Map.refPParameterListVM.colPParam_Value.IsReadOnly = True
End If
If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Value) Then
Map.refQParameterListVM.colQParam_Value.IsReadOnly = True
End If
If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Custom) Then
Map.refQParameterListVM.colQParam_Custom.IsReadOnly = True
End If
If Not IsNothing(Map.refRawPartListVM.colRawPart_StartCut) Then
Map.refRawPartListVM.colRawPart_StartCut.IsReadOnly = True
End If
@@ -466,31 +460,25 @@ Public Class ProjectVM
ManageIsEnabled(True)
' aggiungere gestione colonne editabili delle tabelle
If Not IsNothing(Map.refPartListVM.colPart_Do) Then
Map.refPartListVM.colPart_Do.ResetIsReadOnlytoorig()
Map.refPartListVM.colPart_Do.ResetIsReadOnlyToOrig()
End If
If Not IsNothing(Map.refFeatureListVM) AndAlso Not IsNothing(Map.refFeatureListVM.colFeature_Do) Then
Map.refFeatureListVM.colFeature_Do.ResetToOrigIsReadOnly()
End If
If Not IsNothing(Map.refPParameterListVM.colPParam_Value) Then
Map.refPParameterListVM.colPParam_Value.ResetToOrigIsReadOnly()
End If
If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Value) Then
Map.refQParameterListVM.colQParam_Value.ResetToOrigIsReadOnly()
End If
If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Custom) Then
Map.refQParameterListVM.colQParam_Custom.ResetToOrigIsReadOnly()
Map.refPParameterListVM.colPParam_Value.ResetIsReadOnlyToOrig()
End If
If Not IsNothing(Map.refRawPartListVM.colRawPart_StartCut) Then
Map.refRawPartListVM.colRawPart_StartCut.ResetToOrigIsReadOnly()
Map.refRawPartListVM.colRawPart_StartCut.ResetIsReadOnlyToOrig()
End If
If m_BTLStructureVM.nPROJTYPE <> BWType.BEAM AndAlso Not IsNothing(Map.refRawPartListVM.colRawPart_W) Then
Map.refRawPartListVM.colRawPart_W.ResetToOrigIsReadOnly()
Map.refRawPartListVM.colRawPart_W.ResetIsReadOnlyToOrig()
End If
If Not IsNothing(Map.refRawPartListVM.colRawPart_L) Then
Map.refRawPartListVM.colRawPart_L.ResetToOrigIsReadOnly()
Map.refRawPartListVM.colRawPart_L.ResetIsReadOnlyToOrig()
End If
If Not IsNothing(Map.refRawPartListVM.colRawPart_PosZ) Then
Map.refRawPartListVM.colRawPart_PosZ.ResetToOrigIsReadOnly()
Map.refRawPartListVM.colRawPart_PosZ.ResetIsReadOnlyToOrig()
End If
If Not IsNothing(Map.refPartInRawPartListVM) AndAlso Not IsNothing(Map.refPartInRawPartListVM.colPartInRawPart_Offset) Then
Map.refPartInRawPartListVM.colPartInRawPart_Offset.ResetToOrigIsReadOnly()
@@ -508,7 +496,7 @@ Public Class ProjectVM
Map.refPartInRawPartListVM.colPartInRawPart_PosY.ResetToOrigIsReadOnly()
End If
If Not IsNothing(Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Do) Then
Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Do.ResetToOrigIsReadOnly()
Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Do.ResetIsReadOnlyToOrig()
End If
' fermo il timer
If Not m_bCalcRunning Then
EgtBEAMWALL.Optimizer/Utility/Configuration.vb
+10 -6
View File
@@ -1,4 +1,5 @@
Imports EgtBEAMWALL.Core
Imports System.Threading
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports MigraDoc.DocumentObjectModel
Imports MigraDoc.Rendering
@@ -25,10 +26,6 @@ Module Configuration
Dim document As Document = PDFHelper.CreateStatReport(ActivePage, bPreview)
Dim documentPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\MigraDoc.mdddl"
MigraDoc.DocumentObjectModel.IO.DdlWriter.WriteToFile(document, documentPath)
Dim renderer As New PdfDocumentRenderer(True) With {
.Document = document
}
renderer.RenderDocument()
' salvo il documento
Dim sFileName As String = ""
@@ -42,9 +39,16 @@ Module Configuration
sFileName = Map.refMainWindowVM.MainWindowM.sTempDir & "\Statistics.pdf"
PrevSelect()
End If
Dim ExecThread As New Thread(Sub()
Dim renderer As New PdfDocumentRenderer(True) With {
.Document = document
}
renderer.RenderDocument()
renderer.PdfDocument.Save(sFileName)
End Sub)
ExecThread.Start()
' avvio il visualizzatore
renderer.PdfDocument.Save(sFileName)
' cancello file MigraDoc
System.IO.File.Delete(documentPath)
EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
-2
View File
@@ -31,8 +31,6 @@
<OPTIMIZER:PartInRawPartListVM x:Key="PartInRawPartListVM"/>
<OPTIMIZER:FeatureInPartInRawPartListVM x:Key="FeatureInPartInRawPartListVM"/>
<OPTIMIZER:PParameterListVM x:Key="PParameterListVM"/>
<OPTIMIZER:QParameterListVM x:Key="QParameterListVM"/>
<OPTIMIZER:DuploQParameterListVM x:Key="DuploQParameterListVM"/>
<OPTIMIZER:BTLDataWndVM x:Key="BTLDataWndVM"/>
<OPTIMIZER:OptimizePanelVM x:Key="OptimizePanelVM"/>
<OPTIMIZER:FreeContourManagerVM x:Key="FreeContourManagerVM"/>
EgtBEAMWALL.Optimizer/Utility/Map.vb
+9 -26
View File
@@ -23,7 +23,6 @@ Module Map
Private m_refFeatureInPartInRawPartListVM As FeatureInPartInRawPartListVM
Private m_refStatisticsVM As StatisticsVM
Private m_refPParameterListVM As PParameterListVM
Private m_refQParameterListVM As QParameterListVM
Private m_refFeatureManagerVM As FeatureManagerVM
Private m_refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM
Private m_refStatisticsTimePanelVM As StatisticsTimePanelVM
@@ -191,12 +190,6 @@ Module Map
End Get
End Property
Public ReadOnly Property refQParameterListVM As QParameterListVM
Get
Return m_refQParameterListVM
End Get
End Property
Public ReadOnly Property refFeatureManagerVM As FeatureManagerVM
Get
Return m_refFeatureManagerVM
@@ -405,11 +398,6 @@ Module Map
Return Not IsNothing(m_refPParameterListVM)
End Function
Friend Function SetRefQParameterListVM(QParameterListVM As QParameterListVM) As Boolean
m_refQParameterListVM = QParameterListVM
Return Not IsNothing(m_refQParameterListVM)
End Function
Friend Function SetRefFeatureManagerVM(FeatureManagerVM As FeatureManagerVM) As Boolean
m_refFeatureManagerVM = FeatureManagerVM
Return Not IsNothing(m_refFeatureManagerVM)
@@ -480,11 +468,6 @@ Module Map
Return Not IsNothing(m_refSceneBuildingVM)
End Function
'Friend Function SetRefForcedStrategyBTLVM(ForcedStrategyBTLVM As ForcedStrategyBTLVM) As Boolean
' m_refForcedStrategyBTLVM = ForcedStrategyBTLVM
' Return Not IsNothing(m_refForcedStrategyBTLVM)
'End Function
#End Region ' Set
#Region "Init"
@@ -505,15 +488,15 @@ Module Map
Not IsNothing(m_refOptimizePanelVM) AndAlso Not IsNothing(m_refShowBeamPanelVM) AndAlso
Not IsNothing(m_refCALCPanelVM) AndAlso Not IsNothing(m_refPartListVM) AndAlso
Not IsNothing(m_refFeatureInPartInRawPartListVM) AndAlso Not IsNothing(m_refStatisticsVM) AndAlso
Not IsNothing(m_refPParameterListVM) AndAlso Not IsNothing(m_refQParameterListVM) AndAlso
Not IsNothing(m_refFeatureManagerVM) AndAlso Not IsNothing(m_refAddSectionXMaterialWndVM) AndAlso
Not IsNothing(m_refStatisticsTimePanelVM) AndAlso Not IsNothing(m_refPDFEditorVM) AndAlso
Not IsNothing(m_refSpecialPanelVM) AndAlso Not IsNothing(m_refProdManagerVM) AndAlso
Not IsNothing(m_refBTLPartManagerVM) AndAlso Not IsNothing(m_refRawPartManagerVM) AndAlso
Not IsNothing(m_refFeatureListManagerVM) AndAlso Not IsNothing(m_refSpecialPanelVM) AndAlso
Not IsNothing(m_refStrategyManagerVM) AndAlso Not IsNothing(m_refForcedStrategyPanelVM) AndAlso
Not IsNothing(m_refGeneralParametersStrategyVM) AndAlso IsNothing(m_refSceneShowBuldingVM) AndAlso
Not IsNothing(m_refSceneBuildingVM) AndAlso Not LibMap.EndInit()
Not IsNothing(m_refPParameterListVM) AndAlso Not IsNothing(m_refFeatureManagerVM) AndAlso
Not IsNothing(m_refAddSectionXMaterialWndVM) AndAlso Not IsNothing(m_refStatisticsTimePanelVM) AndAlso
Not IsNothing(m_refPDFEditorVM) AndAlso Not IsNothing(m_refSpecialPanelVM) AndAlso
Not IsNothing(m_refProdManagerVM) AndAlso Not IsNothing(m_refBTLPartManagerVM) AndAlso
Not IsNothing(m_refRawPartManagerVM) AndAlso Not IsNothing(m_refFeatureListManagerVM) AndAlso
Not IsNothing(m_refSpecialPanelVM) AndAlso Not IsNothing(m_refStrategyManagerVM) AndAlso
Not IsNothing(m_refForcedStrategyPanelVM) AndAlso Not IsNothing(m_refGeneralParametersStrategyVM) AndAlso
IsNothing(m_refSceneShowBuldingVM) AndAlso Not IsNothing(m_refSceneBuildingVM) AndAlso
Not LibMap.EndInit()
End Function
#End Region ' Init
ExtLibs/EgtUILib.dll
BIN
View File
Binary file not shown.