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

EgtBEAMWALL 3.1.3.3:

Browse Source 
-corretto salvataggio parametri generali btl
-corretto lettura file defaultstrategy
This commit is contained in:
Demetrio Cassarino
2026-03-05 09:53:12 +01:00
parent a63c7a78ff
commit e900b69552
14 changed files with 57 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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.3.2")>
<Assembly: AssemblyFileVersion("3.1.3.2")>
<Assembly: AssemblyVersion("3.1.3.3")>
<Assembly: AssemblyFileVersion("3.1.3.3")>
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.3.2")]
[assembly: AssemblyFileVersion("3.1.3.2")]
[assembly: AssemblyVersion("3.1.3.3")]
[assembly: AssemblyFileVersion("3.1.3.3")]
EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+30 -2
View File
@@ -791,6 +791,35 @@ Public Class BTLDataWndVM
Next
End Sub
Private Sub SaveInfo()
EgtSetInfo(m_nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup)
Dim sInfo As String = String.Empty
For Each GeneralParameter In GeneralParametersList
Select Case GeneralParameter.GetType()
Case GetType(BooleanGenericParameter)
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue)
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, BooleanGenericParameter).bIsBooleanModify)
Case GetType(DoubleGenericParameter)
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue)
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, DoubleGenericParameter).bIsDoubleModify)
Case GetType(ComboGenericParameter)
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue)
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ComboGenericParameter).bIsComboBoxModify)
Case GetType(StringGenericParameter)
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue)
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, StringGenericParameter).bIsStringModify)
Case GetType(ListGenericParameter)
For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
If Item.bIsActive Then
sInfo &= Item.sUUID & "," & Item.sName & ";"
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sInfo)
End If
Next
EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ListGenericParameter).bIsListModify)
End Select
Next
End Sub
#End Region ' METHODS
#Region "COMMANDS"
@@ -814,9 +843,8 @@ Public Class BTLDataWndVM
Else
Return
End If
Else
SaveInfoBTL(ProjectManagerVM.CurrProd.nType)
End If
SaveInfo()
Map.refLeftPanelVM.ResetCalc()
Map.refSceneHostVM.SaveProject()
RaiseEvent m_CloseWindow(True)
EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
-7
View File
@@ -1329,13 +1329,6 @@ Public Class BTLStructureVM
GetMainPrivateProfileString(S_GENERAL, K_LASTUPDATEDIR, "", sDir)
If bWithDlg Then
' apro finestra scelta file
'Dim BTLDlg As New Microsoft.Win32.OpenFileDialog() With {
' .DefaultExt = ".btl",
' .Filter = "BTL (*.btl)|*.btl" &
' "|BTLX (*.btlx)|*.btlx",
' .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
' .CheckFileExists = True,
' .ValidateNames = True}
Dim BTLDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
.Title = EgtMsg(61834),
.Filter = "BTL (*.btl)|*.btl" &
EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb
-1
View File
@@ -1,6 +1,5 @@
Imports System.Collections.ObjectModel
Imports System.Globalization
Imports System.IO
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb
-1
View File
@@ -2,7 +2,6 @@
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
Imports System.IO
Public Class FeatureInPartInRawPartListVM
Inherits VMBase
EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb
-1
View File
@@ -2,7 +2,6 @@
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5
Imports System.IO
Public Class PParameterListVM
Inherits VMBase
EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
-1
View File
@@ -1,7 +1,6 @@
Imports System.Collections.ObjectModel
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports System.IO
Imports EgtWPFLib5
Public Class RawPartListVM
EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+15 -3
View File
@@ -588,12 +588,12 @@ Public Class MainMenuVM
Dim ProdId As Integer
Select Case Map.refMainMenuVM.SelPage
Case Pages.VIEW
ProdId = ProjectManagerVM.CurrProj.nProdId
ProdId = ProjectManagerVM.CurrProd.nProjIdList(0)
Case Pages.MACHINING, Pages.OPTIMIZERPAGE
ProdId = ProjectManagerVM.CurrProd.nProdId
End Select
If ProdId = 0 Then
AddDirectoryToZip(archive, ProjectManagerVM.CurrProd.sProdDirPath, "Projs\" & ProjectManagerVM.CurrProj.nProjId.ToString("0000"))
AddDirectoryToZip(archive, ProjectManagerVM.CurrProd.sProdDirPath, "Projs\" & ProjectManagerVM.CurrProd.nProjIdList(0).ToString("0000"))
Else
ProjFileMList = DbControllers.m_ProjController.GetByProdAsc(ProdId)
@@ -654,10 +654,22 @@ Public Class MainMenuVM
' mailmessage.Attachments.Add(New System.Net.Mail.Attachment(Map.refMainWindowVM.MainWindowM.sTempDir & "\Feedback.zip"))
'End If
'Dim client As New SmtpClient()
'Dim filename As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\mymessage.eml"
'If Not IsNothing(filename) Then
' Configuration.SaveEml(mailmessage, filename)
' Process.Start(filename)
' Dim flags = BindingFlags.Instance Or BindingFlags.NonPublic
' Dim method As MethodInfo = GetType(SmtpClient).GetMethod("SendInternal", flags)
' If method Is Nothing Then
' method = GetType(SmtpClient).GetMethod("SendMail", flags)
' End If
' If method Is Nothing Then
' Throw New Exception("Metodo interno SendInternal/SendMail non trovato. Versione .NET non compatibile.")
' End If
' method.Invoke(client, New Object() {mailmessage, filename})
' Process.Start(New ProcessStartInfo(filename) With {.UseShellExecute = True})
' 'Process.Start(filename)
'Else
' MessageBox.Show("Errore creazione file .eml")
'End If
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("3.1.3.2")>
<Assembly: AssemblyFileVersion("3.1.3.2")>
<Assembly: AssemblyVersion("3.1.3.3")>
<Assembly: AssemblyFileVersion("3.1.3.3")>
EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+4 -2
View File
@@ -61,7 +61,7 @@ Public Class StrategyManagerVM
Dim sDefaultConfigFile As String = String.Empty
Dim sTrimDefaultConfig As String = String.Empty
If GetMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile) <> 0 Then
If EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) <> 0 Then
sTrimDefaultConfig = System.IO.Path.GetFileNameWithoutExtension(sDefaultConfigFile)
If sTrimDefaultConfig = m_SelStrategySetup.sName Then
SetDefaultConfig_IsChecked(True)
@@ -71,6 +71,7 @@ Public Class StrategyManagerVM
End If
End If
SetSaveImage(MODIFY_IMAGE)
NotifyPropertyChanged(NameOf(SelStrategySetup))
End Set
End Property
@@ -81,6 +82,7 @@ Public Class StrategyManagerVM
EgtUILib.WritePrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, m_SelStrategySetup.sName, Map.refMainWindowVM.MainWindowM.sDefaultConfig)
m_SelStrategySetup.Read()
End If
SetSaveImage(MODIFY_IMAGE)
NotifyPropertyChanged(NameOf(SelStrategySetup))
End Sub
@@ -201,6 +203,7 @@ Public Class StrategyManagerVM
If m_bDefaultConfig_IsChecked Then
EgtUILib.WritePrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, m_SelStrategySetup.sName, Map.refMainWindowVM.MainWindowM.sDefaultConfig)
End If
SetSaveImage(MODIFY_IMAGE)
NotifyPropertyChanged(NameOf(DefaultConfig_IsChecked))
End Set
End Property
@@ -728,7 +731,6 @@ Public Class StrategySetup
JsonProjectParameters.Add(ParamItem.Serialize())
Next
' Unisco i quattro json in un solo file
Dim CombinedJson = New With {.GENERAL = JsonProjectParameters,
.FEATURE = JsonFromStrategyManager}
EgtBEAMWALL.Optimizer/Utility/Configuration.vb
-35
View File
@@ -57,41 +57,6 @@ Module Configuration
End Try
End Sub
'Public Sub CreatePrintPDF(ActivePage As Integer, bPreview As Boolean)
' LoadingWndHelper.OpenLoadingWnd(ActiveIds.CREATINGPDF, 1, "Creating PDF", "", 100)
' Try
' Dim doc As FlowDocument = PDFFlowHelper.CreateStatReportFlow(ActivePage, bPreview)
' Dim sFileName As String = ""
' If ActivePage = Pages.VIEW AndAlso Not bPreview Then
' sFileName = ProjectManagerVM.CurrProd.sProdDirPath & "\Statistics.pdf"
' ElseIf ActivePage = Pages.VIEW AndAlso bPreview Then
' sFileName = Map.refMainWindowVM.MainWindowM.sTempDir & "\Statistics.pdf"
' ElseIf ActivePage = Pages.MACHINING AndAlso Not bPreview Then
' sFileName = ProjectManagerVM.CurrProd.sProdDirPath & "\" & ProjectManagerVM.CurrProd.sProdId & " - Statistics.pdf"
' ElseIf ActivePage = Pages.MACHINING AndAlso bPreview Then
' sFileName = Map.refMainWindowVM.MainWindowM.sTempDir & "\Statistics.pdf"
' PrevSelect()
' End If
' Dim server As New LocalPrintServer()
' Dim queue As PrintQueue = server.GetPrintQueue("Microsoft Print to PDF")
' Dim writer As XpsDocumentWriter = PrintQueue.CreateXpsDocumentWriter(queue)
' Dim paginator As DocumentPaginator = CType(doc, IDocumentPaginatorSource).DocumentPaginator
' writer.Write(paginator)
' 'If Not bPreview AndAlso System.IO.File.Exists(sFileName) Then
' ' Process.Start(sFileName)
' 'End If
' Catch ex As Exception
' EgtOutLog("Error generating PDF from FlowDocument: " & ex.ToString())
' Finally
' LoadingWndHelper.CloseLoadingWnd(ActiveIds.CREATINGPDF)
' End Try
'End Sub
Private Sub PrevSelect()
' ripristino selezione precedente
Dim nCurrMachGroupId As Integer = EgtGetCurrMachGroup()
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.3.2")>
<Assembly: AssemblyFileVersion("3.1.3.2")>
<Assembly: AssemblyVersion("3.1.3.3")>
<Assembly: AssemblyFileVersion("3.1.3.3")>
ExtLibs/EgtWPFLib5.dll
BIN
View File
Binary file not shown.