--- capa/capa51/GUITools/quizzer.tcl 1999/11/17 21:34:40 1.8 +++ capa/capa51/GUITools/quizzer.tcl 1999/12/16 22:18:35 1.11 @@ -3005,11 +3005,15 @@ proc trackChanges { procName num } { set chars \[ .$procName get \$insertindex \$insertindex2 \] } set gUndo($num.\$numChange) \"insert \$insertindex \[list \$chars\] \" - if {\[regexp \{.*\[\"/\].*\} \$chars\] || \ - \[regexp \{.*\[\"/\].*\} \[.$procName get \"\$insertindex linestart\" \"\$insertindex2 lineend\"\]\]} { - registerCreateImportLinks $num \$insertindex \$insertindex2 + if { \[string length \$chars\] > 100 } { + registerCreateImportLinks $num \$insertindex-1line \$insertindex2+1line + } else { + if {\[regexp \{.*\[\"/\].*\} \$chars\] || \ + \[regexp \{.*\[\"/\].*\} \[.$procName get \"\$insertindex linestart\" \"\$insertindex2 lineend\"\]\]} { + registerCreateImportLinks $num \$insertindex \$insertindex2 + } } - } + } set result \[uplevel .$procName \$args\] updateLocation $num return \$result @@ -3653,7 +3657,7 @@ proc printWindow {} { -value "printWholeClass" -variable gPrintSelection(type) pack $wholeClassFrame.wholeClass -side left -i message $studentNumber.msg -text "Student Number: " -aspect 10000 + message $studentNumber.msg -text "Student Number: " -aspect 10000 entry $studentNumber.entry -textvariable gPrintSelection(studentNumber) -width 9 \ -validate key -validatecommand "limitEntry %W 9 any %P" pack $studentNumber.msg $studentNumber.entry -side left @@ -3785,14 +3789,16 @@ proc createCreateDviWin {} { # sends the file quiztemp.ps to the printer through lpr using # the option foud in gLprCommand ########################################################### -# Arguments: none +# Arguments: lprCommand - actual command to be run to print +# showCompletionMessage - (defaults to 1 true) +# controls whether the print complete +# message gets shown # Returns: Nothing # Globals: gCapaConfig - # gStopPrinting - # Files: quiztemp.ps - file containg info to print (removed) ########################################################### -proc printBodon(section -ionMessage 1 } } { +proc printBody { lprCommand { showCompletionMessage 1 } } { global gCapaConfig gStopPrinting gDonePrinting set errorMsg "" @@ -4384,7 +4390,7 @@ proc analyzeClass { {start 1} } { set name [lindex $gAnalyze(toprocess) 1] set section [lindex $gAnalyze(toprocess) 2] set gAnalyze(toprocess) [lrange $gAnalyze(toprocess) 3 end] - set command "$gCapaConfig(answers_command) $number \"$name\" $section $gAnalyze(set)" + set command "$gCapaConfig(answers_command) $number \"$name\" 0 $gAnalyze(set)" set fileId [open "|$command" "r"] set gAnalyze(pid) [pid $fileId] fconfigure $fileId -blocking 0 @@ -4665,7 +4671,7 @@ proc analyzeStop {} { global gAnalyze set gAnalyze(stop) 1 set gAnalyze(status) "Stopped" - exec kill -SIGKILL $gAnalyze(pid) + catch {exec kill -SIGKILL $gAnalyze(pid)} } ###########################################################