From 4f1a9b8938de31ea363208846b0bd17252badb04 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 26 Jan 2024 16:14:34 +0100 Subject: [PATCH] =?UTF-8?q?Icarus=202.6a1=20:=20-=20corretto=20controllo?= =?UTF-8?q?=20movimento=20pezzo=20(ora=20anche=20fuori=20da=20tavola=20pur?= =?UTF-8?q?ch=C3=A8=20in=20area=20di=20stampa)=20-=20aggiunta=20indicazion?= =?UTF-8?q?e=20giorni=20mancanti=20alla=20fine=20del=20piano=20di=20manute?= =?UTF-8?q?nzione.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Icarus/AboutBoxWindow/AboutBoxV.xaml.vb | 12 ++++++++++++ Icarus/DispositionPanel/DispositionPanelVM.vb | 8 ++++---- Icarus/MainWindow/MainWindowM.vb | 4 ++-- Icarus/My Project/AssemblyInfo.vb | 6 +++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb index 0d57a6a..164a61c 100644 --- a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb +++ b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb @@ -18,12 +18,24 @@ Public Class AboutBoxV Dim sLeftDays As String = "" Dim nLeftDays As Integer If EgtGetKeyLeftDays(nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays = " (" & nLeftDays.ToString() & ")" + Dim sAssStatus As String = " discontinued" + Dim nAssLeftDays As Integer + If EgtGetKeyAssLeftDays( nAssLeftDays) And nAssLeftDays >= 0 Then + If nAssLeftDays > 30 then + sAssStatus = "expires within " & nAssLeftDays.ToString() & " days" + Else If nAssLeftDays > 0 then + sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days" + Else + sAssStatus = "to be renewed by today" + End If + End If sInfo = If(EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName & " Inst" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & " Ulv" & Map.refMainWindowVM.MainWindowM.nUserLevel.ToString() & " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine + sInfo &= "Maintenance plane " & sAssStatus & Environment.NewLine sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine Dim sOpSys As String = String.Empty diff --git a/Icarus/DispositionPanel/DispositionPanelVM.vb b/Icarus/DispositionPanel/DispositionPanelVM.vb index 3321944..789eb52 100644 --- a/Icarus/DispositionPanel/DispositionPanelVM.vb +++ b/Icarus/DispositionPanel/DispositionPanelVM.vb @@ -21,8 +21,8 @@ Public Class DispositionPanelVM Dim dNewXPos As Double = ptReference.x StringToLen(value, dNewXPos) Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart) - Dim dMin As Double = 0 - Dim dMax As Double = CurrentMachine.b3Tab.DimX + Dim dMin As Double = Math.Min( 0, CurrentMachine.b3ExtrusionArea.Min.x) + Dim dMax As Double = Math.Max( CurrentMachine.b3Tab.DimX, CurrentMachine.b3ExtrusionArea.Max.x) If b3Print.Max.x > ptReference.x Then dMax -= b3Print.Max.x - ptReference.x End If @@ -60,8 +60,8 @@ Public Class DispositionPanelVM Dim dNewYPos As Double = ptReference.y StringToLen(value, dNewYPos) Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart) - Dim dMin As Double = 0 - Dim dMax As Double = CurrentMachine.b3Tab.DimY + Dim dMin As Double = Math.Min( 0, CurrentMachine.b3ExtrusionArea.Min.y) + Dim dMax As Double = Math.Max( CurrentMachine.b3Tab.DimY, CurrentMachine.b3ExtrusionArea.Max.y) If b3Print.Max.y > ptReference.y Then dMax -= b3Print.Max.y - ptReference.y End If diff --git a/Icarus/MainWindow/MainWindowM.vb b/Icarus/MainWindow/MainWindowM.vb index 05ceb28..4e5a80c 100644 --- a/Icarus/MainWindow/MainWindowM.vb +++ b/Icarus/MainWindow/MainWindowM.vb @@ -191,8 +191,8 @@ Public Class MainWindowM EgtSetLockId( sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5583, 2512, 1, m_nKeyLevel) And - EgtGetKeyOptions(5583, 2512, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5583, 2601, 1, m_nKeyLevel) And + EgtGetKeyOptions(5583, 2601, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb index ba68205..75c84ce 100644 --- a/Icarus/My Project/AssemblyInfo.vb +++ b/Icarus/My Project/AssemblyInfo.vb @@ -30,7 +30,7 @@ Imports System.Windows #End If - + @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +