Changeset 1188 for trunk


Ignore:
Timestamp:
Jan 26, 2012 10:47:43 AM (9 years ago)
Author:
toby
Message:

update to match bug fixs in sandbox

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/addcmds.tcl

    r1166 r1188  
    10561056        $np.d1.m2 config -text {}
    10571057        $np.b1 config -state disabled
     1058        $np.b1a config -state disabled
    10581059        grid forget $np.l3 $np.e3 $np.cb3 $np.cb4 $np.cb5 $np.bank $np.f6a
    10591060        grid $np.dl1 -column 0 -row 18
     
    10971098        }
    10981099        $np.b1 config -state normal
     1100        $np.b1a config -state normal
    10991101        grid $np.bank -column 2 -row 3 -columnspan 7 -sticky ew
    11001102        grid $np.f6a -column 4 -row 18 -rowspan 3
  • trunk/dumpexp.tcl

    r930 r1188  
    121121        grab .
    122122        focus .
     123        set phase {}
    123124        tkwait variable phase
    124125    }
  • trunk/expgui

    r1175 r1188  
    541541    loadexp $newexpfile
    542542
    543     # switch to the appropriate 1st page
    544     #StageTabUse
    545     SetStartPanel
    546 
    547543    # reset the phase selection
    548544    set expgui(curPhase) {}
     
    554550        set expgui(curhist) {}
    555551    }
    556 #    if {[CountHistory] > 100} {
    557 #       DeleteHistoryRecords "This .EXP file has [CountHistory] history records\nErasing most will speed EXPGUI"
    558 #    }
     552    # switch to the appropriate 1st page
     553    #StageTabUse
     554    SetStartPanel
    559555}
    560556
     
    841837        }
    842838        set ans [ReloadExpMsg [file tail $expgui(expfile)] $expgui(changed)]
    843 
     839        # did a load already occur while we were waiting for an answer?
     840        if {[file mtime $expgui(expfile)] == $expgui(expModifiedLast)} {
     841            return
     842        }
    844843        if {$ans == 0} {
    845844            loadexp $expgui(expfile)
  • trunk/gsascmds.tcl

    r1175 r1188  
    604604}
    605605
     606# for use in debugging -- how did I get here!
     607proc ShowCallStack {} {
     608    puts "\n================== ShowCallStack ==============="
     609    set n [info level]
     610    incr n -1
     611    while {$n > 0} {
     612        puts "level $n: [info level $n]"
     613        incr n -1
     614    }
     615}
    606616#------------------------------------------------------------------------------
    607617# profile/symmetry routines
     
    27872797
    27882798proc ExplainEXPerror {parent message file} {
     2799    #ShowCallStack
    27892800    if {$parent == "."} {
    27902801        set w .experr
  • trunk/rigid.tcl

    r1175 r1188  
    19331933    set atomnum $::rb_map_beginning($phasenum,$bodnum,$mapnum)
    19341934    # get a list of the atoms in the RB
    1935     set st [lsearch $::expmap(atomlist_$phase) $atomnum]
     1935    set st [lsearch $::expmap(atomlist_$phasenum) $atomnum]
    19361936    set en [expr {$st+$::rb_coord_num($bodnum,1)-1}]
    1937     set atomlist [lrange $::expmap(atomlist_$phase) $st $en]
     1937    set atomlist [lrange $::expmap(atomlist_$phasenum) $st $en]
    19381938    atominfo $phasenum $atomlist $var set $val
    19391939 }
Note: See TracChangeset for help on using the changeset viewer.