[brlcad-commits] SF.net SVN: brlcad:[49425] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 49425
http://brlcad.svn.sourceforge.net/brlcad/?rev=49425view=rev
Author: bob1961
Date: 2012-02-15 15:06:09 + (Wed, 15 Feb 2012)
Log Message:
---
Added Cyan to the list of colors available in the tree popup menu.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2012-02-14 22:17:39 UTC
(rev 49424)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2012-02-15 15:06:09 UTC
(rev 49425)
@@ -3640,6 +3640,8 @@
-command [::itcl::code $this setDisplayColor $_node {0 255 0}]
$color add command -label Blue \
-command [::itcl::code $this setDisplayColor $_node {0 0 255}]
+$color add command -label Cyan \
+ -command [::itcl::code $this setDisplayColor $_node {0 255 255}]
$color add command -label Indigo \
-command [::itcl::code $this setDisplayColor $_node {0 0 128}]
$color add command -label Violet \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Virtualization Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49426] brlcad/trunk/TODO
Revision: 49426 http://brlcad.svn.sourceforge.net/brlcad/?rev=49426view=rev Author: starseeker Date: 2012-02-15 16:59:26 + (Wed, 15 Feb 2012) Log Message: --- search allows all of these usages now - remove from TODO Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2012-02-15 15:06:09 UTC (rev 49425) +++ brlcad/trunk/TODO 2012-02-15 16:59:26 UTC (rev 49426) @@ -314,12 +314,6 @@ visualization feature to help with rotation operations, showing global object alignment with respect to its own coordinate space. -* search usage consistency: - - path and expression are optional: search . search / - - curious behavior if you e havoc then search / (prints havoc) - - relative searching: search ./havoc -type r - - simplifable paths should work: search /havoc/. -type r - * make mged not have a garbled display manager window if the framebuffer is enabled and the window is resized. initialize and refresh the new memory and zap the framebuffer. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49427] brlcad/trunk/TODO
Revision: 49427 http://brlcad.svn.sourceforge.net/brlcad/?rev=49427view=rev Author: starseeker Date: 2012-02-15 17:01:44 + (Wed, 15 Feb 2012) Log Message: --- Another search feature in place. Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2012-02-15 16:59:26 UTC (rev 49426) +++ brlcad/trunk/TODO 2012-02-15 17:01:44 UTC (rev 49427) @@ -762,11 +762,6 @@ * implement -param support for 'search' command -* make search . return object lists (no leading /) but still - process hierarchically so things like search . -maxdepth 0 return - a list of the top-level objects. The . implies returning only - unique names (i.e., a list). - * make ged command names aware of object arguments for automatic globbing and regular expression expansion: attr set t 1 [regex .*\.r] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49428] brlcad/trunk/src/tclscripts/archer
Revision: 49428
http://brlcad.svn.sourceforge.net/brlcad/?rev=49428view=rev
Author: bob1961
Date: 2012-02-15 17:18:42 + (Wed, 15 Feb 2012)
Log Message:
---
Added a slider for selecting object transparency.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2012-02-15 17:01:44 UTC
(rev 49427)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2012-02-15 17:18:42 UTC
(rev 49428)
@@ -450,6 +450,7 @@
buildObjAttrView
buildObjEditView
buildObjToolView
+ buildSelectTransparencyDialog
# set initial toggle variables
set mVPaneToggle3 $mVPaneFraction3
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2012-02-15 17:01:44 UTC
(rev 49427)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2012-02-15 17:18:42 UTC
(rev 49428)
@@ -318,6 +318,7 @@
variable mSelectedObjType
variable mPasteActive 0
variable mMultiPane 0
+ variable mTransparency 0
variable mHPaneFraction1 80
variable mHPaneFraction2 20
@@ -775,6 +776,8 @@
method render {_node _state _trans _updateTree {_wflag 1}}
method selectDisplayColor {_node}
method setDisplayColor {_node _rgb}
+ method selectTransparency {_node}
+ method selectTransparencyCmd {_node _alpha}
method setTransparency {_node _alpha}
method raytracePanel{}
method doPng {}
@@ -842,6 +845,7 @@
# Dialogs Section
method buildInfoDialog {_name _title _info _size _wrapOption _modality}
method buildSaveDialog {}
+ method buildSelectTransparencyDialog {}
method buildViewCenterDialog {}
method centerDialogOverPane {_dialog}
@@ -3232,6 +3236,27 @@
updateSaveMode
}
+
+::itcl::body ArcherCore::selectTransparency {_node} {
+set rdata [gedCmd how -b $_node]
+if {$rdata == -1} {
+ return
+}
+
+set mTransparency [expr {1.0 - [lindex $rdata 1]}]
+
+set pane [centerDialogOverPane $itk_component(selTranspDialog)]
+$itk_component(selTranspDialogSc) configure \
+ -command [::itcl::code $this selectTransparencyCmd $_node]
+$itk_component(selTranspDialog) activate
+}
+
+
+::itcl::body ArcherCore::selectTransparencyCmd {_node _alpha} {
+setTransparency $_node [expr {1.0 - $_alpha}]
+}
+
+
::itcl::body ArcherCore::setTransparency {node alpha} {
gedCmd set_transparency $node $alpha
}
@@ -3362,6 +3387,7 @@
addHistory ae $_az $_el
}
+
::itcl::body ArcherCore::showViewAxes {} {
catch {gedCmd configure -viewAxesEnable $mShowViewAxes}
}
@@ -3681,20 +3707,23 @@
# -command [::itcl::code $this setTransparency $_node 0.5]
# $trans add command -label 60% \
# -command [::itcl::code $this setTransparency $_node 0.4]
-# $trans add command -label 70% \
-# -command [::itcl::code $this setTransparency $_node 0.3]
+ $trans add command -label 70% \
+ -command [::itcl::code $this setTransparency $_node 0.3]
$trans add command -label 80% \
-command [::itcl::code $this setTransparency $_node 0.2]
- $trans add command -label 85% \
+# $trans add command -label 85% \
-command [::itcl::code $this setTransparency $_node 0.15]
$trans add command -label 90% \
-command [::itcl::code $this setTransparency $_node 0.1]
- $trans add command -label 95% \
+# $trans add command -label 95% \
-command [::itcl::code $this setTransparency $_node 0.05]
- $trans add command -label 97% \
+# $trans add command -label 97% \
-command [::itcl::code $this setTransparency $_node 0.03]
- $trans add command -label 99% \
+# $trans add command -label 99% \
-command [::itcl::code $this setTransparency $_node 0.01]
+ $trans add separator
+ $trans add command -label Select... \
+ -command [::itcl::code $this selectTransparency $_node]
# set up bindings for transparency status
bind $trans MenuSelect \
@@ -5818,6 +5847,45 @@
-hscrollmode none
}
+
+::itcl::body ArcherCore::buildSelectTransparencyDialog {} {
+itk_component add selTranspDialog {
+ ::iwidgets::dialog $itk_interior.selTranspDialog \
+ -modality application \
+ -title Select Transparency
+} {}
+$itk_component(selTranspDialog) hide 1
+$itk_component(selTranspDialog) hide 2
+$itk_component(selTranspDialog) hide 3
+$itk_component(selTranspDialog) configure \
+ -thickness 2 \
+
[brlcad-commits] SF.net SVN: brlcad:[49429] brlcad/trunk/TODO
Revision: 49429 http://brlcad.svn.sourceforge.net/brlcad/?rev=49429view=rev Author: starseeker Date: 2012-02-15 17:24:05 + (Wed, 15 Feb 2012) Log Message: --- Add some initial notes on libbu option handling - nothing definitive. Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2012-02-15 17:18:42 UTC (rev 49428) +++ brlcad/trunk/TODO 2012-02-15 17:24:05 UTC (rev 49429) @@ -1178,6 +1178,47 @@ more general liboptical. Need to be careful about performance and maintainability concerns. +* we need to define a libbu api for option handling that supports more + features than getopt: + + - need support for long options (e.g. --help and --color, not just -h +and -C) + + - need a way to consolidate documentation for options into one place +(DRY) that supports all of our various documentation styles. Discussed +with Sean in the past - initial thoughts: + ++ should be in C code - will be needed there, and easier to get it from + there to other formats than vice versa. + ++ should support printing out the options and documentation in formatted + structures that allow our build system to build the command and have + the command itself supply a generated snippit of text or markup that + could be incorporated into the final document - e.g. the DocBook + man page for a command would be set up to expect the command_options.xml + file generated by command --print-options DocBook (or some other + mechanism, that's just an idea) and the CMake build could first build and + then run the command at compilation time to provide the absolute most + current option listing and short descriptions for the other docs. + + - need to allow order dependent options (e.g. command inputfile outputfile) +that become order independent if enough information is available, e.g. the +above would work and command opt1 -i inputfile opt2 -o outputfile opt3 +would also work. + + - (maybe) incorporate some sort of sanity/bounds checking into the option +definitions API - i.e. in the C definition of an option, there could +be optional parameters to indicate the type and bounds of valid input +to that option. Won't always be possible, but may be a good feature +to have if it can save lots of repetivite coding of bounds checking in +programs. + + *might* be worth taking a look at http://rpm5.org/files/popt/ to see if + they have any code we could snarf to make life easier, but regardless + we need a libbu API on top of any other code - at such a core level, + we can't introduce an external API. + + CONVERTERS -- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49430] brlcad/trunk/src/libbu/sscanf.c
Revision: 49430
http://brlcad.svn.sourceforge.net/brlcad/?rev=49430view=rev
Author: n_reed
Date: 2012-02-15 18:48:06 + (Wed, 15 Feb 2012)
Log Message:
---
zero width should be okay for c conversion too
Modified Paths:
--
brlcad/trunk/src/libbu/sscanf.c
Modified: brlcad/trunk/src/libbu/sscanf.c
===
--- brlcad/trunk/src/libbu/sscanf.c 2012-02-15 17:24:05 UTC (rev 49429)
+++ brlcad/trunk/src/libbu/sscanf.c 2012-02-15 18:48:06 UTC (rev 49430)
@@ -510,54 +510,52 @@
case CT_CCL:
case CT_STRING:
- /* unsupressed %s or %[...] conversion */
- if (!(flags SUPPRESS) c != CT_CHAR) {
-
- if (width == 0 !(flags HAVEWIDTH)) {
- struct bu_vls err = BU_VLS_INIT_ZERO;
-
- /* No width was provided by caller.
-*
-* If the caller is using %s or %[...] without a
-* maximum field width, then there is a bug in the
-* caller code.
-*
-* sscanf could easily overrun the provided buffer and
-* cause a program crash, so just bomb here and make
-* the source of the problem clear.
-*/
- bu_vls_sprintf(err, ERROR.\n
- bu_sscanf was called with bad format string:
\%s\\n
- %%s and %%[...] conversions must be bounded
using
- a maximum field width., fmt0);
- bu_bomb(bu_vls_addr(err));
- }
-
- if (width == 0) {
- /* Caller specified zero width in the format string.
-* (%0c %0s or %0[...])
-*
-* The behavior of sscanf for a zero width is
-* undefined, so we provide our own consistent
-* behavior here.
-*
-* The assignment wasn't suppressed, so we'll assume
-* the caller provided a pointer and wants us to write
-* to it. Just write '\0' and call it a successfull
-* assignment.
-*/
- *va_arg(ap, char*) = '\0';
- ++partAssigned;
- break;
- }
-
- }
-
/* %lc %l[...] %ls are unsupported */
if (flags LONG) {
EXIT_DUE_TO_MISC_ERROR;
}
+ /* unsupressed %s or %[...] conversion */
+ if (!(flags SUPPRESS)) {
+ if (width == 0) {
+ if (flags HAVEWIDTH) {
+ /* Caller specified zero width in the format string.
+* (%0c %0s or %0[...])
+*
+* The behavior of sscanf for a zero width is
+* undefined, so we provide our own consistent
+* behavior here.
+*
+* The assignment wasn't suppressed, so we'll assume
+* the caller provided a pointer and wants us to write
+* to it. Just write '\0' and call it a successfull
+* assignment.
+*/
+ *va_arg(ap, char*) = '\0';
+ ++partAssigned;
+ break;
+ } else if (c != CT_CHAR) {
+ struct bu_vls err = BU_VLS_INIT_ZERO;
+
+ /* No width was provided by caller.
+*
+* If the caller is using %s or %[...] without a
+* maximum field width, then there is a bug in the
+* caller code.
+*
+* sscanf could easily overrun the provided buffer and
+* cause a program crash, so just bomb here and make
+* the source of the problem clear.
+*/
+ bu_vls_sprintf(err, ERROR.\n
+ bu_sscanf was called with bad format
string: \%s\\n
+ %%s and %%[...] conversions must be
bounded using
+ a maximum field width., fmt0);
+ bu_bomb(bu_vls_addr(err));
+ }
+ }
+ }
+
/* ordinary %c or %[...] or %s conversion */
SSCANF_TYPE(char*);
break;
@@ -615,7 +613,7 @@
}
break;
- /* %[eEfg] conversion */
+ /* %[aefgAEFG] conversion */
case CT_FLOAT:
if (flags LONG) {
SSCANF_TYPE(double*);
[brlcad-commits] SF.net SVN: brlcad:[49431] brlcad/trunk/include/bu.h
Revision: 49431 http://brlcad.svn.sourceforge.net/brlcad/?rev=49431view=rev Author: n_reed Date: 2012-02-15 18:52:59 + (Wed, 15 Feb 2012) Log Message: --- expand bu_sscanf comment with behavioral details Modified Paths: -- brlcad/trunk/include/bu.h Modified: brlcad/trunk/include/bu.h === --- brlcad/trunk/include/bu.h 2012-02-15 18:48:06 UTC (rev 49430) +++ brlcad/trunk/include/bu.h 2012-02-15 18:52:59 UTC (rev 49431) @@ -3619,12 +3619,46 @@ BU_EXPORT extern void bu_flog(FILE *, const char *, ...) _BU_ATTR_PRINTF23; /** - * Custom vsscanf. + * Custom vsscanf which wraps the system sscanf, and is wrapped by bu_sscanf. + * + * bu_vsscanf differs notably from the underlying system sscanf in that: + * + * - A maximum field width is required for unsuppressed %s and %[...] + *conversions. If a %s or %[...] conversion is encountered which does + *not include a maximum field width, the routine bombs in order to avoid + *an accidental buffer overrun. + * + * - %V and %#V have been added as valid conversions. Both expect a pointer to + *a struct bu_vls as their argument. + * + *%V is comparable to %[^]. It instructs bu_vsscanf to read arbitrary + *characters from the source and store them in the vls buffer. The default + *maximum field width is infinity. + * + *%#V is comparable to %s. It instructs bu_vsscanf to skip leading + *whitespace, and then read characters from the source and store them in the + *vls buffer until the next whitespace character is encountered. The default + *maximum field width is infinity. + * + * - 0 is always a valid field width for unsuppressed %c, %s, and %[...] + *conversions and causes '\0' to be written to the supplied char* + *argument. + * + * - a/e/f/g and A/E/F/G are always synonyms for float conversion. + * + * - The C99 conversions hh[diouxX], z[diouxX], and t[diouxX] are always + *supported. + * + * This routine has an associated test program named test_sscanf, which + * compares its behavior to the system sscanf. */ BU_EXPORT extern int bu_vsscanf(const char *src, const char *fmt, va_list ap); /** - * Initializes the va_list, then calls the above bu_vsscanf. + * Initializes the va_list, then calls bu_vsscanf. + * + * This routine has an associated test program named test_sscanf, which + * compares its behavior to the system sscanf. */ BU_EXPORT extern int bu_sscanf(const char *src, const char *fmt, ...) _BU_ATTR_SCANF23; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49432] brlcad/trunk/src/other/step/src/express/expscan. l
Revision: 49432
http://brlcad.svn.sourceforge.net/brlcad/?rev=49432view=rev
Author: n_reed
Date: 2012-02-15 19:41:41 + (Wed, 15 Feb 2012)
Log Message:
---
looks like we forgot to ignore a token
Modified Paths:
--
brlcad/trunk/src/other/step/src/express/expscan.l
Modified: brlcad/trunk/src/other/step/src/express/expscan.l
===
--- brlcad/trunk/src/other/step/src/express/expscan.l 2012-02-15 18:52:59 UTC
(rev 49431)
+++ brlcad/trunk/src/other/step/src/express/expscan.l 2012-02-15 19:41:41 UTC
(rev 49432)
@@ -318,7 +318,7 @@
comment {
-'\n' { NEWLINE; }
+'\n' { NEWLINE; IGNORE_TOKEN; }
[^*()\n]* { IGNORE_TOKEN; }
[*()] { IGNORE_TOKEN; }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Virtualization Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49433] brlcad/trunk/src/conv/asc/asc2g.c
Revision: 49433 http://brlcad.svn.sourceforge.net/brlcad/?rev=49433view=rev Author: bob1961 Date: 2012-02-15 21:10:54 + (Wed, 15 Feb 2012) Log Message: --- Need to add find separately instead of dbfind. Modified Paths: -- brlcad/trunk/src/conv/asc/asc2g.c Modified: brlcad/trunk/src/conv/asc/asc2g.c === --- brlcad/trunk/src/conv/asc/asc2g.c 2012-02-15 19:41:41 UTC (rev 49432) +++ brlcad/trunk/src/conv/asc/asc2g.c 2012-02-15 21:10:54 UTC (rev 49433) @@ -1655,9 +1655,9 @@ av[0] = aliases[i]; Tcl_CreateAlias(safe_interp, aliases[i], interp, db_name, ac, av); } - /* add dbfind separately */ - av[0] = find; - Tcl_CreateAlias(safe_interp, dbfind, interp, db_name, ac, av); + /* add find separately */ + av[0] = dbfind; + Tcl_CreateAlias(safe_interp, find, interp, db_name, ac, av); } while ((gettclblock(line,ifp)) = 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49434] brlcad/trunk/src/other/step/src/express/expscan. l
Revision: 49434
http://brlcad.svn.sourceforge.net/brlcad/?rev=49434view=rev
Author: n_reed
Date: 2012-02-15 21:54:25 + (Wed, 15 Feb 2012)
Log Message:
---
another missed ignore
Modified Paths:
--
brlcad/trunk/src/other/step/src/express/expscan.l
Modified: brlcad/trunk/src/other/step/src/express/expscan.l
===
--- brlcad/trunk/src/other/step/src/express/expscan.l 2012-02-15 21:10:54 UTC
(rev 49433)
+++ brlcad/trunk/src/other/step/src/express/expscan.l 2012-02-15 21:54:25 UTC
(rev 49434)
@@ -195,7 +195,10 @@
/* Added * at the end of next rule (to make lexer faster) - DEL */
*[\t ]* { IGNORE_TOKEN; }
-*'\n' { NEWLINE; }
+*'\n' {
+NEWLINE;
+IGNORE_TOKEN;
+}
code--[^\n]*'\n' {
NEWLINE;
@@ -318,7 +321,10 @@
comment {
-'\n' { NEWLINE; IGNORE_TOKEN; }
+'\n' {
+NEWLINE;
+IGNORE_TOKEN;
+}
[^*()\n]* { IGNORE_TOKEN; }
[*()] { IGNORE_TOKEN; }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Virtualization Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49435] brlcad/trunk/src/libtclcad/tclcad_obj.c
Revision: 49435
http://brlcad.svn.sourceforge.net/brlcad/?rev=49435view=rev
Author: bob1961
Date: 2012-02-15 21:58:52 + (Wed, 15 Feb 2012)
Log Message:
---
Tweak to_data_pick() to pick the top data point.
Modified Paths:
--
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2012-02-15 21:54:25 UTC (rev
49434)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2012-02-15 21:58:52 UTC (rev
49435)
@@ -4496,6 +4496,22 @@
point_t dpoint, vpoint;
register int i;
struct ged_dm_view *gdvp;
+fastf_t top_z;
+point_t top_point;
+size_t top_i, top_j, top_k;
+int found_top = 0;
+char *top_data_str;
+char *top_data_label;
+static fastf_t tol = 0.015;
+static char *data_polygons_str = data_polygons;
+static char *data_labels_str = data_labels;
+static char *sdata_labels_str = sdata_labels;
+static char *data_lines_str = data_lines;
+static char *sdata_lines_str = sdata_lines;
+static char *data_arrows_str = data_arrows;
+static char *sdata_arrows_str = sdata_arrows;
+static char *data_axes_str = data_axes;
+static char *sdata_axes_str = sdata_axes;
/* initialize result */
bu_vls_trunc(gedp-ged_result_str, 0);
@@ -4552,20 +4568,32 @@
fastf_t minY, maxY;
MAT4X3PNT(vpoint, gdvp-gdv_view-gv_model2view,
gdpsp-gdps_polygons.gp_polygon[si].gp_contour[sj].gpc_point[sk]);
- minX = vpoint[X] - 0.015;
- maxX = vpoint[X] + 0.015;
- minY = vpoint[Y] - 0.015;
- maxY = vpoint[Y] + 0.015;
+ minX = vpoint[X] - tol;
+ maxX = vpoint[X] + tol;
+ minY = vpoint[Y] - tol;
+ maxY = vpoint[Y] + tol;
if (minX vx vx maxX
minY vy vy maxY) {
- bu_vls_printf(gedp-ged_result_str, data_polygons
{%llu %llu %llu} {%lf %lf %lf},
- si, sj, sk,
V3ARGS(gdpsp-gdps_polygons.gp_polygon[si].gp_contour[sj].gpc_point[sk]));
- return GED_OK;
+ if (!found_top || top_z vpoint[Z]) {
+ top_z = vpoint[Z];
+ top_data_str = data_polygons_str;
+ top_i = si;
+ top_j = sj;
+ top_k = sk;
+ VMOVE(top_point,
gdpsp-gdps_polygons.gp_polygon[si].gp_contour[sj].gpc_point[sk]);
+ found_top = 1;
+ }
}
}
}
+if (found_top) {
+ bu_vls_printf(gedp-ged_result_str, %s {%llu %llu %llu} {%lf %lf %lf},
+ top_data_str, top_i, top_j, top_k, V3ARGS(top_point));
+ return GED_OK;
+}
+
/* check for label points */
if (gdvp-gdv_view-gv_data_labels.gdls_draw
gdvp-gdv_view-gv_data_labels.gdls_num_labels) {
@@ -4578,22 +4606,21 @@
VMOVE(dpoint, gdlsp-gdls_points[i]);
MAT4X3PNT(vpoint, gdvp-gdv_view-gv_model2view, dpoint);
-#if 1
minX = vpoint[X];
- maxX = vpoint[X] + 0.03;
+ maxX = vpoint[X] + (2 * tol);
minY = vpoint[Y];
- maxY = vpoint[Y] + 0.03;
-#else
- minX = vpoint[X] - 0.015;
- maxX = vpoint[X] + 0.015;
- minY = vpoint[Y] - 0.015;
- maxY = vpoint[Y] + 0.015;
-#endif
+ maxY = vpoint[Y] + (2 * tol);
+
if (minX vx vx maxX
minY vy vy maxY) {
- bu_vls_printf(gedp-ged_result_str, data_labels %d {{%s} {%lf
%lf %lf}},
- i, gdlsp-gdls_labels[i], V3ARGS(dpoint));
- return GED_OK;
+ if (!found_top || top_z vpoint[Z]) {
+ top_z = vpoint[Z];
+ top_data_str = data_labels_str;
+ top_i = i;
+ top_data_label = gdlsp-gdls_labels[i];
+ VMOVE(top_point, dpoint);
+ found_top = 1;
+ }
}
}
}
@@ -4610,27 +4637,31 @@
VMOVE(dpoint, gdlsp-gdls_points[i]);
MAT4X3PNT(vpoint, gdvp-gdv_view-gv_model2view, dpoint);
-#if 1
minX = vpoint[X];
- maxX = vpoint[X] + 0.03;
+ maxX = vpoint[X] + (2 * tol);
minY = vpoint[Y];
- maxY = vpoint[Y] + 0.03;
-#else
- minX = vpoint[X] - 0.015;
- maxX = vpoint[X] + 0.015;
- minY = vpoint[Y] - 0.015;
- maxY = vpoint[Y] + 0.015;
-#endif
+ maxY = vpoint[Y] + (2 * tol);
if (minX vx vx maxX
minY vy vy maxY) {
-
[brlcad-commits] SF.net SVN: brlcad:[49436] brlcad/trunk/src/tclscripts/archer
Revision: 49436
http://brlcad.svn.sourceforge.net/brlcad/?rev=49436view=rev
Author: bob1961
Date: 2012-02-15 22:12:55 + (Wed, 15 Feb 2012)
Log Message:
---
Make Archer's notion of top/bottom the same as MGED's.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2012-02-15 21:58:52 UTC
(rev 49435)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2012-02-15 22:12:55 UTC
(rev 49436)
@@ -3477,10 +3477,10 @@
-command [::itcl::code $this doAe -90 0]
$itk_component(${_prefix}stdviewsmenu) add command \
-label Top \
- -command [::itcl::code $this doAe 0 90]
+ -command [::itcl::code $this doAe 270 90]
$itk_component(${_prefix}stdviewsmenu) add command \
-label Bottom \
- -command [::itcl::code $this doAe 0 -90]
+ -command [::itcl::code $this doAe 270 -90]
$itk_component(${_prefix}stdviewsmenu) add separator
$itk_component(${_prefix}stdviewsmenu) add command \
-label 35, 25 \
@@ -4840,9 +4840,9 @@
$itk_component(menubar) menuconfigure .display.standard.starboard \
-command [::itcl::code $this doAe -90 0]
$itk_component(menubar) menuconfigure .display.standard.top \
- -command [::itcl::code $this doAe 0 90]
+ -command [::itcl::code $this doAe 270 90]
$itk_component(menubar) menuconfigure .display.standard.bottom \
- -command [::itcl::code $this doAe 0 -90]
+ -command [::itcl::code $this doAe 270 -90]
$itk_component(menubar) menuconfigure .display.standard.35, 25 \
-command [::itcl::code $this doAe 35 25]
$itk_component(menubar) menuconfigure .display.standard.45, 45 \
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2012-02-15 21:58:52 UTC
(rev 49435)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2012-02-15 22:12:55 UTC
(rev 49436)
@@ -1293,10 +1293,10 @@
-command [::itcl::code $this doAe -90 0] \
-state disabled
$itk_component(canvas_menu) menuconfigure .view.top \
- -command [::itcl::code $this doAe 0 90] \
+ -command [::itcl::code $this doAe 270 90] \
-state disabled
$itk_component(canvas_menu) menuconfigure .view.bottom \
- -command [::itcl::code $this doAe 0 -90] \
+ -command [::itcl::code $this doAe 270 -90] \
-state disabled
$itk_component(canvas_menu) menuconfigure .view.35,25 \
-command [::itcl::code $this doAe 35 25] \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Virtualization Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49437] brlcad/trunk/misc/CMake/distcheck_buildsys.cmake .in
Revision: 49437
http://brlcad.svn.sourceforge.net/brlcad/?rev=49437view=rev
Author: starseeker
Date: 2012-02-16 00:40:06 + (Thu, 16 Feb 2012)
Log Message:
---
One other possible line to remove from svn info output for distcheck...
Modified Paths:
--
brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in
Modified: brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in
===
--- brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in 2012-02-15 22:12:55 UTC
(rev 49436)
+++ brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in 2012-02-16 00:40:06 UTC
(rev 49437)
@@ -68,6 +68,7 @@
string(REGEX REPLACE Text Last[^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
string(REGEX REPLACE Last [^\r\n]* \n SVN_PROCESSING ${SVN_PROCESSING})
string(REGEX REPLACE Checksum: [^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
+ string(REGEX REPLACE Copied From [^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
string(REGEX REPLACE Revision: [^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
string(REGEX REPLACE Schedule: [^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
string(REGEX REPLACE Node Kind: [^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Virtualization Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49439] brlcad/trunk/CMakeLists.txt
Revision: 49439
http://brlcad.svn.sourceforge.net/brlcad/?rev=49439view=rev
Author: starseeker
Date: 2012-02-16 02:20:48 + (Thu, 16 Feb 2012)
Log Message:
---
Try making distcheck do both Debug and Release builds...
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2012-02-16 01:27:52 UTC (rev 49438)
+++ brlcad/trunk/CMakeLists.txt 2012-02-16 02:20:48 UTC (rev 49439)
@@ -2053,25 +2053,26 @@
DISTCLEAN(${CMAKE_BINARY_DIR}/Makefile)
DISTCLEAN(${CMAKE_BINARY_DIR}/include/brlcad_config.h.in)
-# Define a target distcheck. This performs the following steps to test
-# whether BRL-CAD is in a distribution ready state:
-#
-# 1. Check the files currently in the source directories against
-# known file lists generated by CMake and Subversion. There are
-# two hard fail cases - files in Subversion not accounted for by
-# the build logic, and build logic files not in Subversion. Files
-# not accounted for by either are assumed to be temporary and will
-# be excluded from the archive files.
-# 2. Run CPack to generate source tarballs.
-# 3. Expand the tarball into a subdirectory, make a build directory,
-# cd into the build directory, and configure BRL-CAD for a local
-# build and install.
-# 4. Perform the build.
-# 5. Run the regression and benchmark targets in the build directory.
-# 6. Install to the local install directory.
-# 7. Clear the tgz expanded sources and build files.
-# 8. Run benchmark from the installed directory.
-# 9. Clean up.
+# Define a target distcheck. This performs the following steps to test
+# whether BRL-CAD is in a distribution ready state:
+#
+# 1. Check the files currently in the source directories against
+# known file lists generated by CMake and Subversion. There are
+# two hard fail cases - files in Subversion not accounted for by
+# the build logic, and build logic files not in Subversion. Files
+# not accounted for by either are assumed to be temporary and will
+# be excluded from the archive files.
+# 2. Run CPack to generate source tarballs.
+# 3. Expand the tarball into a subdirectory, make a build directory,
+# cd into the build directory, and configure BRL-CAD for a local
+# build and install.
+# 4. Perform the build using the Debug configuration.
+# 5. Run the regression and benchmark targets in the build directory.
+# 6. Install to the local install directory.
+# 7. Clear the tgz expanded sources and build files.
+# 8. Run benchmark from the installed directory.
+# 9. Repeat 3 through 8 using the Release build type.
+# 10. Clean up.
# If we're doing a Make based build, we want the Make command. Otherwise
# fall back on cmake --build, with the limitations imposed by that option.
@@ -2089,7 +2090,7 @@
COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake
COMMAND ${CMAKE_COMMAND} -E echo Stage 2: Create source tgz, tbz2 and
zip archives from toplevel archive.
COMMAND ${CPACK_EXEC} --config
${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake
- COMMAND ${CMAKE_COMMAND} -E echo Stage 3: Expand tgz archive and
prepare to build from archive sources.
+ COMMAND ${CMAKE_COMMAND} -E echo Stage 3: Expand tgz archive and
prepare to build using the Debug configuration from archive sources.
COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
@@ -2107,10 +2108,26 @@
COMMAND ${CMAKE_COMMAND} -E echo Stage 8: Run benchmark testing from
tgz archive installed build.
COMMAND TIMEFRAME=1
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark run
COMMAND _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark
clean
- COMMAND ${CMAKE_COMMAND} -E echo Stage 9: Cleanup.
+ COMMAND ${CMAKE_COMMAND} -E echo Stage 9: Do it all again using the
Release build configuration.
COMMAND ${CMAKE_COMMAND} -E remove summary
COMMAND ${CMAKE_COMMAND} -E remove run-*.log
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
+ COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
+ COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build
+ COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-install
+ COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-release-build ${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS=Bundled
-DCMAKE_BUILD_TYPE=Release
[brlcad-commits] SF.net SVN: brlcad:[49440] brlcad/trunk
Revision: 49440
http://brlcad.svn.sourceforge.net/brlcad/?rev=49440view=rev
Author: starseeker
Date: 2012-02-16 02:30:02 + (Thu, 16 Feb 2012)
Log Message:
---
Make a stab at cleaning up the distcheck logic a bit, or at least reducing the
line count of the logic needed to define it...
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in
Added Paths:
---
brlcad/trunk/misc/CMake/Distcheck.cmake
brlcad/trunk/misc/CMake/distcheck_target.cmake.in
Removed Paths:
-
brlcad/trunk/misc/CMake/distcheck_message.in
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2012-02-16 02:20:48 UTC (rev 49439)
+++ brlcad/trunk/CMakeLists.txt 2012-02-16 02:30:02 UTC (rev 49440)
@@ -2053,133 +2053,11 @@
DISTCLEAN(${CMAKE_BINARY_DIR}/Makefile)
DISTCLEAN(${CMAKE_BINARY_DIR}/include/brlcad_config.h.in)
-# Define a target distcheck. This performs the following steps to test
-# whether BRL-CAD is in a distribution ready state:
-#
-# 1. Check the files currently in the source directories against
-# known file lists generated by CMake and Subversion. There are
-# two hard fail cases - files in Subversion not accounted for by
-# the build logic, and build logic files not in Subversion. Files
-# not accounted for by either are assumed to be temporary and will
-# be excluded from the archive files.
-# 2. Run CPack to generate source tarballs.
-# 3. Expand the tarball into a subdirectory, make a build directory,
-# cd into the build directory, and configure BRL-CAD for a local
-# build and install.
-# 4. Perform the build using the Debug configuration.
-# 5. Run the regression and benchmark targets in the build directory.
-# 6. Install to the local install directory.
-# 7. Clear the tgz expanded sources and build files.
-# 8. Run benchmark from the installed directory.
-# 9. Repeat 3 through 8 using the Release build type.
-# 10. Clean up.
+# Define a distcheck target. This performs a variety of tests to determine
+# whether BRL-CAD is in a distribution ready state.
+include(${BRLCAD_CMAKE_DIR}/Distcheck.cmake)
+DEFINE_DISTCHECK_TARGET()
-# If we're doing a Make based build, we want the Make command. Otherwise
-# fall back on cmake --build, with the limitations imposed by that option.
-# This really needs to migrate to it's own .cmake file, too complex for a
-# series of COMMAND statements.
-if(NOT IS_SUBBUILD)
- find_program(CPACK_EXEC cpack)
- mark_as_advanced(CPACK_EXEC)
- configure_file(${BRLCAD_CMAKE_DIR}/distcheck_buildsys.cmake.in
-${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake @ONLY)
-
- if(${CMAKE_GENERATOR} MATCHES Make AND (${cmake_generator} MATCHES
Make OR NOT cmake_generator))
-add_custom_target(distcheck
- COMMAND ${CMAKE_COMMAND} -E echo Stage 1: Check files in Source
Repository against files specified in Build Logic
- COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake
- COMMAND ${CMAKE_COMMAND} -E echo Stage 2: Create source tgz, tbz2 and
zip archives from toplevel archive.
- COMMAND ${CPACK_EXEC} --config
${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake
- COMMAND ${CMAKE_COMMAND} -E echo Stage 3: Expand tgz archive and
prepare to build using the Debug configuration from archive sources.
- COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS=Bundled
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E echo Stage 4: Compile using source from
tgz archive.
- COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build $(MAKE)
- COMMAND ${CMAKE_COMMAND} -E echo Stage 5: Run build-directory
regression and benchmark testing from tgz archive compilation.
- COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target regress
- COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target benchmark
- COMMAND ${CMAKE_COMMAND} -E echo Stage 6: Install from tgz build
directory.
- COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target install
- COMMAND ${CMAKE_COMMAND} -E echo Stage 7: Clear tgz archive sources
and build directory.
- COMMAND ${CMAKE_COMMAND} -E remove_directory
${CPACK_SOURCE_PACKAGE_FILE_NAME}
- COMMAND ${CMAKE_COMMAND} -E
[brlcad-commits] SF.net SVN: brlcad:[49441] brlcad/trunk/misc/CMake
Revision: 49441
http://brlcad.svn.sourceforge.net/brlcad/?rev=49441view=rev
Author: starseeker
Date: 2012-02-16 03:01:22 + (Thu, 16 Feb 2012)
Log Message:
---
Be quieter about a few things during distcheck...
Modified Paths:
--
brlcad/trunk/misc/CMake/Distcheck.cmake
brlcad/trunk/misc/CMake/distcheck_target.cmake.in
Modified: brlcad/trunk/misc/CMake/Distcheck.cmake
===
--- brlcad/trunk/misc/CMake/Distcheck.cmake 2012-02-16 02:30:02 UTC (rev
49440)
+++ brlcad/trunk/misc/CMake/Distcheck.cmake 2012-02-16 03:01:22 UTC (rev
49441)
@@ -8,7 +8,7 @@
# Determine how to trigger the build in the distcheck target
if(${CMAKE_GENERATOR} MATCHES Make AND (${cmake_generator} MATCHES
Make OR NOT cmake_generator))
- set(DISTCHECK_BUILD_CMD ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build $(MAKE))
+ set(DISTCHECK_BUILD_CMD ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build $(MAKE) distcheck_compilation_log)
else(${CMAKE_GENERATOR} MATCHES Make AND (${cmake_generator} MATCHES
Make OR NOT cmake_generator))
set(DISTCHECK_BUILD_CMD COMMAND ${CMAKE_COMMAND} -E build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build)
endif(${CMAKE_GENERATOR} MATCHES Make AND (${cmake_generator}
MATCHES Make OR NOT cmake_generator))
Modified: brlcad/trunk/misc/CMake/distcheck_target.cmake.in
===
--- brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2012-02-16 02:30:02 UTC
(rev 49440)
+++ brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2012-02-16 03:01:22 UTC
(rev 49441)
@@ -1,48 +1,48 @@
add_custom_target(distcheck
- COMMAND ${CMAKE_COMMAND} -E echo Stage 1: Check files in Source
Repository against files specified in Build Logic
- COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake
- COMMAND ${CMAKE_COMMAND} -E echo Stage 2: Create source tgz, tbz2 and
zip archives from toplevel archive.
- COMMAND ${CPACK_EXEC} --config
${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake
- COMMAND ${CMAKE_COMMAND} -E echo Stage 3: Expand tgz archive and
prepare to build using the Debug configuration from archive sources.
- COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS=Bundled
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E echo Stage 4: Compile using source from
tgz archive.
- COMMAND @DISTCHECK_BUILD_CMD@
- COMMAND ${CMAKE_COMMAND} -E echo Stage 5: Run build-directory
regression and benchmark testing from tgz archive compilation.
- COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target regress
- COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target benchmark
- COMMAND ${CMAKE_COMMAND} -E echo Stage 6: Install from tgz build
directory.
- COMMAND ${CMAKE_COMMAND} --build
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target install
- COMMAND ${CMAKE_COMMAND} -E echo Stage 7: Clear tgz archive sources
and build directory.
- COMMAND ${CMAKE_COMMAND} -E remove_directory
${CPACK_SOURCE_PACKAGE_FILE_NAME}
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E echo Stage 8: Run benchmark testing from
tgz archive installed build.
- COMMAND TIMEFRAME=1
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark run
- COMMAND _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark
clean
- COMMAND ${CMAKE_COMMAND} -E echo Stage 9: Do it all again using the
Release build configuration.
- COMMAND ${CMAKE_COMMAND} -E remove summary
- COMMAND ${CMAKE_COMMAND} -E remove run-*.log
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E tar xvzf
${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
- COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E chdir
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND}
../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS=Bundled
[brlcad-commits] SF.net SVN: brlcad:[49442] brlcad/trunk/misc/CMake
Revision: 49442
http://brlcad.svn.sourceforge.net/brlcad/?rev=49442view=rev
Author: starseeker
Date: 2012-02-16 03:05:36 + (Thu, 16 Feb 2012)
Log Message:
---
make the script name a bit more descriptive.
Modified Paths:
--
brlcad/trunk/misc/CMake/Distcheck.cmake
brlcad/trunk/misc/CMake/distcheck_target.cmake.in
Added Paths:
---
brlcad/trunk/misc/CMake/distcheck_repo_verify.cmake.in
Removed Paths:
-
brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in
Modified: brlcad/trunk/misc/CMake/Distcheck.cmake
===
--- brlcad/trunk/misc/CMake/Distcheck.cmake 2012-02-16 03:01:22 UTC (rev
49441)
+++ brlcad/trunk/misc/CMake/Distcheck.cmake 2012-02-16 03:05:36 UTC (rev
49442)
@@ -4,7 +4,7 @@
mark_as_advanced(CPACK_EXEC)
# Set up the script that will be used to verify the source archives
-configure_file(${BRLCAD_CMAKE_DIR}/distcheck_buildsys.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_buildsys.cmake @ONLY)
+configure_file(${BRLCAD_CMAKE_DIR}/distcheck_repo_verify.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_repo_verify.cmake @ONLY)
# Determine how to trigger the build in the distcheck target
if(${CMAKE_GENERATOR} MATCHES Make AND (${cmake_generator} MATCHES
Make OR NOT cmake_generator))
Deleted: brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in
===
--- brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in 2012-02-16 03:01:22 UTC
(rev 49441)
+++ brlcad/trunk/misc/CMake/distcheck_buildsys.cmake.in 2012-02-16 03:05:36 UTC
(rev 49442)
@@ -1,329 +0,0 @@
-# D I S T C H E C K _ B U I L D S Y S . C M A K E . I N
-#
-# BRL-CAD
-#
-# Copyright (c) 2011-2012 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-# Empty elements in lists are of no interest
-if(COMMAND CMAKE_POLICY)
- CMAKE_POLICY(SET CMP0007 OLD)
-endif(COMMAND CMAKE_POLICY)
-
-set(NOT_DISTCHECK_READY 0)
-set(CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@)
-
-# CPack needs a list of things to ignore - it is inclusive by default. This
-# macro updates an existing CPack configuration by sourcing the old CPack
-# settings, updating various values, and including CPack again to re-generate
-# the CPack output files.
-macro(UPDATE_CPACK_CONFIGS)
- include(@CMAKE_BINARY_DIR@/CPackConfig.cmake)
- set(CPACK_PROJECT_CONFIG_FILE @CMAKE_BINARY_DIR@/BRLCAD_CPackOptions.cmake)
- set(CPACK_SOURCE_INSTALLED_DIRECTORIES @CMAKE_SOURCE_DIR@;/)
- string(REGEX REPLACE CPACK_SOURCE_IGNORE_FILES
${CPACK_SOURCE_IGNORE_FILES})
- set(CPACK_SOURCE_IGNORE_FILES
${CPACK_SOURCE_IGNORE_FILES};${CPACK_EXTRA_IGNORE_FILES})
- list(REMOVE_DUPLICATES CPACK_SOURCE_IGNORE_FILES)
- include(CPack)
-endmacro(UPDATE_CPACK_CONFIGS)
-
-# Subversion generates a textual report that we need to convert into a file
-# list. The basic approach is to crush anything that's not what we want down
-# to line returns, then replace all line returns with semicolons to create
-# a valid CMake lists.
-macro(SVN_INFO_TO_PATH_LIST SVN_RAW SVN_PATHLIST)
- set(SVN_PROCESSING ${${SVN_RAW}})
- string(REGEX REPLACE Name: [^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
- string(REGEX REPLACE URL: [^\r\n]* \n SVN_PROCESSING ${SVN_PROCESSING})
- string(REGEX REPLACE Repository [^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
- string(REGEX REPLACE Text Last[^\r\n]* \n SVN_PROCESSING
${SVN_PROCESSING})
- string(REGEX REPLACE
[brlcad-commits] SF.net SVN: brlcad:[49443] brlcad/trunk/misc/CMake/distcheck_target.cmake. in
Revision: 49443
http://brlcad.svn.sourceforge.net/brlcad/?rev=49443view=rev
Author: starseeker
Date: 2012-02-16 03:13:50 + (Thu, 16 Feb 2012)
Log Message:
---
If we're good, remove the compilation log
Modified Paths:
--
brlcad/trunk/misc/CMake/distcheck_target.cmake.in
Modified: brlcad/trunk/misc/CMake/distcheck_target.cmake.in
===
--- brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2012-02-16 03:05:36 UTC
(rev 49442)
+++ brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2012-02-16 03:13:50 UTC
(rev 49443)
@@ -41,6 +41,7 @@
COMMAND ${CMAKE_COMMAND} -E remove summary
COMMAND ${CMAKE_COMMAND} -E remove run-*.log
COMMAND ${CMAKE_COMMAND} -E echo Stage 10: Final Cleanup.
+ COMMAND ${CMAKE_COMMAND} -E remove distcheck_compilation_log
COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
# The source repository verification script is responsible for generating
this file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Virtualization Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49444] brlcad/trunk/src/vdeck/vdeck.c
Revision: 49444
http://brlcad.svn.sourceforge.net/brlcad/?rev=49444view=rev
Author: starseeker
Date: 2012-02-16 05:16:10 + (Thu, 16 Feb 2012)
Log Message:
---
The Release build in distcheck proves its worth. Initialize the op pointer.
Modified Paths:
--
brlcad/trunk/src/vdeck/vdeck.c
Modified: brlcad/trunk/src/vdeck/vdeck.c
===
--- brlcad/trunk/src/vdeck/vdeck.c 2012-02-16 03:13:50 UTC (rev 49443)
+++ brlcad/trunk/src/vdeck/vdeck.c 2012-02-16 05:16:10 UTC (rev 49444)
@@ -460,7 +460,7 @@
first = 1;
do {
- char*op;
+ char*op = NULL;
int op_left = OBUF_SIZE;
if ( first ) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Virtualization Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49445] brlcad/trunk/src/libtclcad/tclcad_obj.c
Revision: 49445 http://brlcad.svn.sourceforge.net/brlcad/?rev=49445view=rev Author: starseeker Date: 2012-02-16 05:26:51 + (Thu, 16 Feb 2012) Log Message: --- More initializations Modified Paths: -- brlcad/trunk/src/libtclcad/tclcad_obj.c Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c === --- brlcad/trunk/src/libtclcad/tclcad_obj.c 2012-02-16 05:16:10 UTC (rev 49444) +++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2012-02-16 05:26:51 UTC (rev 49445) @@ -4496,12 +4496,14 @@ point_t dpoint, vpoint; register int i; struct ged_dm_view *gdvp; -fastf_t top_z; -point_t top_point; -size_t top_i, top_j, top_k; +fastf_t top_z = 0.0; +point_t top_point = VINIT_ZERO; +size_t top_i = 0; +size_t top_j = 0; +size_t top_k = 0; int found_top = 0; -char *top_data_str; -char *top_data_label; +char *top_data_str = NULL; +char *top_data_label = NULL; static fastf_t tol = 0.015; static char *data_polygons_str = data_polygons; static char *data_labels_str = data_labels; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Virtualization Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[49446] brlcad/trunk/misc/CMake/distcheck_target.cmake. in
Revision: 49446
http://brlcad.svn.sourceforge.net/brlcad/?rev=49446view=rev
Author: starseeker
Date: 2012-02-16 05:56:20 + (Thu, 16 Feb 2012)
Log Message:
---
Tweak the distcheck rules.
Modified Paths:
--
brlcad/trunk/misc/CMake/distcheck_target.cmake.in
Modified: brlcad/trunk/misc/CMake/distcheck_target.cmake.in
===
--- brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2012-02-16 05:26:51 UTC
(rev 49445)
+++ brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2012-02-16 05:56:20 UTC
(rev 49446)
@@ -4,6 +4,9 @@
COMMAND ${CMAKE_COMMAND} -E echo Stage 2: Create source tgz, tbz2 and zip
archives from toplevel archive.
COMMAND ${CPACK_EXEC} --config
${CMAKE_CURRENT_BINARY_DIR}/CPackSourceConfig.cmake
COMMAND ${CMAKE_COMMAND} -E echo Stage 3: Expand tgz archive and prepare
to build using the Debug configuration from archive sources.
+ COMMAND ${CMAKE_COMMAND} -E remove summary run-*.log
distcheck_compilation_log
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
COMMAND ${CMAKE_COMMAND} -E tar xzf ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
COMMAND ${CMAKE_COMMAND} -E make_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
@@ -22,8 +25,7 @@
COMMAND TIMEFRAME=1
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark run
COMMAND _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark clean
COMMAND ${CMAKE_COMMAND} -E echo Stage 9: Do it all again using the
Release build configuration.
- COMMAND ${CMAKE_COMMAND} -E remove summary
- COMMAND ${CMAKE_COMMAND} -E remove run-*.log
+ COMMAND ${CMAKE_COMMAND} -E remove summary run-*.log
distcheck_compilation_log
COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
COMMAND ${CMAKE_COMMAND} -E tar xzf ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
@@ -38,12 +40,10 @@
COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
COMMAND TIMEFRAME=1
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark run
COMMAND _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install/${BIN_DIR}/benchmark clean
- COMMAND ${CMAKE_COMMAND} -E remove summary
- COMMAND ${CMAKE_COMMAND} -E remove run-*.log
COMMAND ${CMAKE_COMMAND} -E echo Stage 10: Final Cleanup.
- COMMAND ${CMAKE_COMMAND} -E remove distcheck_compilation_log
+ COMMAND ${CMAKE_COMMAND} -E remove summary run-*.log
distcheck_compilation_log
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-build
COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
- COMMAND ${CMAKE_COMMAND} -E remove_directory
_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install
# The source repository verification script is responsible for generating
this file
COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/distcheck_message
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Virtualization Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
