From bbdac918941232c33324d20587525017ac7b7bbc Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Fri, 13 Dec 2024 17:04:37 +0100 Subject: [PATCH 1/6] Migliorata gestione tempi comunicazione NUM_old --- MainWindow.xaml.vb | 12 ++++++------ My Project/AssemblyInfo.vb | 4 ++-- NcComm/M_Num_old.vb | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 99192e6..a7c9fba 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -343,8 +343,8 @@ Class MainWindow ' Verifico abilitazione nesting automatico m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey) ' Recupero opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2611, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2611, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2612, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2612, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE) ' Impostazione per programma OnlyFrame: solo se CUT_BASE non attivo @@ -656,13 +656,13 @@ Class MainWindow Dim sAssStatus As String = " discontinued" Dim nAssLeftDays As Integer + ' MESSAGGIO... If EgtGetKeyAssLeftDays(nAssLeftDays) And nAssLeftDays >= 0 Then - If nAssLeftDays > 30 Then + If nAssLeftDays > 0 Then sAssStatus = "expires within " & nAssLeftDays.ToString() & " days" - ElseIf nAssLeftDays > 0 Then - sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days" + 'sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days" Else - sAssStatus = "to be renewed by today" + sAssStatus = "Expired" End If End If diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 4a4f9ad..c849d31 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -62,5 +62,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/NcComm/M_Num_old.vb b/NcComm/M_Num_old.vb index d6d3ea1..4f1f569 100644 --- a/NcComm/M_Num_old.vb +++ b/NcComm/M_Num_old.vb @@ -1297,14 +1297,14 @@ Namespace Num End Function Function VerifyBusy() As eStateType - For I As Integer = 0 To 50 + For I As Integer = 0 To 150 If global_state <> eStateType.READY Then System.Threading.Thread.Sleep(SLEEP_TIME) Else Exit For End If Next - + EgtOutLog("eStateType: " & global_state.ToString & " -- if eStateType=0 it means READY") Return global_state End Function From 3ea8335357ee527aeb9a4a85004cd21fef97a4b6 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 16 Dec 2024 15:40:03 +0100 Subject: [PATCH 2/6] Gestione parcheggio per scatto foto --- CadCuts/CadCutPageUC.xaml.vb | 1 + Constants/ConstMachIni.vb | 3 ++ RawPhoto/Camera.vb | 64 ++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/CadCuts/CadCutPageUC.xaml.vb b/CadCuts/CadCutPageUC.xaml.vb index 8f39689..1e959f3 100644 --- a/CadCuts/CadCutPageUC.xaml.vb +++ b/CadCuts/CadCutPageUC.xaml.vb @@ -2,6 +2,7 @@ Imports EgtWPFLib Imports System.Reflection Imports System.Globalization +Imports EgtWPFLib5 Public Class CadCutPageUC diff --git a/Constants/ConstMachIni.vb b/Constants/ConstMachIni.vb index b449bd4..794268e 100644 --- a/Constants/ConstMachIni.vb +++ b/Constants/ConstMachIni.vb @@ -182,6 +182,9 @@ Public Const K_PHOTO_TAB2_OFFSETY As String = "Tab2OffsetY" Public Const K_PHOTO_HQ_OFFSETX As String = "HQOffsetX" Public Const K_PHOTO_HQ_OFFSETY As String = "HQOffsetY" + Public Const K_CAMERA_DIRECT_CMD As String = "CameraDirectCmd" + Public Const K_CAMERA_STATE_VAR As String = "CameraStateVar" + Public Const K_ENABELE_GOHOME_FOR_PHOTO As String = "EnableGoHomeForPhoto" Public Const S_TOOLS As String = "Tools" Public Const K_DRILLBIT As String = "Drillbit" diff --git a/RawPhoto/Camera.vb b/RawPhoto/Camera.vb index 9c412bf..f118a16 100644 --- a/RawPhoto/Camera.vb +++ b/RawPhoto/Camera.vb @@ -347,6 +347,13 @@ Public Class Camera ' ------------------------------------ accensione riflettori ------------------------------------ + ' ------------------------------------ mando la testa in home ------------------------------------ + If Not GoHomeForPhoto() Then + EgtOutLog("Error in positioning") + End If + + ' ------------------------------------ mando la testa in home ------------------------------------ + ' Scatto una foto con eventuale riconoscimento del contorno (il programma deve essere già attivo) Dim bOk As Boolean = False Dim sArgs As String = "2 0" @@ -364,6 +371,63 @@ Public Class Camera Return bOk End Function + Private Function GoHomeForPhoto() As Boolean + Dim bGoHome As Boolean = GetPrivateProfileInt(S_PHOTO, K_ENABELE_GOHOME_FOR_PHOTO, 0, m_MainWindow.GetMachIniFile()) <> 0 + ' Se non configurato esco senza generare errore + If Not bGoHome Then Return True + ' Costruisco il bottone per potere eseguire il comando MDI + Dim GoHome As MachineButton = Nothing + Dim sDirectCmdFile As String = String.Empty + GetPrivateProfileString(S_PHOTO, K_CAMERA_DIRECT_CMD, "", sDirectCmdFile, m_MainWindow.GetMachIniFile()) + If String.IsNullOrEmpty(sDirectCmdFile) Then + Return False + Else + EgtOutLog("Direct command for positionig head: " & sDirectCmdFile) + End If + GoHome = New TwoStateButton("", sDirectCmdFile, "", "", "") + ' eseguo lo script lua associato + GoHome.ExecuteMDICommand(GoHome.TLuaScriptName) + ' Leggo nome variabile posizione home raggiunta + Dim CameraStateNameVar As String = String.Empty + GetPrivateProfileString(S_PHOTO, K_CAMERA_STATE_VAR, "", CameraStateNameVar, m_MainWindow.GetMachIniFile()) + If String.IsNullOrEmpty(CameraStateNameVar) Then + 'Return False + Else + EgtOutLog("Variable for read status of positioning head: " & CameraStateNameVar) + End If + m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage("Going home!") + UpdateUI() + ' Eseguo reset variabile posizione home raggiunta + m_MainWindow.m_CNCommunication.m_CN.DVariables_WriteVariables2(CameraStateNameVar, "0") + System.Threading.Thread.Sleep(300) + ' Definisco flag posizionamento completato + Dim bPositionOk As Boolean = False + For I As Integer = 0 To 40 + ' Devo rileggere la variabile ad ogni ciclo + m_MainWindow.m_CNCommunication.m_CN.ReadEls_Add_Parameter(CameraStateNameVar, 3) + System.Threading.Thread.Sleep(100) + If m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 3 Then + Dim CameraStateVal As Integer = CInt(m_MainWindow.m_CNCommunication.m_CN.d_DReadELS_value) + Select Case CameraStateVal + Case 0 + ' Non faccio alcunchè perchè si sta posizionando + Case 1 + ' Posizionamento completato + bPositionOk = True + Exit For + Case 2 + ' Errore + bPositionOk = False + Exit For + End Select + End If + System.Threading.Thread.Sleep(900) + Next + m_MainWindow.m_CurrentProjectPageUC.ClearMessage() + UpdateUI() + Return bPositionOk + End Function + Private Function WaitPhoto(nInd As Integer) As Boolean ' Ciclo di ricerca foto scattata Dim nMaxThick = 10 * m_nTimeout From 615d6d2652e2bfe5f95ad58d5a1c11ad6262cf27 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 23 Dec 2024 11:23:53 +0100 Subject: [PATCH 3/6] Nuova gestione tagli parziali Saw&Waterjet --- CAM/CamAuto.vb | 27 +++++++++++++++++++++++++-- RawPhoto/Camera.vb | 3 ++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/CAM/CamAuto.vb b/CAM/CamAuto.vb index d818fe2..bf90f76 100644 --- a/CAM/CamAuto.vb +++ b/CAM/CamAuto.vb @@ -47,6 +47,26 @@ Friend Module CamAuto Return bOk End Function + ' versione CamAuto 2.6l1: gestione tagli con ridotto affondamento + Friend Function AddWaterJetMachining(LocaList As List(Of Integer), ByRef nWarn As Integer) As Boolean + EgtLuaCreateGlobTable("CAM") + SetLuaStandardCamParams() + For i As Integer = 0 To LocaList.Count - 1 + EgtLuaSetGlobIntVar("CAM.TAB_OPERID." & (i + 1).ToString, LocaList(i)) + Next + Dim nErr As Integer = 999 + Dim bOk As Boolean = EgtLuaExecFile(m_MainWindow.GetCamAutoDir() & "\CamAuto.lua") + bOk = bOk AndAlso EgtLuaGetGlobIntVar("CAM.ERR", nErr) AndAlso nErr = 0 + bOk = bOk AndAlso EgtLuaCallFunction("CAM.AddWaterJets") + EgtLuaGetGlobIntVar("CAM.ERR", nErr) + EgtLuaResetGlobVar("CAM") + If nErr <> 0 Then + bOk = False + EgtOutLog("Error in CamAuto : " & nErr.ToString()) + End If + Return bOk + End Function + Friend Function EraseMachinings(nPartId As Integer) As Boolean EgtLuaCreateGlobTable("CAM") EgtLuaSetGlobIntVar("CAM.PARTID", nPartId) @@ -543,6 +563,7 @@ Friend Module CamAuto Dim dReducedDepth As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_REDUCEDDEPTH, 1, m_MainWindow.GetMachIniFile()) ' Ciclo sulle lavorazioni Dim nOperId As Integer = EgtGetFirstOperation() + Dim LocalListOperId As New List(Of Integer) While nOperId <> GDB_ID.NULL ' verifico sia una lavorazione valida di taglio con lama If IsValidMachining( nOperId) And EgtGetOperationType( nOperId) = MCH_OY.SAWING Then @@ -557,12 +578,14 @@ Friend Module CamAuto ' se abilitato e attivo waterjet, lo aggiungo per completare il taglio If m_MainWindow.m_CurrentMachine.WaterJettingActive Then Dim nWarn As Integer = 0 - AddWaterJetMachining(nOperId, nWarn) + LocalListOperId.Add(nOperId) + 'AddWaterJetMachining(nOperId, nWarn) + End If End If - End If End If nOperId = EgtGetNextOperation(nOperId) End While + If LocalListOperId.Count > 0 Then AddWaterJetMachining(LocalListOperId, 0) Return bModified End Function diff --git a/RawPhoto/Camera.vb b/RawPhoto/Camera.vb index f118a16..ca44f1f 100644 --- a/RawPhoto/Camera.vb +++ b/RawPhoto/Camera.vb @@ -395,7 +395,8 @@ Public Class Camera Else EgtOutLog("Variable for read status of positioning head: " & CameraStateNameVar) End If - m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage("Going home!") + ' 91145=Going home + m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(91145)) UpdateUI() ' Eseguo reset variabile posizione home raggiunta m_MainWindow.m_CNCommunication.m_CN.DVariables_WriteVariables2(CameraStateNameVar, "0") From 6613b3d551b2f06a1940fcd7b1c2dd9ca6743bd5 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 23 Dec 2024 12:33:19 +0100 Subject: [PATCH 4/6] Nuovi messaggi per assistenza --- DirectCuts/SawTestUC.xaml.vb | 4 ++-- LicenseWindow.xaml | 8 ++++---- LicenseWindow.xaml.vb | 2 +- MainWindow.xaml.vb | 19 ++++++++++++++----- RawPhoto/Camera.vb | 4 ++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/DirectCuts/SawTestUC.xaml.vb b/DirectCuts/SawTestUC.xaml.vb index 9d97258..2f06862 100644 --- a/DirectCuts/SawTestUC.xaml.vb +++ b/DirectCuts/SawTestUC.xaml.vb @@ -532,8 +532,8 @@ Public Class SawTestUC vtPerp.Rotate(Vector3d.Z_AX, +90) Else m_CurrProjPage.ClearMessage() - ' 91144 = Set machining side: right or left. - m_CurrProjPage.SetInfoMessage(EgtMsg(91144)) + ' 91143 = Set machining side: right or left. + m_CurrProjPage.SetInfoMessage(EgtMsg(91143)) End If Dim ptEnd As Point3d = ptStart + vtDir * m_dLen + vtPerp * dThick Dim dLen2 As Double = m_dLen / 2 diff --git a/LicenseWindow.xaml b/LicenseWindow.xaml index 3206a7b..c0b9729 100644 --- a/LicenseWindow.xaml +++ b/LicenseWindow.xaml @@ -3,15 +3,15 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" FontFamily="{DynamicResource OmagCut_Font}" - Title="OpenFile" Height="500.6" Width="426.6" WindowStyle="None" + Title="OpenFile" Height="587.4" Width="500.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent"> - + - + @@ -36,7 +36,7 @@ - diff --git a/LicenseWindow.xaml.vb b/LicenseWindow.xaml.vb index 3f7777a..692ef6b 100644 --- a/LicenseWindow.xaml.vb +++ b/LicenseWindow.xaml.vb @@ -17,7 +17,7 @@ Public Sub Init() Handles Me.Initialized IconTxBl.Text = "⚠️" - LicenseTxBl.Text = "Warning" & vbCrLf & m_sTitle + LicenseTxBl.Text = m_sTitle m_sMessage = m_sMessage.Replace("/n", "£") Dim sItems As String() = m_sMessage.Split("£") For Index As Integer = 0 To sItems.Count - 1 diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index a7c9fba..5053779 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -666,16 +666,25 @@ Class MainWindow End If End If + ' Or nAssLeftDays = 358 - If (nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28 Then - Dim sMsg As String = EgtMsg(91141) ' Assistenza in scadenza /nContattare assistenza:/n + If (nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28 Or nAssLeftDays = 39 Then + ' 91145=Avviso importante + Dim sMsg_Title As String = EgtMsg(91145) + ' 91146=Il contratto di aggiornamento della licenza in uso scadrà tra {0} giorni./n + Dim sMsg_AssStatus As String = String.Format(EgtMsg(91146), nAssLeftDays.ToString()) + ' 91147=Se desiderate rimanere aggiornati e continuare ad usufruire dei benefici del servizio, vi invitiamo a contattare la nostra assistenza al seguente indirizzo:/n + Dim sMsg_RefAssistance As String = EgtMsg(91147) Dim sAssistance As String = String.Empty GetPrivateProfileString(S_GENERAL, "Assistances", "", sAssistance, GetIniFile) Dim sItems As String() = sAssistance.Split(","c) For Each Item As String In sItems - sMsg &= " → " & Item.Trim & " /n" + sMsg_RefAssistance &= " → " & Item.Trim & " /n" Next - Dim MyLicWn As New LicenseWindow(Me, sMsg, "Assistance " & sAssStatus) + ' 91148=Grazie per la vostra collaborazione. + Dim sMsg_ThankYou As String = EgtMsg(91148) + Dim MyLicWn As New LicenseWindow(Me, sMsg_AssStatus & sMsg_RefAssistance & sMsg_ThankYou, sMsg_Title) + MyLicWn.WindowStartupLocation = WindowStartupLocation.CenterOwner MyLicWn.Show() End If @@ -1327,7 +1336,7 @@ Class MainWindow If m_OnlyFrame Then If nPrjType = CurrentProjectPageUC.PRJ_TYPE.FLATS And m_ActivePage <> Pages.RawPart And m_ActivePage <> Pages.DirectCut And m_ActivePage <> Pages.Simulation Then - Dim FrameWnd As New EgtMsgBox(Me, EgtMsg(91142), EgtMsg(91143), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) + Dim FrameWnd As New EgtMsgBox(Me, EgtMsg(91141), EgtMsg(91142), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) '' Gestione stato FastGrid 'm_CadCutPageUC.m_FastGridSlabManager.OnPreNewProject() ' Cancello progetto salvato con nome da file ini diff --git a/RawPhoto/Camera.vb b/RawPhoto/Camera.vb index ca44f1f..fa61e01 100644 --- a/RawPhoto/Camera.vb +++ b/RawPhoto/Camera.vb @@ -395,8 +395,8 @@ Public Class Camera Else EgtOutLog("Variable for read status of positioning head: " & CameraStateNameVar) End If - ' 91145=Going home - m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(91145)) + ' 91144=Going home + m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(91144)) UpdateUI() ' Eseguo reset variabile posizione home raggiunta m_MainWindow.m_CNCommunication.m_CN.DVariables_WriteVariables2(CameraStateNameVar, "0") From 9f3920a2b24af35731f33ab722c077a4b7e6e083 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Tue, 24 Dec 2024 14:39:09 +0100 Subject: [PATCH 5/6] Nuova gestione visualizzazione layer info lavorazioni --- CadCuts/SplitPageUC.xaml | 8 +++- CadCuts/SplitPageUC.xaml.vb | 57 +++++++++++++++++++++++++++ Constants/ConstIni.vb | 1 + MainWindow.xaml.vb | 2 +- OmagCUT.vbproj | 4 ++ Resources/NewIcons/LightArrowOff.png | Bin 0 -> 2314 bytes Resources/NewIcons/LightArrowOn.png | Bin 0 -> 2437 bytes 7 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 Resources/NewIcons/LightArrowOff.png create mode 100644 Resources/NewIcons/LightArrowOn.png diff --git a/CadCuts/SplitPageUC.xaml b/CadCuts/SplitPageUC.xaml index b0eb155..c8a109a 100644 --- a/CadCuts/SplitPageUC.xaml +++ b/CadCuts/SplitPageUC.xaml @@ -100,8 +100,14 @@ + + + - + diff --git a/CadCuts/SplitPageUC.xaml.vb b/CadCuts/SplitPageUC.xaml.vb index e3f2155..bb138f8 100644 --- a/CadCuts/SplitPageUC.xaml.vb +++ b/CadCuts/SplitPageUC.xaml.vb @@ -1,5 +1,6 @@ Imports System.Collections.ObjectModel Imports System.ComponentModel +Imports System.Drawing Imports EgtUILib Public Class SplitPageUC @@ -8,6 +9,9 @@ Public Class SplitPageUC Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) Private WithEvents m_CurrProjPage As CurrentProjectPageUC + ' Creazione converter da String a ImageSource + Private ImageConverter As New ImageSourceConverter + ' Flag di pagina attiva Private m_bActive As Boolean = False ' Tipo movimento dei grezzi (manuale o con testa ventosa) @@ -183,6 +187,9 @@ Public Class SplitPageUC m_MainWindow.m_CurrentProjectPageUC.ClearMessage() End If End If + ' leggo lo stato del bottone per la visualizzazione delle etichette + LayNbArrTgBtn.IsChecked = (GetPrivateProfileInt(S_GENERAL, K_SHOWNBARROW, 1, m_MainWindow.GetIniFile()) <> 0) + SetLayNbArrTgBtn_Click() End Sub ' preparo la lista delle lavorazioni da mostrare in interfaccia @@ -765,6 +772,25 @@ Public Class SplitPageUC MoveItem(1) End Sub + Private Sub LayNbArrTgBtn_Click() Handles LayNbArrTgBtn.Click + SetLayNbArrTgBtn_Click() + WritePrivateProfileString(S_GENERAL, K_SHOWNBARROW, If(LayNbArrTgBtn.IsChecked, "1", "0"), m_MainWindow.GetIniFile()) + End Sub + + Private Sub SetLayNbArrTgBtn_Click() + If LayNbArrTgBtn.IsChecked Then + StatusOffNumbArrow(GDB_ST.ON_) + LayNbArrTgBtn.ToolTip = "Hide" + Dim Img As ImageSource = ImageConverter.ConvertFromString("pack://application:,,,/Resources/NewIcons/LightArrowOn.png") + LayNbArrImg.Source = Img + Else + StatusOffNumbArrow(GDB_ST.OFF) + LayNbArrTgBtn.ToolTip = "Show" + Dim Img As ImageSource = ImageConverter.ConvertFromString("pack://application:,,,/Resources/NewIcons/LightArrowOff.png") + LayNbArrImg.Source = Img + End If + End Sub + Private Sub MoveItem(direction As Integer) ' Checking selected item If m_CurrFirstInd = -1 OrElse MachiningLsBx.SelectedIndex < 0 Then @@ -2392,6 +2418,11 @@ Public Class SplitPageUC ' Aggiungo a numero info con identificativo della lavorazione e viceversa EgtSetInfo(nNbrId, "MId", m_MachiningList(nI).m_nId) EgtSetInfo(m_MachiningList(nI).m_nId, "NbrId", nNbrId) + If Not LayNbArrTgBtn.IsChecked Then + EgtSetStatus(nNbrId, GDB_ST.OFF) + Else + EgtSetStatus(nNbrId, GDB_ST.ON_) + End If End If ' Se taglio con lama, metto la direzione accanto al numero If m_MachiningList(nI).m_nType = MCH_OY.SAWING Then @@ -2403,6 +2434,11 @@ Public Class SplitPageUC ' Aggiungo a freccia info con identificativo della lavorazione e viceversa EgtSetInfo(nArrId, "MId", m_MachiningList(nI).m_nId) EgtSetInfo(m_MachiningList(nI).m_nId, "ArrId", nArrId) + If Not LayNbArrTgBtn.IsChecked Then + EgtSetStatus(nArrId, GDB_ST.OFF) + Else + EgtSetStatus(nArrId, GDB_ST.ON_) + End If Else m_MachiningList(nI).m_nArrId = GDB_ID.NULL End If @@ -2519,6 +2555,27 @@ Public Class SplitPageUC EgtResetMark(nNbrId) EgtResetMark(nArrId) End If + If Not LayNbArrTgBtn.IsChecked And Not bMark Then + EgtSetStatus(nNbrId, GDB_ST.OFF) + EgtSetStatus(nArrId, GDB_ST.OFF) + Else + EgtSetStatus(nNbrId, GDB_ST.ON_) + EgtSetStatus(nArrId, GDB_ST.ON_) + End If + End Sub + + Private Sub StatusOffNumbArrow(Status As GDB_ST) + For Each Item As SplitMach In m_MachiningList + Dim nOperId As Integer = Item.m_nId + Dim nNbrId As Integer = Item.m_nNbrId + Dim nArrId As Integer = Item.m_nArrId + Dim nInd As Integer = m_MachiningList.IndexOf(Item) + If nInd >= 0 AndAlso nInd < m_ItemList.Count AndAlso Not m_ItemList(nInd).IsSelected Then + EgtSetStatus(nNbrId, Status) + EgtSetStatus(nArrId, Status) + End If + Next + EgtDraw() End Sub Private Sub ColorNumberArrow(nI As Integer) diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 43eba05..bede91d 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -54,6 +54,7 @@ Module ConstIni Public Const K_FRACTIONPATTERN As String = "FractionPattern" Public Const K_PRECISION As String = "Precision" Public Const K_QUITDRAWPAGE As String = "QuitDrawPage" + Public Const K_SHOWNBARROW As String = "ShowNbArrow" Public Const S_LANGUAGES As String = "Languages" Public Const K_LANGUAGE As String = "Language" diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 5053779..7998f18 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -668,7 +668,7 @@ Class MainWindow ' Or nAssLeftDays = 358 - If (nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28 Or nAssLeftDays = 39 Then + If (nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28 Then ' 91145=Avviso importante Dim sMsg_Title As String = EgtMsg(91145) ' 91146=Il contratto di aggiornamento della licenza in uso scadrà tra {0} giorni./n diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj index 8713a7a..ea927d4 100644 --- a/OmagCUT.vbproj +++ b/OmagCUT.vbproj @@ -1385,6 +1385,10 @@ + + + + IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe diff --git a/Resources/NewIcons/LightArrowOff.png b/Resources/NewIcons/LightArrowOff.png new file mode 100644 index 0000000000000000000000000000000000000000..47de5d73539aa845e74b6a9f7f5f5ee21912674f GIT binary patch literal 2314 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 literal 0 HcmV?d00001 From c730513f27f8d8fddb787c27730b4ac25506a918 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 30 Dec 2024 09:02:50 +0100 Subject: [PATCH 6/6] Configurazione finestra licenza --- Constants/ConstIni.vb | 1 + MainWindow.xaml.vb | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index bede91d..79f0ee9 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -55,6 +55,7 @@ Module ConstIni Public Const K_PRECISION As String = "Precision" Public Const K_QUITDRAWPAGE As String = "QuitDrawPage" Public Const K_SHOWNBARROW As String = "ShowNbArrow" + Public Const K_SHOWEXPIREASSITANCE As String = "ShowExpireAssistance" Public Const S_LANGUAGES As String = "Languages" Public Const K_LANGUAGE As String = "Language" diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 7998f18..cfe9c1d 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -666,9 +666,10 @@ Class MainWindow End If End If - + Dim bShowInfoAssistance As Boolean = True + bShowInfoAssistance = (GetPrivateProfileInt(S_GENERAL, K_SHOWEXPIREASSITANCE, "1", GetIniFile) <> 0) ' Or nAssLeftDays = 358 - If (nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28 Then + If bShowInfoAssistance And ((nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28) Then ' 91145=Avviso importante Dim sMsg_Title As String = EgtMsg(91145) ' 91146=Il contratto di aggiornamento della licenza in uso scadrà tra {0} giorni./n