diff --git a/CatiaNetTest/AndOrDataExtraction.vb b/CatiaNetTest/AndOrDataExtraction.vb index 64b54b3562949b6023dd97dda93fc539798d77bd..e00fe3bc5c259bded24595cb8fb2a19254630f4c 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 f41fb6a6066af329a2eebc19e10e10d4162bbbea..1f2d3d97337aa05a87877145b7ca1bd2891d2162 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