--- capa/capa51/GUITools/quizzer.tcl 1999/09/28 21:25:36 1.1.1.1 +++ capa/capa51/GUITools/quizzer.tcl 1999/10/28 16:32:07 1.6 @@ -1162,7 +1162,7 @@ proc addDate { listbox } { ########################################################### proc createDBHeader {} { global gNumberParsedText gPrompt gLoadHeaderSet gControlDates \ - gSetNumberText gHeaderQCount + gSetNumberText gHeaderQCount gEnableDiscussion gFile if { $gNumberParsedText == "" } { displayError "You must first preview the file before creating the \ @@ -1182,8 +1182,9 @@ proc createDBHeader {} { message $dialog.msg -text "Header Information" -aspect 1000 set loadFrame [frame $dialog.loadFrame -borderwidth 4 -relief sunken] set infoFrame [frame $dialog.infoFrame -borderwidth 4 -relief sunken] + set optionFrame [frame $dialog.options] set buttonFrame [frame $dialog.buttons -bd 10] - pack $dialog.msg $loadFrame $infoFrame $buttonFrame -side top -fill x + pack $dialog.msg $loadFrame $infoFrame $optionFrame $buttonFrame -side top -fill x set legendFrame [frame $infoFrame.legendFrame] set listFrame [frame $infoFrame.listFrame] @@ -1212,6 +1213,15 @@ proc createDBHeader {} { button $loadFrame.load -text "load" -command "loadDates $listbox" pack $loadFrame.msg $loadFrame.entry $loadFrame.load -side left + if { [file exists [file join [file dirname $gFile] discussion $gSetNumberText]] } { + set gEnableDiscussion 1 + } else { + set gEnableDiscussion 0 + } + checkbutton $optionFrame.discuss -text "Enable Discussion Forum" \ + -variable gEnableDiscussion + pack $optionFrame.discuss + button $buttonFrame.ok -text Set -command { set gPrompt(ok) 1 } \ -underline 0 button $buttonFrame.cancel -text Cancel -command { set gPrompt(ok) 0 } \ @@ -1241,6 +1251,7 @@ proc createDBHeader {} { capaGrab release $dialog destroy $dialog if {$gPrompt(ok) == 1 } { + updateDiscussion eval updateHeader [ eval concat $gControlDates ] } @@ -1249,12 +1260,40 @@ proc createDBHeader {} { } ########################################################### +# updateDiscussion +########################################################### +########################################################### +########################################################### +proc updateDiscussion {} { + global gFile gSetNumberText gEnableDiscussion + set dir [file dirname $gFile] + set disDir [file join $dir discussion $gSetNumberText] + set logDir [file join $dir discussion logs] + if { $gEnableDiscussion } { + if { ![file exists $disDir] } { + if { [file exists $disDir.unavailable] } { + exec mv $disDir.unavailable $disDir + } else { + file mkdir $disDir + file attributes $disDir -permissions 0777 + } + } + if { ![file exists $logDir] } { + file mkdir [file join $dir discussion logs] + file attributes [file join $dir discussion logs] -permissions 0777 + } + } else { + if { [file exists $disDir] } { exec mv $disDir $disDir.unavailable } + } +} + +########################################################### # allFieldsComplete2 ########################################################### ########################################################### ########################################################### proc allFieldsComplete2 {} { - global gLoadHeaderSet gControlDates + global gLoadHeaderSet gControlDates if { [string length $gOpenDate] != 8 } { return 0 @@ -2189,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] @@ -2243,8 +2303,29 @@ proc showParseErrors {} { $gParseErrorsText delete 0.0 end capaRaise .parseErrors } - - $gParseErrorsText insert end $parseErrors + foreach line [split $parseErrors "\n"] { + set tag 0 + if { [regexp -indices {File:.+->(.+), Line ([0-9]+): ERROR:} $line result file linenum]} { + set tag 1 + } else { + 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" + } + } } else { if { [winfo exists .parseErrors] } { $gParseErrorsText delete 0.0 end } } @@ -2381,6 +2462,7 @@ proc rereadCapaConfig { } { displayError "Invalid capa.config file" set gCapaConfig(printer_option) $printer_option } + setDefaultValues updateColors } @@ -2399,16 +2481,24 @@ proc pickCapaConfig { } { cd [file dirname $file] set error [parseCapaConfig] if { $error != "OK" } { displayError "Invalid capa.config file"; cd $oldDir } + setDefaultValues } } +proc setDefaultValues {} { + global gProbVal gTryVal gHintVal gCapaConfig + catch {set gProbVal $gCapaConfig(default_prob_val)} + catch {set gTryVal $gCapaConfig(default_try_val)} + catch {set gHintVal $gCapaConfig(default_hint_val)} +} + ########################################################### # openDocument ########################################################### ########################################################### ########################################################### proc openDocument {} { - global gFile gTextWindow gSetNumberText gPrefs gChanged gQuizTemp gUndo + global gFile gTextWindow gSetNumberText gPrefs gChanged gQuizTemp gUndo if { $gChanged } { if { [askToSave 0 0] == "Cancel" } { return } } if { ![catch {set gTextWindow}] } { @@ -2478,7 +2568,8 @@ proc openDocument {} { set gQuizTemp true return } - + setDefaultValues + createEditingWindow 0 $gTextWindow delete 0.0 end $gTextWindow insert 0.0 [read $fileId [file size $gFile]] @@ -2664,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) } { @@ -2721,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" } { @@ -2743,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 } } } @@ -2872,6 +2964,7 @@ proc openReferenceFile { {file ""} {new set gRefChanged($num) 0 set gRefClosed($num) 0 addFindList $num + return $num } ########################################################### @@ -2928,7 +3021,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] } { @@ -2939,8 +3032,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 } @@ -3220,7 +3315,7 @@ proc createStopButton {} { if {[winfo exists .stopbutton]} {destroy .stopbutton} set top [toplevel .stopbutton] button $top.stop -text "Stop Parser" -command "stopParser" - label $top.status -textvariable gStopStatus -width 35 + label $top.status -textvariable gStopStatus -width 35 -anchor w pack $top.stop $top.status set gStopStatus "" grab $top @@ -4424,6 +4519,67 @@ proc analyzeRandom { } { } ########################################################### +# analyzeStrings +########################################################### +########################################################### +########################################################### +proc analyzeStrings { prob window create} { + global gAnalyze + + if { ![winfo exists $window.analyzestrings] } { if {!$create} { return } } + if { ![catch {set setWin [toplevel $window.analyzestrings]}] } { + set msgFrame [frame $setWin.msgFrame] + set valFrame [frame $setWin.valFrame] + set buttonFrame [frame $setWin.buttonFrame] + pack $msgFrame $valFrame $buttonFrame + pack configure $valFrame -expand 1 -fill both + + message $msgFrame.msg -text "Correct Answers" -aspect 3000 + pack $msgFrame.msg + + set maxWidth 1 + foreach choice $gAnalyze($prob.ans) { + if {[string length $choice]>$maxWidth} {set maxWidth [string length $choice]} + } + set maxStringWidth $maxWidth + incr maxWidth 6 + + set selectMode none + listbox $valFrame.val -width [expr $maxWidth + 2] \ + -yscrollcommand "$valFrame.scroll set" -selectmode $selectMode + scrollbar $valFrame.scroll -command "$valFrame.val yview" + pack $valFrame.val $valFrame.scroll -side left + pack configure $valFrame.val -expand 1 -fill both + pack configure $valFrame.scroll -expand 0 -fill y + button $buttonFrame.cancel -text "Dismiss" -command "destroy $setWin" + pack $buttonFrame.cancel + } else { + set maxWidth 1 + set valFrame $window.analyzestrings.valFrame + $valFrame.val delete 0 end + foreach choice $gAnalyze($prob.ans) { + if {[string length $choice]>$maxWidth} {set maxWidth [string length $choice]} + } + set maxStringWidth $maxWidth + incr maxWidth 6 + } + set lastchoice [lindex $gAnalyze($gAnalyze(prob).ans) 0] + set num 1 + foreach choice [lsort $gAnalyze($gAnalyze(prob).ans)] { + if { $lastchoice != $choice } { + $valFrame.val insert end \ + "[format %-[set maxStringWidth]s $lastchoice] [format %5d $num]" + set lastchoice $choice + set num 1 + } else { + incr num + } + } + $valFrame.val insert end \ + "[format %-[set maxStringWidth]s $lastchoice] [format %5d $num]" +} + +########################################################### # analyzeUpdate ########################################################### ########################################################### @@ -4444,13 +4600,21 @@ proc analyzeUpdate { {newProbNumber 0} } set gAnalyze(highnum) [set high [lindex $gAnalyze($gAnalyze(prob).ans) end]] set gAnalyze(numuniq) [llength [lunique $gAnalyze($gAnalyze(prob).ans)]] #don't draw anything if the answers aren't numbers - if { [catch {expr $low + 1}]} { update idletask;return } + if { [catch {expr $low + 1}]} { + catch {destroy $c.button} + update idletask + button $c.button -text "List of strings" -command \ + "analyzeStrings $gAnalyze(prob) $c 1" + $c create window [expr $gAnalyze(canvaswidth)/2.0] 40 -window $c.button + analyzeStrings $gAnalyze(prob) $c 0 + return + } $c create line 25 50 [expr $gAnalyze(canvaswidth) - 25] 50 set diff [expr double($high-$low)] if { $diff == 0 } { set center [expr $gAnalyze(canvaswidth)/2.0] - $c create oval [expr $center - 2] 48 [expr $center + 2] 52 -fill green + $c create rectangle [expr $center - 2] 48 [expr $center + 2] 52 -fill green update idletasks return } @@ -4467,11 +4631,24 @@ proc analyzeUpdate { {newProbNumber 0} } set center [expr $center+25] $c create rectangle [expr $center - 1] 40 [expr $center + 1] 60 } + set lastpoint [lindex $gAnalyze($gAnalyze(prob).ans) 0] + set num 0 foreach point $gAnalyze($gAnalyze(prob).ans) { - set center [expr ($gAnalyze(canvaswidth)-50)*(($point-$low)/$diff)] - set center [expr $center+25] - $c create oval [expr $center - 2] 48 [expr $center + 2] 52 -fill green + if { $lastpoint != $point } { + set center [expr ($gAnalyze(canvaswidth)-50)*(($lastpoint-$low)/$diff)] + set center [expr $center+25] + $c create rectangle [expr $center - 2] [expr 48-$num] \ + [expr $center + 2] [expr 52+$num] -fill green + set lastpoint $point + set num 0 + } else { + incr num + } } + set center [expr ($gAnalyze(canvaswidth)-50)*(($lastpoint-$low)/$diff)] + set center [expr $center+25] + $c create rectangle [expr $center - 2] [expr 48-$num] \ + [expr $center + 2] [expr 52+$num] -fill green update idletasks }