diff --git a/HardwareGeometry/GeometryListConfigVM.vb b/HardwareGeometry/GeometryListConfigVM.vb index f7fcc31..1300a2d 100644 --- a/HardwareGeometry/GeometryListConfigVM.vb +++ b/HardwareGeometry/GeometryListConfigVM.vb @@ -384,7 +384,7 @@ Public Class GeometryListConfigVM End If Next If Not String.IsNullOrEmpty(ParamName) Then - m_GeometryName = ParamName + GeometryName = ParamName End If ' carico la lista dei Parametri LoadNameComboBoxLua(Map.refHardwarePageVM.CurrHardware) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 7cb2eb2..e08d4ff 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -72,5 +72,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/SceneManager/InstrumentPanel/InstrumentPanelVM.vb b/SceneManager/InstrumentPanel/InstrumentPanelVM.vb index cb1cef3..dcd7ef0 100644 --- a/SceneManager/InstrumentPanel/InstrumentPanelVM.vb +++ b/SceneManager/InstrumentPanel/InstrumentPanelVM.vb @@ -212,11 +212,11 @@ Public Class InstrumentPanelVM If IsNothing(Map.refHardwarePageVM.CurrHardware) OrElse IsNothing(Map.refHardwarePageVM.CurrHardware.SelTemplate) Then Return Dim sCurrDir As String = Path.GetDirectoryName(Map.refHardwarePageVM.CurrHardware.CurrPath()) Dim sImageFile As String = sCurrDir & "\" & Path.GetFileNameWithoutExtension(Map.refHardwarePageVM.CurrHardware.CurrPath) & ".png" - ExportPngFromNge(sImageFile) + ExportPngFromNge(sImageFile, 1500, 2000) ElseIf Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nDDFPage Then If IsNothing(Map.refAssemblyManagerVM.CurrProject) OrElse IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) OrElse IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name) Then Return Dim sImageFile As String = IniFile.m_sTempDir & "\Image.png" - ExportPngFromNge(sImageFile) + ExportPngFromNge(sImageFile, 3000, 4000) Else Return End If @@ -248,16 +248,17 @@ Public Class InstrumentPanelVM #Region "METHODS" - Public Function ExportPngFromNge(ByRef SPathImage As String) As Boolean + Public Function ExportPngFromNge(ByRef SPathImage As String, nImgW As Integer, nImgH As Integer) As Boolean ' Creo l'immagine da allegare ' Nascondo la tavola ed eseguo zoom su quello che rimane ' EgtZoom(ZM.ALL, True) ' Prendo l'immagine per la stampa Dim colWhite As New Color3d(255, 255, 255) - Dim nImgW As Integer = 3000 - Dim nImgH As Integer = 4000 + ' 3000x4000 + ' Dim nImgW As Integer = 3000 + ' Dim nImgH As Integer = 4000 Dim sPath As String = SPathImage - EgtSetLineAttribs(3) + EgtSetLineAttribs(4) If Not EgtGetImage(SM.HIDDENLINE, colWhite, colWhite, nImgW, nImgH, sPath) Then ' Error in creating the print image EgtOutLog(EgtMsg(50181))