[brlcad-commits] SF.net SVN: brlcad:[41305] brlcad/trunk/src/tclscripts/mged/bindings.tcl
Revision: 41305
http://brlcad.svn.sourceforge.net/brlcad/?rev=41305view=rev
Author: bob1961
Date: 2010-11-09 16:10:50 + (Tue, 09 Nov 2010)
Log Message:
---
Modified the default_mouse_bindings proc by replacing the previous hack,
related to bad mouse behavior on Mac OS 10.5, with a similar hack that let's
the user determine whether or not to use the provided hack by setting a
no_focus_hack variable in the .mgedrc file.
Modified Paths:
--
brlcad/trunk/src/tclscripts/mged/bindings.tcl
Modified: brlcad/trunk/src/tclscripts/mged/bindings.tcl
===
--- brlcad/trunk/src/tclscripts/mged/bindings.tcl 2010-11-09 16:02:19 UTC
(rev 41304)
+++ brlcad/trunk/src/tclscripts/mged/bindings.tcl 2010-11-09 16:10:50 UTC
(rev 41305)
@@ -273,6 +273,7 @@
}
proc default_mouse_bindings { w } {
+global no_focus_hack
global transform
global tcl_platform
@@ -281,7 +282,7 @@
set osMajorVersion 0
}
-if {$::tcl_platform(os) == Darwin $osMajorVersion == 9} {
+if {[info exists no_focus_hack] $no_focus_hack} {
bind $w 1 winset $w; zoom 0.5; break
bind $w 2 winset $w; set tmpstr \[dm m %x %y\]; print_return_val
\$tmpstr; break
bind $w 3 winset $w; zoom 2.0; break
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book Blueprint to a
Billion shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-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:[41307] brlcad/trunk/src/libged/rt.c
Revision: 41307
http://brlcad.svn.sourceforge.net/brlcad/?rev=41307view=rev
Author: bob1961
Date: 2010-11-09 20:46:00 + (Tue, 09 Nov 2010)
Log Message:
---
Modified ged_build_tops to use the full path name when building up the command
line vector.
Modified Paths:
--
brlcad/trunk/src/libged/rt.c
Modified: brlcad/trunk/src/libged/rt.c
===
--- brlcad/trunk/src/libged/rt.c2010-11-09 19:57:26 UTC (rev 41306)
+++ brlcad/trunk/src/libged/rt.c2010-11-09 20:46:00 UTC (rev 41307)
@@ -501,7 +501,7 @@
continue;
if (vp end)
- *vp++ = gdlp-gdl_dp-d_namep;
+ *vp++ = bu_vls_addr(gdlp-gdl_path);
else {
bu_vls_printf(gedp-ged_result_str, libged: ran out of command
vector space at %s\n, gdlp-gdl_dp-d_namep);
break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book Blueprint to a
Billion shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-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:[41311] brlcad/trunk/src/libged/erase.c
Revision: 41311
http://brlcad.svn.sourceforge.net/brlcad/?rev=41311view=rev
Author: bob1961
Date: 2010-11-10 16:06:48 + (Wed, 10 Nov 2010)
Log Message:
---
This corrects behavior of the erase_all command (i.e. The who command now
yields the proper results and a subsequent raytrace is also correct).
Modified Paths:
--
brlcad/trunk/src/libged/erase.c
Modified: brlcad/trunk/src/libged/erase.c
===
--- brlcad/trunk/src/libged/erase.c 2010-11-09 21:50:48 UTC (rev 41310)
+++ brlcad/trunk/src/libged/erase.c 2010-11-10 16:06:48 UTC (rev 41311)
@@ -401,7 +401,51 @@
}
}
+int
+_ged_eraseFirstSubpath(struct ged *gedp,
+ struct ged_display_list *gdlp,
+ struct db_full_path *subpath,
+ const int skip_first)
+{
+struct solid *sp;
+struct solid *nsp;
+struct db_full_path dup_path;
+db_full_path_init(dup_path);
+
+sp = BU_LIST_NEXT(solid, gdlp-gdl_headSolid);
+while (BU_LIST_NOT_HEAD(sp, gdlp-gdl_headSolid)) {
+ nsp = BU_LIST_PNEXT(solid, sp);
+ if (db_full_path_subset(sp-s_fullpath, subpath, skip_first)) {
+ int ret;
+
+ db_dup_full_path(dup_path, sp-s_fullpath);
+ BU_LIST_DEQUEUE(sp-l);
+ FREE_SOLID(sp, _FreeSolid.l);
+
+ BU_LIST_DEQUEUE(gdlp-l);
+
+ if (!BU_LIST_IS_EMPTY(gdlp-gdl_headSolid)) {
+ ged_splitGDL(gedp, gdlp, dup_path);
+ ret = 1;
+ } else {
+ ret = 0;
+ }
+
+ db_free_full_path(dup_path);
+
+ /* Free up the display list */
+ bu_vls_free(gdlp-gdl_path);
+ free((void *)gdlp);
+
+ return ret;
+ }
+ sp = nsp;
+}
+
+return 0;
+}
+
/*
* Erase/remove display list item from headDisplay if path is a subset of
item's path.
*/
@@ -417,13 +461,30 @@
if (db_string_to_path(subpath, gedp-ged_wdbp-dbip, path) == 0) {
gdlp = BU_LIST_NEXT(ged_display_list, gedp-ged_gdp-gd_headDisplay);
while (BU_LIST_NOT_HEAD(gdlp, gedp-ged_gdp-gd_headDisplay)) {
+ gdlp-gdl_wflag = 0;
+ gdlp = BU_LIST_PNEXT(ged_display_list, gdlp);
+ }
+
+ gdlp = BU_LIST_NEXT(ged_display_list, gedp-ged_gdp-gd_headDisplay);
+ while (BU_LIST_NOT_HEAD(gdlp, gedp-ged_gdp-gd_headDisplay)) {
next_gdlp = BU_LIST_PNEXT(ged_display_list, gdlp);
+ /* This display list has already been visited. */
+ if (gdlp-gdl_wflag) {
+ gdlp = next_gdlp;
+ continue;
+ }
+
+ /* Mark as being visited. */
+ gdlp-gdl_wflag = 1;
+
if (db_string_to_path(fullpath, gedp-ged_wdbp-dbip,
bu_vls_addr(gdlp-gdl_path)) == 0) {
if (db_full_path_subset(fullpath, subpath, skip_first)) {
_ged_freeDisplayListItem(gedp, gdlp);
- } else {
- eraseAllSubpathsFromSolidList(gdlp, subpath, skip_first);
+ } else if (_ged_eraseFirstSubpath(gedp, gdlp, subpath,
skip_first)) {
+ gdlp = BU_LIST_NEXT(ged_display_list,
gedp-ged_gdp-gd_headDisplay);
+ db_free_full_path(fullpath);
+ continue;
}
db_free_full_path(fullpath);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book Blueprint to a
Billion shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-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:[41312] brlcad/trunk/src/tclscripts/archer
Revision: 41312
http://brlcad.svn.sourceforge.net/brlcad/?rev=41312view=rev
Author: bob1961
Date: 2010-11-10 18:25:04 + (Wed, 10 Nov 2010)
Log Message:
---
Added a way to bypass tree decoration (i.e. increase tree update speed) by
setting a no_tree_decorate variable in .archerrc.
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 2010-11-10 16:06:48 UTC
(rev 41311)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2010-11-10 18:25:04 UTC
(rev 41312)
@@ -8313,6 +8313,7 @@
::itcl::body Archer::readPreferences {} {
global env
+global no_tree_decorate
if {$mViewOnly} {
return
@@ -8385,6 +8386,12 @@
}
::itcl::body Archer::writePreferencesBody {_pfile} {
+global no_tree_decorate
+
+if {[info exists no_tree_decorate]} {
+ puts $_pfile set no_tree_decorate $no_tree_decorate
+}
+
puts $_pfile set mBackgroundColor \$mBackgroundColor\
puts $_pfile set mBindingMode $mBindingMode
puts $_pfile set mEnableBigE $mEnableBigE
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2010-11-10 16:06:48 UTC
(rev 41311)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2010-11-10 18:25:04 UTC
(rev 41312)
@@ -3287,6 +3287,8 @@
}
::itcl::body ArcherCore::fillTree {_pnode _ctext _flat {_allow_multiple 0}} {
+global no_tree_decorate
+
set cnodes [getCNodesFromCText $_pnode $_ctext]
# Atleast one node for _pnode/_ctext already exists
@@ -3303,12 +3305,18 @@
}
set ptext $mNode2Text($_pnode)
-set op [getTreeOp $ptext $_ctext]
-set img [getTreeImage $_ctext $ctype $op $isregion]
-set cnode [$itk_component(newtree) insert $_pnode end \
- -tags $TREE_POPUP_TAG \
- -text $_ctext \
- -image $img]
+if {[info exists no_tree_decorate] $no_tree_decorate} {
+ set cnode [$itk_component(newtree) insert $_pnode end \
+ -tags $TREE_POPUP_TAG \
+ -text $_ctext]
+} else {
+ set op [getTreeOp $ptext $_ctext]
+ set img [getTreeImage $_ctext $ctype $op $isregion]
+ set cnode [$itk_component(newtree) insert $_pnode end \
+ -tags $TREE_POPUP_TAG \
+ -text $_ctext \
+ -image $img]
+}
fillTreeColumns $cnode $_ctext
if {!$_flat $ctype == comb} {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book Blueprint to a
Billion shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-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:[41321] brlcad/trunk/src/tclscripts/archer/CombEditFrame .tcl
Revision: 41321
http://brlcad.svn.sourceforge.net/brlcad/?rev=41321view=rev
Author: bob1961
Date: 2010-11-10 22:32:19 + (Wed, 10 Nov 2010)
Log Message:
---
Added the validTableEntry method for validating CombEditFrame's relative edit
tables entries.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-11-10
21:16:56 UTC (rev 41320)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-11-10
22:32:19 UTC (rev 41321)
@@ -99,6 +99,7 @@
method deleteRow {_type _row}
method setKeypoint {args}
method setKeypointVC {_tname _row _col}
+ method validateTableEntry {_row _col _newval _tname}
# Override what's in GeometryEditFrame
method updateGeometryIfMod {}
@@ -565,7 +566,9 @@
-cols $cols \
-titlerows 1 \
-colstretchmode all \
- -variable [::itcl::scope mMemberData$tname]
+ -variable [::itcl::scope mMemberData$tname] \
+ -validate 1 \
+ -validatecommand [::itcl::code $this validateTableEntry %r %c
%S $tname]
} {}
# Create scrollbars
@@ -934,6 +937,26 @@
}
}
+::itcl::body CombEditFrame::validateTableEntry {_row _col _newval _tname} {
+if {$_col == 0 || ![info exists mMemberData$_tname\($_row,0)]} {
+ return 0
+}
+
+if {$_col == 1} {
+ if {[regexp {[/\?\*\n]} $_newval]} {
+ return 0
+ }
+
+ return 1
+}
+
+if {[string is double $_newval])} {
+ return 1
+}
+
+return 0
+}
+
::itcl::body CombEditFrame::updateGeometryIfMod {} {
if {$itk_option(-mged) == ||
$itk_option(-geometryObject) == } {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-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:[41350] brlcad/trunk/src/tclscripts/archer/CombEditFrame .tcl
Revision: 41350
http://brlcad.svn.sourceforge.net/brlcad/?rev=41350view=rev
Author: bob1961
Date: 2010-11-15 15:42:44 + (Mon, 15 Nov 2010)
Log Message:
---
Fixed a typo in CombEditFrame::validateTableEntry.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-11-15
15:06:04 UTC (rev 41349)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-11-15
15:42:44 UTC (rev 41350)
@@ -950,7 +950,7 @@
return 1
}
-if {[string is double $_newval])} {
+if {[string is double $_newval]} {
return 1
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-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:[41355] brlcad/trunk/src/libged/combmem.c
Revision: 41355
http://brlcad.svn.sourceforge.net/brlcad/?rev=41355view=rev
Author: bob1961
Date: 2010-11-15 19:36:43 + (Mon, 15 Nov 2010)
Log Message:
---
Modified combmem_vls_print_member_info by putting braces around object member
names to accommodate possible whitespace in the member names.
Modified Paths:
--
brlcad/trunk/src/libged/combmem.c
Modified: brlcad/trunk/src/libged/combmem.c
===
--- brlcad/trunk/src/libged/combmem.c 2010-11-15 19:35:16 UTC (rev 41354)
+++ brlcad/trunk/src/libged/combmem.c 2010-11-15 19:36:43 UTC (rev 41355)
@@ -285,13 +285,13 @@
switch (etype) {
case ETYPES_ABS:
if (!itp-tr_l.tl_mat) {
- bu_vls_printf(gedp-ged_result_str, %c %s 0.0 0.0 0.0 0.0 0.0
0.0 1.0 1.0 1.0 1.0 0.0 0.0 0.0,
+ bu_vls_printf(gedp-ged_result_str, %c {%s} 0.0 0.0 0.0 0.0
0.0 0.0 1.0 1.0 1.0 1.0 0.0 0.0 0.0,
op, itp-tr_l.tl_name);
} else {
if (combmem_disassemble_mat(itp-tr_l.tl_mat, az, el, tw,
tx, ty, tz, sa, sx, sy, sz))
bu_log(Found bad matrix for %s\n, itp-tr_l.tl_name);
- bu_vls_printf(gedp-ged_result_str, %c %s %lf %lf %lf %lf %lf
%lf %lf %lf %lf %lf 0.0 0.0 0.0,
+ bu_vls_printf(gedp-ged_result_str, %c {%s} %lf %lf %lf %lf
%lf %lf %lf %lf %lf %lf 0.0 0.0 0.0,
op, itp-tr_l.tl_name,
az * bn_radtodeg,
el * bn_radtodeg,
@@ -302,27 +302,27 @@
break;
case ETYPES_REL:
- bu_vls_printf(gedp-ged_result_str, %c %s 0.0 0.0 0.0 0.0 0.0 0.0
1.0 1.0 1.0 1.0 0.0 0.0 0.0,
+ bu_vls_printf(gedp-ged_result_str, %c {%s} 0.0 0.0 0.0 0.0 0.0
0.0 1.0 1.0 1.0 1.0 0.0 0.0 0.0,
op, itp-tr_l.tl_name);
break;
case ETYPES_ROT_AET:
- bu_vls_printf(gedp-ged_result_str, %c %s 0.0 0.0 0.0 0.0 0.0 0.0,
+ bu_vls_printf(gedp-ged_result_str, %c {%s} 0.0 0.0 0.0 0.0 0.0
0.0,
op, itp-tr_l.tl_name);
break;
case ETYPES_ROT_XYZ:
- bu_vls_printf(gedp-ged_result_str, %c %s 0.0 0.0 0.0 0.0 0.0 0.0,
+ bu_vls_printf(gedp-ged_result_str, %c {%s} 0.0 0.0 0.0 0.0 0.0
0.0,
op, itp-tr_l.tl_name);
break;
case ETYPES_ROT_ARBITRARY_AXIS:
- bu_vls_printf(gedp-ged_result_str, %c %s 0.0 0.0 0.0 0.0 0.0 0.0
0.0,
+ bu_vls_printf(gedp-ged_result_str, %c {%s} 0.0 0.0 0.0 0.0 0.0
0.0 0.0,
op, itp-tr_l.tl_name);
break;
case ETYPES_TRA:
- bu_vls_printf(gedp-ged_result_str, %c %s 0.0 0.0 0.0,
+ bu_vls_printf(gedp-ged_result_str, %c {%s} 0.0 0.0 0.0,
op, itp-tr_l.tl_name);
break;
case ETYPES_SCA:
- bu_vls_printf(gedp-ged_result_str, %c %s 1.0 1.0 1.0 1.0 0.0 0.0
0.0,
+ bu_vls_printf(gedp-ged_result_str, %c {%s} 1.0 1.0 1.0 1.0 0.0
0.0 0.0,
op, itp-tr_l.tl_name);
default:
break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-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:[41403] brlcad/trunk/src/tclscripts
Revision: 41403
http://brlcad.svn.sourceforge.net/brlcad/?rev=41403view=rev
Author: bob1961
Date: 2010-11-18 22:16:33 + (Thu, 18 Nov 2010)
Log Message:
---
Mouse ray callbacks are now required to have pane as its first argument.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2010-11-18 15:17:43 UTC
(rev 41402)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2010-11-18 22:16:33 UTC
(rev 41403)
@@ -762,9 +762,9 @@
method initCompSelect {}
method compSelectCallback {_mstring}
- method mrayCallback_cvo {_start _target _partitions}
- method mrayCallback_erase {_start _target _partitions}
- method mrayCallback_pick {_start _target _partitions}
+ method mrayCallback_cvo {_pane _start _target _partitions}
+ method mrayCallback_erase {_pane _start _target _partitions}
+ method mrayCallback_pick {_pane _start _target _partitions}
method initViewMeasure {}
method endViewMeasure {_mstring}
@@ -2528,7 +2528,7 @@
putString $_mstring
}
-::itcl::body ArcherCore::mrayCallback_cvo {_start _target _partitions} {
+::itcl::body ArcherCore::mrayCallback_cvo {_pane _start _target _partitions} {
if {$_partitions == } {
set rpos [$itk_component(ged) lastMouseRayPos]
eval $itk_component(ged) vslew $rpos
@@ -2550,10 +2550,10 @@
}
set point [vscale $point [$itk_component(ged) base2local]]
-$itk_component(ged) center $point
+$itk_component(ged) pane_center $_pane $point
}
-::itcl::body ArcherCore::mrayCallback_erase {_start _target _partitions} {
+::itcl::body ArcherCore::mrayCallback_erase {_pane _start _target _partitions}
{
if {$_partitions == } {
return
}
@@ -2581,7 +2581,7 @@
set mStatusStr erase $path
}
-::itcl::body ArcherCore::mrayCallback_pick {_start _target _partitions} {
+::itcl::body ArcherCore::mrayCallback_pick {_pane _start _target _partitions} {
set partition [lindex $_partitions 0]
if {$partition == {}} {
putString Missed!
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2010-11-18 15:17:43 UTC (rev
41402)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2010-11-18 22:16:33 UTC (rev
41403)
@@ -3324,7 +3324,7 @@
}
} else {
foreach callback $mMouseRayCallbacks {
- catch {$callback $mLastMouseRayStart $mLastMouseRayTarget
$partitions}
+ catch {$callback $_pane $mLastMouseRayStart $mLastMouseRayTarget
$partitions}
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-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:[41462] brlcad/trunk/src/tclscripts/archer/CombEditFrame .tcl
Revision: 41462
http://brlcad.svn.sourceforge.net/brlcad/?rev=41462view=rev
Author: bob1961
Date: 2010-11-24 20:37:44 + (Wed, 24 Nov 2010)
Log Message:
---
Added the ability to select one or more members of a combination such that
setting the edit parameters for one member will set them for all selected
members.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-11-24
18:08:12 UTC (rev 41461)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-11-24
20:37:44 UTC (rev 41462)
@@ -65,15 +65,16 @@
variable mMemberDataRotArb
variable mMemberDataTra
variable mMemberDataSca
- variable mMemberHeadings {Op Name Az El Tw Tx Ty Tz Sa Sx Sy Sz Kx Ky
Kz}
- variable mMemberHeadingsRotAet {Op Name Az El Tw Kx Ky Kz}
- variable mMemberHeadingsRotXyz {Op Name Rx Ry Rz Kx Ky Kz}
- variable mMemberHeadingsRotArb {Op Name Kx Ky Kz Dx Dy Dz Ang}
- variable mMemberHeadingsTra {Op Name Tx Ty Tz}
- variable mMemberHeadingsSca {Op Name Sa Sx Sy Sz Kx Ky Kz}
+ variable mMemberHeadings { Op Name Az El Tw Tx Ty Tz Sa Sx Sy Sz Kx
Ky Kz}
+ variable mMemberHeadingsRotAet { Op Name Az El Tw Kx Ky Kz}
+ variable mMemberHeadingsRotXyz { Op Name Rx Ry Rz Kx Ky Kz}
+ variable mMemberHeadingsRotArb { Op Name Kx Ky Kz Dx Dy Dz Ang}
+ variable mMemberHeadingsTra { Op Name Tx Ty Tz}
+ variable mMemberHeadingsSca { Op Name Sa Sx Sy Sz Kx Ky Kz}
variable mMemberDataOrder {RotAet RotXyz RotArb Tra Sca}
variable mLastTabIndex -1
- variable mTableData {RotAet 8 Rot (AET) RotXyz 8 Rot (XYZ) RotArb 9
Rot (Arbitrary) Tra 5 Translation Sca 9 Scale}
+ variable mTableData {RotAet 9 Rot (AET) RotXyz 9 Rot (XYZ) RotArb
10 Rot (Arbitrary) Tra 6 Translation Sca 10 Scale}
+ variable mToggleSelectMode 0
method buildGeneralGUI {}
method buildShaderGUI {}
@@ -92,13 +93,17 @@
method handleTablePopup {_win _x _y _X _Y}
method populateMembersMenu {_type _index _X _Y}
method addMemberCreationMenuEntries {_type _row}
- method setOperator {_op _tname _index}
+ method setTableCol {_tname _col _val}
+ method setTableVal {_tname _index _val}
method selectName {args}
+ method invertSelect {_tname}
+ method toggleSelect {_tname _win _x _y}
method appendRow {_tname}
method insertRow {_type _row}
method deleteRow {_type _row}
method setKeypoint {args}
method setKeypointVC {_tname _row _col}
+ method syncColumn {_tname _row _col _val}
method validateTableEntry {_row _col _newval _tname}
# Override what's in GeometryEditFrame
@@ -525,6 +530,8 @@
grid $itk_component(combTreeT) \
-row 0 \
-sticky nsew
+grid columnconfigure $parent 0 -weight 1
+grid rowconfigure $parent 0 -weight 1
#bind $itk_component(combTreeT) Leave [::itcl::code $this
updateGeometryIfMod]
#bind $itk_component(combTreeT) Return [::itcl::code $this
updateGeometryIfMod]
@@ -564,6 +571,7 @@
-width 0 \
-rows 10 \
-cols $cols \
+ -titlecols 1 \
-titlerows 1 \
-colstretchmode all \
-variable [::itcl::scope mMemberData$tname] \
@@ -571,6 +579,11 @@
-validatecommand [::itcl::code $this validateTableEntry %r %c
%S $tname]
} {}
+ # Set width of columns 0, 1 and 2
+ $itk_component(combMembers$tname) width 0 3
+ $itk_component(combMembers$tname) width 1 4
+ $itk_component(combMembers$tname) width 2 20
+
# Create scrollbars
itk_component add tableHScroll$tname {
::ttk::scrollbar $itk_component(combMembers$tname\F).tableHScroll \
@@ -596,8 +609,15 @@
$itk_component(combMembersTabs) add $itk_component(combMembers$tname\F)
-text $text
+ bind $itk_component(combMembers$tname) Button-1 [::itcl::code $this
toggleSelect $tname %W %x %y]
bind $itk_component(combMembers$tname) Button-3 [::itcl::code $this
handleTablePopup %W %x %y %X %Y]
bind $itk_component(combMembers$tname) B3-Motion {break}
+
+ $itk_component(combMembers$tname) tag col select_col 0
+ $itk_component(combMembers$tname) tag configure select_col \
+ -relief raised
+ $itk_component(combMembers$tname) tag configure title \
+ -relief raised
}
grid columnconfigure $itk_component(combMembersTabs) 0 -weight 1
@@ -667,7 +687,7 @@
unset mMemberData$_tname
set col 0
foreach heading [subst $[subst mMemberHeadings$_tname]] {
- set mMemberData$_tname\(0,$col) $heading
[brlcad-commits] SF.net SVN: brlcad:[41494] brlcad/trunk/src/tclscripts/archer/ AttrGroupsDisplayUtility.tcl
Revision: 41494
http://brlcad.svn.sourceforge.net/brlcad/?rev=41494view=rev
Author: bob1961
Date: 2010-12-01 20:49:08 + (Wed, 01 Dec 2010)
Log Message:
---
Minor tweak to AttrGroupsDisplayUtility::exportToPng. Changed Text to PNG in
typelist.
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-12-01 14:27:45 UTC (rev 41493)
+++ brlcad/trunk/src/tclscripts/archer/AttrGroupsDisplayUtility.tcl
2010-12-01 20:49:08 UTC (rev 41494)
@@ -364,7 +364,7 @@
::itcl::body AttrGroupsDisplayUtility::exportToPng {} {
set typelist {
- {Text {.png}}
+ {PNG {.png}}
{All Files {*}}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Increase Visibility of Your 3D Game App Earn a Chance To Win $500!
Tap into the largest installed PC base get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-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:[41514] brlcad/trunk/src/tclscripts/archer/CombEditFrame .tcl
Revision: 41514
http://brlcad.svn.sourceforge.net/brlcad/?rev=41514view=rev
Author: bob1961
Date: 2010-12-06 19:06:50 + (Mon, 06 Dec 2010)
Log Message:
---
Update calls to setKeypointVC to account for the selection column.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-12-06
18:17:37 UTC (rev 41513)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-12-06
19:06:50 UTC (rev 41514)
@@ -881,15 +881,15 @@
($_type == 1 6 = $col $col = 8)} {
$itk_component(combMembersMenu) add command \
-label Set Keypoint (View Center) \
- -command [::itcl::code $this setKeypointVC $tname $row 5]
+ -command [::itcl::code $this setKeypointVC $tname $row 6]
} elseif {$_type == 2 3 = $col $col = 5} {
$itk_component(combMembersMenu) add command \
-label Set Keypoint (View Center) \
- -command [::itcl::code $this setKeypointVC $tname $row 2]
+ -command [::itcl::code $this setKeypointVC $tname $row 3]
} elseif {$_type == 4 7 = $col $col = 9} {
$itk_component(combMembersMenu) add command \
-label Set Keypoint (View Center) \
- -command [::itcl::code $this setKeypointVC $tname $row 6]
+ -command [::itcl::code $this setKeypointVC $tname $row 7]
}
addMemberCreationMenuEntries $_type $row
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-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:[41585] brlcad/trunk/src
Revision: 41585 http://brlcad.svn.sourceforge.net/brlcad/?rev=41585view=rev Author: bob1961 Date: 2010-12-13 20:41:27 + (Mon, 13 Dec 2010) Log Message: --- Bump version to 7.18.1 Modified Paths: -- brlcad/trunk/src/archer/archer.bat brlcad/trunk/src/mged/mged.bat brlcad/trunk/src/tclscripts/rtwizard/rtwizard.bat Modified: brlcad/trunk/src/archer/archer.bat === --- brlcad/trunk/src/archer/archer.bat 2010-12-13 20:09:30 UTC (rev 41584) +++ brlcad/trunk/src/archer/archer.bat 2010-12-13 20:41:27 UTC (rev 41585) @@ -23,7 +23,7 @@ SETLOCAL REM XXX FIXME: SHOULD NOT NEED TO SET BRLCAD_DATA OR CAD_VERSION XXX -SET CAD_VERSION=7.17.0 +SET CAD_VERSION=7.18.1 SET SAVE_CD=%CD% SET PATH=%~dp0 Modified: brlcad/trunk/src/mged/mged.bat === --- brlcad/trunk/src/mged/mged.bat 2010-12-13 20:09:30 UTC (rev 41584) +++ brlcad/trunk/src/mged/mged.bat 2010-12-13 20:41:27 UTC (rev 41585) @@ -23,7 +23,7 @@ SETLOCAL REM XXX FIXME: SHOULD NOT NEED TO SET BRLCAD_DATA OR CAD_VERSION XXX -SET CAD_VERSION=7.17.10 +SET CAD_VERSION=7.18.1 SET SAVE_CD=%CD% SET PATH=%~dp0 Modified: brlcad/trunk/src/tclscripts/rtwizard/rtwizard.bat === --- brlcad/trunk/src/tclscripts/rtwizard/rtwizard.bat 2010-12-13 20:09:30 UTC (rev 41584) +++ brlcad/trunk/src/tclscripts/rtwizard/rtwizard.bat 2010-12-13 20:41:27 UTC (rev 41585) @@ -23,7 +23,7 @@ SETLOCAL REM XXX FIXME: SHOULD NOT NEED TO SET BRLCAD_DATA OR CAD_VERSION XXX -SET CAD_VERSION=7.17.10 +SET CAD_VERSION=7.18.1 SET SAVE_CD=%CD% SET PATH=%~dp0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-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:[41604] brlcad/trunk/src
Revision: 41604 http://brlcad.svn.sourceforge.net/brlcad/?rev=41604view=rev Author: bob1961 Date: 2010-12-14 21:00:45 + (Tue, 14 Dec 2010) Log Message: --- Remove the need to set CAD_VERSION and BRLCAD_DATA in archer.bat and mged.bat. Modified Paths: -- brlcad/trunk/src/archer/archer.bat brlcad/trunk/src/mged/mged.bat Modified: brlcad/trunk/src/archer/archer.bat === --- brlcad/trunk/src/archer/archer.bat 2010-12-14 20:43:41 UTC (rev 41603) +++ brlcad/trunk/src/archer/archer.bat 2010-12-14 21:00:45 UTC (rev 41604) @@ -22,17 +22,10 @@ SETLOCAL -REM XXX FIXME: SHOULD NOT NEED TO SET BRLCAD_DATA OR CAD_VERSION XXX -SET CAD_VERSION=7.18.1 - -SET SAVE_CD=%CD% -SET PATH=%~dp0 +SET BWISH=%~dp0bwish SET ARCHER=%~dp0archer -CD %PATH%\.. -SET BRLCAD_DATA=%CD%\share\brlcad\%CAD_VERSION% -CD %SAVE_CD% -START /B bwish %ARCHER% %1 +START /B %BWISH% %ARCHER% %1 CLS EXIT Modified: brlcad/trunk/src/mged/mged.bat === --- brlcad/trunk/src/mged/mged.bat 2010-12-14 20:43:41 UTC (rev 41603) +++ brlcad/trunk/src/mged/mged.bat 2010-12-14 21:00:45 UTC (rev 41604) @@ -22,20 +22,13 @@ SETLOCAL -REM XXX FIXME: SHOULD NOT NEED TO SET BRLCAD_DATA OR CAD_VERSION XXX -SET CAD_VERSION=7.18.1 - -SET SAVE_CD=%CD% -SET PATH=%~dp0 -CD %PATH%\.. -SET BRLCAD_DATA=%CD%\share\brlcad\%CAD_VERSION% -CD %SAVE_CD% +SET MGED=%~dp0mged SET WEB_BROWSER=C:\Program Files\Internet Explorer\IEXPLORE.EXE IF %1==-g ( -START /B mged.exe %2 +START /B %MGED% %2 ) ELSE ( -START /B mged.exe %1 +START /B %MGED% %1 ) CLS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-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:[41678] brlcad/trunk/src/libbu/vls.c
Revision: 41678
http://brlcad.svn.sourceforge.net/brlcad/?rev=41678view=rev
Author: bob1961
Date: 2010-12-16 20:07:18 + (Thu, 16 Dec 2010)
Log Message:
---
Updated bu_argv_from_string to handle double quotes. This is for cases where an
argument contains spaces (i.e. like in a path).
Modified Paths:
--
brlcad/trunk/src/libbu/vls.c
Modified: brlcad/trunk/src/libbu/vls.c
===
--- brlcad/trunk/src/libbu/vls.c2010-12-16 19:57:12 UTC (rev 41677)
+++ brlcad/trunk/src/libbu/vls.c2010-12-16 20:07:18 UTC (rev 41678)
@@ -501,6 +501,7 @@
{
int argc = 0; /* number of words seen */
int skip = 0;
+int quoted = 0;
if (UNLIKELY(!argv)) {
/* do this instead of crashing */
@@ -528,8 +529,33 @@
for (; *lp != '\0'; lp++) {
+ if (*lp == '') {
+ if (!quoted) {
+ /* start collecting quoted string */
+ quoted = 1;
+
+ /* skip past the quote character */
+ argv[argc] = lp + 1;
+ continue;
+ }
+
+ /* end qoute */
+ quoted = 0;
+ *lp++ = '\0';
+
+ /* skip leading whitespace */
+ while (*lp != '\0' isspace(*lp)) {
+ /* null out spaces */
+ *lp = '\0';
+ lp++;
+ }
+
+ skip = 0;
+ goto nextword;
+ }
+
/* skip over current word */
- if (!isspace(*lp))
+ if (quoted || !isspace(*lp))
continue;
skip = 0;
@@ -545,6 +571,7 @@
if (*(lp + skip) == '\0')
break;
+nextword:
/* make sure argv[] isn't full, need room for NULL */
if (argc = lim-1)
break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-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:[41680] brlcad/trunk/src/mged/tedit.c
Revision: 41680 http://brlcad.svn.sourceforge.net/brlcad/?rev=41680view=rev Author: bob1961 Date: 2010-12-16 20:09:24 + (Thu, 16 Dec 2010) Log Message: --- Use double quotes in WIN_EDITOR to keep bu_argv_from_string from seeing this as multiple arguments. Modified Paths: -- brlcad/trunk/src/mged/tedit.c Modified: brlcad/trunk/src/mged/tedit.c === --- brlcad/trunk/src/mged/tedit.c 2010-12-16 20:07:27 UTC (rev 41679) +++ brlcad/trunk/src/mged/tedit.c 2010-12-16 20:09:24 UTC (rev 41680) @@ -51,7 +51,7 @@ extern int classic_mged; /* editors to test, in order of discovery preference (EDITOR overrides) */ -#define WIN_EDITOR c:/Program Files/Windows NT/Accessories/wordpad +#define WIN_EDITOR \c:/Program Files/Windows NT/Accessories/wordpad\ #define MAC_EDITOR /Applications/TextEdit.app/Contents/MacOS/TextEdit #define EMACS_EDITOR emacs #define JOVE_EDITOR jove This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-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:[41681] brlcad/trunk/misc/win32-msvc8/tclsh/library/ installTree.tcl
Revision: 41681
http://brlcad.svn.sourceforge.net/brlcad/?rev=41681view=rev
Author: bob1961
Date: 2010-12-16 20:21:52 + (Thu, 16 Dec 2010)
Log Message:
---
Copy the appropriate redist, depending on the platform.
Modified Paths:
--
brlcad/trunk/misc/win32-msvc8/tclsh/library/installTree.tcl
Modified: brlcad/trunk/misc/win32-msvc8/tclsh/library/installTree.tcl
===
--- brlcad/trunk/misc/win32-msvc8/tclsh/library/installTree.tcl 2010-12-16
20:09:24 UTC (rev 41680)
+++ brlcad/trunk/misc/win32-msvc8/tclsh/library/installTree.tcl 2010-12-16
20:21:52 UTC (rev 41681)
@@ -305,11 +305,21 @@
puts \[12 of 15] COPYING REDIST FILES
catch {
if {[info exists C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT]} {
- copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT [file join $installDir bin]
- copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC [file join $installDir bin]
+ if {$platform == x64} {
+ copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.CRT [file join $installDir bin]
+ copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.MFC [file join $installDir bin]
+ } else {
+ copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT [file join $installDir bin]
+ copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC [file join $installDir bin]
+ }
} else {
- copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT [file join $installDir bin]
- copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC [file join $installDir bin]
+ if {$platform == x64} {
+ copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.CRT [file join $installDir bin]
+ copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.MFC [file join $installDir bin]
+ } else {
+ copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT [file join $installDir bin]
+ copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC [file join $installDir bin]
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-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:[41684] brlcad/trunk/src/other/tcl/generic/tclPlatDecls. h
Revision: 41684 http://brlcad.svn.sourceforge.net/brlcad/?rev=41684view=rev Author: bob1961 Date: 2010-12-16 21:50:29 + (Thu, 16 Dec 2010) Log Message: --- Added this bit of code from the previous version of tclPlatDecls.h to get things compiling on windows again. Modified Paths: -- brlcad/trunk/src/other/tcl/generic/tclPlatDecls.h Modified: brlcad/trunk/src/other/tcl/generic/tclPlatDecls.h === --- brlcad/trunk/src/other/tcl/generic/tclPlatDecls.h 2010-12-16 21:00:28 UTC (rev 41683) +++ brlcad/trunk/src/other/tcl/generic/tclPlatDecls.h 2010-12-16 21:50:29 UTC (rev 41684) @@ -26,13 +26,19 @@ /* * Pull in the typedef of TCHAR for windows. */ -#if defined(__WIN32__) !defined(_TCHAR_DEFINED) +#if defined(__CYGWIN__) +typedef char TCHAR; +#elif defined(__WIN32__) !defined(_TCHAR_DEFINED) # include tchar.h # ifndef _TCHAR_DEFINED /* Borland seems to forget to set this. */ - typedef _TCHAR TCHAR; +typedef _TCHAR TCHAR; # define _TCHAR_DEFINED # endif +# if defined(_MSC_VER) defined(__STDC__) + /* MSVC++ misses this. */ + typedef _TCHAR TCHAR; +# endif #endif /* !BEGIN!: Do not edit below this line. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-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:[41692] brlcad/trunk/src/tclscripts/archer/CombEditFrame .tcl
Revision: 41692
http://brlcad.svn.sourceforge.net/brlcad/?rev=41692view=rev
Author: bob1961
Date: 2010-12-17 21:56:42 + (Fri, 17 Dec 2010)
Log Message:
---
Now using TkTable in CombEditFrame.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-12-17
21:55:10 UTC (rev 41691)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-12-17
21:56:42 UTC (rev 41692)
@@ -74,7 +74,6 @@
variable mMemberDataOrder {RotAet RotXyz RotArb Tra Sca}
variable mLastTabIndex -1
variable mTableData {RotAet 9 Rot (AET) RotXyz 9 Rot (XYZ) RotArb
10 Rot (Arbitrary) Tra 6 Translation Sca 10 Scale}
- variable mToggleSelectMode 0
method buildGeneralGUI {}
method buildShaderGUI {}
@@ -90,14 +89,11 @@
method packMemberDataIntoString {_tname}
method resetData {}
- method handleTablePopup {_win _x _y _X _Y}
+ method handleTablePopup {_index _X _Y}
method populateMembersMenu {_type _index _X _Y}
method addMemberCreationMenuEntries {_type _row}
- method setTableCol {_tname _col _val}
- method setTableVal {_tname _index _val}
method selectName {args}
method invertSelect {_tname}
- method toggleSelect {_tname _win _x _y}
method appendRow {_tname}
method insertRow {_type _row}
method deleteRow {_type _row}
@@ -566,19 +562,20 @@
::ttk::frame $itk_component(tabs).members$tname\F
} {}
itk_component add combMembers$tname {
- ::table $itk_component(combMembers$tname\F).members$tname \
+ ::cadwidgets::TkTable
$itk_component(combMembers$tname\F).members$tname \
+ [::itcl::scope mMemberData$tname] \
+ [subst $[subst mMemberHeadings$tname]] \
-cursor arrow \
-height 0 \
-maxheight 2000 \
-width 0 \
-rows 10 \
- -cols $cols \
-titlecols 1 \
-titlerows 1 \
- -colstretchmode all \
- -variable [::itcl::scope mMemberData$tname] \
+ -colstretchmode unset \
-validate 1 \
- -validatecommand [::itcl::code $this validateTableEntry %r %c
%S $tname]
+ -validatecommand [::itcl::code $this validateTableEntry %r %c
%S $tname] \
+ -tablePopupHandler [::itcl::code $this handleTablePopup]
} {}
# Set width of columns 0, 1 and 2
@@ -586,40 +583,11 @@
$itk_component(combMembers$tname) width 1 4
$itk_component(combMembers$tname) width 2 20
- # Create scrollbars
- itk_component add tableHScroll$tname {
- ::ttk::scrollbar $itk_component(combMembers$tname\F).tableHScroll \
- -orient horizontal
- } {}
-
- itk_component add tableVScroll$tname {
- ::ttk::scrollbar $itk_component(combMembers$tname\F).tableVScroll \
- -orient vertical
- } {}
-
- # Hook up scrollbars
- $itk_component(combMembers$tname) configure -xscrollcommand
$itk_component(tableHScroll$tname) set
- $itk_component(combMembers$tname) configure -yscrollcommand
$itk_component(tableVScroll$tname) set
- $itk_component(tableHScroll$tname) configure -command
$itk_component(combMembers$tname) xview
- $itk_component(tableVScroll$tname) configure -command
$itk_component(combMembers$tname) yview
-
- grid $itk_component(combMembers$tname)
$itk_component(tableVScroll$tname) -sticky nsew
- grid $itk_component(tableHScroll$tname) - -sticky nsew
-
+ grid $itk_component(combMembers$tname) -sticky nsew
grid columnconfigure $itk_component(combMembers$tname\F) 0 -weight 1
grid rowconfigure $itk_component(combMembers$tname\F) 0 -weight 1
$itk_component(combMembersTabs) add $itk_component(combMembers$tname\F)
-text $text
-
- bind $itk_component(combMembers$tname) Button-1 [::itcl::code $this
toggleSelect $tname %W %x %y]
- bind $itk_component(combMembers$tname) Button-3 [::itcl::code $this
handleTablePopup %W %x %y %X %Y]
- bind $itk_component(combMembers$tname) B3-Motion {break}
-
- $itk_component(combMembers$tname) tag col select_col 0
- $itk_component(combMembers$tname) tag configure select_col \
- -relief raised
- $itk_component(combMembers$tname) tag configure title \
- -relief raised
}
grid columnconfigure $itk_component(combMembersTabs) 0 -weight 1
@@ -804,10 +772,9 @@
initGeometry $gdata
}
-::itcl::body CombEditFrame::handleTablePopup {_win _x _y _X _Y} {
-set index [$_win index @$_x,$_y]
+::itcl::body CombEditFrame
[brlcad-commits] SF.net SVN: brlcad:[41691] brlcad/trunk/src/tclscripts/lib
Revision: 41691
http://brlcad.svn.sourceforge.net/brlcad/?rev=41691view=rev
Author: bob1961
Date: 2010-12-17 21:55:10 + (Fri, 17 Dec 2010)
Log Message:
---
This is the initial check-in of cadwidgets::TkTable. It's intended to be a
relatively thin wrapper around tktable for housing functionality that would
commonly be written for an application trying to use tktable. This includes
updates to Makefile.am and tclIndex.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/Makefile.am
brlcad/trunk/src/tclscripts/lib/tclIndex
Added Paths:
---
brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Modified: brlcad/trunk/src/tclscripts/lib/Makefile.am
===
--- brlcad/trunk/src/tclscripts/lib/Makefile.am 2010-12-17 20:00:52 UTC (rev
41690)
+++ brlcad/trunk/src/tclscripts/lib/Makefile.am 2010-12-17 21:55:10 UTC (rev
41691)
@@ -22,6 +22,7 @@
Splash.tcl \
Table.tcl \
TableView.tcl \
+ TkTable.tcl \
View.tcl \
ViewAxesControl.tcl
Added: brlcad/trunk/src/tclscripts/lib/TkTable.tcl
===
--- brlcad/trunk/src/tclscripts/lib/TkTable.tcl (rev 0)
+++ brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2010-12-17 21:55:10 UTC (rev
41691)
@@ -0,0 +1,232 @@
+# T K T A B L E . T C L
+# BRL-CAD
+#
+# Copyright (c) 1998-2010 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# This library 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 library 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.
+#
+###
+#
+# Description -
+# The TkTable class wraps tktable with common functionality.
+#
+
+::itcl::class cadwidgets::TkTable {
+inherit itk::Widget
+
+constructor {_datavar _headings args} {}
+destructor {}
+
+itk_option define -dataCallback dataCallback DataCallback
+itk_option define -tablePopupHandler tablePopupHandler TablePopupHandler
+
+public {
+ method setDataEntry {_index _val}
+ method setTableCol {_col _val}
+ method setTableVal {_index _val}
+ method width {args}
+}
+
+protected {
+ variable mTableDataVar
+ variable mTableHeadings
+ variable mToggleSelectMode 0
+
+ method handleTablePopup {_win _x _y _X _Y}
+ method toggleSelect {_win _x _y}
+}
+
+private {}
+}
+
+#
+#OPTIONS
+#
+
+
+#
+# CONSTRUCTOR
+#
+
+::itcl::body cadwidgets::TkTable::constructor {_datavar _headings args} {
+set mTableDataVar $_datavar
+set mTableHeadings $_headings
+
+set numcols [llength $_headings]
+
+itk_component add table {
+ ::table $itk_interior.table \
+ -cols $numcols \
+ -variable $mTableDataVar
+} {
+ keep -anchor -autoclear -background -bordercursor -borderwidth \
+ -browsecommand -cache -colorigin -colseparator \
+ -colstretchmode -coltagcommand -colwidth -command -cursor -drawmode
\
+ -ellipsis -exportselection -flashmode -flashtime -font -foreground \
+ -height -highlightbackground -highlightcolor -highlightthickness \
+ -insertbackground -insertborderwidth -insertofftime -insertontime \
+ -insertwidth -invertselected -ipadx -ipady -justify -maxheight \
+ -maxwidth -multiline -padx -pady -relief -resizeborders -rowheight \
+ -roworigin -rows -rowseparator -rowstretchmode -rowtagcommand \
+ -selectioncommand -selectmode -selecttitles -selecttype
-sparsearray \
+ -state -takefocus -titlecols -titlerows -usecommand -validate \
+ -validatecommand -width -wrap
+}
+
+# Hide these options from users of TkTable
+#-cols
+#-variable
+#-xscrollcommand -yscrollcommand
+
+# Set table headings
+set col 0
+foreach heading $mTableHeadings {
+ set $mTableDataVar\(0,$col\) $heading
+ incr col
+}
+
+# Create scrollbars
+itk_component add tableHScroll {
+ ::ttk::scrollbar $itk_interior.tableHScroll \
+ -orient horizontal
+} {}
+
+itk_component add tableVScroll {
+ ::ttk
[brlcad-commits] SF.net SVN: brlcad:[41770] brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Revision: 41770
http://brlcad.svn.sourceforge.net/brlcad/?rev=41770view=rev
Author: bob1961
Date: 2010-12-22 14:46:48 + (Wed, 22 Dec 2010)
Log Message:
---
Started adding behaviors similar to what's in Excel w.r.t. cell traversal and
editing.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Modified: brlcad/trunk/src/tclscripts/lib/TkTable.tcl
===
--- brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2010-12-22 14:42:15 UTC (rev
41769)
+++ brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2010-12-22 14:46:48 UTC (rev
41770)
@@ -31,6 +31,8 @@
itk_option define -dataCallback dataCallback DataCallback
itk_option define -tablePopupHandler tablePopupHandler TablePopupHandler
+itk_option define -validatecommand validatecommand ValidateCommand
+itk_option define -vclientdata vclientdata VClientData
public {
method setDataEntry {_index _val}
@@ -40,12 +42,25 @@
}
protected {
+ variable mNumCols 3
+ variable mLastCol 2
+ variable mNumRows 10
+ variable mLastRow 9
variable mTableDataVar
variable mTableHeadings
variable mToggleSelectMode 0
+ variable mInsertMode 0
+ variable mDoBreak 0
+ method doBreak {}
+ method handleKey {_win _key}
+ method handleLeftRight {_win _sflag}
method handleTablePopup {_win _x _y _X _Y}
+ method handleUpDown {_win _key}
+ method keyVisible {_key}
+ method setInsertMode {_imode}
method toggleSelect {_win _x _y}
+ method validateTableEntry {_row _col _newval}
}
private {}
@@ -56,6 +71,7 @@
#
+
#
# CONSTRUCTOR
#
@@ -64,11 +80,16 @@
set mTableDataVar $_datavar
set mTableHeadings $_headings
-set numcols [llength $_headings]
+set mNumCols [llength $_headings]
+set mLastCol [expr {$mNumCols - 1}]
itk_component add table {
::table $itk_interior.table \
- -cols $numcols \
+ -state disabled \
+ -titlecols 0 \
+ -titlerows 1 \
+ -cols $mNumCols \
+ -validatecommand [::itcl::code $this validateTableEntry %r %c %S] \
-variable $mTableDataVar
} {
keep -anchor -autoclear -background -bordercursor -borderwidth \
@@ -81,12 +102,16 @@
-maxwidth -multiline -padx -pady -relief -resizeborders -rowheight \
-roworigin -rows -rowseparator -rowstretchmode -rowtagcommand \
-selectioncommand -selectmode -selecttitles -selecttype
-sparsearray \
- -state -takefocus -titlecols -titlerows -usecommand -validate \
- -validatecommand -width -wrap
+ -takefocus -usecommand -validate \
+ -width -wrap
}
# Hide these options from users of TkTable
#-cols
+#-state
+#-titlecols
+#-titlerows
+#-validatecommand
#-variable
#-xscrollcommand -yscrollcommand
@@ -121,17 +146,34 @@
grid rowconfigure $itk_interior 0 -weight 1
-bind $itk_component(table) Button-1 [::itcl::code $this toggleSelect %W
%x %y]
+# Button Bindings
+bind $itk_component(table) Button-1 [::itcl::code $this toggleSelect %W
%x %y]; if {\[[::itcl::code $this doBreak]\]} {break}
bind $itk_component(table) Button-3 [::itcl::code $this handleTablePopup
%W %x %y %X %Y]
bind $itk_component(table) B3-Motion
+# Key Bindings
+bind $itk_component(table) Key [::itcl::code $this handleKey %W %K]; if
{\[[::itcl::code $this doBreak]\]} {break}
+bind $itk_component(table) Key-Tab [::itcl::code $this handleLeftRight
%W 0]; break
+#bind $itk_component(table) Shift-Key-Tab [::itcl::code $this
handleLeftRight %W 1]; break
+bind $itk_component(table) PrevWindow [::itcl::code $this
handleLeftRight %W 1]; break
+bind $itk_component(table) Key-Left [::itcl::code $this handleLeftRight
%W 1]; break
+bind $itk_component(table) Key-Right [::itcl::code $this
handleLeftRight %W 0]; break
+bind $itk_component(table) Control-Key-Left {%W icursor [expr {[%W
icursor]-1}]; break}
+bind $itk_component(table) Control-Key-Right {%W icursor [expr {[%W
icursor]+1}]; break}
+bind $itk_component(table) Key-Up [::itcl::code $this handleUpDown %W
%K]; break
+bind $itk_component(table) Key-Down [::itcl::code $this handleUpDown %W
%K]; break
+
+set bg [$itk_component(table) tag cget title -background]
$itk_component(table) tag col select_col 0
$itk_component(table) tag configure select_col \
+ -background $bg \
-relief raised
$itk_component(table) tag configure title \
-relief raised
eval itk_initialize $args
+set mNumRows [$itk_component(table) cget -rows
[brlcad-commits] SF.net SVN: brlcad:[41771] brlcad/trunk/src/tclscripts/archer/CombEditFrame .tcl
Revision: 41771
http://brlcad.svn.sourceforge.net/brlcad/?rev=41771view=rev
Author: bob1961
Date: 2010-12-22 14:47:41 + (Wed, 22 Dec 2010)
Log Message:
---
Mods to accommodate updates to the cadwidgets::TkTable
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-12-22
14:46:48 UTC (rev 41770)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-12-22
14:47:41 UTC (rev 41771)
@@ -570,11 +570,10 @@
-maxheight 2000 \
-width 0 \
-rows 10 \
- -titlecols 1 \
- -titlerows 1 \
-colstretchmode unset \
-validate 1 \
- -validatecommand [::itcl::code $this validateTableEntry %r %c
%S $tname] \
+ -validatecommand [::itcl::code $this validateTableEntry] \
+ -vclientdata $tname \
-tablePopupHandler [::itcl::code $this handleTablePopup]
} {}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Forrester recently released a report on the Return on Investment (ROI) of
Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even
within 7 months. Over 3 million businesses have gone Google with Google Apps:
an online email calendar, and document program that's accessible from your
browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew
___
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:[41782] brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Revision: 41782
http://brlcad.svn.sourceforge.net/brlcad/?rev=41782view=rev
Author: bob1961
Date: 2010-12-22 20:27:34 + (Wed, 22 Dec 2010)
Log Message:
---
Annotate the selected row by changing the background color of corresponding
cell in the title column.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Modified: brlcad/trunk/src/tclscripts/lib/TkTable.tcl
===
--- brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2010-12-22 20:05:53 UTC (rev
41781)
+++ brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2010-12-22 20:27:34 UTC (rev
41782)
@@ -38,6 +38,7 @@
method setDataEntry {_index _val}
method setTableCol {_col _val}
method setTableVal {_index _val}
+ method updateTitleCol {}
method width {args}
}
@@ -164,12 +165,13 @@
bind $itk_component(table) Key-Down [::itcl::code $this handleUpDown %W
%K]; break
set bg [$itk_component(table) tag cget title -background]
-$itk_component(table) tag col select_col 0
+#$itk_component(table) tag col select_col 0
$itk_component(table) tag configure select_col \
- -background $bg \
- -relief raised
+ -background \#ff
+$itk_component(table) tag col title 0
$itk_component(table) tag configure title \
-relief raised
+$itk_component(table) tag raise select_col
eval itk_initialize $args
set mNumRows [$itk_component(table) cget -rows]
@@ -192,6 +194,14 @@
while {[info exists $mTableDataVar\($row,$_col\)]} {
set $mTableDataVar\($row,$_col\) $_val
+ if {$_col == 0} {
+ if {$_val == *} {
+ $itk_component(table) tag cell select_col $row,$_col
+ } else {
+ $itk_component(table) tag cell {} $row,$_col
+ }
+ }
+
incr row
}
@@ -209,6 +219,24 @@
}
+::itcl::body cadwidgets::TkTable::updateTitleCol {} {
+set row 1
+while {[info exists $mTableDataVar\($row,0\)]} {
+ if {[set [subst $mTableDataVar\($row,0\)]] == *} {
+ $itk_component(table) tag cell select_col $row,0
+ } else {
+ $itk_component(table) tag cell {} $row,0
+ }
+
+ incr row
+}
+
+# Do the rest of the rows. Note - these have NO data
+for {} {$row $mNumRows} {incr row} {
+ $itk_component(table) tag cell {} $row,0
+}
+}
+
::itcl::body cadwidgets::TkTable::width {args} {
eval $itk_component(table) width $args
}
@@ -224,16 +252,23 @@
::itcl::body cadwidgets::TkTable::handleKey {_win _key} {
set index [$_win index active]
set ilist [split $index ,]
+set row [lindex $ilist 0]
set col [lindex $ilist 1]
-if {$col != 0 $_key != Down $_key != Up !$mInsertMode} {
+if {$row == 0} {
set mDoBreak 1
+ return
+}
+
+# Don't need to check for Left/Right/Down/Up
+# (i.e. these get swallowed up by more specific bindings).
+if {$col != 0 !$mInsertMode} {
+ set mDoBreak 1
setInsertMode 1
# Overwrite what's in the cell
if {[keyVisible $_key]} {
if {$itk_option(-validatecommand) != } {
- set row [lindex $ilist 0]
if {[catch {$itk_option(-validatecommand) $row $col $_key
$itk_option(-vclientdata)} isvalid]} {
set isvalid 0
}
@@ -258,8 +293,10 @@
if {[set [subst $mTableDataVar\($index\)]] == *} {
setTableVal $index
+ $itk_component(table) tag cell {} $index
} else {
setTableVal $index *
+ $itk_component(table) tag cell select_col $index
}
} else {
set mDoBreak 0
@@ -273,6 +310,10 @@
set row [lindex $ilist 0]
set col [lindex $ilist 1]
+if {$row == 0} {
+ return
+}
+
# This is a PrevWindow or Shift-Tab
if {$_sflag} {
incr col -1
@@ -324,6 +365,10 @@
set row [lindex $ilist 0]
set col [lindex $ilist 1]
+if {$row == 0} {
+ return
+}
+
if {$_key == Up} {
incr row -1
if {$row 1} {
@@ -391,7 +436,7 @@
return
}
-set mDoBreak 1
+set mDoBreak 0
if {![info exists $mTableDataVar\($row,$col\)]} {
return
}
@@ -403,10 +448,13 @@
# Using set instead.
if {[set [subst $mTableDataVar\($index\)]] == *} {
setTableVal $index
+ $itk_component(table) tag cell {} $index
} else {
setTableVal $index *
+ $itk_component(table) tag cell select_col $index
}
} else {
+ set mDoBreak 1
if {$mToggleSelectMode} {
set mToggleSelectMode 0
setTableCol 0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site
[brlcad-commits] SF.net SVN: brlcad:[41797] brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Revision: 41797
http://brlcad.svn.sourceforge.net/brlcad/?rev=41797view=rev
Author: bob1961
Date: 2010-12-23 21:30:45 + (Thu, 23 Dec 2010)
Log Message:
---
Added more windows and emacs style bindings for cell editing and traversal.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Modified: brlcad/trunk/src/tclscripts/lib/TkTable.tcl
===
--- brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2010-12-23 19:28:26 UTC (rev
41796)
+++ brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2010-12-23 21:30:45 UTC (rev
41797)
@@ -35,6 +35,7 @@
itk_option define -vclientdata vclientdata VClientData
public {
+ method handlePaste {}
method setDataEntry {_index _val}
method setTableCol {_col _val}
method setTableVal {_index _val}
@@ -54,10 +55,12 @@
variable mDoBreak 0
method doBreak {}
+ method handleCopy {_win}
+ method handleCut {_win}
method handleKey {_win _key}
method handleLeftRight {_win _sflag}
method handleTablePopup {_win _x _y _X _Y}
- method handleUpDown {_win _key}
+ method handleUpDown {_win _up}
method keyVisible {_key}
method setInsertMode {_imode}
method toggleSelect {_win _x _y}
@@ -96,19 +99,24 @@
keep -anchor -autoclear -background -bordercursor -borderwidth \
-browsecommand -cache -colorigin -colseparator \
-colstretchmode -coltagcommand -colwidth -command -cursor -drawmode
\
- -ellipsis -exportselection -flashmode -flashtime -font -foreground \
+ -ellipsis -flashmode -flashtime -font -foreground \
-height -highlightbackground -highlightcolor -highlightthickness \
-insertbackground -insertborderwidth -insertofftime -insertontime \
-insertwidth -invertselected -ipadx -ipady -justify -maxheight \
-maxwidth -multiline -padx -pady -relief -resizeborders -rowheight \
-roworigin -rows -rowseparator -rowstretchmode -rowtagcommand \
- -selectioncommand -selectmode -selecttitles -selecttype
-sparsearray \
+ -selectioncommand \
-takefocus -usecommand -validate \
-width -wrap
}
# Hide these options from users of TkTable
#-cols
+#-exportselection
+#-selecttitles
+#-selectmode
+#-selecttype
+#-sparsearray
#-state
#-titlecols
#-titlerows
@@ -161,17 +169,29 @@
bind $itk_component(table) Key-Right [::itcl::code $this
handleLeftRight %W 0]; break
bind $itk_component(table) Control-Key-Left {%W icursor [expr {[%W
icursor]-1}]; break}
bind $itk_component(table) Control-Key-Right {%W icursor [expr {[%W
icursor]+1}]; break}
-bind $itk_component(table) Key-Up [::itcl::code $this handleUpDown %W
%K]; break
-bind $itk_component(table) Key-Down [::itcl::code $this handleUpDown %W
%K]; break
+bind $itk_component(table) Key-Up [::itcl::code $this handleUpDown %W
1]; break
+bind $itk_component(table) Key-Down [::itcl::code $this handleUpDown %W
0]; break
+bind $itk_component(table) Control-b {%W icursor [expr {[%W
icursor]-1}]; break}
+bind $itk_component(table) Control-c [::itcl::code $this handleCopy %W]
+bind $itk_component(table) Control-d {%W delete active insert; break}
+bind $itk_component(table) Control-f {%W icursor [expr {[%W
icursor]+1}]; break}
+bind $itk_component(table) Control-i [::itcl::code $this setInsertMode 1]
+bind $itk_component(table) Control-k [::itcl::code $this handleCut %W];
break
+bind $itk_component(table) Control-n [::itcl::code $this handleUpDown
%W 0]; break
+bind $itk_component(table) Control-p [::itcl::code $this handleUpDown
%W 1]; break
+bind $itk_component(table) Control-v [::itcl::code $this handlePaste];
break
+bind $itk_component(table) Control-y [::itcl::code $this handlePaste];
break
+bind $itk_component(table) Control-Key \# nothing; break
+bind $itk_component(table) Key-Insert [::itcl::code $this setInsertMode
1]
+
set bg [$itk_component(table) tag cget title -background]
-#$itk_component(table) tag col select_col 0
$itk_component(table) tag configure select_col \
-background \#ff
+$itk_component(table) tag raise select_col
$itk_component(table) tag col title 0
$itk_component(table) tag configure title \
-relief raised
-$itk_component(table) tag raise select_col
eval itk_initialize $args
set mNumRows [$itk_component(table) cget -rows]
@@ -182,6 +202,57 @@
# PUBLIC METHODS
#
+::itcl::body cadwidgets::TkTable::handlePaste {} {
+#
+# Don't allow pasting into the title cells
+#
+if {[$itk_component(table) tag includes title active]} {
+return
+}
+
+set savestate [$itk_component(table) cget -state
[brlcad-commits] SF.net SVN: brlcad:[41841] brlcad/trunk/src/libged/rect.c
Revision: 41841
http://brlcad.svn.sourceforge.net/brlcad/?rev=41841view=rev
Author: bob1961
Date: 2010-12-29 20:25:08 + (Wed, 29 Dec 2010)
Log Message:
---
grsp-grs_y was not getting set properly
Modified Paths:
--
brlcad/trunk/src/libged/rect.c
Modified: brlcad/trunk/src/libged/rect.c
===
--- brlcad/trunk/src/libged/rect.c 2010-12-29 20:23:40 UTC (rev 41840)
+++ brlcad/trunk/src/libged/rect.c 2010-12-29 20:25:08 UTC (rev 41841)
@@ -366,7 +366,7 @@
ged_rect_image2view(struct ged_rect_state *grsp)
{
grsp-grs_x = (grsp-grs_pos[X] / (fastf_t)grsp-grs_cdim[X] - 0.5) * 2.0;
-grsp-grs_y = (grsp-grs_pos[Y] / (fastf_t)grsp-grs_cdim[Y] /
grsp-grs_aspect - 0.5) * 2.0;
+grsp-grs_y = ((0.5 - (grsp-grs_cdim[Y] - grsp-grs_pos[Y]) /
(fastf_t)grsp-grs_cdim[Y]) / grsp-grs_aspect * 2.0);
grsp-grs_width = grsp-grs_dim[X] * 2.0 / (fastf_t)grsp-grs_cdim[X];
grsp-grs_height = grsp-grs_dim[Y] * 2.0 / (fastf_t)grsp-grs_cdim[X];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42263] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 42263
http://brlcad.svn.sourceforge.net/brlcad/?rev=42263view=rev
Author: bob1961
Date: 2011-01-14 15:28:54 + (Fri, 14 Jan 2011)
Log Message:
---
Move raytracePlus to the public section.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-01-14 15:02:32 UTC
(rev 42262)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-01-14 15:28:54 UTC
(rev 42263)
@@ -151,10 +151,10 @@
method pluginUpdateStatusBar {msg}
method importFg4Sections {_slist _wlist _delta}
- method setDefaultBindingMode {_mode}
# General
method askToRevert {}
+ method raytracePlus {}
# ArcherCore Override Section
method 3ptarb {args}
@@ -227,6 +227,7 @@
method vmake {args}
method initImages {}
method initFbImages{}
+ method setDefaultBindingMode {_mode}
# Object Edit Management
method checkpoint {_obj _type}
@@ -314,7 +315,6 @@
method fbModeToggle {}
method fbToggle {}
method rtEndCallback {_aborted}
- method raytracePlus {}
#XXX Need to split up menuStatusCB into one method per menu
method menuStatusCB {_w}
@@ -938,6 +938,30 @@
}
+::itcl::body Archer::raytracePlus {} {
+$itk_component(primaryToolbar) itemconfigure raytrace \
+ -image $mImage_rtAbort \
+ -command $itk_component(rtcntrl) abort
+$itk_component(rtcntrl) raytracePlus
+}
+
+
+::itcl::body Archer::askToRevert {} {
+if {!$mNeedSave} {
+ return 0
+}
+
+$itk_component(revertDialog) center [namespace tail $this]
+::update
+if {[$itk_component(revertDialog) activate]} {
+ revert
+ return 1
+}
+
+return 0
+}
+
+
::itcl::body Archer::3ptarb {args} {
eval ArcherCore::gedWrapper 3ptarb 0 0 1 1 $args
}
@@ -1966,22 +1990,6 @@
### Protected Section
###
-::itcl::body Archer::askToRevert {} {
-if {!$mNeedSave} {
- return 0
-}
-
-$itk_component(revertDialog) center [namespace tail $this]
-::update
-if {[$itk_component(revertDialog) activate]} {
- revert
- return 1
-}
-
-return 0
-}
-
-
### ArcherCore Override Section
###
::itcl::body Archer::buildCommandView {} {
@@ -4673,14 +4681,6 @@
}
-::itcl::body Archer::raytracePlus {} {
-$itk_component(primaryToolbar) itemconfigure raytrace \
- -image $mImage_rtAbort \
- -command $itk_component(rtcntrl) abort
-$itk_component(rtcntrl) raytracePlus
-}
-
-
::itcl::body Archer::menuStatusCB {_w} {
if {$mDoStatus} {
# entry might not support -label (i.e. tearoffs)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42266] brlcad/trunk
Revision: 42266
http://brlcad.svn.sourceforge.net/brlcad/?rev=42266view=rev
Author: bob1961
Date: 2011-01-14 16:40:56 + (Fri, 14 Jan 2011)
Log Message:
---
Mods for overriding the display manager's auto font selection mechanism.
Implemented for ogl and wgl.
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
brlcad/trunk/src/libdm/dm_obj.c
brlcad/trunk/src/libtclcad/ged_obj.c
brlcad/trunk/src/mged/dm-X.c
brlcad/trunk/src/mged/dm-ogl.c
brlcad/trunk/src/mged/dm-rtgl.c
brlcad/trunk/src/mged/dm-tk.c
brlcad/trunk/src/mged/dm-wgl.c
brlcad/trunk/src/mged/doevent.c
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/include/dm.h
===
--- brlcad/trunk/include/dm.h 2011-01-14 16:23:12 UTC (rev 42265)
+++ brlcad/trunk/include/dm.h 2011-01-14 16:40:56 UTC (rev 42266)
@@ -89,8 +89,15 @@
#define FONT8 8x13
#define FONT9 9x15
#define FONT10 10x20
-#define FONT11 12x24
+#define FONT12 12x24
+#if defined(_WIN32) !defined(__CYGWIN__)
+# define DM_VALID_FONT_SIZE(_size) (14 = (_size) (_size) = 29)
+#else
+# define DM_VALID_FONT_SIZE(_size) (5 = (_size) (_size) = 12 (_size)
!= 11)
+# define DM_FONT_SIZE_TO_NAME(_size) (((_size) == 5) ? FONT5 : (((_size) ==
6) ? FONT6 : (((_size) == 7) ? FONT7 : (((_size) == 8) ? FONT8 : (((_size) ==
9) ? FONT9 : (((_size) == 10) ? FONT10 : FONT12))
+#endif
+
/* Display Manager Types */
#define DM_TYPE_BAD -1
#define DM_TYPE_NULL 0
@@ -273,6 +280,7 @@
int dm_zbuffer;/** @brief !0 means zbuffer on */
int dm_zclip; /** @brief !0 means zclipping */
int dm_clearBufferAfter; /** @brief 1 means clear back buffer after
drawing and swap */
+int dm_fontsize; /** @brief !0 override's the auto font size */
Tcl_Interp *dm_interp; /** @brief Tcl interpreter */
};
@@ -313,7 +321,7 @@
#define DM_SET_FGCOLOR(_dmp, _r, _g, _b, _strict, _transparency)
_dmp-dm_setFGColor(_dmp, _r, _g, _b, _strict, _transparency)
#define DM_SET_BGCOLOR(_dmp, _r, _g, _b) _dmp-dm_setBGColor(_dmp, _r, _g, _b)
#define DM_SET_LINE_ATTR(_dmp, _width, _dashed) _dmp-dm_setLineAttr(_dmp,
_width, _dashed)
-#define DM_CONFIGURE_WIN(_dmp) _dmp-dm_configureWin(_dmp)
+#define DM_CONFIGURE_WIN(_dmp,_force) _dmp-dm_configureWin((_dmp),(_force))
#define DM_SET_WIN_BOUNDS(_dmp, _w) _dmp-dm_setWinBounds(_dmp, _w)
#define DM_SET_LIGHT(_dmp, _on) _dmp-dm_setLight(_dmp, _on)
#define DM_SET_TRANSPARENCY(_dmp, _on) _dmp-dm_setTransparency(_dmp, _on)
@@ -456,7 +464,7 @@
HIDDEN int _dmtype##_setBGColor(struct dm *dmp, unsigned char r, unsigned
char g, unsigned char b); \
HIDDEN int _dmtype##_setLineAttr(struct dm *dmp, int width, int style); \
HIDDEN int _dmtype##_configureWin_guts(struct dm *dmp, int force); \
- HIDDEN int _dmtype##_configureWin(struct dm *dmp); \
+ HIDDEN int _dmtype##_configureWin(struct dm *dmp, int force);
\
HIDDEN int _dmtype##_setLight(struct dm *dmp, int lighting_on); \
HIDDEN int _dmtype##_setTransparency(struct dm *dmp, int transparency_on); \
HIDDEN int _dmtype##_setDepthMask(struct dm *dmp, int depthMask_on); \
Modified: brlcad/trunk/src/libdm/dm-Null.c
===
--- brlcad/trunk/src/libdm/dm-Null.c2011-01-14 16:23:12 UTC (rev 42265)
+++ brlcad/trunk/src/libdm/dm-Null.c2011-01-14 16:40:56 UTC (rev 42266)
@@ -161,7 +161,8 @@
0, /* depth buffer is not writable */
0, /* no zbuffer */
0, /* no zclipping */
-1,/* clear back buffer after drawing and swap
*/
+1, /* clear back buffer after drawing and swap */
+0, /* not overriding the auto font size */
0 /* Tcl interpreter */
};
Modified: brlcad/trunk/src/libdm/dm-X.c
===
--- brlcad/trunk/src/libdm/dm-X.c 2011-01-14 16:23:12 UTC (rev 42265)
+++ brlcad/trunk/src/libdm/dm-X.c 2011-01-14 16:40:56 UTC (rev 42266)
@@ -1367,10 +1367,10 @@
HIDDEN int
-X_configureWin(struct dm *dmp)
+X_configureWin(struct dm *dmp, int force)
{
/* don't force */
-return X_configureWin_guts(dmp, 0);
+return X_configureWin_guts(dmp, force);
}
@@ -1673,7 +1673,8 @@
0, /* depth buffer is not writable */
0, /* no zbuffer */
0, /* no zclipping */
-1
[brlcad-commits] SF.net SVN: brlcad:[42457] brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Revision: 42457
http://brlcad.svn.sourceforge.net/brlcad/?rev=42457view=rev
Author: bob1961
Date: 2011-01-19 18:00:09 + (Wed, 19 Jan 2011)
Log Message:
---
Tweaked cadwidgets::TkTable::toggleSelect to behave better after a Button-1
event occurs in a different cell.
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-01-19 17:26:22 UTC (rev
42456)
+++ brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2011-01-19 18:00:09 UTC (rev
42457)
@@ -529,6 +529,11 @@
if {$row == $arow $col == $acol} {
setInsertMode 1
} else {
+ # This line causes the cell data to be
+ # retained even after the state is disable
+ # by the call to setInsertMode 0 below.
+ $itk_component(table) activate active
+
setInsertMode 0
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42458] brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Revision: 42458
http://brlcad.svn.sourceforge.net/brlcad/?rev=42458view=rev
Author: bob1961
Date: 2011-01-19 18:01:03 + (Wed, 19 Jan 2011)
Log Message:
---
Added a configbody for the -color option.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Modified: brlcad/trunk/src/tclscripts/lib/RtControl.tcl
===
--- brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2011-01-19 18:00:09 UTC
(rev 42457)
+++ brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2011-01-19 18:01:03 UTC
(rev 42458)
@@ -357,6 +357,12 @@
### Configuration Options
###
+::itcl::configbody RtControl::color {\
+set rtColor $itk_option(-color)
+set bg [eval ::cadwidgets::Ged::rgb_to_tk $rtColor]
+$itk_component(bgcolorpatchL) configure -background $bg
+}
+
::itcl::configbody RtControl::nproc {
if {![regexp ^\[0-9\]+$ $itk_option(-nproc)]} {
error Bad value - $itk_option(-nproc)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42459] brlcad/trunk/src/tclscripts/archer
Revision: 42459
http://brlcad.svn.sourceforge.net/brlcad/?rev=42459view=rev
Author: bob1961
Date: 2011-01-19 18:02:22 + (Wed, 19 Jan 2011)
Log Message:
---
Added a preference for the framebuffer's background color.
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-01-19 18:01:03 UTC
(rev 42458)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-01-19 18:02:22 UTC
(rev 42459)
@@ -3398,6 +3398,12 @@
mBackgroundColorPref \
Background Color: \
$mColorListNoTriple
+buildComboBox $itk_component(generalF) \
+ fbbackgroundColor \
+ fbbcolor \
+ mFBBackgroundColorPref \
+ FB Background Color: \
+ $mColorListNoTriple
buildComboBox $itk_component(generalF) \
binding \
@@ -3504,6 +3510,9 @@
grid $itk_component(backgroundColorL) -column 0 -row $i -sticky ne
grid $itk_component(backgroundColorF) -column 1 -row $i -sticky ew
incr i
+grid $itk_component(fbbackgroundColorL) -column 0 -row $i -sticky ne
+grid $itk_component(fbbackgroundColorF) -column 1 -row $i -sticky ew
+incr i
grid $itk_component(measuringStickColorL) -column 0 -row $i -sticky e
grid $itk_component(measuringStickColorF) -column 1 -row $i -sticky ew
incr i
@@ -7955,6 +7964,7 @@
}
backgroundColor $mBackgroundColor
+$itk_component(rtcntrl) configure -color [cadwidgets::Ged::get_rgb_color
$mFBBackgroundColor]
gedCmd configure -measuringStickColor $mMeasuringStickColor
gedCmd configure -measuringStickMode $mMeasuringStickMode
gedCmd configure -primitiveLabelColor $mPrimitiveLabelColor
@@ -7983,7 +7993,12 @@
if {$mBackgroundColor != $mBackgroundColorPref} {
set mBackgroundColor $mBackgroundColorPref
backgroundColor $mBackgroundColor
+
}
+if {$mFBBackgroundColor != $mFBBackgroundColorPref} {
+ set mFBBackgroundColor $mFBBackgroundColorPref
+ $itk_component(rtcntrl) configure -color
[cadwidgets::Ged::get_rgb_color $mFBBackgroundColor]
+}
if {$mPrimitiveLabelColor != $mPrimitiveLabelColorPref} {
set mPrimitiveLabelColor $mPrimitiveLabelColorPref
@@ -8479,6 +8494,7 @@
set mBackgroundColorPref $mBackgroundColor
set mBindingModePref $mBindingMode
set mEnableBigEPref $mEnableBigE
+set mFBBackgroundColorPref $mFBBackgroundColor
set mMeasuringStickColorPref $mMeasuringStickColor
set mMeasuringStickModePref $mMeasuringStickMode
set mPrimitiveLabelColorPref $mPrimitiveLabelColor
@@ -8623,6 +8639,7 @@
puts $_pfile set mBackgroundColor \$mBackgroundColor\
puts $_pfile set mBindingMode $mBindingMode
puts $_pfile set mEnableBigE $mEnableBigE
+puts $_pfile set mFBBackgroundColor \$mFBBackgroundColor\
puts $_pfile set mMeasuringStickColor \$mMeasuringStickColor\
puts $_pfile set mMeasuringStickMode $mMeasuringStickMode
puts $_pfile set mPrimitiveLabelColor \$mPrimitiveLabelColor\
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-01-19 18:01:03 UTC
(rev 42458)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-01-19 18:02:22 UTC
(rev 42459)
@@ -343,6 +343,8 @@
variable mBackground 0 0 0
variable mBackgroundColor Black
variable mBackgroundColorPref
+ variable mFBBackgroundColor Black
+ variable mFBBackgroundColorPref
variable mPrimitiveLabelColor Yellow
variable mPrimitiveLabelColorPref
variable mViewingParamsColor Yellow
@@ -5691,6 +5693,9 @@
::itcl::body ArcherCore::watchVar {_name1 _name2 _op} {
switch -- $_name1 {
+ mFBBackgroundColor {
+ $itk_component(rtcntrl) configure -color
[cadwidgets::Ged::get_rgb_color $mFBBackgroundColor]
+ }
mMeasuringStickColor {
$itk_component(ged) configure -measuringStickColor
$mMeasuringStickColor
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
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:[42521] brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Revision: 42521
http://brlcad.svn.sourceforge.net/brlcad/?rev=42521view=rev
Author: bob1961
Date: 2011-01-21 22:33:36 + (Fri, 21 Jan 2011)
Log Message:
---
Modified RtControl::raytrace to honor the subwindow if active (.i.e. use rt's
-j option).
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Modified: brlcad/trunk/src/tclscripts/lib/RtControl.tcl
===
--- brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2011-01-21 22:20:48 UTC
(rev 42520)
+++ brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2011-01-21 22:33:36 UTC
(rev 42521)
@@ -493,7 +493,36 @@
if {$isaMged} {
set rt_cmd $itk_option(-mged) component $rtActivePane rt -F
[get_cooked_dest]
} else {
+ # isaGed must be true
set rt_cmd $itk_option(-mged) pane_rt $rtActivePane -F
[get_cooked_dest]
+
+ if {[$itk_option(-mged) rect draw]} {
+ set pos [$itk_option(-mged) rect pos]
+ set dim [$itk_option(-mged) rect dim]
+
+ set xmin [lindex $pos 0]
+ set ymin [lindex $pos 1]
+ set width [lindex $dim 0]
+ set height [lindex $dim 1]
+
+ if {$width != 0 $height != 0} {
+ if {$width 0} {
+ set xmax [expr $xmin + $width]
+ } else {
+ set xmax $xmin
+ set xmin [expr $xmax + $width]
+ }
+
+ if {$height 0} {
+ set ymax [expr $ymin + $height]
+ } else {
+ set ymax $ymin
+ set ymin [expr $ymax + $height]
+ }
+
+ append rt_cmd -j $xmin,$ymin,$xmax,$ymax
+ }
+ }
}
if {$rtSize != } {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-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:[42712] brlcad/trunk
Revision: 42712
http://brlcad.svn.sourceforge.net/brlcad/?rev=42712view=rev
Author: bob1961
Date: 2011-01-28 20:06:41 + (Fri, 28 Jan 2011)
Log Message:
---
Added a callback for when the view changes to libtclcad.
Modified Paths:
--
brlcad/trunk/include/tclcad.h
brlcad/trunk/src/libtclcad/ged_obj.c
Modified: brlcad/trunk/include/tclcad.h
===
--- brlcad/trunk/include/tclcad.h 2011-01-28 19:55:37 UTC (rev 42711)
+++ brlcad/trunk/include/tclcad.h 2011-01-28 20:06:41 UTC (rev 42712)
@@ -69,6 +69,7 @@
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;
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2011-01-28 19:55:37 UTC (rev
42711)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2011-01-28 20:06:41 UTC (rev
42712)
@@ -554,6 +554,12 @@
ged_func_ptr func,
const char *usage,
int maxargs);
+HIDDEN int go_view_callback(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
HIDDEN int go_view_win_size(struct ged *gedp,
int argc,
const char *argv[],
@@ -617,6 +623,19 @@
ged_func_ptr func,
const char *usage,
int maxargs);
+HIDDEN int go_view_func_common(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs,
+ int cflag);
+HIDDEN int go_view_func_plus(struct ged *gedp,
+int argc,
+const char *argv[],
+ged_func_ptr func,
+const char *usage,
+int maxargs);
HIDDEN int go_dm_func(struct ged *gedp,
int argc,
const char *argv[],
@@ -672,11 +691,11 @@
{adc,args, 7, go_view_func, ged_adc},
{adjust, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_adjust},
{ae2dir, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_ae2dir},
-{aet,[[-i] az el [tw]], 6, go_view_func, ged_aet},
+{aet,[[-i] az el [tw]], 6, go_view_func_plus, ged_aet},
{analyze,(char *)0, GO_UNLIMITED, go_pass_through_func,
ged_analyze},
{arb,(char *)0, GO_UNLIMITED, go_pass_through_func, ged_arb},
{arced, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_arced},
-{arot, x y z angle, 6, go_view_func, ged_arot},
+{arot, x y z angle, 6, go_view_func_plus, ged_arot},
{attr, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_attr},
{autoview, vname, GO_UNLIMITED, go_autoview, GED_FUNC_PTR_NULL},
{bb, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_bb},
@@ -700,7 +719,7 @@
{bounds, [\minX maxX minY maxY minZ maxZ\], GO_UNLIMITED, go_bounds,
GED_FUNC_PTR_NULL},
{c, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_comb_std},
{cat,(char *)0, GO_UNLIMITED, go_pass_through_func, ged_cat},
-{center, [x y z], 5, go_view_func, ged_center},
+{center, [x y z], 5, go_view_func_plus, ged_center},
{clear, (char *)0, GO_UNLIMITED, go_pass_through_and_refresh_func,
ged_zap},
{clone, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_clone},
{color, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_color},
@@ -745,8 +764,8 @@
{erase_all, (char *)0, GO_UNLIMITED,
go_pass_through_and_refresh_func, ged_erase_all},
{ev, (char *)0, GO_UNLIMITED, go_autoview_func, ged_ev},
{expand, (char *)0, GO_UNLIMITED, go_pass_through_func, ged_expand},
-{eye,[x y z], 5, go_view_func, ged_eye},
-{eye_pos,[x y z], 5, go_view_func, ged_eye_pos},
+{eye,[x y z], 5, go_view_func_plus, ged_eye},
+{eye_pos,[x y z], 5, go_view_func_plus, ged_eye_pos},
{faceplate, center_dot|prim_labels|view_params|view_scale
color|draw [val(s)], GO_UNLIMITED, go_faceplate, GED_FUNC_PTR_NULL},
{facetize, (char *)0, GO_UNLIMITED, go_pass_through_func,
ged_facetize},
{fontsize, [fontsize], 3, go_fontsize, GED_FUNC_PTR_NULL},
@@ -789,7 +808,7 @@
{loadview, filename, 3, go_view_func, ged_loadview},
{local2base, (char *)0, GO_UNLIMITED, go_local2base
[brlcad-commits] SF.net SVN: brlcad:[42714] brlcad/trunk/src/tclscripts/lib/Ged.tcl
Revision: 42714
http://brlcad.svn.sourceforge.net/brlcad/?rev=42714view=rev
Author: bob1961
Date: 2011-01-28 20:14:30 + (Fri, 28 Jan 2011)
Log Message:
---
Added methods to expose libtclcad's view_callback function.
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-01-28 20:12:59 UTC (rev
42713)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-01-28 20:14:30 UTC (rev
42714)
@@ -364,6 +364,7 @@
method pane_v2m_point {_pane args}
method pane_view {_pane args}
method pane_view2model {_pane args}
+ method pane_view_callback {_pane args}
method pane_viewdir {_pane args}
method pane_vmake {_pane args}
method pane_vnirt {_pane args}
@@ -482,6 +483,8 @@
method view {args}
method view2model {args}
method view_axes {args}
+ method view_callback {args}
+ method view_callback_all {args}
method viewdir {args}
method vmake {args}
method vnirt {args}
@@ -1991,6 +1994,10 @@
eval $mGed view2model $itk_component($_pane) $args
}
+::itcl::body cadwidgets::Ged::pane_view_callback {_pane args} {
+eval $mGed view_callback $itk_component($_pane) $args
+}
+
::itcl::body cadwidgets::Ged::pane_viewdir {_pane args} {
eval $mGed viewdir $itk_component($_pane) $args
}
@@ -2533,6 +2540,16 @@
return $ret
}
+::itcl::body cadwidgets::Ged::view_callback {args} {
+eval $mGed view_callback $itk_component($itk_option(-pane)) $args
+}
+
+::itcl::body cadwidgets::Ged::view_callback_all {args} {
+foreach dm {ur ul ll lr} {
+ eval $mGed view_callback $itk_component($dm) $args
+}
+}
+
::itcl::body cadwidgets::Ged::viewdir {args} {
eval $mGed viewdir $itk_component($itk_option(-pane)) $args
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-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:[42722] brlcad/trunk/src/tclscripts/archer/CombEditFrame .tcl
Revision: 42722
http://brlcad.svn.sourceforge.net/brlcad/?rev=42722view=rev
Author: bob1961
Date: 2011-01-28 20:44:40 + (Fri, 28 Jan 2011)
Log Message:
---
Fixed CombEditFrame::updateGeometry. It's now able to turn off inherit.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2011-01-28
20:38:08 UTC (rev 42721)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2011-01-28
20:44:40 UTC (rev 42722)
@@ -267,6 +267,8 @@
if {$mInherit != } {
lappend _attrs inherit $mInherit
+} else {
+ lappend _attrs inherit no
}
lappend _attrs tree [ArcherCore::packTree [$itk_component(combTreeT) get
1.0 end]]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-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:[42813] brlcad/trunk/src/tclscripts/lib/Ged.tcl
Revision: 42813
http://brlcad.svn.sourceforge.net/brlcad/?rev=42813view=rev
Author: bob1961
Date: 2011-01-31 23:03:01 + (Mon, 31 Jan 2011)
Log Message:
---
Added cadwidgets::Ged::tk_to_rgb
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-01-31 22:40:01 UTC (rev
42812)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-01-31 23:03:01 UTC (rev
42813)
@@ -611,6 +611,7 @@
proc get_rgb_color {_color}
proc get_vdraw_color {_color}
proc rgb_to_tk {_r _g _b}
+ proc tk_to_rgb {_tkcolor}
}
protected {
@@ -3859,6 +3860,14 @@
}
}
+::itcl::body cadwidgets::Ged::tk_to_rgb {_tkcolor} {
+if {![regexp {^\#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$}
$_tkcolor all r g b]} {
+ return {128 128 128}
+}
+
+return [list [expr int(0x$r)] [expr int(0x$g)] [expr int(0x$b)]]
+}
+
::itcl::body cadwidgets::Ged::rgb_to_tk {_r _g _b} {
return [format \#%.2x%.2x%.2x $_r $_g $_b]
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-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:[42866] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 42866
http://brlcad.svn.sourceforge.net/brlcad/?rev=42866view=rev
Author: bob1961
Date: 2011-02-01 23:10:46 + (Tue, 01 Feb 2011)
Log Message:
---
Updated Archer::constructor to properly set the view of the command window
(i.e. how much command window to display verses geometry window etc.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-01 23:02:04 UTC
(rev 42865)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-01 23:10:46 UTC
(rev 42866)
@@ -520,7 +520,17 @@
set mVPaneToggle5 $mVPaneFraction5
readPreferences
+ set save_hpanefraction1 $mHPaneFraction1
+ set save_hpanefraction2 $mHPaneFraction2
buildCommandViewNew 1
+
+ if {!$mSeparateCommandWindow} {
+ set mHPaneFraction1 $save_hpanefraction1
+ set mHPaneFraction2 $save_hpanefraction2
+ $itk_component(hpane) fraction $mHPaneFraction1 $mHPaneFraction2
+ }
+
+
set mDelayCommandViewBuild 0
pack $itk_component(advancedTabs) -fill both -expand yes
::update
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-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:[42902] brlcad/trunk/src/tclscripts/archer/ArcherCore. tcl
Revision: 42902
http://brlcad.svn.sourceforge.net/brlcad/?rev=42902view=rev
Author: bob1961
Date: 2011-02-02 16:44:12 + (Wed, 02 Feb 2011)
Log Message:
---
Modified ArcherCore::updateRtControl to call rtcntrl's updateControlPanel
instead of configuring -size.
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-02-02 16:43:38 UTC
(rev 42901)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-02-02 16:44:12 UTC
(rev 42902)
@@ -322,6 +322,7 @@
variable mShowADC 0
# variables for preference state
+ variable mWindowGeometry
variable mEnableAffectedNodeHighlight 0
variable mEnableAffectedNodeHighlightPref
variable mEnableListView 0
@@ -1792,7 +1793,7 @@
::itcl::body ArcherCore::updateRtControl {} {
::update
if {[info exists itk_component(rtcntrl)]} {
- $itk_component(rtcntrl) configure -size Size of Pane
+ $itk_component(rtcntrl) updateControlPanel
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-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:[42904] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 42904
http://brlcad.svn.sourceforge.net/brlcad/?rev=42904view=rev
Author: bob1961
Date: 2011-02-02 16:46:50 + (Wed, 02 Feb 2011)
Log Message:
---
Added code to remember Archer's window size.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-02 16:45:18 UTC
(rev 42903)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-02 16:46:50 UTC
(rev 42904)
@@ -307,6 +307,7 @@
method doAboutArcher {}
method doarcherHelp {}
method doarcherMan {}
+ method handleConfigure {}
method launchDisplayMenuBegin {_dm _m _x _y}
method launchDisplayMenuEnd {}
method fbActivePaneCallback {_pane}
@@ -558,8 +559,11 @@
$itk_component(primaryToolbar) itemconfigure new -state normal
$itk_component(primaryToolbar) itemconfigure preferences -state normal
+
::update
Load
+
+bind [namespace tail $this] Configure [::itcl::code $this
handleConfigure]
}
@@ -4644,7 +4648,14 @@
}
+::itcl::body Archer::handleConfigure {} {
+if {$mWindowGeometry != } {
+ wm geometry [namespace tail $this] $mWindowGeometry
+}
+bind [namespace tail $this] Configure {}
+}
+
::itcl::body Archer::launchDisplayMenuBegin {_dm _m _x _y} {
set mCurrentPaneName $_dm
tk_popup $_m $_x $_y
@@ -8725,6 +8736,8 @@
puts $_pfile set mVPaneToggle1 $mVPaneToggle1
puts $_pfile set mVPaneToggle3 $mVPaneToggle3
puts $_pfile set mVPaneToggle5 $mVPaneToggle5
+
+puts $_pfile set mWindowGeometry [winfo geometry [namespace tail $this]]
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-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:[42926] brlcad/trunk/src
Revision: 42926 http://brlcad.svn.sourceforge.net/brlcad/?rev=42926view=rev Author: bob1961 Date: 2011-02-02 21:08:21 + (Wed, 02 Feb 2011) Log Message: --- Call dm_draw_rect() only if grs_draw and grs_line width are not zero. Modified Paths: -- brlcad/trunk/src/libged/rect.c brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libged/rect.c === --- brlcad/trunk/src/libged/rect.c 2011-02-02 20:46:29 UTC (rev 42925) +++ brlcad/trunk/src/libged/rect.c 2011-02-02 21:08:21 UTC (rev 42926) @@ -274,7 +274,7 @@ i = (int)user_pt[X]; if (i = 0) - gedp-ged_gvp-gv_rect.grs_line_width = 1; + gedp-ged_gvp-gv_rect.grs_line_width = 0; else gedp-ged_gvp-gv_rect.grs_line_width = i; Modified: brlcad/trunk/src/libtclcad/ged_obj.c === --- brlcad/trunk/src/libtclcad/ged_obj.c2011-02-02 20:46:29 UTC (rev 42925) +++ brlcad/trunk/src/libtclcad/ged_obj.c2011-02-02 21:08:21 UTC (rev 42926) @@ -8948,7 +8948,7 @@ dm_draw_grid(gdvp-gdv_dmp, gdvp-gdv_view-gv_grid, gdvp-gdv_view, gdvp-gdv_gop-go_gedp-ged_wdbp-dbip-dbi_base2local); /* Draw rect */ -if (gdvp-gdv_view-gv_rect.grs_draw) +if (gdvp-gdv_view-gv_rect.grs_draw gdvp-gdv_view-gv_rect.grs_line_width) dm_draw_rect(gdvp-gdv_dmp, gdvp-gdv_view-gv_rect); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-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:[42962] brlcad/trunk/src/tclscripts/archer
Revision: 42962
http://brlcad.svn.sourceforge.net/brlcad/?rev=42962view=rev
Author: bob1961
Date: 2011-02-03 16:07:51 + (Thu, 03 Feb 2011)
Log Message:
---
Remember whether or not to show things like the view axes, model axes, view
params, scale etc.
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-02-03 15:35:32 UTC
(rev 42961)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-03 16:07:51 UTC
(rev 42962)
@@ -8738,6 +8738,17 @@
puts $_pfile set mVPaneToggle5 $mVPaneToggle5
puts $_pfile set mWindowGeometry [winfo geometry [namespace tail $this]]
+
+puts $_pfile set mShowViewAxes $mShowViewAxes
+puts $_pfile set mShowModelAxes $mShowModelAxes
+puts $_pfile set mShowGroundPlane $mShowGroundPlane
+puts $_pfile set mShowPrimitiveLabels $mShowPrimitiveLabels
+puts $_pfile set mShowViewingParams $mShowViewingParams
+puts $_pfile set mShowScale $mShowScale
+puts $_pfile set mLighting $mLighting
+puts $_pfile set mShowGrid $mShowGrid
+puts $_pfile set mSnapGrid $mSnapGrid
+puts $_pfile set mShowADC $mShowADC
}
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-02-03 15:35:32 UTC
(rev 42961)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2011-02-03 16:07:51 UTC
(rev 42962)
@@ -667,7 +667,7 @@
variable mText2Node
variable mNodePDrawList
variable mNodeDrawList
- variable mAffectedNodeList
+ variable mAffectedNodeList
# init functions
method initImages {}
@@ -1708,26 +1708,6 @@
bind $itk_component(rtcntrl) FocusOut raise $itk_component(rtcntrl)
wm protocol $itk_component(rtcntrl) WM_DELETE_WINDOW
$itk_component(rtcntrl) deactivate
-# create view axes control panel
-#itk_component add vac {
-# ViewAxesControl $itk_interior.vac -mged $itk_component(ged)
-#} {
-# usual
-#}
-
-# create model axes control panel
-#itk_component add mac {
-# ModelAxesControl $itk_interior.mac -mged $itk_component(ged)
-#} {
-# usual
-#}
-
-#wm protocol $itk_component(vac) WM_DELETE_WINDOW $itk_component(vac)
hide
-#wm protocol $itk_component(mac) WM_DELETE_WINDOW $itk_component(mac)
hide
-
-#$itk_component(ged) configure -unitsCallback $itk_component(mac)
updateControlPanel
-$itk_component(ged) configure -paneCallback [::itcl::code $this
updateActivePane]
-
# Other bindings for mged
#bind $itk_component(ged) Enter {focus %W}
@@ -1780,7 +1760,42 @@
}
bind $itk_component(canvasF) Configure [::itcl::code $this
updateRtControl]
-setActivePane ur
+
+set mActivePane 1
+set mActivePaneName ur
+
+if {$mShowViewAxes} {
+ showViewAxes
+}
+if {$mShowModelAxes} {
+ showModelAxes
+}
+if {$mShowGroundPlane} {
+ showGroundPlane
+}
+if {$mShowPrimitiveLabels} {
+ showPrimitiveLabels
+}
+if {$mShowViewingParams} {
+ showViewParams
+}
+if {$mShowScale} {
+ showScale
+}
+if {$mLighting} {
+ doLighting
+}
+if {$mShowGrid} {
+ showGrid
+}
+if {$mSnapGrid} {
+ snapGrid
+}
+if {$mShowADC} {
+ showADC
+}
+
+$itk_component(ged) configure -paneCallback [::itcl::code $this
updateActivePane]
}
::itcl::body ArcherCore::closeMged {} {
@@ -5706,6 +5721,10 @@
}
::itcl::body ArcherCore::watchVar {_name1 _name2 _op} {
+if {![info exists itk_component(ged)]} {
+ return
+}
+
switch -- $_name1 {
mFBBackgroundColor {
$itk_component(rtcntrl) configure -color
[cadwidgets::Ged::get_rgb_color $mFBBackgroundColor]
@@ -5717,7 +5736,7 @@
$itk_component(ged) configure -measuringStickColor
$mMeasuringStickColor
}
mMeasuringStickMode {
- $itk_component(ged) configure -measuringStickMode
$mMeasuringStickMode
+ $itk_component(ged) configure -measuringStickMode
$mMeasuringStickMode
}
mModelAxesColor {
if {$mModelAxesColor == Triple} {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY
[brlcad-commits] SF.net SVN: brlcad:[43026] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 43026
http://brlcad.svn.sourceforge.net/brlcad/?rev=43026view=rev
Author: bob1961
Date: 2011-02-04 20:30:09 + (Fri, 04 Feb 2011)
Log Message:
---
Added an fbclear command.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-04 19:49:07 UTC
(rev 43025)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-04 20:30:09 UTC
(rev 43026)
@@ -154,6 +154,7 @@
# General
method askToRevert {}
+ method fbclear {}
method raytracePlus {}
# ArcherCore Override Section
@@ -952,6 +953,11 @@
}
+::itcl::body Archer::fbclear {} {
+$itk_component(rtcntrl) clear
+}
+
+
::itcl::body Archer::raytracePlus {} {
$itk_component(primaryToolbar) itemconfigure raytrace \
-image $mImage_rtAbort \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
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:[43131] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 43131
http://brlcad.svn.sourceforge.net/brlcad/?rev=43131view=rev
Author: bob1961
Date: 2011-02-08 19:26:28 + (Tue, 08 Feb 2011)
Log Message:
---
Override ArcherCore::zap
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-08 19:12:48 UTC
(rev 43130)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-08 19:26:28 UTC
(rev 43131)
@@ -226,6 +226,7 @@
method track {args}
method units {args}
method vmake {args}
+ method zap {args}
method initImages {}
method initFbImages{}
method setDefaultBindingMode {_mode}
@@ -1804,7 +1805,11 @@
#eval ArcherCore::gedWrapper vmake 0 0 1 1 $args
}
+::itcl::body Archer::zap {args} {
+eval ArcherCore::gedWrapper zap 0 0 0 1 $args
+}
+
::itcl::body Archer::initImages {} {
if {$mInstanceInit} {
return
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
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:[43201] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 43201
http://brlcad.svn.sourceforge.net/brlcad/?rev=43201view=rev
Author: bob1961
Date: 2011-02-10 18:15:07 + (Thu, 10 Feb 2011)
Log Message:
---
Reset output handler when going to/from a separate command window configuration.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-10 17:43:14 UTC
(rev 43200)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-10 18:15:07 UTC
(rev 43201)
@@ -8133,6 +8133,8 @@
activateMenusEtc
updateSaveMode
+
+ $itk_component(ged) set_outputHandler $itk_component(cmd) putstring
}
if {$mEnableBigEPref != $mEnableBigE} {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
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:[43237] brlcad/trunk
Revision: 43237
http://brlcad.svn.sourceforge.net/brlcad/?rev=43237view=rev
Author: bob1961
Date: 2011-02-11 20:23:38 + (Fri, 11 Feb 2011)
Log Message:
---
Added pix2fb and fb2pix to libged.
Modified Paths:
--
brlcad/trunk/include/fb.h
brlcad/trunk/include/fbserv_obj.h
brlcad/trunk/include/ged.h
brlcad/trunk/src/libfb/fb_generic.c
brlcad/trunk/src/libged/Makefile.am
brlcad/trunk/src/libtclcad/ged_obj.c
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Added Paths:
---
brlcad/trunk/src/libged/fb2pix.c
brlcad/trunk/src/libged/pix2fb.c
Modified: brlcad/trunk/include/fb.h
===
--- brlcad/trunk/include/fb.h 2011-02-11 20:11:10 UTC (rev 43236)
+++ brlcad/trunk/include/fb.h 2011-02-11 20:23:38 UTC (rev 43237)
@@ -92,6 +92,8 @@
FB_EXPORT extern int fb_common_file_size(size_t *widthp, size_t *heightp,
const char *filename, int pixel_size);
FB_EXPORT extern int fb_common_image_size(size_t *widthp, size_t *heightp,
size_t npixels);
FB_EXPORT extern int fb_common_name_size(size_t *widthp, size_t *heightp,
const char *name);
+FB_EXPORT extern int fb_write_fp(FBIO *ifp, FILE *fp, int req_width, int
req_height, int crunch, int inverse, struct bu_vls *result);
+FB_EXPORT extern int fb_read_fd(FBIO *ifp, int fd, int file_width, int
file_height, int file_xoff, int file_yoff, int scr_width, int scr_height, int
scr_xoff, int scr_yoff, int fileinput, char *file_name, int one_line_only, int
multiple_lines, int autosize, int inverse, int clear, int zoom, struct bu_vls
*result);
/* color mapping */
FB_EXPORT extern int fb_is_linear_cmap(const ColorMap *cmap);
Modified: brlcad/trunk/include/fbserv_obj.h
===
--- brlcad/trunk/include/fbserv_obj.h 2011-02-11 20:11:10 UTC (rev 43236)
+++ brlcad/trunk/include/fbserv_obj.h 2011-02-11 20:23:38 UTC (rev 43237)
@@ -32,6 +32,7 @@
#define MAX_CLIENTS 32
#define MAX_PORT_TRIES 100
#define FBS_CALLBACK_NULL (void (*)())NULL
+#define FBSERV_OBJ_NULL (struct fbserv_obj *)NULL
struct fbserv_listener {
int fbsl_fd; /** @brief socket to listen for
connections */
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2011-02-11 20:11:10 UTC (rev 43236)
+++ brlcad/trunk/include/ged.h 2011-02-11 20:23:38 UTC (rev 43237)
@@ -164,6 +164,26 @@
return (_flags); \
}
+#define GED_CHECK_FBSERV(_gedp, _flags) \
+if (_gedp-ged_fbsp == FBSERV_OBJ_NULL) { \
+ int ged_check_view_quiet = (_flags) GED_QUIET; \
+ if (!ged_check_view_quiet) { \
+ bu_vls_trunc((_gedp)-ged_result_str, 0); \
+ bu_vls_printf((_gedp)-ged_result_str, A framebuffer server
object does not exist.); \
+ } \
+ return (_flags); \
+}
+
+#define GED_CHECK_FBSERV_FBP(_gedp, _flags) \
+if (_gedp-ged_fbsp-fbs_fbp == FBIO_NULL) { \
+ int ged_check_view_quiet = (_flags) GED_QUIET; \
+ if (!ged_check_view_quiet) { \
+ bu_vls_trunc((_gedp)-ged_result_str, 0); \
+ bu_vls_printf((_gedp)-ged_result_str, A framebuffer IO structure
does not exist.); \
+ } \
+ return (_flags); \
+}
+
/** Lookup database object */
#define GED_CHECK_EXISTS(_gedp, _name, _noisy, _flags) \
if (db_lookup((_gedp)-ged_wdbp-dbip, (_name), (_noisy)) != RT_DIR_NULL)
{ \
@@ -494,6 +514,7 @@
struct ged_drawable*ged_gdp;
struct ged_view*ged_gvp;
+struct fbserv_obj *ged_fbsp;
void *ged_dmp;
void *ged_refresh_clientdata;/** @brief
client data passed to refresh handler */
@@ -1601,6 +1622,11 @@
GED_EXPORT BU_EXTERN(int ged_facetize, (struct ged *gedp, int argc, const char
*argv[]));
/**
+ * Fb2pix writes a framebuffer image to a .pix file.
+ */
+GED_EXPORT BU_EXTERN(int ged_fb2pix, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
* Find combinations that reference object
*/
GED_EXPORT BU_EXTERN(int ged_find, (struct ged *gedp, int argc, const char
*argv[]));
@@ -1939,6 +1965,11 @@
GED_EXPORT BU_EXTERN(int ged_perspective, (struct ged *gedp, int argc, const
char *argv[]));
/**
+ * Pix2fb reads a pix file into a framebuffer.
+ */
+GED_EXPORT BU_EXTERN(int ged_pix2fb, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
* Create a unix plot file of the currently displayed objects.
*/
GED_EXPORT BU_EXTERN(int ged_plot, (struct ged *gedp, int argc, const char
*argv[]));
Modified: brlcad/trunk/src/libfb/fb_generic.c
===
--- brlcad/trunk/src/libfb/fb_generic.c 2011-02-11 20:11:10 UTC (rev 43236)
+++ brlcad/trunk/src/libfb/fb_generic.c 2011-02-11 20:23:38 UTC (rev 43237)
@@ -430,8 +430,278 @@
}
}
+static
[brlcad-commits] SF.net SVN: brlcad:[43347] brlcad/trunk/src
Revision: 43347 http://brlcad.svn.sourceforge.net/brlcad/?rev=43347view=rev Author: bob1961 Date: 2011-02-15 20:33:53 + (Tue, 15 Feb 2011) Log Message: --- Tweaks to get the windows batch files working better. That is, they can handle filenames with spaces and the windows prompt gets removed from the screen. Modified Paths: -- brlcad/trunk/src/archer/archer.bat brlcad/trunk/src/mged/mged.bat brlcad/trunk/src/tclscripts/rtwizard/rtwizard.bat Modified: brlcad/trunk/src/archer/archer.bat === --- brlcad/trunk/src/archer/archer.bat 2011-02-15 20:14:36 UTC (rev 43346) +++ brlcad/trunk/src/archer/archer.bat 2011-02-15 20:33:53 UTC (rev 43347) @@ -22,8 +22,11 @@ SETLOCAL -%~dp0\bwish.exe %~dp0\archer %1 +SET BWISH=%~dp0bwish +SET ARCHER=%~dp0archer +START /B %BWISH% %ARCHER% %1 + CLS EXIT Modified: brlcad/trunk/src/mged/mged.bat === --- brlcad/trunk/src/mged/mged.bat 2011-02-15 20:14:36 UTC (rev 43346) +++ brlcad/trunk/src/mged/mged.bat 2011-02-15 20:33:53 UTC (rev 43347) @@ -22,10 +22,12 @@ SETLOCAL +SET MGED=%~dp0mged + IF %1==-g ( -%~dp0\mged.exe %2 +START /B %MGED% %2 ) ELSE ( -%~dp0\mged.exe %1 +START /B %MGED% %1 ) CLS Modified: brlcad/trunk/src/tclscripts/rtwizard/rtwizard.bat === --- brlcad/trunk/src/tclscripts/rtwizard/rtwizard.bat 2011-02-15 20:14:36 UTC (rev 43346) +++ brlcad/trunk/src/tclscripts/rtwizard/rtwizard.bat 2011-02-15 20:33:53 UTC (rev 43347) @@ -22,8 +22,11 @@ SETLOCAL -%~dp0\bwish.exe %~dp0\rtwizard %1 +SET BWISH=%~dp0bwish +SET RTWIZARD=%~dp0rtwizard +START /B %BWISH% %RTWIZARD% %1 + CLS EXIT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ 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:[43399] brlcad/trunk/src/libfb/if_wgl.c
Revision: 43399 http://brlcad.svn.sourceforge.net/brlcad/?rev=43399view=rev Author: bob1961 Date: 2011-02-17 19:24:27 + (Thu, 17 Feb 2011) Log Message: --- This fixes a bug on windows where drawing strings breaks. Modified Paths: -- brlcad/trunk/src/libfb/if_wgl.c Modified: brlcad/trunk/src/libfb/if_wgl.c === --- brlcad/trunk/src/libfb/if_wgl.c 2011-02-17 19:05:44 UTC (rev 43398) +++ brlcad/trunk/src/libfb/if_wgl.c 2011-02-17 19:24:27 UTC (rev 43399) @@ -484,6 +484,9 @@ glRasterPos2i(xbase, ybase); glDrawPixels(npix, nlines, GL_BGRA_EXT, GL_UNSIGNED_BYTE, (const GLvoid *) ifp-if_mem); + + glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); + glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ 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:[43400] brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Revision: 43400
http://brlcad.svn.sourceforge.net/brlcad/?rev=43400view=rev
Author: bob1961
Date: 2011-02-17 19:38:35 + (Thu, 17 Feb 2011)
Log Message:
---
Accommodate possible spaces in .
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Modified: brlcad/trunk/src/tclscripts/lib/RtControl.tcl
===
--- brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2011-02-17 19:24:27 UTC
(rev 43399)
+++ brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2011-02-17 19:38:35 UTC
(rev 43400)
@@ -478,7 +478,7 @@
set cooked_dest [get_cooked_dest]
set fbclear [file join [bu_brlcad_root bin] fbclear]
-set result [catch {eval exec $fbclear -F $cooked_dest $rtColor } rt_error]
+set result [catch {eval exec \$fbclear\ -F $cooked_dest $rtColor }
rt_error]
if {$result} {
error $rt_error
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
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:[43418] brlcad/trunk/src/libtclcad/ged_obj.c
Revision: 43418 http://brlcad.svn.sourceforge.net/brlcad/?rev=43418view=rev Author: bob1961 Date: 2011-02-18 16:43:57 + (Fri, 18 Feb 2011) Log Message: --- Minor tweak to go_refresh_view(). Modified Paths: -- brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libtclcad/ged_obj.c === --- brlcad/trunk/src/libtclcad/ged_obj.c2011-02-18 14:21:04 UTC (rev 43417) +++ brlcad/trunk/src/libtclcad/ged_obj.c2011-02-18 16:43:57 UTC (rev 43418) @@ -9012,7 +9012,9 @@ fb_refresh(gdvp-gdv_fbs.fbs_fbp, gdvp-gdv_view-gv_rect.grs_pos[X], gdvp-gdv_view-gv_rect.grs_pos[Y], gdvp-gdv_view-gv_rect.grs_dim[X], gdvp-gdv_view-gv_rect.grs_dim[Y]); - dm_draw_rect(gdvp-gdv_dmp, gdvp-gdv_view-gv_rect); + + if (gdvp-gdv_view-gv_rect.grs_line_width) + dm_draw_rect(gdvp-gdv_dmp, gdvp-gdv_view-gv_rect); } else fb_refresh(gdvp-gdv_fbs.fbs_fbp, 0, 0, gdvp-gdv_dmp-dm_width, gdvp-gdv_dmp-dm_height); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ 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:[32561] brlcad/trunk/src/libged/ged.c
Revision: 32561
http://brlcad.svn.sourceforge.net/brlcad/?rev=32561view=rev
Author: bob1961
Date: 2008-08-29 12:57:17 + (Fri, 29 Aug 2008)
Log Message:
---
Making sure ged_log and ged_result_string will initially contain an empty
string instead of a null pointer (I wrongly assumed that bu_vls_init did this
:-( ). This way, any callers of libged functions can harvest ged_log or
ged_result_str without the need to check whether or not it contains a null
pointer (i.e. it should always contain atleast an empty string assuming the
application doesn't free the vls).
Modified Paths:
--
brlcad/trunk/src/libged/ged.c
Modified: brlcad/trunk/src/libged/ged.c
===
--- brlcad/trunk/src/libged/ged.c 2008-08-29 10:28:44 UTC (rev 32560)
+++ brlcad/trunk/src/libged/ged.c 2008-08-29 12:57:17 UTC (rev 32561)
@@ -102,6 +102,10 @@
{
bu_vls_init(gedp-ged_log);
bu_vls_init(gedp-ged_result_str);
+
+bu_vls_extend(gedp-ged_log, 1);
+bu_vls_extend(gedp-ged_result_str, 1);
+
ged_drawable_init(gedp-ged_gdp);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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:[32571] brlcad/trunk
Revision: 32571
http://brlcad.svn.sourceforge.net/brlcad/?rev=32571view=rev
Author: bob1961
Date: 2008-09-03 14:35:36 + (Wed, 03 Sep 2008)
Log Message:
---
Added ADC (angle distance cursor) functions to libged. Added ADC drawing to
libdm. Added ADC command to libtclcad.
Modified Paths:
--
brlcad/trunk/include/dm.h
brlcad/trunk/include/ged.h
brlcad/trunk/include/tclcad.h
brlcad/trunk/misc/win32-msvc8/libdm/libdm.vcproj
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/src/libdm/Makefile.am
brlcad/trunk/src/libdm/axes.c
brlcad/trunk/src/libdm/clip.c
brlcad/trunk/src/libdm/dm-Null.c
brlcad/trunk/src/libdm/dm-generic.c
brlcad/trunk/src/libdm/dm-plot.c
brlcad/trunk/src/libdm/dm-ps.c
brlcad/trunk/src/libdm/knob.c
brlcad/trunk/src/libdm/options.c
brlcad/trunk/src/libdm/query.c
brlcad/trunk/src/libdm/vers.c
brlcad/trunk/src/libged/Makefile.am
brlcad/trunk/src/libtclcad/ged_obj.c
Added Paths:
---
brlcad/trunk/src/libdm/adc.c
brlcad/trunk/src/libged/adc.c
Modified: brlcad/trunk/include/dm.h
===
--- brlcad/trunk/include/dm.h 2008-09-03 03:26:32 UTC (rev 32570)
+++ brlcad/trunk/include/dm.h 2008-09-03 14:35:36 UTC (rev 32571)
@@ -30,6 +30,7 @@
#include bu.h
#include vmath.h
+#include ged.h
#define USE_FBSERV 1
@@ -76,6 +77,9 @@
#define Xx_TO_GED(_dmp, x) ((int)(((x)/(double)_dmp-dm_width - 0.5) *
GED_RANGE))
#define Xy_TO_GED(_dmp, x) ((int)((0.5 - (x)/(double)_dmp-dm_height) *
GED_RANGE))
+/* +-2048 to +-1 */
+#define GED_TO_PM1(x) (((fastf_t)(x))*INV_GED)
+
#if IR_KNOBS
#define NOISE 16 /* Size of dead spot on knob */
#endif
@@ -345,6 +349,12 @@
register fastf_t *,
register fastf_t *));
+/* adc.c */
+DM_EXPORT BU_EXTERN(void dm_draw_adc,
+ (struct dm *dmp,
+struct ged_adc_state *gasp,
+struct ged_view *gvp));
+
/* axes.c */
DM_EXPORT BU_EXTERN(void dmo_drawDataAxes_cmd,
(struct dm *dmp,
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2008-09-03 03:26:32 UTC (rev 32570)
+++ brlcad/trunk/include/ged.h 2008-09-03 14:35:36 UTC (rev 32571)
@@ -164,6 +164,30 @@
return (_ret); \
}
+struct ged_adc_state {
+intgas_draw;
+intgas_dv_x;
+intgas_dv_y;
+intgas_dv_a1;
+intgas_dv_a2;
+intgas_dv_dist;
+fastf_tgas_pos_model[3];
+fastf_tgas_pos_view[3];
+fastf_tgas_pos_grid[3];
+fastf_tgas_a1;
+fastf_tgas_a2;
+fastf_tgas_dst;
+intgas_anchor_pos;
+intgas_anchor_a1;
+intgas_anchor_a2;
+intgas_anchor_dst;
+fastf_tgas_anchor_pt_a1[3];
+fastf_tgas_anchor_pt_a2[3];
+fastf_tgas_anchor_pt_dst[3];
+intgas_line_color[3];
+intgas_tick_color[3];
+intgas_linewidth;
+};
struct ged_run_rt {
struct bu_list l;
@@ -319,6 +343,50 @@
};
+/* defined in adc.c */
+GED_EXPORT BU_EXTERN(void ged_adc_model_To_adc_view,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp));
+GED_EXPORT BU_EXTERN(void ged_adc_grid_To_adc_view,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp));
+GED_EXPORT BU_EXTERN(void ged_adc_view_To_adc_grid,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp));
+GED_EXPORT BU_EXTERN(void ged_calc_adc_pos,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp));
+GED_EXPORT BU_EXTERN(void ged_calc_adc_a1,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp));
+GED_EXPORT BU_EXTERN(void ged_calc_adc_a2,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp));
+GED_EXPORT BU_EXTERN(void ged_calc_adc_dst,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp));
+GED_EXPORT BU_EXTERN(void ged_adc_reset,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp));
+GED_EXPORT BU_EXTERN(void ged_adc_vls_print,
+(struct ged_adc_state *gasp,
+ struct ged_view *gvp,
+ fastf_t base2local,
+ struct bu_vls *out_vp));
+
+/* defined in clip.c */
+GED_EXPORT BU_EXTERN(int ged_clip,
+(fastf_t *xp1,
+ fastf_t *yp1,
+ fastf_t *xp2,
+ fastf_t *yp2));
+GED_EXPORT BU_EXTERN(int
[brlcad-commits] SF.net SVN: brlcad:[32612] brlcad/trunk/src/libged/adc.c
Revision: 32612
http://brlcad.svn.sourceforge.net/brlcad/?rev=32612view=rev
Author: bob1961
Date: 2008-09-09 17:56:52 + (Tue, 09 Sep 2008)
Log Message:
---
Remove adc draw toggle.
Modified Paths:
--
brlcad/trunk/src/libged/adc.c
Modified: brlcad/trunk/src/libged/adc.c
===
--- brlcad/trunk/src/libged/adc.c 2008-09-09 17:20:53 UTC (rev 32611)
+++ brlcad/trunk/src/libged/adc.c 2008-09-09 17:56:52 UTC (rev 32612)
@@ -99,15 +99,6 @@
return BRLCAD_ERROR;
}
-if (argc == 1) {
- if (gedp-ged_gvp-gv_adc.gas_draw)
- gedp-ged_gvp-gv_adc.gas_draw = 0;
- else
- gedp-ged_gvp-gv_adc.gas_draw = 1;
-
- return BRLCAD_OK;
-}
-
command = (char *)argv[0];
if (strcmp(argv[1], -i) == 0) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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:[32627] brlcad/trunk/src/libged
Revision: 32627
http://brlcad.svn.sourceforge.net/brlcad/?rev=32627view=rev
Author: bob1961
Date: 2008-09-10 20:33:36 + (Wed, 10 Sep 2008)
Log Message:
---
Changed include order for windows. Fixed a few typos.
Modified Paths:
--
brlcad/trunk/src/libged/search.c
brlcad/trunk/src/libged/search.h
Modified: brlcad/trunk/src/libged/search.c
===
--- brlcad/trunk/src/libged/search.c2008-09-10 20:05:53 UTC (rev 32626)
+++ brlcad/trunk/src/libged/search.c2008-09-10 20:33:36 UTC (rev 32627)
@@ -89,15 +89,16 @@
*/
#include common.h
+
#include string.h
#include stdlib.h
+#include time.h
+#include regex.h
+#include bio.h
-#include bio.h
#include cmd.h
#include ged_private.h
-#include regex.h
-
#include search.h
/*
@@ -714,11 +715,11 @@
break;
case DB5_MINORTYPE_BRLCAD_COMBINATION:
if (DB_FULL_PATH_CUR_DIR(entry)-d_flags
DIR_REGION) {
- if ((!bu_fnmatch(plan-type_data, r,
0)) || (!fnmatch(plan-type_data, region, 0))) {
+ if ((!bu_fnmatch(plan-type_data, r,
0)) || (!bu_fnmatch(plan-type_data, region, 0))) {
type_match = 1;
}
} else {
- if ((!bu_fnmatch(plan-type_data,
comb, 0)) || (!fnmatch(plan-type_data, combination, 0))) {
+ if ((!bu_fnmatch(plan-type_data,
comb, 0)) || (!bu_fnmatch(plan-type_data, combination, 0))) {
type_match = 1;
}
}
Modified: brlcad/trunk/src/libged/search.h
===
--- brlcad/trunk/src/libged/search.h2008-09-10 20:05:53 UTC (rev 32626)
+++ brlcad/trunk/src/libged/search.h2008-09-10 20:33:36 UTC (rev 32627)
@@ -51,8 +51,6 @@
*
*/
-#include sys/cdefs.h
-
/* node type */
enum ntype {
N_AND = 1, /* must start 0 */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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:[32632] brlcad/trunk/src/libbu/fnmatch.c
Revision: 32632 http://brlcad.svn.sourceforge.net/brlcad/?rev=32632view=rev Author: bob1961 Date: 2008-09-11 13:47:22 + (Thu, 11 Sep 2008) Log Message: --- Needs bu.h Modified Paths: -- brlcad/trunk/src/libbu/fnmatch.c Modified: brlcad/trunk/src/libbu/fnmatch.c === --- brlcad/trunk/src/libbu/fnmatch.c2008-09-11 13:42:32 UTC (rev 32631) +++ brlcad/trunk/src/libbu/fnmatch.c2008-09-11 13:47:22 UTC (rev 32632) @@ -63,7 +63,9 @@ #include string.h #include bio.h +#include bu.h + #define _BU_FNMATCH_H_ #define BU_FNM_NOMATCH 1 /* Match failed. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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:[32633] brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj
Revision: 32633 http://brlcad.svn.sourceforge.net/brlcad/?rev=32633view=rev Author: bob1961 Date: 2008-09-11 13:52:41 + (Thu, 11 Sep 2008) Log Message: --- Added fnmatch.c Modified Paths: -- brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj Modified: brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj === --- brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj2008-09-11 13:47:22 UTC (rev 32632) +++ brlcad/trunk/misc/win32-msvc8/libbu/libbu.vcproj2008-09-11 13:52:41 UTC (rev 32633) @@ -561,6 +561,10 @@ /FileConfiguration /File File + RelativePath=..\..\..\src\libbu\fnmatch.c + + /File + File RelativePath=..\..\..\src\libbu\fopen_uniq.c FileConfiguration This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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:[32634] brlcad/trunk/misc/win32-msvc8/libged/libged. vcproj
Revision: 32634 http://brlcad.svn.sourceforge.net/brlcad/?rev=32634view=rev Author: bob1961 Date: 2008-09-11 13:53:19 + (Thu, 11 Sep 2008) Log Message: --- Added search.c 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 2008-09-11 13:52:41 UTC (rev 32633) +++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-09-11 13:53:19 UTC (rev 32634) @@ -52,7 +52,7 @@ Name=VCCLCompilerTool Optimization=2 InlineFunctionExpansion=1 - AdditionalIncludeDirectories=../../../include;../../../src/libged;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/libz;../../../src/other/opennurbs;../../../src/other/tnt + AdditionalIncludeDirectories=../../../include;../../../src/libged;../../../src/other/libregex;../../../src/other/tcl/generic;../../../src/other/tcl/win;../../../src/other/libz;../../../src/other/opennurbs;../../../src/other/tnt PreprocessorDefinitions=WIN32;NDEBUG;_WINDOWS;_USRDLL;__win32;ON_DLL_IMPORTS;GED_EXPORT_DLL;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;NEW_TOPS_BEHAVIOR;OBJ_BREP=1;TCL_THREADS=1;_RT_DECL_IFREE;_CRT_SECURE_NO_WARNINGS StringPooling=true BasicRuntimeChecks=0 @@ -818,6 +818,10 @@ /File File + RelativePath=..\..\..\src\libged\search.c + + /File + File RelativePath=..\..\..\src\libged\set_output_script.c /File This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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:[32823] brlcad/trunk/src/conv/bot_dump.c
Revision: 32823
http://brlcad.svn.sourceforge.net/brlcad/?rev=32823view=rev
Author: bob1961
Date: 2008-10-03 12:25:59 + (Fri, 03 Oct 2008)
Log Message:
---
Modified to accept optional bot objects. If provided, dump only the specified
bots.
Modified Paths:
--
brlcad/trunk/src/conv/bot_dump.c
Modified: brlcad/trunk/src/conv/bot_dump.c
===
--- brlcad/trunk/src/conv/bot_dump.c2008-10-03 02:05:13 UTC (rev 32822)
+++ brlcad/trunk/src/conv/bot_dump.c2008-10-03 12:25:59 UTC (rev 32823)
@@ -41,7 +41,7 @@
#define V3ARGS_SCALE(_a) (_a)[X]*cfactor, (_a)[Y]*cfactor,
(_a)[Z]*cfactor
static char usage[] = \
-Usage: %s [-b] [-m directory] [-o file] [-t dxf|obj|sat|stl] [-u units] [-v]
geom.g\n;
+Usage: %s [-b] [-m directory] [-o file] [-t dxf|obj|sat|stl] [-u units] [-v]
geom.g [bot1 bot2 ...]\n;
enum otype {
OTYPE_DXF = 1,
@@ -57,6 +57,7 @@
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;
static int curr_line_num = 0;
static int curr_body_id;
@@ -98,7 +99,6 @@
int last_face;
int first_loop;
int last_loop;
-int edge_id;
int num_vertices = bot-num_vertices;
int num_faces = bot-num_faces;
int num_edges = num_faces*3;
@@ -213,7 +213,6 @@
point_t A;
point_t B;
point_t C;
- point_t center;
vect_t BmA;
vect_t CmB;
vect_t AmC;
@@ -408,7 +407,6 @@
vect_t CmA;
vect_t norm;
register unsigned long i, j, vi;
-unsigned char tot_buffer[4];
num_vertices = bot-num_vertices;
vertices = bot-vertices;
@@ -461,7 +459,124 @@
}
}
+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)
+{
+if (output_directory) {
+ char *cp;
+ bu_vls_trunc(file_name, 0);
+ bu_vls_strcpy(file_name, output_directory);
+ bu_vls_putc(file_name, '/');
+ cp = dp-d_namep;
+ cp++;
+ while (*cp != '\0') {
+ if (*cp == '/') {
+ bu_vls_putc(file_name, '@');
+ } else if (*cp == '.' || isspace(*cp)) {
+ bu_vls_putc(file_name, '_');
+ } else {
+ bu_vls_putc(file_name, *cp);
+ }
+ cp++;
+ }
+ bu_vls_strcat(file_name, file_ext);
+
+ if (binary output_type == OTYPE_STL) {
+ char buf[81]; /* need exactly 80 chars for header */
+ unsigned char tot_buffer[4];
+
+ if ((fd=open(bu_vls_addr(file_name),
O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) 0) {
+ perror(bu_vls_addr(file_name));
+ bu_exit(1, Cannot open binary output file (%s) for writing\n,
bu_vls_addr(file_name));
+ }
+
+ /* Write out STL header */
+ memset(buf, 0, sizeof(buf));
+ bu_strlcpy(buf, BRL-CAD generated STL FILE, sizeof(buf));
+ write(fd, buf, 80);
+
+ /* write a place keeper for the number of triangles */
+ memset(buf, 0, 4);
+ write(fd, buf, 4);
+
+ write_bot_stl_binary(bot, fd, dp-d_namep);
+
+ /* Re-position pointer to 80th byte */
+ lseek(fd, 80, SEEK_SET);
+
+ /* Write out number of triangles */
+ bu_plong(tot_buffer, (unsigned long)total_faces);
+ lswap((unsigned int *)tot_buffer);
+ write(fd, tot_buffer, 4);
+
+ close(fd);
+ } else {
+ if ((fp=fopen(bu_vls_addr(file_name), wb+)) == NULL) {
+ perror(bu_vls_addr(file_name));
+ bu_exit(1, Cannot open ASCII output file (%s) for writing\n,
bu_vls_addr(file_name));
+ }
+
+ switch (output_type) {
+ case OTYPE_DXF:
+ fprintf(fp,
+ 0\nSECTION\n2\nHEADER\n999\n%s (BOT from
%s)\n0\nENDSEC\n0\nSECTION\n2\nENTITIES\n,
+ dp-d_namep, db_name);
+ write_bot_dxf(bot, fp, dp-d_namep);
+ fprintf(fp, 0\nENDSEC\n0\nEOF\n);
+ break;
+ case OTYPE_OBJ:
+ v_offset = 1;
+ write_bot_obj(bot, fp, dp-d_namep);
+ break;
+ case OTYPE_SAT:
+ curr_line_num = 0;
+
+ fprintf(fp, 400 0 1 0\n);
+ /*XXX Temporarily hardwired */
+#if 1
+ fprintf(fp, 37 SolidWorks(2008000)-Sat-Convertor-2.0 11 ACIS
8.0 NT 24 Wed Dec 03 09:26:53 2003\n);
+#else
+ fprintf(fp, 08 BRL-CAD-bot_dump-4.0 11 ACIS 4.0 NT 24 Thur Sep
25 15:00:00 2008\n);
+#endif
+ fprintf(fp, 1 9.9995e-007 1e-010\n);
+
+ write_bot_sat(bot, fp, dp-d_namep
[brlcad-commits] SF.net SVN: brlcad:[32956] brlcad/trunk
Revision: 32956
http://brlcad.svn.sourceforge.net/brlcad/?rev=32956view=rev
Author: bob1961
Date: 2008-10-14 15:17:07 + (Tue, 14 Oct 2008)
Log Message:
---
Added the inside command to libged.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/src/libged/Makefile.am
brlcad/trunk/src/libtclcad/ged_obj.c
Added Paths:
---
brlcad/trunk/src/libged/inside.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2008-10-14 12:20:55 UTC (rev 32955)
+++ brlcad/trunk/include/ged.h 2008-10-14 15:17:07 UTC (rev 32956)
@@ -1593,6 +1593,14 @@
GED_EXPORT BU_EXTERN(int ged_in, (struct ged *gedp, int argc, const char
*argv[]));
/**
+ * Finds the inside primitive per the specified thickness.
+ *
+ * Usage:
+ * inside out_prim in_prim th(s)
+ */
+GED_EXPORT BU_EXTERN(int ged_inside, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
* Add instance of obj to comb
*
* Usage:
Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-14 12:20:55 UTC
(rev 32955)
+++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-14 15:17:07 UTC
(rev 32956)
@@ -518,6 +518,10 @@
/File
File
+ RelativePath=..\..\..\src\libged\inside.c
+
+ /File
+ File
RelativePath=..\..\..\src\libged\instance.c
/File
Modified: brlcad/trunk/src/libged/Makefile.am
===
--- brlcad/trunk/src/libged/Makefile.am 2008-10-14 12:20:55 UTC (rev 32955)
+++ brlcad/trunk/src/libged/Makefile.am 2008-10-14 15:17:07 UTC (rev 32956)
@@ -76,6 +76,7 @@
how.c \
illum.c \
importFg4Section.c \
+ inside.c \
instance.c \
isize.c \
item.c \
Added: brlcad/trunk/src/libged/inside.c
===
--- brlcad/trunk/src/libged/inside.c(rev 0)
+++ brlcad/trunk/src/libged/inside.c2008-10-14 15:17:07 UTC (rev 32956)
@@ -0,0 +1,1197 @@
+/*I N S I D E . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library 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 library 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 inside.c
+ *
+ * The inside command.
+ *
+ */
+
+#include common.h
+#include bio.h
+
+#include stdlib.h
+#include ctype.h
+#include math.h
+#include string.h
+
+#include bu.h
+#include vmath.h
+#include bn.h
+#include nmg.h
+#include rtgeom.h
+#include raytrace.h
+#include db.h
+#include ged_private.h
+
+static char *p_arb4[] = {
+Enter thickness for face 123: ,
+Enter thickness for face 124: ,
+Enter thickness for face 234: ,
+Enter thickness for face 134: ,
+};
+
+static char *p_arb5[] = {
+Enter thickness for face 1234: ,
+Enter thickness for face 125: ,
+Enter thickness for face 235: ,
+Enter thickness for face 345: ,
+Enter thickness for face 145: ,
+};
+
+static char *p_arb6[] = {
+Enter thickness for face 1234: ,
+Enter thickness for face 2356: ,
+Enter thickness for face 1564: ,
+Enter thickness for face 125: ,
+Enter thickness for face 346: ,
+};
+
+static char *p_arb7[] = {
+Enter thickness for face 1234: ,
+Enter thickness for face 567: ,
+Enter thickness for face 145: ,
+Enter thickness for face 2376: ,
+Enter thickness for face 1265: ,
+Enter thickness for face 3475: ,
+};
+
+static char *p_arb8[] = {
+Enter thickness for face 1234: ,
+Enter thickness for face 5678: ,
+Enter thickness for face 1485: ,
+Enter thickness for face 2376: ,
+Enter thickness for face 1265: ,
+Enter thickness for face 3478: ,
+};
+
+static char *p_tgcin[] = {
+Enter thickness for base (AxB): ,
+Enter thickness for top (CxD): ,
+Enter thickness for side: ,
+};
+
+static char *p_partin[] = {
+Enter thickness for body
[brlcad-commits] SF.net SVN: brlcad:[32974] brlcad/trunk/src/libgcv/Makefile.am
Revision: 32974
http://brlcad.svn.sourceforge.net/brlcad/?rev=32974view=rev
Author: bob1961
Date: 2008-10-16 15:33:04 + (Thu, 16 Oct 2008)
Log Message:
---
Mods to add include paths for Tcl headers.
Modified Paths:
--
brlcad/trunk/src/libgcv/Makefile.am
Modified: brlcad/trunk/src/libgcv/Makefile.am
===
--- brlcad/trunk/src/libgcv/Makefile.am 2008-10-16 13:18:27 UTC (rev 32973)
+++ brlcad/trunk/src/libgcv/Makefile.am 2008-10-16 15:33:04 UTC (rev 32974)
@@ -5,6 +5,8 @@
libgcv_nil_la_SOURCES = \
region_end.c
+AM_CPPFLAGS = ${TCL_CPPFLAGS}
+
libgcv_la_SOURCES =
libgcv_la_LDFLAGS = -version-info 19:1 -no-undefined
libgcv_la_LIBADD = \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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:[32975] brlcad/trunk/src/conv/dxf/Makefile.am
Revision: 32975
http://brlcad.svn.sourceforge.net/brlcad/?rev=32975view=rev
Author: bob1961
Date: 2008-10-16 15:45:24 + (Thu, 16 Oct 2008)
Log Message:
---
Mods to add include paths for Tcl headers.
Modified Paths:
--
brlcad/trunk/src/conv/dxf/Makefile.am
Modified: brlcad/trunk/src/conv/dxf/Makefile.am
===
--- brlcad/trunk/src/conv/dxf/Makefile.am 2008-10-16 15:33:04 UTC (rev
32974)
+++ brlcad/trunk/src/conv/dxf/Makefile.am 2008-10-16 15:45:24 UTC (rev
32975)
@@ -4,6 +4,8 @@
dxf-g \
g-dxf
+AM_CPPFLAGS = ${TCL_CPPFLAGS}
+
bot_bldxf_SOURCES = bot-bldxf.c
bot_bldxf_LDADD = ${RT}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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:[32984] brlcad/trunk/src/libged/ps.c
Revision: 32984
http://brlcad.svn.sourceforge.net/brlcad/?rev=32984view=rev
Author: bob1961
Date: 2008-10-17 16:31:13 + (Fri, 17 Oct 2008)
Log Message:
---
Enable clipping.
Modified Paths:
--
brlcad/trunk/src/libged/ps.c
Modified: brlcad/trunk/src/libged/ps.c
===
--- brlcad/trunk/src/libged/ps.c2008-10-17 03:10:46 UTC (rev 32983)
+++ brlcad/trunk/src/libged/ps.c2008-10-17 16:31:13 UTC (rev 32984)
@@ -42,9 +42,7 @@
#define GED_TO_PS(_x) ((int)((_x)+2048))
#define GED_TO_PS_COLOR(_c) ((_c)*ged_ps_color_sf)
-#define GED_PS_CLIPPING 0
-
static void
ged_draw_ps_header(FILE *fp, char *font, char *title, char *creator, int
linewidth, fastf_t scale, int xoffset, int yoffset)
{
@@ -93,10 +91,8 @@
ged_draw_ps_solid(struct ged *gedp, FILE *fp, struct solid *sp, matp_t psmat)
{
static vect_t last;
-#if GED_PS_CLIPPING
-point_tclipmin = {0.0, 0.0, 0.0};
-point_tclipmax = {0.0, 0.0, 0.0};
-#endif
+point_tclipmin = {-1.0, -1.0, -MAX_FASTF};
+point_tclipmax = {1.0, 1.0, MAX_FASTF};
register struct bn_vlist *tvp;
register point_t *pt_prev=NULL;
register fastf_t dist_prev=1.0;
@@ -214,10 +210,8 @@
break;
}
-#if GED_PS_CLIPPING
if (ged_vclip(start, fin, clipmin, clipmax) == 0)
continue;
-#endif
fprintf(fp,
newpath %d %d moveto %d %d lineto stroke\n,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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:[33086] brlcad/trunk
Revision: 33086
http://brlcad.svn.sourceforge.net/brlcad/?rev=33086view=rev
Author: bob1961
Date: 2008-10-28 15:17:06 + (Tue, 28 Oct 2008)
Log Message:
---
Added the echo function to libged.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/src/libged/Makefile.am
brlcad/trunk/src/libtclcad/ged_obj.c
Added Paths:
---
brlcad/trunk/src/libged/echo.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2008-10-28 13:49:07 UTC (rev 33085)
+++ brlcad/trunk/include/ged.h 2008-10-28 15:17:06 UTC (rev 33086)
@@ -1398,6 +1398,14 @@
GED_EXPORT BU_EXTERN(int ged_eac, (struct ged *gedp, int argc, const char
*argv[]));
/**
+ * Echo the specified arguments.
+ *
+ * Usage:
+ * echo args
+ */
+GED_EXPORT BU_EXTERN(int ged_echo, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
* Text edit the color table
*
* Usage:
Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-28 13:49:07 UTC
(rev 33085)
+++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-10-28 15:17:06 UTC
(rev 33086)
@@ -410,6 +410,10 @@
/File
File
+ RelativePath=..\..\..\src\libged\echo.c
+
+ /File
+ File
RelativePath=..\..\..\src\libged\edcodes.c
/File
Modified: brlcad/trunk/src/libged/Makefile.am
===
--- brlcad/trunk/src/libged/Makefile.am 2008-10-28 13:49:07 UTC (rev 33085)
+++ brlcad/trunk/src/libged/Makefile.am 2008-10-28 15:17:06 UTC (rev 33086)
@@ -49,6 +49,7 @@
dump.c \
dup.c \
eac.c \
+ echo.c \
edcodes.c \
edcomb.c \
editit.c \
Added: brlcad/trunk/src/libged/echo.c
===
--- brlcad/trunk/src/libged/echo.c (rev 0)
+++ brlcad/trunk/src/libged/echo.c 2008-10-28 15:17:06 UTC (rev 33086)
@@ -0,0 +1,71 @@
+/* E C H O . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library 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 library 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 echo.c
+ *
+ * The echo command.
+ *
+ */
+
+#include common.h
+#include bio.h
+
+#include stdlib.h
+#include ctype.h
+#include string.h
+
+#include ged_private.h
+
+int
+ged_echo(struct ged *gedp, int argc, const char *argv[])
+{
+register int i;
+
+static const char *usage = args;
+
+GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+GED_CHECK_ARGC_GT_0(gedp, argc, BRLCAD_ERROR);
+
+/* 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 BRLCAD_HELP;
+}
+
+for (i=1; i argc; i++) {
+ bu_vls_printf(gedp-ged_result_str, %s%s, i==1 ? : , argv[i]);
+}
+
+bu_vls_printf(gedp-ged_result_str, \n);
+
+return BRLCAD_OK;
+}
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: stroustrup
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/libged/echo.c
___
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2008-10-28 13:49:07 UTC (rev
33085)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2008-10-28 15:17:06 UTC (rev
33086)
@@ -400,6 +400,7 @@
{E, (char *)0, MAXARGS, go_autoview_func, ged_E},
{e, (char *)0, MAXARGS, go_autoview_func, ged_draw},
{eac,(char *)0, MAXARGS, go_autoview_func, ged_eac},
+{echo, (char *)0, MAXARGS
[brlcad-commits] SF.net SVN: brlcad:[33106] brlcad/trunk/src/conv/bot_dump.c
Revision: 33106 http://brlcad.svn.sourceforge.net/brlcad/?rev=33106view=rev Author: bob1961 Date: 2008-11-03 13:43:29 + (Mon, 03 Nov 2008) Log Message: --- Print out what's in the result string. Modified Paths: -- brlcad/trunk/src/conv/bot_dump.c Modified: brlcad/trunk/src/conv/bot_dump.c === --- brlcad/trunk/src/conv/bot_dump.c2008-11-02 16:06:35 UTC (rev 33105) +++ brlcad/trunk/src/conv/bot_dump.c2008-11-03 13:43:29 UTC (rev 33106) @@ -81,6 +81,8 @@ } (void)ged_bot_dump(gedp, j, av); +if (bu_vls_strlen(gedp-ged_result_str) 0) + bu_log(%s, bu_vls_addr(gedp-ged_result_str)); ged_close(gedp); return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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:[33108] brlcad/trunk/src/libtclcad/ged_obj.c
Revision: 33108 http://brlcad.svn.sourceforge.net/brlcad/?rev=33108view=rev Author: bob1961 Date: 2008-11-03 20:07:11 + (Mon, 03 Nov 2008) Log Message: --- Turn init routines for the older tcl interfaces back on for now. Modified Paths: -- brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libtclcad/ged_obj.c === --- brlcad/trunk/src/libtclcad/ged_obj.c2008-11-03 16:00:18 UTC (rev 33107) +++ brlcad/trunk/src/libtclcad/ged_obj.c2008-11-03 20:07:11 UTC (rev 33108) @@ -595,7 +595,7 @@ (void)Tcl_CreateCommand(interp, (const char *)go_open, go_open_tcl, (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL); -#if 0 +#if 1 /*XXX Temporary */ /* initialize database objects */ Wdb_Init(interp); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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:[33188] brlcad/trunk/src/libged/get_type.c
Revision: 33188
http://brlcad.svn.sourceforge.net/brlcad/?rev=33188view=rev
Author: bob1961
Date: 2008-11-14 14:03:29 + (Fri, 14 Nov 2008)
Log Message:
---
Fleshed out get_type
Modified Paths:
--
brlcad/trunk/src/libged/get_type.c
Modified: brlcad/trunk/src/libged/get_type.c
===
--- brlcad/trunk/src/libged/get_type.c 2008-11-14 13:36:18 UTC (rev 33187)
+++ brlcad/trunk/src/libged/get_type.c 2008-11-14 14:03:29 UTC (rev 33188)
@@ -34,6 +34,8 @@
int
ged_get_type(struct ged *gedp, int argc, const char *argv[])
{
+struct rt_db_internal intern;
+int type;
static const char *usage = object;
GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
@@ -48,11 +50,143 @@
return BRLCAD_HELP;
}
-if (MAXARGS argc) {
+if (argc != 2) {
bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
return BRLCAD_ERROR;
}
+if (wdb_import_from_path(gedp-ged_result_str, intern, argv[1],
gedp-ged_wdbp) == BRLCAD_ERROR)
+ return BRLCAD_ERROR;
+
+if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD) {
+ bu_vls_printf(gedp-ged_result_str, unknown);
+ rt_db_free_internal(intern, rt_uniresource);
+
+ return BRLCAD_OK;
+}
+
+switch (intern.idb_minor_type) {
+ case DB5_MINORTYPE_BRLCAD_TOR:
+ bu_vls_printf(gedp-ged_result_str, tor);
+ break;
+ case DB5_MINORTYPE_BRLCAD_TGC:
+ bu_vls_printf(gedp-ged_result_str, tgc);
+ break;
+ case DB5_MINORTYPE_BRLCAD_ELL:
+ bu_vls_printf(gedp-ged_result_str, ell);
+ break;
+ case DB5_MINORTYPE_BRLCAD_ARB8:
+ type = rt_arb_std_type(intern, gedp-ged_wdbp-wdb_tol);
+
+ switch (type) {
+ case 4:
+ bu_vls_printf(gedp-ged_result_str, arb4);
+ break;
+ case 5:
+ bu_vls_printf(gedp-ged_result_str, arb5);
+ break;
+ case 6:
+ bu_vls_printf(gedp-ged_result_str, arb6);
+ break;
+ case 7:
+ bu_vls_printf(gedp-ged_result_str, arb7);
+ break;
+ case 8:
+ bu_vls_printf(gedp-ged_result_str, arb8);
+ break;
+ default:
+ bu_vls_printf(gedp-ged_result_str, invalid);
+ break;
+ }
+
+ break;
+ case DB5_MINORTYPE_BRLCAD_ARS:
+ bu_vls_printf(gedp-ged_result_str, ars);
+ break;
+ case DB5_MINORTYPE_BRLCAD_HALF:
+ bu_vls_printf(gedp-ged_result_str, half);
+ break;
+ case DB5_MINORTYPE_BRLCAD_REC:
+ bu_vls_printf(gedp-ged_result_str, rec);
+ break;
+ case DB5_MINORTYPE_BRLCAD_POLY:
+ bu_vls_printf(gedp-ged_result_str, poly);
+ break;
+ case DB5_MINORTYPE_BRLCAD_BSPLINE:
+ bu_vls_printf(gedp-ged_result_str, spline);
+ break;
+ case DB5_MINORTYPE_BRLCAD_SPH:
+ bu_vls_printf(gedp-ged_result_str, sph);
+ break;
+ case DB5_MINORTYPE_BRLCAD_NMG:
+ bu_vls_printf(gedp-ged_result_str, nmg);
+ break;
+ case DB5_MINORTYPE_BRLCAD_EBM:
+ bu_vls_printf(gedp-ged_result_str, ebm);
+ break;
+ case DB5_MINORTYPE_BRLCAD_VOL:
+ bu_vls_printf(gedp-ged_result_str, vol);
+ break;
+ case DB5_MINORTYPE_BRLCAD_ARBN:
+ bu_vls_printf(gedp-ged_result_str, arbn);
+ break;
+ case DB5_MINORTYPE_BRLCAD_PIPE:
+ bu_vls_printf(gedp-ged_result_str, pipe);
+ break;
+ case DB5_MINORTYPE_BRLCAD_PARTICLE:
+ bu_vls_printf(gedp-ged_result_str, part);
+ break;
+ case DB5_MINORTYPE_BRLCAD_RPC:
+ bu_vls_printf(gedp-ged_result_str, rpc);
+ break;
+ case DB5_MINORTYPE_BRLCAD_RHC:
+ bu_vls_printf(gedp-ged_result_str, rhc);
+ break;
+ case DB5_MINORTYPE_BRLCAD_EPA:
+ bu_vls_printf(gedp-ged_result_str, epa);
+ break;
+ case DB5_MINORTYPE_BRLCAD_EHY:
+ bu_vls_printf(gedp-ged_result_str, ehy);
+ break;
+ case DB5_MINORTYPE_BRLCAD_ETO:
+ bu_vls_printf(gedp-ged_result_str, eto);
+ break;
+ case DB5_MINORTYPE_BRLCAD_GRIP:
+ bu_vls_printf(gedp-ged_result_str, grip);
+ break;
+ case DB5_MINORTYPE_BRLCAD_JOINT:
+ bu_vls_printf(gedp-ged_result_str, joint);
+ break;
+ case DB5_MINORTYPE_BRLCAD_HF:
+ bu_vls_printf(gedp-ged_result_str, hf);
+ break;
+ case DB5_MINORTYPE_BRLCAD_DSP:
+ bu_vls_printf(gedp-ged_result_str, dsp);
+ break;
+ case DB5_MINORTYPE_BRLCAD_SKETCH:
+ bu_vls_printf(gedp-ged_result_str
[brlcad-commits] SF.net SVN: brlcad:[33189] brlcad/trunk/src/libged/grid.c
Revision: 33189
http://brlcad.svn.sourceforge.net/brlcad/?rev=33189view=rev
Author: bob1961
Date: 2008-11-14 14:12:32 + (Fri, 14 Nov 2008)
Log Message:
---
Added code to return help string if no args were specified.
Modified Paths:
--
brlcad/trunk/src/libged/grid.c
Modified: brlcad/trunk/src/libged/grid.c
===
--- brlcad/trunk/src/libged/grid.c 2008-11-14 14:03:29 UTC (rev 33188)
+++ brlcad/trunk/src/libged/grid.c 2008-11-14 14:12:32 UTC (rev 33189)
@@ -74,6 +74,11 @@
/* initialize result */
bu_vls_trunc(gedp-ged_result_str, 0);
+if (argc == 1) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return BRLCAD_OK;
+}
+
if (argc 2 || 5 argc) {
bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
return BRLCAD_ERROR;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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:[33262] brlcad/trunk/src/tclscripts/lib/tclIndex
Revision: 33262 http://brlcad.svn.sourceforge.net/brlcad/?rev=33262view=rev Author: bob1961 Date: 2008-12-01 16:43:24 + (Mon, 01 Dec 2008) Log Message: --- Added the Ged cadwidget. This widget mainly wraps libtclcad's ged object. Modified Paths: -- brlcad/trunk/src/tclscripts/lib/tclIndex Modified: brlcad/trunk/src/tclscripts/lib/tclIndex === --- brlcad/trunk/src/tclscripts/lib/tclIndex2008-12-01 16:43:00 UTC (rev 33261) +++ brlcad/trunk/src/tclscripts/lib/tclIndex2008-12-01 16:43:24 UTC (rev 33262) @@ -904,6 +904,7 @@ set auto_index(::cadwidgets::ComboBox::setText) [list source [file join $dir ComboBox.tcl]] set auto_index(::cadwidgets::ComboBox::text) [list source [file join $dir ComboBox.tcl]] set auto_index(::cadwidgets::ComboBox::type) [list source [file join $dir ComboBox.tcl]] +set auto_index(::cadwidgets::Ged) [list source [file join $dir Ged.tcl]] set auto_index(::cadwidgets::Help) [list source [file join $dir Help.tcl]] set auto_index(::cadwidgets::Help::?) [list source [file join $dir Help.tcl]] set auto_index(::cadwidgets::Help::add) [list source [file join $dir Help.tcl]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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:[33263] brlcad/trunk/src/libdm
Revision: 33263
http://brlcad.svn.sourceforge.net/brlcad/?rev=33263view=rev
Author: bob1961
Date: 2008-12-01 16:50:25 + (Mon, 01 Dec 2008)
Log Message:
---
Added labels.c and scale.c for drawing primitive labels and a view scale.
Modified Paths:
--
brlcad/trunk/src/libdm/Makefile.am
Added Paths:
---
brlcad/trunk/src/libdm/labels.c
brlcad/trunk/src/libdm/scale.c
Modified: brlcad/trunk/src/libdm/Makefile.am
===
--- brlcad/trunk/src/libdm/Makefile.am 2008-12-01 16:43:24 UTC (rev 33262)
+++ brlcad/trunk/src/libdm/Makefile.am 2008-12-01 16:50:25 UTC (rev 33263)
@@ -45,9 +45,11 @@
focus.c \
grid.c \
knob.c \
+ labels.c \
options.c \
query.c \
rect.c \
+ scale.c \
tcl.c \
vers.c
Added: brlcad/trunk/src/libdm/labels.c
===
--- brlcad/trunk/src/libdm/labels.c (rev 0)
+++ brlcad/trunk/src/libdm/labels.c 2008-12-01 16:50:25 UTC (rev 33263)
@@ -0,0 +1,696 @@
+/* L A B E L S . C
+ * BRL-CAD
+ *
+ * Copyright (c) 1998-2008 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library 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 library 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 labels.c
+ *
+ * Functions -
+ * dm_draw_labels Draw primitive labels.
+ *
+ */
+
+#include common.h
+#include bio.h
+
+#include stdio.h
+#include math.h
+
+#include vmath.h
+#include bu.h
+#include bn.h
+#include db.h
+#include mater.h
+#include nmg.h
+#include rtgeom.h
+#include nurb.h
+#include solid.h
+#include dm.h
+
+/*
+ * Put labels on the vertices of the currently edited solid.
+ * XXX This really should use import/export interface!!! Or be part of it.
+ *
+ * This code was lifted from mged/edsol.c.
+ * XXX This should probably live in librt.
+ */
+void
+dm_label_primitive(struct rt_wdb *wdbp,
+ int *num_lines,
+ point_t *lines,
+ struct rt_point_labels pl[],
+ int max_pl,
+ const mat_t xform,
+ struct rt_db_internal*ip)
+{
+register int i;
+point_twork;
+point_tpos_view;
+intnpl = 0;
+
+
+#definePOINT_LABEL( _pt, _char ) { \
+ VMOVE( pl[npl].pt, _pt ); \
+ pl[npl].str[0] = _char; \
+ pl[npl++].str[1] = '\0'; }
+
+#definePOINT_LABEL_STR( _pt, _str ){ \
+ VMOVE( pl[npl].pt, _pt ); \
+ bu_strlcpy( pl[npl++].str, _str, sizeof(pl[0].str) ); }
+
+
+RT_CK_DB_INTERNAL(ip);
+
+if (ip-idb_major_type != DB5_MAJORTYPE_BRLCAD)
+ /* silently ignore */
+ return;
+
+switch (ip-idb_minor_type) {
+ case DB5_MINORTYPE_BRLCAD_TOR: {
+ struct rt_tor_internal *tor =
+ (struct rt_tor_internal *)ip-idb_ptr;
+ fastf_t r3, r4;
+ vect_t adir;
+
+ RT_TOR_CK_MAGIC(tor);
+
+ bn_vec_ortho(adir, tor-h);
+
+ MAT4X3PNT(pos_view, xform, tor-v);
+ POINT_LABEL(pos_view, 'V');
+
+ r3 = tor-r_a - tor-r_h;
+ VJOIN1(work, tor-v, r3, adir);
+ MAT4X3PNT(pos_view, xform, work);
+ POINT_LABEL(pos_view, 'I');
+
+ r4 = tor-r_a + tor-r_h;
+ VJOIN1(work, tor-v, r4, adir);
+ MAT4X3PNT(pos_view, xform, work);
+ POINT_LABEL(pos_view, 'O');
+
+ VJOIN1(work, tor-v, tor-r_a, adir);
+ VADD2(work, work, tor-h);
+ MAT4X3PNT(pos_view, xform, work);
+ POINT_LABEL(pos_view, 'H');
+ }
+
+ break;
+ case DB5_MINORTYPE_BRLCAD_TGC: {
+ struct rt_tgc_internal *tgc =
+ (struct rt_tgc_internal *)ip-idb_ptr;
+
+ RT_TGC_CK_MAGIC(tgc);
+ MAT4X3PNT(pos_view, xform, tgc-v);
+ POINT_LABEL(pos_view, 'V');
+
+ VADD2(work, tgc-v, tgc-a);
+ MAT4X3PNT(pos_view, xform, work);
+ POINT_LABEL(pos_view, 'A');
+
+ VADD2(work, tgc-v, tgc-b);
+ MAT4X3PNT(pos_view, xform, work);
+ POINT_LABEL(pos_view, 'B
[brlcad-commits] SF.net SVN: brlcad:[33269] brlcad/trunk/src
Revision: 33269
http://brlcad.svn.sourceforge.net/brlcad/?rev=33269view=rev
Author: bob1961
Date: 2008-12-02 16:38:21 + (Tue, 02 Dec 2008)
Log Message:
---
Activate wizard plugins and the primitive creation buttons in Archer.
Modified Paths:
--
brlcad/trunk/src/archer/plugins/Wizards/tankwizardIA/TankWizardIA.tcl
brlcad/trunk/src/tclscripts/archer/Archer.tcl
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/archer/plugins/Wizards/tankwizardIA/TankWizardIA.tcl
===
--- brlcad/trunk/src/archer/plugins/Wizards/tankwizardIA/TankWizardIA.tcl
2008-12-02 16:19:49 UTC (rev 33268)
+++ brlcad/trunk/src/archer/plugins/Wizards/tankwizardIA/TankWizardIA.tcl
2008-12-02 16:38:21 UTC (rev 33269)
@@ -490,7 +490,7 @@
set wizardXmlAction buildTankXML
set wizardUnits in
-set savedUnits [$archersMged units]
+set savedUnits [$archersMged units -s]
$archersMged units $_originUnits
set sf1 [$archersMged local2base]
$archersMged units $wizardUnits
@@ -1274,7 +1274,7 @@
$archersMged attachObservers
}
-$archersMged refreshAll
+$archersMged refresh_all
$archersMged configure -autoViewEnable 1
}
@@ -1283,7 +1283,7 @@
initRegionIds
$archer pluginUpdateStatusBar Building Tank...
-set savedUnits [$archersMged units]
+set savedUnits [$archersMged units -s]
$archersMged units $wizardUnits
set local2base [$archersMged local2base]
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2008-12-02 16:19:49 UTC
(rev 33268)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2008-12-02 16:38:21 UTC
(rev 33269)
@@ -962,7 +962,7 @@
if {[info exists itk_component(mged)]} {
SetWaitCursor
- set savedUnits [$itk_component(mged) units]
+ set savedUnits [$itk_component(mged) units -s]
$itk_component(mged) units in
$itk_component(mged) configure -autoViewEnable 0
$itk_component(mged) detachObservers
@@ -1198,11 +1198,11 @@
applyPreferences
doLighting
updateModesMenu
-# updateWizardMenu
+ updateWizardMenu
updateUtilityMenu
deleteTargetOldCopy
-# updateCreationButtons 1
+ updateCreationButtons 1
buildGroundPlane
showGroundPlane
@@ -5688,7 +5688,7 @@
} else {
if {[catch {$itk_component(mged) attr get $mWizardTop WizardOrigin}
wizOrigin]} {
set wizOrigin [dbCmd center]
- set wizUnits [dbCmd units]
+ set wizUnits [dbCmd units -s]
} elseif {[catch {$itk_component(mged) attr get $mWizardTop
WizardUnits} wizUnits]} {
set wizUnits mm
}
@@ -6027,7 +6027,7 @@
set name [dbCmd make_name $name]
set oname $name
set origin [dbCmd center]
-set units [dbCmd units]
+set units [dbCmd units -s]
set dialog $itk_interior.wizardDialog
::iwidgets::dialog $dialog \
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-02 16:19:49 UTC
(rev 33268)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-02 16:38:21 UTC
(rev 33269)
@@ -1870,7 +1870,7 @@
set delta [expr {[magnitude $diff] * [dbCmd base2local]}]
tk_messageBox -title Measured Distance \
-icon info \
- -message Measured distance: $delta [dbCmd units]
+ -message Measured distance: $delta [dbCmd units -s]
}
@@ -2408,7 +2408,7 @@
set mCenterY [lindex $center 1]
set mCenterZ [lindex $center 2]
-set mDbUnits [dbCmd units]
+set mDbUnits [dbCmd units -s]
$itk_component(centerDialog) center [namespace tail $this]
if {[$itk_component(centerDialog) activate]} {
$dm center $mCenterX $mCenterY $mCenterZ
@@ -2887,7 +2887,7 @@
}
set mDbTitle [$itk_component(mged) title]
-set mDbUnits [$itk_component(mged) units]
+set mDbUnits [$itk_component(mged) units -s]
set mPrevObjViewMode $OBJ_ATTR_VIEW_MODE
set mPrevSelectedObjPath
set mPrevSelectedObj
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https
[brlcad-commits] SF.net SVN: brlcad:[33270] brlcad/trunk
Revision: 33270
http://brlcad.svn.sourceforge.net/brlcad/?rev=33270view=rev
Author: bob1961
Date: 2008-12-03 21:00:43 + (Wed, 03 Dec 2008)
Log Message:
---
Activate Archer's wizard menu and primitive edit toolbar. Added commands for
editing primitives via the mouse to libtclcad's Ged object.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/src/libtclcad/ged_obj.c
brlcad/trunk/src/tclscripts/archer/Archer.tcl
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2008-12-02 16:38:21 UTC (rev 33269)
+++ brlcad/trunk/include/ged.h 2008-12-03 21:00:43 UTC (rev 33270)
@@ -74,6 +74,9 @@
#define GED_SCALE_MODE 3
#define GED_CONSTRAINED_ROTATE_MODE 4
#define GED_CONSTRAINED_TRANSLATE_MODE 5
+#define GED_OROTATE_MODE 6
+#define GED_OSCALE_MODE 7
+#define GED_OTRANSLATE_MODE 8
/**
* S E M A P H O R E S
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2008-12-02 16:38:21 UTC (rev
33269)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2008-12-03 21:00:43 UTC (rev
33270)
@@ -218,6 +218,30 @@
ged_func_ptrfunc,
const char *usage,
int maxargs);
+static int go_mouse_orotate(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
+static int go_mouse_oscale(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
+static int go_mouse_otranslate(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
+static int go_mouse_translate(struct ged *gedp,
+ int argc,
+ const char*argv[],
+ ged_func_ptr func,
+ const char*usage,
+ int maxargs);
static int go_mouse_ray(struct ged *gedp,
int argc,
const char *argv[],
@@ -248,6 +272,24 @@
ged_func_ptr func,
const char *usage,
int maxargs);
+static int go_orotate_mode(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
+static int go_oscale_mode(struct ged *gedp,
+ int argc,
+ const char*argv[],
+ ged_func_ptr func,
+ const char*usage,
+ int maxargs);
+static int go_otranslate_mode(struct ged *gedp,
+ int argc,
+ const char*argv[],
+ ged_func_ptr func,
+ const char*usage,
+ int maxargs);
static int go_paint_rect_area(struct ged *gedp,
int argc,
const char*argv[],
@@ -552,6 +594,9 @@
{move_arb_face, (char *)0, MAXARGS, go_pass_through_func,
ged_move_arb_face},
{mouse_constrain_rot,vname coord x y, MAXARGS,
go_mouse_constrain_rot, GED_FUNC_PTR_NULL},
{mouse_constrain_trans, vname coord x y, MAXARGS,
go_mouse_constrain_trans, GED_FUNC_PTR_NULL},
+{mouse_orotate, vname obj x y, MAXARGS, go_mouse_orotate,
GED_FUNC_PTR_NULL},
+{mouse_oscale, vname obj x y, MAXARGS, go_mouse_oscale,
GED_FUNC_PTR_NULL},
+{mouse_otranslate, vname obj x y, MAXARGS, go_mouse_otranslate,
GED_FUNC_PTR_NULL},
{mouse_ray, vname x y, MAXARGS, go_mouse_ray, GED_FUNC_PTR_NULL},
{mouse_rot, vname x y, MAXARGS, go_mouse_rot, GED_FUNC_PTR_NULL},
{mouse_scale,vname x y, MAXARGS, go_mouse_scale,
GED_FUNC_PTR_NULL},
@@ -566,8 +611,11 @@
{open, (char *)0, MAXARGS
[brlcad-commits] SF.net SVN: brlcad:[33289] brlcad/trunk/src/tclscripts
Revision: 33289
http://brlcad.svn.sourceforge.net/brlcad/?rev=33289view=rev
Author: bob1961
Date: 2008-12-04 19:52:19 + (Thu, 04 Dec 2008)
Log Message:
---
Added wrappers for the in and inside commands in Archer. Modified the
Command widget to append more_args, if any, to the invoked command.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
brlcad/trunk/src/tclscripts/lib/Command.tcl
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-04 18:32:36 UTC
(rev 33288)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-04 19:52:19 UTC
(rev 33289)
@@ -133,6 +133,8 @@
method get {args}
method group {args}
method i {args}
+ method in {args}
+ method inside {args}
method item{args}
method kill{args}
method killall {args}
@@ -362,9 +364,8 @@
whichid who unpackTree Z zap
}
variable mMgedCommands { \
-bot2pipe \
-adjust arced attr blast c comb comb_color
concat copyeval E edcomb \
-edmater erase_all ev find hide item
killall killtree make \
+adjust arced attr blast bot2pipe c comb
comb_color concat copyeval E edcomb \
+edmater erase_all ev find hide in inside
item killall killtree make \
make_bb make_name mater mirror mvall push
put r rmater report \
shader track unhide vdraw wmater
}
@@ -3833,6 +3834,14 @@
}
+::itcl::body ArcherCore::in {args} {
+eval mgedWrapper in 0 0 1 1 $args
+}
+
+::itcl::body ArcherCore::inside {args} {
+eval mgedWrapper inside 0 0 1 1 $args
+}
+
::itcl::body ArcherCore::item {args} {
eval mgedWrapper item 0 0 1 1 $args
}
Modified: brlcad/trunk/src/tclscripts/lib/Command.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Command.tcl 2008-12-04 18:32:36 UTC (rev
33288)
+++ brlcad/trunk/src/tclscripts/lib/Command.tcl 2008-12-04 19:52:19 UTC (rev
33289)
@@ -116,6 +116,7 @@
private variable search_char
private variable search_dir
+private variable more_args_list {}
private variable more_args_var
private variable more_args_begin_index
private variable more_args_end_index
@@ -262,6 +263,7 @@
bind $w Return [::itcl::code $this doReturn]; break
bind $w KP_Enter [::itcl::code $this doReturn]; break
+eval lappend more_args_list $more_args_var
return $more_args_var
}
@@ -302,6 +304,7 @@
set w $itk_component(text)
set cmd [$w get promptEnd insert]
+set more_args_list {}
# remove any instances of prompt2 from the beginning of each secondary line
regsub -all \n$itk_option(-prompt2) $cmd cmd
@@ -328,6 +331,7 @@
}
if {$do_history} {
+ eval lappend cmd $more_args_list
$hist add $cmd
}
print_prompt
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2008-12-04 18:32:36 UTC (rev
33288)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2008-12-04 19:52:19 UTC (rev
33289)
@@ -2772,7 +2772,6 @@
$help add idents {{file object(s)} {dump the idents for the
specified objects to file}}
$help add illum{{name} {illuminate object}}
$help add importFg4Section {{obj section} {create an object by importing
the specified section}}
-#XXX Temporarily disabled (i.e. doesn't work properly)
$help add in {{args} {creates a primitive by prompting the
user for input}}
$help add inside {{out_prim in_prim th(s)} {Creates in_prim as
the inside of out_prim}}
$help add isize{{} {returns the inverse of view size}}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo
[brlcad-commits] SF.net SVN: brlcad:[33331] brlcad/trunk/src/librt/tcl.c
Revision: 1
http://brlcad.svn.sourceforge.net/brlcad/?rev=1view=rev
Author: bob1961
Date: 2008-12-09 18:41:19 + (Tue, 09 Dec 2008)
Log Message:
---
Modified the rt_comb_get function (i.e. added braces around rgb and shader
values when getting all attributes).
Modified Paths:
--
brlcad/trunk/src/librt/tcl.c
Modified: brlcad/trunk/src/librt/tcl.c
===
--- brlcad/trunk/src/librt/tcl.c2008-12-09 18:02:00 UTC (rev 0)
+++ brlcad/trunk/src/librt/tcl.c2008-12-09 18:41:19 UTC (rev 1)
@@ -950,11 +950,11 @@
}
if (comb-rgb_valid) {
- bu_vls_printf(log, rgb %d %d %d , V3ARGS(comb-rgb));
+ bu_vls_printf(log, rgb {%d %d %d} , V3ARGS(comb-rgb));
}
if (bu_vls_strlen(comb-shader) 0) {
- bu_vls_printf(log, shader %s , bu_vls_addr(comb-shader));
+ bu_vls_printf(log, shader {%s} , bu_vls_addr(comb-shader));
}
if (bu_vls_strlen(comb-material) 0) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.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:[33341] brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Revision: 33341
http://brlcad.svn.sourceforge.net/brlcad/?rev=33341view=rev
Author: bob1961
Date: 2008-12-10 21:12:55 + (Wed, 10 Dec 2008)
Log Message:
---
Added code to insure the Advanced Settings dialog pops up above the main rt
control dialog.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/RtControl.tcl
Modified: brlcad/trunk/src/tclscripts/lib/RtControl.tcl
===
--- brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2008-12-10 21:09:38 UTC
(rev 33340)
+++ brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2008-12-10 21:12:55 UTC
(rev 33341)
@@ -110,6 +110,9 @@
private variable isaMged 0
private variable isaGed 0
+protected variable saveVisibilityBinding {}
+protected variable saveFocusOutBinding {}
+
constructor {args} {}
}
@@ -392,6 +395,8 @@
itk_component add adv {
::toplevel $itk_interior.adv
}
+bind $itk_component(adv) Visibility raise $itk_component(adv); break
+bind $itk_component(adv) FocusOut raise $itk_component(adv); break
itk_component add adv_gridF1 {
::frame $itk_component(adv).gridF1
@@ -602,6 +607,11 @@
}
::itcl::body RtControl::activate_adv {} {
+set saveVisibilityBinding [bind $itk_component(hull) Visibility]
+set saveFocusOutBinding [bind $itk_component(hull) FocusOut]
+bind $itk_component(hull) Visibility {}
+bind $itk_component(hull) FocusOut {}
+
raise $itk_component(adv)
# center over control panel
@@ -621,6 +631,10 @@
::itcl::body RtControl::deactivate_adv {} {
set win_geom_adv [wm geometry $itk_component(adv)]
wm withdraw $itk_component(adv)
+
+bind $itk_component(hull) Visibility $saveVisibilityBinding
+bind $itk_component(hull) FocusOut $saveFocusOutBinding
+raise $itk_component(hull)
}
::itcl::body RtControl::center {w gs {cw }} {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.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:[33345] brlcad/trunk/src
Revision: 33345
http://brlcad.svn.sourceforge.net/brlcad/?rev=33345view=rev
Author: bob1961
Date: 2008-12-10 21:35:06 + (Wed, 10 Dec 2008)
Log Message:
---
Make use of libged's tire functionality.
Modified Paths:
--
brlcad/trunk/src/libtclcad/ged_obj.c
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2008-12-10 21:33:24 UTC (rev
33344)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2008-12-10 21:35:06 UTC (rev
33345)
@@ -687,6 +687,7 @@
{solids_on_ray, (char *)0, MAXARGS, go_pass_through_func,
ged_solids_on_ray},
{summary,(char *)0, MAXARGS, go_pass_through_func, ged_summary},
{sync, (char *)0, MAXARGS, go_pass_through_func, ged_sync},
+{tire, (char *)0, MAXARGS, go_pass_through_func, ged_tire},
{title, (char *)0, MAXARGS, go_pass_through_func, ged_title},
{tol,(char *)0, MAXARGS, go_pass_through_func, ged_tol},
{tops, (char *)0, MAXARGS, go_pass_through_func, ged_tops},
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-10 21:33:24 UTC
(rev 33344)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2008-12-10 21:35:06 UTC
(rev 33345)
@@ -188,6 +188,7 @@
method rotate_arb_face {args}
method shader {args}
method shells {args}
+ method tire{args}
method title {args}
method track {args}
method unhide {args}
@@ -400,7 +401,7 @@
mv mvall nmg_collapse nmg_simplify \
ocenter orotate oscale otranslate
packTree prefix push \
put put_comb putmat pwd r rcodes red
rfarb rm rmater \
- rotate_arb_face shader shells title
track unhide units unpackTree \
+ rotate_arb_face shader shells tire
title track unhide units unpackTree \
vmake wmater xpush Z zap
}
variable mUnwrappedDbCommands {}
@@ -4163,6 +4164,10 @@
eval gedWrapper shells 0 0 1 0 $args
}
+::itcl::body ArcherCore::tire {args} {
+eval gedWrapper tire 0 0 1 1 $args
+}
+
::itcl::body ArcherCore::title {args} {
if {$args == {}} {
return [gedCmd title]
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2008-12-10
21:33:24 UTC (rev 33344)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2008-12-10
21:35:06 UTC (rev 33345)
@@ -118,7 +118,11 @@
# Initialize the variables containing the object's specification.
#
::itcl::body CombEditFrame::initGeometry {gdata} {
-set mRegion [bu_get_value_by_keyword region $gdata]
+if {![catch {bu_get_value_by_keyword region $gdata} _region]} {
+ set mRegion $_region
+} else {
+ set mRegion
+}
if {![catch {bu_get_value_by_keyword id $gdata} _id]} {
set mId $_id
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2008-12-10 21:33:24 UTC (rev
33344)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2008-12-10 21:35:06 UTC (rev
33345)
@@ -393,6 +393,7 @@
method solids_on_ray {args}
method summary {args}
method sync {args}
+ method tire {args}
method title {args}
method tol {args}
method tops {args}
@@ -1929,6 +1930,10 @@
eval $mGed sync $args
}
+::itcl::body cadwidgets::Ged::tire {args} {
+eval $mGed tire $args
+}
+
::itcl::body cadwidgets::Ged::title {args} {
eval $mGed title $args
}
@@ -2868,6 +2873,7 @@
$help add solids {{file object(s)} {returns an ascii summary of
solids}}
$help add summary {{[s r g]} {count/list solid/reg/groups}}
$help add sync {{} {sync the in memory database to disk}}
+$help add tire {{[options] tire_top} {create a tire}}
$help add title{{?string?} {print or change the title}}
$help add tol {{[abs #] [rel #] [norm #] [dist #] [perp #]}
{show/set tessellation and calculation tolerances}}
$help add tops {{} {find all top level objects}}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site
[brlcad-commits] SF.net SVN: brlcad:[33361] brlcad/trunk/src/libged/tire.c
Revision: 33361 http://brlcad.svn.sourceforge.net/brlcad/?rev=33361view=rev Author: bob1961 Date: 2008-12-11 14:35:37 + (Thu, 11 Dec 2008) Log Message: --- Removed leftover debug statement. Modified Paths: -- brlcad/trunk/src/libged/tire.c Modified: brlcad/trunk/src/libged/tire.c === --- brlcad/trunk/src/libged/tire.c 2008-12-11 14:22:08 UTC (rev 33360) +++ brlcad/trunk/src/libged/tire.c 2008-12-11 14:35:37 UTC (rev 33361) @@ -2203,9 +2203,6 @@ if (pattern_type == 1 tread_type == 0) tread_type = 1; if (pattern_type == 2 tread_type == 0) tread_type = 2; -bu_log(XXX: tread_type - %d, pattern_type - %d\n, tread_type, pattern_type); - - /* Make the tire region */ MakeTire(gedp-ged_wdbp, bu_vls_addr(dimen), dytred, dztred, d1, dyside1, zside1, ztire, dyhub, zhub, tire_thickness, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.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:[33362] brlcad/trunk/src/archer/plugins/Wizards/ tirewizard/TireWizard.tcl
Revision: 33362
http://brlcad.svn.sourceforge.net/brlcad/?rev=33362view=rev
Author: bob1961
Date: 2008-12-11 19:40:11 + (Thu, 11 Dec 2008)
Log Message:
---
Indicate the units for various entries.
Modified Paths:
--
brlcad/trunk/src/archer/plugins/Wizards/tirewizard/TireWizard.tcl
Modified: brlcad/trunk/src/archer/plugins/Wizards/tirewizard/TireWizard.tcl
===
--- brlcad/trunk/src/archer/plugins/Wizards/tirewizard/TireWizard.tcl
2008-12-11 14:35:37 UTC (rev 33361)
+++ brlcad/trunk/src/archer/plugins/Wizards/tirewizard/TireWizard.tcl
2008-12-11 19:40:11 UTC (rev 33362)
@@ -176,7 +176,7 @@
# Create rim diameter entry field
itk_component add paramRimDiameterL {
::label $itk_component(paramNonArrowF).rimDiameterL \
- -text Rim Diameter: \
+ -text Rim Diameter (in): \
-anchor e
} {}
itk_component add paramRimDiameterE {
@@ -188,7 +188,7 @@
# Create rim width entry field
itk_component add paramRimWidthL {
::label $itk_component(paramNonArrowF).rimWidthL \
- -text Rim Width: \
+ -text Rim Width (in): \
-anchor e
} {}
itk_component add paramRimWidthE {
@@ -200,7 +200,7 @@
# Create tire aspect entry field
itk_component add paramTireAspectL {
::label $itk_component(paramNonArrowF).tireAspectL \
- -text Tire Aspect: \
+ -text Tire Aspect (%): \
-anchor e
} {}
itk_component add paramTireAspectE {
@@ -212,7 +212,7 @@
# Create tire thickness entry field
itk_component add paramTireThicknessL {
::label $itk_component(paramNonArrowF).tireThicknessL \
- -text Tire Thickness: \
+ -text Tire Thickness (mm): \
-anchor e
} {}
itk_component add paramTireThicknessE {
@@ -224,7 +224,7 @@
# Create tire width entry field
itk_component add paramTireWidthL {
::label $itk_component(paramNonArrowF).tireWidthL \
- -text Tire Width: \
+ -text Tire Width (mm): \
-anchor e
} {}
itk_component add paramTireWidthE {
@@ -236,7 +236,7 @@
# Create tread depth entry field
itk_component add paramTreadDepthL {
::label $itk_component(paramNonArrowF).treadDepthL \
- -text Tread Depth: \
+ -text Tread Depth (mm): \
-anchor e
} {}
itk_component add paramTreadDepthE {
@@ -311,7 +311,7 @@
} {}
# Create Create Wheel checkbutton
-itk_component add paramUseWheelCB {
+itk_component add paramCreateWheelCB {
::checkbutton $itk_component(paramNonArrowF).createWheelCB \
-text Create Wheel \
-variable [::itcl::scope createWheel]
@@ -351,7 +351,7 @@
grid $itk_component(emptyL) -columnspan 2 \
-row $row -stick nsew
incr row
-grid $itk_component(paramUseWheelCB) -columnspan 2 \
+grid $itk_component(paramCreateWheelCB) -columnspan 2 \
-row $row -stick nsew
grid columnconfigure $itk_component(paramNonArrowF) 1 -weight 1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.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:[33363] brlcad/trunk/src/archer/plugins/Wizards/ tirewizard.tcl
Revision: 33363
http://brlcad.svn.sourceforge.net/brlcad/?rev=33363view=rev
Author: bob1961
Date: 2008-12-11 19:41:43 + (Thu, 11 Dec 2008)
Log Message:
---
Minor mod of an error message.
Modified Paths:
--
brlcad/trunk/src/archer/plugins/Wizards/tirewizard.tcl
Modified: brlcad/trunk/src/archer/plugins/Wizards/tirewizard.tcl
===
--- brlcad/trunk/src/archer/plugins/Wizards/tirewizard.tcl 2008-12-11
19:40:11 UTC (rev 33362)
+++ brlcad/trunk/src/archer/plugins/Wizards/tirewizard.tcl 2008-12-11
19:41:43 UTC (rev 33363)
@@ -32,7 +32,7 @@
set filename [file join $brlcadDataPath archer plugins Wizards tirewizard
TireWizard.tcl]
}
if { ![file exists $filename] } {
-puts Could not load the Tire plugin, skipping $filename
+puts Could not load the TireWizard plugin, skipping $filename
return
}
source $filename
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.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:[33385] brlcad/trunk/misc/win32-msvc8/libged/libged. vcproj
Revision: 33385 http://brlcad.svn.sourceforge.net/brlcad/?rev=33385view=rev Author: bob1961 Date: 2008-12-16 18:32:09 + (Tue, 16 Dec 2008) Log Message: --- Added tire to libged build on Windows. 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 2008-12-16 17:48:32 UTC (rev 33384) +++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2008-12-16 18:32:09 UTC (rev 33385) @@ -914,6 +914,10 @@ /File File + RelativePath=..\..\..\src\libged\tire.c + + /File + File RelativePath=..\..\..\src\libged\title.c /File This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.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:[33410] brlcad/trunk/src/libged/ged.c
Revision: 33410
http://brlcad.svn.sourceforge.net/brlcad/?rev=33410view=rev
Author: bob1961
Date: 2008-12-22 15:22:40 + (Mon, 22 Dec 2008)
Log Message:
---
Modified ged_open() to acquire a new RT material head.
Modified Paths:
--
brlcad/trunk/src/libged/ged.c
Modified: brlcad/trunk/src/libged/ged.c
===
--- brlcad/trunk/src/libged/ged.c 2008-12-22 05:28:14 UTC (rev 33409)
+++ brlcad/trunk/src/libged/ged.c 2008-12-22 15:22:40 UTC (rev 33410)
@@ -56,12 +56,20 @@
{
struct ged *gedp;
struct rt_wdb *wdbp;
+struct mater *save_materp = MATER_NULL;
+save_materp = rt_material_head();
+rt_new_material_head(MATER_NULL);
+
if (strcmp(dbtype, db) == 0) {
struct db_i *dbip;
- if ((dbip = ged_open_dbip(filename, existing_only)) == DBI_NULL)
+ if ((dbip = ged_open_dbip(filename, existing_only)) == DBI_NULL) {
+ /* Restore RT's material head */
+ rt_new_material_head(save_materp);
+
return GED_NULL;
+ }
RT_CK_DBI(dbip);
@@ -71,8 +79,12 @@
} else {
struct db_i *dbip;
- if (ged_decode_dbip(filename, dbip) != BRLCAD_OK)
+ if (ged_decode_dbip(filename, dbip) != BRLCAD_OK) {
+ /* Restore RT's material head */
+ rt_new_material_head(save_materp);
+
return GED_NULL;
+ }
if (strcmp(dbtype, disk ) == 0)
wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_DISK);
@@ -83,6 +95,9 @@
else if (strcmp(dbtype, inmem_append ) == 0)
wdbp = wdb_dbopen(dbip, RT_WDB_TYPE_DB_INMEM_APPEND_ONLY);
else {
+ /* Restore RT's material head */
+ rt_new_material_head(save_materp);
+
bu_log(wdb_open %s target type not recognized, dbtype);
return GED_NULL;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
___
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:[33432] brlcad/trunk/src
Revision: 33432 http://brlcad.svn.sourceforge.net/brlcad/?rev=33432view=rev Author: bob1961 Date: 2008-12-23 19:29:12 + (Tue, 23 Dec 2008) Log Message: --- Moved some initialization code for struct ged_view from libtclcad/ged_obj.c to libged/ged.c Modified Paths: -- brlcad/trunk/src/libged/ged.c brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libged/ged.c === --- brlcad/trunk/src/libged/ged.c 2008-12-23 19:24:17 UTC (rev 33431) +++ brlcad/trunk/src/libged/ged.c 2008-12-23 19:29:12 UTC (rev 33432) @@ -190,6 +190,65 @@ gvp-gv_maxMouseDelta = 20; gvp-gv_rscale = 0.4; gvp-gv_sscale = 2.0; + +gvp-gv_adc.gas_a1 = 45.0; +gvp-gv_adc.gas_a2 = 45.0; +VSET(gvp-gv_adc.gas_line_color, 255, 255, 0); +VSET(gvp-gv_adc.gas_tick_color, 255, 255, 255); + +VSET(gvp-gv_grid.ggs_anchor, 0.0, 0.0, 0.0); +gvp-gv_grid.ggs_res_h = 1.0; +gvp-gv_grid.ggs_res_v = 1.0; +gvp-gv_grid.ggs_res_major_h = 5; +gvp-gv_grid.ggs_res_major_v = 5; +VSET(gvp-gv_grid.ggs_color, 255, 255, 255); + +gvp-gv_rect.grs_draw = 0; +gvp-gv_rect.grs_pos[0] = 128; +gvp-gv_rect.grs_pos[1] = 128; +gvp-gv_rect.grs_dim[0] = 256; +gvp-gv_rect.grs_dim[1] = 256; +VSET(gvp-gv_rect.grs_color, 255, 255, 255); + +gvp-gv_view_axes.gas_draw = 0; +VSET(gvp-gv_view_axes.gas_axes_pos, 0.85, -0.85, 0.0); +gvp-gv_view_axes.gas_axes_size = 0.2; +gvp-gv_view_axes.gas_line_width = 0; +gvp-gv_view_axes.gas_pos_only = 1; +VSET(gvp-gv_view_axes.gas_axes_color, 255, 255, 255); +VSET(gvp-gv_view_axes.gas_label_color, 255, 255, 0); +gvp-gv_view_axes.gas_triple_color = 1; + +gvp-gv_model_axes.gas_draw = 0; +VSET(gvp-gv_model_axes.gas_axes_pos, 0.0, 0.0, 0.0); +gvp-gv_model_axes.gas_axes_size = 2.0; +gvp-gv_model_axes.gas_line_width = 0; +gvp-gv_model_axes.gas_pos_only = 0; +VSET(gvp-gv_model_axes.gas_axes_color, 255, 255, 255); +VSET(gvp-gv_model_axes.gas_label_color, 255, 255, 0); +gvp-gv_model_axes.gas_triple_color = 0; +gvp-gv_model_axes.gas_tick_enabled = 1; +gvp-gv_model_axes.gas_tick_length = 4; +gvp-gv_model_axes.gas_tick_major_length = 8; +gvp-gv_model_axes.gas_tick_interval = 100; +gvp-gv_model_axes.gas_ticks_per_major = 10; +gvp-gv_model_axes.gas_tick_threshold = 8; +VSET(gvp-gv_model_axes.gas_tick_color, 255, 255, 0); +VSET(gvp-gv_model_axes.gas_tick_major_color, 255, 0, 0); + +gvp-gv_center_dot.gos_draw = 0; +VSET(gvp-gv_center_dot.gos_line_color, 255, 255, 0); + +gvp-gv_prim_labels.gos_draw = 0; +VSET(gvp-gv_prim_labels.gos_text_color, 255, 255, 0); + +gvp-gv_view_params.gos_draw = 0; +VSET(gvp-gv_view_params.gos_text_color, 255, 255, 0); + +gvp-gv_view_scale.gos_draw = 0; +VSET(gvp-gv_view_scale.gos_line_color, 255, 255, 0); +VSET(gvp-gv_view_scale.gos_text_color, 255, 255, 255); + ged_view_update(gvp); } Modified: brlcad/trunk/src/libtclcad/ged_obj.c === --- brlcad/trunk/src/libtclcad/ged_obj.c2008-12-23 19:24:17 UTC (rev 33431) +++ brlcad/trunk/src/libtclcad/ged_obj.c2008-12-23 19:29:12 UTC (rev 33432) @@ -3603,65 +3603,6 @@ new_gdvp-gdv_fbs.fbs_clientData = new_gdvp; new_gdvp-gdv_fbs.fbs_interp = go_current_gop-go_interp; -new_gdvp-gdv_view-gv_adc.gas_a1 = 45.0; -new_gdvp-gdv_view-gv_adc.gas_a2 = 45.0; -VSET(new_gdvp-gdv_view-gv_adc.gas_line_color, 255, 255, 0); -VSET(new_gdvp-gdv_view-gv_adc.gas_tick_color, 255, 255, 255); - -VSET(new_gdvp-gdv_view-gv_grid.ggs_anchor, 0.0, 0.0, 0.0); -new_gdvp-gdv_view-gv_grid.ggs_res_h = 1.0; -new_gdvp-gdv_view-gv_grid.ggs_res_v = 1.0; -new_gdvp-gdv_view-gv_grid.ggs_res_major_h = 5; -new_gdvp-gdv_view-gv_grid.ggs_res_major_v = 5; -VSET(new_gdvp-gdv_view-gv_grid.ggs_color, 255, 255, 255); - -new_gdvp-gdv_view-gv_rect.grs_draw = 0; -new_gdvp-gdv_view-gv_rect.grs_pos[0] = 128; -new_gdvp-gdv_view-gv_rect.grs_pos[1] = 128; -new_gdvp-gdv_view-gv_rect.grs_dim[0] = 256; -new_gdvp-gdv_view-gv_rect.grs_dim[1] = 256; -VSET(new_gdvp-gdv_view-gv_rect.grs_color, 255, 255, 255); - -new_gdvp-gdv_view-gv_view_axes.gas_draw = 0; -VSET(new_gdvp-gdv_view-gv_view_axes.gas_axes_pos, 0.85, -0.85, 0.0); -new_gdvp-gdv_view-gv_view_axes.gas_axes_size = 0.2; -new_gdvp-gdv_view-gv_view_axes.gas_line_width = 0; -new_gdvp-gdv_view-gv_view_axes.gas_pos_only = 1; -VSET(new_gdvp-gdv_view-gv_view_axes.gas_axes_color, 255, 255, 255); -VSET(new_gdvp-gdv_view-gv_view_axes.gas_label_color, 255, 255, 0); -new_gdvp-gdv_view-gv_view_axes.gas_triple_color = 1; - -new_gdvp-gdv_view-gv_model_axes.gas_draw = 0; -VSET(new_gdvp-gdv_view-gv_model_axes.gas_axes_pos, 0.0, 0.0, 0.0); -new_gdvp-gdv_view-gv_model_axes.gas_axes_size
[brlcad-commits] SF.net SVN: brlcad:[33433] brlcad/trunk/src/libged/bigE.c
Revision: 33433 http://brlcad.svn.sourceforge.net/brlcad/?rev=33433view=rev Author: bob1961 Date: 2008-12-29 12:58:30 + (Mon, 29 Dec 2008) Log Message: --- Call ged_drawH_part2 instead of dgo_drawH_part2. Modified Paths: -- brlcad/trunk/src/libged/bigE.c Modified: brlcad/trunk/src/libged/bigE.c === --- brlcad/trunk/src/libged/bigE.c 2008-12-23 19:29:12 UTC (rev 33432) +++ brlcad/trunk/src/libged/bigE.c 2008-12-29 12:58:30 UTC (rev 33433) @@ -2347,7 +2347,7 @@ bu_ptbl_reset(dgcdp-leaf_list); ts.ts_mater = rp-reg_mater; db_string_to_path(path, gedp-ged_wdbp-dbip, rp-reg_name); - dgo_drawH_part2(0, vhead, path, ts, SOLID_NULL, dgcdp); + ged_drawH_part2(0, vhead, path, ts, SOLID_NULL, dgcdp); db_free_full_path(path); } /* do not do an rt_free_rti() (closes the database) */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- ___ 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:[33436] brlcad/trunk/src/libged/vutil.c
Revision: 33436 http://brlcad.svn.sourceforge.net/brlcad/?rev=33436view=rev Author: bob1961 Date: 2008-12-31 20:00:26 + (Wed, 31 Dec 2008) Log Message: --- Modified ged_view_update to call gv_callback. Modified Paths: -- brlcad/trunk/src/libged/vutil.c Modified: brlcad/trunk/src/libged/vutil.c === --- brlcad/trunk/src/libged/vutil.c 2008-12-31 19:59:00 UTC (rev 33435) +++ brlcad/trunk/src/libged/vutil.c 2008-12-31 20:00:26 UTC (rev 33436) @@ -66,12 +66,8 @@ /* apply the perspective angle to model2view */ bn_mat_mul(gvp-gv_pmodel2view, gvp-gv_pmat, gvp-gv_model2view); -#if 0 if (gvp-gv_callback) - (*gvp-gv_callback)(gvp-gv_clientData, gvp); -else if (oflag interp != (Tcl_Interp *)NULL) - bu_observer_notify(interp, gvp-gv_observers, bu_vls_addr(gvp-gv_name)); -#endif + (*gvp-gv_callback)(gvp, gvp-gv_clientData); } void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- ___ 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:[33438] brlcad/trunk/src/libged
Revision: 33438
http://brlcad.svn.sourceforge.net/brlcad/?rev=33438view=rev
Author: bob1961
Date: 2008-12-31 20:04:40 + (Wed, 31 Dec 2008)
Log Message:
---
Split out the arg parsing into separate functions.
Modified Paths:
--
brlcad/trunk/src/libged/arot.c
brlcad/trunk/src/libged/rot.c
brlcad/trunk/src/libged/scale.c
brlcad/trunk/src/libged/tra.c
Modified: brlcad/trunk/src/libged/arot.c
===
--- brlcad/trunk/src/libged/arot.c 2008-12-31 20:03:49 UTC (rev 33437)
+++ brlcad/trunk/src/libged/arot.c 2008-12-31 20:04:40 UTC (rev 33438)
@@ -33,9 +33,8 @@
#include ged_private.h
int
-ged_arot(struct ged *gedp, int argc, const char *argv[])
+ged_arot_args(struct ged *gedp, int argc, const char *argv[], mat_t rmat)
{
-mat_t rmat;
point_t pt;
vect_t axis;
fastf_t angle;
@@ -60,30 +59,41 @@
}
if (sscanf(argv[1], %lf, axis[X]) != 1) {
- bu_vls_printf(gedp-ged_result_str, ged_arot: bad X value - %s\n,
argv[1]);
+ bu_vls_printf(gedp-ged_result_str, %s: bad X value - %s\n, argv[0],
argv[1]);
return BRLCAD_ERROR;
}
if (sscanf(argv[2], %lf, axis[Y]) != 1) {
- bu_vls_printf(gedp-ged_result_str, ged_arot: bad Y value - %s\n,
argv[2]);
+ bu_vls_printf(gedp-ged_result_str, %s: bad Y value - %s\n, argv[0],
argv[2]);
return BRLCAD_ERROR;
}
if (sscanf(argv[3], %lf, axis[Z]) != 1) {
- bu_vls_printf(gedp-ged_result_str, ged_arot: bad Z value - %s\n,
argv[3]);
+ bu_vls_printf(gedp-ged_result_str, %s: bad Z value - %s\n, argv[0],
argv[3]);
return BRLCAD_ERROR;
}
if (sscanf(argv[4], %lf, angle) != 1) {
- bu_vls_printf(gedp-ged_result_str, ged_arot: bad angle - %s\n,
argv[4]);
+ bu_vls_printf(gedp-ged_result_str, %s: bad angle - %s\n, argv[0],
argv[4]);
return BRLCAD_ERROR;
}
VSETALL(pt, 0.0);
VUNITIZE(axis);
-
bn_mat_arb_rot(rmat, pt, axis, angle*bn_degtorad);
+return BRLCAD_OK;
+}
+
+int
+ged_arot(struct ged *gedp, int argc, const char *argv[])
+{
+int ret;
+mat_t rmat;
+
+if ((ret = ged_arot_args(gedp, argc, argv, rmat)) != BRLCAD_OK)
+ return ret;
+
return ged_do_rot(gedp, gedp-ged_gvp-gv_coord, rmat, (int (*)())0);
}
Modified: brlcad/trunk/src/libged/rot.c
===
--- brlcad/trunk/src/libged/rot.c 2008-12-31 20:03:49 UTC (rev 33437)
+++ brlcad/trunk/src/libged/rot.c 2008-12-31 20:04:40 UTC (rev 33438)
@@ -33,11 +33,9 @@
#include ged_private.h
int
-ged_rot(struct ged *gedp, int argc, const char *argv[])
+ged_rot_args(struct ged *gedp, int argc, const char *argv[], char *coord,
mat_t rmat)
{
vect_t rvec;
-mat_t rmat;
-char coord;
static const char *usage = [-m|-v] x y z;
GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
@@ -55,11 +53,11 @@
/* process possible coord flag */
if (argv[1][0] == '-' (argv[1][1] == 'v' || argv[1][1] == 'm')
argv[1][2] == '\0') {
- coord = argv[1][1];
+ *coord = argv[1][1];
--argc;
++argv;
} else
- coord = gedp-ged_gvp-gv_coord;
+ *coord = gedp-ged_gvp-gv_coord;
if (argc != 2 argc != 4) {
bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
@@ -91,6 +89,19 @@
VSCALE(rvec, rvec, -1.0);
bn_mat_angles(rmat, rvec[X], rvec[Y], rvec[Z]);
+return BRLCAD_OK;
+}
+
+int
+ged_rot(struct ged *gedp, int argc, const char *argv[])
+{
+int ret;
+char coord;
+mat_t rmat;
+
+if ((ret = ged_rot_args(gedp, argc, argv, coord, rmat)) != BRLCAD_OK)
+ return ret;
+
return ged_do_rot(gedp, coord, rmat, (int (*)())0);
}
Modified: brlcad/trunk/src/libged/scale.c
===
--- brlcad/trunk/src/libged/scale.c 2008-12-31 20:03:49 UTC (rev 33437)
+++ brlcad/trunk/src/libged/scale.c 2008-12-31 20:04:40 UTC (rev 33438)
@@ -34,9 +34,8 @@
int
-ged_scale(struct ged *gedp, int argc, const char *argv[])
+ged_scale_args(struct ged *gedp, int argc, const char *argv[], fastf_t *sf)
{
-fastf_t sf;
static const char *usage = sf;
GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
@@ -49,32 +48,44 @@
/* must be wanting help */
if (argc == 1) {
bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
- return BRLCAD_OK;
+ return BRLCAD_HELP;
}
-/* scale the view */
-if (argc == 2) {
- if (sscanf(argv[1], %lf, sf) != 1) {
- bu_vls_printf(gedp-ged_result_str, bad scale factor - %s,
argv[1]);
- return BRLCAD_ERROR;
- }
+if (argc != 2) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return BRLCAD_ERROR;
+}
- if (sf = SMALL_FASTF || INFINITY sf)
- return
[brlcad-commits] SF.net SVN: brlcad:[33452] brlcad/trunk/src/mged
Revision: 33452
http://brlcad.svn.sourceforge.net/brlcad/?rev=33452view=rev
Author: bob1961
Date: 2009-01-05 16:30:10 + (Mon, 05 Jan 2009)
Log Message:
---
Mods to use libged's ged_analyze.
Modified Paths:
--
brlcad/trunk/src/mged/Makefile.am
brlcad/trunk/src/mged/setup.c
Removed Paths:
-
brlcad/trunk/src/mged/anal.c
Modified: brlcad/trunk/src/mged/Makefile.am
===
--- brlcad/trunk/src/mged/Makefile.am 2009-01-05 15:30:58 UTC (rev 33451)
+++ brlcad/trunk/src/mged/Makefile.am 2009-01-05 16:30:10 UTC (rev 33452)
@@ -56,7 +56,6 @@
mged_SOURCES = \
adc.c \
- anal.c \
animedit.c \
arbs.c \
attach.c \
Deleted: brlcad/trunk/src/mged/anal.c
===
--- brlcad/trunk/src/mged/anal.c2009-01-05 15:30:58 UTC (rev 33451)
+++ brlcad/trunk/src/mged/anal.c2009-01-05 16:30:10 UTC (rev 33452)
@@ -1,986 +0,0 @@
-/* A N A L . C
- * BRL-CAD
- *
- * Copyright (c) 1985-2008 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 anal.c
- *
- */
-
-#include common.h
-
-#include stdio.h
-#include math.h
-
-#include bio.h
-#include bu.h
-#include vmath.h
-#include bn.h
-#include ./sedit.h
-#include raytrace.h
-#include rtgeom.h
-#include ./mged.h
-#include ./mged_dm.h
-
-
-/* Conversion factor for Gallons to cubic millimeters */
-#define GALLONS_TO_MM3 3785411.784
-
-extern struct rt_db_internal es_int;
-
-static voiddo_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidarb_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static double anal_face(struct bu_vls *vp, int face, fastf_t *center_pt,
const struct rt_arb_internal *arb, int type, const struct bn_tol *tol);
-static voidanal_edge(struct bu_vls *vp, int edge, const struct
rt_arb_internal *arb, int type);
-static double find_vol(int loc, struct rt_arb_internal *arb, struct bn_tol
*tol);
-static voidtgc_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidhyp_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidell_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidtor_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidars_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidrpc_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidrhc_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidpart_anal(struct bu_vls *vp, const struct rt_db_internal *ip);
-static voidsuperell_anal(struct bu_vls *vp, const struct rt_db_internal
*ip);
-
-/*
- * F _ A N A L Y Z E
- *
- * Analyze command - prints loads of info about a solid
- * Format: analyze [name]
- * if 'name' is missing use solid being edited
- */
-
-int
-f_analyze(ClientData clientData, Tcl_Interp *interp, int argc, char **argv)
-{
-register struct directory *ndp;
-mat_t new_mat;
-register int i;
-struct bu_vls v;
-struct rt_db_internal intern;
-
-CHECK_DBI_NULL;
-
-if (argc 1) {
- struct bu_vls vls;
-
- bu_vls_init(vls);
- bu_vls_printf(vls, help analyze);
- Tcl_Eval(interp, bu_vls_addr(vls));
- bu_vls_free(vls);
- return TCL_ERROR;
-}
-
-bu_vls_init(v);
-
-if ( argc == 1 ) {
- /* use the solid being edited */
- if (illump == SOLID_NULL) {
- state_err( Default SOLID Analyze );
- return TCL_ERROR;
- }
- ndp = LAST_SOLID(illump);
- if (illump-s_Eflag) {
- Tcl_AppendResult(interp, analyze: cannot analyze evaluated region
containing ,
-ndp-d_namep, \n, (char *)NULL);
- return TCL_ERROR;
- }
- switch ( state ) {
- case ST_S_EDIT:
- /* Use already modified version. new way */
- do_anal(v, es_int);
- Tcl_AppendResult(interp, bu_vls_addr(v), (char *)NULL);
- bu_vls_free(v);
- return TCL_OK;
-
- case ST_O_EDIT:
- /* use solid at bottom of path */
- break
[brlcad-commits] SF.net SVN: brlcad:[33498] brlcad/trunk/src/libged/make.c
Revision: 33498
http://brlcad.svn.sourceforge.net/brlcad/?rev=33498view=rev
Author: bob1961
Date: 2009-01-09 19:50:30 + (Fri, 09 Jan 2009)
Log Message:
---
Tweak the parameters of the following primitives to give better results wrt the
view: grip, hyp, part, rcc, rec, rhc, rpc, tec, tgc, trc and all arbs
Modified Paths:
--
brlcad/trunk/src/libged/make.c
Modified: brlcad/trunk/src/libged/make.c
===
--- brlcad/trunk/src/libged/make.c 2009-01-09 19:45:38 UTC (rev 33497)
+++ brlcad/trunk/src/libged/make.c 2009-01-09 19:50:30 UTC (rev 33498)
@@ -143,9 +143,9 @@
arb_ip = (struct rt_arb_internal *)internal.idb_ptr;
arb_ip-magic = RT_ARB_INTERNAL_MAGIC;
VSET(arb_ip-pt[0] ,
-origin[X] +scale,
-origin[Y] -scale,
-origin[Z] -scale);
+origin[X] + 0.5*scale,
+origin[Y] - 0.5*scale,
+origin[Z] - 0.5*scale);
for (i=1; i8; i++)
VMOVE(arb_ip-pt[i], arb_ip-pt[0]);
arb_ip-pt[1][Y] += scale;
@@ -166,9 +166,9 @@
arb_ip = (struct rt_arb_internal *)internal.idb_ptr;
arb_ip-magic = RT_ARB_INTERNAL_MAGIC;
VSET(arb_ip-pt[0] ,
-origin[X] + scale,
-origin[Y] - scale,
-origin[Z] - 0.5*scale);
+origin[X] + 0.5*scale,
+origin[Y] - 0.5*scale,
+origin[Z] - 0.25*scale);
for (i=1; i8; i++)
VMOVE(arb_ip-pt[i], arb_ip-pt[0]);
arb_ip-pt[1][Y] += scale;
@@ -188,9 +188,9 @@
arb_ip = (struct rt_arb_internal *)internal.idb_ptr;
arb_ip-magic = RT_ARB_INTERNAL_MAGIC;
VSET(arb_ip-pt[0],
-origin[X] +scale,
-origin[Y] -scale,
-origin[Z] -scale);
+origin[X] + 0.5*scale,
+origin[Y] - 0.5*scale,
+origin[Z] - 0.5*scale);
for (i=1; i8; i++)
VMOVE(arb_ip-pt[i], arb_ip-pt[0]);
arb_ip-pt[1][Y] += scale;
@@ -213,9 +213,9 @@
arb_ip = (struct rt_arb_internal *)internal.idb_ptr;
arb_ip-magic = RT_ARB_INTERNAL_MAGIC;
VSET(arb_ip-pt[0] ,
-origin[X] + scale,
-origin[Y] - scale,
-origin[Z] - scale);
+origin[X] + 0.5*scale,
+origin[Y] - 0.5*scale,
+origin[Z] - 0.5*scale);
for (i=1; i8; i++)
VMOVE(arb_ip-pt[i], arb_ip-pt[0]);
arb_ip-pt[1][Y] += scale;
@@ -236,9 +236,9 @@
arb_ip = (struct rt_arb_internal *)internal.idb_ptr;
arb_ip-magic = RT_ARB_INTERNAL_MAGIC;
VSET(arb_ip-pt[0] ,
-origin[X] +scale,
-origin[Y] -scale,
-origin[Z] -scale);
+origin[X] + 0.5*scale,
+origin[Y] - 0.5*scale,
+origin[Z] - 0.5*scale);
for (i=1; i8; i++)
VMOVE(arb_ip-pt[i], arb_ip-pt[0]);
arb_ip-pt[1][Y] += scale;
@@ -360,7 +360,7 @@
VSET(grp_ip-center, origin[X], origin[Y],
origin[Z]);
VSET(grp_ip-normal, 1.0, 0.0, 0.0);
- grp_ip-mag = scale;
+ grp_ip-mag = 0.375*scale;
} else if (strcmp(argv[bu_optind+1], ell1) == 0) {
internal.idb_major_type = DB5_MAJORTYPE_BRLCAD;
internal.idb_type = ID_ELL;
@@ -404,12 +404,12 @@
internal.idb_ptr = (genptr_t)bu_malloc(sizeof(struct rt_tgc_internal),
rt_tgc_internal);
tgc_ip = (struct rt_tgc_internal *)internal.idb_ptr;
tgc_ip-magic = RT_TGC_INTERNAL_MAGIC;
- VSET(tgc_ip-v, origin[X], origin[Y], origin[Z]-scale);
+ VSET(tgc_ip-v, origin[X], origin[Y], origin[Z]-0.5*scale);
VSET(tgc_ip-h, 0.0, 0.0, scale);
- VSET(tgc_ip-a, 0.5*scale, 0.0, 0.0);
- VSET(tgc_ip-b, 0.0, 0.25*scale, 0.0);
- VSET(tgc_ip-c, 0.25*scale, 0.0, 0.0);
- VSET(tgc_ip-d, 0.0, 0.5*scale, 0.0);
+ VSET(tgc_ip-a, 0.25*scale, 0.0, 0.0);
+ VSET(tgc_ip-b, 0.0, 0.125*scale, 0.0);
+ VSET(tgc_ip-c, 0.125*scale, 0.0, 0.0);
+ VSET(tgc_ip-d, 0.0, 0.25*scale, 0.0);
} else if (strcmp(argv[bu_optind+1], tec) == 0) {
internal.idb_major_type = DB5_MAJORTYPE_BRLCAD;
internal.idb_type = ID_TGC;
@@ -417,12 +417,12 @@
internal.idb_ptr = (genptr_t)bu_malloc(sizeof(struct rt_tgc_internal),
rt_tgc_internal);
tgc_ip = (struct rt_tgc_internal *)internal.idb_ptr;
tgc_ip-magic = RT_TGC_INTERNAL_MAGIC;
- VSET(tgc_ip-v, origin[X], origin[Y], origin[Z]-scale);
+ VSET(tgc_ip-v, origin[X], origin[Y], origin[Z]-0.5*scale);
VSET(tgc_ip-h, 0.0, 0.0, scale);
- VSET(tgc_ip-a, 0.5*scale, 0.0, 0.0);
- VSET(tgc_ip-b, 0.0, 0.25*scale, 0.0);
- VSET(tgc_ip-c, 0.25*scale, 0.0, 0.0);
- VSET(tgc_ip-d, 0.0, (0.125*scale), 0.0);
+ VSET(tgc_ip-a, 0.25*scale, 0.0, 0.0);
+ VSET(tgc_ip-b, 0.0, 0.125*scale, 0.0);
+ VSET(tgc_ip-c, 0.125*scale
[brlcad-commits] SF.net SVN: brlcad:[33503] brlcad/trunk/src/libged/scale.c
Revision: 33503
http://brlcad.svn.sourceforge.net/brlcad/?rev=33503view=rev
Author: bob1961
Date: 2009-01-09 20:32:37 + (Fri, 09 Jan 2009)
Log Message:
---
Fixed the sscanf statement in ged_scale_args.
Modified Paths:
--
brlcad/trunk/src/libged/scale.c
Modified: brlcad/trunk/src/libged/scale.c
===
--- brlcad/trunk/src/libged/scale.c 2009-01-09 20:11:39 UTC (rev 33502)
+++ brlcad/trunk/src/libged/scale.c 2009-01-09 20:32:37 UTC (rev 33503)
@@ -56,7 +56,7 @@
return BRLCAD_ERROR;
}
-if (sscanf(argv[1], %lf, sf) != 1) {
+if (sscanf(argv[1], %lf, sf) != 1) {
bu_vls_printf(gedp-ged_result_str, bad scale factor - %s, argv[1]);
return BRLCAD_ERROR;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
___
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:[33511] brlcad/trunk/src/mged
Revision: 33511
http://brlcad.svn.sourceforge.net/brlcad/?rev=33511view=rev
Author: bob1961
Date: 2009-01-09 21:45:55 + (Fri, 09 Jan 2009)
Log Message:
---
A little cleanup and a minor mod that fixes a solid edit illumination problem
that crept in with the push to use libged.
Modified Paths:
--
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/mged/setup.c
Modified: brlcad/trunk/src/mged/attach.c
===
--- brlcad/trunk/src/mged/attach.c 2009-01-09 21:41:01 UTC (rev 33510)
+++ brlcad/trunk/src/mged/attach.c 2009-01-09 21:45:55 UTC (rev 33511)
@@ -688,9 +688,7 @@
*view_state = *initial_dm_list-dml_view_state;/*
struct copy */
BU_GETSTRUCT(view_state-vs_gvp, ged_view);
*view_state-vs_gvp = *initial_dm_list-dml_view_state-vs_gvp;/*
struct copy */
-#if 0
-view_state-vs_gvp-gv_clientData = view_state;
-#endif
+view_state-vs_gvp-gv_clientData = (genptr_t)view_state;
view_state-vs_rc = 1;
view_ring_init(curr_dm_list-dml_view_state, (struct _view_state *)NULL);
Modified: brlcad/trunk/src/mged/mged.c
===
--- brlcad/trunk/src/mged/mged.c2009-01-09 21:41:01 UTC (rev 33510)
+++ brlcad/trunk/src/mged/mged.c2009-01-09 21:45:55 UTC (rev 33511)
@@ -2376,7 +2376,6 @@
struct _view_state *vsp = (struct _view_state *)clientData;
if (state != ST_VIEW) {
- bu_log(XXXmged_view_obj_callback: updating model2objview and
objview2model\n);
bn_mat_mul(vsp-vs_model2objview, gvp-gv_model2view, modelchanges);
bn_mat_inv(vsp-vs_objview2model, vsp-vs_model2objview);
}
Modified: brlcad/trunk/src/mged/setup.c
===
--- brlcad/trunk/src/mged/setup.c 2009-01-09 21:41:01 UTC (rev 33510)
+++ brlcad/trunk/src/mged/setup.c 2009-01-09 21:45:55 UTC (rev 33511)
@@ -558,9 +558,6 @@
view_state-vs_gvp-gv_callback = mged_view_callback;
view_state-vs_gvp-gv_clientData = (genptr_t)view_state;
-view_state-vs_gvp-gv_scale = 500;
-view_state-vs_gvp-gv_size = 2.0 * view_state-vs_gvp-gv_scale;
-view_state-vs_gvp-gv_isize = 1.0 / view_state-vs_gvp-gv_size;
MAT_DELTAS_GET_NEG(view_state-vs_orig_pos, view_state-vs_gvp-gv_center);
/* register commands */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
___
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:[33510] brlcad/trunk/src/libged/ged.c
Revision: 33510 http://brlcad.svn.sourceforge.net/brlcad/?rev=33510view=rev Author: bob1961 Date: 2009-01-09 21:41:01 + (Fri, 09 Jan 2009) Log Message: --- Set initial view scale to 500. Modified Paths: -- brlcad/trunk/src/libged/ged.c Modified: brlcad/trunk/src/libged/ged.c === --- brlcad/trunk/src/libged/ged.c 2009-01-09 21:34:05 UTC (rev 33509) +++ brlcad/trunk/src/libged/ged.c 2009-01-09 21:41:01 UTC (rev 33510) @@ -139,7 +139,7 @@ if (gvp == GED_VIEW_NULL) return; -gvp-gv_scale = 1.0; +gvp-gv_scale = 500.0; gvp-gv_size = 2.0 * gvp-gv_scale; gvp-gv_isize = 1.0 / gvp-gv_size; VSET(gvp-gv_eye_pos, 0.0, 0.0, 1.0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Check out the new SourceForge.net Marketplace. It is the best place to buy or sell services for just about anything Open Source. http://p.sf.net/sfu/Xq1LFB ___ 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:[33546] brlcad/trunk/src/shapes/picket_fence.c
Revision: 33546
http://brlcad.svn.sourceforge.net/brlcad/?rev=33546view=rev
Author: bob1961
Date: 2009-01-14 16:24:39 + (Wed, 14 Jan 2009)
Log Message:
---
Initialization not needed on these character arrays (i.e. they're inititialized
below before being used). Besides, windows doesn't like it.
Modified Paths:
--
brlcad/trunk/src/shapes/picket_fence.c
Modified: brlcad/trunk/src/shapes/picket_fence.c
===
--- brlcad/trunk/src/shapes/picket_fence.c 2009-01-14 05:41:30 UTC (rev
33545)
+++ brlcad/trunk/src/shapes/picket_fence.c 2009-01-14 16:24:39 UTC (rev
33546)
@@ -38,12 +38,12 @@
long i, j, k, l;
struct rt_wdb *fp_db = NULL;
-char name[256] = {};
-char pname[256] = {};
-char w1name[256] = {};
-char w2name[256] = {};
-char firstname[256] = {};
-char prefix[256] = {};
+char name[256];
+char pname[256];
+char w1name[256];
+char w2name[256];
+char firstname[256];
+char prefix[256];
struct wmember wm;
struct wmember wm2;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
___
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:[33548] brlcad/trunk/src/libged
Revision: 33548
http://brlcad.svn.sourceforge.net/brlcad/?rev=33548view=rev
Author: bob1961
Date: 2009-01-14 16:43:04 + (Wed, 14 Jan 2009)
Log Message:
---
Add code to prevent interrupts during database writes.
Modified Paths:
--
brlcad/trunk/src/libged/inside.c
brlcad/trunk/src/libged/typein.c
Modified: brlcad/trunk/src/libged/inside.c
===
--- brlcad/trunk/src/libged/inside.c2009-01-14 16:27:58 UTC (rev 33547)
+++ brlcad/trunk/src/libged/inside.c2009-01-14 16:43:04 UTC (rev 33548)
@@ -27,6 +27,7 @@
#include bio.h
#include stdlib.h
+#include signal.h
#include ctype.h
#include math.h
#include string.h
@@ -917,6 +918,7 @@
char *newname;
int arg = 1;
static const char *usage = out_prim in_prim th(s);
+void (*cur_sigint)();
GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
@@ -1171,16 +1173,28 @@
return BRLCAD_ERROR;
}
+/* don't allow interrupts while we update the database! */
+cur_sigint = signal(SIGINT, SIG_IGN);
+
/* Add to in-core directory */
if ( (dp = db_diradd( gedp-ged_wdbp-dbip, newname, -1, 0, DIR_SOLID,
(genptr_t)intern.idb_type )) == DIR_NULL ) {
+ /* restore the handler before returning */
+ (void)signal(SIGINT, cur_sigint);
+
bu_vls_printf(gedp-ged_result_str, %s: Database alloc error,
aborting\n, argv[0]);
return BRLCAD_ERROR;
}
if ( rt_db_put_internal( dp, gedp-ged_wdbp-dbip, intern,
rt_uniresource ) 0 ) {
+ /* restore the handler before returning */
+ (void)signal(SIGINT, cur_sigint);
+
bu_vls_printf(gedp-ged_result_str, %s: Database write error,
aborting\n, argv[0]);
return BRLCAD_ERROR;
}
+/* restore the handler before returning */
+(void)signal(SIGINT, cur_sigint);
+
return BRLCAD_OK;
}
Modified: brlcad/trunk/src/libged/typein.c
===
--- brlcad/trunk/src/libged/typein.c2009-01-14 16:27:58 UTC (rev 33547)
+++ brlcad/trunk/src/libged/typein.c2009-01-14 16:43:04 UTC (rev 33548)
@@ -28,6 +28,7 @@
#include bio.h
#include stdlib.h
+#include signal.h
#include ctype.h
#include string.h
@@ -2694,6 +2695,7 @@
struct rt_db_internal internal;
char **menu;
int nvals, (*fn_in)();
+void (*cur_sigint)();
GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
GED_CHECK_READ_ONLY(gedp, BRLCAD_ERROR);
@@ -2987,17 +2989,29 @@
do_new_update:
/* The function may have already written via LIBWDB */
if ( internal.idb_ptr != NULL ) {
+ /* don't allow interrupts while we update the database! */
+ cur_sigint = signal(SIGINT, SIG_IGN);
+
if ( (dp=db_diradd( gedp-ged_wdbp-dbip, name, -1L, 0, DIR_SOLID,
(genptr_t)internal.idb_type)) == DIR_NULL ) {
+ /* restore the handler before returning */
+ (void)signal(SIGINT, cur_sigint);
+
rt_db_free_internal( internal, rt_uniresource );
bu_vls_printf(gedp-ged_result_str, %s: Cannot add '%s' to
directory\n, argv[0], name);
return BRLCAD_ERROR;
}
if ( rt_db_put_internal( dp, gedp-ged_wdbp-dbip, internal,
rt_uniresource ) 0 )
{
+ /* restore the handler before returning */
+ (void)signal(SIGINT, cur_sigint);
+
rt_db_free_internal( internal, rt_uniresource );
bu_vls_printf(gedp-ged_result_str, %s: Database write error,
aborting\n, argv[0]);
return BRLCAD_ERROR;
}
+
+ /* restore the handler before returning */
+ (void)signal(SIGINT, cur_sigint);
}
return BRLCAD_OK;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
___
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:[33553] brlcad/trunk/misc/win32-msvc8
Revision: 33553 http://brlcad.svn.sourceforge.net/brlcad/?rev=33553view=rev Author: bob1961 Date: 2009-01-14 17:29:42 + (Wed, 14 Jan 2009) Log Message: --- Updates to get things compiling on Windows. Modified Paths: -- brlcad/trunk/misc/win32-msvc8/fence/fence.vcproj brlcad/trunk/misc/win32-msvc8/mged/mged.vcproj brlcad/trunk/misc/win32-msvc8/picket_fence/picket_fence.vcproj brlcad/trunk/misc/win32-msvc8/tire/tire.vcproj Modified: brlcad/trunk/misc/win32-msvc8/fence/fence.vcproj === --- brlcad/trunk/misc/win32-msvc8/fence/fence.vcproj2009-01-14 17:26:58 UTC (rev 33552) +++ brlcad/trunk/misc/win32-msvc8/fence/fence.vcproj2009-01-14 17:29:42 UTC (rev 33553) @@ -222,7 +222,7 @@ Filter=cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp File - RelativePath=..\..\..\src\proc-db\fence.c + RelativePath=..\..\..\src\shapes\fence.c /File /Filter Modified: brlcad/trunk/misc/win32-msvc8/mged/mged.vcproj === --- brlcad/trunk/misc/win32-msvc8/mged/mged.vcproj 2009-01-14 17:26:58 UTC (rev 33552) +++ brlcad/trunk/misc/win32-msvc8/mged/mged.vcproj 2009-01-14 17:29:42 UTC (rev 33553) @@ -226,10 +226,6 @@ /File File - RelativePath=..\..\..\src\mged\anal.c - - /File - File RelativePath=..\..\..\src\mged\animedit.c /File @@ -350,10 +346,6 @@ /File File - RelativePath=..\..\..\src\mged\inside.c - - /File - File RelativePath=..\..\..\src\mged\mater.c /File @@ -398,10 +390,6 @@ /File File - RelativePath=..\..\..\src\mged\red.c - - /File - File RelativePath=..\..\..\src\mged\rtif.c /File @@ -438,10 +426,6 @@ /File File - RelativePath=..\..\..\src\mged\typein.c - - /File - File RelativePath=..\..\..\src\mged\update.c /File Modified: brlcad/trunk/misc/win32-msvc8/picket_fence/picket_fence.vcproj === --- brlcad/trunk/misc/win32-msvc8/picket_fence/picket_fence.vcproj 2009-01-14 17:26:58 UTC (rev 33552) +++ brlcad/trunk/misc/win32-msvc8/picket_fence/picket_fence.vcproj 2009-01-14 17:29:42 UTC (rev 33553) @@ -78,7 +78,7 @@ / Tool Name=VCLinkerTool - AdditionalDependencies=libbu.lib libbn.lib libsysv.lib librt.lib libwdb.lib tcl85.lib + AdditionalDependencies=libbu.lib libbn.lib libsysv.lib librt.lib libwdb.lib tcl85.lib libged.lib OutputFile=$(PlatformName)\$(ConfigurationName)/picket_fence.exe LinkIncremental=1 SuppressStartupBanner=true @@ -222,7 +222,7 @@ Filter=cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp File - RelativePath=..\..\..\src\proc-db\picket_fence.c + RelativePath=..\..\..\src\shapes\picket_fence.c /File /Filter Modified: brlcad/trunk/misc/win32-msvc8/tire/tire.vcproj === --- brlcad/trunk/misc/win32-msvc8/tire/tire.vcproj 2009-01-14 17:26:58 UTC (rev 33552) +++ brlcad/trunk/misc/win32-msvc8/tire/tire.vcproj 2009-01-14 17:29:42 UTC (rev 33553) @@ -78,7 +78,7 @@ / Tool Name=VCLinkerTool - AdditionalDependencies=libbu.lib libbn.lib
[brlcad-commits] SF.net SVN: brlcad:[33555] brlcad/trunk/NEWS
Revision: 33555 http://brlcad.svn.sourceforge.net/brlcad/?rev=33555view=rev Author: bob1961 Date: 2009-01-14 18:23:57 + (Wed, 14 Jan 2009) Log Message: --- Updates to reflect change in MGED's inside command. Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2009-01-14 17:35:39 UTC (rev 33554) +++ brlcad/trunk/NEWS 2009-01-14 18:23:57 UTC (rev 33555) @@ -14,6 +14,8 @@ --- 2008-XX-XX Release 7.XX.X --- -- +* mged's inside command no longer uses the geometry currently being + edited for the outside solid - Bob Parker * reported and fixed mged documentation eto typein bug - Robert Penny * fixed mged itcl.tcl startup failure prior to install - Sean Morrison * fixed bot_dump -u command line option for setting units - Bob Parker This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword ___ 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:[33556] brlcad/trunk/src/libtclcad/ged_obj.c
Revision: 33556 http://brlcad.svn.sourceforge.net/brlcad/?rev=33556view=rev Author: bob1961 Date: 2009-01-14 18:24:44 + (Wed, 14 Jan 2009) Log Message: --- Minor mod. Modified Paths: -- brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libtclcad/ged_obj.c === --- brlcad/trunk/src/libtclcad/ged_obj.c2009-01-14 18:23:57 UTC (rev 33555) +++ brlcad/trunk/src/libtclcad/ged_obj.c2009-01-14 18:24:44 UTC (rev 33556) @@ -5008,7 +5008,7 @@ bu_vls_free(temp); for (i = 0; i ac; ++i) - bu_free((void *)av[i], go_in); + bu_free((void *)av[i], go_more_args_func); return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword ___ 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:[33594] brlcad/trunk/src/libbu/interrupt.c
Revision: 33594 http://brlcad.svn.sourceforge.net/brlcad/?rev=33594view=rev Author: bob1961 Date: 2009-01-23 15:23:35 + (Fri, 23 Jan 2009) Log Message: --- Need to include bu.h for Windows. Modified Paths: -- brlcad/trunk/src/libbu/interrupt.c Modified: brlcad/trunk/src/libbu/interrupt.c === --- brlcad/trunk/src/libbu/interrupt.c 2009-01-23 05:38:45 UTC (rev 33593) +++ brlcad/trunk/src/libbu/interrupt.c 2009-01-23 15:23:35 UTC (rev 33594) @@ -30,7 +30,9 @@ #include signal.h #include assert.h +#include bu.h + /* hard-coded maximum signal number we can defer due to array we're * using for quick O(1) access in a single container for all signals. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword ___ 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:[33606] brlcad/trunk
Revision: 33606
http://brlcad.svn.sourceforge.net/brlcad/?rev=33606view=rev
Author: bob1961
Date: 2009-01-26 19:36:48 + (Mon, 26 Jan 2009)
Log Message:
---
Added the following functions to libged (also modified MGED to use them):
ged_debugbu, ged_debugdir, ged_debuglib, ged_debugmem and ged_debugnmg.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/src/libged/Makefile.am
brlcad/trunk/src/mged/chgview.c
brlcad/trunk/src/mged/dir.c
brlcad/trunk/src/mged/setup.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2009-01-25 16:41:48 UTC (rev 33605)
+++ brlcad/trunk/include/ged.h 2009-01-26 19:36:48 UTC (rev 33606)
@@ -1387,6 +1387,51 @@
GED_EXPORT BU_EXTERN(int ged_dbip, (struct ged *gedp, int argc, const char
*argv[]));
/**
+ * Set/get libbu's debug bit vector
+ *
+ * Usage:
+ * debugbu [hex_code]
+ *
+ */
+GED_EXPORT BU_EXTERN(int ged_debugbu, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
+ * Dump of the database's directory
+ *
+ * Usage:
+ * debugdir
+ *
+ */
+GED_EXPORT BU_EXTERN(int ged_debugdir, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
+ * Set/get librt's debug bit vector
+ *
+ * Usage:
+ * debuglib [hex_code]
+ *
+ */
+GED_EXPORT BU_EXTERN(int ged_debuglib, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
+ * Provides user-level access to LIBBU's bu_prmem()
+ *
+ * Usage:
+ * debugmem
+ *
+ */
+GED_EXPORT BU_EXTERN(int ged_debugmem, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
+ * Set/get librt's NMG debug bit vector
+ *
+ * Usage:
+ * debugnmg [hex_code]
+ *
+ */
+GED_EXPORT BU_EXTERN(int ged_debugnmg, (struct ged *gedp, int argc, const char
*argv[]));
+
+/**
* Decompose nmg_solid into maximally connected shells
*
* Usage:
Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2009-01-25 16:41:48 UTC
(rev 33605)
+++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2009-01-26 19:36:48 UTC
(rev 33606)
@@ -378,6 +378,26 @@
/File
File
+ RelativePath=..\..\..\src\libged\debugbu.c
+
+ /File
+ File
+ RelativePath=..\..\..\src\libged\debugdir.c
+
+ /File
+ File
+ RelativePath=..\..\..\src\libged\debuglib.c
+
+ /File
+ File
+ RelativePath=..\..\..\src\libged\debugmem.c
+
+ /File
+ File
+ RelativePath=..\..\..\src\libged\debugnmg.c
+
+ /File
+ File
RelativePath=..\..\..\src\libged\decompose.c
/File
Modified: brlcad/trunk/src/libged/Makefile.am
===
--- brlcad/trunk/src/libged/Makefile.am 2009-01-25 16:41:48 UTC (rev 33605)
+++ brlcad/trunk/src/libged/Makefile.am 2009-01-26 19:36:48 UTC (rev 33606)
@@ -41,6 +41,11 @@
copyeval.c \
cpi.c \
dbip.c \
+ debugbu.c \
+ debugdir.c \
+ debuglib.c \
+ debugmem.c \
+ debugnmg.c \
decompose.c \
delay.c \
dg_obj.c \
Modified: brlcad/trunk/src/mged/chgview.c
===
--- brlcad/trunk/src/mged/chgview.c 2009-01-25 16:41:48 UTC (rev 33605)
+++ brlcad/trunk/src/mged/chgview.c 2009-01-26 19:36:48 UTC (rev 33606)
@@ -603,152 +603,6 @@
}
/*
- * F _ D E B U G B U
- *
- * Provide user-level access to LIBBU debug bit vector.
- */
-int
-f_debugbu(ClientData clientData,
- Tcl_Interp*interp,
- int argc,
- char **argv)
-{
-struct bu_vls vls;
-
-bu_vls_init(vls);
-
-if (argc 1 || 2 argc) {
- bu_vls_printf(vls, help debugbu);
- Tcl_Eval(interp, bu_vls_addr(vls));
- bu_vls_free(vls);
- return TCL_ERROR;
-}
-
-
-if ( argc = 2 ) {
- sscanf( argv[1], %x, (unsigned int *)bu_debug );
-} else {
- bu_vls_printb(vls, Possible flags, 0xL, BU_DEBUG_FORMAT );
- bu_vls_printf(vls, \n);
-}
-bu_vls_printb(vls, bu_debug, bu_debug, BU_DEBUG_FORMAT );
-bu_vls_printf(vls, \n);
-
-Tcl_AppendResult
[brlcad-commits] SF.net SVN: brlcad:[33607] brlcad/trunk/src/libged
Revision: 33607
http://brlcad.svn.sourceforge.net/brlcad/?rev=33607view=rev
Author: bob1961
Date: 2009-01-26 22:06:20 + (Mon, 26 Jan 2009)
Log Message:
---
Oops, forgot to add the new source files for the last libged upgrade.
Added Paths:
---
brlcad/trunk/src/libged/debugbu.c
brlcad/trunk/src/libged/debugdir.c
brlcad/trunk/src/libged/debuglib.c
brlcad/trunk/src/libged/debugmem.c
brlcad/trunk/src/libged/debugnmg.c
Added: brlcad/trunk/src/libged/debugbu.c
===
--- brlcad/trunk/src/libged/debugbu.c (rev 0)
+++ brlcad/trunk/src/libged/debugbu.c 2009-01-26 22:06:20 UTC (rev 33607)
@@ -0,0 +1,80 @@
+/* D E B U G B U . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008-2009 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library 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 library 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 debugbu.c
+ *
+ * The debugbu command.
+ *
+ */
+
+#include common.h
+#include bio.h
+
+#include stdlib.h
+#include ctype.h
+#include string.h
+
+#include ged_private.h
+
+
+int
+ged_debugbu(struct ged *gedp, int argc, const char *argv[])
+{
+fastf_t size;
+static const char *usage = [hex_code];
+
+GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+GED_CHECK_ARGC_GT_0(gedp, argc, BRLCAD_ERROR);
+
+/* initialize result */
+bu_vls_trunc(gedp-ged_result_str, 0);
+
+if (argc 2) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ return BRLCAD_ERROR;
+}
+
+/* get libbu's debug bit vector */
+if (argc == 1) {
+ bu_vls_printb(gedp-ged_result_str, Possible flags, 0xL,
BU_DEBUG_FORMAT );
+ bu_vls_printf(gedp-ged_result_str, \n);
+} else {
+ /* set libbu's debug bit vector */
+ if (sscanf(argv[1], %x, (unsigned int *)bu_debug) != 1) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0],
usage);
+ return BRLCAD_ERROR;
+ }
+}
+
+bu_vls_printb(gedp-ged_result_str, bu_debug, bu_debug, BU_DEBUG_FORMAT
);
+bu_vls_printf(gedp-ged_result_str, \n);
+
+return BRLCAD_OK;
+}
+
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: stroustrup
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/libged/debugbu.c
___
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/src/libged/debugdir.c
===
--- brlcad/trunk/src/libged/debugdir.c (rev 0)
+++ brlcad/trunk/src/libged/debugdir.c 2009-01-26 22:06:20 UTC (rev 33607)
@@ -0,0 +1,66 @@
+/* D E B U G D I R . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008-2009 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library 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 library 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 debugdir.c
+ *
+ * The debugdir command.
+ *
+ */
+
+#include common.h
+#include bio.h
+
+#include stdlib.h
+#include ctype.h
+#include string.h
+
+#include ged_private.h
+
+
+int
+ged_debugdir(struct ged *gedp, int argc, const char *argv[])
+{
+fastf_t size;
+
+GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
+GED_CHECK_ARGC_GT_0(gedp, argc, BRLCAD_ERROR);
+
+/* initialize result */
+bu_vls_trunc(gedp-ged_result_str, 0);
+
+if (argc != 1) {
+ bu_vls_printf(gedp-ged_result_str, Usage: %s, argv[0]);
+ return BRLCAD_ERROR;
+}
+
+db_pr_dir(gedp-ged_wdbp-dbip);
+
+return BRLCAD_OK;
+}
+
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style
[brlcad-commits] SF.net SVN: brlcad:[33611] brlcad/trunk
Revision: 33611 http://brlcad.svn.sourceforge.net/brlcad/?rev=33611view=rev Author: bob1961 Date: 2009-01-27 18:24:49 + (Tue, 27 Jan 2009) Log Message: --- Added the following functions to libged: ged_grid2model_lu, ged_grid2view_lu, ged_model2grid_lu, ged_model2view_lu, ged_view2grid_lu, ged_view2model_lu and ged_view2model_vec. Modified Paths: -- brlcad/trunk/include/ged.h brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj brlcad/trunk/src/libged/Makefile.am brlcad/trunk/src/mged/setup.c Added Paths: --- brlcad/trunk/src/libged/grid2model_lu.c brlcad/trunk/src/libged/grid2view_lu.c brlcad/trunk/src/libged/model2grid_lu.c brlcad/trunk/src/libged/model2view_lu.c brlcad/trunk/src/libged/view2grid_lu.c brlcad/trunk/src/libged/view2model_lu.c brlcad/trunk/src/libged/view2model_vec.c Modified: brlcad/trunk/include/ged.h === --- brlcad/trunk/include/ged.h 2009-01-27 04:50:38 UTC (rev 33610) +++ brlcad/trunk/include/ged.h 2009-01-27 18:24:49 UTC (rev 33611) @@ -1683,6 +1683,22 @@ GED_EXPORT BU_EXTERN(int ged_grid, (struct ged *gedp, int argc, const char *argv[])); /** + * Convert grid coordinates to model coordinates. + * + * Usage: + * grid2model_lu u v + */ +GED_EXPORT BU_EXTERN(int ged_grid2model_lu, (struct ged *gedp, int argc, const char *argv[])); + +/** + * Convert grid coordinates to view coordinates. + * + * Usage: + * grid2view_lu u v + */ +GED_EXPORT BU_EXTERN(int ged_grid2view_lu, (struct ged *gedp, int argc, const char *argv[])); + +/** * Create or append objects to a group * * Usage: @@ -1916,6 +1932,14 @@ GED_EXPORT BU_EXTERN(int ged_mirror, (struct ged *gedp, int argc, const char *argv[])); /** + * Convert model coordinates to grid coordinates. + * + * Usage: + * model2grid_lu u v + */ +GED_EXPORT BU_EXTERN(int ged_model2grid_lu, (struct ged *gedp, int argc, const char *argv[])); + +/** * Get the model to view matrix * * Usage: @@ -1924,6 +1948,14 @@ GED_EXPORT BU_EXTERN(int ged_model2view, (struct ged *gedp, int argc, const char *argv[])); /** + * Convert model coordinates to view coordinates. + * + * Usage: + * model2view_lu u v + */ +GED_EXPORT BU_EXTERN(int ged_model2view_lu, (struct ged *gedp, int argc, const char *argv[])); + +/** * Move an arb's edge through point * * Usage: @@ -2621,6 +2653,14 @@ GED_EXPORT BU_EXTERN(int ged_view, (struct ged *gedp, int argc, const char *argv[])); /** + * Convert view coordinates to grid coordinates. + * + * Usage: + * view2grid_lu u v + */ +GED_EXPORT BU_EXTERN(int ged_view2grid_lu, (struct ged *gedp, int argc, const char *argv[])); + +/** * Get the view2model matrix. * * Usage: @@ -2629,6 +2669,22 @@ GED_EXPORT BU_EXTERN(int ged_view2model, (struct ged *gedp, int argc, const char *argv[])); /** + * Convert view coordinates to model coordinates. + * + * Usage: + * view2model_lu u v + */ +GED_EXPORT BU_EXTERN(int ged_view2model_lu, (struct ged *gedp, int argc, const char *argv[])); + +/** + * Convert a view vector to a model vector. + * + * Usage: + * view2model_vec u v + */ +GED_EXPORT BU_EXTERN(int ged_view2model_vec, (struct ged *gedp, int argc, const char *argv[])); + +/** * Rotate the view. Note - x, y and z are rotations in view coordinates. * * Usage: Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj === --- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2009-01-27 04:50:38 UTC (rev 33610) +++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2009-01-27 18:24:49 UTC (rev 33611) @@ -530,6 +530,14 @@ /File File + RelativePath=..\..\..\src\libged\grid2model_lu.c + + /File + File + RelativePath=..\..\..\src\libged\grid2view_lu.c + + /File + File RelativePath=..\..\..\src\libged\group.c /File @@ -646,10 +654,18 @@ /File File + RelativePath=..\..\..\src\libged\model2grid_lu.c + + /File + File RelativePath=..\..\..\src\libged\model2view.c /File File + RelativePath=..\..\..\src\libged\model2view_lu.c + + /File + File
[brlcad-commits] SF.net SVN: brlcad:[33626] brlcad/trunk/src/libged/gqa.c
Revision: 33626
http://brlcad.svn.sourceforge.net/brlcad/?rev=33626view=rev
Author: bob1961
Date: 2009-01-30 16:55:22 + (Fri, 30 Jan 2009)
Log Message:
---
Modified the return values of parse_args.
Modified Paths:
--
brlcad/trunk/src/libged/gqa.c
Modified: brlcad/trunk/src/libged/gqa.c
===
--- brlcad/trunk/src/libged/gqa.c 2009-01-30 05:20:25 UTC (rev 33625)
+++ brlcad/trunk/src/libged/gqa.c 2009-01-30 16:55:22 UTC (rev 33626)
@@ -511,7 +511,7 @@
break;
default:
bu_vls_printf(ged_current_gedp-ged_result_str, Unknown analysis type \%c\
requested.\n, *p);
- return BRLCAD_ERROR;
+ return -1;
}
}
break;
@@ -520,14 +520,14 @@
bu_vls_printf(ged_current_gedp-ged_result_str, azimuth not
implemented\n);
if (sscanf(bu_optarg, %lg, azimuth_deg) != 1) {
bu_vls_printf(ged_current_gedp-ged_result_str, error
parsing azimuth \%s\\n, bu_optarg);
- return BRLCAD_ERROR;
+ return -1;
}
break;
case 'e':
bu_vls_printf(ged_current_gedp-ged_result_str, elevation not
implemented\n);
if (sscanf(bu_optarg, %lg, elevation_deg) != 1) {
bu_vls_printf(ged_current_gedp-ged_result_str, error
parsing elevation \%s\\n, bu_optarg);
- return BRLCAD_ERROR;
+ return -1;
}
break;
case 'd': debug = 1; break;
@@ -551,14 +551,14 @@
if (read_units_double(value1, bu_optarg, units_tab[0])) {
bu_vls_printf(ged_current_gedp-ged_result_str, error
parsing grid spacing value \%s\\n, bu_optarg);
- return BRLCAD_ERROR;
+ return -1;
}
if (p) {
/* we've got 2 values, they are upper limit and lower
limit */
if (read_units_double(value2, p, units_tab[0])) {
bu_vls_printf(ged_current_gedp-ged_result_str,
error parsing grid spacing limit value \%s\\n, p);
- return BRLCAD_ERROR;
+ return -1;
}
gridSpacing = value1;
@@ -577,11 +577,11 @@
case 'G':
makeOverlapAssemblies = 1;
bu_vls_printf(ged_current_gedp-ged_result_str, -G option
unimplemented\n);
- return BRLCAD_ERROR;
+ return -1;
case 'n':
if (sscanf(bu_optarg, %d, c) != 1 || c 0) {
bu_vls_printf(ged_current_gedp-ged_result_str, num_hits
must be integer value = 0, not \%s\\n, bu_optarg);
- return BRLCAD_ERROR;
+ return -1;
}
require_num_hits = c;
@@ -610,7 +610,7 @@
case 't':
if (read_units_double(overlap_tolerance, bu_optarg,
units_tab[0])) {
bu_vls_printf(ged_current_gedp-ged_result_str, error in
overlap tolerance distance \%s\\n, bu_optarg);
- return BRLCAD_ERROR;
+ return -1;
}
break;
case 'v':
@@ -619,13 +619,13 @@
case 'V':
if (read_units_double(volume_tolerance, bu_optarg,
units_tab[1])) {
bu_vls_printf(ged_current_gedp-ged_result_str, error in
volume tolerance \%s\\n, bu_optarg);
- return BRLCAD_ERROR;
+ return -1;
}
break;
case 'W':
if (read_units_double(weight_tolerance, bu_optarg,
units_tab[2])) {
bu_vls_printf(ged_current_gedp-ged_result_str, error in
weight tolerance \%s\\n, bu_optarg);
- return BRLCAD_ERROR;
+ return -1;
}
break;
@@ -633,7 +633,7 @@
use_air = strtol(bu_optarg, (char **)NULL, 10);
if (errno == ERANGE || errno == EINVAL) {
bu_vls_printf(ged_current_gedp-ged_result_str, error in
air argument\n, bu_optarg);
- return BRLCAD_ERROR;
+ return -1;
}
break;
case 'u':
@@ -654,7 +654,7 @@
}
}
bu_vls_printf(ged_current_gedp-ged_result_str,
Units \%s\ not found in coversion table\n, units_name[i]);
- return BRLCAD_ERROR;
+ return -1
[brlcad-commits] SF.net SVN: brlcad:[33632] brlcad/trunk/src/libged/prefix.c
Revision: 33632
http://brlcad.svn.sourceforge.net/brlcad/?rev=33632view=rev
Author: bob1961
Date: 2009-01-30 21:23:45 + (Fri, 30 Jan 2009)
Log Message:
---
Fixed a bug in ged_prefix (i.e. renamed object(s) not getting written to disk).
Modified Paths:
--
brlcad/trunk/src/libged/prefix.c
Modified: brlcad/trunk/src/libged/prefix.c
===
--- brlcad/trunk/src/libged/prefix.c2009-01-30 20:00:21 UTC (rev 33631)
+++ brlcad/trunk/src/libged/prefix.c2009-01-30 21:23:45 UTC (rev 33632)
@@ -38,9 +38,9 @@
int
ged_prefix(struct ged *gedp, int argc, const char *argv[])
{
-register int i, k;
+register int i, k;
register struct directory *dp;
-struct rt_db_internal intern;
+struct rt_db_internal intern;
struct rt_comb_internal *comb;
char tempstring_v4[NAMESIZE+1];
struct bu_vls tempstring_v5;
@@ -66,6 +66,7 @@
return BRLCAD_ERROR;
}
+bu_log(XXXged_prefix: step 1\n);
bu_vls_init(tempstring_v5);
/* First, check validity, and change node names */
@@ -99,12 +100,25 @@
argv[i] = ;
continue;
}
+
/* Change object name in the directory. */
if (db_rename(gedp-ged_wdbp-dbip, dp, tempstring) 0) {
bu_vls_free(tempstring_v5);
bu_vls_printf(gedp-ged_result_str, error in rename to %s,
aborting\n, tempstring);
return BRLCAD_ERROR;
}
+
+ if (rt_db_get_internal(intern, dp, gedp-ged_wdbp-dbip, (fastf_t
*)NULL, rt_uniresource) 0) {
+ bu_vls_printf(gedp-ged_result_str, Database read error,
aborting);
+ return BRLCAD_ERROR;
+ }
+
+ /* Change object name on disk. */
+ if (rt_db_put_internal(dp, gedp-ged_wdbp-dbip, intern,
rt_uniresource)) {
+ bu_vls_printf(gedp-ged_result_str, Database write error,
aborting);
+ return BRLCAD_ERROR;
+ }
+ bu_log(XXXged_prefix: changed name from %s to %s\n, argv[i],
tempstring);
}
bu_vls_free(tempstring_v5);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
___
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:[33649] brlcad/trunk/src
Revision: 33649
http://brlcad.svn.sourceforge.net/brlcad/?rev=33649view=rev
Author: bob1961
Date: 2009-02-03 21:06:17 + (Tue, 03 Feb 2009)
Log Message:
---
Tweak the usage message and the message complaining about the missing density
data.
Modified Paths:
--
brlcad/trunk/src/gtools/g_qa.c
brlcad/trunk/src/libged/gqa.c
Modified: brlcad/trunk/src/gtools/g_qa.c
===
--- brlcad/trunk/src/gtools/g_qa.c 2009-02-03 20:38:14 UTC (rev 33648)
+++ brlcad/trunk/src/gtools/g_qa.c 2009-02-03 21:06:17 UTC (rev 33649)
@@ -36,7 +36,7 @@
#include cmd.h
#include ged.h
-static char usage[] = Usage: %s [options] model object [object...]\n;
+static char usage[] = Usage: %s [-A A|a|b|e|g|o|v|w] [-a az] [-d] [-e el] [-f
densityFile] [-g spacing|upper,lower|upper-lower] [-G] [-n nhits] [-N nviews]
[-p] [-P ncpus] [-r] [-S nsamples] [-t overlap_tol] [-U useair] [-u len_units
vol_units wt_units] [-v] [-V volume_tol] [-W weight_tol] model object
[object...]\n;
/*
* M A I N
Modified: brlcad/trunk/src/libged/gqa.c
===
--- brlcad/trunk/src/libged/gqa.c 2009-02-03 20:38:14 UTC (rev 33648)
+++ brlcad/trunk/src/libged/gqa.c 2009-02-03 21:06:17 UTC (rev 33649)
@@ -56,6 +56,7 @@
/* bu_getopt() options */
char *options = A:a:de:f:g:Gn:N:pP:rS:s:t:U:u:vV:W:;
+char *options_str = [-A A|a|b|e|g|o|v|w] [-a az] [-d] [-e el] [-f
densityFile] [-g spacing|upper,lower|upper-lower] [-G] [-n nhits] [-N nviews]
[-p] [-P ncpus] [-r] [-S nsamples] [-t overlap_tol] [-U useair] [-u len_units
vol_units wt_units] [-v] [-V volume_tol] [-W weight_tol];
#define ANALYSIS_VOLUME 1
#define ANALYSIS_WEIGHT 2
@@ -813,7 +814,8 @@
dp = db_lookup(rtip-rti_dbip, _DENSITIES, LOOKUP_QUIET);
if (dp == (struct directory *)NULL) {
- bu_vls_printf(ged_current_gedp-ged_result_str, No \_DENSITIES\
density table object in database\n);
+ bu_vls_printf(ged_current_gedp-ged_result_str, No \_DENSITIES\
density table object in database.);
+ bu_vls_printf(ged_current_gedp-ged_result_str, If you do not have
density data you can still get adjacent air, bounding box, exposed air, gaps,
volume or overlaps by using the -Aa, -Ab, -Ae, -Ag, -Av or -Ao options,
respectively.\n);
return BRLCAD_ERROR;
}
@@ -2069,7 +2071,7 @@
struct cstate state;
int start_objs; /* index in command line args where geom object list
starts */
struct region_pair *rp;
-static const char *usage = [options] object [object ...];
+static const char *usage = object [object ...];
GED_CHECK_DATABASE_OPEN(gedp, BRLCAD_ERROR);
GED_CHECK_ARGC_GT_0(gedp, argc, BRLCAD_ERROR);
@@ -2079,7 +2081,7 @@
/* must be wanting help */
if (argc == 1) {
- bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s %s, argv[0],
options_str, usage);
return BRLCAD_HELP;
}
@@ -2119,7 +2121,7 @@
arg_count = parse_args(argc, (char **)argv);
if (arg_count 0 || (argc-arg_count) 1) {
- bu_vls_printf(gedp-ged_result_str, Usage: %s %s, argv[0], usage);
+ bu_vls_printf(gedp-ged_result_str, Usage: %s %s %s, argv[0],
options_str, usage);
return BRLCAD_ERROR;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-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:[33650] brlcad/trunk/src/mged/chgmodel.c
Revision: 33650 http://brlcad.svn.sourceforge.net/brlcad/?rev=33650view=rev Author: bob1961 Date: 2009-02-03 21:45:43 + (Tue, 03 Feb 2009) Log Message: --- Fixed bug/typo in f_make (i.e. the problem was that things were set up to use av, but av was never used). Modified Paths: -- brlcad/trunk/src/mged/chgmodel.c Modified: brlcad/trunk/src/mged/chgmodel.c === --- brlcad/trunk/src/mged/chgmodel.c2009-02-03 21:06:17 UTC (rev 33649) +++ brlcad/trunk/src/mged/chgmodel.c2009-02-03 21:45:43 UTC (rev 33650) @@ -113,7 +113,7 @@ av[0] = draw; av[1] = argv[argc-2]; av[2] = NULL; - edit_com(argc, argv, 1, 1); + edit_com(2, av, 1, 1); } /* Convert to Tcl codes */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-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:[33655] brlcad/trunk/src/tclscripts/mged
Revision: 33655
http://brlcad.svn.sourceforge.net/brlcad/?rev=33655view=rev
Author: bob1961
Date: 2009-02-04 15:49:10 + (Wed, 04 Feb 2009)
Log Message:
---
This fixes a bug that was breaking the font preferences panel (i.e. it's init
routine was not getting called if a .mgedrc file was present).
Modified Paths:
--
brlcad/trunk/src/tclscripts/mged/font.tcl
brlcad/trunk/src/tclscripts/mged/openw.tcl
Modified: brlcad/trunk/src/tclscripts/mged/font.tcl
===
--- brlcad/trunk/src/tclscripts/mged/font.tcl 2009-02-04 15:41:00 UTC (rev
33654)
+++ brlcad/trunk/src/tclscripts/mged/font.tcl 2009-02-04 15:49:10 UTC (rev
33655)
@@ -95,6 +95,10 @@
}
}
+if ![info exists mged_default(font_init)] {
+set mged_default(font_init)
+}
+
if ![info exists font_scheme_data] {
set font_scheme_data { {fs_button_font button_font Buttons}
{fs_entry_font entry_font Entries}
Modified: brlcad/trunk/src/tclscripts/mged/openw.tcl
===
--- brlcad/trunk/src/tclscripts/mged/openw.tcl 2009-02-04 15:41:00 UTC (rev
33654)
+++ brlcad/trunk/src/tclscripts/mged/openw.tcl 2009-02-04 15:49:10 UTC (rev
33655)
@@ -152,7 +152,7 @@
set mged_gui(loadScriptDir) [pwd]
}
-if {![info exists mged_default(text_font)]} {
+if {![info exists mged_default(font_init)]} {
font_init
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
