Changeset 1219 for trunk/expgui


Ignore:
Timestamp:
Aug 19, 2012 1:24:43 PM (8 years ago)
Author:
toby
Message:

Major new release: bug fixes for rigid bodies; Split Restraints from Constraints; add chemistry restraints; edit f' & f; fixes for fixing atoms; start work on Absorption constraints and interface for Fourier maps

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/expgui

    r1188 r1219  
    6868catch {if $env(DEBUG) {set expgui(debug) 1}}
    6969#set expgui(debug) 1
    70 
     70set expgui(HistSelectList) {}
    7171# location for web pages, if not found locally
    7272set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
     
    159159source [file join $expgui(scriptdir) disagledit.tcl]
    160160source [file join $expgui(scriptdir) Geo_Viewer.tcl]
     161# setup Anomalous Dispersion Coefficent Editor
     162source [file join $expgui(scriptdir) anomal.tcl]
    161163#---------------------------------------------------------------------------
    162164# override options with locally defined values
     
    13371339    # is this fixed?
    13381340    set param [string toupper $var]
    1339     if {[array name ::fix_param "$phase,$atom,$param"] != ""} {
    1340         return [format "%9.5fF" [atominfo $phase $atom $var]]
     1341    if {[atom_constraint_get $phase $atom $param]} {
     1342        return [format "%9.5ff" [atominfo $phase $atom $var]]
    13411343    }
    13421344    # is this atom in a rigid body?
     
    16351637            -yscrollcommand "$frm.y set" \
    16361638            ] -row 2 -column 0 -sticky news
    1637     lappend expgui(HistSelectList) $frm
     1639    if {[lsearch $expgui(HistSelectList) $frm] < 0} {
     1640        lappend expgui(HistSelectList) $frm
     1641    }
    16381642    grid [scrollbar $frm.x -orient horizontal \
    16391643            -command "move2boxesX \" $frm.title $frm.lbox \" "
     
    16591663    }
    16601664    foreach lbox $expgui(HistSelectList) {
     1665        if {! [winfo exists $lbox]} continue
    16611666        $lbox.title delete 0 end
    16621667        $lbox.lbox delete 0 end
     
    17211726    # title field needs to match longest title
    17221727    foreach lbox $expgui(HistSelectList) {
     1728        if {! [winfo exists $lbox]} continue
    17231729        $lbox.title insert end [format "%2s %s %4s %8s  %-67s" \
    17241730                "h#" \
     
    17561762        }
    17571763        foreach lbox $expgui(HistSelectList) {
     1764            if {! [winfo exists $lbox]} continue
    17581765            $lbox.lbox insert end [format "%2d  %s %4d %8s  %-67s" \
    17591766                    $h \
     
    17931800            } else {
    17941801                $c configure -state normal
    1795             } 
     1802            }
    17961803        }
    17971804    }
     
    18151822        set expgui(backtermlbl) ""
    18161823        set expgui(backtypelbl) ""
    1817         set expgui(abstypelbl) "" 
     1824        set expgui(abstypelbl) ""
    18181825        foreach var {bref bdamp absref absdamp} {
    18191826            set entrycmd($var) ""
     
    18211828        }
    18221829        $expgui(histFrame).top.txt config -text "No Selected Histograms"
    1823         grid $expgui(histFrame).top -column 1 -row 0 -sticky nsew       
     1830        grid $expgui(histFrame).top -column 1 -row 0 -sticky nsew
    18241831        set expgui(bkglbl) ""
    18251832        set expgui(abslbl) ""
     
    18321839        set expgui(backtermlbl) ""
    18331840        set expgui(backtypelbl) ""
    1834         set expgui(abstypelbl) "" 
     1841        set expgui(abstypelbl) ""
    18351842        foreach var {bref bdamp absref absdamp} {
    18361843            set entrycmd($var) "histinfo [list $histlist] $var"
    18371844            set entryvar($var) [histinfo [lindex $histlist 0] $var]
    18381845        }
     1846        $expgui(histFrame).bb.anom config -state disabled
    18391847    } else {
    18401848        set hist $histlist
     
    18691877            set expgui(abstypelbl) "  Model #$abstype, value: [histinfo $hist abscor1]"
    18701878        }
     1879        $expgui(histFrame).bb.anom config -state normal
    18711880    }
    18721881    # Top box
     
    33283337            DisplayProfile \
    33293338            1  expgui5.html ""}
    3330     {consFrame    "Re/Constraints" \
     3339    {consFrame    "Constraints" \
    33313340            "source [file join $expgui(scriptdir) atomcons.tcl]; MakeConstraintsPane" \
    33323341            DisplayConstraintsPane \
     3342            0  expgui6.html ""}
     3343    {restrFrame    "Restraints" \
     3344            "source [file join $expgui(scriptdir) atomcons.tcl]; MakeRestraintsPane" \
     3345            DisplayRestraintsPane \
    33333346            0  expgui6.html ""}
    33343347    {rbFrame   "Rigid Body" \
     
    38933906            -command SetHistUseFlags
    38943907    grid $expgui(histFrame).bb.use -column 2 -row 1
     3908    button $expgui(histFrame).bb.anom -text "Edit\n\u0394f' and \u0394f\""\
     3909            -command Edit_Anomalous
     3910    grid $expgui(histFrame).bb.anom -column 3 -row 1
    38953911
    38963912    # BACKGROUND information.
Note: See TracChangeset for help on using the changeset viewer.