File CGR101V112.patch of Package syscomp-cgr

Overview Repositories Revisions Requests Users Attributes Meta

File CGR101V112.patch of Package syscomp-cgr (Revision 9424ea19733b08c3a9ad73bcdb803e71)

Currently displaying revision 9424ea19733b08c3a9ad73bcdb803e71 , Show latest

--- CGR101-1.12/main.tcl.orig	2009-10-06 17:39:28.000000000 +0200
+++ CGR101-1.12/main.tcl	2009-11-20 23:29:08.000000000 +0100
@@ -23,9 +23,14 @@ set softwareVersion "1.12"
 #USA
 
 #---=== Global Variables ===---
+set saved_cwd [pwd]
+set dirname [file dirname [info script]]
+# so that our source commands work here and now.
+cd $dirname	
 
 #Folder Location for GUI Images
-set images "./Images"
+set images "$dirname/Images"
+set port_cfg "$env(HOME)/.syscomp-cgr.cfg"
 
 #GUI Operational Mode
 set opMode "CircuitGear"
@@ -39,17 +44,17 @@ if {$osType == "unix"} {
 #Img package required for screen captures
 #lappend auto_path "$include/Img1.3"
 if {$osType=="windows"} {
-	lappend auto_path "./Img13Win"
+	lappend auto_path "$dirname/Img13Win"
 } else {
-	lappend auto_path "./Img13Lin"
+	lappend auto_path "$dirname/Img13Lin"
 }
 package require Img
 
 #BWidget package used for comboboxes
 if {$osType=="windows"} {
-	lappend auto_path "./Bwidget18Win"
+	lappend auto_path "$dirname/Bwidget18Win"
 } else {
-	lappend auto_path "./Bwidget18Lin"
+	lappend auto_path "$dirname/Bwidget18Lin"
 }
 package require BWidget
 
@@ -221,11 +226,11 @@ source cursors.tcl
 source capture.tcl
 source automeasure.tcl
 
-if [catch {open port.cfg r+} fileId] {
+if [catch {open "$port_cfg" r} fileId] {
 	if {$osType == "windows"} {
 		set usbSerial::serialPort "com4:"
 	} else {
-		set serialPort "/dev/ttyUSB0"
+		set usbSerial::serialPort "/dev/ttyUSB0"
 	}
 } else {
 	if { [gets $fileId line] >= 0} {
@@ -270,3 +275,5 @@ source dataRecorder.tcl
 source persist.tcl
 source math.tcl
 
+# so that saved files are where the user expects them
+cd $saved_cwd	
--- CGR101-1.12/usbSerial.tcl.orig	2009-03-11 16:50:14.000000000 +0100
+++ CGR101-1.12/usbSerial.tcl	2009-11-20 23:10:46.000000000 +0100
@@ -379,10 +379,11 @@ proc ::usbSerial::sendCommand {command}
 #---------------
 #When invoked, this procedure creates a new window which allows
 #the user to adjust the serial port settings.  The settings are read 
-#from, and stored to, a file called port.cfg.
+#from, and stored to, a file called $port_cfg.
 proc ::usbSerial::serialSettings {} {
 	global osType	\
-		otherPort
+		otherPort \
+		port_cfg
 
 	#Create a new window
 	toplevel .serial
@@ -500,11 +501,11 @@ proc ::usbSerial::serialSettings {} {
 	}
 	
 	#The "Save and Exit" button closes the serial config window
-	#and saves the current settings to the port.cfg file
+	#and saves the current settings to the $port_cfg file
 	button .serial.saveExit	\
 		-text "Save and Exit"	\
 		-command {
-			set fileId [open port.cfg w]
+			set fileId [open $port_cfg w]
 			if { $usbSerial::serialPort == "other"} {
 				puts $fileId $otherPort
 				set usbSerial::serialPort $otherPort
@@ -519,7 +520,7 @@ proc ::usbSerial::serialSettings {} {
 	
 	#Attempt to open and read the configuration file.  If the
 	#file does not exist, default values are used.
-	if [catch {open port.cfg r+} fileId] {
+	if [catch {open $port_cfg r+} fileId] {
 		if { $osType == "windows" } {
 			set usbSerial::serialPort com4
 		} else { 
@@ -677,4 +678,4 @@ proc usbSerial::autodetect {} {
 	#Autodetection failed.
 
 
-}
\ No newline at end of file
+}
--- CGR101V110/capture.tcl.orig	2008-06-05 15:20:50.000000000 +0200
+++ CGR101V110/capture.tcl	2009-04-29 23:08:05.000000000 +0200
@@ -81,7 +81,8 @@
 
 	set img [capture::captureWindow $win]
 	set types {{"Image Files" {.jpg}}}
-	set name [wm title $win]
+	# linux users don't like whitespace in filenames
+	set name [regsub -all {\s+} [wm title $win] {_} ]
 	set initFile "$name.jpg"
 	
 	set filename [tk_getSaveFile	\

Places

File CGR101V112.patch of Package syscomp-cgr (Revision 9424ea19733b08c3a9ad73bcdb803e71)

Places