[brlcad-commits] SF.net SVN: brlcad:[50588] brlcad/trunk/src/tclscripts/rtwizard

[<sta...@us...>]

Revision: 50588
          http://brlcad.svn.sourceforge.net/brlcad/?rev=50588&view=rev
Author:   starseeker
Date:     2012-05-17 18:44:50 +0000 (Thu, 17 May 2012)
Log Message:
-----------
rtwizard.tcl is doing the sanity insurance for dbFile

Modified Paths:
--------------
    brlcad/trunk/src/tclscripts/rtwizard/RaytraceWizard.tcl
    brlcad/trunk/src/tclscripts/rtwizard/rtwizard.tcl

Modified: brlcad/trunk/src/tclscripts/rtwizard/RaytraceWizard.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/rtwizard/RaytraceWizard.tcl	2012-05-17 18:39:00 UTC (rev 50587)
+++ brlcad/trunk/src/tclscripts/rtwizard/RaytraceWizard.tcl	2012-05-17 18:44:50 UTC (rev 50588)
@@ -175,14 +175,6 @@
 	# command line, use it and proceed. Otherwise, spin up the
 	# gui, select the database page, and wait for the database
 	# file to be specified.
-	#
-	if { [llength $args] > 0 } {
-	    set ::RtWizard::wizard_state(dbFile) [ lindex $args 0 ]
-	    if { ! [file exists $::RtWizard::wizard_state(dbFile)] } {
-		set ::RtWizard::wizard_state(dbFile) ""
-	    }
-	}
-
 	if { [string length $::RtWizard::wizard_state(dbFile)] == 0 } {
 	    #
 	    # select the database page

Modified: brlcad/trunk/src/tclscripts/rtwizard/rtwizard.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/rtwizard/rtwizard.tcl	2012-05-17 18:39:00 UTC (rev 50587)
+++ brlcad/trunk/src/tclscripts/rtwizard/rtwizard.tcl	2012-05-17 18:44:50 UTC (rev 50588)
@@ -292,6 +292,8 @@
 # OK, we've collected all the info we can from the inputs.  Make sure all the key
 # variables are initialized to sane defaults.  The viewsize and eye_pt defaults are determined from
 # the drawing of the objects into the display manager.
+# Geometry Database
+if {![info exists ::RtWizard::wizard_state(dbFile)]} { set ::RtWizard::wizard_state(dbFile) "" }
 # Initial orientation
 if {![info exists ::RtWizard::wizard_state(init_azimuth)]} { set ::RtWizard::wizard_state(init_azimuth) 35 }
 if {![info exists ::RtWizard::wizard_state(init_elevation)]} { set ::RtWizard::wizard_state(init_elevation) 25 }
@@ -328,8 +330,7 @@
 }
 
 # If we're launching without enough arguments to fully specify an rtwizard 
-# run, a gui run has been specifically requested, or we've got arguments 
-# that aren't understood, go graphical
+# run or a gui run has been specifically requested, go graphical
 if {[info exists ::use_gui]} {
    # Have to do these loads until we get "package require tclcad" and "package require dm" 
    # working - bwish loads them for us by default, but since rtwizard may be either

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.