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

Merge remote-tracking branch 'origin/feature/NewGraphicsProgram' into feature/DevExpress

Browse Source
This commit is contained in:
Emmanuele Sassi
2026-04-02 17:08:25 +02:00
parent f605ba5b84 239258bbce
commit 46548eeeb0
17 changed files with 139 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb
+1
View File
@@ -25,6 +25,7 @@ Public Module CalcIntegration
EDIT = 7
CHECKNOSIM = 8
TOPOLOGY = 9
FLIP_ROT = 10
OPENTOOLDB = 11 ' Non utilizzato
OPENMACHINIGDB = 12 ' Non utilizzato
End Enum
EgtBEAMWALL.Core/Constants/ConstIni.vb
+1
View File
@@ -57,6 +57,7 @@ Public Module ConstIni
Public Const K_CALCPATH As String = "CalcPath"
Public Const K_BEAMBASEDIR As String = "BaseDir"
Public Const K_BEAMBWEEXEC As String = "BweExec"
Public Const K_FLIPROTEXEC As String = "FlipRotExec"
Public Const S_WALL As String = "Wall"
Public Const S_WALLNEW As String = "WallNew"
EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -38,5 +38,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.3.7")>
<Assembly: AssemblyFileVersion("3.1.3.7")>
<Assembly: AssemblyVersion("3.1.4.1")>
<Assembly: AssemblyFileVersion("3.1.4.1")>
EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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("3.1.3.7")]
[assembly: AssemblyFileVersion("3.1.3.7")]
[assembly: AssemblyVersion("3.1.4.1")]
[assembly: AssemblyFileVersion("3.1.4.1")]
EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+10 -10
View File
@@ -186,9 +186,9 @@ Public Class BTLPartVM
Public Property sL As String
Get
Dim nOrigGroupId As Integer = nPartId
If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
End If
'If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
' nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
'End If
If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
nOrigGroupId = GetOrigFrameGroup(nPartId)
End If
@@ -247,9 +247,9 @@ Public Class BTLPartVM
Public Property sW As String
Get
Dim nOrigGroupId As Integer = nPartId
If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
End If
'If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
' nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
'End If
If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
nOrigGroupId = GetOrigFrameGroup(nPartId)
End If
@@ -308,9 +308,9 @@ Public Class BTLPartVM
Public Property sH As String
Get
Dim nOrigGroupId As Integer = nPartId
If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
End If
'If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
' nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
'End If
If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
nOrigGroupId = GetOrigFrameGroup(nPartId)
End If
@@ -2341,7 +2341,7 @@ Public Class BTLPartVM
Friend Sub Verify()
If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
Map.refCALCPanelVM.Verify(ProjectType.PROJ)
Map.refCALCPanelVM.Verify(ProjectType.PROJ, CalcIntegration.CmdTypes.CHECKNOSIM)
Return
End Sub
EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
+21 -14
View File
@@ -532,7 +532,7 @@ Public Class CALCPanelVM
m_OrigSelectedMachine = SelectedMachine
End Sub
Friend Sub Verify(ProgramPage As ProjectType)
Friend Sub Verify(ProgramPage As ProjectType, CmdType As Integer)
If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
Dim ProjType As BWType = ProjectManagerVM.CurrProd.nType
Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
@@ -548,14 +548,14 @@ Public Class CALCPanelVM
End If
Else
Dim ExecThread As New Thread(Sub()
VerifyWithEngine(ProgramPage)
VerifyWithEngine(ProgramPage, CmdType)
End Sub)
ExecThread.Start()
End If
End Sub
Private Sub VerifyProjWithEngine(CurrPart As BTLPartVM)
Private Sub VerifyProjWithEngine(CurrPart As BTLPartVM, CmdType As Integer)
If Not CurrPart.bDO Then Return
Dim Args As New Dictionary(Of String, String)
Args.Add("BarId", CurrPart.nPartId)
@@ -574,7 +574,14 @@ Public Class CALCPanelVM
Dim sBTLPartFilePath As String = BarPath & "\" & CurrPart.nPDN.ToString() & ".ori.bwe"
If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
End If
nCmdType = CalcIntegration.CmdTypes.CHECKNOSIM
nCmdType = CmdType
'If nCmdType = CmdTypes.FLIP_ROT Then
' Dim sPreRotate As String = String.Empty
' Dim sPreInvert As String = String.Empty
' FindFlipRot(CurrPart.nPartId, sPreRotate, sPreInvert)
' CurrPart.ForwardRotation(sPreRotate)
' CurrPart.IsInverted = sPreInvert
'End If
End Select
Args.Add("CmdType", nCmdType)
Dim ExecEnvironment As EXECENVIRONMENTS = EXECENVIRONMENTS.NULL
@@ -604,7 +611,7 @@ Public Class CALCPanelVM
End If
End Sub
Private Sub VerifyProdWithEngine(CurrMachGroup As MyMachGroupVM)
Private Sub VerifyProdWithEngine(CurrMachGroup As MyMachGroupVM, CmdType As Integer)
' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra
If CurrMachGroup.nProduction_State >= ItemState.Assigned Then Return
Dim Args As New Dictionary(Of String, String)
@@ -626,7 +633,7 @@ Public Class CALCPanelVM
Dim sMachGroupFilePath As String = BarPath & "\" & CurrMachGroup.Name.ToString() & ".ori.bwe"
If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
End If
nCmdType = CalcIntegration.CmdTypes.CHECKGEN
nCmdType = CmdType
End Select
Args.Add("CmdType", nCmdType)
Dim ExecEnvironment As EXECENVIRONMENTS = EXECENVIRONMENTS.NULL
@@ -656,7 +663,7 @@ Public Class CALCPanelVM
End If
End Sub
Private Sub VerifyWithEngine(ProgramPage As ProjectType)
Private Sub VerifyWithEngine(ProgramPage As ProjectType, CmdType As Integer)
Dim ProjType As BWType = ProjectManagerVM.CurrProd.nType
' lancio calcolo
Dim ExecEnvironment As EXECENVIRONMENTS = EXECENVIRONMENTS.NULL
@@ -674,11 +681,11 @@ Public Class CALCPanelVM
Map.refMyStatusBarVM.MaximumValue = 1
If ProgramPage = ProjectType.PROJ Then
If Not Map.refProjectVM.BTLStructureVM.SelBTLPart.bDO Then Return
VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.SelBTLPart)
VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.SelBTLPart, CmdType)
ElseIf ProgramPage = ProjectType.PROD Then
' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra
If Map.refMachGroupPanelVM.SelectedMachGroup.nProduction_State >= ItemState.Assigned Then Return
VerifyProdWithEngine(Map.refMachGroupPanelVM.SelectedMachGroup)
VerifyProdWithEngine(Map.refMachGroupPanelVM.SelectedMachGroup, CmdType)
End If
End Sub
@@ -765,7 +772,7 @@ Public Class CALCPanelVM
Map.refMyStatusBarVM.SetOutputMessage(sProgress)
End Sub
Friend Sub VerifyAll(ProgramPage As ProjectType)
Friend Sub VerifyAll(ProgramPage As ProjectType, CmdType As Integer)
Dim ProjType As BWType = ProjectManagerVM.CurrProd.nType
If GetMainPrivateProfileInt(S_GENERAL, "UseCam5", 0) = 1 Then
Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
@@ -780,13 +787,13 @@ Public Class CALCPanelVM
End If
Else
Dim ExecThread As New Thread(Sub()
VerifyAllWithEngine(ProgramPage)
VerifyAllWithEngine(ProgramPage, CmdType)
End Sub)
ExecThread.Start()
End If
End Sub
Private Sub VerifyAllWithEngine(ProgramPage As ProjectType)
Private Sub VerifyAllWithEngine(ProgramPage As ProjectType, CmdType As Integer)
Dim QuestionList As New List(Of QuestionDTO)
' Blocco scena dell'assemblato
Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False)
@@ -797,14 +804,14 @@ Public Class CALCPanelVM
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))
VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex), CmdType)
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
VerifyProdWithEngine(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex))
VerifyProdWithEngine(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), CmdType)
Next
End If
End Sub
EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+3
View File
@@ -1219,6 +1219,9 @@
<ItemGroup>
<Resource Include="Resources\EgtDialog\Tiles.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\NewPage\VerifyAllR.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerR32.exe
EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
+15 -6
View File
@@ -23,6 +23,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
@@ -36,6 +37,14 @@
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="1"
ToolTip="{Binding VerifyAll_ToolTip}"
Command="{Binding VerifyAllFlipRot_Command}"
IsEnabled="{Binding VerifyAll_IsEnabled}"
Style="{StaticResource Verify_Button}">
<Image Source="{StaticResource VerifyAllR_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="2"
Command="{Binding ResetCalc_Command}"
ToolTip="{Binding ResetCalc_ToolTip}"
IsEnabled="{Binding CALCPanel_IsEnabled}"
@@ -43,7 +52,7 @@
<Image Source="{StaticResource ResetCalc_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="2"
<Button Grid.Column="3"
Name="FilterAllBtn"
ToolTip="{Binding FilterAll_ToolTip}"
Command="{Binding ShowPopUpFilterBtnCommand}"
@@ -95,7 +104,7 @@
</Expander>
</UniformGrid>
</Popup>
<Expander Grid.Column="3"
<Expander Grid.Column="4"
Header="{Binding Section_Msg}"
Style="{StaticResource Section_Expander}">
<ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
@@ -104,10 +113,10 @@
Style="{StaticResource LeftPanel_ListBox}"
ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}"/>
</Expander>
<EgtWPFLib5:EgtTextBox Grid.Column="4"
<EgtWPFLib5:EgtTextBox Grid.Column="5"
Text="{Binding Tag.SearchText, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelV}}}"
Style="{StaticResource LeftPanel_TextBox}"/>
<Button Grid.Column="5" Visibility="Collapsed"
<Button Grid.Column="6" Visibility="Collapsed"
Command="{Binding RotateAll_Command}"
ToolTip="{Binding RotateAll_ToolTip}"
IsEnabled="{Binding RotateAll_IsEnabled}"
@@ -115,7 +124,7 @@
<Image Source="{StaticResource Rotate_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="6" Visibility="Collapsed"
<Button Grid.Column="7" Visibility="Collapsed"
Command="{Binding InvertAll_Command}"
ToolTip="{Binding InvertAll_ToolTip}"
IsEnabled="{Binding RotateAll_IsEnabled}"
@@ -123,7 +132,7 @@
<Image Source="{StaticResource Inversion_Image}"
Style="{StaticResource BTLDataWnd_Image}"/>
</Button>
<Button Grid.Column="7" Visibility="Collapsed"
<Button Grid.Column="8" Visibility="Collapsed"
Command="{Binding Edit_Command}"
ToolTip="{Binding MultipleModify_ToolTip}"
IsEnabled="{Binding RotateAll_IsEnabled}"
EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
+36 -3
View File
@@ -84,6 +84,7 @@ Public Class LeftPanelVM
' Definizione comandi
Private m_cmdVerifyAll As ICommand
Private m_cmdVerifyFlipRotAll As ICommand
Private m_cmdShowPopUpFilterBtnCmd As ICommand
Private m_cmdRotateAll As ICommand
Private m_cmdInvertAll As ICommand
@@ -216,15 +217,47 @@ Public Class LeftPanelVM
If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
' imposto flag per calcolo
Map.refCALCPanelVM.SetCalculating(True)
For PartIndex As Integer = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex).SetIsRowEnabled(False)
For Each BTLPartItem As BTLPartVM In Map.refProjectVM.BTLStructureVM.BTLPartVMList
BTLPartItem.SetIsRowEnabled(False)
Next
Map.refCALCPanelVM.VerifyAll(ProjectType.PROJ)
Map.refCALCPanelVM.VerifyAll(ProjectType.PROJ, CalcIntegration.CmdTypes.CHECKNOSIM)
Return
End Sub
#End Region ' VerifyAll
#Region "VerifyAllFlipRot"
Public ReadOnly Property VerifyAllFlipRot_Command As ICommand
Get
If m_cmdVerifyFlipRotAll Is Nothing Then
m_cmdVerifyFlipRotAll = New Command(AddressOf VerifyAllFlipRot)
End If
Return m_cmdVerifyFlipRotAll
End Get
End Property
Friend Sub VerifyAllFlipRot()
If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
' imposto flag per calcolo
Map.refCALCPanelVM.SetCalculating(True)
For Each BTLPartItem As BTLPartVM In Map.refProjectVM.BTLStructureVM.BTLPartVMList
BTLPartItem.SetIsRowEnabled(False)
Next
Map.refCALCPanelVM.VerifyAll(ProjectType.PROJ, CalcIntegration.CmdTypes.FLIP_ROT)
Dim bPreRotate As Boolean = False
Dim bPreInvert As Boolean = False
For Each BTLPartItem As BTLPartVM In Map.refProjectVM.BTLStructureVM.BTLPartVMList
FindFlipRot(BTLPartItem.nPartId, bPreRotate, bPreInvert)
EgtResetCurrMachGroup()
If bPreRotate Then BTLPartItem.ForwardRotation(bPreRotate)
If bPreInvert Then BTLPartItem.IsInverted = bPreInvert
Next
Return
End Sub
#End Region ' VerifyAllRotate
#Region "ShowPopUpFilterBtnCommand"
Public ReadOnly Property ShowPopUpFilterBtnCommand As ICommand
EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
+2 -2
View File
@@ -933,7 +933,7 @@ Public Class MyMachGroupVM
Friend Sub Verify()
If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Map.refCALCPanelVM.Verify(ProjectType.PROD)
Map.refCALCPanelVM.Verify(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKNOSIM)
Return
End Sub
@@ -1027,7 +1027,7 @@ Public Class MyMachGroupVM
' se attiva opzione e non ancora calcolato
If GetMainPrivateProfileInt(S_GENERAL, K_FASTPRODUCE, 0) = 1 And Map.refMachGroupPanelVM.SelectedMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
Map.refCALCPanelVM.SetFromProduce(CALCPanelVM.ProduceType.PRODUCE)
Map.refCALCPanelVM.Verify(ProjectType.PROD)
Map.refCALCPanelVM.Verify(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKNOSIM)
Return
End If
' verifico se modalita' supervisore attiva
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("3.1.3.7")>
<Assembly: AssemblyFileVersion("3.1.3.7")>
<Assembly: AssemblyVersion("3.1.4.1")>
<Assembly: AssemblyFileVersion("3.1.4.1")>
EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+1 -1
View File
@@ -1911,7 +1911,7 @@ Public Class ProdManagerVM
If Map.refMainWindowVM.MainWindowM.nUserLevel >= 5 AndAlso GetMainPrivateProfileInt(S_MACH, K_EXPORTBWE, 0) = 1 Then
' lancio verifica perche' importato
Map.refCALCPanelVM.VerifyAll(ProjectType.PROJ)
Map.refCALCPanelVM.VerifyAll(ProjectType.PROJ, CalcIntegration.CmdTypes.CHECKNOSIM)
End If
' creo cartella per Proj
EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
+3 -3
View File
@@ -169,7 +169,7 @@ Public Class RawPartManagerVM
' se attiva opzione e non ancora calcolato
If GetMainPrivateProfileInt(S_GENERAL, K_FASTPRODUCE, 0) = 1 And Map.refMachGroupPanelVM.SelectedMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
Map.refCALCPanelVM.SetFromProduce(CALCPanelVM.ProduceType.PRODUCE)
Map.refCALCPanelVM.Verify(ProjectType.PROD)
Map.refCALCPanelVM.Verify(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKNOSIM)
Return
End If
' verifico se modalita' supervisore attiva
@@ -282,7 +282,7 @@ Public Class RawPartManagerVM
' se attiva opzione e non ancora calcolato
If GetMainPrivateProfileInt(S_GENERAL, K_FASTPRODUCE, 0) = 1 And Map.refMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.nProduction_State = ItemState.ND AndAlso x.nGlobalState = CalcStates.NOTCALCULATED) Then
Map.refCALCPanelVM.SetFromProduce(CALCPanelVM.ProduceType.PRODUCEALL)
Map.refCALCPanelVM.VerifyAll(ProjectType.PROD)
Map.refCALCPanelVM.VerifyAll(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKNOSIM)
Return
End If
If Map.refMachGroupPanelVM.MachGroupVMList.Count > 0 Then
@@ -783,7 +783,7 @@ Public Class RawPartManagerVM
For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1
DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).SetIsRowEnabled(False)
Next
Map.refCALCPanelVM.VerifyAll(ProjectType.PROD)
Map.refCALCPanelVM.VerifyAll(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKNOSIM)
Return
End Sub
EgtBEAMWALL.Optimizer/Resources/NewPage/VerifyAllR.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+1
View File
@@ -100,6 +100,7 @@
<BitmapImage x:Key="MoveUp_Image" UriSource="/Resources/NewPage/MoveUp.png"/>
<BitmapImage x:Key="MoveDown_Image" UriSource="/Resources/NewPage/MoveDown.png"/>
<BitmapImage x:Key="VerifyAll_Image" UriSource="/Resources/CALCPanel/VerifyAll.png"/>
<BitmapImage x:Key="VerifyAllR_Image" UriSource="/Resources/NewPage/VerifyAllR.png"/>
<BitmapImage x:Key="AllFilter_Image" UriSource="/Resources/LeftPanel/All_Filter.png"/>
<BitmapImage x:Key="Inversion_Image" UriSource="/Resources/NewPage/Inversion.png"/>
<BitmapImage x:Key="Send_Image" UriSource="/Resources/MainMenu/Send.png"/>
EgtBEAMWALL.Optimizer/Utility/LuaExec.vb
+37
View File
@@ -248,4 +248,41 @@ Module LuaExec
Return bOk
End Function
Friend Function FindFlipRot(nPartId As Integer, ByRef bPrerotate90 As Boolean, ByRef bPreInvert As Boolean) As Boolean
EgtOutLog("-- Start ExecBeam --")
' Recupero lo script da eseguire
Dim sExecPath As String = ""
Dim sExecName As String = ""
GetMainPrivateProfileString(S_BEAM, K_FLIPROTEXEC, "", sExecName)
sExecPath = (Map.refMainWindowVM.MainWindowM.sBeamRoot & "\" & sExecName).TrimEnd({"\"c})
If Not My.Computer.FileSystem.FileExists(sExecPath) Then
EgtOutLog("Not found BeamExec script " & sExecPath)
Return False
End If
' Assegno i dati
EgtLuaCreateGlobTable("BEAM")
EgtLuaSetGlobStringVar("BEAM.BASEDIR", Map.refMainWindowVM.MainWindowM.sBeamRoot)
EgtLuaSetGlobStringVar("BEAM.MACHINE", "")
EgtLuaSetGlobStringVar("BEAM.FILE", "")
EgtLuaSetGlobIntVar("BEAM.FLAG", CmdTypes.FLIP_ROT)
EgtLuaSetGlobIntVar("BEAM.FEATUREID", nPartId)
' Eseguo lo script
Dim bOk As Boolean = False
If EgtLuaExecFile(sExecPath) Then
' Recupero i risultati
Dim nErr As Integer = 999
EgtLuaGetGlobIntVar("BEAM.ERR", nErr)
bOk = (nErr <= 0)
If Not bOk Then EgtOutLog("BeamExec Err=" & nErr.ToString())
EgtLuaGetGlobBoolVar("BEAM.PREROTATE90", bPrerotate90)
EgtLuaGetGlobBoolVar("BEAM.PREINVERT", bPreInvert)
Else
EgtOutLog("Error executing Beam Exec script " & sExecPath)
Return False
End If
' Cancello tavola globale
EgtLuaResetGlobVar("BEAM")
Return bOk
End Function
End Module
EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.3.7")>
<Assembly: AssemblyFileVersion("3.1.3.7")>
<Assembly: AssemblyVersion("3.1.4.1")>
<Assembly: AssemblyFileVersion("3.1.4.1")>