[brlcad-commits] SF.net SVN: brlcad:[60016] brlcad/trunk/src/util
Revision: 60016 http://sourceforge.net/p/brlcad/code/60016 Author: bob1961 Date: 2014-02-28 21:53:29 + (Fri, 28 Feb 2014) Log Message: --- When on windows we need to arrange for stdin, stdout and stderr to be in binary mode. This fixes the breakage of bw-pix and pix-bw on windows. Modified Paths: -- brlcad/trunk/src/util/bw-pix.c brlcad/trunk/src/util/pix-bw.c Modified: brlcad/trunk/src/util/bw-pix.c === --- brlcad/trunk/src/util/bw-pix.c 2014-02-28 21:50:32 UTC (rev 60015) +++ brlcad/trunk/src/util/bw-pix.c 2014-02-28 21:53:29 UTC (rev 60016) @@ -94,6 +94,12 @@ return 1; } +#if defined(_WIN32) !defined(__CYGWIN__) +setmode(fileno(stdin), O_BINARY); +setmode(fileno(stdout), O_BINARY); +setmode(fileno(stderr), O_BINARY); +#endif + img = icv_read(in_file, ICV_IMAGE_BW, inx, iny); if (img == NULL) return 1; Modified: brlcad/trunk/src/util/pix-bw.c === --- brlcad/trunk/src/util/pix-bw.c 2014-02-28 21:50:32 UTC (rev 60015) +++ brlcad/trunk/src/util/pix-bw.c 2014-02-28 21:53:29 UTC (rev 60016) @@ -150,6 +150,13 @@ bu_log(%s, usage); return 1; } + +#if defined(_WIN32) !defined(__CYGWIN__) +setmode(fileno(stdin), O_BINARY); +setmode(fileno(stdout), O_BINARY); +setmode(fileno(stderr), O_BINARY); +#endif + img = icv_read(in_file, ICV_IMAGE_PIX, inx, iny); if (img == NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/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:[60074] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 60074
http://sourceforge.net/p/brlcad/code/60074
Author: bob1961
Date: 2014-03-06 12:58:15 + (Thu, 06 Mar 2014)
Log Message:
---
Update Archer::raytracePlus to include ghost objects when computing the eye_pt
for the calls to rtwizard.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2014-03-06 11:54:03 UTC
(rev 60073)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2014-03-06 12:58:15 UTC
(rev 60074)
@@ -1137,7 +1137,25 @@
-w $w -n $n -p $port -c $mColorObjects -g
$mGhostObjects -l $mEdgeObjects \
-G $mRtWizardGhostIntensity -O
$mRtWizardOccMode
} else {
+ $itk_component(ged) refresh_off
+ if {$mGhostObjects != } {
+ set wlist [$itk_component(ged) who]
+ set size [$itk_component(ged) size]
+ set center [$itk_component(ged) center]
+ eval $itk_component(ged) draw $mGhostObjects
+ }
+ set vparams [split [$itk_component(ged) get_eyemodel] \n]
+ if {$mGhostObjects != } {
+ eval $itk_component(ged) erase $mGhostObjects
+ eval $itk_component(ged) draw $wlist
+ $itk_component(ged) size $size
+ $itk_component(ged) center $center
+ }
+ set eye_pt [lrange [concat [regsub {;$} [lindex $vparams 2]
]] 1 end]
+ $itk_component(ged) refresh_on
+
set ret [eval $itk_component(ged) rtwizard \
+ --eye_pt [list $eye_pt] \
-C [list $bcolor] --line-color [list $ecolor] \
--non-line-color [list $necolor] \
-w $w -n $n -p $port -c $mColorObjects -g
$mGhostObjects -l $mEdgeObjects \
@@ -1152,7 +1170,25 @@
-w $w -n $n -p $port -c $mColorObjects -g
$mGhostObjects -l $mEdgeObjects \
-G $mRtWizardGhostIntensity -O $mRtWizardOccMode
} {
+ $itk_component(ged) refresh_off
+ if {$mGhostObjects != } {
+ set wlist [$itk_component(ged) who]
+ set size [$itk_component(ged) size]
+ set center [$itk_component(ged) center]
+ eval $itk_component(ged) draw $mGhostObjects
+ }
+ set vparams [split [$itk_component(ged) get_eyemodel] \n]
+ if {$mGhostObjects != } {
+ eval $itk_component(ged) erase $mGhostObjects
+ eval $itk_component(ged) draw $wlist
+ $itk_component(ged) size $size
+ $itk_component(ged) center $center
+ }
+ set eye_pt [lrange [concat [regsub {;$} [lindex $vparams 2]
]] 1 end]
+ $itk_component(ged) refresh_on
+
eval $itk_component(ged) rtwizard \
+ --eye_pt [list $eye_pt] \
-C [list $bcolor] --line-color [list $ecolor] \
-w $w -n $n -p $port -c $mColorObjects -g
$mGhostObjects -l $mEdgeObjects \
-G $mRtWizardGhostIntensity -O $mRtWizardOccMode
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Subversion Kills Productivity. Get off Subversion Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951iu=/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:[61128] brlcad/trunk/include/ged.h
Revision: 61128
http://sourceforge.net/p/brlcad/code/61128
Author: bob1961
Date: 2014-06-04 21:43:49 + (Wed, 04 Jun 2014)
Log Message:
---
Added gdps_data_vZ to type ged_data_polygon_state.
Modified Paths:
--
brlcad/trunk/include/ged.h
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2014-06-04 21:16:22 UTC (rev 61127)
+++ brlcad/trunk/include/ged.h 2014-06-04 21:43:49 UTC (rev 61128)
@@ -377,6 +377,7 @@
mat_t gdps_view2model;
mat_t gdps_model2view;
ged_polygons gdps_polygons;
+fastf_tgdps_data_vZ;
} ged_data_polygon_state;
struct ged_grid_state {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Learn Graph Databases - Download FREE O'Reilly Book
Graph Databases is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
___
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:[61129] brlcad/trunk/src
Revision: 61129 http://sourceforge.net/p/brlcad/code/61129 Author: bob1961 Date: 2014-06-04 21:47:08 + (Wed, 04 Jun 2014) Log Message: --- Update ged_export_polygon to use the view Z value in ged_data_polygon_state instead of 1.0 Modified Paths: -- brlcad/trunk/src/libged/polyclip.cpp brlcad/trunk/src/libtclcad/tclcad_obj.c Modified: brlcad/trunk/src/libged/polyclip.cpp === --- brlcad/trunk/src/libged/polyclip.cpp2014-06-04 21:43:49 UTC (rev 61128) +++ brlcad/trunk/src/libged/polyclip.cpp2014-06-04 21:47:08 UTC (rev 61129) @@ -297,7 +297,7 @@ /* Project the origin onto the front of the viewing cube */ MAT4X3PNT(vorigin, gdpsp-gdps_model2view, gdpsp-gdps_origin); -vorigin[Z] = 1.0; +vorigin[Z] = gdpsp-gdps_data_vZ; /* Convert back to model coordinates for storage */ MAT4X3PNT(sketch_ip-V, gdpsp-gdps_view2model, vorigin); Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c === --- brlcad/trunk/src/libtclcad/tclcad_obj.c 2014-06-04 21:43:49 UTC (rev 61128) +++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2014-06-04 21:47:08 UTC (rev 61129) @@ -3597,6 +3597,7 @@ gdpsp = gdvp-gdv_view-gv_data_polygons; gdpsp-gdps_scale = gdvp-gdv_view-gv_scale; +gdpsp-gdps_data_vZ = gdvp-gdv_view-gv_data_vZ; VMOVE(gdpsp-gdps_origin, gdvp-gdv_view-gv_center); MAT_COPY(gdpsp-gdps_rotation, gdvp-gdv_view-gv_rotation); MAT_COPY(gdpsp-gdps_model2view, gdvp-gdv_view-gv_model2view); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Learn Graph Databases - Download FREE O'Reilly Book Graph Databases is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech ___ 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:[61267] brlcad/trunk
Revision: 61267 http://sourceforge.net/p/brlcad/code/61267 Author: bob1961 Date: 2014-06-12 13:27:49 + (Thu, 12 Jun 2014) Log Message: --- Mods for compiling on Windows. Modified Paths: -- brlcad/trunk/include/bu/cmd.h brlcad/trunk/src/libbrep/PullbackCurve.cpp Modified: brlcad/trunk/include/bu/cmd.h === --- brlcad/trunk/include/bu/cmd.h 2014-06-12 12:21:45 UTC (rev 61266) +++ brlcad/trunk/include/bu/cmd.h 2014-06-12 13:27:49 UTC (rev 61267) @@ -40,6 +40,7 @@ /* for timeval via windows.h */ #if defined(_WIN32) !defined(__CYGWIN__) # define NOMINMAX +# include winsock.h # include windows.h # include io.h Modified: brlcad/trunk/src/libbrep/PullbackCurve.cpp === --- brlcad/trunk/src/libbrep/PullbackCurve.cpp 2014-06-12 12:21:45 UTC (rev 61266) +++ brlcad/trunk/src/libbrep/PullbackCurve.cpp 2014-06-12 13:27:49 UTC (rev 61267) @@ -34,13 +34,13 @@ #include limits #include set #include map +#include string #include brep.h /* interface header */ #include PullbackCurve.h - #define RANGE_HI 0.55 #define RANGE_LO 0.45 #define UNIVERSAL_SAMPLE_COUNT 1001 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions Find What Matters Most in Your Big Data with HPCC Systems Open Source. Fast. Scalable. Simple. Ideal for Dirty Data. Leverages Graph Analysis for Fast Processing Easy Data Exploration http://p.sf.net/sfu/hpccsystems ___ 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:[61347] brlcad/trunk/src/tclscripts/archer
Revision: 61347
http://sourceforge.net/p/brlcad/code/61347
Author: bob1961
Date: 2014-06-18 18:55:59 + (Wed, 18 Jun 2014)
Log Message:
---
Added code to get around Tcl's file writable somefile failure (i.e., command
always returns 0 when on windows and the file in question is on a remote drive.
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 2014-06-17 21:36:31 UTC
(rev 61346)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2014-06-18 18:55:59 UTC
(rev 61347)
@@ -1716,7 +1716,8 @@
::itcl::body Archer::Load {_target} {
-SetWaitCursor $this
+global tcl_platform
+
if {$mNeedSave} {
askToSave
}
@@ -1739,7 +1740,8 @@
set mDbShared 1
set mDbReadOnly 1
} elseif {[file exists $mTarget]} {
- if {[file writable $mTarget]} {
+ if {[file writable $mTarget] ||
+ ($tcl_platform(platform) == windows ![file attributes $mTarget
-readonly])} {
set mDbReadOnly 0
} else {
set mDbReadOnly 1
@@ -1783,66 +1785,70 @@
}
}
+SetWaitCursor $this
$itk_component(ged) refresh_off
-set mDbTitle [$itk_component(ged) title]
-set mDbUnits [$itk_component(ged) units -s]
-set mPrevObjViewMode $OBJ_ATTR_VIEW_MODE
-set mPrevSelectedObjPath
-set mPrevSelectedObj
-set mSelectedObjPath
-set mSelectedObj
-set mSelectedObjType
-set mColorObjects
-set mGhostObjects
-set mEdgeObjects
+catch {
+ set mDbTitle [$itk_component(ged) title]
+ set mDbUnits [$itk_component(ged) units -s]
+ set mPrevObjViewMode $OBJ_ATTR_VIEW_MODE
+ set mPrevSelectedObjPath
+ set mPrevSelectedObj
+ set mSelectedObjPath
+ set mSelectedObj
+ set mSelectedObjType
+ set mColorObjects
+ set mGhostObjects
+ set mEdgeObjects
-if {!$mViewOnly} {
- initDbAttrView $mTarget
+ if {!$mViewOnly} {
+ initDbAttrView $mTarget
- set mTreeMode $TREE_MODE_TREE
- set mPrevTreeMode $TREE_MODE_TREE
- set mPrevTreeMode2 $TREE_MODE_COLOR_OBJECTS
- toggleTreeView
+ set mTreeMode $TREE_MODE_TREE
+ set mPrevTreeMode $TREE_MODE_TREE
+ set mPrevTreeMode2 $TREE_MODE_COLOR_OBJECTS
+ toggleTreeView
- applyPreferences
- doLighting
- updateWizardMenu
- updateUtilityMenu
- deleteTargetOldCopy
+ applyPreferences
+ doLighting
+ updateWizardMenu
+ updateUtilityMenu
+ deleteTargetOldCopy
- updateCreationButtons 1
- # updateRaytraceButtons 1
+ updateCreationButtons 1
+ # updateRaytraceButtons 1
- buildGroundPlane
- showGroundPlane
-} else {
- applyPreferences
- doLighting
-}
+ buildGroundPlane
+ showGroundPlane
+ } else {
+ applyPreferences
+ doLighting
+ }
-# update the units combobox in the General tab of the preferences panel
-set utypes {}
-foreach utype [split [$itk_component(ged) units -t] , ] {
- lappend utypes [string trim $utype]
-}
-$itk_component(unitsCB) configure \
- -values $utypes \
- -state readonly
+ # update the units combobox in the General tab of the preferences panel
+ set utypes {}
+ foreach utype [split [$itk_component(ged) units -t] , ] {
+ lappend utypes [string trim $utype]
+ }
+ $itk_component(unitsCB) configure \
+ -values $utypes \
+ -state readonly
-# refresh tree contents
-rebuildTree
+ # refresh tree contents
+ rebuildTree
-if {$mBindingMode == Default} {
- set mDefaultBindingMode $VIEW_ROTATE_MODE
- beginViewRotate
+ if {$mBindingMode == Default} {
+ set mDefaultBindingMode $VIEW_ROTATE_MODE
+ beginViewRotate
+ }
+
+ set mSavedCenter
+ set mSavedViewEyePt
+ set mSavedSize
+
+ $itk_component(ged) edit_motion_delta_callback_all [::itcl::code $this
editMotionDeltaCallback]
}
-set mSavedCenter
-set mSavedViewEyePt
-set mSavedSize
-
-$itk_component(ged) edit_motion_delta_callback_all [::itcl::code $this
editMotionDeltaCallback]
$itk_component(ged) refresh_on
$itk_component(ged) refresh_all
SetNormalCursor $this
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-06-17 21:36:31 UTC
(rev 61346)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2014-06
[brlcad-commits] SF.net SVN: brlcad:[61516] brlcad/trunk
Revision: 61516
http://sourceforge.net/p/brlcad/code/61516
Author: bob1961
Date: 2014-07-02 11:57:39 + (Wed, 02 Jul 2014)
Log Message:
---
Added an fbclear command to libged/libtclcad/Ged.tcl.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/src/libged/CMakeLists.txt
brlcad/trunk/src/libtclcad/tclcad_obj.c
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Added Paths:
---
brlcad/trunk/src/libged/fbclear.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2014-07-02 08:59:13 UTC (rev 61515)
+++ brlcad/trunk/include/ged.h 2014-07-02 11:57:39 UTC (rev 61516)
@@ -1144,6 +1144,11 @@
GED_EXPORT extern int ged_fb2pix(struct ged *gedp, int argc, const char
*argv[]);
/**
+ * Fclear clears a framebuffer.
+ */
+GED_EXPORT extern int ged_fbclear(struct ged *gedp, int argc, const char
*argv[]);
+
+/**
* Find combinations that reference object
*/
GED_EXPORT extern int ged_find(struct ged *gedp, int argc, const char *argv[]);
Modified: brlcad/trunk/src/libged/CMakeLists.txt
===
--- brlcad/trunk/src/libged/CMakeLists.txt 2014-07-02 08:59:13 UTC (rev
61515)
+++ brlcad/trunk/src/libged/CMakeLists.txt 2014-07-02 11:57:39 UTC (rev
61516)
@@ -100,6 +100,7 @@
facedef.c
facetize.c
fb2pix.c
+ fbclear.c
find.c
form.c
fracture.c
Added: brlcad/trunk/src/libged/fbclear.c
===
--- brlcad/trunk/src/libged/fbclear.c (rev 0)
+++ brlcad/trunk/src/libged/fbclear.c 2014-07-02 11:57:39 UTC (rev 61516)
@@ -0,0 +1,100 @@
+/*F B C L E A R . C
+ * BRL-CAD
+ *
+ * Copyright (c) 1986-2014 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ *
+ */
+/** @file libged/fbclear.c
+ *
+ * Clear a framebuffer.
+ *
+ */
+
+#include common.h
+
+#include stdlib.h
+#ifdef HAVE_SYS_TYPES_H
+# include sys/types.h
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include sys/stat.h
+#endif
+#ifdef HAVE_WINSOCK_H
+# include winsock.h
+#endif
+#include bio.h
+
+#include fb.h
+#include ged.h
+
+static char usage[] = \
+Usage: fbclear [rgb];
+
+#define FB_CONSTRAIN(_v, _a, _b) \
+(((_v) (_a)) ? ((_v) (_b) ? (_v) : (_b)) : (_a))
+
+int
+ged_fbclear(struct ged *gedp, int argc, const char *argv[])
+{
+int ret;
+unsigned char *clearColor;
+
+GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
+GED_CHECK_FBSERV(gedp, GED_ERROR);
+GED_CHECK_FBSERV_FBP(gedp, GED_ERROR);
+GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
+
+/* initialize result */
+bu_vls_trunc(gedp-ged_result_str, 0);
+
+/* must be wanting help */
+if (argc == 1) {
+ clearColor = PIXEL_NULL;
+} else if (argc == 2) {
+ int r, g, b;
+
+ if (sscanf(argv[1], %d %d %d, r, g, b) != 3) {
+ bu_log(fb_clear: bad color spec - %s, argv[1]);
+ return BRLCAD_ERROR;
+ }
+
+ clearColor[RED] = FB_CONSTRAIN(r, 0, 255);
+ clearColor[GRN] = FB_CONSTRAIN(g, 0, 255);
+ clearColor[BLU] = FB_CONSTRAIN(b, 0, 255);
+} else {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return GED_ERROR;
+}
+
+ret = fb_clear(gedp-ged_fbsp-fbs_fbp, clearColor);
+
+if (ret == BRLCAD_OK)
+ return GED_OK;
+
+return GED_ERROR;
+}
+
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: stroustrup
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/libged/fbclear.c
___
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2014-07-02 08:59:13 UTC (rev
61515)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2014-07-02 11:57:39 UTC (rev
61516)
@@ -1056,6 +1056,7 @@
{facetize, (char *)0, TO_UNLIMITED, to_pass_through_func,
ged_facetize},
{voxelize, (char *)0, TO_UNLIMITED
[brlcad-commits] SF.net SVN: brlcad:[56218] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 56218
http://sourceforge.net/p/brlcad/code/56218
Author: bob1961
Date: 2013-07-25 17:02:27 + (Thu, 25 Jul 2013)
Log Message:
---
Added ArcherCore::updatePrimitiveLabels (used by ArcherCore::kill and
ArcherCore::killall to update cadwidgets::Ged's -primitiveLabels option before
calling kill/killall.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-07-25 16:59:28 UTC
(rev 56217)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-07-25 17:02:27 UTC
(rev 56218)
@@ -970,6 +970,7 @@
method watchVar {_name1 _name2 _op}
method accordianCallback {_item _state}
+ method updatePrimitiveLabels {args}
}
}
@@ -6457,11 +6458,38 @@
eval gedWrapper item 0 0 1 0 $args
}
+::itcl::body ArcherCore::updatePrimitiveLabels {args} {
+if {![info exists itk_component(ged)]} {
+ return
+}
+
+set plist [$itk_component(ged) cget -primitiveLabels]
+if {[llength $plist] 0} {
+ set tail_plist {}
+ foreach item $plist {
+ lappend tail_plist [file tail $item]
+ }
+
+ foreach item [eval gedCmd kill -n $args] {
+ set item [string trim $item]
+ set i [lsearch $tail_plist $item]
+ if {$i != -1} {
+ set plist [lreplace $plist $i $i]
+ set tail_plist [lreplace $tail_plist $i $i]
+ }
+ }
+
+ $itk_component(ged) configure -primitiveLabels $plist
+}
+}
+
::itcl::body ArcherCore::kill {args} {
+eval updatePrimitiveLabels $args
eval gedWrapper kill 1 0 1 2 $args
}
::itcl::body ArcherCore::killall {args} {
+eval updatePrimitiveLabels $args
eval gedWrapper killall 1 0 1 2 $args
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/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:[56223] brlcad/trunk/src/tclscripts/archer
Revision: 56223
http://sourceforge.net/p/brlcad/code/56223
Author: bob1961
Date: 2013-07-25 18:47:11 + (Thu, 25 Jul 2013)
Log Message:
---
Set the environment's LIBRT_BOT_MINTIE if changing the respective preference in
Archer. Also, initialize Archer's mRtBotMintie preference if the environment
has LIBRT_BOT_MINTIE set. This overrides Archer's preference.
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 2013-07-25 18:47:04 UTC
(rev 56222)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2013-07-25 18:47:11 UTC
(rev 56223)
@@ -9204,6 +9204,11 @@
}
}
+if {[info exists env(LIBRT_BOT_MINTIE)]} {
+ # triggers a set of librt's global tcl variable (i.e., rt_bot_mintie)
via ArcherCore::watchVar{}
+ set mRtBotMintie $env(LIBRT_BOT_MINTIE)
+}
+
# This feature has been disabled.
set mTreeAttrColumns
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-07-25 18:47:04 UTC
(rev 56222)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-07-25 18:47:11 UTC
(rev 56223)
@@ -7201,6 +7201,7 @@
::itcl::body ArcherCore::watchVar {_name1 _name2 _op} {
global rt_bot_mintie
+global env
if {![info exists itk_component(ged)]} {
return
@@ -7264,6 +7265,7 @@
}
mRtBotMintie {
set rt_bot_mintie $mRtBotMintie
+ set env(LIBRT_BOT_MINTIE) $mRtBotMintie
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/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:[57902] brlcad/trunk/src/libged/rtwizard.c
Revision: 57902
http://sourceforge.net/p/brlcad/code/57902
Author: bob1961
Date: 2013-09-26 10:48:05 + (Thu, 26 Sep 2013)
Log Message:
---
This fixes a path with spaces issue on windows for rtwizard.
Modified Paths:
--
brlcad/trunk/src/libged/rtwizard.c
Modified: brlcad/trunk/src/libged/rtwizard.c
===
--- brlcad/trunk/src/libged/rtwizard.c 2013-09-26 00:12:54 UTC (rev 57901)
+++ brlcad/trunk/src/libged/rtwizard.c 2013-09-26 10:48:05 UTC (rev 57902)
@@ -231,6 +231,7 @@
const char *bin;
char rt[256] = {0};
+char rtscript[256] = {0};
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_DRAWABLE(gedp, GED_ERROR);
@@ -241,21 +242,21 @@
bu_vls_trunc(gedp-ged_result_str, 0);
if (gedp-ged_gvp-gv_perspective 0)
- /* rtwizard --no_gui -perspective p -i db.g --viewsize size
--orientation A B C D} --eye_pt X Y Z */
- args = argc + 1 + 1 + 2 + 2 + 2 + 2 + 2;
+ /* btclsh rtwizard --no_gui -perspective p -i db.g --viewsize size
--orientation A B C D} --eye_pt X Y Z */
+ args = argc + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 2;
else
- /* rtwizard --no_gui -i db.g --viewsize size --orientation A B C D}
--eye_pt X Y Z */
- args = argc + 1 + 1 + 2 + 2 + 2 + 2;
+ /* btclsh rtwizard --no_gui -i db.g --viewsize size --orientation A B
C D} --eye_pt X Y Z */
+ args = argc + 1 + 1 + 1 + 2 + 2 + 2 + 2;
gedp-ged_gdp-gd_rt_cmd = (char **)bu_calloc(args, sizeof(char *), alloc
gd_rt_cmd);
bin = bu_brlcad_root(bin, 1);
if (bin) {
-#ifdef _WIN32
- snprintf(rt, 256, %s/rtwizard.bat, bin);
-#else
- snprintf(rt, 256, %s/rtwizard, bin);
-#endif
+ snprintf(rt, 256, %s/btclsh, bin);
+ snprintf(rtscript, 256, %s/rtwizard, bin);
+} else {
+ snprintf(rt, 256, btclsh);
+ snprintf(rtscript, 256, rtwizard);
}
_ged_rt_set_eye_model(gedp, eye_model);
@@ -267,6 +268,7 @@
vp = gedp-ged_gdp-gd_rt_cmd[0];
*vp++ = rt;
+*vp++ = rtscript;
*vp++ = --no-gui;
*vp++ = --viewsize;
*vp++ = bu_vls_addr(size_vls);
@@ -282,17 +284,7 @@
}
*vp++ = -i;
-/* XXX why is this different for win32 only? */
-#ifdef _WIN32
-{
- char buf[512];
-
- snprintf(buf, 512, \%s\, gedp-ged_wdbp-dbip-dbi_filename);
- *vp++ = buf;
-}
-#else
*vp++ = gedp-ged_wdbp-dbip-dbi_filename;
-#endif
/* Append all args */
for (i = 1; i argc; i++)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/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:[58295] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 58295
http://sourceforge.net/p/brlcad/code/58295
Author: bob1961
Date: 2013-10-25 13:27:20 + (Fri, 25 Oct 2013)
Log Message:
---
Fixed a bug that breaks ArcherCore::redrawWho. This appears to have been
introduced in r56397.
Revision Links:
--
http://sourceforge.net/p/brlcad/code/56397
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-10-25 12:49:09 UTC
(rev 58294)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-10-25 13:27:20 UTC
(rev 58295)
@@ -1601,7 +1601,7 @@
set rmode [lindex $rdata 0]
set rtrans [lindex $rdata 1]
- if [ $rmode == $DISPLAY_MODE_HIDDEN ] {
+ if {$rmode == $DISPLAY_MODE_HIDDEN} {
gedCmd draw -h $obj
} else {
gedCmd draw -m$rmode -x$rtrans $obj
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60135991iu=/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:[58296] brlcad/trunk/src/libged/open.c
Revision: 58296
http://sourceforge.net/p/brlcad/code/58296
Author: bob1961
Date: 2013-10-25 17:10:32 + (Fri, 25 Oct 2013)
Log Message:
---
Updated ged_reopen to properly set the rt material head. This would have
impacted Archer and its ilk.
Modified Paths:
--
brlcad/trunk/src/libged/open.c
Modified: brlcad/trunk/src/libged/open.c
===
--- brlcad/trunk/src/libged/open.c 2013-10-25 13:27:20 UTC (rev 58295)
+++ brlcad/trunk/src/libged/open.c 2013-10-25 17:10:32 UTC (rev 58296)
@@ -36,7 +36,7 @@
int
ged_reopen(struct ged *gedp, int argc, const char *argv[])
{
-struct db_i *dbip;
+struct db_i *new_dbip;
static const char *usage = [filename];
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
@@ -54,12 +54,25 @@
/* set database filename */
if (argc == 2) {
char *av[2];
+ struct db_i *old_dbip = gedp-ged_wdbp-dbip;
+ struct mater *old_materp = rt_material_head();
+struct mater *new_materp;
- if ((dbip = _ged_open_dbip(argv[1], 0)) == DBI_NULL) {
+ rt_new_material_head(MATER_NULL);
+
+ if ((new_dbip = _ged_open_dbip(argv[1], 0)) == DBI_NULL) {
+ /* Restore RT's material head */
+ rt_new_material_head(old_materp);
+
bu_vls_printf(gedp-ged_result_str, ged_reopen: failed to open
%s\n, argv[1]);
return GED_ERROR;
}
+ new_materp = rt_material_head();
+
+ gedp-ged_wdbp-dbip = old_dbip;
+rt_new_material_head(old_materp);
+
av[0] = zap;
av[1] = (char *)0;
ged_zap(gedp, 1, (const char **)av);
@@ -67,7 +80,8 @@
/* close current database */
db_close(gedp-ged_wdbp-dbip);
- gedp-ged_wdbp-dbip = dbip;
+ gedp-ged_wdbp-dbip = new_dbip;
+ rt_new_material_head(new_materp);
bu_vls_printf(gedp-ged_result_str, %s,
gedp-ged_wdbp-dbip-dbi_filename);
return GED_OK;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60135991iu=/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:[58340] brlcad/trunk/src/libdm/scale.c
Revision: 58340 http://sourceforge.net/p/brlcad/code/58340 Author: bob1961 Date: 2013-10-29 15:33:55 + (Tue, 29 Oct 2013) Log Message: --- Insure that the scale line is drawn using solid lines. Modified Paths: -- brlcad/trunk/src/libdm/scale.c Modified: brlcad/trunk/src/libdm/scale.c === --- brlcad/trunk/src/libdm/scale.c 2013-10-29 15:28:28 UTC (rev 58339) +++ brlcad/trunk/src/libdm/scale.c 2013-10-29 15:33:55 UTC (rev 58340) @@ -47,7 +47,13 @@ fastf_t xpos1, xpos2; fastf_t ypos1, ypos2; struct bu_vls vls = BU_VLS_INIT_ZERO; +/* Save the line attributes */ +int saveLineWidth = dmp-dm_lineWidth; +int saveLineStyle = dmp-dm_lineStyle; +/* Draw solid lines */ +DM_SET_LINE_ATTR(dmp, dmp-dm_lineWidth, 0); /* solid lines */ + bu_vls_printf(vls, %g, viewSize*0.5); soffset = (int)(strlen(bu_vls_addr(vls)) * 0.5); @@ -74,6 +80,9 @@ ypos1 + 0.02, 1, 0); bu_vls_free(vls); + +/* Restore the line attributes */ +DM_SET_LINE_ATTR(dmp, saveLineWidth, saveLineStyle); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Android is increasing in popularity, but the open development platform that developers love is also attractive to malware creators. Download this white paper to learn more about secure code signing practices that can help keep Android apps secure. http://pubads.g.doubleclick.net/gampad/clk?id=65839951iu=/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:[58341] brlcad/trunk/src/libtclcad/tclcad_obj.c
Revision: 58341
http://sourceforge.net/p/brlcad/code/58341
Author: bob1961
Date: 2013-10-29 15:34:57 + (Tue, 29 Oct 2013)
Log Message:
---
Draw the scale text using the view parameter color settings.
Modified Paths:
--
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-10-29 15:33:55 UTC (rev
58340)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-10-29 15:34:57 UTC (rev
58341)
@@ -13341,12 +13341,13 @@
gdvp-gdv_view-gv_view_axes.gas_axes_pos[Y] = save_ypos;
}
+
/* View scale */
if (gdvp-gdv_view-gv_view_scale.gos_draw)
dm_draw_scale(gdvp-gdv_dmp,
gdvp-gdv_view-gv_size*gop-go_gedp-ged_wdbp-dbip-dbi_base2local,
gdvp-gdv_view-gv_view_scale.gos_line_color,
- gdvp-gdv_view-gv_view_scale.gos_text_color);
+ gdvp-gdv_view-gv_view_params.gos_text_color);
/* View parameters */
if (gdvp-gdv_view-gv_view_params.gos_draw) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951iu=/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:[58345] brlcad/trunk/src/libtclcad/tclcad_obj.c
Revision: 58345
http://sourceforge.net/p/brlcad/code/58345
Author: bob1961
Date: 2013-10-29 18:01:31 + (Tue, 29 Oct 2013)
Log Message:
---
Updated go_dm_draw_polys() to draw the target polygon last.
Modified Paths:
--
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-10-29 16:56:35 UTC (rev
58344)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-10-29 18:01:31 UTC (rev
58345)
@@ -13156,10 +13156,40 @@
}
+#define GO_DM_DRAW_POLY(_dmp, _gdpsp, _i, _last_poly, _mode) { \
+ size_t _j; \
+\
+ /* set color */ \
+ (void)DM_SET_FGCOLOR((_dmp), \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_color[0], \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_color[1], \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_color[2], \
+1, 1.0); \
+\
+ /* set the linewidth and linestyle for polygon i */ \
+ (void)DM_SET_LINE_ATTR((_dmp), \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_line_width, \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_line_style); \
+\
+ for (_j = 0; _j
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_num_contours; ++_j) { \
+ size_t _last =
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_contour[_j].gpc_num_points-1; \
+\
+ (void)DM_DRAW_LINES_3D((_dmp), \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_contour[_j].gpc_num_points, \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_contour[_j].gpc_point, 1); \
+\
+ if (_mode != TCLCAD_POLY_CONTOUR_MODE || _i != _last_poly ||
(_gdpsp)-gdps_cflag == 0) { \
+ (void)DM_DRAW_LINE_3D((_dmp), \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_contour[_j].gpc_point[_last], \
+
(_gdpsp)-gdps_polygons.gp_polygon[_i].gp_contour[_j].gpc_point[0]); \
+ } \
+ }}
+
+
HIDDEN void
go_dm_draw_polys(struct dm *dmp, ged_data_polygon_state *gdpsp, int mode)
{
-register size_t i, j, last_poly;
+register size_t i, last_poly;
int saveLineWidth;
int saveLineStyle;
@@ -13171,33 +13201,15 @@
last_poly = gdpsp-gdps_polygons.gp_num_polygons - 1;
for (i = 0; i gdpsp-gdps_polygons.gp_num_polygons; ++i) {
- /* set color */
- (void)DM_SET_FGCOLOR(dmp,
- gdpsp-gdps_polygons.gp_polygon[i].gp_color[0],
- gdpsp-gdps_polygons.gp_polygon[i].gp_color[1],
- gdpsp-gdps_polygons.gp_polygon[i].gp_color[2],
- 1, 1.0);
+ if (i == gdpsp-gdps_target_polygon_i)
+ continue;
- /* set the linewidth and linestyle for polygon i */
- (void)DM_SET_LINE_ATTR(dmp,
-gdpsp-gdps_polygons.gp_polygon[i].gp_line_width,
-gdpsp-gdps_polygons.gp_polygon[i].gp_line_style);
+ GO_DM_DRAW_POLY(dmp, gdpsp, i, last_poly, mode);
+}
- for (j = 0; j gdpsp-gdps_polygons.gp_polygon[i].gp_num_contours;
++j) {
- size_t last =
gdpsp-gdps_polygons.gp_polygon[i].gp_contour[j].gpc_num_points-1;
+/* draw the target poly last */
+GO_DM_DRAW_POLY(dmp, gdpsp, gdpsp-gdps_target_polygon_i, last_poly, mode);
- (void)DM_DRAW_LINES_3D(dmp,
-
gdpsp-gdps_polygons.gp_polygon[i].gp_contour[j].gpc_num_points,
-
gdpsp-gdps_polygons.gp_polygon[i].gp_contour[j].gpc_point, 1);
-
- if (mode != TCLCAD_POLY_CONTOUR_MODE || i != last_poly ||
gdpsp-gdps_cflag == 0) {
- (void)DM_DRAW_LINE_3D(dmp,
-
gdpsp-gdps_polygons.gp_polygon[i].gp_contour[j].gpc_point[last],
-
gdpsp-gdps_polygons.gp_polygon[i].gp_contour[j].gpc_point[0]);
- }
- }
-}
-
/* Restore the line attributes */
(void)DM_SET_LINE_ATTR(dmp, saveLineWidth, saveLineStyle);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951iu=/4140/ostg.clktrk
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
[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:[58479] brlcad/trunk/src/libtclcad/tclcad_obj.c
Revision: 58479
http://sourceforge.net/p/brlcad/code/58479
Author: bob1961
Date: 2013-11-07 18:16:03 + (Thu, 07 Nov 2013)
Log Message:
---
Added the functionality to scale data arrows and labels.
Modified Paths:
--
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-11-07 17:46:00 UTC (rev
58478)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-11-07 18:16:03 UTC (rev
58479)
@@ -488,6 +488,12 @@
ged_func_ptr func,
const char *usage,
int maxargs);
+HIDDEN int to_mouse_data_scale(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
HIDDEN int to_mouse_scale(struct ged *gedp,
int argc,
const char *argv[],
@@ -725,6 +731,12 @@
ged_func_ptr func,
const char *usage,
int maxargs);
+HIDDEN int to_data_scale_mode(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
HIDDEN int to_scale_mode(struct ged *gedp,
int argc,
const char *argv[],
@@ -979,6 +991,7 @@
{data_move_object_mode, x y, TO_UNLIMITED, to_data_move_object_mode,
GED_FUNC_PTR_NULL},
{data_move_point_mode, x y, TO_UNLIMITED, to_data_move_point_mode,
GED_FUNC_PTR_NULL},
{data_pick, ???, TO_UNLIMITED, to_data_pick, GED_FUNC_PTR_NULL},
+{data_scale_mode,x y, TO_UNLIMITED, to_data_scale_mode,
GED_FUNC_PTR_NULL},
{dbconcat, (char *)0, TO_UNLIMITED, to_pass_through_func,
ged_concat},
{dbfind, (char *)0, TO_UNLIMITED, to_pass_through_func, ged_find},
{dbip, (char *)0, TO_UNLIMITED, to_pass_through_func, ged_dbip},
@@ -1104,6 +1117,7 @@
{mouse_append_pipept,obj mx my, TO_UNLIMITED,
to_mouse_append_pt_common, ged_append_pipept},
{mouse_constrain_rot,coord mx my, TO_UNLIMITED,
to_mouse_constrain_rot, GED_FUNC_PTR_NULL},
{mouse_constrain_trans, coord mx my, TO_UNLIMITED,
to_mouse_constrain_trans, GED_FUNC_PTR_NULL},
+{mouse_data_scale, mx my, TO_UNLIMITED, to_mouse_data_scale,
GED_FUNC_PTR_NULL},
{mouse_find_arb_edge,obj mx my ptol, TO_UNLIMITED,
to_mouse_find_arb_edge, GED_FUNC_PTR_NULL},
{mouse_find_bot_edge,obj mx my, TO_UNLIMITED,
to_mouse_find_bot_edge, GED_FUNC_PTR_NULL},
{mouse_find_botpt, obj mx my, TO_UNLIMITED, to_mouse_find_botpt,
GED_FUNC_PTR_NULL},
@@ -4641,7 +4655,93 @@
return GED_ERROR;
}
+/*
+ * Usage: data_scale vname dtype sf
+ */
+HIDDEN int
+to_data_scale(struct ged *gedp,
+int argc,
+const char *argv[],
+ged_func_ptr UNUSED(func),
+const char *usage,
+int UNUSED(maxargs))
+{
+register int i;
+struct ged_dm_view *gdvp;
+fastf_t sf;
+/* initialize result */
+bu_vls_trunc(gedp-ged_result_str, 0);
+
+/* must be wanting help */
+if (argc == 1) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return GED_HELP;
+}
+
+if (argc != 3) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return GED_ERROR;
+}
+
+for (BU_LIST_FOR(gdvp, ged_dm_view,
current_top-to_gop-go_head_views.l)) {
+ if (BU_STR_EQUAL(bu_vls_addr(gdvp-gdv_name), argv[1]))
+ break;
+}
+
+if (BU_LIST_IS_HEAD(gdvp-l, current_top-to_gop-go_head_views.l)) {
+ bu_vls_printf(gedp-ged_result_str, View not found - %s, argv[1]);
+ return GED_ERROR;
+}
+
+if (bu_sscanf(argv[2], %lf, sf) != 1 || sf 0) {
+ bu_vls_printf(gedp-ged_result_str, Invalid scale factor - %s,
argv[2]);
+ return GED_ERROR;
+}
+
+/* scale data arrows */
+{
+ struct ged_data_arrow_state *gdasp = gdvp-gdv_view-gv_data_arrows;
+ point_t vcenter = {0, 0, 0};
+
+ /* Scale the length of each arrow */
+ for (i = 0; i gdasp-gdas_num_points; i += 2) {
+ vect_t diff;
+ point_t vpoint;
+
+ MAT4X3PNT(vpoint, gedp-ged_gvp-gv_model2view,
gdasp-gdas_points[i]);
+ vcenter[Z] = vpoint[Z];
+ VSUB2(diff, vpoint, vcenter);
+ VSCALE(diff, diff, sf);
+ VADD2(vpoint, vcenter, diff);
+ MAT4X3PNT(gdasp-gdas_points[i], gedp-ged_gvp-gv_view2model,
vpoint
[brlcad-commits] SF.net SVN: brlcad:[58480] brlcad/trunk/src/tclscripts/lib/Ged.tcl
Revision: 58480
http://sourceforge.net/p/brlcad/code/58480
Author: bob1961
Date: 2013-11-07 18:25:21 + (Thu, 07 Nov 2013)
Log Message:
---
Added the itcl interface to libtclcad's data scaling functionality.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2013-11-07 18:16:03 UTC (rev
58479)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2013-11-07 18:25:21 UTC (rev
58480)
@@ -194,6 +194,7 @@
method data_move_object_mode {_pane _x _y}
method data_move_point_mode {_pane _x _y}
method data_pick {args}
+ method data_scale_mode {args}
method dbconcat {args}
method dbfind {args}
method dbip {args}
@@ -397,6 +398,7 @@
method pane_center {_pane args}
method pane_constrain_rmode {_pane args}
method pane_constrain_tmode {_pane args}
+ method pane_data_scale_mode {_pane args}
method pane_eye {_pane args}
method pane_eye_pos {_pane args}
method pane_fb2pix {_pane args}
@@ -692,6 +694,7 @@
method begin_data_poly_cont {}
method begin_data_poly_ell {}
method begin_data_poly_rect {}
+ method begin_data_scale {_pane}
method begin_view_measure {_pane _part1_button _part1_button _x _y}
method begin_view_measure_part2 {_pane _button _x _y}
method default_views {}
@@ -705,6 +708,7 @@
method end_data_poly_cont {_pane {_button 1}}
method end_data_poly_ell {_pane {_button 1}}
method end_data_poly_rect {_pane {_button 1}}
+ method end_data_scale {_pane}
method end_view_measure {_pane _part1_button _part2_button}
method end_view_measure_part2 {_pane _button}
method end_view_rect {_pane {_button 1} {_pflag 0} {_bot }}
@@ -728,6 +732,7 @@
method init_data_move_object {{_button 1}}
method init_data_move_point {{_button 1}}
method init_data_pick {{_button 1}}
+ method init_data_scale {{_button 1}}
method init_data_poly_circ {{_button 1}}
method init_data_poly_cont {{_button 1}}
method init_data_poly_ell {{_button 1}}
@@ -783,6 +788,10 @@
method clear_end_data_move_callback_list {}
method delete_end_data_move_callback {_callback}
+ method add_end_data_scale_callback {_callback}
+ method clear_end_data_scale_callback_list {}
+ method delete_end_data_scale_callback {_callback}
+
method add_mouse_data_callback {_callback}
method clear_mouse_data_callback_list {}
method delete_mouse_data_callback {_callback}
@@ -870,6 +879,7 @@
variable mEndDataArrowCallbacks
variable mEndDataLineCallbacks
variable mEndDataMoveCallbacks
+ variable mEndDataScaleCallbacks
variable mMouseDataCallbacks
variable mMouseRayCallbacks
variable mPrevGedMouseX 0
@@ -1542,6 +1552,10 @@
eval $mGed data_pick $itk_component($itk_option(-pane)) $args
}
+::itcl::body cadwidgets::Ged::data_scale_mode {args} {
+eval $mGed data_scale_mode $itk_component($itk_option(-pane)) $args
+}
+
::itcl::body cadwidgets::Ged::dbconcat {args} {
eval $mGed dbconcat $args
}
@@ -2549,6 +2563,10 @@
eval $mGed constrain_tmode $itk_component($_pane) $args
}
+::itcl::body cadwidgets::Ged::pane_data_scale_mode {_pane args} {
+eval $mGed data_scale_mode $itk_component($_pane) $args
+}
+
::itcl::body cadwidgets::Ged::pane_eye {_pane args} {
eval $mGed eye $itk_component($_pane) $args
}
@@ -4103,6 +4121,13 @@
}
+::itcl::body cadwidgets::Ged::begin_data_scale {_pane} {
+# Temporarily turn off view callbacks
+set mSaveViewCallbacks($_pane) [$mGed view_callback $itk_component($_pane)]
+$mGed view_callback $itk_component($_pane)
+}
+
+
::itcl::body cadwidgets::Ged::begin_view_measure {_pane _part1_button
_part2_button _x _y} {
measure_line_erase
@@ -4463,6 +4488,25 @@
}
+::itcl::body cadwidgets::Ged::end_data_scale {_pane} {
+set svcallback [$mGed view_callback $itk_component($_pane)]
+$mGed view_callback $itk_component($_pane)
+
+$mGed idle_mode $itk_component($_pane)
+
+refresh_off
+
+foreach callback $mEndDataScaleCallbacks {
+ catch {$callback}
+}
+
+refresh_on
+refresh_all
+
+$mGed view_callback $itk_component($_pane) $svcallback
+}
+
+
::itcl::body cadwidgets::Ged::end_view_measure {_pane _part1_button
_part2_button} {
$mGed idle_mode $itk_component($_pane)
@@ -4790,6 +4834,16 @@
}
+::itcl::body cadwidgets::Ged::init_data_scale {{_button 1}} {
+measure_line_erase
+
+foreach dm {ur ul ll lr} {
+ bind $itk_component($dm) $_button $mGed data_scale_mode
$itk_component($dm) %x %y; focus %W; break
+ bind $itk_component($dm) ButtonRelease-$_button [::itcl
[brlcad-commits] SF.net SVN: brlcad:[58811] brlcad/trunk/src/libged/polyclip.cpp
Revision: 58811
http://sourceforge.net/p/brlcad/code/58811
Author: bob1961
Date: 2013-12-04 11:53:58 + (Wed, 04 Dec 2013)
Log Message:
---
Since polygon clipping is happening in 2d, remember the view Z for later use
when converting back to 3d.
Modified Paths:
--
brlcad/trunk/src/libged/polyclip.cpp
Modified: brlcad/trunk/src/libged/polyclip.cpp
===
--- brlcad/trunk/src/libged/polyclip.cpp2013-12-03 23:10:37 UTC (rev
58810)
+++ brlcad/trunk/src/libged/polyclip.cpp2013-12-04 11:53:58 UTC (rev
58811)
@@ -51,11 +51,12 @@
};
-static void
+static fastf_t
load_polygon(ClipperLib::Clipper clipper, ClipperLib::PolyType ptype,
ged_polygon *gpoly, fastf_t sf, matp_t mat)
{
register size_t j, k, n;
ClipperLib::Polygon curr_poly;
+fastf_t vZ = 1.0;
for (j = 0; j gpoly-gp_num_contours; ++j) {
n = gpoly-gp_contour[j].gpc_num_points;
@@ -65,6 +66,7 @@
/* Convert to view coordinates */
MAT4X3PNT(vpoint, mat, gpoly-gp_contour[j].gpc_point[k]);
+ vZ = vpoint[Z];
curr_poly[k].X = (ClipperLib::long64)(vpoint[X] * sf);
curr_poly[k].Y = (ClipperLib::long64)(vpoint[Y] * sf);
@@ -76,15 +78,20 @@
bu_log(Exception thrown by clipper\n);
}
}
+
+return vZ;
}
-static void
+static fastf_t
load_polygons(ClipperLib::Clipper clipper, ClipperLib::PolyType ptype,
ged_polygons *subj, fastf_t sf, matp_t mat)
{
register size_t i;
+fastf_t vZ = 1.0;
for (i = 0; i subj-gp_num_polygons; ++i)
- load_polygon(clipper, ptype, subj-gp_polygon[i], sf, mat);
+ vZ = load_polygon(clipper, ptype, subj-gp_polygon[i], sf, mat);
+
+return vZ;
}
@@ -92,7 +99,7 @@
* Process/extract the clipper_polys into a ged_polygon.
*/
static ged_polygon *
-extract(ClipperLib::ExPolygons clipper_polys, fastf_t sf, matp_t mat)
+extract(ClipperLib::ExPolygons clipper_polys, fastf_t sf, matp_t mat, fastf_t
vZ)
{
register size_t i, j, k, n;
size_t num_contours = 0;
@@ -123,7 +130,7 @@
sizeof(point_t), gpc_point);
for (j = 0; j result_poly-gp_contour[n].gpc_num_points; ++j) {
- VSET(vpoint, (fastf_t)(clipper_polys[i].outer[j].X) * sf,
(fastf_t)(clipper_polys[i].outer[j].Y) * sf, 1.0);
+ VSET(vpoint, (fastf_t)(clipper_polys[i].outer[j].X) * sf,
(fastf_t)(clipper_polys[i].outer[j].Y) * sf, vZ);
/* Convert to model coordinates */
MAT4X3PNT(result_poly-gp_contour[n].gpc_point[j], mat, vpoint);
@@ -138,7 +145,7 @@
sizeof(point_t), gpc_point);
for (k = 0; k result_poly-gp_contour[n].gpc_num_points; ++k) {
- VSET(vpoint, (fastf_t)(clipper_polys[i].holes[j][k].X) * sf,
(fastf_t)(clipper_polys[i].holes[j][k].Y) * sf, 1.0);
+ VSET(vpoint, (fastf_t)(clipper_polys[i].holes[j][k].X) * sf,
(fastf_t)(clipper_polys[i].holes[j][k].Y) * sf, vZ);
/* Convert to model coordinates */
MAT4X3PNT(result_poly-gp_contour[n].gpc_point[k], mat, vpoint);
@@ -156,6 +163,7 @@
ged_clip_polygon(GedClipType op, ged_polygon *subj, ged_polygon *clip, fastf_t
sf, matp_t model2view, matp_t view2model)
{
fastf_t inv_sf;
+fastf_t vZ;
ClipperLib::Clipper clipper;
ClipperLib::ExPolygons result_clipper_polys;
ClipperLib::ClipType ctOp;
@@ -168,7 +176,7 @@
load_polygon(clipper, ClipperLib::ptSubject, subj, sf, model2view);
/* Load clip polygon into clipper */
-load_polygon(clipper, ClipperLib::ptClip, clip, sf, model2view);
+vZ = load_polygon(clipper, ClipperLib::ptClip, clip, sf, model2view);
/* Convert op from BRL-CAD to Clipper */
switch (op) {
@@ -190,7 +198,7 @@
clipper.Execute(ctOp, result_clipper_polys, ClipperLib::pftEvenOdd,
ClipperLib::pftEvenOdd);
inv_sf = 1.0/sf;
-return extract(result_clipper_polys, inv_sf, view2model);
+return extract(result_clipper_polys, inv_sf, view2model, vZ);
}
@@ -198,6 +206,7 @@
ged_clip_polygons(GedClipType op, ged_polygons *subj, ged_polygons *clip,
fastf_t sf, matp_t model2view, matp_t view2model)
{
fastf_t inv_sf;
+fastf_t vZ;
ClipperLib::Clipper clipper;
ClipperLib::ExPolygons result_clipper_polys;
ClipperLib::ClipType ctOp;
@@ -210,7 +219,7 @@
load_polygons(clipper, ClipperLib::ptSubject, subj, sf, model2view);
/* Load clip polygons into clipper */
-load_polygons(clipper, ClipperLib::ptClip, clip, sf, model2view);
+vZ = load_polygons(clipper, ClipperLib::ptClip, clip, sf, model2view);
/* Convert op from BRL-CAD to Clipper */
switch (op) {
@@ -232,9 +241,10 @@
clipper.Execute(ctOp, result_clipper_polys, ClipperLib::pftEvenOdd,
ClipperLib::pftEvenOdd);
inv_sf = 1.0/sf;
-return extract(result_clipper_polys
[brlcad-commits] SF.net SVN: brlcad:[58812] brlcad/trunk
Revision: 58812
http://sourceforge.net/p/brlcad/code/58812
Author: bob1961
Date: 2013-12-04 12:32:38 + (Wed, 04 Dec 2013)
Log Message:
---
Added the ability to create polygons in an XY plane other than the one at
viewZ=1.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/src/libged/ged.c
brlcad/trunk/src/libtclcad/tclcad_obj.c
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2013-12-04 11:53:58 UTC (rev 58811)
+++ brlcad/trunk/include/ged.h 2013-12-04 12:32:38 UTC (rev 58812)
@@ -537,6 +537,7 @@
intgv_y_samples;
fastf_tgv_point_scale;
fastf_tgv_curve_scale;
+fastf_tgv_data_vZ;
};
Modified: brlcad/trunk/src/libged/ged.c
===
--- brlcad/trunk/src/libged/ged.c 2013-12-04 11:53:58 UTC (rev 58811)
+++ brlcad/trunk/src/libged/ged.c 2013-12-04 12:32:38 UTC (rev 58812)
@@ -286,6 +286,8 @@
VSET(gvp-gv_view_scale.gos_line_color, 255, 255, 0);
VSET(gvp-gv_view_scale.gos_text_color, 255, 255, 255);
+gvp-gv_data_vZ = 1.0;
+
/* FIXME: this causes the shaders.sh regression to fail */
/* _ged_mat_aet(gvp); */
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-12-04 11:53:58 UTC (rev
58811)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-12-04 12:32:38 UTC (rev
58812)
@@ -221,6 +221,12 @@
ged_func_ptr func,
const char *usage,
int maxargs);
+HIDDEN int to_data_vZ(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
HIDDEN int to_dlist_on(struct ged *gedp,
int argc,
const char *argv[],
@@ -992,6 +998,7 @@
{data_move_point_mode, x y, TO_UNLIMITED, to_data_move_point_mode,
GED_FUNC_PTR_NULL},
{data_pick, ???, TO_UNLIMITED, to_data_pick, GED_FUNC_PTR_NULL},
{data_scale_mode,x y, TO_UNLIMITED, to_data_scale_mode,
GED_FUNC_PTR_NULL},
+{data_vZ,[z], TO_UNLIMITED, to_data_vZ, GED_FUNC_PTR_NULL},
{dbconcat, (char *)0, TO_UNLIMITED, to_pass_through_func,
ged_concat},
{dbfind, (char *)0, TO_UNLIMITED, to_pass_through_func, ged_find},
{dbip, (char *)0, TO_UNLIMITED, to_pass_through_func, ged_dbip},
@@ -5229,6 +5236,62 @@
return GED_ERROR;
}
+
+HIDDEN int
+to_data_vZ(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr UNUSED(func),
+ const char *usage,
+ int UNUSED(maxargs))
+{
+struct ged_dm_view *gdvp;
+
+/* must be double for scanf */
+double vZ;
+
+/* initialize result */
+bu_vls_trunc(gedp-ged_result_str, 0);
+
+/* must be wanting help */
+if (argc == 1) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return GED_HELP;
+}
+
+if (argc != 2 argc != 3) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return GED_ERROR;
+}
+
+for (BU_LIST_FOR(gdvp, ged_dm_view,
current_top-to_gop-go_head_views.l)) {
+ if (BU_STR_EQUAL(bu_vls_addr(gdvp-gdv_name), argv[1]))
+ break;
+}
+
+if (BU_LIST_IS_HEAD(gdvp-l, current_top-to_gop-go_head_views.l)) {
+ bu_vls_printf(gedp-ged_result_str, View not found - %s, argv[1]);
+ return GED_ERROR;
+}
+
+/* Get the data vZ */
+if (argc == 2) {
+ bu_vls_printf(gedp-ged_result_str, %lf, gdvp-gdv_view-gv_data_vZ);
+ return GED_OK;
+}
+
+/* Set the data vZ */
+if (bu_sscanf(argv[2], %lf, vZ) != 1) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return GED_ERROR;
+}
+
+gdvp-gdv_view-gv_data_vZ = vZ;
+
+return GED_OK;
+}
+
+
HIDDEN void
to_deleteViewProc(ClientData clientData)
{
@@ -5243,6 +5306,7 @@
bu_free((genptr_t)gdvp, ged_dm_view);
}
+
HIDDEN void
to_init_default_bindings(struct ged_dm_view *gdvp)
{
@@ -8044,7 +8108,7 @@
fastf_t curr_fx, curr_fy;
register int nsegs, n;
- VSET(v_pt, fx, fy, 1.0);
+ VSET(v_pt, fx, fy, gdvp-gdv_view-gv_data_vZ);
VSUB2(vdiff, v_pt, gdpsp-gdps_prev_point);
r = MAGNITUDE(vdiff);
@@ -8067,7 +8131,7 @@
curr_fx = cos(ang*bn_degtorad) * r + gdpsp-gdps_prev_point[X];
curr_fy = sin(ang*bn_degtorad) * r + gdpsp-gdps_prev_point[Y];
- VSET(v_pt, curr_fx, curr_fy, 1.0);
+ VSET(v_pt, curr_fx, curr_fy
[brlcad-commits] SF.net SVN: brlcad:[58820] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 58820
http://sourceforge.net/p/brlcad/code/58820
Author: bob1961
Date: 2013-12-04 21:12:23 + (Wed, 04 Dec 2013)
Log Message:
---
Minor mod to Archer::buildGeneralPreferences that now handles the possibility
of the call to buildOtherGeneralPreferences returning a list of two indices
(the first indicating the next row while the second indicates the row that gets
configured to grow).
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2013-12-04 20:25:19 UTC
(rev 58819)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2013-12-04 21:12:23 UTC
(rev 58820)
@@ -3128,13 +3128,18 @@
grid $itk_component(maxcombmembL) -column 0 -row $i -sticky e
grid $itk_component(maxcombmembE) -column 1 -row $i -sticky ew
incr i
-set i [buildOtherGeneralPreferences $i]
+set ilist [buildOtherGeneralPreferences $i]
+set i [lindex $ilist 0]
+set ri [lindex $ilist 1]
+if {$ri == } {
+ set ri $i
+}
grid $itk_component(affectedTreeNodesModeCB) \
-columnspan 2 \
-column 0 \
-row $i \
-sticky sw
-grid rowconfigure $itk_component(generalF) $i -weight 1
+grid rowconfigure $itk_component(generalF) $ri -weight 1
incr i
grid $itk_component(listViewAllAffectedCB) \
-columnspan 2 \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/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:[58827] brlcad/trunk/src/librt/memalloc.c
Revision: 58827 http://sourceforge.net/p/brlcad/code/58827 Author: bob1961 Date: 2013-12-05 15:19:09 + (Thu, 05 Dec 2013) Log Message: --- This reverts r50778. rt_memfree() needs to continue in order to initialize *pp, otherwise curp and prevp will always be NULL. The short of it is that if we return early when (\!prevp || \!curp), the free memory nodes will never coalesce which results in the file size growing unnecessarily because it's being filled with contiguous free regions that are always seen seperately. Revision Links: -- http://sourceforge.net/p/brlcad/code/50778 Modified Paths: -- brlcad/trunk/src/librt/memalloc.c Modified: brlcad/trunk/src/librt/memalloc.c === --- brlcad/trunk/src/librt/memalloc.c 2013-12-05 14:16:20 UTC (rev 58826) +++ brlcad/trunk/src/librt/memalloc.c 2013-12-05 15:19:09 UTC (rev 58827) @@ -271,10 +271,6 @@ return; } -/* nothing to do */ -if (!prevp || !curp) - return; - /* * Now we do the surgery: * If there are no matches on boundaries we allocate a buffer This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631iu=/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:[58899] brlcad/trunk/src/libged/get_obj_bounds.c
Revision: 58899
http://sourceforge.net/p/brlcad/code/58899
Author: bob1961
Date: 2013-12-11 18:55:20 + (Wed, 11 Dec 2013)
Log Message:
---
_ged_get_obj_bounds() should be calling rt_gettree with argv[i] instead of
path.fp_names[0]-d_namep (i.e., use the provided path instead of the first
element of the path). The more path an object is specified with the faster the
call to rt_gettree() will run.
Modified Paths:
--
brlcad/trunk/src/libged/get_obj_bounds.c
Modified: brlcad/trunk/src/libged/get_obj_bounds.c
===
--- brlcad/trunk/src/libged/get_obj_bounds.c2013-12-11 15:11:31 UTC (rev
58898)
+++ brlcad/trunk/src/libged/get_obj_bounds.c2013-12-11 18:55:20 UTC (rev
58899)
@@ -87,7 +87,7 @@
}
/* if we don't already have it, get it */
- if (!gottree rt_gettree(rtip, path.fp_names[0]-d_namep)) {
+ if (!gottree rt_gettree(rtip, argv[i])) {
bu_vls_printf(gedp-ged_result_str, rt_gettree failed for %s\n,
argv[i]);
rt_free_rti(rtip);
db_free_full_path(path);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[58900] brlcad/trunk/src/libtclcad/tclcad_obj.c
Revision: 58900
http://sourceforge.net/p/brlcad/code/58900
Author: bob1961
Date: 2013-12-11 21:25:22 + (Wed, 11 Dec 2013)
Log Message:
---
Update to go_draw_other()'s sf computation that reflects the fact that gv_size
is already in base units.
Modified Paths:
--
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-12-11 18:55:20 UTC (rev
58899)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2013-12-11 21:25:22 UTC (rev
58900)
@@ -13680,7 +13680,7 @@
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;
+fastf_t sf = gdvp-gdv_view-gv_size / (fastf_t)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, sf);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[58997] brlcad/trunk/src/tclscripts/lib/RtImage.tcl
Revision: 58997
http://sourceforge.net/p/brlcad/code/58997
Author: bob1961
Date: 2013-12-18 20:07:40 + (Wed, 18 Dec 2013)
Log Message:
---
Updating cadwidgets::rtimage to reflect a change to the bw-pix command's syntax
change. This fixes part of the breakage seen in rtwizard (i.e., the ghost
intensity was not getting applied to the image).
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/RtImage.tcl
Modified: brlcad/trunk/src/tclscripts/lib/RtImage.tcl
===
--- brlcad/trunk/src/tclscripts/lib/RtImage.tcl 2013-12-18 19:22:16 UTC (rev
58996)
+++ brlcad/trunk/src/tclscripts/lib/RtImage.tcl 2013-12-18 20:07:40 UTC (rev
58997)
@@ -215,7 +215,7 @@
#
catch {exec [file join $binpath pix-bw] $tgi $tbw}
catch {exec [file join $binpath bwmod] -a 4 -d259 -r$_gamma -m255 $tbw
$tmod}
- catch {exec [file join $binpath bw-pix] $tmod $tbwpix}
+ catch {exec [file join $binpath bw-pix] $tmod $tbwpix}
set bgl =[lindex $_bgcolor 0]/[lindex $_bgcolor 1]/[lindex $_bgcolor
2]
catch {exec [file join $binpath pixmatte] -e $tfci $bgl $tbwpix $tfci
$tmi}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[59002] brlcad/trunk/src/util/pix-bw.c
Revision: 59002
http://sourceforge.net/p/brlcad/code/59002
Author: bob1961
Date: 2013-12-18 22:05:45 + (Wed, 18 Dec 2013)
Log Message:
---
pix-bw seems to now require one of the color flags or the ntsc/crt options.
This broke rtwizard (i.e., the ghost intensity was not getting applied to the
image). I added e: to the bu_getopt string to make the crt and ntsc options
accessible.
Modified Paths:
--
brlcad/trunk/src/util/pix-bw.c
Modified: brlcad/trunk/src/util/pix-bw.c
===
--- brlcad/trunk/src/util/pix-bw.c 2013-12-18 21:47:05 UTC (rev 59001)
+++ brlcad/trunk/src/util/pix-bw.c 2013-12-18 22:05:45 UTC (rev 59002)
@@ -68,7 +68,8 @@
{
int c;
-while ((c = bu_getopt(argc, argv, s:w:n:R:G:B:o:h?NC)) != -1) {
+bu_optind = 1;
+while ((c = bu_getopt(argc, argv, e:s:w:n:R:G:B:o:h?NC)) != -1) {
switch (c) {
case 'e' :
if(BU_STR_EQUAL(bu_optarg, ntsc)) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[59003] brlcad/trunk/src/tclscripts/lib/RtImage.tcl
Revision: 59003
http://sourceforge.net/p/brlcad/code/59003
Author: bob1961
Date: 2013-12-18 22:07:04 + (Wed, 18 Dec 2013)
Log Message:
---
Updating cadwidgets::rtimage to reflect a change to the pix-bw command's syntax
change and its use of libicv. This fixes part of the breakage seen in rtwizard
(i.e., the ghost intensity was not getting applied to the image).
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/RtImage.tcl
Modified: brlcad/trunk/src/tclscripts/lib/RtImage.tcl
===
--- brlcad/trunk/src/tclscripts/lib/RtImage.tcl 2013-12-18 22:05:45 UTC (rev
59002)
+++ brlcad/trunk/src/tclscripts/lib/RtImage.tcl 2013-12-18 22:07:04 UTC (rev
59003)
@@ -213,7 +213,7 @@
#
# Convert to ghost image
#
- catch {exec [file join $binpath pix-bw] $tgi $tbw}
+ catch {exec [file join $binpath pix-bw] -e crt $tgi $tbw}
catch {exec [file join $binpath bwmod] -a 4 -d259 -r$_gamma -m255 $tbw
$tmod}
catch {exec [file join $binpath bw-pix] $tmod $tbwpix}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[59029] brlcad/trunk/src/mged/dm-wgl.c
Revision: 59029
http://sourceforge.net/p/brlcad/code/59029
Author: bob1961
Date: 2013-12-19 14:25:13 + (Thu, 19 Dec 2013)
Log Message:
---
calls to dirty_hook() now needs arguments.
Modified Paths:
--
brlcad/trunk/src/mged/dm-wgl.c
Modified: brlcad/trunk/src/mged/dm-wgl.c
===
--- brlcad/trunk/src/mged/dm-wgl.c 2013-12-19 12:59:06 UTC (rev 59028)
+++ brlcad/trunk/src/mged/dm-wgl.c 2013-12-19 14:25:13 UTC (rev 59029)
@@ -313,7 +313,7 @@
dmp-dm_zclip = ((struct wgl_vars
*)dmp-dm_vars.priv_vars)-mvars.zclipping_on;
view_state-vs_gvp-gv_zclip = dmp-dm_zclip;
-dirty_hook();
+dirty_hook(NULL, NULL, NULL, NULL);
if (dmp-dm_zclip) {
bounds[4] = -1.0;
@@ -343,7 +343,7 @@
{
dmp-dm_bound =
((struct wgl_vars *)dmp-dm_vars.priv_vars)-mvars.bound;
-dirty_hook();
+dirty_hook(NULL, NULL, NULL, NULL);
}
@@ -355,7 +355,7 @@
{
dmp-dm_boundFlag =
((struct wgl_vars *)dmp-dm_vars.priv_vars)-mvars.boundFlag;
-dirty_hook();
+dirty_hook(NULL, NULL, NULL, NULL);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[59037] brlcad/trunk/include/raytrace.h
Revision: 59037
http://sourceforge.net/p/brlcad/code/59037
Author: bob1961
Date: 2013-12-19 15:58:41 + (Thu, 19 Dec 2013)
Log Message:
---
Declare db5_attr_std with RT_EXPORT so it can be seen on Windows.
Modified Paths:
--
brlcad/trunk/include/raytrace.h
Modified: brlcad/trunk/include/raytrace.h
===
--- brlcad/trunk/include/raytrace.h 2013-12-19 15:42:38 UTC (rev 59036)
+++ brlcad/trunk/include/raytrace.h 2013-12-19 15:58:41 UTC (rev 59037)
@@ -8188,7 +8188,7 @@
const char *long_description;
};
-extern const struct db5_attr_ctype db5_attr_std[];
+RT_EXPORT extern const struct db5_attr_ctype db5_attr_std[];
/* Container for holding user-registered attributes */
struct db5_registry{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[59045] brlcad/trunk
Revision: 59045
http://sourceforge.net/p/brlcad/code/59045
Author: bob1961
Date: 2013-12-19 16:40:56 + (Thu, 19 Dec 2013)
Log Message:
---
Cliff tweaks for building on Windows.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt
brlcad/trunk/misc/attributes/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2013-12-19 16:39:21 UTC (rev 59044)
+++ brlcad/trunk/CMakeLists.txt 2013-12-19 16:40:56 UTC (rev 59045)
@@ -2240,7 +2240,7 @@
try_compile(BUILD_SLEEP
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
${BRLCAD_CMAKE_DIR}/test_srcs/sleep.c
- COMPILE_DEFINITIONS -I${CMAKE_CURRENT_BINARY_DIR}/include
-I${CMAKE_CURRENT_SOURCE_DIR}/include
+ COMPILE_DEFINITIONS -DBRLCADBUILD -DHAVE_CONFIG_H
-I${CMAKE_CURRENT_BINARY_DIR}/include -I${CMAKE_CURRENT_SOURCE_DIR}/include
OUTPUT_VARIABLE BUILD_SLEEP_LOG
COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/sleep.bin)
if(NOT BUILD_SLEEP)
Modified: brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt
===
--- brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt 2013-12-19
16:39:21 UTC (rev 59044)
+++ brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt 2013-12-19
16:40:56 UTC (rev 59045)
@@ -35,7 +35,11 @@
endif(BRLCAD_EXTRADOCS_PDF_MAN)
add_dependencies(attributes_man5_html attr_std_list_xml attr_std_table_xml)
-add_dependencies(attributes_man5_man attr_std_list_xml attr_std_table_xml)
+
+if(BRLCAD_EXTRADOCS_MAN)
+ add_dependencies(attributes_man5_man attr_std_list_xml attr_std_table_xml)
+endif(BRLCAD_EXTRADOCS_MAN)
+
if(BRLCAD_EXTRADOCS_PDF_MAN)
add_dependencies(attributes_man5_pdf attr_std_list_xml attr_std_table_xml)
endif(BRLCAD_EXTRADOCS_PDF_MAN)
Modified: brlcad/trunk/misc/attributes/CMakeLists.txt
===
--- brlcad/trunk/misc/attributes/CMakeLists.txt 2013-12-19 16:39:21 UTC (rev
59044)
+++ brlcad/trunk/misc/attributes/CMakeLists.txt 2013-12-19 16:40:56 UTC (rev
59045)
@@ -4,6 +4,7 @@
${BRLCAD_SOURCE_DIR}/src/librt
${OPENNURBS_INCLUDE_DIR}
${BU_INCLUDE_DIRS}
+ ${RT_INCLUDE_DIRS}
)
# a new html and xml generation file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[59257] brlcad/trunk/src/libicv
Revision: 59257
http://sourceforge.net/p/brlcad/code/59257
Author: bob1961
Date: 2014-01-02 16:28:26 + (Thu, 02 Jan 2014)
Log Message:
---
This fixes breakage of many tools on windows (i.e., rt, pix-bw, bw-pix, ...).
Need to open binary files on windows using the b flag.
Modified Paths:
--
brlcad/trunk/src/libicv/bw.c
brlcad/trunk/src/libicv/dpix.c
brlcad/trunk/src/libicv/fileformat.c
brlcad/trunk/src/libicv/pix.c
brlcad/trunk/src/libicv/ppm.c
Modified: brlcad/trunk/src/libicv/bw.c
===
--- brlcad/trunk/src/libicv/bw.c2014-01-02 16:20:52 UTC (rev 59256)
+++ brlcad/trunk/src/libicv/bw.c2014-01-02 16:28:26 UTC (rev 59257)
@@ -49,7 +49,7 @@
if (filename==NULL) {
fp = stdout;
-} else if ((fp = fopen(filename, w)) == NULL) {
+} else if ((fp = fopen(filename, wb)) == NULL) {
bu_log(bw_write: Cannot open file for saving\n);
return -1;
}
@@ -76,7 +76,7 @@
if (filename==NULL) {
fp = stdin;
-} else if ((fp = fopen(filename, r)) == NULL) {
+} else if ((fp = fopen(filename, rb)) == NULL) {
bu_log(bw_read: Cannot open %s for reading\n, filename);
return NULL;
}
Modified: brlcad/trunk/src/libicv/dpix.c
===
--- brlcad/trunk/src/libicv/dpix.c 2014-01-02 16:20:52 UTC (rev 59256)
+++ brlcad/trunk/src/libicv/dpix.c 2014-01-02 16:28:26 UTC (rev 59257)
@@ -98,7 +98,7 @@
if (filename == NULL)
fd = fileno(stdin);
-else if ((fd = open(filename, O_RDONLY, WRMODE)) 0 ) {
+else if ((fd = open(filename, O_RDONLY|O_BINARY, WRMODE)) 0 ) {
bu_log(dpix_read : Cannot open file %s for reading\n,, filename);
return NULL;
}
Modified: brlcad/trunk/src/libicv/fileformat.c
===
--- brlcad/trunk/src/libicv/fileformat.c2014-01-02 16:20:52 UTC (rev
59256)
+++ brlcad/trunk/src/libicv/fileformat.c2014-01-02 16:28:26 UTC (rev
59257)
@@ -116,7 +116,7 @@
unsigned char *data;
FILE *fh;
-fh = fopen(filename, w);
+fh = fopen(filename, wb);
if (UNLIKELY(fh==NULL)) {
perror(fdopen);
bu_log(ERROR: png_write failed to get a FILE pointer\n);
Modified: brlcad/trunk/src/libicv/pix.c
===
--- brlcad/trunk/src/libicv/pix.c 2014-01-02 16:20:52 UTC (rev 59256)
+++ brlcad/trunk/src/libicv/pix.c 2014-01-02 16:28:26 UTC (rev 59257)
@@ -45,7 +45,7 @@
if (filename==NULL) {
fp = stdout;
-} else if ((fp = fopen(filename, w)) == NULL) {
+} else if ((fp = fopen(filename, wb)) == NULL) {
bu_log(pix_write: Cannot open file for saving\n);
return -1;
}
@@ -73,7 +73,7 @@
if (filename == NULL) {
fp = stdin;
-} else if ((fp = fopen(filename, r)) == NULL) {
+} else if ((fp = fopen(filename, rb)) == NULL) {
bu_log(pix_read: Cannot open file for reading\n);
return NULL;
}
Modified: brlcad/trunk/src/libicv/ppm.c
===
--- brlcad/trunk/src/libicv/ppm.c 2014-01-02 16:20:52 UTC (rev 59256)
+++ brlcad/trunk/src/libicv/ppm.c 2014-01-02 16:28:26 UTC (rev 59257)
@@ -65,7 +65,7 @@
if (filename==NULL) {
fp = stdout;
-} else if ((fp = fopen(filename, w)) == NULL) {
+} else if ((fp = fopen(filename, wb)) == NULL) {
bu_log(ERROR : Cannot open file for saving\n);
return -1;
}
@@ -119,7 +119,7 @@
if (filename == NULL) {
fp = stdin;
-} else if ((fp = fopen(filename, r)) == NULL) {
+} else if ((fp = fopen(filename, rb)) == NULL) {
bu_log(ERROR: Cannot open file for reading\n);
return NULL;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/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:[43684] brlcad/trunk/src/libtclcad/ged_obj.c
Revision: 43684 http://brlcad.svn.sourceforge.net/brlcad/?rev=43684view=rev Author: bob1961 Date: 2011-03-04 15:22:06 + (Fri, 04 Mar 2011) Log Message: --- Fixed a problem with rect_mode that was causing an offset rectangle to be drawn. Modified Paths: -- brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libtclcad/ged_obj.c === --- brlcad/trunk/src/libtclcad/ged_obj.c2011-03-04 14:45:24 UTC (rev 43683) +++ brlcad/trunk/src/libtclcad/ged_obj.c2011-03-04 15:22:06 UTC (rev 43684) @@ -5267,7 +5267,6 @@ char *av[5]; int x, y; int dx, dy; -int half_wMh; struct bu_vls dx_vls, dy_vls; struct ged_dm_view *gdvp; @@ -5301,9 +5300,8 @@ return BRLCAD_ERROR; } -half_wMh = (gdvp-gdv_dmp-dm_width - gdvp-gdv_dmp-dm_height) * 0.5; dx = x - gdvp-gdv_view-gv_prevMouseX; -dy = gdvp-gdv_dmp-dm_height - y + half_wMh - gdvp-gdv_view-gv_prevMouseY; +dy = gdvp-gdv_dmp-dm_height - y - gdvp-gdv_view-gv_prevMouseY; bu_vls_init(dx_vls); bu_vls_init(dy_vls); @@ -6707,7 +6705,6 @@ int ac; char *av[5]; int x, y; -int half_wMh; struct bu_vls bindings; struct bu_vls x_vls, y_vls; struct ged_dm_view *gdvp; @@ -6744,9 +6741,8 @@ return BRLCAD_ERROR; } -half_wMh = (gdvp-gdv_dmp-dm_width - gdvp-gdv_dmp-dm_height) * 0.5; gdvp-gdv_view-gv_prevMouseX = x; -gdvp-gdv_view-gv_prevMouseY = gdvp-gdv_dmp-dm_height - y + half_wMh; +gdvp-gdv_view-gv_prevMouseY = gdvp-gdv_dmp-dm_height - y; gdvp-gdv_view-gv_mode = GED_RECTANGLE_MODE; ac = 4; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- What You Don't Know About Data Connectivity CAN Hurt You This paper provides an overview of data connectivity, details its effect on application quality, and explores various alternative solutions. http://p.sf.net/sfu/progress-d2d ___ 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:[43715] brlcad/trunk/src/libged/nirt.c
Revision: 43715
http://brlcad.svn.sourceforge.net/brlcad/?rev=43715view=rev
Author: bob1961
Date: 2011-03-05 00:30:36 + (Sat, 05 Mar 2011)
Log Message:
---
Fixed a bug in libged/nirt.c that was tripping in the /* skip commands */
section of the windows specific code when an object being passed to nirt
contained -e in its name.
Modified Paths:
--
brlcad/trunk/src/libged/nirt.c
Modified: brlcad/trunk/src/libged/nirt.c
===
--- brlcad/trunk/src/libged/nirt.c 2011-03-05 00:28:51 UTC (rev 43714)
+++ brlcad/trunk/src/libged/nirt.c 2011-03-05 00:30:36 UTC (rev 43715)
@@ -409,7 +409,7 @@
for (i=1; igedp-ged_gdp-gd_rt_cmd_len; i++) {
/* skip commands */
- if (strstr(gedp-ged_gdp-gd_rt_cmd[i], -e) != NULL)
+ if (!strcmp(gedp-ged_gdp-gd_rt_cmd[i], -e))
++i;
else {
/* append other arguments (i.e. options, file and obj(s)) */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
___
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:[43791] brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Revision: 43791
http://brlcad.svn.sourceforge.net/brlcad/?rev=43791view=rev
Author: bob1961
Date: 2011-03-08 21:01:07 + (Tue, 08 Mar 2011)
Log Message:
---
Added a TkTable::see method.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Modified: brlcad/trunk/src/tclscripts/lib/TkTable.tcl
===
--- brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2011-03-08 20:49:46 UTC (rev
43790)
+++ brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2011-03-08 21:01:07 UTC (rev
43791)
@@ -37,6 +37,7 @@
public {
method handlePaste {}
+ method see {_index}
method setDataEntry {_index _val}
method setTableCol {_col _val}
method setTableVal {_index _val}
@@ -256,6 +257,10 @@
#focus $itk_component(table)
}
+::itcl::body cadwidgets::TkTable::see {_index} {
+$itk_component(table) see $_index
+}
+
::itcl::body cadwidgets::TkTable::setDataEntry {_index _val} {
set $mTableDataVar\($_index\) $_val
if {$itk_option(-dataCallback) != } {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
___
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:[43877] brlcad/trunk/src/libged/rt.c
Revision: 43877
http://brlcad.svn.sourceforge.net/brlcad/?rev=43877view=rev
Author: bob1961
Date: 2011-03-16 18:23:33 + (Wed, 16 Mar 2011)
Log Message:
---
Fixed a Windows related bug in _ged_run_rt (i.e. no longer using a fixed size
char array to hold the command for CreateProcess.
Modified Paths:
--
brlcad/trunk/src/libged/rt.c
Modified: brlcad/trunk/src/libged/rt.c
===
--- brlcad/trunk/src/libged/rt.c2011-03-16 18:07:59 UTC (rev 43876)
+++ brlcad/trunk/src/libged/rt.c2011-03-16 18:23:33 UTC (rev 43877)
@@ -162,8 +162,7 @@
STARTUPINFO si = {0};
PROCESS_INFORMATION pi = {0};
SECURITY_ATTRIBUTES sa = {0};
-char line[2048];
-char name[256];
+struct bu_vls line;
#endif
vect_t eye_model;
struct ged_run_rt *run_rtp;
@@ -271,15 +270,15 @@
si.hStdOutput = pipe_err[1];
si.hStdError = pipe_err[1];
-snprintf(line, sizeof(line), %s , gedp-ged_gdp-gd_rt_cmd[0]);
-for (i=1; igedp-ged_gdp-gd_rt_cmd_len; i++) {
- snprintf(name, sizeof(name), %s , gedp-ged_gdp-gd_rt_cmd[i]);
- bu_strlcat(line, name, sizeof(line));
+bu_vls_init(line);
+for (i=0; igedp-ged_gdp-gd_rt_cmd_len; i++) {
+ bu_vls_printf(line, %s , gedp-ged_gdp-gd_rt_cmd[i]);
}
-CreateProcess(NULL, line, NULL, NULL, TRUE,
+CreateProcess(NULL, bu_vls_addr(line), NULL, NULL, TRUE,
DETACHED_PROCESS, NULL, NULL,
si, pi);
+bu_vls_free(line);
CloseHandle(pipe_in[0]);
CloseHandle(pipe_err[1]);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
___
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:[43938] brlcad/trunk/src/tclscripts/lib/Ged.tcl
Revision: 43938
http://brlcad.svn.sourceforge.net/brlcad/?rev=43938view=rev
Author: bob1961
Date: 2011-03-23 21:13:50 + (Wed, 23 Mar 2011)
Log Message:
---
Minor mod to Ged::handle_data_move to not load data for _pane.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-03-23 19:44:23 UTC (rev
43937)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-03-23 21:13:50 UTC (rev
43938)
@@ -3053,12 +3053,20 @@
set labels [$mGed $_dtype $itk_component($_pane) labels]
foreach dm {ur ul ll lr} {
+ if {$dm == $_pane} {
+ continue
+ }
+
$mGed $_dtype $itk_component($dm) labels $labels
}
} else {
set points [$mGed $_dtype $itk_component($_pane) points]
foreach dm {ur ul ll lr} {
+ if {$dm == $_pane} {
+ continue
+ }
+
$mGed $_dtype $itk_component($dm) points $points
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
___
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:[44151] brlcad/trunk
Revision: 44151
http://brlcad.svn.sourceforge.net/brlcad/?rev=44151view=rev
Author: bob1961
Date: 2011-04-01 16:12:53 + (Fri, 01 Apr 2011)
Log Message:
---
Added the dm_reshape function to struct dm. This splits out the bits of code in
dm-ogl and dm-wgl that reconfigure the openGL window after a resize.
Modified Paths:
--
brlcad/trunk/include/dm.h
brlcad/trunk/src/libdm/dm-Null.c
brlcad/trunk/src/libdm/dm-X.c
brlcad/trunk/src/libdm/dm-ogl.c
brlcad/trunk/src/libdm/dm-plot.c
brlcad/trunk/src/libdm/dm-ps.c
brlcad/trunk/src/libdm/dm-rtgl.c
brlcad/trunk/src/libdm/dm-tk.c
brlcad/trunk/src/libdm/dm-wgl.c
Modified: brlcad/trunk/include/dm.h
===
--- brlcad/trunk/include/dm.h 2011-04-01 14:45:20 UTC (rev 44150)
+++ brlcad/trunk/include/dm.h 2011-04-01 16:12:53 UTC (rev 44151)
@@ -247,6 +247,7 @@
int (*dm_drawDList)();
int (*dm_freeDLists)();
int (*dm_getDisplayImage)(struct dm *dmp, unsigned char **image);
+void (*dm_reshape)();
unsigned long dm_id; /** @brief window id */
int dm_displaylist;/** @brief !0 means device has
displaylist */
int dm_stereo;/** @brief stereo flag */
Modified: brlcad/trunk/src/libdm/dm-Null.c
===
--- brlcad/trunk/src/libdm/dm-Null.c2011-04-01 14:45:20 UTC (rev 44150)
+++ brlcad/trunk/src/libdm/dm-Null.c2011-04-01 16:12:53 UTC (rev 44151)
@@ -129,6 +129,7 @@
Nu_int0,
Nu_int0,
Nu_getDisplayImage, /* display to image function */
+Nu_void,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/trunk/src/libdm/dm-X.c
===
--- brlcad/trunk/src/libdm/dm-X.c 2011-04-01 14:45:20 UTC (rev 44150)
+++ brlcad/trunk/src/libdm/dm-X.c 2011-04-01 16:12:53 UTC (rev 44151)
@@ -134,6 +134,15 @@
}
+HIDDEN void
+X_reshape(struct dm *dmp, int width, int height)
+{
+dmp-dm_height = height;
+dmp-dm_width = width;
+dmp-dm_aspect = (fastf_t)dmp-dm_width / (fastf_t)dmp-dm_height;
+}
+
+
HIDDEN int
X_configureWin_guts(struct dm *dmp, int force)
{
@@ -152,9 +161,7 @@
dmp-dm_width == xwa.width)
return TCL_OK;
-dmp-dm_height = xwa.height;
-dmp-dm_width = xwa.width;
-dmp-dm_aspect = (fastf_t)dmp-dm_width / (fastf_t)dmp-dm_height;
+X_reshape(dmp, xwa.width, xwa.height);
if (dmp-dm_debugLevel) {
bu_log(X_configureWin_guts()\n);
@@ -1617,6 +1624,7 @@
return TCL_OK;
}
+
/* Display Manager package interface */
struct dm dm_X = {
X_close,
@@ -1647,6 +1655,7 @@
Nu_int0,
Nu_int0,
X_getDisplayImage, /* display to image function */
+X_reshape,
0,
0, /* no displaylist */
0,/* no stereo */
Modified: brlcad/trunk/src/libdm/dm-ogl.c
===
--- brlcad/trunk/src/libdm/dm-ogl.c 2011-04-01 14:45:20 UTC (rev 44150)
+++ brlcad/trunk/src/libdm/dm-ogl.c 2011-04-01 16:12:53 UTC (rev 44151)
@@ -128,11 +128,13 @@
HIDDEN int ogl_drawDList(struct dm *dmp, unsigned int list);
HIDDEN int ogl_freeDLists(struct dm *dmp, unsigned int list, int range);
HIDDEN int ogl_getDisplayImage(struct dm *dmp, unsigned char **image);
+HIDDEN void ogl_reshape(struct dm *dmp, int width, int height);
HIDDEN int ogl_drawString2D(struct dm *dmp, char *str, fastf_t x, fastf_t y,
int size, int use_aspect);
HIDDEN int ogl_setLight(struct dm *dmp, int lighting_on);
HIDDEN int ogl_setZBuffer(struct dm *dmp, int zbuffer_on);
+
struct dm dm_ogl = {
ogl_close,
ogl_drawBegin,
@@ -162,6 +164,7 @@
ogl_drawDList,
ogl_freeDLists,
ogl_getDisplayImage, /* display to image function */
+ogl_reshape,
0,
1, /* has displaylist */
0, /* no stereo by default */
@@ -271,7 +274,6 @@
HIDDEN int
ogl_configureWin_guts(struct dm *dmp, int force)
{
-GLint mm;
XWindowAttributes xwa;
XFontStruct *newfontstruct;
@@ -294,39 +296,8 @@
dmp-dm_width == xwa.width)
return TCL_OK;
-dmp-dm_height = xwa.height;
-dmp-dm_width = xwa.width;
-dmp-dm_aspect = (fastf_t)dmp-dm_width / (fastf_t)dmp-dm_height;
+ogl_reshape(dmp, xwa.width, xwa.height);
-if (dmp-dm_debugLevel) {
- bu_log(ogl_configureWin_guts()\n);
- bu_log(width = %d, height = %d\n, dmp-dm_width, dmp-dm_height);
-}
-
-glViewport(0, 0, dmp-dm_width, dmp-dm_height);
-#if 0
-glScissor(0, 0, (dmp-dm_width)+1,
- (dmp-dm_height)+1);
-#endif
-
-if (dmp-dm_zbuffer)
- ogl_setZBuffer(dmp, dmp-dm_zbuffer);
-
-ogl_setLight(dmp, dmp-dm_light);
-
-glClearColor
[brlcad-commits] SF.net SVN: brlcad:[44181] brlcad/trunk/src/libged/ged.c
Revision: 44181
http://brlcad.svn.sourceforge.net/brlcad/?rev=44181view=rev
Author: bob1961
Date: 2011-04-04 14:27:26 + (Mon, 04 Apr 2011)
Log Message:
---
typo in comment
Modified Paths:
--
brlcad/trunk/src/libged/ged.c
Modified: brlcad/trunk/src/libged/ged.c
===
--- brlcad/trunk/src/libged/ged.c 2011-04-04 14:18:11 UTC (rev 44180)
+++ brlcad/trunk/src/libged/ged.c 2011-04-04 14:27:26 UTC (rev 44181)
@@ -19,7 +19,7 @@
*/
/** @addtogroup libged */
/** @{ */
-/** @file wdb_obj.c
+/** @file ged.c
*
* A quasi-object-oriented database interface.
*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself;
WebMatrix provides all the features you need to develop and
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
___
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:[44192] brlcad/trunk
Revision: 44192
http://brlcad.svn.sourceforge.net/brlcad/?rev=44192view=rev
Author: bob1961
Date: 2011-04-04 19:16:06 + (Mon, 04 Apr 2011)
Log Message:
---
Mods to get libtclcad compiling again.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/include/tclcad.h
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2011-04-04 18:49:53 UTC (rev 44191)
+++ brlcad/trunk/include/ged.h 2011-04-04 19:16:06 UTC (rev 44192)
@@ -35,6 +35,7 @@
#endif
#include raytrace.h
+#include fbserv_obj.h
__BEGIN_DECLS
@@ -73,6 +74,7 @@
#define GED_DISPLAY_LIST_NULL (struct ged_display_list *)0
#define GED_DRAWABLE_NULL (struct ged_drawable *)0
#define GED_VIEW_NULL (struct ged_view *)0
+#define GED_OBJ_NULL (struct ged_obj *)0
#define GED_VIEW_OBJ_NULL ((struct view_obj *)0)
#define GED_RESULT_NULL ((void *)0)
@@ -97,6 +99,11 @@
#define GED_PTRANSLATE_MODE 14
#define GED_RECTANGLE_MODE 15
+#define GED_OBJ_FB_MODE_OFF 0
+#define GED_OBJ_FB_MODE_UNDERLAY 1
+#define GED_OBJ_FB_MODE_INTERLAY 2
+#define GED_OBJ_FB_MODE_OVERLAY 3
+
/**
* S E M A P H O R E S
*
@@ -451,7 +458,6 @@
#endif
};
-
struct ged_view {
struct bu_list l;
fastf_tgv_scale;
@@ -501,7 +507,6 @@
struct ged_rect_state gv_rect;
};
-
struct ged {
struct bu_list l;
struct rt_wdb *ged_wdbp;
@@ -560,7 +565,28 @@
intvo_zclip;
};
+struct ged_dm_view {
+struct bu_list l;
+struct bu_vls gdv_callback;
+struct bu_vls gdv_name;
+struct ged_view*gdv_view;
+struct dm *gdv_dmp;
+struct fbserv_obj gdv_fbs;
+struct ged_obj *gdv_gop; /* Pointer back to its ged object */
+};
+struct ged_obj {
+struct ged *go_gedp;
+struct ged_dm_view go_head_views;
+struct bu_vls go_name;
+struct bu_observer go_observers;
+struct bu_vls go_more_args_callback;
+struct bu_vls go_rt_end_callback;
+struct bu_vls *go_prim_label_list;
+intgo_prim_label_list_size;
+intgo_refresh_on;
+};
+
/* defined in adc.c */
GED_EXPORT BU_EXTERN(void ged_calc_adc_pos,
(struct ged_view *gvp));
@@ -620,6 +646,14 @@
GED_EXPORT BU_EXTERN(void ged_view_init,
(struct ged_view *gvp));
+/* defined in go_refresh.c */
+GED_EXPORT BU_EXTERN(void go_refresh,
+(struct ged_obj *gop,
+ struct ged_dm_view *gdvp));
+GED_EXPORT BU_EXTERN(void go_refresh_draw,
+(struct ged_obj *gop,
+ struct ged_dm_view *gdvp));
+
/* defined in grid.c */
GED_EXPORT BU_EXTERN(void ged_snap_to_grid,
(struct ged *gedp, fastf_t *vx, fastf_t *vy));
Modified: brlcad/trunk/include/tclcad.h
===
--- brlcad/trunk/include/tclcad.h 2011-04-04 18:49:53 UTC (rev 44191)
+++ brlcad/trunk/include/tclcad.h 2011-04-04 19:16:06 UTC (rev 44192)
@@ -61,39 +61,14 @@
#define TCLCAD_EXTERN(type_and_name, args) extern type_and_name args
#define TCLCAD_ARGS(args) args
-#define GED_OBJ_NUM_VIEWS 4
-#define GED_OBJ_FB_MODE_OFF 0
-#define GED_OBJ_FB_MODE_UNDERLAY 1
-#define GED_OBJ_FB_MODE_INTERLAY 2
-#define GED_OBJ_FB_MODE_OVERLAY 3
-
-struct ged_dm_view {
-struct bu_list l;
-struct bu_vls gdv_callback;
-struct bu_vls gdv_name;
-struct ged_view*gdv_view;
-struct dm *gdv_dmp;
-struct fbserv_obj gdv_fbs;
-struct ged_obj *gdv_gop; /* Pointer back to its ged object */
-};
-
-struct ged_obj {
+struct tclcad_obj {
struct bu_list l;
-struct ged *go_gedp;
-struct ged_dm_view go_head_views;
-struct bu_vls go_name;
-struct bu_observer go_observers;
-struct bu_vls go_more_args_callback;
-struct bu_vls go_rt_end_callback;
-struct bu_vls *go_prim_label_list;
-intgo_prim_label_list_size;
-intgo_refresh_on;
-Tcl_Interp *go_interp;
+struct ged_obj *to_gop;
+Tcl_Interp *to_interp;
};
-#define GED_OBJ_NULL (struct ged_obj *)0
+#define TCLCAD_OBJ_NULL (struct tclcad_obj *)0
-
TCLCAD_EXPORT TCLCAD_EXTERN(int tclcad_tk_setup, (Tcl_Interp *interp));
TCLCAD_EXPORT TCLCAD_EXTERN(void tclcad_auto_path, (Tcl_Interp *interp));
TCLCAD_EXPORT TCLCAD_EXTERN(void tclcad_tcl_library, (Tcl_Interp *interp));
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad
[brlcad-commits] SF.net SVN: brlcad:[44237] brlcad/trunk/src/tclscripts/mged/openw.tcl
Revision: 44237
http://brlcad.svn.sourceforge.net/brlcad/?rev=44237view=rev
Author: bob1961
Date: 2011-04-06 15:02:38 + (Wed, 06 Apr 2011)
Log Message:
---
Added a wrapper for the call to dbupgrade from the Tools menu. This catches the
call and prints the results to the command window. The catch prevents a
possible error window popping up.
Modified Paths:
--
brlcad/trunk/src/tclscripts/mged/openw.tcl
Modified: brlcad/trunk/src/tclscripts/mged/openw.tcl
===
--- brlcad/trunk/src/tclscripts/mged/openw.tcl 2011-04-06 12:17:16 UTC (rev
44236)
+++ brlcad/trunk/src/tclscripts/mged/openw.tcl 2011-04-06 15:02:38 UTC (rev
44237)
@@ -1942,7 +1942,7 @@
.$id.menubar.tools add separator
.$id.menubar.tools add command -label Upgrade Database... -underline 1\
- -command dbupgrade
+ -command call_dbupgrade $id
hoc_register_menu_data Tools Upgrade Database... Upgrade Database...\
{ { summary Upgrade to the current database format. }
{ see_also dbupgrade } }
@@ -3180,6 +3180,16 @@
set mged_gui($id,grid_draw) [rset grid draw]
}
+proc call_dbupgrade {id} {
+catch {dbupgrade} msg
+
+if {$msg != } {
+ # Calling with .$id instead of .$id.t to fool it into
+ # adding the msg text
+ distribute_text .$id dbupgrade $msg
+}
+}
+
# Local Variables:
# mode: Tcl
# tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
___
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:[44383] brlcad/trunk/src/libdm/dm-wgl.c
Revision: 44383
http://brlcad.svn.sourceforge.net/brlcad/?rev=44383view=rev
Author: bob1961
Date: 2011-04-14 13:58:39 + (Thu, 14 Apr 2011)
Log Message:
---
RECT has no width/height members.
Modified Paths:
--
brlcad/trunk/src/libdm/dm-wgl.c
Modified: brlcad/trunk/src/libdm/dm-wgl.c
===
--- brlcad/trunk/src/libdm/dm-wgl.c 2011-04-14 13:36:00 UTC (rev 44382)
+++ brlcad/trunk/src/libdm/dm-wgl.c 2011-04-14 13:58:39 UTC (rev 44383)
@@ -1536,7 +1536,7 @@
dmp-dm_width == (xwa.right-xwa.left))
return TCL_OK;
-wgl_reshape(dmp, xwa.width, xwa.height);
+wgl_reshape(dmp, xwa.right-xwa.left, xwa.bottom-xwa.top);
/* First time through, load a font or quit */
if (((struct dm_xvars *)dmp-dm_vars.pub_vars)-fontstruct == NULL) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
___
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:[44446] brlcad/trunk/include/ged.h
Revision: 6 http://brlcad.svn.sourceforge.net/brlcad/?rev=6view=rev Author: bob1961 Date: 2011-04-19 18:03:28 + (Tue, 19 Apr 2011) Log Message: --- Added GED_DM_VIEW_NULL. Modified Paths: -- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h === --- brlcad/trunk/include/ged.h 2011-04-19 16:18:20 UTC (rev 5) +++ brlcad/trunk/include/ged.h 2011-04-19 18:03:28 UTC (rev 6) @@ -74,6 +74,7 @@ #define GED_DISPLAY_LIST_NULL (struct ged_display_list *)0 #define GED_DRAWABLE_NULL (struct ged_drawable *)0 #define GED_VIEW_NULL (struct ged_view *)0 +#define GED_DM_VIEW_NULL (struct ged_dm_view *)0 #define GED_OBJ_NULL (struct ged_obj *)0 #define GED_VIEW_OBJ_NULL ((struct view_obj *)0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Benefiting from Server Virtualization: Beyond Initial Workload Consolidation -- Increasing the use of server virtualization is a top priority.Virtualization can reduce costs, simplify management, and improve application availability and disaster protection. Learn more about boosting the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev ___ 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:[44516] brlcad/trunk
Revision: 44516
http://brlcad.svn.sourceforge.net/brlcad/?rev=44516view=rev
Author: bob1961
Date: 2011-04-26 19:28:16 + (Tue, 26 Apr 2011)
Log Message:
---
Modify asc2g to use libtclcad.
Modified Paths:
--
brlcad/trunk/include/tclcad.h
brlcad/trunk/src/conv/CMakeLists.txt
brlcad/trunk/src/conv/Makefile.am
brlcad/trunk/src/conv/asc/asc2g.c
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/include/tclcad.h
===
--- brlcad/trunk/include/tclcad.h 2011-04-26 17:26:57 UTC (rev 44515)
+++ brlcad/trunk/include/tclcad.h 2011-04-26 19:28:16 UTC (rev 44516)
@@ -74,9 +74,14 @@
TCLCAD_EXPORT TCLCAD_EXTERN(void tclcad_tcl_library, (Tcl_Interp *interp));
TCLCAD_EXPORT TCLCAD_EXTERN(int Tclcad_Init, (Tcl_Interp *interp));
-/* defined in tcl.c */
+/* defined in tclcad_obj.c */
TCLCAD_EXPORT BU_EXTERN(int Go_Init,
(Tcl_Interp *interp));
+TCLCAD_EXPORT BU_EXTERN(int to_open_tcl,
+ (ClientData UNUSED(clientData),
+Tcl_Interp *interp,
+int argc,
+const char **argv));
__END_DECLS
Modified: brlcad/trunk/src/conv/CMakeLists.txt
===
--- brlcad/trunk/src/conv/CMakeLists.txt2011-04-26 17:26:57 UTC (rev
44515)
+++ brlcad/trunk/src/conv/CMakeLists.txt2011-04-26 19:28:16 UTC (rev
44516)
@@ -21,7 +21,7 @@
BRLCAD_ADDEXEC(3dm-g 3dm/3dm-g.cpp libwdb ${OPENNURBS_LIBRARY})
set_target_properties(3dm-g PROPERTIES COMPILE_DEFINITIONS OBJ_BREP=1)
-BRLCAD_ADDEXEC(asc2g asc/asc2g.c libged libwdb librt libbu ${WINSOCK_LIB})
+BRLCAD_ADDEXEC(asc2g asc/asc2g.c libged libwdb librt libbu libtclcad
${WINSOCK_LIB})
BRLCAD_ADDEXEC(asc2pix asc/asc2pix.c libbu)
Modified: brlcad/trunk/src/conv/Makefile.am
===
--- brlcad/trunk/src/conv/Makefile.am 2011-04-26 17:26:57 UTC (rev 44515)
+++ brlcad/trunk/src/conv/Makefile.am 2011-04-26 19:28:16 UTC (rev 44516)
@@ -125,7 +125,7 @@
asc2g_SOURCES = asc/asc2g.c
asc2g_CFLAGS = ${STRICT_FLAGS} ${TCL_CPPFLAGS}
-asc2g_LDADD = ${WDB} ${GED}
+asc2g_LDADD = ${WDB} ${TCLCAD} ${GED}
# static is required to avoid MIPSpro 7.3 long rpath linker bug
if LINK_STATIC_REQUIRED
asc2g_LDFLAGS = -static
Modified: brlcad/trunk/src/conv/asc/asc2g.c
===
--- brlcad/trunk/src/conv/asc/asc2g.c 2011-04-26 17:26:57 UTC (rev 44515)
+++ brlcad/trunk/src/conv/asc/asc2g.c 2011-04-26 19:28:16 UTC (rev 44516)
@@ -43,6 +43,7 @@
#include ged.h
#include wdb.h
#include mater.h
+#include tclcad.h
/* maximum input line buffer size */
@@ -1761,23 +1762,36 @@
/* this is a Tcl script */
-
rewind(ifp);
bu_vls_trunc( line, 0);
- /* No longer need ifp
- fclose(ifp); ifp = NULL; */
-
BU_LIST_INIT(rt_g.rtg_headwdb.l);
interp = Tcl_CreateInterp();
- if (wdb_init_obj(interp, ofp, db_name) != TCL_OK ||
- wdb_create_cmd(interp, ofp, db_name) != TCL_OK) {
- bu_exit(1, Failed to initialize wdb_obj!\n);
+ Go_Init(interp);
+ wdb_close(ofp);
+
+ {
+ int ac = 4;
+ const char *av[5];
+
+ av[0] = to_open;
+ av[1] = db_name;
+ av[2] = db;
+ av[3] = argv[2];
+ av[4] = (char *)0;
+
+ if (to_open_tcl((ClientData)0, interp, ac, av) != TCL_OK) {
+ fclose(ifp);
+ bu_log(Failed to initialize tclcad_obj!\n);
+ Tcl_Exit(1);
+ }
}
/* Create the safe interpreter */
if ((safe_interp = Tcl_CreateSlave(interp, slave_name, 1)) == NULL) {
- bu_exit(1, Failed to create safe interpreter);
+ fclose(ifp);
+ bu_log(Failed to create safe interpreter);
+ Tcl_Exit(1);
}
/* Create aliases */
@@ -1799,6 +1813,7 @@
while ((gettclblock(line,ifp)) = 0)
{
if (Tcl_Eval(safe_interp, (const char *)bu_vls_addr(line)) !=
TCL_OK) {
+ fclose(ifp);
bu_log(Failed to process input file (%s)!\n, argv[1]);
bu_log(%s\n, Tcl_GetStringResult(safe_interp));
Tcl_Exit(1);
@@ -1807,12 +1822,12 @@
}
/* free up our resources */
- mk_write_color_table(ofp);
- wdb_close(ofp); ofp = NULL;
bu_vls_free(line);
bu_vls_free(str_title);
bu_vls_free(str_put);
+ fclose(ifp);
+
Tcl_Exit(0);
} else {
bu_vls_free(line);
@@ -1935,7 +1950,7 @@
fclose(ifp); ifp = NULL;
wdb_close(ofp); ofp = NULL;
-Tcl_Exit(0);
+bu_exit(0, );
return 0;
}
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
[brlcad-commits] SF.net SVN: brlcad:[44536] brlcad/trunk/src/Makefile.am
Revision: 44536 http://brlcad.svn.sourceforge.net/brlcad/?rev=44536view=rev Author: bob1961 Date: 2011-04-29 20:07:54 + (Fri, 29 Apr 2011) Log Message: --- Promote libdm and libtclcad from kitchensink_dirs to bench_dirs. Reason - asc2g needs libtclcad. Modified Paths: -- brlcad/trunk/src/Makefile.am Modified: brlcad/trunk/src/Makefile.am === --- brlcad/trunk/src/Makefile.am2011-04-29 19:59:57 UTC (rev 44535) +++ brlcad/trunk/src/Makefile.am2011-04-29 20:07:54 UTC (rev 44536) @@ -48,6 +48,8 @@ libged \ liboptical \ liborle \ + libdm \ + libtclcad \ conv \ fbserv \ rt @@ -55,11 +57,9 @@ # anything not included from above kitchensink_dirs = \ libcursor \ - libdm \ libfft \ libicv \ libmultispectral \ - libtclcad \ libtermio \ adrt \ anim \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- WhatsUp Gold - Download Free Network Management Software The most intuitive, comprehensive, and cost-effective network management toolset available today. Delivers lowest initial acquisition cost and overall TCO of any competing solution. http://p.sf.net/sfu/whatsupgold-sd ___ 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:[44537] brlcad/trunk/include/raytrace.h
Revision: 44537 http://brlcad.svn.sourceforge.net/brlcad/?rev=44537view=rev Author: bob1961 Date: 2011-04-29 20:10:32 + (Fri, 29 Apr 2011) Log Message: --- Added RT_APPLICATION_NULL macro. Modified Paths: -- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h === --- brlcad/trunk/include/raytrace.h 2011-04-29 20:07:54 UTC (rev 44536) +++ brlcad/trunk/include/raytrace.h 2011-04-29 20:10:32 UTC (rev 44537) @@ -1671,6 +1671,7 @@ int b_return; }; +#define RT_APPLICATION_NULL ((struct application *)0) #define RT_AFN_NULL((int (*)(struct application *, struct partition *, struct region *, struct region *, struct partition *))NULL) #define RT_CK_AP(_p) BU_CKMAG(_p, RT_AP_MAGIC, struct application) #define RT_CK_APPLICATION(_p) BU_CKMAG(_p, RT_AP_MAGIC, struct application) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- WhatsUp Gold - Download Free Network Management Software The most intuitive, comprehensive, and cost-effective network management toolset available today. Delivers lowest initial acquisition cost and overall TCO of any competing solution. http://p.sf.net/sfu/whatsupgold-sd ___ 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:[44538] brlcad/trunk/include/ged.h
Revision: 44538 http://brlcad.svn.sourceforge.net/brlcad/?rev=44538view=rev Author: bob1961 Date: 2011-04-29 20:12:39 + (Fri, 29 Apr 2011) Log Message: --- Add enclosing parens to a few NULL macros. Modified Paths: -- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h === --- brlcad/trunk/include/ged.h 2011-04-29 20:10:32 UTC (rev 44537) +++ brlcad/trunk/include/ged.h 2011-04-29 20:12:39 UTC (rev 44538) @@ -70,18 +70,18 @@ #define INV_GED_V 0.00048828125 #define INV_4096_V 0.000244140625 -#define GED_NULL (struct ged *)0 -#define GED_DISPLAY_LIST_NULL (struct ged_display_list *)0 -#define GED_DRAWABLE_NULL (struct ged_drawable *)0 -#define GED_VIEW_NULL (struct ged_view *)0 -#define GED_DM_VIEW_NULL (struct ged_dm_view *)0 -#define GED_OBJ_NULL (struct ged_obj *)0 +#define GED_NULL ((struct ged *)0) +#define GED_DISPLAY_LIST_NULL ((struct ged_display_list *)0) +#define GED_DRAWABLE_NULL ((struct ged_drawable *)0) +#define GED_VIEW_NULL ((struct ged_view *)0) +#define GED_DM_VIEW_NULL ((struct ged_dm_view *)0) +#define GED_OBJ_NULL ((struct ged_obj *)0) #define GED_VIEW_OBJ_NULL ((struct view_obj *)0) #define GED_RESULT_NULL ((void *)0) -#define GED_FUNC_PTR_NULL (ged_func_ptr)0 -#define GED_REFRESH_CALLBACK_PTR_NULL (ged_refresh_callback_ptr)0 +#define GED_FUNC_PTR_NULL ((ged_func_ptr)0) +#define GED_REFRESH_CALLBACK_PTR_NULL ((ged_refresh_callback_ptr)0) #define GED_IDLE_MODE 0 #define GED_ROTATE_MODE 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- WhatsUp Gold - Download Free Network Management Software The most intuitive, comprehensive, and cost-effective network management toolset available today. Delivers lowest initial acquisition cost and overall TCO of any competing solution. http://p.sf.net/sfu/whatsupgold-sd ___ 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:[44605] brlcad/trunk/src/rt
Revision: 44605
http://brlcad.svn.sourceforge.net/brlcad/?rev=44605view=rev
Author: bob1961
Date: 2011-05-10 20:00:04 + (Tue, 10 May 2011)
Log Message:
---
Fix rt commands use of -c orientation subcommand.
Modified Paths:
--
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/rt/main.c
brlcad/trunk/src/rt/opt.c
Modified: brlcad/trunk/src/rt/do.c
===
--- brlcad/trunk/src/rt/do.c2011-05-10 19:28:17 UTC (rev 44604)
+++ brlcad/trunk/src/rt/do.c2011-05-10 20:00:04 UTC (rev 44605)
@@ -59,6 +59,10 @@
extern void grid_setup(void);
extern void worker(int cpu, genptr_t arg);
+/* variables shared with opt.c */
+extern int orientflag; /* 1 means orientation has been set */
+/* end variables shared with opt.c */
+
/* variables shared with rt.c */
extern char *string_pix_start; /* string spec of starting pixel */
extern char *string_pix_end; /* string spec of ending pixel */
@@ -285,6 +289,7 @@
for (i=0; i4; i++)
quat[i] = atof(argv[i+1]);
quat_quat2mat(Viewrotscale, quat);
+orientflag = 1;
return 0;
}
Modified: brlcad/trunk/src/rt/main.c
===
--- brlcad/trunk/src/rt/main.c 2011-05-10 19:28:17 UTC (rev 44604)
+++ brlcad/trunk/src/rt/main.c 2011-05-10 20:00:04 UTC (rev 44605)
@@ -82,6 +82,7 @@
long n_free;
long n_realloc;
extern int matflag;/* read matrix from stdin */
+extern int orientflag; /* 1 means orientation has been set */
extern int desiredframe; /* frame to start at */
extern int curframe; /* current frame number,
* also shared with view.c */
@@ -452,8 +453,11 @@
if (!matflag) {
int frame_retval;
+
def_tree(rtip); /* Load the default trees */
- do_ae(azimuth, elevation);
+ /* orientation command has not been used */
+ if (!orientflag)
+ do_ae(azimuth, elevation);
frame_retval = do_frame(curframe);
if (frame_retval != 0) {
/* Release the framebuffer, if any */
Modified: brlcad/trunk/src/rt/opt.c
===
--- brlcad/trunk/src/rt/opt.c 2011-05-10 19:28:17 UTC (rev 44604)
+++ brlcad/trunk/src/rt/opt.c 2011-05-10 20:00:04 UTC (rev 44605)
@@ -107,6 +107,7 @@
intnobjs = 0; /* Number of cmd-line treetops */
char **objtab = (char **)NULL; /* array of treetop strings */
intmatflag = 0;/* read matrix from stdin */
+intorientflag = 0; /* 1 means orientation has been set */
intdesiredframe = 0; /* frame to start at */
intfinalframe = -1;/* frame to halt at */
intcurframe = 0; /* current frame number,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
___
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:[44630] brlcad/trunk
Revision: 44630
http://brlcad.svn.sourceforge.net/brlcad/?rev=44630view=rev
Author: bob1961
Date: 2011-05-18 19:37:14 + (Wed, 18 May 2011)
Log Message:
---
Colors were not getting imported for combinations. Standardized attributes on
import before calling object specific import func. Moved ATTR enum definitions
from db5_types.c to raytrace.h
Modified Paths:
--
brlcad/trunk/include/raytrace.h
brlcad/trunk/src/librt/comb/comb.c
brlcad/trunk/src/librt/db5_io.c
brlcad/trunk/src/librt/db5_types.c
Modified: brlcad/trunk/include/raytrace.h
===
--- brlcad/trunk/include/raytrace.h 2011-05-18 16:58:47 UTC (rev 44629)
+++ brlcad/trunk/include/raytrace.h 2011-05-18 19:37:14 UTC (rev 44630)
@@ -6054,6 +6054,24 @@
/**
+ * Define standard attribute types in BRL-CAD geometry. (See the
+ * gattributes manual page) these should be a collective enumeration
+ * starting from 0 and increasing without any gaps in the numbers so
+ * db5_standard_attribute() can be used as an index-based iterator.
+ */
+enum {
+ATTR_REGION = 0,
+ATTR_REGION_ID,
+ATTR_MATERIAL_ID,
+ATTR_AIR,
+ATTR_LOS,
+ATTR_COLOR,
+ATTR_SHADER,
+ATTR_INHERIT,
+ATTR_NULL
+};
+
+/**
* D B 5 _ S T A N D A R D _ A T T R I B U T E
*
* Function returns the string name for a given standard attribute
Modified: brlcad/trunk/src/librt/comb/comb.c
===
--- brlcad/trunk/src/librt/comb/comb.c 2011-05-18 16:58:47 UTC (rev 44629)
+++ brlcad/trunk/src/librt/comb/comb.c 2011-05-18 19:37:14 UTC (rev 44630)
@@ -722,7 +722,8 @@
/* Unpack the attributes */
comb-rgb_valid = 0;
-if ((ap = bu_avs_get(ip-idb_avs, rgb)) != NULL) {
+
+if ((ap = bu_avs_get(ip-idb_avs, db5_standard_attribute(ATTR_COLOR))) !=
NULL) {
int ibuf[3];
if (sscanf(ap, %d/%d/%d, ibuf, ibuf+1, ibuf+2) == 3) {
VMOVE(comb-rgb, ibuf);
@@ -731,10 +732,10 @@
bu_log(unable to parse 'rgb' attribute '%s'\n, ap);
}
}
-if ((ap = bu_avs_get(ip-idb_avs, inherit)) != NULL) {
+if ((ap = bu_avs_get(ip-idb_avs, db5_standard_attribute(ATTR_INHERIT)))
!= NULL) {
comb-inherit = atoi(ap);
}
-if ((ap = bu_avs_get(ip-idb_avs, region)) != NULL) {
+if ((ap = bu_avs_get(ip-idb_avs, db5_standard_attribute(ATTR_REGION)))
!= NULL) {
/* Presence of this attribute implies it is a region */
comb-region_flag = 1;
@@ -758,20 +759,20 @@
}
/* get the other GIFT region attributes */
- if ((ap = bu_avs_get(ip-idb_avs, region_id)) != NULL) {
+ if ((ap = bu_avs_get(ip-idb_avs,
db5_standard_attribute(ATTR_REGION_ID))) != NULL) {
comb-region_id = atol(ap);
}
- if ((ap = bu_avs_get(ip-idb_avs, aircode)) != NULL) {
+ if ((ap = bu_avs_get(ip-idb_avs, db5_standard_attribute(ATTR_AIR)))
!= NULL) {
comb-aircode = atol(ap);
}
- if ((ap = bu_avs_get(ip-idb_avs, material_id)) != NULL) {
+ if ((ap = bu_avs_get(ip-idb_avs,
db5_standard_attribute(ATTR_MATERIAL_ID))) != NULL) {
comb-GIFTmater = atol(ap);
}
- if ((ap = bu_avs_get(ip-idb_avs, los)) != NULL) {
+ if ((ap = bu_avs_get(ip-idb_avs, db5_standard_attribute(ATTR_LOS)))
!= NULL) {
comb-los = atol(ap);
}
}
-if ((ap = bu_avs_get(ip-idb_avs, shader)) != NULL) {
+if ((ap = bu_avs_get(ip-idb_avs, db5_standard_attribute(ATTR_SHADER)))
!= NULL) {
bu_vls_strcat(comb-shader, ap);
}
Modified: brlcad/trunk/src/librt/db5_io.c
===
--- brlcad/trunk/src/librt/db5_io.c 2011-05-18 16:58:47 UTC (rev 44629)
+++ brlcad/trunk/src/librt/db5_io.c 2011-05-18 19:37:14 UTC (rev 44630)
@@ -1014,6 +1014,8 @@
name);
return -8;
}
+
+ (void)db5_standardize_avs(ip-idb_avs);
}
if (!raw.body.ext_buf) {
Modified: brlcad/trunk/src/librt/db5_types.c
===
--- brlcad/trunk/src/librt/db5_types.c 2011-05-18 16:58:47 UTC (rev 44629)
+++ brlcad/trunk/src/librt/db5_types.c 2011-05-18 19:37:14 UTC (rev 44630)
@@ -37,26 +37,7 @@
#include db5.h
#include raytrace.h
-/**
- * Define standard attribute types in BRL-CAD geometry. (See the
- * gattributes manual page) these should be a collective enumeration
- * starting from 0 and increasing without any gaps in the numbers so
- * db5_standard_attribute() can be used as an index-based iterator.
- */
-enum {
-ATTR_REGION = 0,
-ATTR_REGION_ID,
-ATTR_MATERIAL_ID,
-ATTR_AIR,
-ATTR_LOS,
-ATTR_COLOR,
-ATTR_SHADER,
-ATTR_INHERIT,
-ATTR_NULL
-};
-
-
struct db5_type {
int major_code;
int minor_code;
This was sent by the SourceForge.net
[brlcad-commits] SF.net SVN: brlcad:[44644] brlcad/trunk/src/libdm/dm-ogl.c
Revision: 44644
http://brlcad.svn.sourceforge.net/brlcad/?rev=44644view=rev
Author: bob1961
Date: 2011-05-20 13:13:06 + (Fri, 20 May 2011)
Log Message:
---
Minor mod.
Modified Paths:
--
brlcad/trunk/src/libdm/dm-ogl.c
Modified: brlcad/trunk/src/libdm/dm-ogl.c
===
--- brlcad/trunk/src/libdm/dm-ogl.c 2011-05-20 12:03:59 UTC (rev 44643)
+++ brlcad/trunk/src/libdm/dm-ogl.c 2011-05-20 13:13:06 UTC (rev 44644)
@@ -1464,19 +1464,18 @@
bu_log( %d (%g %g %g)\n, *cmd, V3ARGS(pt));
switch (*cmd) {
case BN_VLIST_LINE_MOVE:
+ case BN_VLIST_LINE_DRAW:
break;
case BN_VLIST_POLY_START:
-
/* Start poly marker normal */
if (first == 0)
glEnd();
+ first = 0;
glBegin(GL_POLYGON);
/* Set surface normal (vl_pnt points outward) */
glNormal3dv(*pt);
break;
- case BN_VLIST_LINE_DRAW:
- break;
case BN_VLIST_POLY_MOVE:
case BN_VLIST_POLY_DRAW:
glVertex3dv(*pt);
@@ -1528,6 +1527,7 @@
/* Start poly marker normal */
if (first == 0)
glEnd();
+ first = 0;
glBegin(GL_LINE_STRIP);
break;
@@ -1618,6 +1618,7 @@
/* Start poly marker normal */
if (first == 0)
glEnd();
+ first = 0;
if (dmp-dm_light mflag) {
mflag = 0;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
___
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:[44645] brlcad/trunk/src/libdm/dm-wgl.c
Revision: 44645
http://brlcad.svn.sourceforge.net/brlcad/?rev=44645view=rev
Author: bob1961
Date: 2011-05-20 13:18:53 + (Fri, 20 May 2011)
Log Message:
---
Copy points/vectors to an array of GLdouble before sending to OpenGL. This
seems to have remedied a bit of strange behavior seen only on windows (i.e.
data arrows were sometimes being drawn incorrectly).
Modified Paths:
--
brlcad/trunk/src/libdm/dm-wgl.c
Modified: brlcad/trunk/src/libdm/dm-wgl.c
===
--- brlcad/trunk/src/libdm/dm-wgl.c 2011-05-20 13:13:06 UTC (rev 44644)
+++ brlcad/trunk/src/libdm/dm-wgl.c 2011-05-20 13:18:53 UTC (rev 44645)
@@ -962,36 +962,41 @@
register intnused = tvp-nused;
register int*cmd = tvp-cmd;
register point_t *pt = tvp-pt;
+ GLdouble glpt[3];
for (i = 0; i nused; i++, cmd++, pt++) {
if (dmp-dm_debugLevel 2)
bu_log( %d (%g %g %g)\n, *cmd, V3ARGS(pt));
switch (*cmd) {
case BN_VLIST_LINE_MOVE:
+ case BN_VLIST_LINE_DRAW:
break;
case BN_VLIST_POLY_START:
/* Start poly marker normal */
if (first == 0)
glEnd();
+ first = 0;
glBegin(GL_POLYGON);
/* Set surface normal (vl_pnt points outward) */
- glNormal3dv(*pt);
+ VMOVE(glpt, *pt);
+ glNormal3dv(glpt);
break;
- case BN_VLIST_LINE_DRAW:
- break;
case BN_VLIST_POLY_MOVE:
case BN_VLIST_POLY_DRAW:
- glVertex3dv(*pt);
+ VMOVE(glpt, *pt);
+ glVertex3dv(glpt);
break;
case BN_VLIST_POLY_END:
/* Draw, End Polygon */
- glVertex3dv(*pt);
+ VMOVE(glpt, *pt);
+ glVertex3dv(glpt);
glEnd();
first = 1;
break;
case BN_VLIST_POLY_VERTNORM:
/* Set per-vertex normal. Given before vert. */
- glNormal3dv(*pt);
+ VMOVE(glpt, *pt);
+ glNormal3dv(glpt);
break;
}
}
@@ -1000,7 +1005,6 @@
if (first == 0)
glEnd();
-
/* Last, draw wireframe/edges. */
/* Set color to wireColor for drawing wireframe/edges */
@@ -1013,6 +1017,7 @@
register intnused = tvp-nused;
register int*cmd = tvp-cmd;
register point_t *pt = tvp-pt;
+ GLdouble glpt[3];
for (i = 0; i nused; i++, cmd++, pt++) {
if (dmp-dm_debugLevel 2)
bu_log( %d (%g %g %g)\n, *cmd, V3ARGS(pt));
@@ -1024,28 +1029,33 @@
first = 0;
glBegin(GL_LINE_STRIP);
- glVertex3dv(*pt);
+ VMOVE(glpt, *pt);
+ glVertex3dv(glpt);
break;
case BN_VLIST_POLY_START:
/* Start poly marker normal */
if (first == 0)
glEnd();
+ first = 0;
glBegin(GL_LINE_STRIP);
break;
case BN_VLIST_LINE_DRAW:
case BN_VLIST_POLY_MOVE:
case BN_VLIST_POLY_DRAW:
- glVertex3dv(*pt);
+ VMOVE(glpt, *pt);
+ glVertex3dv(glpt);
break;
case BN_VLIST_POLY_END:
/* Draw, End Polygon */
- glVertex3dv(*pt);
+ VMOVE(glpt, *pt);
+ glVertex3dv(glpt);
glEnd();
first = 1;
break;
case BN_VLIST_POLY_VERTNORM:
/* Set per-vertex normal. Given before vert. */
+ VMOVE(glpt, glpt);
glNormal3dv(*pt);
break;
}
@@ -1088,10 +1098,11 @@
/* Viewing region is from -1.0 to +1.0 */
first = 1;
for (BU_LIST_FOR(tvp, bn_vlist, vp-l)) {
- int i;
- int nused = tvp-nused;
- int *cmd = tvp-cmd;
- point_t *pt = tvp-pt;
+ register inti;
+ register intnused = tvp-nused;
+ register int*cmd = tvp-cmd;
+ register point_t *pt = tvp-pt;
+ GLdouble glpt[3];
for (i = 0; i nused; i++, cmd++, pt++) {
if (dmp-dm_debugLevel 2)
bu_log( %d (%g %g %g)\n, *cmd, V3ARGS(pt));
@@ -1114,12 +1125,14 @@
}
glBegin(GL_LINE_STRIP);
- glVertex3dv(*pt);
+ VMOVE(glpt, *pt
[brlcad-commits] SF.net SVN: brlcad:[44700] brlcad/trunk/src/other/iwidgets/generic
Revision: 44700
http://brlcad.svn.sourceforge.net/brlcad/?rev=44700view=rev
Author: bob1961
Date: 2011-05-26 20:38:10 + (Thu, 26 May 2011)
Log Message:
---
Temporarily deleted a few troublesome options that currently break things like
iwidgets::fileselectionbox and rtwizard. Need to find out what's really going
on here.
Modified Paths:
--
brlcad/trunk/src/other/iwidgets/generic/fileselectionbox.itk
brlcad/trunk/src/other/iwidgets/generic/fileselectiondialog.itk
brlcad/trunk/src/other/iwidgets/generic/scrolledlistbox.itk
brlcad/trunk/src/other/iwidgets/generic/scrolledtext.itk
Modified: brlcad/trunk/src/other/iwidgets/generic/fileselectionbox.itk
===
--- brlcad/trunk/src/other/iwidgets/generic/fileselectionbox.itk
2011-05-26 18:05:31 UTC (rev 44699)
+++ brlcad/trunk/src/other/iwidgets/generic/fileselectionbox.itk
2011-05-26 20:38:10 UTC (rev 44700)
@@ -38,11 +38,11 @@
# Usual options.
#
itk::usual Fileselectionbox {
-keep -activebackground -activerelief -background -borderwidth -cursor \
- -elementborderwidth -foreground -highlightcolor -highlightthickness \
+keep -background -borderwidth -cursor \
+ -foreground -highlightcolor -highlightthickness \
-insertbackground -insertborderwidth -insertofftime -insertontime \
- -insertwidth -jump -labelfont -selectbackground -selectborderwidth \
- -textbackground -textfont -troughcolor
+ -insertwidth -labelfont -selectbackground -selectborderwidth \
+ -textbackground -textfont
}
# --
Modified: brlcad/trunk/src/other/iwidgets/generic/fileselectiondialog.itk
===
--- brlcad/trunk/src/other/iwidgets/generic/fileselectiondialog.itk
2011-05-26 18:05:31 UTC (rev 44699)
+++ brlcad/trunk/src/other/iwidgets/generic/fileselectiondialog.itk
2011-05-26 20:38:10 UTC (rev 44700)
@@ -38,10 +38,10 @@
# Usual options.
#
itk::usual Fileselectiondialog {
-keep -activebackground -activerelief -background -borderwidth -cursor \
--elementborderwidth -foreground -highlightcolor -highlightthickness \
+keep -background -borderwidth -cursor \
+-foreground -highlightcolor -highlightthickness \
-insertbackground -insertborderwidth -insertofftime -insertontime \
--insertwidth -jump -labelfont -modality -selectbackground \
+-insertwidth -labelfont -modality -selectbackground \
-selectborderwidth -textbackground -textfont
}
Modified: brlcad/trunk/src/other/iwidgets/generic/scrolledlistbox.itk
===
--- brlcad/trunk/src/other/iwidgets/generic/scrolledlistbox.itk 2011-05-26
18:05:31 UTC (rev 44699)
+++ brlcad/trunk/src/other/iwidgets/generic/scrolledlistbox.itk 2011-05-26
20:38:10 UTC (rev 44700)
@@ -38,10 +38,10 @@
# Usual options.
#
itk::usual Scrolledlistbox {
-keep -activebackground -activerelief -background -borderwidth -cursor \
- -elementborderwidth -foreground -highlightcolor -highlightthickness \
- -jump -labelfont -selectbackground -selectborderwidth \
- -selectforeground -textbackground -textfont -troughcolor
+keep -background -borderwidth -cursor \
+ -foreground -highlightcolor -highlightthickness \
+ -labelfont -selectbackground -selectborderwidth \
+ -selectforeground -textbackground -textfont
}
# --
Modified: brlcad/trunk/src/other/iwidgets/generic/scrolledtext.itk
===
--- brlcad/trunk/src/other/iwidgets/generic/scrolledtext.itk2011-05-26
18:05:31 UTC (rev 44699)
+++ brlcad/trunk/src/other/iwidgets/generic/scrolledtext.itk2011-05-26
20:38:10 UTC (rev 44700)
@@ -40,11 +40,11 @@
# Usual options.
#
itk::usual Scrolledtext {
-keep -activebackground -activerelief -background -borderwidth -cursor \
--elementborderwidth -foreground -highlightcolor -highlightthickness \
+keep -background -borderwidth -cursor \
+-foreground -highlightcolor -highlightthickness \
-insertbackground -insertborderwidth -insertofftime -insertontime \
--insertwidth -jump -labelfont -selectbackground -selectborderwidth \
--selectforeground -textbackground -textfont -troughcolor
+-insertwidth -labelfont -selectbackground -selectborderwidth \
+-selectforeground -textbackground -textfont
}
# --
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
vRanger cuts backup time in half-while
[brlcad-commits] SF.net SVN: brlcad:[44717] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 44717
http://brlcad.svn.sourceforge.net/brlcad/?rev=44717view=rev
Author: bob1961
Date: 2011-05-31 17:27:32 + (Tue, 31 May 2011)
Log Message:
---
Removed bot2pipe from mArcherCoreCommands.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-05-31 16:26:16 UTC
(rev 44716)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-05-31 17:27:32 UTC
(rev 44717)
@@ -436,7 +436,7 @@
# a few commands that are implemented here in ArcherCore.
variable mArcherCoreCommands { \
3ptarb adjust arced attr bb bev
blast bo \
- bot bot2pipe bot_condense
bot_decimate bot_face_fuse \
+ bot bot_condense bot_decimate
bot_face_fuse \
bot_face_sort bot_flip bot_merge
bot_smooth bot_split bot_sync bot_vertex_fuse \
c cd clear clone color comb
comb_color combmem copy copyeval copymat \
cp cpi dbconcat dbExpand decompose
delete draw E edcodes edcolor edcomb \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
___
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:[44718] brlcad/trunk/src/tclscripts/archer
Revision: 44718
http://brlcad.svn.sourceforge.net/brlcad/?rev=44718view=rev
Author: bob1961
Date: 2011-06-01 13:03:39 + (Wed, 01 Jun 2011)
Log Message:
---
Needed to override ArcherCore::cmd because core commands added in Archer
(including Core plugins) were not getting recognized. Added code to append core
commands coming from plugins to mArcherCoreCommands.
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 2011-05-31 17:27:32 UTC
(rev 44717)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-06-01 13:03:39 UTC
(rev 44718)
@@ -110,6 +110,15 @@
} {}
destructor {}
+
+# Dynamically load methods
+if {$Archer::methodDecls != } {
+ foreach meth $::Archer::methodDecls {
+ eval $meth
+ }
+}
+
+
public {
# Public Class Variables
common LEDGER_ENTRY_OUT_OF_SYNC_ATTR Ledger_Entry_Out_Of_Sync
@@ -158,6 +167,7 @@
method raytracePlus {}
# ArcherCore Override Section
+ method cmd {args}
method 3ptarb {args}
method attr{args}
method bo {args}
@@ -496,7 +506,11 @@
# CONSTRUCTOR
#
::itcl::body Archer::constructor {{_viewOnly 0} {_noCopy 0} args} {
+
# Append a few more commands
+if {$Archer::extraMgedCommands != } {
+ eval lappend mArcherCoreCommands $Archer::extraMgedCommands
+}
lappend mArcherCoreCommands importFg4Sections
if {!$mViewOnly} {
@@ -983,6 +997,15 @@
}
+::itcl::body Archer::cmd {args} {
+set mCoreCmdLevel 1
+set ret [eval ArcherCore::cmd $args]
+set mCoreCmdLevel 0
+
+return $ret
+}
+
+
::itcl::body Archer::3ptarb {args} {
eval ArcherCore::gedWrapper 3ptarb 0 0 1 1 $args
}
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-05-31 17:27:32 UTC
(rev 44717)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-06-01 13:03:39 UTC
(rev 44718)
@@ -670,6 +670,8 @@
variable mNodeDrawList
variable mAffectedNodeList
+ variable mCoreCmdLevel 0
+
# init functions
method initImages {}
method initTree {}
@@ -2844,8 +2846,8 @@
return
}
-set arg1 [lindex $args 1]
if {$cmd == info} {
+ set arg1 [lindex $args 1]
switch $arg1 {
function {
if {[llength $args] == 3} {
@@ -2872,7 +2874,7 @@
set i [lsearch -exact $mArcherCoreCommands $cmd]
if {$i != -1} {
addHistory $args
- return [eval $args]
+ return [uplevel $mCoreCmdLevel $args]
}
set i [lsearch -exact $mUnwrappedDbCommands $cmd]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
___
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:[45077] brlcad/trunk/src/libbu/basenametester.c
Revision: 45077
http://brlcad.svn.sourceforge.net/brlcad/?rev=45077view=rev
Author: bob1961
Date: 2011-06-16 20:25:10 + (Thu, 16 Jun 2011)
Log Message:
---
Call basename if HAVE_BASENAME.
Modified Paths:
--
brlcad/trunk/src/libbu/basenametester.c
Modified: brlcad/trunk/src/libbu/basenametester.c
===
--- brlcad/trunk/src/libbu/basenametester.c 2011-06-16 20:12:35 UTC (rev
45076)
+++ brlcad/trunk/src/libbu/basenametester.c 2011-06-16 20:25:10 UTC (rev
45077)
@@ -36,17 +36,20 @@
automatic_test(const char *input)
{
-char *ans, buf_input[1000];
-char *res;
+char *ans = NULL;
+char buf_input[1000];
+char *res = NULL;
if (input)
bu_strlcpy(buf_input, input, strlen(input)+1);
+#ifdef HAVE_BASENAME
/* build UNIX 'basename' command */
if (!input)
ans = basename(NULL);
else
ans = basename(buf_input);
+#endif
if (!input)
res = bu_basename(NULL);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
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:[45079] brlcad/trunk/src/tclscripts/archer
Revision: 45079
http://brlcad.svn.sourceforge.net/brlcad/?rev=45079view=rev
Author: bob1961
Date: 2011-06-16 21:01:44 + (Thu, 16 Jun 2011)
Log Message:
---
Make it so that a canvas located toolbar or menu is allowed only if mViewOnly
is true.
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 2011-06-16 20:26:50 UTC
(rev 45078)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-06-16 21:01:44 UTC
(rev 45079)
@@ -1673,7 +1673,7 @@
grid forget $itk_component(canvas)
if {!$mViewOnly} {
- grid $itk_component(ged) -row 1 -column 0 -columnspan 3 -sticky news
+ grid $itk_component(ged) -row 0 -column 0 -columnspan 3 -sticky news
after idle $this component cmd configure -cmd_prefix \[namespace
tail $this] cmd\
} else {
grid $itk_component(ged) -row 1 -column 0 -sticky news
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-06-16 20:26:50 UTC
(rev 45078)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-06-16 21:01:44 UTC
(rev 45079)
@@ -912,7 +912,7 @@
-relief sunken
} {}
-if {!$mNoToolbar} {
+if {$mViewOnly !$mNoToolbar} {
itk_component add canvas_menu {
::iwidgets::menubar $itk_component(canvasF).canvas_menu \
-helpvariable [::itcl::scope mStatusStr] \
@@ -935,14 +935,9 @@
-borderwidth 0 \
-relief flat
} {}
- if {!$mNoToolbar} {
- grid $itk_component(canvas_menu) -row 0 -column 1 -sticky w
- grid $itk_component(canvas) -row 1 -column 0 -columnspan 3 -sticky
news
- grid rowconfigure $itk_component(canvasF) 1 -weight 1
- } else {
- grid $itk_component(canvas) -row 0 -column 0 -columnspan 3 -sticky
news
- grid rowconfigure $itk_component(canvasF) 0 -weight 1
- }
+
+ grid $itk_component(canvas) -row 0 -column 0 -columnspan 3 -sticky news
+ grid rowconfigure $itk_component(canvasF) 0 -weight 1
grid columnconfigure $itk_component(canvasF) 1 -weight 1
# status bar
@@ -1208,7 +1203,7 @@
}
::itcl::body ArcherCore::buildCanvasMenubar {} {
-if {!$mNoToolbar} {
+if {$mViewOnly !$mNoToolbar} {
# View Menu
$itk_component(canvas_menu) add menubutton view \
-text View -menu {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
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:[45097] brlcad/trunk/src
Revision: 45097
http://brlcad.svn.sourceforge.net/brlcad/?rev=45097view=rev
Author: bob1961
Date: 2011-06-17 17:57:17 + (Fri, 17 Jun 2011)
Log Message:
---
A few more modes to accommodate windows.
Modified Paths:
--
brlcad/trunk/src/libtclcad/tclcad_obj.c
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2011-06-17 15:18:13 UTC (rev
45096)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2011-06-17 17:57:17 UTC (rev
45097)
@@ -3544,18 +3544,21 @@
gdvp-gdv_name);
/* Mouse Bindings */
-bu_vls_printf(bindings, bind %V 2 {%V vslew %V %%x %%y; break}; ,
+bu_vls_printf(bindings, bind %V 2 {%V vslew %V %%x %%y; focus %V;
break}; ,
gdvp-gdv_dmp-dm_pathName,
current_top-to_gop-go_name,
- gdvp-gdv_name);
-bu_vls_printf(bindings, bind %V 1 {%V zoom %V 0.5; break}; ,
+ gdvp-gdv_name,
+ gdvp-gdv_dmp-dm_pathName);
+bu_vls_printf(bindings, bind %V 1 {%V zoom %V 0.5; focus %V; break}; ,
gdvp-gdv_dmp-dm_pathName,
current_top-to_gop-go_name,
- gdvp-gdv_name);
-bu_vls_printf(bindings, bind %V 3 {%V zoom %V 2.0; break}; ,
+ gdvp-gdv_name,
+ gdvp-gdv_dmp-dm_pathName);
+bu_vls_printf(bindings, bind %V 3 {%V zoom %V 2.0; focus %V; break};
,
gdvp-gdv_dmp-dm_pathName,
current_top-to_gop-go_name,
- gdvp-gdv_name);
+ gdvp-gdv_name,
+ gdvp-gdv_dmp-dm_pathName);
/* Idle Mode */
bu_vls_printf(bindings, bind %V ButtonRelease {%V idle_mode %V;
break}; ,
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-06-17 15:18:13 UTC (rev
45096)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-06-17 17:57:17 UTC (rev
45097)
@@ -3129,7 +3129,7 @@
measure_line_erase
foreach dm {ur ul ll lr} {
- bind $itk_component($dm) $_button [::itcl::code $this pane_mouse_ray
$dm %x %y]; break
+ bind $itk_component($dm) $_button [::itcl::code $this pane_mouse_ray
$dm %x %y]; focus %W; break
bind $itk_component($dm) ButtonRelease-$_button
}
}
@@ -3138,7 +3138,7 @@
measure_line_erase
foreach dm {ur ul ll lr} {
- bind $itk_component($dm) $_button [::itcl::code $this
begin_data_arrow $dm %x %y]; break
+ bind $itk_component($dm) $_button [::itcl::code $this
begin_data_arrow $dm %x %y]; focus %W; break
bind $itk_component($dm) ButtonRelease-$_button [::itcl::code $this
end_data_arrow $dm]; break
}
}
@@ -3147,7 +3147,7 @@
measure_line_erase
foreach dm {ur ul ll lr} {
- bind $itk_component($dm) $_button [::itcl::code $this
pane_mouse_data_label $dm %x %y]; break
+ bind $itk_component($dm) $_button [::itcl::code $this
pane_mouse_data_label $dm %x %y]; focus %W; break
bind $itk_component($dm) ButtonRelease-$_button
}
}
@@ -3156,7 +3156,7 @@
measure_line_erase
foreach dm {ur ul ll lr} {
- bind $itk_component($dm) $_button [::itcl::code $this
begin_data_line $dm %x %y]; break
+ bind $itk_component($dm) $_button [::itcl::code $this
begin_data_line $dm %x %y]; focus %W; break
bind $itk_component($dm) ButtonRelease-$_button [::itcl::code $this
end_data_line $dm]; break
}
}
@@ -3165,7 +3165,7 @@
measure_line_erase
foreach dm {ur ul ll lr} {
- bind $itk_component($dm) $_button [::itcl::code $this
begin_data_move $dm %x %y]; break
+ bind $itk_component($dm) $_button [::itcl::code $this
begin_data_move $dm %x %y]; focus %W; break
bind $itk_component($dm) ButtonRelease-$_button [::itcl::code $this
end_data_move $dm]; break
}
}
@@ -3174,7 +3174,7 @@
measure_line_erase
foreach dm {ur ul ll lr} {
- bind $itk_component($dm) $_button [::itcl::code $this
pane_mouse_data_pick $dm %x %y]; break
+ bind $itk_component($dm) $_button [::itcl::code $this
pane_mouse_data_pick $dm %x %y]; focus %W; break
bind $itk_component($dm) ButtonRelease-$_button
}
}
@@ -3215,7 +3215,7 @@
measure_line_erase
foreach dm {ur ul ll lr} {
- bind $itk_component($dm) $_button $mGed vslew $itk_component($dm) %x
%y; break
+ bind $itk_component($dm) $_button $mGed vslew $itk_component($dm) %x
%y; focus %W; break
bind $itk_component($dm) ButtonRelease-$_button [::itcl::code $this
end_view_translate $dm]; break
}
}
@@ -3224,13 +3224,13 @@
measure_line_erase
foreach dm {ur ul ll lr} {
- bind $itk_component($dm) $_part1_button [::itcl::code $this
begin_view_measure $dm $_part1_button
[brlcad-commits] SF.net SVN: brlcad:[45222] brlcad/trunk/src/tclscripts/mged/text.tcl
Revision: 45222
http://brlcad.svn.sourceforge.net/brlcad/?rev=45222view=rev
Author: bob1961
Date: 2011-06-23 19:05:11 + (Thu, 23 Jun 2011)
Log Message:
---
Modified the gets proc to use the last line in getsVal.
Modified Paths:
--
brlcad/trunk/src/tclscripts/mged/text.tcl
Modified: brlcad/trunk/src/tclscripts/mged/text.tcl
===
--- brlcad/trunk/src/tclscripts/mged/text.tcl 2011-06-23 01:16:31 UTC (rev
45221)
+++ brlcad/trunk/src/tclscripts/mged/text.tcl 2011-06-23 19:05:11 UTC (rev
45222)
@@ -326,14 +326,9 @@
if {[lindex $lines end] == {}} {
set lines [lreplace $lines end end]
}
-
-if {[llength $lines] == 1} {
- set vname [lindex $lines 0]
-} else {
- # first line is the gets line, skip it
- set vname [lindex $lines 1]
-}
+set vname [lindex $lines end]
+
# if a var is provided, return the length. otherwise return the
# string itself. this matches gets behavior.
if {$len == 1} {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
___
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:[45384] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 45384
http://brlcad.svn.sourceforge.net/brlcad/?rev=45384view=rev
Author: bob1961
Date: 2011-07-05 21:29:24 + (Tue, 05 Jul 2011)
Log Message:
---
Fixed the Affected Tree/List Nodes behavior.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-07-05 20:28:15 UTC
(rev 45383)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-07-05 21:29:24 UTC
(rev 45384)
@@ -3510,8 +3510,8 @@
set mRenderMode [gedCmd how $_node]
# do this in case ev was used from the command line
-if {2 $mRenderMode} {
- set mRenderMode 2
+if {!$mEnableBigE 2 $mRenderMode} {
+ set mRenderMode 0
}
if {$_nodeType == leaf} {
@@ -3977,7 +3977,6 @@
if {$mEnableListViewAllAffected} {
foreach path [string trim [gedCmd search / -name $mSelectedObj]] {
set path [regsub {^/} $path {}]
- puts $path
foreach obj [split $path /] {
if {$obj == $mSelectedObj} {
continue
@@ -3999,11 +3998,12 @@
foreach path [string trim [gedCmd search / -name $mSelectedObj]] {
set path [regsub {^/} $path {}]
set pathNodes [getTreeNodes $path]
- set pnodes [lreverse [lindex $pathNodes 0]]
+# set pnodes [lreverse [lindex $pathNodes 0]]
+ set pnodes [lindex $pathNodes 0]
set cnodes [lindex $pathNodes 1]
set found 0
foreach pnode $pnodes {
- if {![$itk_component(newtree) item $pnode -open]} {
+ if {[$itk_component(newtree) item $pnode -open]} {
lappend mAffectedNodeList $pnode
set found 1
addTreeNodeTag $pnode $TREE_AFFECTED_TAG
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
___
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:[45553] brlcad/trunk/src/tclscripts/mged/openw.tcl
Revision: 45553
http://brlcad.svn.sourceforge.net/brlcad/?rev=45553view=rev
Author: bob1961
Date: 2011-07-20 18:39:21 + (Wed, 20 Jul 2011)
Log Message:
---
This fixes the failed browser launch on windows.
Modified Paths:
--
brlcad/trunk/src/tclscripts/mged/openw.tcl
Modified: brlcad/trunk/src/tclscripts/mged/openw.tcl
===
--- brlcad/trunk/src/tclscripts/mged/openw.tcl 2011-07-20 18:30:15 UTC (rev
45552)
+++ brlcad/trunk/src/tclscripts/mged/openw.tcl 2011-07-20 18:39:21 UTC (rev
45553)
@@ -64,7 +64,11 @@
}
if {![info exists mged_default(web_browser)]} {
-set mged_default(web_browser) /usr/bin/netscape
+if { ($::tcl_platform(platform) == windows) [file exists C:/Program
Files/Internet Explorer/iexplore.exe] } {
+ set mged_default(web_browser) C:/Program Files/Internet
Explorer/iexplore.exe
+} else {
+ set mged_default(web_browser) /usr/bin/netscape
+}
}
if {![info exists mged_color_scheme]} {
@@ -203,7 +207,7 @@
set mged_browser $mged_default(web_browser)
} else {
if { ($::tcl_platform(os) == Windows NT) [file exists C:/Program
Files/Internet Explorer/iexplore.exe] } {
- set mged_default(web_browser) C:/Program Files/Internet
Explorer/iexplore.exe
+ set mged_browser C:/Program Files/Internet Explorer/iexplore.exe
} elseif {[info exists env(PATH)]} {
set pathlist [split $env(PATH) :]
foreach path $pathlist {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
10 Tips for Better Web Security
Learn 10 ways to better secure your business today. Topics covered include:
Web security, SSL, hacker attacks Denial of Service (DoS), private keys,
security Microsoft Exchange, secure Instant Messaging, and much more.
http://www.accelacomm.com/jaw/sfnl/114/51426210/
___
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:[45926] brlcad/trunk/src/tclscripts/lib/Ged.tcl
Revision: 45926
http://brlcad.svn.sourceforge.net/brlcad/?rev=45926view=rev
Author: bob1961
Date: 2011-08-11 19:43:54 + (Thu, 11 Aug 2011)
Log Message:
---
Need to destroy the ray object whenever the ged object is destroyed or when
opening a different database. This fix was prompted by database turds being
left on Windows platforms whenever the ray object was used. That is, the ray
object also has the database copy (i.e. the turd) open and so the code that
removes the database copy fails.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-08-11 19:40:01 UTC (rev
45925)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-08-11 19:43:54 UTC (rev
45926)
@@ -656,6 +656,8 @@
variable mViewMeasureCallbacks
variable mViewRectCallbacks
+ variable mRay ray
+
method init_button_no_op_prot {{_button 1}}
method measure_line_erase {}
method multi_pane {args}
@@ -754,6 +756,7 @@
::itcl::body cadwidgets::Ged::destructor {} {
if {!$mSharedGed} {
+ catch {rename $mRay }
rename $mGed
}
}
@@ -1600,11 +1603,12 @@
}
::itcl::body cadwidgets::Ged::open {args} {
+catch {rename $mRay }
set $mGedFile [eval $mGed open $args]
}
::itcl::body cadwidgets::Ged::opendb {args} {
-set $mGedFile [eval $mGed open $args]
+eval open $args
}
::itcl::body cadwidgets::Ged::orient {args} {
@@ -3546,12 +3550,12 @@
set result
catch {
- eval $mGed rt_gettrees ray -i -u [$mGed who]
- ray prep $_prep
- ray no_bool $_no_bool
- ray onehit $_onehit
+ eval $mGed rt_gettrees $mRay -i -u [$mGed who]
+ $mRay prep $_prep
+ $mRay no_bool $_no_bool
+ $mRay onehit $_onehit
- set result [ray shootray $_start $_op $_target]
+ set result [$mRay shootray $_start $_op $_target]
}
SetNormalCursor $this
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it.
http://p.sf.net/sfu/wandisco-dev2dev
___
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:[45928] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 45928
http://brlcad.svn.sourceforge.net/brlcad/?rev=45928view=rev
Author: bob1961
Date: 2011-08-11 20:55:30 + (Thu, 11 Aug 2011)
Log Message:
---
The backgroundColor routine should be calling ::cadwidgets::Ged::get_rgb_color
instead of getRgbColor for consistency.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-08-11 20:10:20 UTC
(rev 45927)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-08-11 20:55:30 UTC
(rev 45928)
@@ -2786,12 +2786,8 @@
::itcl::body ArcherCore::backgroundColor {_color} {
set mCurrentPaneName
set mBackgroundColor $_color
+set mBackground [::cadwidgets::Ged::get_rgb_color $mBackgroundColor]
-if {[catch {getRgbColor $mBackgroundColor} mBackground]} {
- set mBackgroundColor black
- set mBackground {0 0 0}
-}
-
if {[info exists itk_component(ged)]} {
eval $itk_component(ged) bg_all $mBackground
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it.
http://p.sf.net/sfu/wandisco-dev2dev
___
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:[46264] brlcad/trunk/src/libged/erase.c
Revision: 46264
http://brlcad.svn.sourceforge.net/brlcad/?rev=46264view=rev
Author: bob1961
Date: 2011-08-18 19:16:31 + (Thu, 18 Aug 2011)
Log Message:
---
This reverts the fix for r45409 (i.e. ged_splitGDL was no longer splitting
things correctly. This caused a noticeable performance issue as well as the
results of 'who' being wrong). The segmentation fault problem was resolved in
_ged_eraseFirstSubpath.
Modified Paths:
--
brlcad/trunk/src/libged/erase.c
Modified: brlcad/trunk/src/libged/erase.c
===
--- brlcad/trunk/src/libged/erase.c 2011-08-18 19:11:51 UTC (rev 46263)
+++ brlcad/trunk/src/libged/erase.c 2011-08-18 19:16:31 UTC (rev 46264)
@@ -193,10 +193,12 @@
struct ged_display_list *new_gdlp;
char *pathname;
int savelen;
+int newlen = path-fp_len + 1;
-if (path-fp_len 3) {
+if (newlen 3) {
while (BU_LIST_WHILE(sp, solid, gdlp-gdl_headSolid)) {
savelen = sp-s_fullpath.fp_len;
+ sp-s_fullpath.fp_len = newlen;
pathname = db_path_to_string(sp-s_fullpath);
sp-s_fullpath.fp_len = savelen;
@@ -213,6 +215,7 @@
if (db_full_path_match_top(path, sp-s_fullpath)) {
savelen = sp-s_fullpath.fp_len;
+ sp-s_fullpath.fp_len = newlen;
pathname = db_path_to_string(sp-s_fullpath);
sp-s_fullpath.fp_len = savelen;
@@ -424,8 +427,11 @@
nsp = BU_LIST_PNEXT(solid, sp);
if (db_full_path_subset(sp-s_fullpath, subpath, skip_first)) {
int ret;
+ int full_len = sp-s_fullpath.fp_len;
+ sp-s_fullpath.fp_len = full_len - 1;
db_dup_full_path(dup_path, sp-s_fullpath);
+ sp-s_fullpath.fp_len = full_len;
BU_LIST_DEQUEUE(sp-l);
FREE_SOLID(sp, _FreeSolid.l);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
___
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:[46313] brlcad/trunk/src/tclscripts/archer
Revision: 46313
http://brlcad.svn.sourceforge.net/brlcad/?rev=46313view=rev
Author: bob1961
Date: 2011-08-22 15:43:04 + (Mon, 22 Aug 2011)
Log Message:
---
The rectangle used for selection was no longer being drawn due to a previous
modification (i.e. not drawing rectangle if its lwidth is 0). This restores the
desired behavior in Archer.
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 2011-08-22 15:33:34 UTC
(rev 46312)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-08-22 15:43:04 UTC
(rev 46313)
@@ -6305,6 +6305,8 @@
bind $win ButtonRelease-1 [::itcl::code $this endObjRotate $dname
$obj]; break
}
+
+$itk_component(ged) rect lwidth 0
}
@@ -6334,6 +6336,8 @@
bind $win ButtonRelease-1 [::itcl::code $this endObjScale $dname
$obj]; break
}
+
+$itk_component(ged) rect lwidth 0
}
@@ -6364,6 +6368,8 @@
bind $win ButtonRelease-1 [::itcl::code $this endObjTranslate $dname
$obj %x %y]; break
}
+
+$itk_component(ged) rect lwidth 0
}
@@ -6388,6 +6394,8 @@
bind $win 1 [::itcl::code $this handleObjCenter $dname $obj %x %y];
break
bind $win ButtonRelease-1 [::itcl::code $this endObjCenter $obj];
break
}
+
+$itk_component(ged) rect lwidth 0
}
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-08-22 15:33:34 UTC
(rev 46312)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-08-22 15:43:04 UTC
(rev 46313)
@@ -2554,6 +2554,8 @@
::itcl::body ArcherCore::beginViewRotate {} {
$itk_component(ged) init_view_rotate 1
$itk_component(ged) init_button_no_op 2
+
+$itk_component(ged) rect lwidth 0
}
::itcl::body ArcherCore::endViewRotate {_pane} {
@@ -2566,6 +2568,8 @@
::itcl::body ArcherCore::beginViewScale {} {
$itk_component(ged) init_view_scale 1
$itk_component(ged) init_button_no_op 2
+
+$itk_component(ged) rect lwidth 0
}
::itcl::body ArcherCore::endViewScale {_pane} {
@@ -2578,6 +2582,8 @@
::itcl::body ArcherCore::beginViewTranslate {} {
$itk_component(ged) init_view_translate 1
$itk_component(ged) init_button_no_op 2
+
+$itk_component(ged) rect lwidth 0
}
::itcl::body ArcherCore::endViewTranslate {_pane} {
@@ -2594,6 +2600,8 @@
$itk_component(ged) clear_mouse_ray_callback_list
$itk_component(ged) add_mouse_ray_callback [::itcl::code $this
mrayCallback_cvo]
$itk_component(ged) init_comp_pick 2
+
+$itk_component(ged) rect lwidth 0
}
::itcl::body ArcherCore::initCompErase {} {
@@ -2601,6 +2609,8 @@
$itk_component(ged) add_mouse_ray_callback [::itcl::code $this
mrayCallback_erase]
$itk_component(ged) init_comp_pick 1
$itk_component(ged) init_button_no_op 2
+
+$itk_component(ged) rect lwidth 0
}
::itcl::body ArcherCore::initCompPick {} {
@@ -2608,6 +2618,8 @@
$itk_component(ged) add_mouse_ray_callback [::itcl::code $this
mrayCallback_pick]
$itk_component(ged) init_comp_pick 1
$itk_component(ged) init_button_no_op 2
+
+$itk_component(ged) rect lwidth 0
}
::itcl::body ArcherCore::initCompSelect {} {
@@ -2615,6 +2627,9 @@
$itk_component(ged) add_view_rect_callback [::itcl::code $this
compSelectCallback]
$itk_component(ged) init_view_rect 1
$itk_component(ged) init_button_no_op 2
+
+# The rect lwidth should be a preference
+$itk_component(ged) rect lwidth 1
}
::itcl::body ArcherCore::compSelectCallback {_mstring} {
@@ -2692,6 +2707,8 @@
$itk_component(ged) add_view_measure_callback [::itcl::code $this
endViewMeasure]
$itk_component(ged) init_view_measure
$itk_component(ged) init_button_no_op 2
+
+$itk_component(ged) rect lwidth 0
}
::itcl::body ArcherCore::endViewMeasure {_mstring} {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
___
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:[46314] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 46314
http://brlcad.svn.sourceforge.net/brlcad/?rev=46314view=rev
Author: bob1961
Date: 2011-08-22 20:37:48 + (Mon, 22 Aug 2011)
Log Message:
---
Updated ArcherCore::selectTreePath to make the selected tree item visible.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-08-22 15:43:04 UTC
(rev 46313)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-08-22 20:37:48 UTC
(rev 46314)
@@ -4081,6 +4081,7 @@
set mSelectedObj $obj
set mSelectObjPath $obj
$itk_component(newtree) selection set [lindex [lindex $mText2Node($obj)
0] 0]
+ $itk_component(newtree) see [lindex [lindex $mText2Node($obj) 0] 0]
} else {
getTreeNode $_path 1
set snode [$itk_component(newtree) focus]
@@ -4092,6 +4093,7 @@
} else {
set mSelectedObj $obj
$itk_component(newtree) selection set $snode
+ $itk_component(newtree) see $snode
foreach pnode [lreverse [findTreeParentNodes $snode]] {
append mSelectedObjPath $mNode2Text($pnode) /
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
___
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:[46334] brlcad/trunk/src/tclscripts/lib/Ged.tcl
Revision: 46334
http://brlcad.svn.sourceforge.net/brlcad/?rev=46334view=rev
Author: bob1961
Date: 2011-08-23 15:30:45 + (Tue, 23 Aug 2011)
Log Message:
---
Updated Ged::pane_mouse_ray to calculate the mLastMouseRayStart point (i.e. the
point from which to fire a ray) so that all displayed geometry is in front of
the ray firing point.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-08-23 14:59:41 UTC (rev
46333)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-08-23 15:30:45 UTC (rev
46334)
@@ -3387,8 +3387,21 @@
set view [$mGed screen2view $itk_component($_pane) $_x $_y]
set view [$mGed snap_view $itk_component($_pane) [lindex $view 0] [lindex
$view 1]]
-set bounds [$mGed bounds $itk_component($_pane)]
-set vZ [expr {[lindex $bounds 4] / -2048.0}]
+if {[catch {eval $mGed bb -q -e [$mGed who]} bblist]} {
+ set bounds [$mGed bounds $itk_component($_pane)]
+ set vZ [expr {[lindex $bounds 4] / -2048.0}]
+} else {
+ set base2local [$mGed base2local]
+ set vcenter [center]
+ set vsize [size]
+
+ set bbmin [vscale [lindex $bblist 1] $base2local]
+ set bbmax [vscale [lindex $bblist 3] $base2local]
+ set bbdiag [vmagnitude [vsub2 $bbmax $bbmin]]
+ set bbcenter [vscale [vadd2 $bbmin $bbmax] 0.5]
+ set dist [expr [vmagnitude [vsub2 $vcenter $bbcenter]] + $bbdiag]
+ set vZ [expr $dist / $vsize]
+}
set mLastMouseRayStart [$mGed v2m_point $itk_component($_pane) [lindex
$view 0] [lindex $view 1] $vZ]
set mLastMouseRayTarget [$mGed v2m_point $itk_component($_pane) [lindex
$view 0] [lindex $view 1] 0]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
___
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:[37472] brlcad/trunk/src/libged/move_all.c
Revision: 37472
http://brlcad.svn.sourceforge.net/brlcad/?rev=37472view=rev
Author: bob1961
Date: 2010-01-29 15:57:50 + (Fri, 29 Jan 2010)
Log Message:
---
Added a -f option to mvall for reading a mapping file.
Modified Paths:
--
brlcad/trunk/src/libged/move_all.c
Modified: brlcad/trunk/src/libged/move_all.c
===
--- brlcad/trunk/src/libged/move_all.c 2010-01-29 14:22:25 UTC (rev 37471)
+++ brlcad/trunk/src/libged/move_all.c 2010-01-29 15:57:50 UTC (rev 37472)
@@ -34,61 +34,50 @@
#include ./ged_private.h
-
-int
-ged_move_all(struct ged *gedp, int argc, const char *argv[])
+HIDDEN int
+ged_move_all_file(struct ged *gedp, int nflag, const char *file)
{
-struct ged_display_list *gdlp;
-int nflag;
-inti;
-struct directory *dp;
-struct rt_db_internal intern;
-struct rt_comb_internal *comb;
-struct bu_ptbl stack;
-static const char *usage = [-n] from to;
+FILE *fp;
+char line[512];
-GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
-GED_CHECK_READ_ONLY(gedp, GED_ERROR);
-GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
+if ((fp=fopen(file, r)) == NULL) {
+ bu_vls_printf(gedp-ged_result_str, cannot open %s\n, file);
+ return GED_ERROR;
+}
-/* initialize result */
-bu_vls_trunc(gedp-ged_result_str, 0);
+while (bu_fgets(line, sizeof(line), fp) != NULL) {
+ char old[256];
+ char new[256];
-/* must be wanting help */
-if (argc == 1) {
- bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
- return GED_HELP;
-}
+ if (sscanf(line, %s %s, old, new) != 2) {
+ bu_vls_printf(gedp-ged_result_str, Discarding %s\n, line);
+ continue;
+ }
-if (argc 3 || 4 argc) {
- bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
- return GED_ERROR;
+ ged_move_all_func(gedp, nflag, (const char *)old, (const char *)new);
}
-if (gedp-ged_wdbp-dbip-dbi_version 5 (int)strlen(argv[2])
NAMESIZE) {
- bu_vls_printf(gedp-ged_result_str, ERROR: name length limited to %d
characters in v4 databases\n, strlen(argv[2]));
- return GED_ERROR;
-}
+fclose(fp);
-/* Process the -n option */
-if (argc == 4) {
- if (argv[1][0] == '-' argv[1][1] == 'n' argv[1][2] == '\0') {
- nflag = 1;
- --argc;
- ++argv;
- } else {
- bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0],
usage);
- return GED_ERROR;
- }
-} else
- nflag = 0;
+return GED_OK;
+}
+HIDDEN int
+ged_move_all_func(struct ged *gedp, int nflag, const char *old, const char
*new)
+{
+inti;
+struct ged_display_list *gdlp;
+struct directory *dp;
+struct rt_db_internal intern;
+struct rt_comb_internal *comb;
+struct bu_ptbl stack;
+
/* rename the record itself */
-if ((dp = db_lookup(gedp-ged_wdbp-dbip, argv[1], LOOKUP_NOISY )) ==
DIR_NULL)
+if ((dp = db_lookup(gedp-ged_wdbp-dbip, old, LOOKUP_NOISY )) == DIR_NULL)
return GED_ERROR;
-if (db_lookup(gedp-ged_wdbp-dbip, argv[2], LOOKUP_QUIET) != DIR_NULL) {
- bu_vls_printf(gedp-ged_result_str, %s: already exists, argv[2]);
+if (db_lookup(gedp-ged_wdbp-dbip, new, LOOKUP_QUIET) != DIR_NULL) {
+ bu_vls_printf(gedp-ged_result_str, %s: already exists, new);
return GED_ERROR;
}
@@ -118,13 +107,13 @@
extrude = (struct rt_extrude_internal *)intern.idb_ptr;
RT_EXTRUDE_CK_MAGIC(extrude);
- if (!strcmp(extrude-sketch_name, argv[1])) {
+ if (!strcmp(extrude-sketch_name, old)) {
if (nflag) {
bu_vls_printf(gedp-ged_result_str, %s ,
dirp-d_namep);
rt_db_free_internal(intern);
} else {
bu_free(extrude-sketch_name, sketch name);
- extrude-sketch_name = bu_strdup(argv[2]);
+ extrude-sketch_name = bu_strdup(new);
if (rt_db_put_internal(dirp, gedp-ged_wdbp-dbip,
intern, rt_uniresource) 0) {
bu_log(oops\n);
@@ -139,8 +128,8 @@
if (!nflag) {
/* Change object name in the directory. */
- if (db_rename(gedp-ged_wdbp-dbip, dp, argv[2]) 0) {
- bu_vls_printf(gedp-ged_result_str, error in rename to %s,
aborting, argv[2]);
+ if (db_rename(gedp-ged_wdbp-dbip, dp, new) 0) {
+ bu_vls_printf(gedp-ged_result_str, error in rename to %s,
aborting, new);
return GED_ERROR;
}
@@ -184,12 +173,12 @@
comb_leaf = comb_leaf-tr_b.tb_left;
}
- if (!strcmp(comb_leaf-tr_l.tl_name, argv[1
[brlcad-commits] SF.net SVN: brlcad:[37473] brlcad/trunk/src/libged/bot_dump.c
Revision: 37473
http://brlcad.svn.sourceforge.net/brlcad/?rev=37473view=rev
Author: bob1961
Date: 2010-01-29 16:05:58 + (Fri, 29 Jan 2010)
Log Message:
---
Added ged_dbot_dump() for dumping the displayed bots and auxiliary data (i.e.
arrows, lines and axes) to obj format.
Modified Paths:
--
brlcad/trunk/src/libged/bot_dump.c
Modified: brlcad/trunk/src/libged/bot_dump.c
===
--- brlcad/trunk/src/libged/bot_dump.c 2010-01-29 15:57:50 UTC (rev 37472)
+++ brlcad/trunk/src/libged/bot_dump.c 2010-01-29 16:05:58 UTC (rev 37473)
@@ -39,6 +39,9 @@
#include raytrace.h
#include wdb.h
+#include mater.h
+#include solid.h
+
#include ./ged_private.h
@@ -58,20 +61,37 @@
struct ged *gedp;
FILE *fp;
int fd;
-struct bu_vls *file_name;
char *file_ext;
};
-static enum otype output_type = OTYPE_STL;
-static int binary = 0;
-static int normals = 0;
-static fastf_t cfactor = 1.0;
-static int v_offset = 1;
-static char *output_file = NULL; /* output filename */
-static char *output_directory = NULL; /* directory name to hold output files
*/
-static unsigned int total_faces = 0;
+struct _ged_obj_material {
+struct bu_list l;
+struct bu_vls name;
+unsigned char r;
+unsigned char g;
+unsigned char b;
+fastf_t a;
+};
-static int curr_line_num = 0;
+struct bu_list HeadObjMaterials;
+struct bu_vls obj_materials_file;
+FILE *obj_materials_fp;
+int num_obj_materials;
+int curr_obj_red;
+int curr_obj_green;
+int curr_obj_blue;
+fastf_t curr_obj_alpha;
+
+static enum otype output_type;
+static int binary;
+static int normals;
+static fastf_t cfactor;
+static char *output_file; /* output filename */
+static char *output_directory; /* directory name to hold output files */
+static unsigned int total_faces;
+static int v_offset;
+static int curr_line_num;
+
static int curr_body_id;
static int curr_lump_id;
static int curr_shell_id;
@@ -93,7 +113,53 @@
| ((r 0xff00) 24);
}
+static struct _ged_obj_material *
+ged_get_obj_material(int red, int green, int blue, fastf_t transparency)
+{
+struct _ged_obj_material *gomp;
+
+for (BU_LIST_FOR(gomp, _ged_obj_material, HeadObjMaterials)) {
+ if (gomp-r == red
+ gomp-g == green
+ gomp-b == blue
+ gomp-a == transparency) {
+ return gomp;
+ }
+}
+
+BU_GETSTRUCT(gomp, _ged_obj_material);
+BU_LIST_APPEND(HeadObjMaterials, gomp-l);
+gomp-r = red;
+gomp-g = green;
+gomp-b = blue;
+gomp-a = transparency;
+bu_vls_init(gomp-name);
+bu_vls_printf(gomp-name, matl_%d, ++num_obj_materials);
+
+/* Write out newmtl to mtl file */
+fprintf(obj_materials_fp, newmtl %s\n, bu_vls_addr(gomp-name));
+fprintf(obj_materials_fp, Kd %lf %lf %lf\n,
+ (fastf_t)gomp-r / 255.0,
+ (fastf_t)gomp-g / 255.0,
+ (fastf_t)gomp-b / 255.0);
+fprintf(obj_materials_fp, d %lf\n, gomp-a);
+fprintf(obj_materials_fp, illum 1\n);
+
+return gomp;
+}
+
static void
+ged_free_obj_materials() {
+struct _ged_obj_material *gomp;
+
+while (BU_LIST_WHILE(gomp, _ged_obj_material, HeadObjMaterials)) {
+ BU_LIST_DEQUEUE(gomp-l);
+ bu_vls_free(gomp-name);
+ bu_free(gomp, _ged_obj_material);
+}
+}
+
+static void
write_bot_sat(struct rt_bot_internal *bot, FILE *fp, char *name)
{
int i, j;
@@ -345,7 +411,14 @@
vect_t CmA;
vect_t norm;
int i,vi;
+struct _ged_obj_material *gomp;
+gomp = ged_get_obj_material(curr_obj_red,
+ curr_obj_green,
+ curr_obj_blue,
+ curr_obj_alpha);
+fprintf(fp, usemtl %s\n, bu_vls_addr(gomp-name));
+
num_vertices = bot-num_vertices;
vertices = bot-vertices;
num_faces = bot-num_faces;
@@ -506,34 +579,37 @@
}
static void
-bot_dump(struct directory *dp, struct rt_bot_internal *bot, FILE *fp, int fd,
struct bu_vls *file_name, const char *file_ext, const char *db_name)
+bot_dump(struct directory *dp, struct rt_bot_internal *bot, FILE *fp, int fd,
const char *file_ext, const char *db_name)
{
if (output_directory) {
char *cp;
+ struct bu_vls file_name;
- bu_vls_trunc(file_name, 0);
- bu_vls_strcpy(file_name, output_directory);
- bu_vls_putc(file_name, '/');
+ bu_vls_init(file_name);
+ bu_vls_strcpy(file_name, output_directory);
+ bu_vls_putc(file_name, '/');
cp = dp-d_namep;
while (*cp != '\0') {
if (*cp == '/') {
- bu_vls_putc(file_name, '@');
+ bu_vls_putc(file_name, '@');
} else if (*cp == '.' || isspace(*cp)) {
- bu_vls_putc(file_name, '_');
+ bu_vls_putc(file_name, '_');
} else {
- bu_vls_putc(file_name, *cp);
+ bu_vls_putc
[brlcad-commits] SF.net SVN: brlcad:[37474] brlcad/trunk/src/mged/utility1.c
Revision: 37474
http://brlcad.svn.sourceforge.net/brlcad/?rev=37474view=rev
Author: bob1961
Date: 2010-01-29 16:22:25 + (Fri, 29 Jan 2010)
Log Message:
---
Moved a few variable declarations to the beginning the their respective blocks.
Modified Paths:
--
brlcad/trunk/src/mged/utility1.c
Modified: brlcad/trunk/src/mged/utility1.c
===
--- brlcad/trunk/src/mged/utility1.c2010-01-29 16:05:58 UTC (rev 37473)
+++ brlcad/trunk/src/mged/utility1.c2010-01-29 16:22:25 UTC (rev 37474)
@@ -126,8 +126,8 @@
{
char **av;
char **avtmp;
-
int i;
+struct bu_vls editstring;
CHECK_DBI_NULL;
@@ -141,7 +141,6 @@
return TCL_ERROR;
}
-struct bu_vls editstring;
bu_vls_init(editstring);
get_editor_string(editstring);
@@ -171,7 +170,7 @@
{
char **av;
char **avtmp;
-
+struct bu_vls editstring;
int i;
CHECK_DBI_NULL;
@@ -186,7 +185,6 @@
return TCL_ERROR;
}
-struct bu_vls editstring;
bu_vls_init(editstring);
get_editor_string(editstring);
@@ -215,7 +213,7 @@
{
char **av;
char **avtmp;
-
+struct bu_vls editstring;
int i;
CHECK_DBI_NULL;
@@ -230,7 +228,6 @@
return TCL_ERROR;
}
-struct bu_vls editstring;
bu_vls_init(editstring);
get_editor_string(editstring);
@@ -259,7 +256,7 @@
{
char **av;
char **avtmp;
-
+struct bu_vls editstring;
int i;
CHECK_DBI_NULL;
@@ -274,7 +271,6 @@
return TCL_ERROR;
}
-struct bu_vls editstring;
bu_vls_init(editstring);
get_editor_string(editstring);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37479] brlcad/trunk/misc/win32-msvc8/opennurbs/ opennurbs.vcproj
Revision: 37479 http://brlcad.svn.sourceforge.net/brlcad/?rev=37479view=rev Author: bob1961 Date: 2010-01-29 16:48:59 + (Fri, 29 Jan 2010) Log Message: --- Added move source files to the build. Modified Paths: -- brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj Modified: brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj === --- brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj2010-01-29 16:47:33 UTC (rev 37478) +++ brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj2010-01-29 16:48:59 UTC (rev 37479) @@ -255,10 +255,22 @@ /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_base32.cpp + + /File + File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_base64.cpp + + /File + File RelativePath=..\..\..\src\other\openNURBS\opennurbs_basic.cpp /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_beam.cpp + + /File + File RelativePath=..\..\..\src\other\openNURBS\opennurbs_bezier.cpp /File @@ -275,6 +287,10 @@ /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_box.cpp + + /File + File RelativePath=..\..\..\src\other\openNURBS\opennurbs_brep.cpp /File @@ -299,6 +315,10 @@ /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_brep_region.cpp + + /File + File RelativePath=..\..\..\src\other\openNURBS\opennurbs_brep_tools.cpp /File @@ -423,6 +443,10 @@ /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_lookup.cpp + + /File + File RelativePath=..\..\..\src\other\openNURBS\opennurbs_massprop.cpp /File @@ -455,6 +479,10 @@ /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_mesh_ngon.cpp + + /File + File RelativePath=..\..\..\src\other\openNURBS\opennurbs_mesh_tools.cpp /File @@ -527,6 +555,10 @@ /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_polyedgecurve.cpp + + /File + File RelativePath=..\..\..\src\other\openNURBS\opennurbs_polyline.cpp /File @@ -539,10 +571,26 @@ /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_quaternion.cpp + + /File + File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_rand.cpp + + /File + File RelativePath=..\..\..\src\other\openNURBS\opennurbs_revsurface.cpp /File File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_rtree.cpp + + /File + File + RelativePath=..\..\..\src\other\openNURBS\opennurbs_sort.cpp
[brlcad-commits] SF.net SVN: brlcad:[37491] brlcad/trunk/doc/docbook/system/man1/en/mvall. xml
Revision: 37491 http://brlcad.svn.sourceforge.net/brlcad/?rev=37491view=rev Author: bob1961 Date: 2010-01-29 21:15:57 + (Fri, 29 Jan 2010) Log Message: --- Minor tweak to the SEE ALSO section. Modified Paths: -- brlcad/trunk/doc/docbook/system/man1/en/mvall.xml Modified: brlcad/trunk/doc/docbook/system/man1/en/mvall.xml === --- brlcad/trunk/doc/docbook/system/man1/en/mvall.xml 2010-01-29 21:15:18 UTC (rev 37490) +++ brlcad/trunk/doc/docbook/system/man1/en/mvall.xml 2010-01-29 21:15:57 UTC (rev 37491) @@ -91,10 +91,9 @@ /example /refsect1 -refsect1 -titleSee Also/title -paramv prefix -/para +refsect1 id='see_also' +titleSEE ALSO/title +paramv prefix/para /refsect1 refsect1 id='author' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37495] brlcad/trunk/src/libged/move_all.c
Revision: 37495
http://brlcad.svn.sourceforge.net/brlcad/?rev=37495view=rev
Author: bob1961
Date: 2010-01-29 22:37:00 + (Fri, 29 Jan 2010)
Log Message:
---
Modified ged_move_all_file() to handle comments. It's expected that
bu_argv_from_string() will handle arguments with spaces (i.e. example arg with
spaces).
Modified Paths:
--
brlcad/trunk/src/libged/move_all.c
Modified: brlcad/trunk/src/libged/move_all.c
===
--- brlcad/trunk/src/libged/move_all.c 2010-01-29 22:32:48 UTC (rev 37494)
+++ brlcad/trunk/src/libged/move_all.c 2010-01-29 22:37:00 UTC (rev 37495)
@@ -46,15 +46,17 @@
}
while (bu_fgets(line, sizeof(line), fp) != NULL) {
- char old[256];
- char new[256];
+ char *cp;
+ char *new_av[3];
- if (sscanf(line, %s %s, old, new) != 2) {
- bu_vls_printf(gedp-ged_result_str, Discarding %s\n, line);
+ /* Skip comments */
+ if ((cp = strchr(line, '#')) != NULL)
+ *cp = '\0';
+
+ if (bu_argv_from_string(new_av, 2, line) != 2)
continue;
- }
- ged_move_all_func(gedp, nflag, (const char *)old, (const char *)new);
+ ged_move_all_func(gedp, nflag, (const char *)new_av[0], (const char
*)new_av[1]);
}
fclose(fp);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37496] brlcad/trunk/doc/docbook/system/man1/en/mvall. xml
Revision: 37496 http://brlcad.svn.sourceforge.net/brlcad/?rev=37496view=rev Author: bob1961 Date: 2010-01-29 22:48:06 + (Fri, 29 Jan 2010) Log Message: --- Updated to reflect that comments are now allowed in the mapping file. Modified Paths: -- brlcad/trunk/doc/docbook/system/man1/en/mvall.xml Modified: brlcad/trunk/doc/docbook/system/man1/en/mvall.xml === --- brlcad/trunk/doc/docbook/system/man1/en/mvall.xml 2010-01-29 22:37:00 UTC (rev 37495) +++ brlcad/trunk/doc/docbook/system/man1/en/mvall.xml 2010-01-29 22:48:06 UTC (rev 37496) @@ -84,9 +84,10 @@ example titleThis example shows a simple mapping file./title literallayout -old_name1 new_name1 -old_name2 new_name2 -old_name3 new_name3 +# this line is a comment +old_name new_name +foo bar # another comment, replacing foo with bar +bad_name good_name /literallayout /example /refsect1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37497] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 37497
http://brlcad.svn.sourceforge.net/brlcad/?rev=37497view=rev
Author: bob1961
Date: 2010-01-29 22:51:22 + (Fri, 29 Jan 2010)
Log Message:
---
Fixed two misuses/typos of lsearch in the cmd method.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2010-01-29 22:48:06 UTC
(rev 37496)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2010-01-29 22:51:22 UTC
(rev 37497)
@@ -2028,11 +2028,11 @@
function {
if {[llength $args] == 3} {
set subcmd [lindex $args 2]
- if {[lsearch $subcmd $mArcherCoreCommands] == -1
- [lsearch $subcmd $mUnwrappedDbCommands] == -1} {
+ if {[lsearch $mArcherCoreCommands $subcmd] == -1
+ [lsearch $mUnwrappedDbCommands $subcmd] == -1} {
error ArcherCore::cmd: unrecognized command - $subcmd
} else {
- return
+ return $subcmd
}
} else {
return [eval list $mArcherCoreCommands
$mUnwrappedDbCommands]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37498] brlcad/trunk/src/tclscripts/archer/ AttrGroupsDisplayUtility.tcl
Revision: 37498
http://brlcad.svn.sourceforge.net/brlcad/?rev=37498view=rev
Author: bob1961
Date: 2010-01-29 22:52:11 + (Fri, 29 Jan 2010)
Log Message:
---
Added exportToObj method.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
Modified: brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
===
--- brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
2010-01-29 22:51:22 UTC (rev 37497)
+++ brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
2010-01-29 22:52:11 UTC (rev 37498)
@@ -44,6 +44,7 @@
method exportAttrGroups {}
method exportAttrMap {}
+ method exportToObj {}
method exportToPng {}
method hideStatusbar {}
method hideToolbar {}
@@ -342,6 +343,24 @@
close $fh
}
+::itcl::body AttrGroupsDisplayUtility::exportToObj {} {
+set typelist {
+ {Text {.obj}}
+ {All Files {*}}
+}
+
+set file [tk_getSaveFile -parent $itk_interior \
+ -initialdir [$mArcher getLastSelectedDir] \
+ -title Export display to OBJ (Wavefront). \
+ -filetypes $typelist]
+
+if {$file == } {
+ return
+}
+
+$mArchersGed dbot_dump -o $file -t obj
+}
+
::itcl::body AttrGroupsDisplayUtility::exportToPng {} {
set typelist {
{Text {.png}}
@@ -361,7 +380,8 @@
wm withdraw $mToplevel
}
-# Hack to get around the dialog window (i.e. so it doesn't show up in the
image)
+#XXX Hack to get around the dialog window (i.e. so it doesn't show up in
the image)
+# Remove this hack when png is updated to draw to and pull from an
in-memory buffer
::update idletasks
after 1000
$mArcher refreshDisplay
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37499] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 37499
http://brlcad.svn.sourceforge.net/brlcad/?rev=37499view=rev
Author: bob1961
Date: 2010-01-29 22:56:25 + (Fri, 29 Jan 2010)
Log Message:
---
Updated the moveWrapper to bypass the ledger stuff if -f is specified.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2010-01-29 22:52:11 UTC
(rev 37498)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2010-01-29 22:56:25 UTC
(rev 37499)
@@ -2207,7 +2207,10 @@
return [gedCmd $_cmd]
}
-if {$alen == 3} {
+set fi [lsearch $args -f]
+set ni [lsearch $args -n]
+
+if {$fi != -1 || $ni != -1} {
# Must be using the -n option. If not, an error message
# containing the usage string will be returned.
return [eval gedCmd $_cmd $args]
@@ -2215,7 +2218,7 @@
# Get the list of potentially modified objects.
if {$_cmd == mvall} {
- set mlist [eval gedCmd $_cmd -n $args]
+ set mlist [lsort -dictionary -unique [eval gedCmd $_cmd -n $args]]
} else {
set mlist {}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37500] brlcad/trunk/src/tclscripts/lib/Ged.tcl
Revision: 37500
http://brlcad.svn.sourceforge.net/brlcad/?rev=37500view=rev
Author: bob1961
Date: 2010-01-29 22:57:23 + (Fri, 29 Jan 2010)
Log Message:
---
Added a method for dbot_dump.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2010-01-29 22:56:25 UTC (rev
37499)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2010-01-29 22:57:23 UTC (rev
37500)
@@ -156,6 +156,7 @@
method dbconcat {args}
method dbfind {args}
method dbip {args}
+ method dbot_dump {args}
method decompose {args}
method delay {args}
method dir2ae {args}
@@ -1106,6 +1107,10 @@
eval $mGed dbip $args
}
+::itcl::body cadwidgets::Ged::dbot_dump {args} {
+eval $mGed dbot_dump $args
+}
+
::itcl::body cadwidgets::Ged::decompose {args} {
eval $mGed decompose $args
}
@@ -3129,14 +3134,14 @@
return $partitions
}
-set partition [lindex $partitions 0]
-
if {$_pflag} {
return $partitions
}
# mMouseRayCallbacks is not currently active
if {[llength $mMouseRayCallbacks] == 0} {
+ set partition [lindex $partitions 0]
+
if {$partition == {}} {
tk_messageBox -message Nothing hit
} else {
@@ -3777,6 +3782,7 @@
$help add dbconcat {{file [prefix]} {concatenate 'file' onto end
of present database. Run 'dup file' first.}}
$help add dbfind {{[-s] objects} {find all references to
objects}}
$help add dbip {{} {get dbip}}
+$help add dbot_dump{{[-b] [-m directory] [-o file] [-t
dxf|obj|sat|stl] [-u units] \n} {dump the displayed bots}}
$help add decompose{{nmg_solid [prefix]} {decompose
nmg_solid into maximally connected shells}}
$help add delay{{sec usec} {delay processing for the specified
amount of time}}
$help add dir2ae {{az el} {returns a direction vector given the
azimuth and elevation}}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37501] brlcad/trunk/include/config_win.h
Revision: 37501 http://brlcad.svn.sourceforge.net/brlcad/?rev=37501view=rev Author: bob1961 Date: 2010-01-29 23:00:53 + (Fri, 29 Jan 2010) Log Message: --- Added define for STDIN_FILENO. Modified Paths: -- brlcad/trunk/include/config_win.h Modified: brlcad/trunk/include/config_win.h === --- brlcad/trunk/include/config_win.h 2010-01-29 22:57:23 UTC (rev 37500) +++ brlcad/trunk/include/config_win.h 2010-01-29 23:00:53 UTC (rev 37501) @@ -259,6 +259,10 @@ #undef DELETE #undef complex +#ifndef STDIN_FILENO +# define STDIN_FILENO 0 +#endif + /* * faking it */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37503] brlcad/trunk/include/dm.h
Revision: 37503 http://brlcad.svn.sourceforge.net/brlcad/?rev=37503view=rev Author: bob1961 Date: 2010-01-29 23:01:55 + (Fri, 29 Jan 2010) Log Message: --- Added more defines for FONT10 and FONT11. Modified Paths: -- brlcad/trunk/include/dm.h Modified: brlcad/trunk/include/dm.h === --- brlcad/trunk/include/dm.h 2010-01-29 23:01:15 UTC (rev 37502) +++ brlcad/trunk/include/dm.h 2010-01-29 23:01:55 UTC (rev 37503) @@ -88,6 +88,8 @@ #define FONT7 7x13 #define FONT8 8x13 #define FONT9 9x15 +#define FONT10 10x20 +#define FONT11 12x24 /* Display Manager Types */ #define DM_TYPE_BAD -1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37505] brlcad/trunk/include/ged.h
Revision: 37505 http://brlcad.svn.sourceforge.net/brlcad/?rev=37505view=rev Author: bob1961 Date: 2010-01-29 23:03:06 + (Fri, 29 Jan 2010) Log Message: --- Added a declaration for dbot_dump. Modified Paths: -- brlcad/trunk/include/ged.h Modified: brlcad/trunk/include/ged.h === --- brlcad/trunk/include/ged.h 2010-01-29 23:01:56 UTC (rev 37504) +++ brlcad/trunk/include/ged.h 2010-01-29 23:03:06 UTC (rev 37505) @@ -1382,6 +1382,14 @@ GED_EXPORT BU_EXTERN(int ged_bot_dump, (struct ged *gedp, int argc, const char *argv[])); /** + * Dump displayed bots to the specified format. + * + * Usage: + * dbot_dump [-b] [-m directory] [-o file] [-t dxf|obj|sat|stl] [-u units]; + */ +GED_EXPORT BU_EXTERN(int ged_dbot_dump, (struct ged *gedp, int argc, const char *argv[])); + +/** * Create new_bot by fusing faces in old_bot * * Usage: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37508] brlcad/trunk/misc/win32-msvc8/libged/libged. vcproj
Revision: 37508 http://brlcad.svn.sourceforge.net/brlcad/?rev=37508view=rev Author: bob1961 Date: 2010-01-29 23:08:29 + (Fri, 29 Jan 2010) Log Message: --- Added libanalyze.lib Modified Paths: -- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj === --- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2010-01-29 23:06:19 UTC (rev 37507) +++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2010-01-29 23:08:29 UTC (rev 37508) @@ -84,7 +84,7 @@ / Tool Name=VCLinkerTool - AdditionalDependencies=tcl85.lib libbu.lib libbn.lib libsysv.lib libregex.lib opennurbs.lib librt.lib libwdb.lib libpng.lib ws2_32.lib + AdditionalDependencies=tcl85.lib libbu.lib libbn.lib libsysv.lib libregex.lib opennurbs.lib librt.lib libwdb.lib libanalyze.lib libpng.lib ws2_32.lib OutputFile=.\$(PlatformName)\$(ConfigurationName)/libged.dll LinkIncremental=1 SuppressStartupBanner=true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37516] brlcad/trunk/src/other/openNURBS/opennurbs_zlib. h
Revision: 37516 http://brlcad.svn.sourceforge.net/brlcad/?rev=37516view=rev Author: bob1961 Date: 2010-02-01 22:18:57 + (Mon, 01 Feb 2010) Log Message: --- Added code to remove WIN32 if defined when WIN64 is defined. Modified Paths: -- brlcad/trunk/src/other/openNURBS/opennurbs_zlib.h Modified: brlcad/trunk/src/other/openNURBS/opennurbs_zlib.h === --- brlcad/trunk/src/other/openNURBS/opennurbs_zlib.h 2010-02-01 07:17:20 UTC (rev 37515) +++ brlcad/trunk/src/other/openNURBS/opennurbs_zlib.h 2010-02-01 22:18:57 UTC (rev 37516) @@ -40,6 +40,11 @@ #include zlib.h +#if defined(WIN32) defined(WIN64) +/* zlib.h includes zconf.h which defines WIN32 */ +#undef WIN32 +#endif + ON_BEGIN_EXTERNC voidpf zcalloc (voidpf, unsigned, unsigned); void zcfree (voidpf, voidpf); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37517] brlcad/trunk/include/raytrace.h
Revision: 37517 http://brlcad.svn.sourceforge.net/brlcad/?rev=37517view=rev Author: bob1961 Date: 2010-02-01 22:28:55 + (Mon, 01 Feb 2010) Log Message: --- Modified declaration of db_full_path_subst (i.e. make skip_first a const int). Modified Paths: -- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h === --- brlcad/trunk/include/raytrace.h 2010-02-01 22:18:57 UTC (rev 37516) +++ brlcad/trunk/include/raytrace.h 2010-02-01 22:28:55 UTC (rev 37517) @@ -2637,7 +2637,7 @@ RT_EXPORT BU_EXTERN(int db_full_path_subset, (const struct db_full_path *a, const struct db_full_path *b, -intskip_first)); +const int skip_first)); RT_EXPORT BU_EXTERN(int db_full_path_match_top, (const struct db_full_path *a, const struct db_full_path *b)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37523] brlcad/trunk/include/opennurbs_ext.h
Revision: 37523
http://brlcad.svn.sourceforge.net/brlcad/?rev=37523view=rev
Author: bob1961
Date: 2010-02-02 17:46:13 + (Tue, 02 Feb 2010)
Log Message:
---
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/include/opennurbs_ext.h
Modified: brlcad/trunk/include/opennurbs_ext.h
===
--- brlcad/trunk/include/opennurbs_ext.h2010-02-02 15:35:12 UTC (rev
37522)
+++ brlcad/trunk/include/opennurbs_ext.h2010-02-02 17:46:13 UTC (rev
37523)
@@ -424,14 +424,15 @@
corners[4] = BANodeBA::m_estimate;
// find the point on the curve closest to pt
- int mini = 0;
+ size_t mini = 0;
double mindist = pt.DistanceTo(corners[mini]);
double tmpdist;
for (size_t i = 1; i 5; i++) {
tmpdist = pt.DistanceTo(corners[i]);
TRACE(\t mindist tmpdist);
if (tmpdist mindist) {
- mini = i; mindist = tmpdist;
+ mini = i;
+ mindist = tmpdist;
}
}
TRACE(Closest: mindist ; PT2(uvs[mini]));
@@ -896,7 +897,7 @@
corners[4] = BVNodeBV::m_estimate;
// find the point on the surface closest to pt
- int mini = 0;
+ size_t mini = 0;
double mindist = pt.DistanceTo(corners[mini]);
double tmpdist;
for (size_t i = 1; i 5; i++) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37524] brlcad/trunk/src/librt
Revision: 37524
http://brlcad.svn.sourceforge.net/brlcad/?rev=37524view=rev
Author: bob1961
Date: 2010-02-02 17:47:15 + (Tue, 02 Feb 2010)
Log Message:
---
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/librt/binary_obj.c
brlcad/trunk/src/librt/db5_comb.c
brlcad/trunk/src/librt/db5_io.c
brlcad/trunk/src/librt/db_io.c
brlcad/trunk/src/librt/db_path.c
brlcad/trunk/src/librt/db_tree.c
brlcad/trunk/src/librt/fortray.c
brlcad/trunk/src/librt/opennurbs_ext.cpp
brlcad/trunk/src/librt/pr.c
brlcad/trunk/src/librt/prep.c
brlcad/trunk/src/librt/primitives/arb8/arb8.c
brlcad/trunk/src/librt/primitives/brep/brep.cpp
brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
brlcad/trunk/src/librt/primitives/dsp/dsp.c
brlcad/trunk/src/librt/primitives/ebm/ebm.c
brlcad/trunk/src/librt/primitives/ehy/ehy.c
brlcad/trunk/src/librt/primitives/ell/ell.c
brlcad/trunk/src/librt/primitives/epa/epa.c
brlcad/trunk/src/librt/primitives/eto/eto.c
brlcad/trunk/src/librt/primitives/extrude/extrude.c
brlcad/trunk/src/librt/primitives/generic.c
brlcad/trunk/src/librt/primitives/grip/grip.c
brlcad/trunk/src/librt/primitives/half/half.c
brlcad/trunk/src/librt/primitives/hf/hf.c
brlcad/trunk/src/librt/primitives/hyp/hyp.c
brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c
brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c
brlcad/trunk/src/librt/primitives/part/part.c
brlcad/trunk/src/librt/primitives/revolve/revolve.h
brlcad/trunk/src/librt/primitives/rhc/rhc.c
brlcad/trunk/src/librt/primitives/rpc/rpc.c
brlcad/trunk/src/librt/primitives/superell/superell.c
brlcad/trunk/src/librt/primitives/tgc/tgc.c
brlcad/trunk/src/librt/primitives/tor/tor.c
brlcad/trunk/src/librt/primitives/vol/vol.c
brlcad/trunk/src/librt/tree.c
brlcad/trunk/src/librt/vlist.c
Modified: brlcad/trunk/src/librt/binary_obj.c
===
--- brlcad/trunk/src/librt/binary_obj.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/binary_obj.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -106,7 +106,7 @@
}
/* just copy the bytes */
-bip-count = num_items;
+bip-count = (long)num_items;
bip-u.int8 = (char *)bu_malloc( obj_length, binary uniform object );
memcpy(bip-u.int8, bu_fd-buf, obj_length);
Modified: brlcad/trunk/src/librt/db5_comb.c
===
--- brlcad/trunk/src/librt/db5_comb.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/db5_comb.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -92,7 +92,7 @@
tcsp-n_leaf++;
if ( tp-tr_l.tl_mat !bn_mat_is_identity(tp-tr_l.tl_mat) )
tcsp-n_mat++;
/* Over-estimate storage requirement for matrix # */
- tcsp-leafbytes += strlen(tp-tr_l.tl_name) + 1 + 8;
+ tcsp-leafbytes += (long)strlen(tp-tr_l.tl_name) + 1 + 8;
return 1;
case OP_NOT:
@@ -160,7 +160,7 @@
const union tree *tp,
struct rt_comb_v5_serialize_state *ssp)
{
-intn;
+size_t n;
intmi;
RT_CK_TREE(tp);
Modified: brlcad/trunk/src/librt/db5_io.c
===
--- brlcad/trunk/src/librt/db5_io.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/db5_io.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -347,11 +347,11 @@
db5_get_raw_internal_fp(struct db5_raw_internal *rip, FILE *fp)
{
struct db5_ondisk_header header;
-unsigned char lenbuf[8];
+unsigned char lenbuf[8];
intcount = 0;
intused;
-long want, got;
-unsigned char *cp;
+size_t want, got;
+unsigned char *cp;
if ( fread( (unsigned char *)header, sizeof header, 1, fp ) != 1 ) {
if ( feof(fp) ) return -1;
@@ -476,7 +476,7 @@
need = sizeof(struct db5_ondisk_header);
need += 8; /* for object_length */
if ( name ) {
- namelen = strlen(name) + 1; /* includes null */
+ namelen = (long)strlen(name) + 1; /* includes null */
if ( namelen 1 ) {
n_width = db5_select_length_encoding(namelen);
need += namelen + db5_enc_len[n_width];
@@ -811,12 +811,12 @@
avpp = avs-avp;
for ( i = 0; i (size_t)avs-count; i++, avpp++ ) {
if (avpp-name) {
- need += strlen(avpp-name) + 1; /* include room for NULL */
+ need += (int)strlen(avpp-name) + 1; /* include room for NULL */
} else {
need += 1;
}
if (avpp-value) {
- need += strlen(avpp
[brlcad-commits] SF.net SVN: brlcad:[37526] brlcad/trunk/src/librt/primitives
Revision: 37526
http://brlcad.svn.sourceforge.net/brlcad/?rev=37526view=rev
Author: bob1961
Date: 2010-02-02 20:08:38 + (Tue, 02 Feb 2010)
Log Message:
---
The cast to long is now part of the bu_offsetof definition.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/arb8/arb8.c
brlcad/trunk/src/librt/primitives/dsp/dsp.c
brlcad/trunk/src/librt/primitives/ebm/ebm.c
brlcad/trunk/src/librt/primitives/ehy/ehy.c
brlcad/trunk/src/librt/primitives/ell/ell.c
brlcad/trunk/src/librt/primitives/epa/epa.c
brlcad/trunk/src/librt/primitives/eto/eto.c
brlcad/trunk/src/librt/primitives/grip/grip.c
brlcad/trunk/src/librt/primitives/half/half.c
brlcad/trunk/src/librt/primitives/hf/hf.c
brlcad/trunk/src/librt/primitives/hyp/hyp.c
brlcad/trunk/src/librt/primitives/part/part.c
brlcad/trunk/src/librt/primitives/revolve/revolve.h
brlcad/trunk/src/librt/primitives/rhc/rhc.c
brlcad/trunk/src/librt/primitives/rpc/rpc.c
brlcad/trunk/src/librt/primitives/superell/superell.c
brlcad/trunk/src/librt/primitives/tgc/tgc.c
brlcad/trunk/src/librt/primitives/tor/tor.c
brlcad/trunk/src/librt/primitives/vol/vol.c
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c 2010-02-02 18:14:00 UTC
(rev 37525)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c 2010-02-02 20:08:38 UTC
(rev 37526)
@@ -128,14 +128,14 @@
const struct bu_structparse rt_arb_parse[] = {
-{ %f, 3, V1, (long)bu_offsetof(struct rt_arb_internal, pt[0][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{ %f, 3, V2, (long)bu_offsetof(struct rt_arb_internal, pt[1][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{ %f, 3, V3, (long)bu_offsetof(struct rt_arb_internal, pt[2][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{ %f, 3, V4, (long)bu_offsetof(struct rt_arb_internal, pt[3][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{ %f, 3, V5, (long)bu_offsetof(struct rt_arb_internal, pt[4][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{ %f, 3, V6, (long)bu_offsetof(struct rt_arb_internal, pt[5][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{ %f, 3, V7, (long)bu_offsetof(struct rt_arb_internal, pt[6][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{ %f, 3, V8, (long)bu_offsetof(struct rt_arb_internal, pt[7][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+{ %f, 3, V1, bu_offsetof(struct rt_arb_internal, pt[0][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+{ %f, 3, V2, bu_offsetof(struct rt_arb_internal, pt[1][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+{ %f, 3, V3, bu_offsetof(struct rt_arb_internal, pt[2][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+{ %f, 3, V4, bu_offsetof(struct rt_arb_internal, pt[3][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+{ %f, 3, V5, bu_offsetof(struct rt_arb_internal, pt[4][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+{ %f, 3, V6, bu_offsetof(struct rt_arb_internal, pt[5][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+{ %f, 3, V7, bu_offsetof(struct rt_arb_internal, pt[6][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+{ %f, 3, V8, bu_offsetof(struct rt_arb_internal, pt[7][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/dsp/dsp.c
===
--- brlcad/trunk/src/librt/primitives/dsp/dsp.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/dsp/dsp.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -271,7 +271,7 @@
{%i, 1, sm, DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{%d, 1, w, DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{%d, 1, n, DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{%f, 16, stom, (long)DSP_AO(dsp_stom), hook_mtos_from_stom, NULL,
NULL },
+{%f, 16, stom, DSP_AO(dsp_stom), hook_mtos_from_stom, NULL, NULL },
{, 0, (char *)0, 0,BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -282,7 +282,7 @@
{%i, 1, sm, DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{%d, 1, w, DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{%d, 1, n, DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
-{%f, 16, stom, (long)DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL },
+{%f, 16, stom, DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{, 0, (char *)0, 0,BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -4638,7 +4638,7 @@
{%d, 1, n, DSP_O(dsp_ycnt), hook_verify, NULL, NULL },
{%i, 1, sm, DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{%c, 1, cut, DSP_O(dsp_cuttype), hook_verify, NULL, NULL },
-{%f, 16, stom, (long
[brlcad-commits] SF.net SVN: brlcad:[37527] brlcad/trunk/include/bu.h
Revision: 37527 http://brlcad.svn.sourceforge.net/brlcad/?rev=37527view=rev Author: bob1961 Date: 2010-02-02 20:09:17 + (Tue, 02 Feb 2010) Log Message: --- The cast to long is now part of the bu_offsetof definition. Modified Paths: -- brlcad/trunk/include/bu.h Modified: brlcad/trunk/include/bu.h === --- brlcad/trunk/include/bu.h 2010-02-02 20:08:38 UTC (rev 37526) +++ brlcad/trunk/include/bu.h 2010-02-02 20:09:17 UTC (rev 37527) @@ -1765,12 +1765,15 @@ * Files using bu_offsetof or bu_offsetofarray will need to include * stddef.h in order to get offsetof() */ +/* FIXME - this is a temporary cast. The bu_structparse sp_offset member + * should be a size_t. + */ #ifndef offsetof # define bu_offsetof(_t, _m) (size_t)_t *)0)-_m)) # define bu_offsetofarray(_t, _m) (size_t)_t *)0)-_m)) #else -# define bu_offsetof(_t, _m) offsetof(_t, _m) -# define bu_offsetofarray(_t, _m) offsetof(_t, _m[0]) +# define bu_offsetof(_t, _m) (long)offsetof(_t, _m) +# define bu_offsetofarray(_t, _m) (long)offsetof(_t, _m[0]) #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37528] brlcad/trunk/src/libbu
Revision: 37528
http://brlcad.svn.sourceforge.net/brlcad/?rev=37528view=rev
Author: bob1961
Date: 2010-02-02 21:03:18 + (Tue, 02 Feb 2010)
Log Message:
---
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libbu/bitv.c
brlcad/trunk/src/libbu/brlcad_path.c
brlcad/trunk/src/libbu/convert.c
brlcad/trunk/src/libbu/dirname.c
brlcad/trunk/src/libbu/fopen_uniq.c
brlcad/trunk/src/libbu/malloc.c
brlcad/trunk/src/libbu/mappedfile.c
brlcad/trunk/src/libbu/parse.c
brlcad/trunk/src/libbu/temp.c
brlcad/trunk/src/libbu/units.c
brlcad/trunk/src/libbu/vls.c
Modified: brlcad/trunk/src/libbu/bitv.c
===
--- brlcad/trunk/src/libbu/bitv.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/bitv.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -201,8 +201,8 @@
void
bu_bitv_to_hex(struct bu_vls *v, const struct bu_bitv *bv)
{
-unsigned int word_count = 0;
-unsigned int chunksize = 0;
+size_t word_count = 0;
+size_t chunksize = 0;
/* necessarily volatile to keep the compiler from complaining
* about unreachable code during optimization.
*/
@@ -212,7 +212,7 @@
BU_CK_BITV(bv);
word_count = bv-nbits / 8 / BVS;
-bu_vls_extend(v, word_count * BVS * 2 + 1);
+bu_vls_extend(v, (unsigned int)(word_count * BVS * 2 + 1));
while (word_count--) {
chunksize = (unsigned int)BVS;
@@ -233,8 +233,8 @@
int bytes;
struct bu_bitv *bv;
unsigned long c;
-int word_count;
-unsigned int chunksize = 0;
+size_t word_count;
+size_t chunksize = 0;
volatile size_t BVS = sizeof(bitv_t);
abyte[2] = '\0';
Modified: brlcad/trunk/src/libbu/brlcad_path.c
===
--- brlcad/trunk/src/libbu/brlcad_path.c2010-02-02 20:09:17 UTC (rev
37527)
+++ brlcad/trunk/src/libbu/brlcad_path.c2010-02-02 21:03:18 UTC (rev
37528)
@@ -285,7 +285,7 @@
HIDDEN int
_bu_find_path(char result[MAXPATHLEN], const char *lhs, const char *rhs,
struct bu_vls *searched, const char *where)
{
-int llen, rlen;
+size_t llen, rlen;
static const char *currdir=.;
/* swap right with left if there is no left so logic is simplified
@@ -425,7 +425,7 @@
lhs = bu_getprogname();
if (lhs) {
char argv0[MAX_WHERE_SIZE] = {0};
- int len = strlen(lhs);
+ size_t len = strlen(lhs);
snprintf(argv0, MAX_WHERE_SIZE, %s, lhs);
/* need to trim off the trailing binary */
Modified: brlcad/trunk/src/libbu/convert.c
===
--- brlcad/trunk/src/libbu/convert.c2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/convert.c2010-02-02 21:03:18 UTC (rev 37528)
@@ -124,7 +124,7 @@
bu_cv_fmt_cookie(char *buf, size_t buflen, int cookie)
{
register char *cp = buf;
-unsigned int len;
+size_t len;
if (buflen == 0) {
fprintf(stderr, bu_cv_pr_cookie: call me with a bigger buffer\n);
@@ -342,7 +342,7 @@
int limit;
register int i;
-limit = size / sizeof(signed short);
+limit = (int)(size / sizeof(signed short));
if (limit count) count = limit;
for (i=0; icount; i++) {
@@ -364,7 +364,7 @@
int limit;
register int i;
-limit = size / sizeof(unsigned short);
+limit = (int)(size / sizeof(unsigned short));
if (limit count) count = limit;
for (i=0; icount; i++) {
@@ -382,7 +382,7 @@
int limit;
register int i;
-limit = size / sizeof(signed long int);
+limit = (int)(size / sizeof(signed long int));
if (limit count) count = limit;
for (i=0; icount; i++) {
@@ -404,7 +404,7 @@
int limit;
register int i;
-limit = size / sizeof(unsigned long int);
+limit = (int)(size / sizeof(unsigned long int));
if (limit count) count = limit;
for (i=0; icount; i++) {
@@ -426,7 +426,7 @@
register unsigned char *cp = (unsigned char *)out;
register int val;
-limit = size / 2;
+limit = (int)(size / 2);
if (count limit) count = limit;
for (i=0; icount; i++) {
@@ -445,7 +445,7 @@
register unsigned char *cp = (unsigned char *)out;
register int val;
-limit = size / 2;
+limit = (int)(size / 2);
if (count limit) count = limit;
for (i=0; icount; i++) {
@@ -464,7 +464,7 @@
register unsigned char *cp = (unsigned char *)out;
register long val;
-limit = size / 4;
+limit = (int)(size / 4);
if (count limit) count = limit;
for (i=0; icount; i++) {
@@ -485,7 +485,7 @@
register unsigned char *cp = (unsigned char *)out;
register long val;
-limit = size / 4;
+limit = (int)(size / 4);
if (count limit) {
count = limit;
}
@@ -557,7 +557,7
[brlcad-commits] SF.net SVN: brlcad:[37529] brlcad/trunk/src/libbn/sphmap.c
Revision: 37529
http://brlcad.svn.sourceforge.net/brlcad/?rev=37529view=rev
Author: bob1961
Date: 2010-02-02 21:12:21 + (Tue, 02 Feb 2010)
Log Message:
---
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libbn/sphmap.c
Modified: brlcad/trunk/src/libbn/sphmap.c
===
--- brlcad/trunk/src/libbn/sphmap.c 2010-02-02 21:03:18 UTC (rev 37528)
+++ brlcad/trunk/src/libbn/sphmap.c 2010-02-02 21:12:21 UTC (rev 37529)
@@ -241,7 +241,7 @@
total += mapp-nx[y];
bu_semaphore_acquire( BU_SEM_SYSCALL );/* lock */
-y = fread( (char *)mapp-_data, mapp-elsize, total, fp ); /* res_syscall
*/
+y = (int)fread( (char *)mapp-_data, mapp-elsize, total, fp );/*
res_syscall */
(void) fclose( fp );
bu_semaphore_release( BU_SEM_SYSCALL );/* unlock */
@@ -278,8 +278,8 @@
for ( i = 0; i mapp-ny; i++ ) {
bu_semaphore_acquire( BU_SEM_SYSCALL ); /* lock */
- got = fwrite( (char *)mapp-xbin[i], mapp-elsize, /* res_syscall
*/
- mapp-nx[i], fp );
+ got = (int)fwrite( (char *)mapp-xbin[i], mapp-elsize, /* res_syscall
*/
+ mapp-nx[i], fp );
bu_semaphore_release( BU_SEM_SYSCALL ); /* unlock */
if ( got != mapp-nx[i] ) {
bu_log(spm_save(%s): write error\n, filename);
@@ -332,7 +332,7 @@
/* Shamelessly suck it all in */
buffer = (unsigned char *)bu_malloc( (unsigned)(nx*nx*3), spm_px_load
buffer );
bu_semaphore_acquire( BU_SEM_SYSCALL );/* lock */
-i = fread( (char *)buffer, 3, nx*ny, fp ); /* res_syscall */
+i = (int)fread( (char *)buffer, 3, nx*ny, fp );/* res_syscall */
(void) fclose( fp );
bu_semaphore_release( BU_SEM_SYSCALL );/* unlock */
if ( i != nx*ny ) {
@@ -401,7 +401,7 @@
for ( x = 0; x nx; x++ ) {
spm_read( mapp, pixel, (double)x/(double)nx, (double)y/(double)ny );
bu_semaphore_acquire( BU_SEM_SYSCALL ); /* lock */
- got = fwrite( (char *)pixel, sizeof(pixel), 1, fp );/*
res_syscall */
+ got = (int)fwrite( (char *)pixel, sizeof(pixel), 1, fp ); /*
res_syscall */
bu_semaphore_release( BU_SEM_SYSCALL ); /* unlock */
if ( got != 1 ) {
bu_log(spm_px_save(%s): write error\n, filename);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37530] brlcad/trunk/src/libdm
Revision: 37530
http://brlcad.svn.sourceforge.net/brlcad/?rev=37530view=rev
Author: bob1961
Date: 2010-02-02 22:17:50 + (Tue, 02 Feb 2010)
Log Message:
---
Quell a few warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libdm/axes.c
brlcad/trunk/src/libdm/dm-Null.c
brlcad/trunk/src/libdm/dm-wgl.c
brlcad/trunk/src/libdm/dm_obj.c
Modified: brlcad/trunk/src/libdm/axes.c
===
--- brlcad/trunk/src/libdm/axes.c 2010-02-02 21:12:21 UTC (rev 37529)
+++ brlcad/trunk/src/libdm/axes.c 2010-02-02 22:17:50 UTC (rev 37530)
@@ -44,10 +44,6 @@
{
int i, j;
fastf_t halfAxesSize; /* half the length of an axis */
-point_t v2;
-point_t rxv1, rxv2;
-point_t ryv1, ryv2;
-point_t rzv1, rzv2;
point_t ptA, ptB;
int npoints = gdasp-gdas_num_points * 6;
point_t *points;
Modified: brlcad/trunk/src/libdm/dm-Null.c
===
--- brlcad/trunk/src/libdm/dm-Null.c2010-02-02 21:12:21 UTC (rev 37529)
+++ brlcad/trunk/src/libdm/dm-Null.c2010-02-02 22:17:50 UTC (rev 37530)
@@ -43,7 +43,7 @@
unsigned Nu_unsign(void);
static int Nu_fg(struct dm *, unsigned char, unsigned char, unsigned char,
int strict, fastf_t transparency);
static int Nu_bg(struct dm *, unsigned char, unsigned char, unsigned char);
-static int Nu_dr(struct dm *dmp, struct bn_vlist
*(*callback_function)BU_ARGS((void *)), genptr_t *data){};
+static int Nu_dr(struct dm *dmp, struct bn_vlist
*(*callback_function)BU_ARGS((void *)), genptr_t *data){return TCL_OK;};
struct dm dm_Null = {
Nu_int0,
Modified: brlcad/trunk/src/libdm/dm-wgl.c
===
--- brlcad/trunk/src/libdm/dm-wgl.c 2010-02-02 21:12:21 UTC (rev 37529)
+++ brlcad/trunk/src/libdm/dm-wgl.c 2010-02-02 22:17:50 UTC (rev 37530)
@@ -294,8 +294,6 @@
/* Make xtkwin a toplevel window */
#if 1
Tcl_DString ds;
- char *cp;
- int ret;
Tcl_DStringInit(ds);
Tcl_DStringAppend(ds, toplevel , -1);
@@ -1249,7 +1247,7 @@
glRasterPos2f(x, y);
glListBase(((struct wgl_vars *)dmp-dm_vars.priv_vars)-fontOffset);
-glCallLists(strlen( str ), GL_UNSIGNED_BYTE, str );
+glCallLists((GLuint)strlen( str ), GL_UNSIGNED_BYTE, str );
return TCL_OK;
}
Modified: brlcad/trunk/src/libdm/dm_obj.c
===
--- brlcad/trunk/src/libdm/dm_obj.c 2010-02-02 21:12:21 UTC (rev 37529)
+++ brlcad/trunk/src/libdm/dm_obj.c 2010-02-02 22:17:50 UTC (rev 37530)
@@ -767,7 +767,6 @@
char **argv)
{
point_t modelAxesPos;
-point_t viewAxesPos;
fastf_t viewSize;
mat_t rmat;
mat_t model2view;
@@ -1313,10 +1312,7 @@
char **argv)
{
int color[3];
-int soffset;
fastf_t viewSize;
-fastf_t x1, x2;
-fastf_t y1, y2;
struct bu_vls vls;
if (argc != 3) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37531] brlcad/trunk/src/libfb/if_remote.c
Revision: 37531
http://brlcad.svn.sourceforge.net/brlcad/?rev=37531view=rev
Author: bob1961
Date: 2010-02-02 22:21:41 + (Tue, 02 Feb 2010)
Log Message:
---
Quell a few warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libfb/if_remote.c
Modified: brlcad/trunk/src/libfb/if_remote.c
===
--- brlcad/trunk/src/libfb/if_remote.c 2010-02-02 22:17:50 UTC (rev 37530)
+++ brlcad/trunk/src/libfb/if_remote.c 2010-02-02 22:21:41 UTC (rev 37531)
@@ -208,7 +208,7 @@
HIDDEN int
rem_open(register FBIO *ifp, register char *file, int width, int height)
{
-register int i;
+register size_t i;
struct pkg_conn *pc;
char buf[128] = {0};
char hostname[MAX_HOSTNAME] = {0};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37536] brlcad/trunk/src/liboptical
Revision: 37536
http://brlcad.svn.sourceforge.net/brlcad/?rev=37536view=rev
Author: bob1961
Date: 2010-02-03 23:00:17 + (Wed, 03 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/liboptical/material.c
brlcad/trunk/src/liboptical/sh_stxt.c
brlcad/trunk/src/liboptical/shade.c
Modified: brlcad/trunk/src/liboptical/material.c
===
--- brlcad/trunk/src/liboptical/material.c 2010-02-03 22:27:04 UTC (rev
37535)
+++ brlcad/trunk/src/liboptical/material.c 2010-02-03 23:00:17 UTC (rev
37536)
@@ -219,7 +219,7 @@
intret;
struct bu_vls param;
const char *material;
-intmlen;
+size_t mlen;
RT_CK_REGION(rp);
RT_CK_RTI(rtip);
Modified: brlcad/trunk/src/liboptical/sh_stxt.c
===
--- brlcad/trunk/src/liboptical/sh_stxt.c 2010-02-03 22:27:04 UTC (rev
37535)
+++ brlcad/trunk/src/liboptical/sh_stxt.c 2010-02-03 23:00:17 UTC (rev
37536)
@@ -140,7 +140,7 @@
linebuf = bu_malloc(stp-stx_fw*3, texture file line);
for ( i = 0; i stp-stx_n; i++ ) {
- if ((rd = fread(linebuf, 1, stp-stx_fw*3, fp)) != stp-stx_fw*3 ) {
+ if ((rd = (int)fread(linebuf, 1, stp-stx_fw*3, fp)) !=
stp-stx_fw*3 ) {
bu_log(stxt_read: read error on %s\n, name);
stp-stx_file[0] = '\0';
(void)fclose(fp);
Modified: brlcad/trunk/src/liboptical/shade.c
===
--- brlcad/trunk/src/liboptical/shade.c 2010-02-03 22:27:04 UTC (rev 37535)
+++ brlcad/trunk/src/liboptical/shade.c 2010-02-03 23:00:17 UTC (rev 37536)
@@ -57,7 +57,7 @@
int i;
if (!swp)
- return
+ return;
bu_log(Shadework%s: 0x%x\n, str ? str : , swp);
bu_printb( sw_inputs, swp-sw_inputs, MFI_FORMAT);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37537] brlcad/trunk/include/bu.h
Revision: 37537 http://brlcad.svn.sourceforge.net/brlcad/?rev=37537view=rev Author: bob1961 Date: 2010-02-03 23:37:48 + (Wed, 03 Feb 2010) Log Message: --- Quell a few warnings when compiling for 64-bit Windows. Modified Paths: -- brlcad/trunk/include/bu.h Modified: brlcad/trunk/include/bu.h === --- brlcad/trunk/include/bu.h 2010-02-03 23:00:17 UTC (rev 37536) +++ brlcad/trunk/include/bu.h 2010-02-03 23:37:48 UTC (rev 37537) @@ -1806,7 +1806,11 @@ #endif # else /* Conservative way of finding # bytes as diff of 2 char ptrs */ -#define bu_byteoffset(_i) ((size_t)(((char *)(_i))-((char *)0))) +#if defined(_WIN32) !defined(__CYGWIN__) +# define bu_byteoffset(_i)((long)(((char *)(_i))-((char *)0))) +#else +# define bu_byteoffset(_i)((size_t)(((char *)(_i))-((char *)0))) +#endif # endif #endif # endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37538] brlcad/trunk/src/libpkg/pkg.c
Revision: 37538
http://brlcad.svn.sourceforge.net/brlcad/?rev=37538view=rev
Author: bob1961
Date: 2010-02-03 23:41:40 + (Wed, 03 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libpkg/pkg.c
Modified: brlcad/trunk/src/libpkg/pkg.c
===
--- brlcad/trunk/src/libpkg/pkg.c 2010-02-03 23:37:48 UTC (rev 37537)
+++ brlcad/trunk/src/libpkg/pkg.c 2010-02-03 23:41:40 UTC (rev 37538)
@@ -94,8 +94,8 @@
* compatibility macros should take care of this.
*/
#ifdef HAVE_WINSOCK_H
-# define PKG_READ(d, buf, nbytes) recv((d), (buf), (nbytes), 0)
-# define PKG_SEND(d, buf, nbytes) send((d), (buf), (nbytes), 0)
+# define PKG_READ(d, buf, nbytes) recv((d), (buf), (int)(nbytes), 0)
+# define PKG_SEND(d, buf, nbytes) send((d), (buf), (int)(nbytes), 0)
#else
# define PKG_READ(d, buf, nbytes) read((d), (buf), (nbytes))
# define PKG_SEND(d, buf, nbytes) write((d), (buf), (nbytes))
@@ -117,8 +117,9 @@
# define DMSG(s) /**/
#endif
-
+#if !defined(_WIN32) || defined(__CYGWIN__)
extern int errno;
+#endif
int pkg_nochecking = 0;/* set to disable extra checking for input */
int pkg_permport = 0; /* TCP port that pkg_permserver() is listening on XXX */
@@ -851,9 +852,9 @@
/* Input Buffer has some data in it, move to caller's buffer */
if ((int)len todo) len = todo;
memcpy(buf, pc-pkc_inbuf[pc-pkc_incur], len);
- pc-pkc_incur += len;
+ pc-pkc_incur += (int)len;
buf += len;
- todo -= len;
+ todo -= (int)len;
}
return(count);
}
@@ -1005,7 +1006,7 @@
(pc-pkc_errlog)(_pkg_errbuf);
return(i-sizeof(hdr)); /* amount of user data sent */
}
- return(len);
+ return((int)len);
}
/* Send them separately */
if ((i = PKG_SEND(pc-pkc_fd, (char *)hdr, sizeof(hdr))) != sizeof(hdr)) {
@@ -1031,7 +1032,7 @@
return(i); /* amount of user data sent */
}
#endif
-return(len);
+return((int)len);
}
@@ -1122,7 +1123,7 @@
(pc-pkc_errlog)(_pkg_errbuf);
return(i-sizeof(hdr)); /* amount of user data sent */
}
- return(len1+len2);
+ return((int)(len1+len2));
}
/* Send it in three pieces */
if ((i = PKG_SEND(pc-pkc_fd, (char *)hdr, sizeof(hdr))) != sizeof(hdr)) {
@@ -1166,10 +1167,10 @@
snprintf(_pkg_errbuf, MAX_PKG_ERRBUF_SIZE, pkg_2send of %d+%d+%d,
wrote len2=%d\n,
(int)sizeof(hdr), len1, len2, i);
(pc-pkc_errlog)(_pkg_errbuf);
- return(len1+i); /* amount of user data sent */
+ return((int)(len1+i)); /* amount of user data sent */
}
#endif
-return(len1+len2);
+return((int)(len1+len2));
}
@@ -1200,7 +1201,7 @@
memcpy((pc-pkc_stream[pc-pkc_strpos]), (char *)hdr, sizeof(struct
pkg_header));
pc-pkc_strpos += sizeof(struct pkg_header);
memcpy((pc-pkc_stream[pc-pkc_strpos]), buf, len);
-pc-pkc_strpos += len;
+pc-pkc_strpos += (int)len;
return((int)(len + sizeof(struct pkg_header)));
}
@@ -1299,7 +1300,7 @@
pc-pkc_type = pkg_gshort((char *)pc-pkc_hdr.pkh_type); /* host order */
pc-pkc_len = pkg_glong((char *)pc-pkc_hdr.pkh_len);
pc-pkc_buf = (char *)0;
-pc-pkc_left = pc-pkc_len;
+pc-pkc_left = (int)pc-pkc_len;
if (pc-pkc_left == 0) return(1); /* msg here, no data */
if (buf) {
@@ -1404,7 +1405,7 @@
pc-pkc_buf = (char *)0;
pc-pkc_curpos = (char *)0;
pc-pkc_left = -1; /* safety */
-return(pc-pkc_len);
+return((int)pc-pkc_len);
}
@@ -1585,7 +1586,7 @@
}
len = _pkg_inget(pc, pc-pkc_curpos, len);
pc-pkc_curpos += len;
- pc-pkc_left -= len;
+ pc-pkc_left -= (int)len;
if (pc-pkc_left 0) {
/*
* Input buffer is exhausted, but more data is needed
@@ -1699,13 +1700,13 @@
/* If cur point is near end of buffer, recopy data to buffer front */
if (pc-pkc_incur = (pc-pkc_inlen * 7) / 8) {
- size_t ammount;
+ size_t amount;
- ammount = pc-pkc_inend - pc-pkc_incur;
+ amount = pc-pkc_inend - pc-pkc_incur;
/* This copy can not overlap itself, because of 7/8 above */
- memcpy(pc-pkc_inbuf, pc-pkc_inbuf[pc-pkc_incur], ammount);
+ memcpy(pc-pkc_inbuf, pc-pkc_inbuf[pc-pkc_incur], amount);
pc-pkc_incur = 0;
- pc-pkc_inend = ammount;
+ pc-pkc_inend = (int)amount;
}
/* If remaining buffer space is small, make buffer bigger */
@@ -1759,7 +1760,7 @@
}
if (got (int)avail) {
pc-pkc_errlog(pkg_suckin: read more bytes than desired\n);
- got = avail;
+ got = (int)avail;
}
pc-pkc_inend += got;
ret = 1;
This was sent
[brlcad-commits] SF.net SVN: brlcad:[37539] brlcad/trunk/src/other/libpng
Revision: 37539
http://brlcad.svn.sourceforge.net/brlcad/?rev=37539view=rev
Author: bob1961
Date: 2010-02-04 00:02:57 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/other/libpng/pngpread.c
brlcad/trunk/src/other/libpng/pngrutil.c
brlcad/trunk/src/other/libpng/pngset.c
brlcad/trunk/src/other/libpng/pngwio.c
brlcad/trunk/src/other/libpng/pngwutil.c
Modified: brlcad/trunk/src/other/libpng/pngpread.c
===
--- brlcad/trunk/src/other/libpng/pngpread.c2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngpread.c2010-02-04 00:02:57 UTC (rev
37539)
@@ -526,7 +526,7 @@
png_calculate_crc(png_ptr, png_ptr-save_buffer_ptr, save_size);
- png_ptr-skip_length -= save_size;
+ png_ptr-skip_length -= (png_uint_32)save_size;
png_ptr-buffer_size -= save_size;
png_ptr-save_buffer_size -= save_size;
png_ptr-save_buffer_ptr += save_size;
@@ -542,7 +542,7 @@
png_calculate_crc(png_ptr, png_ptr-current_buffer_ptr, save_size);
- png_ptr-skip_length -= save_size;
+ png_ptr-skip_length -= (png_uint_32)save_size;
png_ptr-buffer_size -= save_size;
png_ptr-current_buffer_size -= save_size;
png_ptr-current_buffer_ptr += save_size;
@@ -707,7 +707,7 @@
png_calculate_crc(png_ptr, png_ptr-save_buffer_ptr, save_size);
if (!(png_ptr-flags PNG_FLAG_ZLIB_FINISHED))
png_process_IDAT_data(png_ptr, png_ptr-save_buffer_ptr, save_size);
- png_ptr-idat_size -= save_size;
+ png_ptr-idat_size -= (png_uint_32)save_size;
png_ptr-buffer_size -= save_size;
png_ptr-save_buffer_size -= save_size;
png_ptr-save_buffer_ptr += save_size;
@@ -730,7 +730,7 @@
if (!(png_ptr-flags PNG_FLAG_ZLIB_FINISHED))
png_process_IDAT_data(png_ptr, png_ptr-current_buffer_ptr, save_size);
- png_ptr-idat_size -= save_size;
+ png_ptr-idat_size -= (png_uint_32)save_size;
png_ptr-buffer_size -= save_size;
png_ptr-current_buffer_size -= save_size;
png_ptr-current_buffer_ptr += save_size;
@@ -1277,9 +1277,8 @@
png_charp tmp;
tmp = text;
- text = (png_charp)png_malloc(png_ptr, text_size +
- (png_uint_32)(png_ptr-zbuf_size
- - png_ptr-zstream.avail_out + 1));
+ text = (png_charp)png_malloc(png_ptr, (png_uint_32)(text_size +
+ png_ptr-zbuf_size - png_ptr-zstream.avail_out +
1));
png_memcpy(text, tmp, text_size);
png_free(png_ptr, tmp);
png_memcpy(text + text_size, png_ptr-zbuf,
Modified: brlcad/trunk/src/other/libpng/pngrutil.c
===
--- brlcad/trunk/src/other/libpng/pngrutil.c2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngrutil.c2010-02-04 00:02:57 UTC (rev
37539)
@@ -251,7 +251,7 @@
if (text == NULL)
{
text_size = prefix_size + png_sizeof(msg) + 1;
- text = (png_charp)png_malloc_warn(png_ptr, text_size);
+ text = (png_charp)png_malloc_warn(png_ptr,
(png_uint_32)text_size);
if (text == NULL)
{
png_free(png_ptr, png_ptr-chunkdata);
@@ -277,7 +277,7 @@
{
text_size = prefix_size +
png_ptr-zbuf_size - png_ptr-zstream.avail_out;
- text = (png_charp)png_malloc_warn(png_ptr, text_size + 1);
+ text = (png_charp)png_malloc_warn(png_ptr,
(png_uint_32)text_size + 1);
if (text == NULL)
{
png_free(png_ptr, png_ptr-chunkdata);
@@ -347,7 +347,7 @@
text_size = prefix_size;
if (text == NULL)
{
-text = (png_charp)png_malloc_warn(png_ptr, text_size+1);
+ text = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)text_size+1);
if (text == NULL)
{
png_free(png_ptr, png_ptr-chunkdata);
@@ -1067,7 +1067,7 @@
png_decompress_chunk(png_ptr, compression_type,
slength, prefix_length, data_length);
- profile_length = data_length - prefix_length;
+ profile_length = (png_uint_32)(data_length - prefix_length);
if ( prefix_length data_length || profile_length 4)
{
@@ -1166,7 +1166,7 @@
new_palette.depth = *entry_start++;
entry_size = (new_palette.depth == 8 ? 6 : 10);
- data_length = (slength - (entry_start - (png_bytep)png_ptr-chunkdata));
+ data_length = (int)(slength - (entry_start -
(png_bytep)png_ptr-chunkdata));
/* integrity-check the data length */
if (data_length % entry_size)
@@ -3187,9 +3187,9 @@
if (row_bytes + 64 png_ptr
[brlcad-commits] SF.net SVN: brlcad:[37540] brlcad/trunk/src/other/libregex/regcomp.c
Revision: 37540 http://brlcad.svn.sourceforge.net/brlcad/?rev=37540view=rev Author: bob1961 Date: 2010-02-04 00:11:54 + (Thu, 04 Feb 2010) Log Message: --- Quell a few warnings when compiling for 64-bit Windows. Modified Paths: -- brlcad/trunk/src/other/libregex/regcomp.c Modified: brlcad/trunk/src/other/libregex/regcomp.c === --- brlcad/trunk/src/other/libregex/regcomp.c 2010-02-04 00:02:57 UTC (rev 37539) +++ brlcad/trunk/src/other/libregex/regcomp.c 2010-02-04 00:11:54 UTC (rev 37540) @@ -1478,7 +1478,7 @@ assert(p-slen p-ssize); /* finally, it's all reduced to the easy case */ - p-strip[p-slen++] = SOP(op, opnd); + p-strip[p-slen++] = SOP(op, (sop)opnd); } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com ___ 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:[37542] brlcad/trunk/src/other/libutahrle
Revision: 37542
http://brlcad.svn.sourceforge.net/brlcad/?rev=37542view=rev
Author: bob1961
Date: 2010-02-04 00:46:50 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/other/libutahrle/Runput.c
brlcad/trunk/src/other/libutahrle/colorquant.c
brlcad/trunk/src/other/libutahrle/inv_cmap.c
brlcad/trunk/src/other/libutahrle/rle_addhist.c
brlcad/trunk/src/other/libutahrle/rle_hdr.c
brlcad/trunk/src/other/libutahrle/rle_open_f.c
Modified: brlcad/trunk/src/other/libutahrle/Runput.c
===
--- brlcad/trunk/src/other/libutahrle/Runput.c 2010-02-04 00:20:29 UTC (rev
37541)
+++ brlcad/trunk/src/other/libutahrle/Runput.c 2010-02-04 00:46:50 UTC (rev
37542)
@@ -247,7 +247,7 @@
/* Get the total length of comments */
comlen = 0;
for ( com_p = the_hdr-comments; *com_p != NULL; com_p++ )
- comlen += 1 + strlen( *com_p );
+ comlen += 1 + (int)strlen( *com_p );
put16( comlen );
for ( com_p = the_hdr-comments; *com_p != NULL; com_p++ )
Modified: brlcad/trunk/src/other/libutahrle/colorquant.c
===
--- brlcad/trunk/src/other/libutahrle/colorquant.c 2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/colorquant.c 2010-02-04 00:46:50 UTC
(rev 37542)
@@ -88,6 +88,7 @@
*/
static char rcsid[] = $Header$;
+#include stdlib.h
#include math.h
#include stdio.h
#include rle_config.h
Modified: brlcad/trunk/src/other/libutahrle/inv_cmap.c
===
--- brlcad/trunk/src/other/libutahrle/inv_cmap.c2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/inv_cmap.c2010-02-04 00:46:50 UTC
(rev 37542)
@@ -483,7 +483,8 @@
int detect;
register unsigned long *dp;
register unsigned char *rgbp;
-register long bdist, bxx;
+register unsigned long bdist;
+register long bxx;
register int b, i = cindex;
register long txsqr = xsqr + xsqr;
register int lim;
Modified: brlcad/trunk/src/other/libutahrle/rle_addhist.c
===
--- brlcad/trunk/src/other/libutahrle/rle_addhist.c 2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/rle_addhist.c 2010-02-04 00:46:50 UTC
(rev 37542)
@@ -55,7 +55,8 @@
register char *argv[];
rle_hdr *in_hdr,*out_hdr;
{
- register intlength,i;
+ register inti;
+ register size_t length;
time_t temp;
/* padding must give number of characters in histoire */
/* plus one for = */
Modified: brlcad/trunk/src/other/libutahrle/rle_hdr.c
===
--- brlcad/trunk/src/other/libutahrle/rle_hdr.c 2010-02-04 00:20:29 UTC (rev
37541)
+++ brlcad/trunk/src/other/libutahrle/rle_hdr.c 2010-02-04 00:46:50 UTC (rev
37542)
@@ -180,7 +180,7 @@
size *= sizeof(char *);
to_hdr-comments = (CONST_DECL char **)malloc( size );
RLE_CHECK_ALLOC( to_hdr-cmd, to_hdr-comments, comments );
- bcopy( from_hdr-comments, to_hdr-comments, size );
+ bcopy( (const void *)from_hdr-comments, (void *)to_hdr-comments,
size );
}
else
to_hdr-comments = NULL;/* Blow off empty comment list. */
@@ -236,7 +236,7 @@
the_hdr-cmap = 0;
/* Unfortunately, we don't know how to free the comment memory. */
if ( the_hdr-comments )
- free( the_hdr-comments );
+ free( (void *)the_hdr-comments );
the_hdr-comments = 0;
}
}
Modified: brlcad/trunk/src/other/libutahrle/rle_open_f.c
===
--- brlcad/trunk/src/other/libutahrle/rle_open_f.c 2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/rle_open_f.c 2010-02-04 00:46:50 UTC
(rev 37542)
@@ -61,9 +61,6 @@
FILE *fp;
void perror();
CONST_DECL char *err_str;
-register char *cp;
-char *combuf;
-size_t combuf_size;
#ifdef STDIO_NEEDS_BINARY
char mode_string[32]; /* Should be enough. */
@@ -83,6 +80,10 @@
if ( file_name != NULL strcmp( file_name, - ) != 0 )
{
#ifndefNO_OPEN_PIPES
+ register char *cp;
+ char *combuf;
+ size_t combuf_size;
+
/* Check for dead children. */
if ( catching_children 0 )
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay
[brlcad-commits] SF.net SVN: brlcad:[37545] brlcad/trunk/src/conv/asc/asc2g.c
Revision: 37545
http://brlcad.svn.sourceforge.net/brlcad/?rev=37545view=rev
Author: bob1961
Date: 2010-02-04 00:55:38 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/conv/asc/asc2g.c
Modified: brlcad/trunk/src/conv/asc/asc2g.c
===
--- brlcad/trunk/src/conv/asc/asc2g.c 2010-02-04 00:54:35 UTC (rev 37544)
+++ brlcad/trunk/src/conv/asc/asc2g.c 2010-02-04 00:55:38 UTC (rev 37545)
@@ -1697,7 +1697,6 @@
int
main(int argc, char *argv[])
{
-char c1[3];
struct bu_vls str_title;
struct bu_vls str_put;
struct bu_vls line;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37544] brlcad/trunk/misc/win32-msvc8
Revision: 37544
http://brlcad.svn.sourceforge.net/brlcad/?rev=37544view=rev
Author: bob1961
Date: 2010-02-04 00:54:35 + (Thu, 04 Feb 2010)
Log Message:
---
More updates
Modified Paths:
--
brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj
Modified: brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln
===
--- brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln 2010-02-04 00:48:55 UTC
(rev 37543)
+++ brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln 2010-02-04 00:54:35 UTC
(rev 37544)
@@ -1319,6 +1319,7 @@
{2794FD11-F9A6-4145-92DE-A05F5A2E6361} =
{2794FD11-F9A6-4145-92DE-A05F5A2E6361}
{EA0BB405-25E2-4B31-92D7-97316770F32B} =
{EA0BB405-25E2-4B31-92D7-97316770F32B}
{333C38B9-BD2E-4D34-98DD-69E9B5E56ECB} =
{333C38B9-BD2E-4D34-98DD-69E9B5E56ECB}
+ {65AE6C9B-AFA3-46FB-BB13-ED37D6E0042E} =
{65AE6C9B-AFA3-46FB-BB13-ED37D6E0042E}
EndProjectSection
EndProject
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = tire,
..\tire\tire.vcproj, {D4B7A4C2-1029-4273-8DA1-232668DD7B0F}
@@ -1635,6 +1636,13 @@
Debug.AspNetCompiler.Debug = True
Release.AspNetCompiler.Debug = False
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ {EA0BB405-25E2-4B31-92D7-97316770F32B} =
{EA0BB405-25E2-4B31-92D7-97316770F32B}
+ {2794FD11-F9A6-4145-92DE-A05F5A2E6361} =
{2794FD11-F9A6-4145-92DE-A05F5A2E6361}
+ {39172035-CC5F-4140-9118-E1A9AD311FC7} =
{39172035-CC5F-4140-9118-E1A9AD311FC7}
+ {D2A218BF-FAB3-4BEA-B288-E357FE003E29} =
{D2A218BF-FAB3-4BEA-B288-E357FE003E29}
+ {9C2287FD-4991-493F-81A4-41CAA48565CE} =
{9C2287FD-4991-493F-81A4-41CAA48565CE}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2010-02-04 00:48:55 UTC
(rev 37543)
+++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2010-02-04 00:54:35 UTC
(rev 37544)
@@ -181,7 +181,7 @@
/
Tool
Name=VCLinkerTool
- AdditionalDependencies=tcl85.lib libbu.lib
libbn.lib libsysv.lib libregex.lib opennurbs.lib librt.lib libwdb.lib
libpng.lib ws2_32.lib
+ AdditionalDependencies=tcl85.lib libbu.lib
libbn.lib libsysv.lib libregex.lib opennurbs.lib librt.lib libwdb.lib
libanalyze.lib libpng.lib ws2_32.lib
OutputFile=.\$(PlatformName)\$(ConfigurationName)/libged.dll
LinkIncremental=1
SuppressStartupBanner=true
Modified: brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2010-02-04 00:48:55 UTC
(rev 37543)
+++ brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2010-02-04 00:54:35 UTC
(rev 37544)
@@ -496,6 +496,10 @@
/File
File
+
RelativePath=..\..\..\src\librt\primitives\generic.c
+
+ /File
+ File
RelativePath=..\..\..\src\librt\globals.c
/File
Modified: brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj2010-02-04
00:48:55 UTC (rev 37543)
+++ brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj2010-02-04
00:54:35 UTC (rev 37544)
@@ -142,7 +142,7 @@
InlineFunctionExpansion=1
EnableIntrinsicFunctions=false
AdditionalIncludeDirectories=../../../include;../../../src/other/libz;../../../src/other/tcl/generic;../../../src/other/tcl/win
-
PreprocessorDefinitions=WIN32;NDEBUG;_WINDOWS;_USRDLL;ON_DLL_EXPORTS;ON_COMPILING_OPENNURBS;_CRT_SECURE_NO_WARNINGS
+
PreprocessorDefinitions=WIN64;_M_X64;NDEBUG;_WINDOWS;_USRDLL;ON_DLL_EXPORTS;ON_COMPILING_OPENNURBS;_CRT_SECURE_NO_WARNINGS
StringPooling=true
ExceptionHandling=1
RuntimeLibrary=2
This was sent
[brlcad-commits] SF.net SVN: brlcad:[37543] brlcad/trunk/src/libwdb/wdb.c
Revision: 37543
http://brlcad.svn.sourceforge.net/brlcad/?rev=37543view=rev
Author: bob1961
Date: 2010-02-04 00:48:55 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libwdb/wdb.c
Modified: brlcad/trunk/src/libwdb/wdb.c
===
--- brlcad/trunk/src/libwdb/wdb.c 2010-02-04 00:46:50 UTC (rev 37542)
+++ brlcad/trunk/src/libwdb/wdb.c 2010-02-04 00:48:55 UTC (rev 37543)
@@ -344,9 +344,6 @@
mk_hyp(struct rt_wdb *wdbp, const char *name, const point_t vertex, const
vect_t height_vector, const vect_t vectA, fastf_t magB, fastf_t base_neck_ratio)
{
struct rt_hyp_internal *hyp;
-vect_t inH, inAu;
-vect_t unit_H;
-
BU_GETSTRUCT( hyp, rt_hyp_internal );
hyp-hyp_magic = RT_HYP_INTERNAL_MAGIC;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
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:[37541] brlcad/trunk/src/libtclcad
Revision: 37541
http://brlcad.svn.sourceforge.net/brlcad/?rev=37541view=rev
Author: bob1961
Date: 2010-02-04 00:20:29 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libtclcad/ged_obj.c
brlcad/trunk/src/libtclcad/tclcadAutoPath.c
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2010-02-04 00:11:54 UTC (rev
37540)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2010-02-04 00:20:29 UTC (rev
37541)
@@ -2250,7 +2250,6 @@
}
if (argc == 4) {
- int ret;
int ac;
const char **av;
@@ -2499,7 +2498,6 @@
}
if (argc == 4) {
- int ret;
int ac;
const char **av;
@@ -2662,7 +2660,6 @@
}
if (argc == 4) {
- int ret;
int ac;
const char **av;
@@ -2894,7 +2891,6 @@
}
if (argc == 4) {
- int ret;
int ac;
const char **av;
@@ -2963,7 +2959,6 @@
const char *usage,
int maxargs)
{
-register int i;
int mx, my;
int dindex;
fastf_t cx, cy;
Modified: brlcad/trunk/src/libtclcad/tclcadAutoPath.c
===
--- brlcad/trunk/src/libtclcad/tclcadAutoPath.c 2010-02-04 00:11:54 UTC (rev
37540)
+++ brlcad/trunk/src/libtclcad/tclcadAutoPath.c 2010-02-04 00:20:29 UTC (rev
37541)
@@ -56,7 +56,9 @@
#define MAX_BUF 2048
/* FIXME: we utilize this Tcl internal in here */
+#if !defined(_WIN32) || defined(__CYGWIN__)
extern Tcl_Obj *TclGetLibraryPath (void);
+#endif
/* helper routine to determine whether the full 'path' includes a
@@ -220,13 +222,13 @@
char *cp;
if (root != (char *)0) {
- for (cp = root; *cp != '\0'; ++cp)
+ for (cp = (char *)root; *cp != '\0'; ++cp)
if (*cp == '\\')
*cp = '/';
}
if (data != (char *)0) {
- for (cp = data; *cp != '\0'; ++cp)
+ for (cp = (char *)data; *cp != '\0'; ++cp)
if (*cp == '\\')
*cp = '/';
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
