From 27a1618265ff6cd0070ab67c244e2f9691e0f6fc Mon Sep 17 00:00:00 2001 From: DarioS Date: Sun, 1 May 2022 17:54:18 +0200 Subject: [PATCH] EgtBEAMWALL 2.4e1 : - migliorie per cancellazione pezzo e assemblato. --- EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb | 2 +- .../LoadingWnd/LoadingWndHelper.vb | 8 +- .../MachGroupModel/MyMachGroupPanelM.vb | 4 +- EgtBEAMWALL.Core/My Project/AssemblyInfo.vb | 4 +- .../OpenProjectFileDialogVM.vb | 2 + EgtBEAMWALL.Core/Utility/LuaMsgManager.vb | 2 +- EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb | 4 +- .../Controllers/ProjController.cs | 2 +- EgtBEAMWALL.DataLayer/DatabaseContext.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../CALCPanel/CALCPanelVM.vb | 1 - EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb | 42 +++++----- EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb | 12 +-- .../MainWindow/MainWindowM.vb | 4 +- .../My Project/AssemblyInfo.vb | 4 +- .../SceneHost/MySceneHostVM.vb | 34 ++++---- .../BTLViewModel/BTLStructureVM.vb | 77 +------------------ .../CALCPanel/CALCPanelVM.vb | 1 - .../LeftPanel/LeftPanelVM.vb | 11 --- .../MainWindow/MainWindowM.vb | 4 +- .../My Project/AssemblyInfo.vb | 4 +- .../NestingRunningWnd/NestingRunningWndVM.vb | 1 - .../ProjManager/ProjManagerVM.vb | 54 ++++++------- .../Utility/CurrentMachine.vb | 1 - 24 files changed, 101 insertions(+), 185 deletions(-) diff --git a/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb b/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb index cde25bf6..0d9cdae2 100644 --- a/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb +++ b/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb @@ -95,7 +95,7 @@ Public Class NewMachGroupPanelVM If Not MachGroupPanelM.IsMultiMachGroup Then SetMachGroupPanelVisibility(False) CreateMachGroupVMList() ' Creo riferimento a questa classe in LibMap - '''LibMap.SetRefMachGroupPanelVM(Me) + 'LibMap.SetRefMachGroupPanelVM(Me) End Sub #End Region ' CONSTRUCTOR diff --git a/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb b/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb index e91c42ba..e47a6f1b 100644 --- a/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb +++ b/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb @@ -19,14 +19,14 @@ Public Module LoadingWndHelper End Enum Dim m_MainWindow As Windows.Window - Public Function SetMainWindow(MainWindow As Windows.Window) + Public Sub SetMainWindow(MainWindow As Windows.Window) m_MainWindow = MainWindow - End Function + End Sub Private m_bMainWindow_IsActive As Boolean = True - Public Function SetMainWindowIsActive(IsActive As Boolean) + Public Sub SetMainWindowIsActive(IsActive As Boolean) m_bMainWindow_IsActive = IsActive - End Function + End Sub Delegate Sub CallbackLoadingDlg(ByRef CurrStep As Integer, ByRef StepText As String, ByRef nProgress As Integer, ByRef nNextProgress As Integer, ByRef MainWindow_IsActive As Boolean, ByRef bClose As Boolean) diff --git a/EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb b/EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb index 56718f79..95680db1 100644 --- a/EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb +++ b/EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb @@ -361,11 +361,11 @@ Public Class MyMachGroupPanelM ' elimino pezzo copia EgtRemovePartFromRawPart(nDuploId) EgtErase(nDuploId) - '' recupero gruppo di lavorazione e trave dell'interfaccia + ' recupero gruppo di lavorazione e trave dell'interfaccia 'Dim BeamMachGroup As BeamMachGroupM = MachGroupMList.FirstOrDefault(Function(x) x.Id = nMachGroupId) 'Dim Beam As BeamM = BeamMachGroup.PartMList.FirstOrDefault(Function(x) x.nPartId = nDuploId) 'EgtSetCurrMachGroup(BeamMachGroup.Id) - '''Beam.DeletePart() + 'Beam.DeletePart() Next End If DuploResetToDelete(nPartId) diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index fc6343b3..3afe9cb5 100644 --- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb @@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index be957dae..536899e8 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -284,6 +284,8 @@ Public MustInherit Class OpenProjectFileDialogVM AllFilesInDir = IO.Directory.EnumerateFiles(SelProject.sProjDirPath) ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then AllFilesInDir = IO.Directory.EnumerateFiles(SelProject.sProdDirPath) + Else + Return False End If For Each File In AllFilesInDir If Path.GetExtension(File).ToLower() = ".nge" Then diff --git a/EgtBEAMWALL.Core/Utility/LuaMsgManager.vb b/EgtBEAMWALL.Core/Utility/LuaMsgManager.vb index 174f5d62..9593cc2a 100644 --- a/EgtBEAMWALL.Core/Utility/LuaMsgManager.vb +++ b/EgtBEAMWALL.Core/Utility/LuaMsgManager.vb @@ -14,7 +14,7 @@ Public Module LuaMsgManager If Not String.IsNullOrWhiteSpace(sMsg) Then Return sMsg Else - EgtMsg(65000 + nMsg) + Return EgtMsg(65000 + nMsg) End If Else Return EgtMsg(65000 + nMsg) diff --git a/EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb b/EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb index 3b75529b..7cdd17cf 100644 --- a/EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb +++ b/EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb @@ -15,7 +15,7 @@ Public Class ViewPanelVM ' Posizione vista Private Shared m_nViewDir As VT = VT.ISO_SW - Public Shared Function BWSetView(nView As VT, Optional bRedraw As Boolean = True) + Public Shared Sub BWSetView(nView As VT, Optional bRedraw As Boolean = True) ' condizioni che cambiano la vista del progetto Select Case m_Type Case BWType.BEAM @@ -88,7 +88,7 @@ Public Class ViewPanelVM End Select End Select End Select - End Function + End Sub Public Shared Sub UpdateMachParam(ViewDir As VT) m_nViewDir = ViewDir diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs index 372efe9b..e49a6403 100644 --- a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs +++ b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs @@ -518,7 +518,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers localDbCtx.SaveChanges(); done = true; } - catch (Exception ex) + catch (Exception) { } } return done; diff --git a/EgtBEAMWALL.DataLayer/DatabaseContext.cs b/EgtBEAMWALL.DataLayer/DatabaseContext.cs index 4e2a60f6..30cdb98a 100644 --- a/EgtBEAMWALL.DataLayer/DatabaseContext.cs +++ b/EgtBEAMWALL.DataLayer/DatabaseContext.cs @@ -131,7 +131,7 @@ namespace EgtBEAMWALL.DataLayer TimeSpan timeout = TimeSpan.FromSeconds(DbConfig.DATABASE_PROCESS_TIMEOUT); service.WaitForStatus(ServiceControllerStatus.Running, timeout); } - catch (Exception ex) + catch (Exception) { return false; } @@ -145,7 +145,7 @@ namespace EgtBEAMWALL.DataLayer migrator.Update(); } } - catch (Exception ex) + catch (Exception) { return false; } diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs index cc37547b..86f63757 100644 --- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs +++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.4.1")] -[assembly: AssemblyFileVersion("2.4.4.1")] +[assembly: AssemblyVersion("2.4.5.1")] +[assembly: AssemblyFileVersion("2.4.5.1")] diff --git a/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb index 4159ecd2..b1dd686e 100644 --- a/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb +++ b/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb @@ -116,7 +116,6 @@ Public Class CALCPanelVM Dim cutId As Integer = 0 Dim taskId As Integer = 0 Dim prevCutId As Integer = GDB_ID.NULL - Dim currPart As PartVM Dim lines As String() = System.IO.File.ReadAllLines(ResPath) For Each line As String In lines diff --git a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb index 0e79754a..7b192527 100644 --- a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb +++ b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb @@ -52,7 +52,6 @@ Public Class NUMAxiumComm Private m_LinearAxisPrecision As Integer Public Sub New(MachManaging As MachManaging) - Dim lRet As Integer m_MachManaging = MachManaging End Sub @@ -327,15 +326,15 @@ Public Class NUMAxiumComm nPLCVarIndex += 1 End If Next - ''Dim sPLCVariableList = "" - ''For VariableIndex = 0 To PlcVariablesList.Count - 1 - '' If VariableIndex <> 0 Then - '' sPLCVariableList &= "," - '' End If - '' sPLCVariableList &= """" & PlcVariablesList(VariableIndex) & """" - ''Next + 'Dim sPLCVariableList = "" + 'For VariableIndex = 0 To PlcVariablesList.Count - 1 + ' If VariableIndex <> 0 Then + ' sPLCVariableList &= "," + ' End If + ' sPLCVariableList &= """" & PlcVariablesList(VariableIndex) & """" + 'Next Dim _FXReturn As Short = objDVariables.Init(objDGroupManager.Handle, sPLCVariableList, 1) 'PlcVariablesList.ToArray().ToString()) - ''Dim _FXReturn As Short = objDVariables.ReadVariables(PlcVariablesList.ToArray()) + 'Dim _FXReturn As Short = objDVariables.ReadVariables(PlcVariablesList.ToArray()) 'If _FXReturn <> 0 Then ' EgtOutLog("Error ReadVariables:" & " " & _FXReturn.ToString()) @@ -367,7 +366,7 @@ Public Class NUMAxiumComm Next objDReadPlcVarList.Argument = sPLCVariableList ' "%M5.L,%M5.B" Dim h = objDReadPlcVarList.Init(objDGroupManager.Handle) - ''Dim _FXReturn As Short = objDVariables.ReadVariables(PlcVariablesList.ToArray()) + 'Dim _FXReturn As Short = objDVariables.ReadVariables(PlcVariablesList.ToArray()) 'If _FXReturn <> 0 Then ' EgtOutLog("Error ReadVariables:" & " " & _FXReturn.ToString()) @@ -375,26 +374,26 @@ Public Class NUMAxiumComm End Sub Friend Sub CloseReadList() - '''objDPlcVariables.CloseReadList() + 'objDPlcVariables.CloseReadList() End Sub Private Sub ReadVariablesOnce(Address As String) 'Dim _ReadSymbolicPlcVariableOnetime As String = "Application.IOCONFIG_GLOBALS.Flexium_NCK.RCNC.General.Mode" - '''Dim _FXReturn As Int16 = objDPlcVariables.ReadVariablesOnce(10, Address) + 'Dim _FXReturn As Int16 = objDPlcVariables.ReadVariablesOnce(10, Address) - '''If _FXReturn <> 0 Then - ''' EgtOutLog("Error ReadVariablesOnce:" & " " & _FXReturn.ToString()) - '''End If + 'If _FXReturn <> 0 Then + ' EgtOutLog("Error ReadVariablesOnce:" & " " & _FXReturn.ToString()) + 'End If End Sub Friend Sub WritePlcVariables(Address As String, value As String) 'Dim _WriteSymbolicPlcVariable As String = _txtReadWritePlcVariables0.Text - '''Dim _FXReturn As Int16 = objDPlcVariables.WriteVariables2(11, Address, value) - ''' - '''If _FXReturn <> 0 Then - ''' EgtOutLog("Error WriteVariables2 :" & " " & _FXReturn.ToString()) - '''End If + 'Dim _FXReturn As Int16 = objDPlcVariables.WriteVariables2(11, Address, value) + ' + 'If _FXReturn <> 0 Then + ' EgtOutLog("Error WriteVariables2 :" & " " & _FXReturn.ToString()) + 'End If End Sub @@ -413,7 +412,7 @@ Public Class NUMAxiumComm End Sub Friend Sub CloseReadELS() - '''objDPlcVariables.CloseReadList() + 'objDPlcVariables.CloseReadList() End Sub #Region "File transfer" @@ -766,7 +765,6 @@ Public Class NUMAxiumComm Private Sub objDVariables_ValueChanged(ByVal vtArrayIndex As Object, ByVal vtArrayValues As Object) Dim AplArrayIndex As Object() = CType(vtArrayIndex, Object()) Dim AplArrayValue As Object() = CType(vtArrayValues, Object()) - Dim Idx As Int16 For index As Integer = 0 To AplArrayIndex.Length - 1 Dim nHandle As Integer = CType(AplArrayIndex.GetValue(index), Int16) diff --git a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb index e4543e9a..709d9840 100644 --- a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb +++ b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb @@ -247,12 +247,12 @@ Public Class MainMenuVM End Function Private Function ExitSUPERVISOR(bVerifyModification As Boolean) As Boolean - ''' verifico se progetto modificato, e chiedo se salvare - ''If bVerifyModification Then - '' If Not ProjFileVM.VerifyProjectModification(Map.refProjManagerVM.CurrProj, ProjectType.PROJ) Then - '' Return False - '' End If - ''End If + ' verifico se progetto modificato, e chiedo se salvare + 'If bVerifyModification Then + ' If Not ProjFileVM.VerifyProjectModification(Map.refProjManagerVM.CurrProj, ProjectType.PROJ) Then + ' Return False + ' End If + 'End If Map.refProjectVM.SetBottomPanel_Visibility(False) Map.refProjectVM.SetLeftPanel_Visibility(True) Map.refProjectVM.SetPartManager_Visibility(False) diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb index 9f13b64b..de6ba953 100644 --- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb @@ -229,8 +229,8 @@ Public Class MainWindowM ' Verifico abilitazione nesting automatico m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5327, 2404, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2404, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2405, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2405, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index 2849f7ea..07ab312f 100644 --- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb @@ -55,5 +55,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb index 753497b0..7a0e03c5 100644 --- a/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb +++ b/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb @@ -371,23 +371,23 @@ Public Class MySceneHostVM While nId <> GDB_ID.NULL ' Recupero l'identificativo del pezzo cui appartiene Dim nPartId As Integer = EgtGetParent(EgtGetParent(nId)) - '''Dim WallMachGroup As WallMachGroup = DirectCast(Map.refMachGroupPanelVM.SelectedMachGroup, WallMachGroup) - '''Dim bPartInTable As Boolean = (EgtGetParent(nPartId) = WallMachGroup.nRawPartId) - '''If EgtIsPart(nPartId) OrElse EgtIsDuplo(nPartId) OrElse bPartInTable Then - ''' Dim nStat As Integer = GDB_ST.ON_ - ''' EgtGetStatus(nPartId, nStat) - ''' ' Se già selezionato - ''' If nStat = GDB_ST.SEL Then - ''' ' Memorizzo Id da deselezionare - ''' m_nIdToDesel = nPartId - ''' Else - ''' ' Memorizzo Id da selezionare - ''' m_nIdToSel = nPartId - ''' End If - ''' ' Drag possibile - ''' m_bDrag = True - ''' Exit While - '''End If + 'Dim WallMachGroup As WallMachGroup = DirectCast(Map.refMachGroupPanelVM.SelectedMachGroup, WallMachGroup) + 'Dim bPartInTable As Boolean = (EgtGetParent(nPartId) = WallMachGroup.nRawPartId) + 'If EgtIsPart(nPartId) OrElse EgtIsDuplo(nPartId) OrElse bPartInTable Then + ' Dim nStat As Integer = GDB_ST.ON_ + ' EgtGetStatus(nPartId, nStat) + ' ' Se già selezionato + ' If nStat = GDB_ST.SEL Then + ' ' Memorizzo Id da deselezionare + ' m_nIdToDesel = nPartId + ' Else + ' ' Memorizzo Id da selezionare + ' m_nIdToSel = nPartId + ' End If + ' ' Drag possibile + ' m_bDrag = True + ' Exit While + 'End If nId = EgtGetNextObjInSelWin() End While ' Dati per drag diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb index c3582a56..3e88f9e5 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb @@ -857,80 +857,11 @@ Public Class BTLStructureVM Friend Sub ShowBuilding(bShow As Boolean, Optional bRedraw As Boolean = True) ' disabilito impostazione modificato Dim DisableMgr As New DisableModifiedMgr - ' recupero progetto del primo pezzo - 'Dim nFirstPartId As Integer = EgtGetFirstPart(True) - 'Dim nCurrProjId As Integer - 'If nFirstPartId = GDB_ID.NULL Then - ' DisableMgr.ReEnable() - ' Return - 'End If - 'If Not EgtGetInfo(nFirstPartId, BTL_PRT_PROJ, nCurrProjId) Then - ' DisableMgr.ReEnable() - ' Return - 'End If - Dim nCurrProjId As Integer - If IsNothing(Map.refProjManagerVM) OrElse IsNothing(Map.refProjManagerVM.CurrProj) Then - DisableMgr.ReEnable() - Return - End If - If Map.refProjectVM.BTLStructureVM.BTLStructureM.nAsseBaseId = GDB_ID.NULL Then - DisableMgr.ReEnable() - Return - End If - ' recupero il primo oggetto nel gruppo e verifico se devo assemblare o disassemblare - Dim AsseId As Integer = EgtGetFirstInGroup(Map.refProjectVM.BTLStructureVM.BTLStructureM.nAsseBaseId) - If AsseId = GDB_ID.NULL Then - DisableMgr.ReEnable() - Return - End If - Dim bMake As Boolean = (EgtGetGroupObjs(AsseId) = 0) - If bMake <> bShow Then - DisableMgr.ReEnable() - Return - End If - ' ciclo sul gruppo di assemblaggio - While AsseId <> GDB_ID.NULL - ' salvo il successivo nel gruppo dell'assemblato - Dim NextId As Integer = EgtGetNext(AsseId) - ' costruisco l'assemblato - If bMake Then - ' recupero il pezzo sorgente - Dim SouId As Integer - If EgtGetInfo(AsseId, GDB_SI_SOURCE, SouId) Then - EgtSetMode(SouId, GDB_MD.STD) - EgtSetStatus(SouId, GDB_ST.ON_) - ' se già utilizzato, ne faccio una copia - If Not EgtIsPart(SouId) Then - Dim CopyId As Integer = EgtCopy(SouId, GDB_ID.ROOT) - If CopyId <> GDB_ID.NULL Then - EgtRemoveInfo(CopyId, GDB_SI_BASE) - EgtRemoveInfo(CopyId, GDB_SI_LIST) - EgtSetInfo(CopyId, GDB_SI_COPY, SouId) - EgtSetInfo(AsseId, GDB_SI_SOURCE, CopyId) - SouId = CopyId - End If - End If - EgtSetStatus(EgtGetFirstNameInGroup(SouId, "Box"), GDB_ST.OFF) - EgtGroupSwap(SouId, AsseId, True, True) - End If - ' ritorno ai pezzi - Else - Dim BasId As Integer - If EgtGetInfo(AsseId, GDB_SI_BASE, BasId) Then - EgtGroupSwap(AsseId, BasId, True, True) - Dim CopId As Integer - If EgtGetInfo(AsseId, GDB_SI_COPY, CopId) Then - EgtErase(AsseId) - EgtSetInfo(BasId, GDB_SI_SOURCE, CopId) - Else - EgtSetStatus(EgtGetFirstNameInGroup(AsseId, "Box"), GDB_ST.ON_) - End If - End If - End If - ' passo al successivo - AsseId = NextId - End While + Dim bOn As Boolean = EgtBeamGetBuildingIsOn() + If bShow <> bOn Then + EgtBeamShowBuilding( bShow) + End If ' ripristino precedente impostazione modificato DisableMgr.ReEnable() diff --git a/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb index 6b195cd9..ea54f905 100644 --- a/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb @@ -271,7 +271,6 @@ Public Class CALCPanelVM Dim taskId As Integer = 0 Dim prevCutId As Integer = GDB_ID.NULL Dim currBTLPart As BTLPartVM = Nothing - Dim currPart As PartVM Dim lines As String() = System.IO.File.ReadAllLines(ResPath) For Each line As String In lines diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb index dc00d3bd..f4024b29 100644 --- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb @@ -853,20 +853,9 @@ Public Class LeftPanelVM If Not Map.refProjectVM.BTLStructureVM.BTLPartVMList.Any(Function(x) x IsNot BTLPartToDelete AndAlso x.Section = BTLPartToDelete.Section) Then Map.refProjectVM.BTLStructureVM.SectionList.Remove(BTLPartToDelete.Section) End If - ' rimuovo riferimenti in AsseBase - Dim nAsseBaseRefId As Integer = GDB_ID.NULL - EgtGetInfo(BTLPartToDelete.nPartId, "!LST", nAsseBaseRefId) ' Eseguo cancellazione EgtBeamSetPart(BTLPartToDelete.nPartId) If EgtBeamErasePart() Then - ' rimuovo riferimenti in AsseBase - EgtErase(nAsseBaseRefId) - Dim nIndex As Integer = 1 - Dim nSouPartId As Integer = GDB_ID.NULL - While EgtGetInfo(nAsseBaseRefId + nIndex, "!SOU", nSouPartId) AndAlso nSouPartId = BTLPartToDelete.nPartId - EgtErase(nAsseBaseRefId + nIndex) - nIndex += 1 - End While ' seleziono elemento precedente Dim Index As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList.IndexOf(BTLPartToDelete) If bSelPrevious Then diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb index b9d336d0..ba2136d7 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb @@ -231,8 +231,8 @@ Public Class MainWindowM ' Verifico abilitazione nesting automatico m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5327, 2404, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2404, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2405, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2405, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb index bc38899e..ac901dc2 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb index 2d23fb02..dd48c9b4 100644 --- a/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb @@ -270,7 +270,6 @@ Public Class NestingRunningWndVM Next End If Case WarehouseType.MEDIUM - Dim sCurrL As String Dim nIndex As Integer = 1 ' aggiungo le sezioni con diverse lunghezze in base al warehouse If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb index d809f441..0d2d7309 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb @@ -1624,33 +1624,33 @@ Public Class ProjManagerVM Map.refProdManagerVM.CurrProd = CurrProd WriteMainPrivateProfileString(S_GENERAL, K_LASTNGEXPDIR, Path.GetDirectoryName(ImportDlg.FileName)) LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTPROJECT) - ''' imposto progetto corrente - ''If NewProjIdList.Count > 0 Then SetCurrProj(NewProjIdList(0)) - ''' costruisco BTLStructure del proj - ''Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(NewProjIdList(0))) - ''' mostro tutti i pezzi - ''Map.refShowBeamPanelVM.ShowAll() - ''EgtZoom(ZM.ALL, True) - ''' aggiungo il file in apertura alla lista degli MRU - ''If Not IsNothing(CurrProj.ProjFileM) AndAlso Not IsNothing(CurrProj.sProjPath) Then Map.refProjManagerVM.m_MruFiles.Add(CurrProj.sProjPath) - ''' imposto macchina del progetto - ''Map.refMachinePanelVM.SelectedMachine = Machine - ''' aggiorno le colonne in base al tipo progetto - ''Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE) - ''Map.refPartInRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE) - ''DbControllers.m_ProjController.LockByProjId(Map.refProjManagerVM.CurrProj.nProjId, True) - ''' carico lista macchine e macchina del progetto per il pulsante Reset Macchina del CALCPanel - ''Map.refCALCPanelVM.LoadMachineList() - ''SectionXMaterial.SetType(nType) - ''ManageView.UpdateBWType(nType) - ''Map.refPartManagerVM.LockVisibilityUpdate() - ''' imposto flag secondo tipo di progetto (travi o pareti) - ''Dim sBTLFlag As String = If(nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) - ''Dim nFlag As Integer = GetMainPrivateProfileInt(S_IMPORT, sBTLFlag, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR) - ''EgtBeamSetFlag(nFlag) - ''Map.refProjectVM.SetOptimizePanel_Visibility(Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL) - ''' aggiorno titolo - ''Map.refMainWindowVM.UpdateTitle() + ' imposto progetto corrente + 'If NewProjIdList.Count > 0 Then SetCurrProj(NewProjIdList(0)) + ' costruisco BTLStructure del proj + 'Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(NewProjIdList(0))) + ' mostro tutti i pezzi + 'Map.refShowBeamPanelVM.ShowAll() + 'EgtZoom(ZM.ALL, True) + ' aggiungo il file in apertura alla lista degli MRU + 'If Not IsNothing(CurrProj.ProjFileM) AndAlso Not IsNothing(CurrProj.sProjPath) Then Map.refProjManagerVM.m_MruFiles.Add(CurrProj.sProjPath) + ' imposto macchina del progetto + 'Map.refMachinePanelVM.SelectedMachine = Machine + ' aggiorno le colonne in base al tipo progetto + 'Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE) + 'Map.refPartInRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE) + 'DbControllers.m_ProjController.LockByProjId(Map.refProjManagerVM.CurrProj.nProjId, True) + ' carico lista macchine e macchina del progetto per il pulsante Reset Macchina del CALCPanel + 'Map.refCALCPanelVM.LoadMachineList() + 'SectionXMaterial.SetType(nType) + 'ManageView.UpdateBWType(nType) + 'Map.refPartManagerVM.LockVisibilityUpdate() + ' imposto flag secondo tipo di progetto (travi o pareti) + 'Dim sBTLFlag As String = If(nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) + 'Dim nFlag As Integer = GetMainPrivateProfileInt(S_IMPORT, sBTLFlag, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR) + 'EgtBeamSetFlag(nFlag) + 'Map.refProjectVM.SetOptimizePanel_Visibility(Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL) + ' aggiorno titolo + 'Map.refMainWindowVM.UpdateTitle() End Sub #End Region ' ImportProject diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/CurrentMachine.vb b/EgtBEAMWALL.ViewerOptimizer/Utility/CurrentMachine.vb index c21cf7a9..a9debac1 100644 --- a/EgtBEAMWALL.ViewerOptimizer/Utility/CurrentMachine.vb +++ b/EgtBEAMWALL.ViewerOptimizer/Utility/CurrentMachine.vb @@ -193,7 +193,6 @@ Public Module CurrentMachine If bOk Then EgtLuaGetGlobIntVar("GWD.HOR_DRILL_DIAM", m_dHorDrillDiam) Dim nTemp As Integer - Dim dTemp As Double EgtLuaGetGlobIntVar("GWD.SIMUL_VIEW_DIR", nTemp) Select Case nTemp Case 1