From 26fbdc46fca7c6bab78c5b1dfdd25ef1d1617201 Mon Sep 17 00:00:00 2001 From: atereshi Date: Tue, 29 Nov 2022 15:58:43 +0300 Subject: [PATCH] 0033221: Resource files are not deleted after testing Problem: The old way of managing resource files was used, without deleting the temporary file. Change: Changing the shape healing options is done by using InterfaceStatic. Result: There is no need to replace the resource file. --- tests/bugs/begin | 44 ------------------------------------ tests/bugs/modalg_7/bug30273 | 25 +++++--------------- tests/bugs/step/bug32922 | 24 ++++---------------- tests/bugs/xde/bug6283 | 25 +++++--------------- tests/de/begin | 44 ------------------------------------ tests/de/end | 4 ++-- tests/de/iges_1/G8 | 32 ++++++-------------------- tests/de/iges_1/J9 | 32 ++++++-------------------- tests/de/step_1/E1 | 34 +++++++--------------------- tests/de/step_1/E2 | 34 +++++++--------------------- tests/de/step_1/G9 | 32 ++++++-------------------- tests/de/step_2/B3 | 32 ++++++-------------------- tests/de/step_2/Q5 | 33 ++++++--------------------- tests/de/step_2/Q6 | 35 +++++++--------------------- tests/de/step_3/B9 | 33 ++++++--------------------- tests/de/step_3/C8 | 33 ++++++--------------------- tests/de/step_3/E4 | 33 ++++++--------------------- 17 files changed, 99 insertions(+), 430 deletions(-) diff --git a/tests/bugs/begin b/tests/bugs/begin index 0f664ace6a..64eb606215 100755 --- a/tests/bugs/begin +++ b/tests/bugs/begin @@ -59,47 +59,3 @@ proc checktime {value expected tol_rel message} { puts "Improvement. ${message}, ${value} seconds, is less than expected time - ${expected} seconds" } } - -# Reads resource file, returns options from file as key-value dict -proc parse_resource_file {theFileName} { - # Creating empty dictionary - set aDict [dict create]; - # Check for resource file - if { [info exists theFileName] == 0 } { - puts "Error: resource file \"${theFileName}\" isn't found" - return $aDict - } - # Open a resource file - set aFD [open "${theFileName}" "rb"] - set aLineNo 0 - # Read line by line - while {[gets $aFD aLine] !=-1 } { - incr aLineNo - # Clear the line from comment - if {[regexp {(^[^!]+)} $aLine match aClearLine]} { - # remove spaces - set aClearLine [string trim $aClearLine] - if {[string length $aClearLine] != 0} { - if {[regexp {(\S+)\s*:\s*(\S*)} $aClearLine match aKey aValue]} { - dict set aDict $aKey $aValue - } else { - puts "Error: syntax error in resource file at line: ${aLineNo}" - } - } - } - } - close $aFD - return $aDict -} - -# Creates new resource file with options as key-value dict -proc create_resource_file {theFileName theOptions} { - # Open a resource file - set aFD [open "${theFileName}" "wb"] - set aLineNo 0 - # Write line by line - dict for {aKey aValue} $theOptions { - puts $aFD "${aKey} : ${aValue}" - } - close $aFD -} diff --git a/tests/bugs/modalg_7/bug30273 b/tests/bugs/modalg_7/bug30273 index daaefa168b..81d25dc70c 100644 --- a/tests/bugs/modalg_7/bug30273 +++ b/tests/bugs/modalg_7/bug30273 @@ -8,28 +8,15 @@ pload XDE # Due to the ambiguous interpretation of the "inner" wire on the surfaces # that have natural bound (is it the cutout in the whole surface, or it's just wrong wire orientation), # we must manually turn off the adding of the natural bound option of the shape healing for this test. -if { [info exists imagedir] == 0 } { - set imagedir ../BugNumber - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } -} -# remember the path to the old resource file -set old_resource_path $::env(CSF_STEPDefaults) -# reading old resource file -set anOptions [parse_resource_file "${old_resource_path}/STEP"] + +# Empty resource file name to take params from InterfaceStatic +param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound -dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" -# path to new resource file -set new_resource_path ${imagedir} -# creating resource file -create_resource_file "${new_resource_path}/STEP" $anOptions -# changing the path to the resource file -set ::env(CSF_STEPDefaults) ${new_resource_path} +param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 stepread [locate_data_file bug30273.stp] res * -# Restoring the path to the old resource file -set ::env(CSF_STEPDefaults) ${old_resource_path} +param "read.step.resource.name" "STEP" +param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 checknbshapes res_1 -solid 176 -face 10463 -shape 72893 diff --git a/tests/bugs/step/bug32922 b/tests/bugs/step/bug32922 index 1c32f0dcc2..07c60e7096 100644 --- a/tests/bugs/step/bug32922 +++ b/tests/bugs/step/bug32922 @@ -9,24 +9,10 @@ puts "" pload MODELING XDE -if { [info exists imagedir] == 0 } { - set imagedir ../bug32922 - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } -} -# remember the path to the old resource file -set old_resource_path $::env(CSF_STEPDefaults) -# reading old resource file -set anOptions [parse_resource_file "${old_resource_path}/STEP"] +# Empty resource file name to take params from InterfaceStatic +param "read.step.resource.name" "\"\"" # turn off shape healing -dict set anOptions "FromSTEP.exec.op" "" -# path to new resource file -set new_resource_path ${imagedir} -# creating resource file -create_resource_file "${new_resource_path}/STEP" $anOptions -# changing the path to the resource file -set ::env(CSF_STEPDefaults) ${new_resource_path} +param "FromSTEP.exec.op" "\"\"" # Generating, writing and reading the torus ptorus tor 20 5 @@ -45,5 +31,5 @@ view 1 -2D- 728 20 400 400 2dfit checkview -screenshot -2d -path ${imagedir}/${test_image}.png -# Restoring the path to the old resource file -set ::env(CSF_STEPDefaults) ${old_resource_path} +param "read.step.resource.name" "STEP" +param "FromSTEP.exec.op" "FixShape" diff --git a/tests/bugs/xde/bug6283 b/tests/bugs/xde/bug6283 index ba5dce2a20..2da044cbef 100644 --- a/tests/bugs/xde/bug6283 +++ b/tests/bugs/xde/bug6283 @@ -11,24 +11,11 @@ set BugNumber OCC6283 # Due to the ambiguous interpretation of the "inner" wire on the surfaces # that have natural bound (is it the cutout in the whole surface, or it's just wrong wire orientation), # we must manually turn off the adding of the natural bound option of the shape healing for this test. -if { [info exists imagedir] == 0 } { - set imagedir ../BugNumber - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } -} -# remember the path to the old resource file -set old_resource_path $::env(CSF_STEPDefaults) -# reading old resource file -set anOptions [parse_resource_file "${old_resource_path}/STEP"] + +# Empty resource file name to take params from InterfaceStatic +param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound -dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" -# path to new resource file -set new_resource_path ${imagedir} -# creating resource file -create_resource_file "${new_resource_path}/STEP" $anOptions -# changing the path to the resource file -set ::env(CSF_STEPDefaults) ${new_resource_path} +param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 set list [stepread [locate_data_file wgehaeuse_surface.stp] a *] @@ -51,6 +38,6 @@ if {[lsearch ${list} Error] > -1} { } } -# Restoring the path to the old resource file -set ::env(CSF_STEPDefaults) ${old_resource_path} +param "read.step.resource.name" "STEP" +param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 diff --git a/tests/de/begin b/tests/de/begin index 66bf8d3526..7dbfbf66fb 100644 --- a/tests/de/begin +++ b/tests/de/begin @@ -13,47 +13,3 @@ set lengthunit_start "" # Open a transaction NewCommand D - -# Reads resource file, returns options from file as key-value dict -proc parse_resource_file {theFileName} { - # Creating empty dictionary - set aDict [dict create]; - # Check for resource file - if { [info exists theFileName] == 0 } { - puts "Error: resource file \"${theFileName}\" isn't found" - return $aDict - } - # Open a resource file - set aFD [open "${theFileName}" "rb"] - set aLineNo 0 - # Read line by line - while {[gets $aFD aLine] !=-1 } { - incr aLineNo - # Clear the line from comment - if {[regexp {(^[^!]+)} $aLine match aClearLine]} { - # remove spaces - set aClearLine [string trim $aClearLine] - if {[string length $aClearLine] != 0} { - if {[regexp {(\S+)\s*:\s*(\S*)} $aClearLine match aKey aValue]} { - dict set aDict $aKey $aValue - } else { - puts "Error: syntax error in resource file at line: ${aLineNo}" - } - } - } - } - close $aFD - return $aDict -} - -# Creates new resource file with options as key-value dict -proc create_resource_file {theFileName theOptions} { - # Open a resource file - set aFD [open "${theFileName}" "wb"] - set aLineNo 0 - # Write line by line - dict for {aKey aValue} $theOptions { - puts $aFD "${aKey} : ${aValue}" - } - close $aFD -} diff --git a/tests/de/end b/tests/de/end index cc0c34c71a..ea1d4f43e8 100644 --- a/tests/de/end +++ b/tests/de/end @@ -70,7 +70,7 @@ if { [string length $filename] > 1} { if { [info exists de_use_custom_scripts] } { puts "Executing custom script for the test before reading data from file..." - set old_resource_path [de_before_script $filename] + de_before_script } if { [catch { $ReadCommand D_First $path_file } catch_result] } { @@ -82,7 +82,7 @@ if { [string length $filename] > 1} { if { [info exists de_use_custom_scripts] } { puts "Executing custom script for the test after reading data from file..." - de_after_script $old_resource_path + de_after_script unset de_use_custom_scripts } diff --git a/tests/de/iges_1/G8 b/tests/de/iges_1/G8 index f2b249db24..5ec5893193 100644 --- a/tests/de/iges_1/G8 +++ b/tests/de/iges_1/G8 @@ -23,32 +23,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_IGESDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/IGES"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.iges.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromIGES.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/IGES" $anOptions - # changing the path to the resource file - set ::env(CSF_IGESDefaults) ${new_resource_path} - puts "New path to IGES resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromIGES.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_IGESDefaults) ${old_resource_path} - puts "Restore path to IGES resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.iges.resource.name" "IGES" + param "FromIGES.FixShape.FixAddNaturalBoundMode" -1 } diff --git a/tests/de/iges_1/J9 b/tests/de/iges_1/J9 index 64b4f46cba..e57bac0363 100644 --- a/tests/de/iges_1/J9 +++ b/tests/de/iges_1/J9 @@ -27,32 +27,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_IGESDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/IGES"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.iges.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromIGES.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/IGES" $anOptions - # changing the path to the resource file - set ::env(CSF_IGESDefaults) ${new_resource_path} - puts "New path to IGES resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromIGES.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_IGESDefaults) ${old_resource_path} - puts "Restore path to IGES resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.iges.resource.name" "IGES" + param "FromIGES.FixShape.FixAddNaturalBoundMode" -1 } diff --git a/tests/de/step_1/E1 b/tests/de/step_1/E1 index b903a708cd..230bab1908 100644 --- a/tests/de/step_1/E1 +++ b/tests/de/step_1/E1 @@ -27,32 +27,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" -} \ No newline at end of file +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 +} diff --git a/tests/de/step_1/E2 b/tests/de/step_1/E2 index 141debb92f..5614373344 100644 --- a/tests/de/step_1/E2 +++ b/tests/de/step_1/E2 @@ -27,32 +27,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" -} \ No newline at end of file +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 +} diff --git a/tests/de/step_1/G9 b/tests/de/step_1/G9 index 712a3e5982..d342315002 100644 --- a/tests/de/step_1/G9 +++ b/tests/de/step_1/G9 @@ -29,32 +29,14 @@ LAYERS : Layers = ( 001 ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 } diff --git a/tests/de/step_2/B3 b/tests/de/step_2/B3 index e08538bf00..24b8a1c7d2 100644 --- a/tests/de/step_2/B3 +++ b/tests/de/step_2/B3 @@ -27,32 +27,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 } diff --git a/tests/de/step_2/Q5 b/tests/de/step_2/Q5 index 035864159a..901cdd2e95 100644 --- a/tests/de/step_2/Q5 +++ b/tests/de/step_2/Q5 @@ -23,33 +23,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 } - diff --git a/tests/de/step_2/Q6 b/tests/de/step_2/Q6 index 1df2560691..34cd873ace 100644 --- a/tests/de/step_2/Q6 +++ b/tests/de/step_2/Q6 @@ -23,33 +23,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] - # turn off the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" + # activation of ignoring the adding of natural bound + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 } - diff --git a/tests/de/step_3/B9 b/tests/de/step_3/B9 index 2e78a1347f..0eba5333ef 100644 --- a/tests/de/step_3/B9 +++ b/tests/de/step_3/B9 @@ -29,33 +29,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 } - diff --git a/tests/de/step_3/C8 b/tests/de/step_3/C8 index 4f47b33248..d00b81a458 100644 --- a/tests/de/step_3/C8 +++ b/tests/de/step_3/C8 @@ -27,33 +27,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 } - diff --git a/tests/de/step_3/E4 b/tests/de/step_3/E4 index cc5b077c81..a831e25833 100644 --- a/tests/de/step_3/E4 +++ b/tests/de/step_3/E4 @@ -27,33 +27,14 @@ LAYERS : Layers = ( ) set de_use_custom_scripts 1 -proc de_before_script {TheFileName} { - if { [info exists imagedir] == 0 } { - set imagedir ../[file rootname $TheFileName] - if {![file exists ${imagedir}]} { - file mkdir ${imagedir} - } - } - # remember the path to the old resource file - set old_resource_path $::env(CSF_STEPDefaults) - # reading old resource file - set anOptions [parse_resource_file "${old_resource_path}/STEP"] +proc de_before_script {} { + # Empty resource file name to take params from InterfaceStatic + param "read.step.resource.name" "\"\"" # activation of ignoring the adding of natural bound - dict set anOptions "FromSTEP.FixShape.FixAddNaturalBoundMode" "0" - # path to new resource file - set new_resource_path ${imagedir} - # creating resource file - create_resource_file "${new_resource_path}/STEP" $anOptions - # changing the path to the resource file - set ::env(CSF_STEPDefaults) ${new_resource_path} - puts "New path to STEP resource file is: \"${new_resource_path}\"" - - return ${old_resource_path} + param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0 } -proc de_after_script {old_resource_path} { - # Restoring the path to the old resource file - set ::env(CSF_STEPDefaults) ${old_resource_path} - puts "Restore path to STEP resource file: \"${old_resource_path}\"" +proc de_after_script {} { + param "read.step.resource.name" "STEP" + param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1 } - -- 2.39.5