--- capa/capa51/GUITools/quizzer.tcl 1999/10/26 16:47:36 1.5 +++ capa/capa51/GUITools/quizzer.tcl 2000/01/12 21:00:25 1.12 @@ -948,7 +948,7 @@ proc createDateDialog { toplevel makedef checkbutton $optionsFrame2.response -variable gDates(inhibitresponse) \ -text "Inhibit Correct/Incorrect response \n(normally only for exams/quizzes)" pack $durationFrame $optionsFrame2.view $optionsFrame2.response -side top - set gDates(viewbetween) 1 + set gDates(viewbetween) 0 set gDates(inhibitresponse) 0 label $durationFrame.label -text "Duration" @@ -1580,7 +1580,7 @@ proc replaceAll {} { set gCreateImportLinks 1 getFindWindow refNum if { $refNum >= 0 } { registerCreateImportLinks $refNum 0.0 end } - displayMessage "Replaced $num occurance$s" + displayMessage "Replaced $num occurrence$s" } ########################################################### @@ -2228,11 +2228,32 @@ proc createPreviewWindow {} { } ########################################################### +# openError +########################################################### +########################################################### +########################################################### +proc openError { file line type} { + global gRefLine gLineNumberGoto gTextWindow + if { $type == 2 } { + set gLineNumberGoto $line + gotoLine + capaRaise [winfo toplevel $gTextWindow] + } else { + if {[set num [openReferenceFile $file]]} { + update idletasks + set gRefLine($num) $line + gotoRefLine $num + } + } +} + +########################################################### +# showParseErrors ########################################################### ########################################################### ########################################################### proc showParseErrors {} { - global gParseErrorsText gWindowMenu + global gParseErrorsText gWindowMenu gUniqueNumber gCapaConfig set parseErrors [getParseErrors] @@ -2283,25 +2304,28 @@ proc showParseErrors {} { capaRaise .parseErrors } foreach line [split $parseErrors "\n"] { - if { [regexp {File:.+->(.+), Line ([0-9]+): ERROR:} $line a one two three four five]} { - puts a:$a - puts one:$one - puts two:$two - puts three:$three - puts four:$four - puts five:$five + set tag 0 + if { [regexp -indices {File:.+->(.+), Line ([0-9]+): ERROR:} $line result file linenum]} { + set tag 1 } else { - if { [regexp {File:(.+), Line ([0-9]+): ERROR:} $line a one two three four five]} { - puts a:$a - puts one:$one - puts two:$two - puts three:$three - puts four:$four - puts five:$five + if { [regexp -indices {File:(.+), Line ([0-9]+): ERROR:} $line result file linenum]} { + set tag 2 } } + if { $tag } { + set tagnum [incr gUniqueNumber] + set linenum [eval [list string range $line] $linenum] + set filename [eval [list string range $line] $file] + set i [expr [lindex [split [$gParseErrorsText index end] .] 0] - 1] + } + $gParseErrorsText insert end "$line\n" + if { $tag } { + $gParseErrorsText tag add error.$tagnum $i.[lindex $file 0] $i.[expr [lindex $file 1] + 1] + $gParseErrorsText tag configure error.$tagnum -foreground $gCapaConfig(IMP_color) + $gParseErrorsText tag bind error.$tagnum \ + "eval openError $filename $linenum $tag" + } } - $gParseErrorsText insert end $parseErrors } else { if { [winfo exists .parseErrors] } { $gParseErrorsText delete 0.0 end } } @@ -2731,7 +2755,7 @@ proc isReferenceFileOpen { file } { set entryfile [lindex $entry 1] } # puts $entryfile - if { [catch {file stat $entryfile a1}] } { puts skipped;continue } + if { [catch {file stat $entryfile a1}] } { continue } file stat $file a2 # puts "$a2(ino) == $a1(ino)" if { $a2(ino) == $a1(ino) } { @@ -2788,18 +2812,19 @@ proc openReferenceFile { {file ""} {new -title "Select the proper file" \ -initialdir "$gDir(reference)" ] event generate .main - if { $file == "" } { return } + if { $file == "" } { return 0 } set gDir(reference) [file dirname $file] if { [file isdirectory $file] } { displayError "You attempted to open $file which is a directory not a file." - return + return 0 } } else { if { !$new } { if { [set window [isReferenceFileOpen $file] ] != "" } { + set num [lindex [split [lindex [split $window .] 1] e] end] capaRaise $window - return + return $num } # specifically opening the capa.config file if { $file == "capa.config" } { @@ -2810,18 +2835,18 @@ proc openReferenceFile { {file ""} {new { {All Files} {"*"} } } \ -title "Select the proper file" \ -initialdir "$gDir(reference)" ] - if { $file == "" } { return } + if { $file == "" } { return 0 } } else { set file [file join [file dirname $gFile] capa.config] } } else { if { ![file isfile $file] && ![file readable $file] } { displayError "Unable to find $file" - return + return 0 } if { [file isdirectory $file] } { displayError "You attempted to open $file which is a directory not a file." - return + return 0 } } } @@ -2939,6 +2964,7 @@ proc openReferenceFile { {file ""} {new set gRefChanged($num) 0 set gRefClosed($num) 0 addFindList $num + return $num } ########################################################### @@ -2979,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 @@ -2995,7 +3025,7 @@ proc trackChanges { procName num } { ########################################################### ########################################################### proc undo { num } { - global gUndo gRefText gTextWindow + global gUndo gRefText gTextWindow gChanged gRefChanged if { $gUndo($num.cur) == 0 } { return } set undoInfo $gUndo($num.$gUndo($num.cur)) if { [regexp {.*[\"/].*} $undoInfo] } { @@ -3006,8 +3036,10 @@ proc undo { num } { } if { $num == 0 } { if {[catch {eval ".$gTextWindow $gUndo($num.$gUndo($num.cur))"}]} { return } + set gChanged 1 } else { if {[catch {eval ".$gRefText($num) $gUndo($num.$gUndo($num.cur))"}]} { return } + set gRefChanged($num) 1 } incr gUndo($num.cur) -1 } @@ -3757,7 +3789,10 @@ 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 - @@ -3771,7 +3806,7 @@ proc printBody { lprCommand { showComple -o quiztemp.ps >& /dev/null} errorMsg ] if { $error } { displayError \ - "When attempting to run dvips an error occured : $errorMsg" + "When attempting to run dvips an error occurred : $errorMsg" return 1 } @@ -3786,7 +3821,7 @@ proc printBody { lprCommand { showComple set error [catch {set returnMessage [eval "exec $lprCommand"] } errorMsg ] if { $error == 1 } { - displayError "When attempting to print an error occured : $errorMsg" + displayError "When attempting to print an error occurred : $errorMsg" return 1 } else { if { $showCompletionMessage } { @@ -4042,12 +4077,14 @@ proc printSection { { lprCommand "" } } default { set type "-T" } } + set prSection [string trimleft $gPrintSelection(section) 0] + if { [set gStopPrinting [expr 2 == [runLatex \ "echo [pwd] | $gCapaConfig(qzparse_command) \ - -sec $gPrintSelection(section) -set $set \ + -sec $prSection -set $set \ -d [pwd] -c [pwd] $type " gCreateDviText] ] ] } { for {set i $start} { $i <= $end} { incr i } { - exec rm -f section$gPrintSelection(section)-set$i.tex + exec rm -f section$prSection-set$i.tex } if {$showStopping} { displayMessage "Printing has been stopped." @@ -4064,7 +4101,7 @@ proc printSection { { lprCommand "" } } } for { set i $start} { $i <= $end } { incr i } { - if { ! [file exists section$gPrintSelection(section)-set$i.tex] } { + if { ! [file exists section$prSection-set$i.tex] } { if {$showStopping} { displayError "The qzparse command: $gCapaConfig(qzparse_command), was unable to produce the expected output. Printing stopped" set gStopPrinting 0 @@ -4073,7 +4110,7 @@ proc printSection { { lprCommand "" } } return 2 } - exec mv section$gPrintSelection(section)-set$i.tex quiztemp.tex + exec mv section$prSection-set$i.tex quiztemp.tex exec /bin/rm -f quiztemp.dvi $gCreateDviText insert end "$gCapaConfig(latex_command)\n" @@ -4353,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 @@ -4634,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)} } ###########################################################