[brlcad-commits] SF.net SVN: brlcad:[58429] brlcad/trunk
Revision: 58429
http://sourceforge.net/p/brlcad/code/58429
Author: carlmoore
Date: 2013-11-05 15:40:38 + (Tue, 05 Nov 2013)
Log Message:
---
fix spellings
Modified Paths:
--
brlcad/trunk/include/bu.h
brlcad/trunk/src/util/gen-registered-attributes-html.cpp
Modified: brlcad/trunk/include/bu.h
===
--- brlcad/trunk/include/bu.h 2013-11-05 00:07:47 UTC (rev 58428)
+++ brlcad/trunk/include/bu.h 2013-11-05 15:40:38 UTC (rev 58429)
@@ -1919,7 +1919,7 @@
* on usage.
*/
/* FIXME: can this be made to include a union (or a struct pointer) to allow
for a binary attr?
- * if so, some (if not all) attr functions will need to be mofified; maybe add
an artifical
+ * if so, some (if not all) attr functions will need to be modified; maybe add
an artificial
* const string value to indicate the binary attr which will probably never be
allowed to be changed
* other than programmatically (don't list, i.e., keep them hidden?) */
struct bu_attribute_value_pair {
Modified: brlcad/trunk/src/util/gen-registered-attributes-html.cpp
===
--- brlcad/trunk/src/util/gen-registered-attributes-html.cpp2013-11-05
00:07:47 UTC (rev 58428)
+++ brlcad/trunk/src/util/gen-registered-attributes-html.cpp2013-11-05
15:40:38 UTC (rev 58429)
@@ -226,7 +226,7 @@
lower-case.)/p\n
pSome attributes have ASCII names but binary values (e.g.,
'mtime'). Their values cannot\n
- be modifed by a user with the 'attr' command. In some cases, but
not all, their\n
+ be modified by a user with the 'attr' command. In some cases, but
not all, their\n
values may be shown in a human readable form with the 'attr'
command.)/p\n
pIf a user wishes to register an attribute to protect its use for
models\n
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk
___
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:[58430] brlcad/trunk/src/proc-db/molecule.c
Revision: 58430 http://sourceforge.net/p/brlcad/code/58430 Author: carlmoore Date: 2013-11-05 18:17:59 + (Tue, 05 Nov 2013) Log Message: --- revise the Usage statement (the .g output file is NOT a redirection of stdin), and change the mol.g object name to 'molecule', because mol.g could be interpreted as a .g FILE name Modified Paths: -- brlcad/trunk/src/proc-db/molecule.c Modified: brlcad/trunk/src/proc-db/molecule.c === --- brlcad/trunk/src/proc-db/molecule.c 2013-11-05 15:40:38 UTC (rev 58429) +++ brlcad/trunk/src/proc-db/molecule.c 2013-11-05 18:17:59 UTC (rev 58430) @@ -65,7 +65,7 @@ struct wmember head; -static const char usage[] = Usage: molecule db_title mol-cube.dat mol.g\n; +static const char usage[] = Usage: molecule db_title mol-cube.dat\n (output file molecule.g)\n; struct rt_wdb *outfp; @@ -84,7 +84,7 @@ read_data(); /* Build the overall combination */ -mk_lfcomb(outfp, mol.g, head, 0); +mk_lfcomb(outfp, molecule, head, 0); wdb_close(outfp); return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ 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:[58431] brlcad/trunk/src/proc-db/nmgmodel.c
Revision: 58431
http://sourceforge.net/p/brlcad/code/58431
Author: carlmoore
Date: 2013-11-05 19:59:36 + (Tue, 05 Nov 2013)
Log Message:
---
implement my run-with-no-arguments/program-continues-running protocol (we do
see we can run the program with no arguments), and change 2 tabs to spaces
Modified Paths:
--
brlcad/trunk/src/proc-db/nmgmodel.c
Modified: brlcad/trunk/src/proc-db/nmgmodel.c
===
--- brlcad/trunk/src/proc-db/nmgmodel.c 2013-11-05 18:17:59 UTC (rev 58430)
+++ brlcad/trunk/src/proc-db/nmgmodel.c 2013-11-05 19:59:36 UTC (rev 58431)
@@ -62,17 +62,16 @@
* U S A G E --- tell user how to invoke this program, then exit
*/
void
-usage(char *str)
+usage(char *str, int stopprog)
{
if (str) (void)fputs(str, stderr);
(void) fprintf(stderr, Usage: %s [ -0123 ] \n%s\%s\\n%s\%s\\n,
progname,
- \tCreate NMG to mged database ,
- mfilename,
- \tand plot3 file ,
- plotfilename);
-bu_exit(1, NULL);
+ Create NMG to mged database ,mfilename,
+ and plot3 file ,plotfilename);
+if (stopprog) bu_exit(1, NULL);
+fprintf(stderr, Program continues running:\n);
}
@@ -107,7 +106,7 @@
case '0': manifold[0] = 0; break;
case '?':
case 'h':
- default : usage((char *)NULL); break;
+ default : usage((char *)NULL,1); break;
}
return bu_optind;
@@ -533,9 +532,10 @@
FILE *fdplot;
struct rt_wdb *fdmodel;
-if (parse_args(ac, av) ac) usage((char *)NULL);
+parse_args(ac, av);
+if (ac==1) usage((char *)NULL,0);
if (!manifold[0] !manifold[1] !manifold[2] !manifold[3])
- usage(No manifolds selected\n);
+ usage(No manifolds selected\n,1);
m = nmg_mm();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk
___
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:[58432] brlcad/trunk/src
Revision: 58432
http://sourceforge.net/p/brlcad/code/58432
Author: bob1961
Date: 2013-11-05 20:46:32 + (Tue, 05 Nov 2013)
Log Message:
---
Draw data arrows/axes using pixel size instead of mm.
Modified Paths:
--
brlcad/trunk/src/libdm/axes.c
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/src/libdm/axes.c
===
--- brlcad/trunk/src/libdm/axes.c 2013-11-05 19:59:36 UTC (rev 58431)
+++ brlcad/trunk/src/libdm/axes.c 2013-11-05 20:46:32 UTC (rev 58432)
@@ -39,7 +39,7 @@
void
dm_draw_data_axes(struct dm *dmp,
- fastf_t UNUSED(viewSize), /* in mm */
+ fastf_t sf,
struct ged_data_axes_state *gdasp)
{
int i, j;
@@ -74,7 +74,7 @@
#endif
points = (point_t *)bu_calloc(npoints, sizeof(point_t), data axes
points);
-halfAxesSize = gdasp-gdas_size * 0.5;
+halfAxesSize = gdasp-gdas_size * 0.5 * sf;
/* set linewidth */
DM_SET_LINE_ATTR(dmp, gdasp-gdas_line_width, 0); /* solid lines */
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-11-05 19:59:36 UTC (rev
58431)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-11-05 20:46:32 UTC (rev
58432)
@@ -13011,7 +13011,7 @@
}
-HIDDEN void go_dm_draw_arrows(struct dm *dmp, struct ged_data_arrow_state
*gdasp);
+HIDDEN void go_dm_draw_arrows(struct dm *dmp, struct ged_data_arrow_state
*gdasp, fastf_t sf);
HIDDEN void go_dm_draw_labels(struct dm *dmp, struct ged_data_label_state
*gdlsp, matp_t m2vmat);
HIDDEN void go_dm_draw_lines(struct dm *dmp, struct ged_data_line_state
*gdlsp);
HIDDEN void go_dm_draw_polys(struct dm *dmp, ged_data_polygon_state *gdpsp,
int mode);
@@ -13023,7 +13023,7 @@
HIDDEN void
-go_dm_draw_arrows(struct dm *dmp, struct ged_data_arrow_state *gdasp)
+go_dm_draw_arrows(struct dm *dmp, struct ged_data_arrow_state *gdasp, fastf_t
sf)
{
register int i;
int saveLineWidth;
@@ -13062,7 +13062,7 @@
VSUB2(BmA, B, A);
VUNITIZE(BmA);
- VSCALE(offset, BmA, -gdasp-gdas_tip_length);
+ VSCALE(offset, BmA, -gdasp-gdas_tip_length * sf);
bn_vec_perp(perp1, BmA);
VUNITIZE(perp1);
@@ -13070,8 +13070,8 @@
VCROSS(perp2, BmA, perp1);
VUNITIZE(perp2);
- VSCALE(perp1, perp1, gdasp-gdas_tip_width);
- VSCALE(perp2, perp2, gdasp-gdas_tip_width);
+ VSCALE(perp1, perp1, gdasp-gdas_tip_width * sf);
+ VSCALE(perp2, perp2, gdasp-gdas_tip_width * sf);
VADD2(a_base, B, offset);
VADD2(a_pt1, a_base, perp1);
@@ -13425,21 +13425,22 @@
HIDDEN void
go_draw_other(struct ged_obj *gop, struct ged_dm_view *gdvp)
{
+fastf_t sf = gdvp-gdv_view-gv_size *
gop-go_gedp-ged_wdbp-dbip-dbi_local2base / gdvp-gdv_dmp-dm_width;
if (gdvp-gdv_view-gv_data_arrows.gdas_draw)
- go_dm_draw_arrows(gdvp-gdv_dmp, gdvp-gdv_view-gv_data_arrows);
+ go_dm_draw_arrows(gdvp-gdv_dmp, gdvp-gdv_view-gv_data_arrows, sf);
if (gdvp-gdv_view-gv_sdata_arrows.gdas_draw)
- go_dm_draw_arrows(gdvp-gdv_dmp, gdvp-gdv_view-gv_sdata_arrows);
+ go_dm_draw_arrows(gdvp-gdv_dmp, gdvp-gdv_view-gv_sdata_arrows, sf);
if (gdvp-gdv_view-gv_data_axes.gdas_draw)
dm_draw_data_axes(gdvp-gdv_dmp,
- gdvp-gdv_view-gv_size,
+ sf,
gdvp-gdv_view-gv_data_axes);
if (gdvp-gdv_view-gv_sdata_axes.gdas_draw)
dm_draw_data_axes(gdvp-gdv_dmp,
- gdvp-gdv_view-gv_size,
+ sf,
gdvp-gdv_view-gv_sdata_axes);
if (gdvp-gdv_view-gv_data_lines.gdls_draw)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk
___
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:[58433] brlcad/trunk/include/nmg.h
Revision: 58433 http://sourceforge.net/p/brlcad/code/58433 Author: starseeker Date: 2013-11-05 21:08:18 + (Tue, 05 Nov 2013) Log Message: --- Add a note about Weiler's thesis from 1986 in the NMG header - there seems to be a scan of that thesis online at http://www.scorec.rpi.edu/REPORTS/1986-1.pdf?\226?\128?\142 Modified Paths: -- brlcad/trunk/include/nmg.h Modified: brlcad/trunk/include/nmg.h === --- brlcad/trunk/include/nmg.h 2013-11-05 20:46:32 UTC (rev 58432) +++ brlcad/trunk/include/nmg.h 2013-11-05 21:08:18 UTC (rev 58433) @@ -25,6 +25,9 @@ * Modelling. Developed from Non-Manifold Geometric Boundary * Modeling by Kevin Weiler, 5/7/87 (SIGGraph 1989 Course #20 Notes) * + * See also Topological Structures for Geometric Modeling + * by Kevin J. Weiler - RPI Phd thesis from 1986. + * */ #ifndef __NMG_H__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ 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:[58434] brlcad/trunk/src/librt/db5_types.c
Revision: 58434 http://sourceforge.net/p/brlcad/code/58434 Author: tbrowder2 Date: 2013-11-05 23:26:19 + (Tue, 05 Nov 2013) Log Message: --- add some aliases Modified Paths: -- brlcad/trunk/src/librt/db5_types.c Modified: brlcad/trunk/src/librt/db5_types.c === --- brlcad/trunk/src/librt/db5_types.c 2013-11-05 21:08:18 UTC (rev 58433) +++ brlcad/trunk/src/librt/db5_types.c 2013-11-05 23:26:19 UTC (rev 58434) @@ -400,6 +400,14 @@ if (BU_STR_EQUIV(attr, mtime)) return ATTR_TIMESTAMP; +if (BU_STR_EQUIV(attr, timestamp)) + return ATTR_TIMESTAMP; +if (BU_STR_EQUIV(attr, time_stamp)) + return ATTR_TIMESTAMP; +if (BU_STR_EQUIV(attr, modtime)) + return ATTR_TIMESTAMP; +if (BU_STR_EQUIV(attr, mod_time)) + return ATTR_TIMESTAMP; /* end-standard-attributes-list */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ 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:[58435] brlcad/trunk/src/librt/db5_types.c
Revision: 58435 http://sourceforge.net/p/brlcad/code/58435 Author: tbrowder2 Date: 2013-11-05 23:32:32 + (Tue, 05 Nov 2013) Log Message: --- make single choice for multiple possibilities clearer Modified Paths: -- brlcad/trunk/src/librt/db5_types.c Modified: brlcad/trunk/src/librt/db5_types.c === --- brlcad/trunk/src/librt/db5_types.c 2013-11-05 23:26:19 UTC (rev 58434) +++ brlcad/trunk/src/librt/db5_types.c 2013-11-05 23:32:32 UTC (rev 58435) @@ -365,49 +365,39 @@ if (BU_STR_EQUIV(attr, region)) return ATTR_REGION; -if (BU_STR_EQUIV(attr, region_id)) +if (BU_STR_EQUIV(attr, region_id) + || BU_STR_EQUIV(attr, id)) return ATTR_REGION_ID; -if (BU_STR_EQUIV(attr, id)) - return ATTR_REGION_ID; -if (BU_STR_EQUIV(attr, material_id)) +if (BU_STR_EQUIV(attr, material_id) + || BU_STR_EQUIV(attr, GIFTmater) + || BU_STR_EQUIV(attr, mat)) return ATTR_MATERIAL_ID; -if (BU_STR_EQUIV(attr, GIFTmater)) - return ATTR_MATERIAL_ID; -if (BU_STR_EQUIV(attr, mat)) - return ATTR_MATERIAL_ID; -if (BU_STR_EQUIV(attr, air)) +if (BU_STR_EQUIV(attr, air) + || BU_STR_EQUIV(attr, aircode)) return ATTR_AIR; -if (BU_STR_EQUIV(attr, aircode)) - return ATTR_AIR; if (BU_STR_EQUIV(attr, los)) return ATTR_LOS; -if (BU_STR_EQUIV(attr, color)) +if (BU_STR_EQUIV(attr, color) + || BU_STR_EQUIV(attr, rgb)) return ATTR_COLOR; -if (BU_STR_EQUIV(attr, rgb)) - return ATTR_COLOR; -if (BU_STR_EQUIV(attr, shader)) +if (BU_STR_EQUIV(attr, shader) + || BU_STR_EQUIV(attr, oshader)) return ATTR_SHADER; -if (BU_STR_EQUIV(attr, oshader)) - return ATTR_SHADER; if (BU_STR_EQUIV(attr, inherit)) return ATTR_INHERIT; -if (BU_STR_EQUIV(attr, mtime)) +if (BU_STR_EQUIV(attr, mtime) + || BU_STR_EQUIV(attr, timestamp) + || BU_STR_EQUIV(attr, time_stamp) + || BU_STR_EQUIV(attr, modtime) + ||B U_STR_EQUIV(attr, mod_time)) return ATTR_TIMESTAMP; -if (BU_STR_EQUIV(attr, timestamp)) - return ATTR_TIMESTAMP; -if (BU_STR_EQUIV(attr, time_stamp)) - return ATTR_TIMESTAMP; -if (BU_STR_EQUIV(attr, modtime)) - return ATTR_TIMESTAMP; -if (BU_STR_EQUIV(attr, mod_time)) - return ATTR_TIMESTAMP; /* end-standard-attributes-list */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ 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:[58436] brlcad/trunk/src/librt/db5_types.c
Revision: 58436 http://sourceforge.net/p/brlcad/code/58436 Author: tbrowder2 Date: 2013-11-05 23:34:16 + (Tue, 05 Nov 2013) Log Message: --- oops, space in wrong place Modified Paths: -- brlcad/trunk/src/librt/db5_types.c Modified: brlcad/trunk/src/librt/db5_types.c === --- brlcad/trunk/src/librt/db5_types.c 2013-11-05 23:32:32 UTC (rev 58435) +++ brlcad/trunk/src/librt/db5_types.c 2013-11-05 23:34:16 UTC (rev 58436) @@ -396,7 +396,7 @@ || BU_STR_EQUIV(attr, timestamp) || BU_STR_EQUIV(attr, time_stamp) || BU_STR_EQUIV(attr, modtime) - ||B U_STR_EQUIV(attr, mod_time)) + || BU_STR_EQUIV(attr, mod_time)) return ATTR_TIMESTAMP; /* end-standard-attributes-list */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
