0027463: Checkprops can not be used with several properties

Added possibility to use several properties in one checkprops command

Modified test cases according to changes in checkprops command

src/DrawResources/CheckCommands.tcl

@@ -543,21 +543,15 @@ proc checkprops {shape args} {
     _check_args ${args} ${options} "checkprops"
 
     if { ${length} != -1 || ${equal_check} == 1 } {
-        set CommandName lprops
-        set mass $length
-        set prop "length"
+        lappend CommandNames {lprops}
         set equal_check 0
     }
     if { ${area} != -1 || ${equal_check} == 1 } {
-        set CommandName sprops
-        set mass $area
-        set prop "area"
+        lappend CommandNames {sprops}
         set equal_check 0
     }
     if { ${volume} != -1 || ${equal_check} == 1 } {
-        set CommandName vprops
-        set mass $volume
-        set prop "volume"
+        lappend CommandNames {vprops}
         set equal_check 0
     }
 
@@ -565,41 +559,47 @@ proc checkprops {shape args} {
     if { $skip } {
         set skip_option "-skip"
     }
-        
     
-    regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${shape} ${epsilon} $skip_option] full m
-
-    if { ${compared_equal_shape} != -1 } {
-        upvar ${compared_equal_shape} ${compared_equal_shape}
-        regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${compared_equal_shape} ${epsilon} $skip_option] full compared_m
-        if { $compared_m != $m } {
-            puts "Error: Shape ${compared_equal_shape} is not equal to shape ${shape}"
+    foreach CommandName ${CommandNames} {
+        switch $CommandName {
+            "lprops"    { set mass ${length}; set prop "length" }
+            "sprops"    { set mass ${area}; set prop "area" }
+            "vprops"    { set mass ${volume}; set prop "volume" }
         }
-    }
+        regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${shape} ${epsilon} $skip_option] full m
 
-    if { ${compared_notequal_shape} != -1 } {
-        upvar ${compared_notequal_shape} ${compared_notequal_shape}
-        regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${compared_notequal_shape} ${epsilon} $skip_option] full compared_m
-        if { $compared_m == $m } {
-            puts "Error: Shape ${compared_notequal_shape} is equal shape to ${shape}"
+        if { ${compared_equal_shape} != -1 } {
+            upvar ${compared_equal_shape} ${compared_equal_shape}
+            regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${compared_equal_shape} ${epsilon} $skip_option] full compared_m
+            if { $compared_m != $m } {
+                puts "Error: Shape ${compared_equal_shape} is not equal to shape ${shape}"
+            }
         }
-    }
 
