Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtBEAMWALL 3.1.1.1:

Browse Source 
- cambiato nome file e directory in Aedifica
- migliorata gestione progress di verifica
This commit is contained in:
Emmanuele Sassi
2026-01-29 11:33:57 +01:00
parent df36d4f495
commit 7fc2fc1691
29 changed files with 104 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/Constants/ConstGen.vb
+3 -3
View File
@@ -19,7 +19,7 @@ Public Module ConstGen
Public Const K_DATAROOT As String = "DataRoot"
' File con dati di licenza
Public Const LIC_FILE_NAME As String = "EgtBEAMWALL.lic"
Public Const LIC_FILE_NAME As String = "Aedifica.lic"
Public Const S_LICENCE As String = "Licence"
Public Const K_LOCKID As String = "LockId"
Public Const K_KEY As String = "Key"
@@ -57,8 +57,8 @@ Public Module ConstGen
End Enum
' File di log generale
Public Const VWOPTGENLOG_FILE_NAME As String = "EgtBEAMWALL.OptimizerLog#.txt"
Public Const SUPGENLOG_FILE_NAME As String = "EgtBEAMWALL.SupervisorLog#.txt"
Public Const VWOPTGENLOG_FILE_NAME As String = "Aedifica.OptimizerLog#.txt"
Public Const SUPGENLOG_FILE_NAME As String = "Aedifica.SupervisorLog#.txt"
' Sottodirettorio di configurazione
Public Const CONF_DIR As String = "Config"
EgtBEAMWALL.Core/Constants/ConstIni.vb
+1 -1
View File
@@ -13,7 +13,7 @@
Public Module ConstIni
Public Const INI_FILE_NAME As String = "EgtBEAMWALL.ini"
Public Const INI_FILE_NAME As String = "Aedifica.ini"
Public Const K_NETKEY As String = "NetKey"
Public Const K_MAXCAMINST As String = "MaxCamInstances"
EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
+3 -3
View File
@@ -56,8 +56,8 @@
<Reference Include="EgwProxy.LiMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwProxy.LiMan.1.0.2408.718\lib\EgwProxy.LiMan.dll</HintPath>
</Reference>
<Reference Include="EgwWPFBaseLib, Version=2.7.11.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwWPFBaseLib.2.7.11-beta.4\lib\EgwWPFBaseLib.dll</HintPath>
<Reference Include="EgwWPFBaseLib, Version=3.1.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwWPFBaseLib.3.1.1.1\lib\EgwWPFBaseLib.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -326,6 +326,6 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent>
<PostBuildEvent>copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.Core.dll</PostBuildEvent>
</PropertyGroup>
</Project>
EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb
+1 -1
View File
@@ -44,7 +44,7 @@ Public Class EgtColorPickerV
#Region "EVENTS"
Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtColorPickerVM.m_CloseWindow
Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtColorPickerVM.OnCloseWindow
Me.DialogResult = DialogResult
Me.Close()
End Sub
EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
+1 -1
View File
@@ -118,7 +118,7 @@ Public Class EgtManageFileDialogV
#Region "EVENTS"
Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.m_CloseWindow
Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.OnCloseWindow
Me.DialogResult = DialogResult
Me.Close()
End Sub
EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb
+1 -1
View File
@@ -99,7 +99,7 @@ Public Class EgtMessageBoxV
#Region "EVENTS"
Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.OnCloseWindow
Me.DialogResult = DialogResult
Me.Close()
End Sub
EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb
+1 -1
View File
@@ -13,7 +13,7 @@ Public Class MachiningDbWindowV
m_MachiningDbWindowVM = MachiningDbWindowVM
End Sub
Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.m_CloseWindow
Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.OnCloseWindow
Me.DataContext = Nothing
Me.DialogResult = bDialogResult
Me.Close()
EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
+5 -5
View File
@@ -10,13 +10,13 @@ Imports System.Windows
' Review the values of the assembly attributes
#If DEBUG Then
<Assembly: AssemblyTitle("EgtBEAMWALL.Core Debug AnyCPU")>
<Assembly: AssemblyTitle("Aedifica.Core Debug AnyCPU")>
#Else
<Assembly: AssemblyTitle("EgtBEAMWALL.Core Release AnyCPU")>
<Assembly: AssemblyTitle("Aedifica.Core Release AnyCPU")>
#End If
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("Egalware s.r.l.")>
<Assembly: AssemblyProduct("EgtBEAMWALL.Core")>
<Assembly: AssemblyProduct("Aedifica.Core")>
<Assembly: AssemblyCopyright("Copyright © 2020-2025 by Egalware s.r.l.")>
<Assembly: AssemblyTrademark("")>
@@ -38,5 +38,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.7.11.23")>
<Assembly: AssemblyFileVersion("2.7.11.23")>
<Assembly: AssemblyVersion("3.1.1.1")>
<Assembly: AssemblyFileVersion("3.1.1.1")>
EgtBEAMWALL.Core/packages.config
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EgwProxy.LiMan" version="1.0.2408.718" targetFramework="net472" />
<package id="EgwWPFBaseLib" version="2.7.11-beta.4" targetFramework="net472" />
<package id="EgwWPFBaseLib" version="3.1.1.1" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.4" targetFramework="net472" />
<package id="RestSharp" version="111.2.0" targetFramework="net472" />
EgtBEAMWALL.DataLayer/DbConfig.cs
+2 -2
View File
@@ -12,7 +12,7 @@ namespace EgtBEAMWALL.DataLayer
{
#region Public Fields
public static string DATABASE_NAME = "EgtBwDb";
public static string DATABASE_NAME = "AedificaDb";
public static int DATABASE_PROCESS_TIMEOUT = 5;
public static string DATABASE_PWD = "viacremasca";
@@ -247,7 +247,7 @@ namespace EgtBEAMWALL.DataLayer
// se nulla metto amster come nKey...
masterKey = string.IsNullOrEmpty(masterKey) ? nKey : masterKey;
DATABASE_SERV = server;
DATABASE_NAME = $"EgtBwDb_{masterKey}";
DATABASE_NAME = $"AedificaDb_{masterKey}";
DATABASE_USER = $"user_{nKey}";
DATABASE_PWD = $"pwd_{sKey}";
ZIP_PWD = $"{DATABASE_USER}:{DATABASE_PWD}:{DATABASE_USER}:{DATABASE_PWD}";
EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj
+1 -1
View File
@@ -238,7 +238,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.DataLayer.dll</PostBuildEvent>
<PostBuildEvent>copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.DataLayer.dll</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Egalware s.r.l.")]
[assembly: AssemblyProduct("EgtBEAMWALL.DataLayer")]
[assembly: AssemblyCopyright("Copyright © 2020-2025 by Egalware s.r.l.")]
[assembly: AssemblyCopyright("Copyright © 2020-2026 by Egalware s.r.l.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -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.7.1.1")]
[assembly: AssemblyFileVersion("2.7.1.1")]
[assembly: AssemblyVersion("3.1.1.1")]
[assembly: AssemblyFileVersion("3.1.1.1")]
EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
+13 -10
View File
@@ -584,11 +584,6 @@ Public Class CALCPanelVM
Case BWType.WALL
ExecEnvironment = EXECENVIRONMENTS.WALL
End Select
' Blocco scena dell'assemblato
Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False)
Map.refSceneBuildingVM.SetViewPanel_IsEnable(False)
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False
Map.refMyStatusBarVM.SetOutputMessage("Verifica in corso...")
' Imposto contesto scena principale
Dim CurrContext As Integer = EgtGetCurrentContext()
Dim MainSceneContext As Integer = Map.refSceneHostVM.MainScene.GetCtx()
@@ -636,11 +631,6 @@ Public Class CALCPanelVM
Case BWType.WALL
ExecEnvironment = EXECENVIRONMENTS.WALL
End Select
' Blocco scena dell'assemblato
Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False)
Map.refSceneBuildingVM.SetViewPanel_IsEnable(False)
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False
Map.refMyStatusBarVM.SetOutputMessage("Verifica in corso...")
' Imposto contesto scena principale
Dim CurrContext As Integer = EgtGetCurrentContext()
Dim MainSceneContext As Integer = Map.refSceneHostVM.MainScene.GetCtx()
@@ -666,6 +656,12 @@ Public Class CALCPanelVM
Case BWType.WALL
ExecEnvironment = EXECENVIRONMENTS.WALL
End Select
' Blocco scena dell'assemblato
Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False)
Map.refSceneBuildingVM.SetViewPanel_IsEnable(False)
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False
Map.refMyStatusBarVM.SetOutputMessage("Verifica in corso...")
Map.refMyStatusBarVM.MaximumValue = 1
If ProgramPage = ProjectType.PROJ Then
If Not Map.refProjectVM.BTLStructureVM.SelBTLPart.bDO Then Return
VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.SelBTLPart)
@@ -782,12 +778,19 @@ Public Class CALCPanelVM
Private Sub VerifyAllWithEngine(ProgramPage As ProjectType)
Dim QuestionList As New List(Of QuestionDTO)
' Blocco scena dell'assemblato
Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False)
Map.refSceneBuildingVM.SetViewPanel_IsEnable(False)
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False
Map.refMyStatusBarVM.SetOutputMessage("Verifica in corso...")
If ProgramPage = ProjectType.PROJ Then
Map.refMyStatusBarVM.MaximumValue = Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count
For PartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
If Not Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex).bDO Then Continue For
VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex))
Next
ElseIf ProgramPage = ProjectType.PROD Then
Map.refMyStatusBarVM.MaximumValue = Map.refMachGroupPanelVM.MachGroupVMList.Count
For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1
' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra
If DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).nProduction_State >= ItemState.Assigned Then Return
EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
+1 -1
View File
@@ -784,7 +784,7 @@ Public Class ConfigurationPageVM
Public Sub Restore()
' recupero processo del supervisore
Dim sSupervisorName As String = "EgtBEAMWALL.SupervisorR32"
Dim sSupervisorName As String = "Aedifica.SupervisorR32"
Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
' verifico che sia chiuso
If localProc.Length > 0 Then
EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+13 -13
View File
@@ -984,13 +984,13 @@
<Version>1.8.5</Version>
</PackageReference>
<PackageReference Include="EgwMultiEngineManager.Core">
<Version>3.1.1-beta.1</Version>
<Version>3.1.1.2</Version>
</PackageReference>
<PackageReference Include="EgwMultiEngineManager.Data">
<Version>3.1.1-beta.1</Version>
<Version>3.1.1.2</Version>
</PackageReference>
<PackageReference Include="EgwWPFBaseLib">
<Version>3.1.1-beta.1</Version>
<Version>3.1.1.1</Version>
</PackageReference>
<PackageReference Include="EntityFramework">
<Version>6.4.4</Version>
@@ -1175,16 +1175,16 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerR32.exe
IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerD32.exe
IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerR64.exe
IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerD64.exe
IF "$(ConfigurationName)" == "Debug" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Debug\EgwMultiEngineManager.Data.dll c:\EgtProg\EgtBEAMWALL\EgwMultiEngineManager.Data.dll
IF "$(ConfigurationName)" == "Release" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Release\EgwMultiEngineManager.Data.dll c:\EgtProg\EgtBEAMWALL\EgwMultiEngineManager.Data.dll
IF "$(ConfigurationName)" == "Debug" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Debug\EgwMultiEngineManager.Core.dll c:\EgtProg\EgtBEAMWALL\EgwMultiEngineManager.Core.dll
IF "$(ConfigurationName)" == "Release" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Release\EgwMultiEngineManager.Core.dll c:\EgtProg\EgtBEAMWALL\EgwMultiEngineManager.Core.dll
IF "$(ConfigurationName)" == "Debug" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Debug\EgwWPFBaseLib.dll c:\EgtProg\EgtBEAMWALL\EgwWPFBaseLib.dll
IF "$(ConfigurationName)" == "Release" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Release\EgwWPFBaseLib.dll c:\EgtProg\EgtBEAMWALL\EgwWPFBaseLib.dll</PostBuildEvent>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerR32.exe
IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerD32.exe
IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Aedifica\EgtBEAMWALL.OptimizerR64.exe
IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerD64.exe
IF "$(ConfigurationName)" == "Debug" copy "$(TargetDir)EgwMultiEngineManager.Data.dll" c:\EgtProg\Aedifica\EgwMultiEngineManager.Data.dll
IF "$(ConfigurationName)" == "Release" copy "$(TargetDir)EgwMultiEngineManager.Data.dll" c:\EgtProg\Aedifica\EgwMultiEngineManager.Data.dll
IF "$(ConfigurationName)" == "Debug" copy "$(TargetDir)EgwMultiEngineManager.Core.dll" c:\EgtProg\Aedifica\EgwMultiEngineManager.Core.dll
IF "$(ConfigurationName)" == "Release" copy "$(TargetDir)EgwMultiEngineManager.Core.dll" c:\EgtProg\Aedifica\EgwMultiEngineManager.Core.dll
IF "$(ConfigurationName)" == "Debug" copy "$(TargetDir)EgwWPFBaseLib.dll" c:\EgtProg\Aedifica\EgwWPFBaseLib.dll
IF "$(ConfigurationName)" == "Release" copy "$(TargetDir)EgwWPFBaseLib.dll" c:\EgtProg\Aedifica\EgwWPFBaseLib.dll</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>
EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb
+12 -37
View File
@@ -78,44 +78,19 @@ Module MyExecProcessManager
Dim nBarId As Integer = -1
Integer.TryParse(Answer.Args("BarId"), nBarId)
EgtOutLog("Risultato progetto " & nBarId)
Map.refCALCPanelVM.ProcessResults(sBarPath, nProgramPage, nBarId)
CALCPanelVM.ProcessResults(sBarPath, nProgramPage, nBarId)
' Gestione progressbar per verificare l'inizio e la fine della verifica
If nProgramPage = ProjectType.PROJ Then
If nProjIndex = -1 Then
Map.refMyStatusBarVM.MaximumValue = 1
Map.refMyStatusBarVM.SetLoadingProgress(1)
Map.refMyStatusBarVM.SetOutputMessage("Verifica Completata")
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
Else
Map.refMyStatusBarVM.MaximumValue = Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
Map.refMyStatusBarVM.SetLoadingProgress(nProjIndex)
nProjIndex += 1
End If
If nProjIndex = Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1 Then
Map.refMyStatusBarVM.SetOutputMessage("Verifica Completata")
Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True)
Map.refSceneBuildingVM.SetViewPanel_IsEnable(True)
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
Map.refCALCPanelVM.SetCalculating(False)
End If
Else
If nProdIndex = -1 Then
Map.refMyStatusBarVM.MaximumValue = 1
Map.refMyStatusBarVM.SetLoadingProgress(1)
Map.refMyStatusBarVM.SetOutputMessage("Verifica Completata")
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
Else
Map.refMyStatusBarVM.MaximumValue = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1
Map.refMyStatusBarVM.SetLoadingProgress(nProdIndex)
nProdIndex += 1
End If
If nProdIndex = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 Then
Map.refMyStatusBarVM.SetOutputMessage("Verifica Completata")
Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True)
Map.refSceneBuildingVM.SetViewPanel_IsEnable(True)
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
Map.refCALCPanelVM.SetCalculating(False)
End If
Dim BeamManager As ExecProcessManager = m_ExecProcessManagerList(EXECENVIRONMENTS.BEAM)
Dim nQuestionInQueue As Integer = BeamManager.nQuestionInQueue
Dim nFreeOrWaitingAnswerProcesses As Integer = BeamManager.nFreeOrWaitingAnswerProcesses
Dim nRunningProcesses As Integer = BeamManager.nRunningProcesses
Map.refMyStatusBarVM.SetLoadingProgress(Map.refMyStatusBarVM.MaximumValue - nQuestionInQueue - (nRunningProcesses - nFreeOrWaitingAnswerProcesses))
If nQuestionInQueue = 0 AndAlso nFreeOrWaitingAnswerProcesses = nRunningProcesses Then
Map.refMyStatusBarVM.SetOutputMessage("Verifica Completata", 2)
Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True)
Map.refSceneBuildingVM.SetViewPanel_IsEnable(True)
Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
Map.refCALCPanelVM.SetCalculating(False)
End If
End Sub
EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+3 -3
View File
@@ -515,7 +515,7 @@ Public Class MainMenuVM
End Property
Public Sub Supervisor()
Dim sSupervisorName As String = "EgtBEAMWALL.SupervisorR32"
Dim sSupervisorName As String = "Aedifica.SupervisorR32"
' recupero processo del supervisore
Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
If localProc.Length > 0 Then
@@ -626,7 +626,7 @@ Public Class MainMenuVM
Dim bEx As Boolean = False
Try
Dim sAddressArray As String() = sSupportAddress.Split(CType(",", Char()))
Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("EgtBEAMWALL Feedback - " & sKey)
Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("Aedifica Feedback - " & sKey)
SendFeedbackWindow.Recipients.Add(sAddressArray(0))
For index As Integer = 1 To sAddressArray.Length() - 1
SendFeedbackWindow.Recipients.Add(sAddressArray(index), EgtWPFLib5.MapiMailMessage.RecipientType.CC)
@@ -637,7 +637,7 @@ Public Class MainMenuVM
SendFeedbackWindow.ShowDialog()
'Dim mailmessage As New System.Net.Mail.MailMessage With {
' .Subject = "EgtBEAMWALL Feedback - " & sKey,
' .Subject = "Aedifica Feedback - " & sKey,
' .IsBodyHtml = True,
' .Body = ""
'}
EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb
+3 -3
View File
@@ -335,7 +335,7 @@ Public Class MainWindowM
Private Sub ManageInstance()
Dim bCreated As Boolean
Try
m_objMutex = New Mutex(False, "Global\EgtBEAMWALL.Optimizer", bCreated)
m_objMutex = New Mutex(False, "Global\Aedifica.Optimizer", bCreated)
Catch
bCreated = False
End Try
@@ -361,7 +361,7 @@ Public Class MainWindowM
' porto in primo piano la prima istanza
Dim bFound As Boolean = False
' processi del programma a 32 bit
Dim localProc As Process() = Process.GetProcessesByName("EgtBEAMWALL.OptimizerR32")
Dim localProc As Process() = Process.GetProcessesByName("Aedifica.OptimizerR32")
For Each p As Process In localProc
If p.Id <> Process.GetCurrentProcess().Id Then
bFound = True
@@ -371,7 +371,7 @@ Public Class MainWindowM
Next
' se non trovati processi a 32 bit provo a 64 bit
If Not bFound Then
localProc = Process.GetProcessesByName("EgtBEAMWALL.OptimizerR64")
localProc = Process.GetProcessesByName("Aedifica.OptimizerR64")
For Each p As Process In localProc
If p.Id <> Process.GetCurrentProcess().Id Then
bFound = True
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+12 -12
View File
@@ -13,24 +13,24 @@ Imports System.Windows
#If PLATFORM = "x64" Then
#If DEBUG Then
<Assembly: AssemblyTitle("EgtBEAMWALL.OptimizerD64.exe")>
<Assembly: AssemblyDescription("EgtBEAMWALL VO Debug 64 bit")>
<Assembly: AssemblyTitle("Aedifica.OptimizerD64.exe")>
<Assembly: AssemblyDescription("Aedifica Optimizer Debug 64 bit")>
#Else
<Assembly: AssemblyTitle("EgtBEAMWALL.OptimizerR64.exe")>
<Assembly: AssemblyDescription("EgtBEAMWALL VO 64 bit")>
<Assembly: AssemblyTitle("Aedifica.OptimizerR64.exe")>
<Assembly: AssemblyDescription("Aedifica Optimizer 64 bit")>
#End if
#Else
#If DEBUG Then
<Assembly: AssemblyTitle("EgtBEAMWALL.OptimizerD32.exe")>
<Assembly: AssemblyDescription("EgtBEAMWALL VO Debug 32 bit")>
<Assembly: AssemblyTitle("Aedifica.OptimizerD32.exe")>
<Assembly: AssemblyDescription("Aedifica Optimizer Debug 32 bit")>
#Else
<Assembly: AssemblyTitle("EgtBEAMWALL.OptimizerR32.exe")>
<Assembly: AssemblyDescription("EgtBEAMWALL VO 32 bit")>
<Assembly: AssemblyTitle("Aedifica.OptimizerR32.exe")>
<Assembly: AssemblyDescription("Aedifica Optimizer 32 bit")>
#End If
#End If
<Assembly: AssemblyCompany("Egalware s.r.l.")>
<Assembly: AssemblyProduct("EgtBEAMWALL.ViewerOptimizer")>
<Assembly: AssemblyCopyright("Copyright © 2020-2025 by Egalware s.r.l.")>
<Assembly: AssemblyProduct("Aedifica.Optimizer")>
<Assembly: AssemblyCopyright("Copyright © 2020-2026 by Egalware s.r.l.")>
<Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(false)>
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("3.1.0.6")>
<Assembly: AssemblyFileVersion("3.1.0.6")>
<Assembly: AssemblyVersion("3.1.1.1")>
<Assembly: AssemblyFileVersion("3.1.1.1")>
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+1 -1
View File
@@ -1464,7 +1464,7 @@ Public Class ProdManagerVM
End Property
Public Sub ImportBTL(Optional sFile As String = "", Optional bWithDlg As Boolean = True)
Map.refShowBeamPanelVM.ShowBuilding_IsChecked = False
' Map.refShowBeamPanelVM.ShowBuilding_IsChecked = False
If Not CreateNewProd() Then
Dim sErrMsg As String = "Errore! Creazione del progetto fallita!"
EgtOutLog(sErrMsg)
EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+4 -4
View File
@@ -94,8 +94,8 @@
<Reference Include="EgwProxy.LiMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwProxy.LiMan.1.0.2408.718\lib\EgwProxy.LiMan.dll</HintPath>
</Reference>
<Reference Include="EgwWPFBaseLib, Version=2.7.11.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwWPFBaseLib.2.7.11-beta.4\lib\EgwWPFBaseLib.dll</HintPath>
<Reference Include="EgwWPFBaseLib, Version=3.1.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwWPFBaseLib.3.1.1.1\lib\EgwWPFBaseLib.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
@@ -636,8 +636,8 @@
</Target>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.SupervisorR32.exe
IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.SupervisorD32.exe
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.SupervisorR32.exe
IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.SupervisorD32.exe
</PostBuildEvent>
</PropertyGroup>
</Project>
EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb
+1 -1
View File
@@ -282,7 +282,7 @@ Public Class MainMenuVM
End Property
Public Sub Optimizer()
Dim sOptimizerName As String = "EgtBEAMWALL.OptimizerR32"
Dim sOptimizerName As String = "Aedifica.OptimizerR32"
' recupero processo del supervisore
Dim localProc As Process() = Process.GetProcessesByName(sOptimizerName)
If localProc.Length > 0 Then
EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb
+2 -2
View File
@@ -368,7 +368,7 @@ Public Class MainWindowM
' porto in primo piano la prima istanza
Dim bFound As Boolean = False
' processi del programma a 32 bit
Dim localProc As Process() = Process.GetProcessesByName("EgtBEAMWALL.SupervisorR32")
Dim localProc As Process() = Process.GetProcessesByName("Aedifica.SupervisorR32")
For Each p As Process In localProc
If p.Id <> Process.GetCurrentProcess().Id Then
bFound = True
@@ -378,7 +378,7 @@ Public Class MainWindowM
Next
' se non trovati processi a 32 bit provo a 64 bit
If Not bFound Then
localProc = Process.GetProcessesByName("EgtBEAMWALL.SupervisorR64")
localProc = Process.GetProcessesByName("Aedifica.SupervisorR64")
For Each p As Process In localProc
If p.Id <> Process.GetCurrentProcess().Id Then
bFound = True
EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
+14 -14
View File
@@ -13,24 +13,24 @@ Imports System.Windows
#If PLATFORM = "x64" Then
#If DEBUG Then
<Assembly: AssemblyTitle("EgtBEAMWALL.SupervisorD64.exe")>
<Assembly: AssemblyDescription("EgtBEAMWALL S Debug 32 bit")>
<Assembly: AssemblyTitle("Aedifica.SupervisorD64.exe")>
<Assembly: AssemblyDescription("Aedifica Supervisor Debug 32 bit")>
#Else
<Assembly: AssemblyTitle("EgtBEAMWALL.SupervisorR64.exe")>
<Assembly: AssemblyDescription("EgtBEAMWALL S 32 bit")>
<Assembly: AssemblyTitle("Aedifica.SupervisorR64.exe")>
<Assembly: AssemblyDescription("Aedifica Supervisor 32 bit")>
#End if
#Else
#If DEBUG Then
<Assembly: AssemblyTitle("EgtBEAMWALL.SupervisorD32.exe")>
<Assembly: AssemblyDescription("EgtBEAMWALL S Debug 32 bit")>
<Assembly: AssemblyTitle("Aedifica.SupervisorD32.exe")>
<Assembly: AssemblyDescription("Aedifica Supervisor Debug 32 bit")>
#Else
<Assembly: AssemblyTitle("EgtBEAMWALL.SupervisorR32.exe")>
<Assembly: AssemblyDescription("EgtBEAMWALL S 32 bit")>
#End if
#End if
<Assembly: AssemblyTitle("Aedifica.SupervisorR32.exe")>
<Assembly: AssemblyDescription("Aedifica Supervisor 32 bit")>
#End If
#End If
<Assembly: AssemblyCompany("Egalware s.r.l.")>
<Assembly: AssemblyProduct("EgtBEAMWALL.Supervisor")>
<Assembly: AssemblyCopyright("Copyright © 2020-2025 by Egalware s.r.l.")>
<Assembly: AssemblyProduct("Aedifica.Supervisor")>
<Assembly: AssemblyCopyright("Copyright © 2020-2026 by Egalware s.r.l.")>
<Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(false)>
@@ -70,5 +70,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.0.1.4")>
<Assembly: AssemblyFileVersion("3.0.1.4")>
<Assembly: AssemblyVersion("3.1.1.1")>
<Assembly: AssemblyFileVersion("3.1.1.1")>
EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
+1 -1
View File
@@ -350,7 +350,7 @@ Public Class SupervisorManagerVM
Friend Sub GoToProd()
If IsNothing(m_CurrProd) Then Return
' apro ottimizzatore
Dim sOptimizerName As String = "EgtBEAMWALL.OptimizerR32"
Dim sOptimizerName As String = "Aedifica.OptimizerR32"
' recupero processo del supervisore
Dim localProc As Process() = Process.GetProcessesByName(sOptimizerName)
If localProc.Length > 0 Then
EgtBEAMWALL.Supervisor/packages.config
+1 -1
View File
@@ -4,7 +4,7 @@
<package id="Csv" version="1.0.31" targetFramework="net472" />
<package id="DotNetZip" version="1.16.0" targetFramework="net472" />
<package id="EgwProxy.LiMan" version="1.0.2408.718" targetFramework="net472" />
<package id="EgwWPFBaseLib" version="2.7.11-beta.4" targetFramework="net472" />
<package id="EgwWPFBaseLib" version="3.1.1.1" targetFramework="net472" />
<package id="EntityFramework" version="6.4.4" targetFramework="net452" />
<package id="FluentFTP" version="19.2.2" targetFramework="net472" />
<package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
ExtLibs/EgtUILib.dll
BIN
View File
Binary file not shown.
ExtLibs/EgtWPFLib5.dll
BIN
View File
Binary file not shown.
ExtLibs/EgwMultiEngineManager.Core.dll
BIN
View File
Binary file not shown.