Revision: 64297
http://sourceforge.net/p/brlcad/code/64297
Author: brlcad
Date: 2015-02-26 18:23:53 +0000 (Thu, 26 Feb 2015)
Log Message:
-----------
revert changes back through to r63500 except for the command rename to lc2 as
most of the prior changes were incorrectly reflecting errors in the new C
implementation.
Revision Links:
--------------
http://sourceforge.net/p/brlcad/code/63500
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/mged/lc.tcl
Modified: brlcad/trunk/src/tclscripts/mged/lc.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/lc.tcl 2015-02-26 18:19:52 UTC (rev
64296)
+++ brlcad/trunk/src/tclscripts/mged/lc.tcl 2015-02-26 18:23:53 UTC (rev
64297)
@@ -24,14 +24,13 @@
# 'region_id', 'material_id', 'los', 'region name', 'region parent'.
# If a value is unset, it is reported as '--'.
#
-# Option '-d' specifies to list only one region with each 'region_id'.
+# Option '-d' specifies to list only regions with duplicate 'region_id'.
#
-# Option '-s' specifies to list only one region with each combination of
'region_id',
-# 'material_id' and 'los'. In addition to the output of '-d', it lists
-# those cases where 'region_id' is the same but 'material_id' and/or
-# 'los' are different.
+# Option '-s' is the same as '-d' except some duplicates will not be
+# reported (i.e. skipped). Skipped duplicates will be those within the
+# specified group, that have the same parent, 'material_id' and 'los'.
#
-# Option '-r' removes regions from the list in which their parent is
+# Option '-r' remove regions from the list in which their parent is
# a region and the region is subtracted within the parent. The '-r'
# option can be combined with any other option.
#
@@ -61,7 +60,7 @@
set sort_column_flag_cnt 0
if { [llength $args] == 0 } {
- puts stdout "Usage: \[-d|-s\] \[-r\] \[-z\] \[-0|-1|-2|-3|-4|-5\] \[-f
{FileName}\] {GroupName}"
+ puts stdout "Usage: \[-d|-s|-r\] \[-z\] \[-0|-1|-2|-3|-4|-5\] \[-f
{FileName}\] {GroupName}"
return
}
@@ -121,22 +120,19 @@
set file_name $arg
continue
}
- if { $arg <= -0 && $arg >= -5 } {
- set sort_column [expr abs($arg)]
- continue
- }
if { $arg == "-f" } {
set file_name_flag_cnt 1
continue
}
- if { $arg == "-d" || $arg == "-s"} {
+ if { $arg == "-d" } {
set find_duplicates_flag_cnt 1
-
- if { $arg == "-s" } {
- set skip_special_duplicates_flag_cnt 1
- }
continue
}
+ if { $arg == "-s" } {
+ set find_duplicates_flag_cnt 1
+ set skip_special_duplicates_flag_cnt 1
+ continue
+ }
if { $arg == "-r" } {
set skip_subtracted_regions_flag_cnt 1
continue
@@ -145,6 +141,10 @@
set descending_sort_flag_cnt 1
continue
}
+ if { $arg <= -0 && $arg >= -5 } {
+ set sort_column [expr abs($arg)]
+ continue
+ }
set group_name_set 1
set group_name $arg
}
@@ -398,7 +398,7 @@
} else {
# convert columns from 1-5 to 0-4
set sort_column [expr ($sort_column - 1)]
-
+
if { $descending_sort_flag_cnt == 1 } {
set lines2 [lsort -dictionary -decreasing -index $sort_column
$lines2]
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
