diff --git a/EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb b/EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb
index a4990b07..17da3a7d 100644
--- a/EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb
+++ b/EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb
@@ -593,4 +593,13 @@ Public Class ProcessResult
m_nTIME = TIME
End Sub
+ Public Sub ResetTypeFeature()
+ m_Type = ProcessResultTypes.PART
+ m_nTASKID = 0
+ End Sub
+ Public Sub ResetTypePart()
+ m_Type = ProcessResultTypes.BAR
+ m_nCUTID = 0
+ End Sub
+
End Class
diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
index 8af7008d..b08ec198 100644
--- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
@@ -16,31 +16,6 @@
-
- AnyCPU
- true
- full
- true
- true
- true
- bin\Debug\
- EgtBEAMWALL.Supervisor.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- false
-
-
- AnyCPU
- pdbonly
- false
- false
- true
- false
- true
- bin\Release\
- EgtBEAMWALL.Supervisor.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- false
-
On
@@ -53,29 +28,6 @@
On
-
- true
- true
- true
- bin\x64\Debug\
- EgtBEAMWALL.Supervisor.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- full
- x64
- MinimumRecommendedRules.ruleset
- false
-
-
- true
- bin\x64\Release\
- EgtBEAMWALL.Supervisor.xml
- true
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- pdbonly
- x64
- MinimumRecommendedRules.ruleset
- false
-
true
true
@@ -102,27 +54,6 @@
app.manifest
-
- true
- true
- true
- bin\RemoteDebug\
- EgtBEAMWALL.Supervisor.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- full
- AnyCPU
-
-
- true
- true
- true
- bin\x64\RemoteDebug\
- EgtBEAMWALL.Supervisor.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- full
- x64
- MinimumRecommendedRules.ruleset
-
true
true
diff --git a/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb
index 59219489..000929f7 100644
--- a/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb
@@ -387,15 +387,15 @@ Public Class CALCPanelVM
' aggiorno nuovo pezzo
CurrBTLPartVM = GetBTLPartVMFromBTLPartId(Line.nCUTID)
If IsNothing(CurrBTLPartVM) Then
+ Line.ResetTypePart()
EgtOutLog("Error in CALC ProcessResult. CUTID " & Line.nCUTID & "not found in project(BTLPartVM).")
- Continue For
End If
Else
' aggiorno nuovo pezzo
CurrPartVM = GetPartVMFromPartId(Line.nCUTID)
If IsNothing(CurrPartVM) Then
+ Line.ResetTypePart()
EgtOutLog("Error in CALC ProcessResult. CUTID " & Line.nCUTID & "not found in project(PartVM).")
- Continue For
End If
End If
End If
@@ -422,14 +422,14 @@ Public Class CALCPanelVM
If nProgramPage = ProjectType.PROJ Then
CurrBTLFeatureVM = GetBTLFeatureVMFromBTLPartId(CurrBTLPartVM, Line.nTASKID)
If IsNothing(CurrBTLFeatureVM) Then
+ Line.ResetTypeFeature()
EgtOutLog("Error in CALC ProcessResult. TASKID " & Line.nTASKID & "not found in BTLPartVM " & CurrBTLPartVM.nPartId)
- Continue For
End If
Else
CurrBTLFeatureVM = GetFeatureVMFromPartId(CurrPartVM, Line.nTASKID)
If IsNothing(CurrBTLFeatureVM) Then
+ Line.ResetTypeFeature()
EgtOutLog("Error in CALC ProcessResult. TASKID " & Line.nTASKID & "not found in PartVM " & CurrPartVM.nPartId)
- Continue For
End If
End If
Else
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index 2c2f8c2e..6cbfb68c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -16,31 +16,6 @@
-
- AnyCPU
- true
- full
- true
- true
- true
- bin\Debug\
- EgtBEAMWALL.ViewerOptimizer.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- false
-
-
- x86
- pdbonly
- false
- false
- true
- false
- true
- bin\Release\
- EgtBEAMWALL.ViewerOptimizer.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- false
-
On
@@ -53,29 +28,6 @@
On
-
- true
- true
- true
- bin\x64\Debug\
- EgtBEAMWALL.ViewerOptimizer.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- full
- x64
- MinimumRecommendedRules.ruleset
- false
-
-
- true
- bin\x64\Release\
- EgtBEAMWALL.ViewerOptimizer.xml
- true
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- pdbonly
- x64
- MinimumRecommendedRules.ruleset
- false
-
true
true
@@ -105,27 +57,6 @@
app.manifest
-
- true
- true
- true
- bin\RemoteDebug\
- EgtBEAMWALL.ViewerOptimizer.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- full
- AnyCPU
-
-
- true
- true
- true
- bin\x64\RemoteDebug\
- EgtBEAMWALL.ViewerOptimizer.xml
- 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
- full
- x64
- MinimumRecommendedRules.ruleset
-
true
true
diff --git a/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb
index a5314aef..71a250f2 100644
--- a/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb
@@ -427,7 +427,7 @@ Public Class FreeContourManagerVM
' posiziono la griglia sul riferimento del contorno libero
Dim frFace As New Frame3d
EgtBeamGetSideData(SelFeature.nSelSIDE, frFace)
- Dim frFrame As New Frame3d( SelFeature.BTLFeatureM.frFRAME)
+ Dim frFrame As New Frame3d(SelFeature.BTLFeatureM.frFRAME)
frFrame.ToGlob( frFace)
EgtSetGridFrame(frFrame)
EgtSetGridShow(True, True)
diff --git a/EgtBEAMWALL.sln b/EgtBEAMWALL.sln
index 82de182e..2701002d 100644
--- a/EgtBEAMWALL.sln
+++ b/EgtBEAMWALL.sln
@@ -13,58 +13,32 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgtBEAMWALL.Core", "EgtBEAM
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Release|x64 = Release|x64
Release|x86 = Release|x86
- RemoteDebug|x64 = RemoteDebug|x64
RemoteDebug|x86 = RemoteDebug|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {57291955-F9C4-4466-8D53-476D43BA3659}.Debug|x64.ActiveCfg = Debug|x64
- {57291955-F9C4-4466-8D53-476D43BA3659}.Debug|x64.Build.0 = Debug|x64
{57291955-F9C4-4466-8D53-476D43BA3659}.Debug|x86.ActiveCfg = Debug|x86
{57291955-F9C4-4466-8D53-476D43BA3659}.Debug|x86.Build.0 = Debug|x86
- {57291955-F9C4-4466-8D53-476D43BA3659}.Release|x64.ActiveCfg = Release|x64
- {57291955-F9C4-4466-8D53-476D43BA3659}.Release|x64.Build.0 = Release|x64
{57291955-F9C4-4466-8D53-476D43BA3659}.Release|x86.ActiveCfg = Release|x86
- {57291955-F9C4-4466-8D53-476D43BA3659}.Release|x86.Build.0 = Release|x86
- {57291955-F9C4-4466-8D53-476D43BA3659}.RemoteDebug|x64.ActiveCfg = RemoteDebug|x64
- {57291955-F9C4-4466-8D53-476D43BA3659}.RemoteDebug|x64.Build.0 = RemoteDebug|x64
{57291955-F9C4-4466-8D53-476D43BA3659}.RemoteDebug|x86.ActiveCfg = RemoteDebug|x86
{57291955-F9C4-4466-8D53-476D43BA3659}.RemoteDebug|x86.Build.0 = RemoteDebug|x86
- {B71DA327-38C8-4305-BBA1-34F3F3F32405}.Debug|x64.ActiveCfg = Debug|x64
- {B71DA327-38C8-4305-BBA1-34F3F3F32405}.Debug|x64.Build.0 = Debug|x64
{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Debug|x86.ActiveCfg = Debug|x86
{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Debug|x86.Build.0 = Debug|x86
- {B71DA327-38C8-4305-BBA1-34F3F3F32405}.Release|x64.ActiveCfg = Release|x64
- {B71DA327-38C8-4305-BBA1-34F3F3F32405}.Release|x64.Build.0 = Release|x64
{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Release|x86.ActiveCfg = Release|x86
{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Release|x86.Build.0 = Release|x86
- {B71DA327-38C8-4305-BBA1-34F3F3F32405}.RemoteDebug|x64.ActiveCfg = RemoteDebug|x64
- {B71DA327-38C8-4305-BBA1-34F3F3F32405}.RemoteDebug|x64.Build.0 = RemoteDebug|x64
{B71DA327-38C8-4305-BBA1-34F3F3F32405}.RemoteDebug|x86.ActiveCfg = RemoteDebug|x86
{B71DA327-38C8-4305-BBA1-34F3F3F32405}.RemoteDebug|x86.Build.0 = RemoteDebug|x86
- {24D7760E-662A-47E4-B729-B70126C24A31}.Debug|x64.ActiveCfg = Debug|Any CPU
- {24D7760E-662A-47E4-B729-B70126C24A31}.Debug|x64.Build.0 = Debug|Any CPU
{24D7760E-662A-47E4-B729-B70126C24A31}.Debug|x86.ActiveCfg = Debug|Any CPU
{24D7760E-662A-47E4-B729-B70126C24A31}.Debug|x86.Build.0 = Debug|Any CPU
- {24D7760E-662A-47E4-B729-B70126C24A31}.Release|x64.ActiveCfg = Release|Any CPU
- {24D7760E-662A-47E4-B729-B70126C24A31}.Release|x64.Build.0 = Release|Any CPU
{24D7760E-662A-47E4-B729-B70126C24A31}.Release|x86.ActiveCfg = Release|Any CPU
{24D7760E-662A-47E4-B729-B70126C24A31}.Release|x86.Build.0 = Release|Any CPU
- {24D7760E-662A-47E4-B729-B70126C24A31}.RemoteDebug|x64.ActiveCfg = Release|Any CPU
{24D7760E-662A-47E4-B729-B70126C24A31}.RemoteDebug|x86.ActiveCfg = Release|Any CPU
{24D7760E-662A-47E4-B729-B70126C24A31}.RemoteDebug|x86.Build.0 = Release|Any CPU
- {F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Debug|x64.ActiveCfg = Debug|Any CPU
- {F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Debug|x64.Build.0 = Debug|Any CPU
{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Debug|x86.ActiveCfg = Debug|Any CPU
{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Debug|x86.Build.0 = Debug|Any CPU
- {F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Release|x64.ActiveCfg = Release|Any CPU
- {F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Release|x64.Build.0 = Release|Any CPU
{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Release|x86.ActiveCfg = Release|Any CPU
{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Release|x86.Build.0 = Release|Any CPU
- {F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.RemoteDebug|x64.ActiveCfg = Release|Any CPU
{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.RemoteDebug|x86.ActiveCfg = Release|Any CPU
{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.RemoteDebug|x86.Build.0 = Release|Any CPU
EndGlobalSection