From 445b7c43d47a8dff48a6c3b0c5c8c376a56a0acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20M=C3=BCnker?= <mnk@wzl.rwth-aachen.de>
Date: Mon, 23 May 2022 10:42:24 +0200
Subject: [PATCH] meta scripts adjusted

---
 CatiaNetTest/AndOrDataExtraction.vb | 21 ++++++++++++---------
 CatiaNetTest/AssemblyTiers2.vb      | 26 ++++++++++++++------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/CatiaNetTest/AndOrDataExtraction.vb b/CatiaNetTest/AndOrDataExtraction.vb
index 64b54b3..e00fe3b 100644
--- a/CatiaNetTest/AndOrDataExtraction.vb
+++ b/CatiaNetTest/AndOrDataExtraction.vb
@@ -47,7 +47,7 @@ Public Class AndOrDataExtraction
         bGenerateANDOR = False
         bAutomaticStep = True
         intStep = 13
-        dCollSens = 1
+        dCollSens = 2
         xlsPath = "D:\03_Dissertation\20_Tools\CATIA_NET\ProgData\"
         xlsFileName = "test_AOG"
 
@@ -105,17 +105,20 @@ Public Class AndOrDataExtraction
         objSheet_m.Cells(3, 1).Value = "bounding_box_code_type"
         objSheet_m.Cells(3, 2).Value = iBoundingBoxCode
 
-        objSheet_m.Cells(4, 1).Value = "step_size"
-        objSheet_m.Cells(4, 2).Value = intStep
+        objSheet_m.Cells(4, 1).Value = "auto_step"
+        objSheet_m.Cells(4, 2).Value = bAutomaticStep
 
-        objSheet_m.Cells(5, 1).Value = "step_size_sensitivity"
-        objSheet_m.Cells(5, 2).Value = dCollSens
+        objSheet_m.Cells(5, 1).Value = "step_size"
+        objSheet_m.Cells(5, 2).Value = intStep
 
-        objSheet_m.Cells(6, 1).Value = "t_liaison"
-        objSheet_m.Cells(6, 2).Value = t_liaison
+        objSheet_m.Cells(6, 1).Value = "step_size_sensitivity"
+        objSheet_m.Cells(6, 2).Value = dCollSens
 
-        objSheet_m.Cells(7, 1).Value = "t_mw"
-        objSheet_m.Cells(7, 2).Value = t_mw
+        objSheet_m.Cells(7, 1).Value = "t_liaison"
+        objSheet_m.Cells(7, 2).Value = t_liaison
+
+        objSheet_m.Cells(8, 1).Value = "t_mw"
+        objSheet_m.Cells(8, 2).Value = t_mw
 
 
         'Save and close excel workbook
diff --git a/CatiaNetTest/AssemblyTiers2.vb b/CatiaNetTest/AssemblyTiers2.vb
index f41fb6a..1f2d3d9 100644
--- a/CatiaNetTest/AssemblyTiers2.vb
+++ b/CatiaNetTest/AssemblyTiers2.vb
@@ -824,24 +824,26 @@ exitCD:
         objSheet_m.Cells(8, 1).Value = "connectivity_check"
         objSheet_m.Cells(8, 2).Value = bConnectivityCheck
 
-        objSheet_m.Cells(9, 1).Value = "step_size"
-        objSheet_m.Cells(9, 2).Value = intStep
+        objSheet_m.Cells(9, 1).Value = "auto_step"
+        objSheet_m.Cells(9, 2).Value = bAutomaticStep
 
-        objSheet_m.Cells(10, 1).Value = "step_size_sensitivity"
-        objSheet_m.Cells(10, 2).Value = dCollSens
+        objSheet_m.Cells(10, 1).Value = "step_size"
+        objSheet_m.Cells(10, 2).Value = intStep
 
-        objSheet_m.Cells(11, 1).Value = "num_collision_axes"
-        objSheet_m.Cells(11, 2).Value = intJ
+        objSheet_m.Cells(11, 1).Value = "step_size_sensitivity"
+        objSheet_m.Cells(11, 2).Value = dCollSens
 
-        objSheet_m.Cells(12, 1).Value = "selected_base_component"
-        objSheet_m.Cells(12, 2).Value = selected_base_component
+        objSheet_m.Cells(12, 1).Value = "num_collision_axes"
+        objSheet_m.Cells(12, 2).Value = intJ
 
-        objSheet_m.Cells(13, 1).Value = "t_bounding_box"
-        objSheet_m.Cells(13, 2).Value = t_bounding_box
+        objSheet_m.Cells(13, 1).Value = "selected_base_component"
+        objSheet_m.Cells(13, 2).Value = selected_base_component
 
-        objSheet_m.Cells(14, 1).Value = "t_assembly_tiers_method"
-        objSheet_m.Cells(14, 2).Value = t_assembly_tiers
+        objSheet_m.Cells(14, 1).Value = "t_bounding_box"
+        objSheet_m.Cells(14, 2).Value = t_bounding_box
 
+        objSheet_m.Cells(15, 1).Value = "t_assembly_tiers_method"
+        objSheet_m.Cells(15, 2).Value = t_assembly_tiers
 
 
         'Save and close excel workbook
-- 
GitLab