From a7d89047bdc2f551cd7d22b9a0a6f790c0015dc3 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 18 Feb 2026 10:54:30 +0100 Subject: [PATCH] OmagCUT 3.1b1 : - piccoli aggiustamenti estetici. --- CadCuts/NestPageUC.xaml | 2 +- CadCuts/NestPageUC.xaml.vb | 20 ++++++++++---------- CadCuts/SelParkIndWD.xaml.vb | 2 +- DrawImport/ImportPageUC.xaml.vb | 2 +- MainWindow.xaml.vb | 6 +++--- My Project/AssemblyInfo.vb | 4 ++-- Project/ProjectMgrUC.xaml.vb | 4 ++-- VeinMatching/VeinMatchingWindow.xaml.vb | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CadCuts/NestPageUC.xaml b/CadCuts/NestPageUC.xaml index ba35060..272df1d 100644 --- a/CadCuts/NestPageUC.xaml +++ b/CadCuts/NestPageUC.xaml @@ -126,7 +126,7 @@ - + diff --git a/CadCuts/NestPageUC.xaml.vb b/CadCuts/NestPageUC.xaml.vb index 7438482..f83ab5a 100644 --- a/CadCuts/NestPageUC.xaml.vb +++ b/CadCuts/NestPageUC.xaml.vb @@ -107,7 +107,7 @@ Public Class NestPageUC RemovePartBtn.ToolTip = EgtMsg(90333) ' Remove part - Elimina pezzo SelectAllBtn.ToolTip = EgtMsg(90334) ' Select All - Seleziona Tutto DeselectAllBtn.ToolTip = EgtMsg(90335) ' Deselect All - Deseleziona Tutto - DragRettanleBtn.ToolTip = EgtMsg(91207) ' Strech + DragRettangleBtn.ToolTip = EgtMsg(91207) ' Strech ' Nascondo i pulsanti in uso quando attivo la modalità REG UG1_Reg.Visibility = Visibility.Hidden @@ -117,9 +117,9 @@ Public Class NestPageUC m_bIsVisibleDragRettangle = (GetPrivateProfileInt(S_NEST, K_DRAG_RETTANGLE, 0, m_MainWindow.GetIniFile()) <> 0) If Not m_bIsVisibleDragRettangle Then nColumsIn_UG1 = 1 - DragRettanleBtn.Visibility = Visibility.Collapsed + DragRettangleBtn.Visibility = Visibility.Collapsed Else - DragRettanleBtn.Visibility = Visibility.Visible + DragRettangleBtn.Visibility = Visibility.Visible End If ' gestisco la visualizzazione del comando Splt (per i tagli waterjet) @@ -147,7 +147,7 @@ Public Class NestPageUC ' Gestione dei comandi di parcheggio e selezione (UniformGrid2) If GetPrivateProfileInt(S_GENERAL, K_ENABLEDXFPARK, 0, m_MainWindow.GetIniFile) = 0 Then - EgtOutLog("Button 'EnableDXFPark' is not enable, check in file *.ini program.") + EgtOutLog("Button 'EnableDXFPark' is not enabled, check in OmagCUT.ini file.") ParkIndBtn.Visibility = Visibility.Collapsed UG2.Columns = 2 End If @@ -163,7 +163,7 @@ Public Class NestPageUC If GetPrivateProfileInt(S_GENERAL, K_ENABLEDXFPARK, 0, m_MainWindow.GetIniFile) = 0 Then m_MainWindow.m_CurrentProjectPageUC.ClearMessage() m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("There are " & (nCpuntParkInd - 1).ToString & " park in project.") - EgtOutLog("WARNONG: Enable button 'EnableDXFPark' in file *.ini program.") + EgtOutLog("WARNING: Enable button 'EnableDXFPark' in OmagCUT.ini file.") End If ParkIndBtn.IsChecked = True End If @@ -2737,8 +2737,8 @@ Public Class NestPageUC #End Region ' Manager Counter Part - Private Sub DragRettangle_Click() Handles DragRettanleBtn.Click - If DragRettanleBtn.IsChecked Then + Private Sub DragRettangle_Click() Handles DragRettangleBtn.Click + If DragRettangleBtn.IsChecked Then m_bIsCheckedDragRettangle = True SplitCurveWJBtn.IsChecked = False ResetSplitCurvWJParam() @@ -2758,7 +2758,7 @@ Public Class NestPageUC Private Sub SplitCurveWJBtn_Click() Handles SplitCurveWJBtn.Click If SplitCurveWJBtn.IsChecked Then m_bIsCheckedSplitCurveWJ = True - DragRettanleBtn.IsChecked = False + DragRettangleBtn.IsChecked = False m_bIsCheckedDragRettangle = False StartCurveWJBtn.IsChecked = False ResetStartCurvWJParam() @@ -2776,7 +2776,7 @@ Public Class NestPageUC Private Sub StartCurveWJBtn_Click() Handles StartCurveWJBtn.Click If StartCurveWJBtn.IsChecked Then m_bIsCheckedStartCurveWJ = True - DragRettanleBtn.IsChecked = False + DragRettangleBtn.IsChecked = False m_bIsCheckedDragRettangle = False ResetSplitCurvWJParam() SplitCurveWJBtn.IsChecked = False @@ -2999,7 +2999,7 @@ Public Class NestPageUC ' Aggiorna immagine e restituisce il numero di parcheggi (+1) disponibili (+1 perchè conto anche il comando All_Off) Private Function UpdateImageParkInd(Optional bDisableModified As Boolean = True) As Integer - ' Carcico la lista dei parcheggi + ' Carico la lista dei parcheggi Dim ListparkInd As New List(Of ParkInd) SelParkIndWD.LoadParkInd(ListparkInd) Dim nCount As Integer = ListparkInd.Count diff --git a/CadCuts/SelParkIndWD.xaml.vb b/CadCuts/SelParkIndWD.xaml.vb index d8d088c..497fce5 100644 --- a/CadCuts/SelParkIndWD.xaml.vb +++ b/CadCuts/SelParkIndWD.xaml.vb @@ -320,7 +320,7 @@ Public Class SelParkIndWD System.IO.File.Copy(If(Extension = ".svg", ItemParkInd.Svg, ItemParkInd.Img), sNewFile) End If Catch ex As Exception - EgtOutLog("Copia immagine " & If(Extension = ".svg", ItemParkInd.Svg, ItemParkInd.Img) & " di ParkInd non roiscita") + EgtOutLog("Copia immagine " & If(Extension = ".svg", ItemParkInd.Svg, ItemParkInd.Img) & " di ParkInd non riuscita") End Try End If Next diff --git a/DrawImport/ImportPageUC.xaml.vb b/DrawImport/ImportPageUC.xaml.vb index 40d9156..63b0f5a 100644 --- a/DrawImport/ImportPageUC.xaml.vb +++ b/DrawImport/ImportPageUC.xaml.vb @@ -1049,7 +1049,7 @@ Public Class ImportPageUC Dim dNewArea As Double = 0 Dim nId As Integer = nFirstId While nId <> GDB_ID.NULL - ' Definisco l'indice di parcheggio asssganto al pezzo + ' Definisco l'indice di parcheggio assegnato al pezzo If GetPrivateProfileInt(S_GENERAL, K_ENABLEDXFPARK, 0, m_MainWindow.GetIniFile) <> 0 Then EgtSetInfo(nId, INFO_PARKIND, NewParkInd.ToString) ' Imposto lo stato diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 5650760..f735043 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -362,8 +362,8 @@ Class MainWindow ' Verifico abilitazione nesting automatico m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey) ' Recupero opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 3101, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 3101, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 3102, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 3102, 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 @@ -2146,7 +2146,7 @@ Class MainWindow ' spegne il comando per la mofica dei rettangoli Public Sub DragRettangleOff() - m_CadCutPageUC.m_NestPage.DragRettanleBtn.IsChecked = False + m_CadCutPageUC.m_NestPage.DragRettangleBtn.IsChecked = False Me.m_CadCutPageUC.m_NestPage.m_bIsCheckedDragRettangle = False ShowParkedParts() diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 22122b8..145168a 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/Project/ProjectMgrUC.xaml.vb b/Project/ProjectMgrUC.xaml.vb index 989f5e4..474c184 100644 --- a/Project/ProjectMgrUC.xaml.vb +++ b/Project/ProjectMgrUC.xaml.vb @@ -1357,7 +1357,7 @@ Public Class ProjectMgrUC m_MainWindow.m_CadCutPageUC.m_NestPage.SelectAllBtn.Visibility = Windows.Visibility.Hidden m_MainWindow.m_CadCutPageUC.m_NestPage.DeselectAllBtn.Visibility = Windows.Visibility.Hidden ' nuovi bottoni pagina di Nesting - m_MainWindow.m_CadCutPageUC.m_NestPage.DragRettanleBtn.Visibility = Windows.Visibility.Hidden + m_MainWindow.m_CadCutPageUC.m_NestPage.DragRettangleBtn.Visibility = Windows.Visibility.Hidden If m_MainWindow.m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.Visibility = Windows.Visibility.Visible Then m_MainWindow.m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.Visibility = Windows.Visibility.Hidden End If @@ -1447,7 +1447,7 @@ Public Class ProjectMgrUC m_MainWindow.m_CadCutPageUC.m_NestPage.SelectAllBtn.Visibility = Windows.Visibility.Visible m_MainWindow.m_CadCutPageUC.m_NestPage.DeselectAllBtn.Visibility = Windows.Visibility.Visible ' nuovi bottoni pagina di Nesting - m_MainWindow.m_CadCutPageUC.m_NestPage.DragRettanleBtn.Visibility = Windows.Visibility.Visible + m_MainWindow.m_CadCutPageUC.m_NestPage.DragRettangleBtn.Visibility = Windows.Visibility.Visible If m_MainWindow.m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.Visibility = Windows.Visibility.Hidden Then m_MainWindow.m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.Visibility = Windows.Visibility.Visible End If diff --git a/VeinMatching/VeinMatchingWindow.xaml.vb b/VeinMatching/VeinMatchingWindow.xaml.vb index d10cdc8..ac208c8 100644 --- a/VeinMatching/VeinMatchingWindow.xaml.vb +++ b/VeinMatching/VeinMatchingWindow.xaml.vb @@ -387,7 +387,7 @@ Friend Module VeinMatching End Function ' ------------------- CARICO I PEZZI PRESENTI NEL PROGETTO CORRENTE ------------------- - ' carico tutti i pezzi del progetto corrente che sonon di tipo PCucina, PBagno, AlzFront + ' carico tutti i pezzi del progetto corrente che sono di tipo PCucina, PBagno, AlzFront Friend Function LoadCurrPartFromProj() As Boolean ' Recupero il contesto corrente Dim nCurrCtx = EgtGetCurrentContext()