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

EgtBEAMWALL 3.1.2.6:

Browse Source 
-rinominato file colonne
-aggiunto controllo su creazione dimensione finestra
This commit is contained in:
Demetrio Cassarino
2026-02-24 09:59:40 +01:00
parent 83d748ace8
commit 0bb65431a7
19 changed files with 113 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb
+1 -1
View File
@@ -1,6 +1,6 @@
Public Module ConstDataGridColumnsIni
Public Const OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME As String = "OPTIMIZERDataGridColumns.json"
Public Const DATAGRIDCOLUMNS_FILE_NAME As String = "DataGridColumns.json"
Public Const S_OPENPROJFILEDLG_PROD As String = "DG_OpenProjectFileDialog_PROD"
Public Const S_NEWOPENPROJFILEDLG_PROD As String = "DG_NewOpenProjectFileDialog_PROD"
EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -38,5 +38,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.2.5")>
<Assembly: AssemblyFileVersion("3.1.2.5")>
<Assembly: AssemblyVersion("3.1.2.6")>
<Assembly: AssemblyFileVersion("3.1.2.6")>
EgtBEAMWALL.Core/Utility/DimensionsIniFile.vb
+8 -3
View File
@@ -1,7 +1,7 @@
Imports System.Windows
Imports EgtWPFLib5
Imports System.Collections.ObjectModel
Imports System.Windows
Imports EgtUILib
Imports System.Collections.ObjectModel
Imports EgtWPFLib5
Public Module DimensionsIniFile
@@ -32,6 +32,11 @@ Public Module DimensionsIniFile
End If
Index += 1
End While
If GridDimsList.Count = 0 Then
For Ind As Integer = 0 To 4
GridDimsList.Add(New GridDimension(GridName, Ind, 0, New GridLength(1, GridUnitType.Star)))
Next
End If
For Each GridDimsItem In GridDimsList
GridDimsItem.GridDimensions = GridDimsList
Next
EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.1.2.5")]
[assembly: AssemblyFileVersion("3.1.2.5")]
[assembly: AssemblyVersion("3.1.2.6")]
[assembly: AssemblyFileVersion("3.1.2.6")]
EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+4 -2
View File
@@ -11,6 +11,8 @@ Public Class BTLDataWndVM
#Region "FIELDS & PROPERTIES"
Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
Friend Event m_CloseWindow(bDialogResult As Boolean)
Private m_StrategySetupList As New ObservableCollection(Of String)
@@ -631,7 +633,7 @@ Public Class BTLDataWndVM
Case Else
If Not Map.refMainMenuVM.UserAdmin_IsChecked Then
Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
Map.refMainMenuVM.SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE)
End If
End Select
Next
@@ -711,7 +713,7 @@ Public Class BTLDataWndVM
Case Else
If Not Map.refMainMenuVM.UserAdmin_IsChecked Then
Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
Map.refMainMenuVM.SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE)
End If
End Select
Next
EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
+3 -1
View File
@@ -11,6 +11,8 @@ Public Class BTLPartManagerVM
#Region "FIELDS & PROPERTIES"
Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
Private m_BTLPartManager_IsEnabled As Boolean = True
Public ReadOnly Property BTLPartManager_IsEnabled As Boolean
Get
@@ -198,7 +200,7 @@ Public Class BTLPartManagerVM
Case Else
If Not Map.refMainMenuVM.UserAdmin_IsChecked Then
Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
Map.refMainMenuVM.SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE)
End If
End Select
Next
EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+5 -3
View File
@@ -10,6 +10,8 @@ Public Class BTLPartVM
#Region "FIELDS & PROPERTIES"
Private DOWN_IMAGE As String = "pack://application:,,,/Resources/NewPage/down.png"
Private WithEvents m_BTLPartM As BTLPartM
Public ReadOnly Property BTLPartM As BTLPartM
Get
@@ -1571,9 +1573,9 @@ Public Class BTLPartVM
End If
End If
If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
Map.refProdManagerVM.SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetOpenImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetSaveImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetBtlImage(DOWN_IMAGE)
Map.refProdManagerVM.SetOpenImage(DOWN_IMAGE)
Map.refProdManagerVM.SetSaveImage(DOWN_IMAGE)
If Not IsNothing(m_SelBTLFeatureVM) Then
SetSelFeatureMsg(EgtMsg(5356) & " [" & m_SelBTLFeatureVM.nSelGRP & "-" & m_SelBTLFeatureVM.nPRC.ToString("000") & "] " & m_SelBTLFeatureVM.sName)
SetDeselFeatureMsg(EgtMsg(5357) & " [" & m_SelBTLFeatureVM.nSelGRP & "-" & m_SelBTLFeatureVM.nPRC.ToString("000") & "] " & m_SelBTLFeatureVM.sName)
EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+6 -7
View File
@@ -1,5 +1,4 @@
Imports System.Collections.ObjectModel
Imports System.Collections.ObjectModel
Imports System.Collections.Specialized
Imports System.ComponentModel
Imports System.IO
@@ -14,6 +13,8 @@ Public Class BTLStructureVM
#Region "FIELDS & PROPERTIES"
Private DOWN_IMAGE As String = "pack://application:,,,/Resources/NewPage/down.png"
' Nome file NGE con i pezzi selezionati per effettuare UpdateBTL
Friend Const UPDATEBTL_NGE As String = "UpdateBTL.nge"
@@ -173,11 +174,9 @@ Public Class BTLStructureVM
Map.refShowBeamPanelVM.bShowAll = False
Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
EgtZoom(ZM.ALL)
Map.refProdManagerVM.SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetOpenImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refProdManagerVM.SetSaveImage("pack://application:,,,/Resources/NewPage/down.png")
Map.refMyStatusBarVM.SetLoadingProgress(0)
Map.refMyStatusBarVM.SetOutputMessage("")
Map.refProdManagerVM.SetBtlImage(DOWN_IMAGE)
Map.refProdManagerVM.SetOpenImage(DOWN_IMAGE)
Map.refProdManagerVM.SetSaveImage(DOWN_IMAGE)
NotifyPropertyChanged(NameOf(SelBTLPart))
If Not bIsReselect AndAlso m_SelBTLParts.Count = 1 Then BtlPart.SetOpenFeatureList(True)
End Sub
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
+3 -1
View File
@@ -14,6 +14,8 @@ Public Class GeneralParametersStrategyVM
#Region "FIELDS & PROPERTIES"
Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
' Evento per chiusura finestra
Public Event m_CloseWindow(bDialogResult As Boolean)
@@ -76,7 +78,7 @@ Public Class GeneralParametersStrategyVM
Case Else
If Not Map.refMainMenuVM.UserAdmin_IsChecked Then
Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
Map.refMainMenuVM.SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE)
End If
End Select
Next
EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb
+3 -1
View File
@@ -11,6 +11,8 @@ Public Class GeneralParametersWndVM
#Region "FIELDS & PROPERTIES"
Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
Friend Event m_CloseWindow(bDialogResult As Boolean)
Private m_GeneralParametersList As New ObservableCollection(Of ProjectParameters)
@@ -110,7 +112,7 @@ Public Class GeneralParametersWndVM
Case Else
If Not Map.refMainMenuVM.UserAdmin_IsChecked Then
Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
Map.refMainMenuVM.SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE)
End If
End Select
Next
EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+16 -11
View File
@@ -12,6 +12,11 @@ Public Class MainMenuVM
#Region "FIELDS & PROPERTIES"
Private CONFIGURATION_IMAGE As String = "pack://application:,,,/Resources/NewPage/configuration.png"
Private ISCONFIGURATION_IMAGE As String = "pack://application:,,,/Resources/NewPage/configurationIsChecked.png"
Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
Private UNPADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
Public Enum UserLevel As Integer
USER = 1
ADVANCED = 5
@@ -36,7 +41,7 @@ Public Class MainMenuVM
Set(value As Boolean)
If value Then
SelPage = Pages.OPTIMIZERPAGE
SetConfigurationImagePath("pack://application:,,,/Resources/NewPage/configuration.png")
SetConfigurationImagePath(CONFIGURATION_IMAGE)
End If
End Set
End Property
@@ -48,7 +53,7 @@ Public Class MainMenuVM
Set(value As Boolean)
If value Then
SelPage = Pages.SUPERVISOR
SetConfigurationImagePath("pack://application:,,,/Resources/NewPage/configuration.png")
SetConfigurationImagePath(CONFIGURATION_IMAGE)
End If
End Set
End Property
@@ -60,7 +65,7 @@ Public Class MainMenuVM
Set(value As Boolean)
If value Then
SelPage = Pages.CONFIG
SetConfigurationImagePath("pack://application:,,,/Resources/NewPage/configuration.png")
SetConfigurationImagePath(CONFIGURATION_IMAGE)
End If
End Set
End Property
@@ -72,9 +77,9 @@ Public Class MainMenuVM
Set(value As Boolean)
If value Then
SelPage = Pages.CONFIGPROGRAM
SetConfigurationImagePath("pack://application:,,,/Resources/NewPage/configurationIsChecked.png")
SetConfigurationImagePath(ISCONFIGURATION_IMAGE)
Else
SetConfigurationImagePath("pack://application:,,,/Resources/NewPage/configuration.png")
SetConfigurationImagePath(CONFIGURATION_IMAGE)
End If
End Set
End Property
@@ -124,7 +129,7 @@ Public Class MainMenuVM
NotifyPropertyChanged(NameOf(ConfigProgram_IsChecked))
End Sub
Private m_sConfigurationImagePath As String = "pack://application:,,,/Resources/NewPage/configuration.png"
Private m_sConfigurationImagePath As String = CONFIGURATION_IMAGE
Public ReadOnly Property sConfigurationImagePath As String
Get
Return m_sConfigurationImagePath
@@ -182,7 +187,7 @@ Public Class MainMenuVM
NotifyPropertyChanged(NameOf(AdminFontWeight))
End Sub
Private m_UnloackImage As String = "pack://application:,,,/Resources/NewPage/padlock.png"
Private m_UnloackImage As String = PADLOCK_IMAGE
Public ReadOnly Property UnloackImage As String
Get
Return m_UnloackImage
@@ -202,12 +207,12 @@ Public Class MainMenuVM
m_bUnlockAllIsChecked = value
If m_bUnlockAllIsChecked Then
If UnLockParameter() Then
SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock-unlock.png")
SetUnloackImage(UNPADLOCK_IMAGE)
Else
Return
End If
Else
SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
SetUnloackImage(PADLOCK_IMAGE)
End If
If Not IsNothing(Map.refForcedStrategyPanelVM.SelStrategy) Then
If m_bUnlockAllIsChecked Then
@@ -411,7 +416,7 @@ Public Class MainMenuVM
Case Else
If Not m_bUserAdmin_IsChecked Then
UserLevelVisibility(ParamItem, If(ParamItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
SetUnloackImage(PADLOCK_IMAGE)
End If
End Select
Next
@@ -425,7 +430,7 @@ Public Class MainMenuVM
Case Else
If Not m_bUserAdmin_IsChecked Then
UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
SetUnloackImage(PADLOCK_IMAGE)
End If
End Select
Next
EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb
+1 -1
View File
@@ -220,7 +220,7 @@ Public Class MainWindowM
' Impostazione path BTL Ini File
BTLIniFile.m_sBTLIniFile = m_sConfigDir & "\" & BTLFEATURES_FILE_NAME
' Impostazione path Ini file DataGrid
DataGridColumnsIniFile.m_sDataGridColumnsIniFile = m_sConfigDir & "\" & OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME
DataGridColumnsIniFile.m_sDataGridColumnsIniFile = m_sConfigDir & "\" & DATAGRIDCOLUMNS_FILE_NAME
' Impostazione path Ini file Dimensioni
DimensionsIniFile.m_sDimensionsIniFile = m_sConfigDir & "\" & ConstDims.DIMENSIONS_FILE_NAME
' Impostazione path resources dir
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("3.1.2.5")>
<Assembly: AssemblyFileVersion("3.1.2.5")>
<Assembly: AssemblyVersion("3.1.2.6")>
<Assembly: AssemblyFileVersion("3.1.2.6")>
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+23 -21
View File
@@ -12,6 +12,9 @@ Public Class ProdManagerVM
#Region "FIELDS & PROPERTIES"
Private DOWN_IMAGE As String = "pack://application:,,,/Resources/NewPage/down.png"
Private UP_IMAGE As String = "pack://application:,,,/Resources/NewPage/up.png"
' Nome file NGE con i pezzi selezionati per effettuare UpdateBTL
Friend Const UPDATEBTL_NGE As String = "UpdateBTL.nge"
@@ -168,7 +171,7 @@ Public Class ProdManagerVM
End Set
End Property
Private m_BtlImage As String = "pack://application:,,,/Resources/NewPage/down.png"
Private m_BtlImage As String = DOWN_IMAGE
Public ReadOnly Property BtlImage As String
Get
Return m_BtlImage
@@ -179,7 +182,7 @@ Public Class ProdManagerVM
NotifyPropertyChanged(NameOf(BtlImage))
End Sub
Private m_OpenImage As String = "pack://application:,,,/Resources/NewPage/down.png"
Private m_OpenImage As String = DOWN_IMAGE
Public ReadOnly Property OpenImage As String
Get
Return m_OpenImage
@@ -190,7 +193,7 @@ Public Class ProdManagerVM
NotifyPropertyChanged(NameOf(OpenImage))
End Sub
Private m_SaveImage As String = "pack://application:,,,/Resources/NewPage/down.png"
Private m_SaveImage As String = DOWN_IMAGE
Public ReadOnly Property SaveImage As String
Get
Return m_SaveImage
@@ -1438,7 +1441,7 @@ Public Class ProdManagerVM
End Property
Public Sub NewProject()
SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
SetBtlImage(DOWN_IMAGE)
CreateNewProd(False)
Return
End Sub
@@ -1523,8 +1526,7 @@ Public Class ProdManagerVM
Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible)
If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible)
If Not CreateNewProd() Then
Dim sErrMsg As String = "Errore! Creazione del progetto fallita!"
EgtOutLog(sErrMsg)
EgtOutLog("Errore! Creazione del progetto fallita!")
End If
Return
End Sub
@@ -1543,7 +1545,7 @@ Public Class ProdManagerVM
End Property
Public Function ExportProject(Optional sExportFileName As String = Nothing) As String
SetSaveImage("pack://application:,,,/Resources/NewPage/down.png")
SetSaveImage(DOWN_IMAGE)
If ProdFileVM.VerifyProjectModification(CurrProd) = MessageBoxResult.Cancel Then Return Nothing
If IsNothing(CurrProd) Then Return Nothing
@@ -1649,7 +1651,7 @@ Public Class ProdManagerVM
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False
Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed)
Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible)
SetOpenImage("pack://application:,,,/Resources/NewPage/down.png")
SetOpenImage(DOWN_IMAGE)
Dim TempCurrProd As ProjectFileVM = CurrProd
If ProdFileVM.VerifyProjectModification(TempCurrProd) Then Return
@@ -1915,7 +1917,7 @@ Public Class ProdManagerVM
End Property
Public Sub AddProj()
SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
SetBtlImage(DOWN_IMAGE)
If Not CreateNewProj(CurrProd, 0) Then
EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62583))
End If
@@ -2072,12 +2074,12 @@ Public Class ProdManagerVM
Public Sub ShowPopUpStartBtn(ByVal param As Object)
If m_IsStartBtnOpen Then
SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
SetOpenImage("pack://application:,,,/Resources/NewPage/up.png")
SetSaveImage("pack://application:,,,/Resources/NewPage/up.png")
SetBtlImage(DOWN_IMAGE)
SetOpenImage(UP_IMAGE)
SetSaveImage(UP_IMAGE)
SetIsStartBtnOpen(False)
Else
SetBtlImage("pack://application:,,,/Resources/NewPage/up.png")
SetBtlImage(UP_IMAGE)
SetIsStartBtnOpen(True)
End If
End Sub
@@ -2097,12 +2099,12 @@ Public Class ProdManagerVM
Public Sub ShowPopUpSaveBtn(ByVal param As Object)
If m_IsSaveBtnOpen Then
SetOpenImage("pack://application:,,,/Resources/NewPage/down.png")
SetSaveImage("pack://application:,,,/Resources/NewPage/up.png")
SetBtlImage("pack://application:,,,/Resources/NewPage/up.png")
SetOpenImage(DOWN_IMAGE)
SetSaveImage(UP_IMAGE)
SetBtlImage(UP_IMAGE)
SetIsSaveBtnOpen(False)
Else
SetOpenImage("pack://application:,,,/Resources/NewPage/up.png")
SetOpenImage(UP_IMAGE)
SetIsSaveBtnOpen(True)
End If
End Sub
@@ -2122,12 +2124,12 @@ Public Class ProdManagerVM
Public Sub ShowPopUpBtlBtn(ByVal param As Object)
If m_IsBtlBtnOpen Then
SetSaveImage("pack://application:,,,/Resources/NewPage/down.png")
SetOpenImage("pack://application:,,,/Resources/NewPage/up.png")
SetBtlImage("pack://application:,,,/Resources/NewPage/up.png")
SetSaveImage(DOWN_IMAGE)
SetOpenImage(UP_IMAGE)
SetBtlImage(UP_IMAGE)
SetIsBtlBtnOpen(False)
Else
SetSaveImage("pack://application:,,,/Resources/NewPage/up.png")
SetSaveImage(UP_IMAGE)
SetIsBtlBtnOpen(True)
End If
End Sub
EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb
+1 -1
View File
@@ -137,7 +137,7 @@ Public Class SaveAsStrategyVM
End If
Next
' Imposta il messaggio di errore e la visibilità in base alla presenza del file
SetErrorMsg(If(fileExists, "FILE GIA' PRESENTE", String.Empty))
SetErrorMsg(If(fileExists, EgtMsg(62112), String.Empty))
' Abilito o Disabilito pulsante saveas
SetSaveAsIsEnable(Not fileExists)
' Rendo visibile o invisibile textblock messaggio
EgtBEAMWALL.Optimizer/Statistics/PDFHelper.vb
+21 -21
View File
@@ -361,12 +361,12 @@ Module PDFHelper
'Recupero la lista delle colonne delle tabelle
Dim sMachGroupList As ExpanderTable = Map.refPDFEditorVM.ExpanderList.FirstOrDefault(Function(x) x.sNameCategory = EgtMsg(61731)).ExpanderElementList.FirstOrDefault() ' Lista Tabella Raw Part
Dim sPDN = GetColumns(sMachGroupList.RawPartColumns, COL_PDN)
Dim sW = GetColumns(sMachGroupList.RawPartColumns, COL_W)
Dim sH = GetColumns(sMachGroupList.RawPartColumns, COL_H)
Dim sL = GetColumns(sMachGroupList.RawPartColumns, COL_L)
Dim sDesc = GetColumns(sMachGroupList.RawPartColumns, COL_DESC)
Dim sMaterial = GetColumns(sMachGroupList.RawPartColumns, COL_MATERIAL)
Dim sPDN As EgwWPFBaseLib.ColumnLayout = GetColumns(sMachGroupList.RawPartColumns, COL_PDN)
Dim sW As EgwWPFBaseLib.ColumnLayout = GetColumns(sMachGroupList.RawPartColumns, COL_W)
Dim sH As EgwWPFBaseLib.ColumnLayout = GetColumns(sMachGroupList.RawPartColumns, COL_H)
Dim sL As EgwWPFBaseLib.ColumnLayout = GetColumns(sMachGroupList.RawPartColumns, COL_L)
Dim sDesc As EgwWPFBaseLib.ColumnLayout = GetColumns(sMachGroupList.RawPartColumns, COL_DESC)
Dim sMaterial As EgwWPFBaseLib.ColumnLayout = GetColumns(sMachGroupList.RawPartColumns, COL_MATERIAL)
' Controllo se bPreview è true mostra il PDF di preview se no il PDF completo
If bPreview Then
@@ -398,12 +398,12 @@ Module PDFHelper
CreateRawPartImage(section, sMachGroupList, RawPart.Id, RawPart.Name, bPreview)
End If
If Not bPreview AndAlso Items.Count = 0 Then Exit Sub
If Not bPreview AndAlso Items.Count = 0 Then Return
Dim ActiveColumns As New List(Of Integer)
For i = 0 To sMachGroupList.RawPartColumns.Count - 1
Dim colName = sMachGroupList.RawPartColumns(i).Key
For i As Integer = 0 To sMachGroupList.RawPartColumns.Count - 1
Dim colName As String = sMachGroupList.RawPartColumns(i).Key
If ColumnRawPartIsEnabled(colName, sPDN, Nothing, sW, sH, sL, sMaterial, Nothing, Nothing, Nothing, Nothing, sDesc, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing) Then
ActiveColumns.Add(i)
@@ -415,33 +415,33 @@ Module PDFHelper
Dim table As New Table()
table.Borders.Width = 0.75
For Each colIndex In ActiveColumns
Dim width = GetRawPartColumnWidth(sMachGroupList.RawPartColumns(colIndex).Key)
For Each colIndex As Integer In ActiveColumns
Dim width As Unit = GetRawPartColumnWidth(sMachGroupList.RawPartColumns(colIndex).Key)
table.AddColumn(width)
Next
Dim header = table.AddRow()
Dim header As Row = table.AddRow()
header.HeadingFormat = True
header.Shading.Color = Colors.Aqua
For j = 0 To ActiveColumns.Count - 1
Dim colName = sMachGroupList.RawPartColumns(ActiveColumns(j)).Key
For j As Integer = 0 To ActiveColumns.Count - 1
Dim colName As String = sMachGroupList.RawPartColumns(ActiveColumns(j)).Key
header.Cells(j).AddParagraph(GetRawPartHeader(colName))
Next
If bPreview Then
Dim row = table.AddRow()
For j = 0 To ActiveColumns.Count - 1
Dim colName = sMachGroupList.RawPartColumns(ActiveColumns(j)).Key
Dim row As Row = table.AddRow()
For j As Integer = 0 To ActiveColumns.Count - 1
Dim colName As String = sMachGroupList.RawPartColumns(ActiveColumns(j)).Key
row.Cells(j).AddParagraph(GetRawPartValue(colName, Nothing, bPreview))
Next
Else
For Each obj As Object In Items
Dim p = CType(obj, PartVM)
Dim row = table.AddRow()
Dim p As PartVM = CType(obj, PartVM)
Dim row As Row = table.AddRow()
For j = 0 To ActiveColumns.Count - 1
Dim colName = sMachGroupList.RawPartColumns(ActiveColumns(j)).Key
For j As Integer = 0 To ActiveColumns.Count - 1
Dim colName As String = sMachGroupList.RawPartColumns(ActiveColumns(j)).Key
row.Cells(j).AddParagraph(GetRawPartValue(colName, p, bPreview))
Next
Next
EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+9 -4
View File
@@ -12,6 +12,9 @@ Public Class StrategyManagerVM
#Region "FIELDS & PROPERTIES"
Private SAVE_IMAGE As String = "pack://application:,,,/Resources/NewPage/diskette.png"
Private MODIFY_IMAGE As String = "pack://application:,,,/Resources/NewPage/SaveModify.png"
Private m_StrategyTypeList As New List(Of IdNameStruct)({New IdNameStruct(BWType.BEAM, "Beam"), New IdNameStruct(BWType.WALL, "Wall")})
Public ReadOnly Property StrategyTypeList As List(Of IdNameStruct)
Get
@@ -118,15 +121,15 @@ Public Class StrategyManagerVM
Friend Sub SetbIsModifyStrategy(value As Boolean)
m_bIsModifyStrategy = value
If m_bIsModifyStrategy Then
SetSaveImage("pack://application:,,,/Resources/NewPage/SaveModify.png")
SetSaveImage(MODIFY_IMAGE)
Else
SetSaveImage("pack://application:,,,/Resources/NewPage/diskette.png")
SetSaveImage(SAVE_IMAGE)
End If
NotifyPropertyChanged(NameOf(bIsModifyStrategy))
End Sub
' Immagine SaveCommand
Private m_SaveImage As String = "pack://application:,,,/Resources/NewPage/diskette.png"
Private m_SaveImage As String = SAVE_IMAGE
Public ReadOnly Property SaveImage As String
Get
Return m_SaveImage
@@ -1033,6 +1036,8 @@ Public Class Strategy
#Region "FIELDS & PROPETIES"
Private STRATEGY_IMAGE As String = "pack://application:,,,/Resources/NewPage/LogoProvaStrategy.png"
Private m_sStrategyId As String
Public Property sStrategyId As String
Get
@@ -1070,7 +1075,7 @@ Public Class Strategy
NotifyPropertyChanged(NameOf(nIndexInList))
End Sub
Private m_sStrategyImagePath As String = "pack://application:,,,/Resources/NewPage/LogoProvaStrategy.png"
Private m_sStrategyImagePath As String = STRATEGY_IMAGE
Public Property sStrategyImagePath As String
Get
Return m_sStrategyImagePath
EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb
+1 -1
View File
@@ -203,7 +203,7 @@ Public Class MainWindowM
' Impostazione path BTL Ini File
BTLIniFile.m_sBTLIniFile = m_sConfigDir & "\" & BTLFEATURES_FILE_NAME
' Impostazione path Ini file DataGrid
DataGridColumnsIniFile.m_sDataGridColumnsIniFile = m_sConfigDir & "\" & OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME
DataGridColumnsIniFile.m_sDataGridColumnsIniFile = m_sConfigDir & "\" & DATAGRIDCOLUMNS_FILE_NAME
' Impostazione path Ini file Dimensioni
DimensionsIniFile.m_sDimensionsIniFile = m_sConfigDir & "\" & ConstDims.DIMENSIONS_FILE_NAME
' Impostazione path resources dir
EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.2.5")>
<Assembly: AssemblyFileVersion("3.1.2.5")>
<Assembly: AssemblyVersion("3.1.2.6")>
<Assembly: AssemblyFileVersion("3.1.2.6")>