[brlcad-commits] SF.net SVN: brlcad:[60302] brlcad/trunk/src/tclscripts/lib/gui_conversion. tcl

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

Revision: 60302
          http://sourceforge.net/p/brlcad/code/60302
Author:   starseeker
Date:     2014-03-31 03:37:25 +0000 (Mon, 31 Mar 2014)
Log Message:
-----------
Have the Cancel button do something - still need to turn Clear into Reset

Modified Paths:
--------------
    brlcad/trunk/src/tclscripts/lib/gui_conversion.tcl

Modified: brlcad/trunk/src/tclscripts/lib/gui_conversion.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/lib/gui_conversion.tcl	2014-03-31 00:53:59 UTC (rev 60301)
+++ brlcad/trunk/src/tclscripts/lib/gui_conversion.tcl	2014-03-31 03:37:25 UTC (rev 60302)
@@ -134,7 +134,7 @@
     # Application buttons
     button $w.ok     -text OK     -command {set done 1}
     button $w.c      -text Clear  -command "set $w {}"
-    button $w.cancel -text Cancel -command "set $w {}; set done 1"
+    button $w.cancel -text Cancel -command "set $w {}; set ::cancel_process 1; set done 1"
     grid $w.ok -column 0 -row 9 -sticky es
     grid $w.c -column 1 -row 9 -sticky s
     grid $w.cancel -column 2 -row 9 -sticky w
@@ -143,6 +143,7 @@
 
     pack $w -expand true -fill x
     vwait done
+
     destroy $w
 }
 
@@ -245,7 +246,7 @@
     # Application buttons
     button $w.ok     -text OK     -command {set done 1}
     button $w.c      -text Clear  -command "set $w {}"
-    button $w.cancel -text Cancel -command "set $w {}; set done 1"
+    button $w.cancel -text Cancel -command "set $w {}; set ::cancel_process 1; set done 1"
     grid $w.ok -column 0 -row 10 -sticky es
     grid $w.c -column 1 -row 10 -sticky s
     grid $w.cancel -column 2 -row 10 -sticky w
@@ -254,6 +255,7 @@
 
     pack $w -expand true -fill x
     vwait done
+
     destroy $w
 }
 
@@ -312,16 +314,20 @@
 if {[llength $::log_file] == 0} {
    set ::log_file [file join [file dirname $::input_file] "$input_root.log"]
 }
+set ::cancel_process 0
 
 switch -nocase "$::input_ext" {
     ".3dm" {
 	::rhino_options
 	::rhino_build_cmd
+
+        if {$::cancel_process == 1} {exit 0}
         gui_conversion $rhino_cmd $::log_file
     }
     ".stl" {
 	::stl_options
         ::stl_build_cmd
+        if {$::cancel_process == 1} {exit 0}
         gui_conversion $::stl_cmd $::log_file
     }
     ".stp" {

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