Merge branch 'master' into CR32857_use_trim_surface

myGeom is now initialized by input surface for Draft_FaceInfo even if its type is Geom_RectangularTrimmedSurface.
input cylindric faces is not necessary to be trimmed (fixes bug712_1)

src/Draft/Draft_FaceInfo.cxx

@@ -37,9 +37,7 @@ Draft_FaceInfo::Draft_FaceInfo (const Handle(Geom_Surface)& S,\
 				const Standard_Boolean HasNewGeometry):
        myNewGeom(HasNewGeometry)
 {
-  Handle(Geom_RectangularTrimmedSurface) T = Handle(Geom_RectangularTrimmedSurface)::DownCast(S);
+  myGeom = S;
-  if (!T.IsNull()) myGeom = T->BasisSurface();
-  else             myGeom = S;
 }
 
 

src/Draft/Draft_Modification_1.cxx

@@ -481,7 +481,7 @@ Standard_Boolean Draft_Modification::Propagate ()
           Handle(Geom_Surface)::DownCast(S->Transformed(L.Transformation()));
 
         const Handle(Standard_Type)& typs = S->DynamicType();
-        if (typs == STANDARD_TYPE(Geom_CylindricalSurface) ||
+        if (/*typs == STANDARD_TYPE(Geom_CylindricalSurface) ||*/
             typs == STANDARD_TYPE(Geom_ConicalSurface)) {
           Standard_Real umin,umax,vmin,vmax;
           BRepTools::UVBounds(F,umin,umax,vmin,vmax);
@@ -1062,7 +1062,11 @@ void Draft_Modification::Perform ()
               //Find the first curve to glue
               TColGeom_SequenceOfCurve Candidates;
               if (S1->DynamicType() == STANDARD_TYPE(Geom_CylindricalSurface) ||
-                  S1->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface)) 
+                  S1->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface) ||
+                  S1->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface) &&
+                  Handle(Geom_RectangularTrimmedSurface)::DownCast(S1)->BasisSurface()->DynamicType() == STANDARD_TYPE(Geom_CylindricalSurface) ||
+                  S1->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface) &&
+                  Handle(Geom_RectangularTrimmedSurface)::DownCast(S1)->BasisSurface()->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface))
               {
                 for (i = 1; i <= i2s.NbLines(); i++)
                 {

tests/bugs/begin

@@ -59,3 +59,47 @@ 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
+}

tests/bugs/modalg_7/bug30273

@@ -8,15 +8,28 @@ 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 } {
-# Empty resource file name to take params from InterfaceStatic
+   set imagedir ../BugNumber
-param "read.step.resource.name" "\"\""
+   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"]
 # activation of ignoring the adding of natural bound
-param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+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}
 
 stepread [locate_data_file bug30273.stp] res *
 
-param "read.step.resource.name" "STEP"
+# Restoring the path to the old resource file
-param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+set ::env(CSF_STEPDefaults) ${old_resource_path}
 
 checknbshapes res_1 -solid 176 -face 10463 -shape 72893

tests/bugs/modalg_8/bug32857

@@ -0,0 +1,72 @@
+puts "================"
+puts "0032857: Problem when finding the intersection between a new face made after a draft and the inner face of body"
+puts "================"
+puts ""
+# Script reproducing the problematic draft case in FreeCAD issue #2497
+#Category: Modeling
+#Title: OCCT Tutorial pocketed ring
+
+pload MODELING VISUALIZATION
+
+# Set basic dimensions. Problems appear when inner_rad < pocket_center.
+dset height 10
+dset inner_rad 39
+dset outer_rad 50
+dset pocket_center 40
+dset pocket_rad 20
+dset pocket_depth 5
+
+# Construct base profile (the "my_ring")
+puts "Constructing my_ring..."
+
+circle c_inner 0 0 0 0 0 1 inner_rad
+circle c_outer 0 0 0 0 0 1 outer_rad
+mkedge e_inner c_inner
+mkedge e_outer c_outer
+wire w_inner e_inner
+wire w_outer e_outer
+
+plane p0
+mkface my_ring_inner_base p0 w_inner
+mkface my_ring_outer_base p0 w_outer
+
+prism my_ring_inner my_ring_inner_base 0 0 height
+prism my_ring_outer my_ring_outer_base 0 0 height
+
+bcut my_ring my_ring_outer my_ring_inner
+
+# Make the pocket
+puts "Constructing pocket..."
+
+circle pocket_base pocket_center 0 0 0 0 1 pocket_rad
+mkedge pocket_base pocket_base
+wire pocket_base pocket_base
+
+mkface pocket_base p0 pocket_base
+
+prism my_pocket pocket_base 0 0 pocket_depth
+
+# Make the cut
+puts "Making the cut"
+
+bcut slotted_ring my_ring my_pocket
+
+explode slotted_ring F
+
+# Make the draft
+puts "Drafting the face"
+
+# Found face by trial and error: slotted_ring_3
+# Perform the draft
+depouille slotted_ring_with_draft slotted_ring 0 0 -1 slotted_ring_3 44 0 1 0 0 0 1
+
+#checking result
+checkshape slotted_ring_with_draft
+checknbshapes slotted_ring_with_draft -shape 48 -vertex 12 -edge 18 -face 7 -wire 8
+checkprops slotted_ring_with_draft -s 11466.5 -v 28662.9
+
+puts "Showing result..."
+
+# Display result
+checkview -display slotted_ring_with_draft -2d -path ${imagedir}/${test_image}.png
+

