Changeset 664

Timestamp:

Dec 4, 2009 5:09:57 PM (14 years ago)

Author:

toby

Message:

# on 2002/12/30 17:00:34, toby did:
updated pleasewait
implement CIF(maxvalues) to control max CIF size
define contents of CIF(status) , to be displayed on "pleasewait" & check

CIF size against maximum

check to see if skip forward is in fact going backwards (prevent infinite loop)
scroll text box while parsing -- looks neat!
implement (&comment out) multiple selection of looped items

File:

• trunk/browsecif.tcl (modified) (11 diffs, 3 props)

trunk/browsecif.tcl

@@ -292 +292 @@
 
 # tell'em what is happening
-proc pleasewait {{message {}}} {
+proc pleasewait {{message {}} {statusvar {}} {parent .} {button ""}} {
     catch {destroy .msg}
     toplevel .msg
     wm transient .msg [winfo toplevel .]
     pack [frame .msg.f -bd 4 -relief groove] -padx 5 -pady 5
-    pack [message .msg.f.m -text "Please wait $message"]
+    pack [message .msg.f.m -text "Please wait $message"] -side top
+    if {$statusvar != ""} {
+        pack [label .msg.f.status -textvariable $statusvar] -side top
+    }
+    if {$button != ""} {
+        pack [button .msg.f.button -text [lindex $button 0] \
+                -command [lindex $button 1]] -side top
+    }
     wm withdraw .msg
     update idletasks
-    # place the message on top of the main window
-    set x [expr [winfo x .] + [winfo width .]/2 - \
-            [winfo reqwidth .msg]/2 - [winfo vrootx .]]
+    # place the message on top of the parent window
+    set x [expr [winfo x $parent] + [winfo width $parent]/2 - \
+            [winfo reqwidth .msg]/2 - [winfo vrootx $parent]]
     if {$x < 0} {set x 0}
-    set y [expr [winfo y .] + [winfo height .]/2 - \
-            [winfo reqheight .msg]/2 - [winfo vrooty .]]
+    set y [expr [winfo y $parent] + [winfo height $parent]/2 - \
+            [winfo reqheight .msg]/2 - [winfo vrooty $parent]]
     if {$y < 0} {set y 0}
     wm geom .msg +$x+$y
@@ -389 +396 @@
 #------------------------------------------------------------------------------
 
-#------------------------------------------------------------------------------# ParseCIF reads and parses a CIF file putting the contents of
+#------------------------------------------------------------------------------
+# ParseCIF reads and parses a CIF file putting the contents of
 # each block into arrays block1, block2,... in the caller's level
 #    the name of the block is saved as blockN(data_)
@@ -431 +439 @@
     }
 
+    # maximum size of file
+    set maxvalues 0
+    catch {
+        set maxvalues $CIF(maxvalues)
+    }
 
     set CIF(undolist) {}
@@ -447 +460 @@
     # loop over tokens
     while {$EOF} {
+        if {$CIF(markcount) % 1000 == 0} {
+            $txt see $pos
+            set CIF(status) "($CIF(markcount) values read.)"
+            update
+            # are we over the limit?
+            if {$maxvalues > 0 && $CIF(markcount) > $maxvalues} {
+                donewait
+                set msg "Too many data values to parse; stopping at $CIF(markcount), line [lindex [split $pos .] 0].\n\nIf your computer has sufficient memory to read more, increase CIF(maxvalues) in cifedit.tcl"
+                set ans [MyMessageBox -parent . -title "CIF Too big" \
+                        -message $msg -icon error -type "{Stop Parsing}" \
+                        -default "stop parsing"]
+                
+                return $blocks
+            }
+        }
         # skip forward to the first non-blank character
-        set pos [$txt search -regexp {[^[:space:]]} $pos end]
+        set npos [$txt search -regexp {[^[:space:]]} $pos end]
         # is this the end?
-        if {$pos == ""} {
+        if {$npos == "" || \
+                [lindex [split $npos .] 0] < [lindex [split $pos .] 0] } {
             set EOF 0
             break
+        } else {
+            set pos $npos
         }
 
@@ -463 +494 @@
         # find end of token
         set epos [$txt search -regexp {[[:space:]]} $pos "$pos lineend"]
-        if {$epos == ""} {set epos [$txt index "$pos lineend"]}
+        if {$epos == ""} {
+            set epos [$txt index "$pos lineend"]
+        }
 
         set token [$txt get $pos $epos]
@@ -683 +716 @@
         }
     }
+    $txt see 1.0
     return $blocks
 }
 
-#------------------------------------------------------------------------------# Create a CIF browser/editor
+#------------------------------------------------------------------------------
+# Create a CIF browser/editor
 #  $txt is a text widget with the entire CIF loaded
 #  blocklist contains the list of defined blocks (by #)
@@ -695 +730 @@
     toplevel $frame 
     wm title $frame "CIF Browser"
-    CIFBrowserWindow $frame
+    CIFOpenBrowser $frame
     CIFBrowser $txt $blocklist $selected $frame
     grid [button $frame.c -text Close -command "destroy $frame"] -column 0 -row 1
@@ -785 +820 @@
 #   (where $frame is a frame or toplevel)
 #   note that the BWidget package is required
-proc CIFBrowserWindow {frame} {
+proc CIFOpenBrowser {frame} {
     global CIF 
     if [catch {package require BWidget}] {
@@ -878 +913 @@
 
     global CIF
-    set pointer [$CIF(tree) itemcget $name -data]
-    set dataname [lindex [$CIF(tree) itemcget $name -text] 0]
-    set CIF(lastShownTreeID) $name
-    showCIFbyDataname $pointer $dataname
+    # code to allow multiple selection within loops
+    #set loopname [lindex [$CIF(tree) itemcget $name -data] 1]
+    #set addtolist 1
+    #if {$loopname == "" || $loopname == "loop"} {set addtolist 0}
+    #foreach n $CIF(treeSelectedList) {
+        #if {$loopname != [lindex [$CIF(tree) itemcget $n -data] 1]} {
+        #    set addtolist 0
+        #    break
+        #}
+    #}
+    #if {$addtolist} {
+        #catch {$CIF(tree) itemconfigure $name -fill red}
+        #lappend CIF(treeSelectedList) $name
+    #} else {
+        foreach n $CIF(treeSelectedList) {
+            catch {$CIF(tree) itemconfigure $n -fill black}
+        }
+        set CIF(treeSelectedList) $name
+        catch {$CIF(tree) itemconfigure $name -fill red}
+        set CIF(lastShownTreeID) $name
+        set pointer [$CIF(tree) itemcget $name -data]
+        set dataname [lindex [$CIF(tree) itemcget $name -text] 0]
+        showCIFbyDataname $pointer $dataname
+    #}
 }
 
@@ -901 +956 @@
         return
     }
-    # create list of defined widgets
+    # create list of widgets defined here
     set CIF(widgetlist) {}
 
@@ -1509 +1564 @@
     # if this widget is a label, the info above will not be defined & checks are not needed
     if {$dataname == ""} {return 0}
+    if {$dataname == "errors"} {return 0}
 
     global ${block}