Revision: 45926
http://brlcad.svn.sourceforge.net/brlcad/?rev=45926&view=rev
Author: bob1961
Date: 2011-08-11 19:43:54 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Need to destroy the ray object whenever the ged object is destroyed or when
opening a different database. This fix was prompted by database turds being
left on Windows platforms whenever the ray object was used. That is, the ray
object also has the database copy (i.e. the turd) open and so the code that
removes the database copy fails.
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-08-11 19:40:01 UTC (rev
45925)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2011-08-11 19:43:54 UTC (rev
45926)
@@ -656,6 +656,8 @@
variable mViewMeasureCallbacks ""
variable mViewRectCallbacks ""
+ variable mRay "ray"
+
method init_button_no_op_prot {{_button 1}}
method measure_line_erase {}
method multi_pane {args}
@@ -754,6 +756,7 @@
::itcl::body cadwidgets::Ged::destructor {} {
if {!$mSharedGed} {
+ catch {rename $mRay ""}
rename $mGed ""
}
}
@@ -1600,11 +1603,12 @@
}
::itcl::body cadwidgets::Ged::open {args} {
+ catch {rename $mRay ""}
set $mGedFile [eval $mGed open $args]
}
::itcl::body cadwidgets::Ged::opendb {args} {
- set $mGedFile [eval $mGed open $args]
+ eval open $args
}
::itcl::body cadwidgets::Ged::orient {args} {
@@ -3546,12 +3550,12 @@
set result ""
catch {
- eval $mGed rt_gettrees ray -i -u [$mGed who]
- ray prep $_prep
- ray no_bool $_no_bool
- ray onehit $_onehit
+ eval $mGed rt_gettrees $mRay -i -u [$mGed who]
+ $mRay prep $_prep
+ $mRay no_bool $_no_bool
+ $mRay onehit $_onehit
- set result [ray shootray $_start $_op $_target]
+ set result [$mRay shootray $_start $_op $_target]
}
SetNormalCursor $this
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