tests/bugs/step/bug32922

@@ -9,10 +9,24 @@ puts ""
 
 pload MODELING XDE
 
-# Empty resource file name to take params from InterfaceStatic
+if { [info exists imagedir] == 0 } {
-param "read.step.resource.name" "\"\""
+   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"]
 # turn off shape healing
-param "FromSTEP.exec.op" "\"\""
+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}
 
 # Generating, writing and reading the torus
 ptorus tor 20 5
@@ -31,5 +45,5 @@ view 1 -2D- 728 20 400 400
 2dfit
 checkview -screenshot -2d -path ${imagedir}/${test_image}.png
 
-param "read.step.resource.name" "STEP"
+# Restoring the path to the old resource file
-param "FromSTEP.exec.op" "FixShape"
+set ::env(CSF_STEPDefaults) ${old_resource_path}

tests/bugs/xde/bug6283

@@ -11,11 +11,24 @@ 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 } {
-# Empty resource file name to take params from InterfaceStatic
+   set imagedir ../BugNumber
-param "read.step.resource.name" "\"\""
+   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"]
 # activation of ignoring the adding of natural bound
-param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+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}
 
 set list [stepread [locate_data_file wgehaeuse_surface.stp] a *]
 
@@ -38,6 +51,6 @@ if {[lsearch ${list} Error] > -1} {
     }
 }
 
-param "read.step.resource.name" "STEP"
+# Restoring the path to the old resource file
-param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+set ::env(CSF_STEPDefaults) ${old_resource_path}
 

tests/de/begin

@@ -13,3 +13,47 @@ 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
+}

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..."
-        de_before_script
+        set old_resource_path [de_before_script $filename]
     }
     
     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
+        de_after_script $old_resource_path
         unset de_use_custom_scripts
     }
 

tests/de/iges_1/G8

@@ -23,14 +23,32 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.iges.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromIGES.FixShape.FixAddNaturalBoundMode" 0
+    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}
 }
 
-proc de_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.iges.resource.name" "IGES"
+   # Restoring the path to the old resource file
-    param "FromIGES.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_IGESDefaults) ${old_resource_path}
+   puts "Restore path to IGES resource file: \"${old_resource_path}\""
 }

tests/de/iges_1/J9

@@ -27,14 +27,32 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.iges.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromIGES.FixShape.FixAddNaturalBoundMode" 0
+    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}
 }
 
-proc de_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.iges.resource.name" "IGES"
+   # Restoring the path to the old resource file
-    param "FromIGES.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_IGESDefaults) ${old_resource_path}
+   puts "Restore path to IGES resource file: \"${old_resource_path}\""
 }

tests/de/step_1/E1

@@ -27,14 +27,32 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+    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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }

tests/de/step_1/E2

@@ -27,14 +27,32 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+    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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }

tests/de/step_1/G9

@@ -29,14 +29,32 @@ LAYERS      : Layers   =   ( 001 )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+    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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }

tests/de/step_2/B3

@@ -27,14 +27,32 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+    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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }

tests/de/step_2/Q5

@@ -23,14 +23,33 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+    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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }
+

tests/de/step_2/Q6

@@ -23,14 +23,33 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       set imagedir ../[file rootname $TheFileName]
-    # activation of ignoring the adding of natural bound
+       if {![file exists ${imagedir}]} {
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+           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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }
+

tests/de/step_3/B9

@@ -29,14 +29,33 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+    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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }
+

tests/de/step_3/C8

@@ -27,14 +27,33 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+    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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }
+

tests/de/step_3/E4

@@ -27,14 +27,33 @@ LAYERS      : Layers   =   (  )
 
 set de_use_custom_scripts 1
 
-proc de_before_script {} {
+proc de_before_script {TheFileName} {
-    # Empty resource file name to take params from InterfaceStatic
+    if { [info exists imagedir] == 0 } {
-    param "read.step.resource.name" "\"\""
+       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"]
     # activation of ignoring the adding of natural bound
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" 0
+    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_after_script {} {
+proc de_after_script {old_resource_path} {
-    param "read.step.resource.name" "STEP"
+   # Restoring the path to the old resource file
-    param "FromSTEP.FixShape.FixAddNaturalBoundMode" -1
+   set ::env(CSF_STEPDefaults) ${old_resource_path}
+   puts "Restore path to STEP resource file: \"${old_resource_path}\""
 }
+