-    if { ${compared_equal_shape} == -1 && ${compared_notequal_shape} == -1 } {
-        if { [string compare "$mass" "empty"] != 0 } {
-            if { $m == 0 } {
-                puts "Error : The command is not valid. The $prop is 0."
+        if { ${compared_notequal_shape} != -1 } {
+            upvar ${compared_notequal_shape} ${compared_notequal_shape}
+            regexp {Mass +: +([-0-9.+eE]+)} [eval ${CommandName} ${compared_notequal_shape} ${epsilon} $skip_option] full compared_m
+            if { $compared_m == $m } {
+                puts "Error: Shape ${compared_notequal_shape} is equal shape to ${shape}"
             }
-            if { $mass > 0 } {
-                puts "The expected $prop is $mass"
-            }
-            #check of change of area is < 1%
-            if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-                puts "Error : The $prop of result shape is $m"
-            }
-        } else {
-            if { $m != 0 } {
-                puts "Error : The command is not valid. The $prop is $m"
+        }
+
+        if { ${compared_equal_shape} == -1 && ${compared_notequal_shape} == -1 } {
+            if { [string compare "$mass" "empty"] != 0 } {
+                if { $m == 0 } {
+                    puts "Error : The command is not valid. The $prop is 0."
+                }
+                if { $mass > 0 } {
+                    puts "The expected $prop is $mass"
+                }
+                #check of change of area is < 1%
+                if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
+                    puts "Error : The $prop of result shape is $m"
+                }
+            } else {
+                if { $m != 0 } {
+                    puts "Error : The command is not valid. The $prop is $m"
+                }
             }
         }
     }

tests/pipe/specific/K4

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 32493.7 -v 108899
+checkprops result -s 30670.1 -v 108899
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/K7

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 34206.6 -v 117501
+checkprops result -s 32766.2 -v 117501
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/K8

@@ -25,6 +25,6 @@ if [catch { buildsweep result -R -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 35327.9 -v 124779
+checkprops result -s 33884 -v 124779
 
 checknbshapes result -vertex 3 -edge 8 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23

tests/pipe/specific/L1

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 32535.9 -v 103756
+checkprops result -s 30548.1 -v 103756
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/L4

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 34072.6 -v 112329
+checkprops result -s 32485.2 -v 112329
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/L5

@@ -25,6 +25,6 @@ if [catch { buildsweep result -R -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 38315.9 -v 147866
+checkprops result -s 36725.8 -v 147866
 
 checknbshapes result -vertex 4 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 25

tests/pipe/specific/L7

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30092.2 -v 80775.2
+checkprops result -s 28294.2 -v 80775.2
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/L9

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 32179.2 -v 90680.2
+checkprops result -s 31041.8 -v 90680.2
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/M2

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 32535.9 -v 103756
+checkprops result -s 30532.5 -v 103756
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/M4

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 34439.8 -v 112768
+checkprops result -s 33191 -v 112768
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/M6

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 32493.7 -v 108899
+checkprops result -s 30670.1 -v 108899
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/M9

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 34206.6 -v 117501
+checkprops result -s 32766.2 -v 117501
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/N1

@@ -26,6 +26,6 @@ if [catch { buildsweep result -R -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 35327.9 -v 124779
+checkprops result -s 33884 -v 124779
 
 checknbshapes result -vertex 3 -edge 8 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23

tests/pipe/specific/N4

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 34072.6 -v 112329
+checkprops result -s 32485.2 -v 112329
 
 checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18

tests/pipe/specific/N5

@@ -26,6 +26,6 @@ if [catch { buildsweep result -R -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 38315.9 -v 147866
+checkprops result -s 36725.8 -v 147866
 
 checknbshapes result -vertex 4 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 25

tests/pipe/specific/N7

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30006.2 -v 80709.6
+checkprops result -s 28316.4 -v 80709.6
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/N9

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30965.4 -v 84188.2
+checkprops result -s 29604.4 -v 84188.2
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/O2

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30073 -v 76901
+checkprops result -s 28233.3 -v 76901
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/O4

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 31054.5 -v 80305.2
+checkprops result -s 29574.7 -v 80305.2
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/O6

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 27815.3 -v 59871
+checkprops result -s 26124.2 -v 59871
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/O8

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 27676 -v 59042
+checkprops result -s 25730.5 -v 59042
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/P1

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30041.6 -v 76900.9
+checkprops result -s 28191 -v 76900.9
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/P3

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 29572.9 -v 74167.4
+checkprops result -s 27592.2 -v 74167.4
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/P5

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30006.2 -v 80709.6
+checkprops result -s 28316.4 -v 80709.6
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/P7

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30965.4 -v 84188.2
+checkprops result -s 29604.4 -v 84188.2
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/P9

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30073 -v 76901
+checkprops result -s 28233.3 -v 76901
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/Q2

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 31054.5 -v 80305.2
+checkprops result -s 29574.7 -v 80305.2
 
 checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66

tests/pipe/specific/Q4

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 29030.2 -v 68648
+checkprops result -s 27397.8 -v 68648
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/Q6

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30092 -v 72386.2
+checkprops result -s 28696.8 -v 72386.2
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/Q8

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 29331.9 -v 65400.7
+checkprops result -s 27552.3 -v 65400.7
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/R1

@@ -25,6 +25,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30287 -v 69136.9
+checkprops result -s 28751 -v 69136.9
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/R3

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 27417.2 -v 50977.6
+checkprops result -s 25784.5 -v 50977.6
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/R5

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 28684.4 -v 55282.1
+checkprops result -s 27472.6 -v 55282.1
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/R7

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 29343.7 -v 65439.6
+checkprops result -s 27557.6 -v 65439.6
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/R9

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30505.5 -v 69371.6
+checkprops result -s 29200.6 -v 69371.6
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/S2

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 29030.2 -v 68648
+checkprops result -s 27397.8 -v 68648
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/S4

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30092 -v 72386.2
+checkprops result -s 28696.8 -v 72386.2
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/S6

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 29331.9 -v 65400.7
+checkprops result -s 27552.3 -v 65400.7
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54

tests/pipe/specific/S7

@@ -26,6 +26,6 @@ if [catch { buildsweep result -S} res] {
   puts "Faulty OCC1477: buildsweep is wrong"
 }
 
-checkprops result -s 30287 -v 69136.9
+checkprops result -s 28751 -v 69136.9
 
 checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54