diff --git a/EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb b/EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb index 74b1ebf3..606e14ae 100644 --- a/EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb +++ b/EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb @@ -326,7 +326,6 @@ Public Module CalcIntegration End Sub Public Function CreateNewProjectFromPart(nPartId As Integer, sProjDirPath As String) As String - ' Aggiorno identificativi per segnalazione errori UpdateCutIdAndTaskId(nPartId) @@ -393,7 +392,7 @@ 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 Return String.Empty diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb index 3d1d4763..f8396440 100644 --- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb +++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb @@ -122,6 +122,10 @@ Public Class GeneralParametersWndVM Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, PROJECTINFO) Dim sInfo As String = String.Empty EgtGetInfo(nBTLInfoLayerId, "AISETUP", m_SelStrategySetup) + If Not IsNothing(m_SelStrategySetup) Then + nBTLInfoLayerId = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO) + EgtGetInfo(nBTLInfoLayerId, "AISETUP", m_SelStrategySetup) + End If For Each GeneralParameter In m_GeneralParametersList Select Case GeneralParameter.GetType() Case GetType(BooleanGenericParameter) diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml index fae865aa..8e4bb05b 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml @@ -48,8 +48,7 @@ - + - + + diff --git a/EgtBEAMWALL.Optimizer/Utility/Configuration.vb b/EgtBEAMWALL.Optimizer/Utility/Configuration.vb index f28d29d0..bc34569c 100644 --- a/EgtBEAMWALL.Optimizer/Utility/Configuration.vb +++ b/EgtBEAMWALL.Optimizer/Utility/Configuration.vb @@ -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) @@ -56,7 +60,6 @@ Module Configuration EgtOutLog("Error genereting pdf: " & ex.ToString()) End Try LoadingWndHelper.CloseLoadingWnd(ActiveIds.CREATINGPDF) - End Sub Private Sub PrevSelect() diff --git a/ExtLibs/EgtUILib.dll b/ExtLibs/EgtUILib.dll index ef134f99..989c23cd 100644 Binary files a/ExtLibs/EgtUILib.dll and b/ExtLibs/EgtUILib.dll differ