Changeset 1021
- Timestamp:
- Oct 12, 2010 12:46:50 PM (12 years ago)
- Location:
- branches/sandbox
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/sandbox/distrest.tcl
r1013 r1021 6 6 #::sr_lookuplist1 7 7 #::sr_lookuplist2 8 # ::sr_top8 #sr_top 9 9 #::sr_checkall 10 10 #::sr_entryvar(choicenum) … … 93 93 94 94 #Activate Restraint Editor 95 grid [button $editorbox.edit -text "Activate Distance \n Restraint Editor" -command SR_TEST] -column 0 -row 3\96 - sticky sw -columnspan 295 grid [button $editorbox.edit -text "Activate Restraint \n Editor" -command SR_TEST] -column 0 -row 4 \ 96 -columnspan 2 -pady 5 97 97 $editorbox.edit config -bg LightGreen -bd 6 98 99 grid [button $editorbox.search -text "Edit Search Distance \n Parameters" -command DA_Control_Panel] -column 0 -row 3 \ 100 -columnspan 2 101 $editorbox.edit config -bd 4 98 102 99 103 … … 317 321 pack $sr_rb -side top -fill both -expand 1 318 322 319 foreach { ::sr_top main side lbl} [MakeScrollTable $sr_rb] {}323 foreach {sr_top main side lbl} [MakeScrollTable $sr_rb] {} 320 324 set ::contraintmainbox $main 321 325 322 button $ ::sr_top.alabel1 -text "Atom 1 " -width 7 \323 -command "SR_Sort atom1 $main $ ::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"324 button $ ::sr_top.alabel2 -text "Atom 2 " -width 7 \325 -command "SR_Sort atom2 $main $ ::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"326 button $ ::sr_top.dlabel1 -text "Distance " -width 9 \327 -command "SR_Sort distance $main $ ::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"328 329 grid $ ::sr_top.alabel1 -column 1 -row 2330 grid $ ::sr_top.alabel2 -column 2 -row 2331 grid $ ::sr_top.dlabel1 -column 3 -row 2332 333 label $ ::sr_top.rlabel1 -text "Restraint"334 label $ ::sr_top.rlabel2 -text "esd"335 grid $ ::sr_top.rlabel1 -column 4 -row 2 -padx 20336 grid $ ::sr_top.rlabel2 -column 5 -row 2 -padx 20337 338 339 button $ ::sr_top.rcon1 -text "Check All" -width 10 -command {340 set ::sr_checkall 1 341 SR_Set_All_Check_Buttons 342 grid forget $ ::sr_top.rcon1343 grid $ ::sr_top.rcon2 -column 6 -row 2 -padx 5344 }345 346 button $ ::sr_top.rcon2 -text "Clear All" -width 10 -command {347 set ::sr_checkall 0 348 SR_Set_All_Check_Buttons 349 grid forget $ ::sr_top.rcon2350 grid $ ::sr_top.rcon1 -column 6 -row 2 -padx 5351 }352 353 grid $ ::sr_top.rcon1 -column 6 -row 2 -padx 5326 button $sr_top.alabel1 -text "Atom 1 " -width 7 \ 327 -command "SR_Sort atom1 $main $sr_top.alabel1 $sr_top.alabel2 $sr_top.dlabel1" 328 button $sr_top.alabel2 -text "Atom 2 " -width 7 \ 329 -command "SR_Sort atom2 $main $sr_top.alabel1 $sr_top.alabel2 $sr_top.dlabel1" 330 button $sr_top.dlabel1 -text "Distance " -width 9 \ 331 -command "SR_Sort distance $main $sr_top.alabel1 $sr_top.alabel2 $sr_top.dlabel1" 332 333 grid $sr_top.alabel1 -column 1 -row 2 334 grid $sr_top.alabel2 -column 2 -row 2 335 grid $sr_top.dlabel1 -column 3 -row 2 336 337 label $sr_top.rlabel1 -text "Restraint" 338 label $sr_top.rlabel2 -text "esd" 339 grid $sr_top.rlabel1 -column 4 -row 2 -padx 20 340 grid $sr_top.rlabel2 -column 5 -row 2 -padx 20 341 342 343 button $sr_top.rcon1 -text "Check All" -width 10 -command " 344 set ::sr_checkall 1; 345 SR_Set_All_Check_Buttons; 346 grid forget $sr_top.rcon1; 347 grid $sr_top.rcon2 -column 6 -row 2 -padx 5; 348 " 349 350 button $sr_top.rcon2 -text "Clear All" -width 10 -command " 351 set ::sr_checkall 0; 352 SR_Set_All_Check_Buttons; 353 grid forget $sr_top.rcon2; 354 grid $sr_top.rcon1 -column 6 -row 2 -padx 5; 355 " 356 357 grid $sr_top.rcon1 -column 6 -row 2 -padx 5 354 358 355 359 #SR_Sort atom1 $main … … 391 395 label $main.rdistance$i -text [lindex $rprint 8] -justify center -anchor center 392 396 entry $main.restraint$i -width 8 -textvariable ::sr_restraintdist([lindex $rprint 13]) -takefocus 1 393 bind $main.restraint$i <KeyRelease> {SR_Validate_Soft %W distance} 397 $main.restraint$i selection range 0 end 398 bind $main.restraint$i <KeyRelease> {SR_Validate_Soft %W distance} 394 399 entry $main.restesd$i -width 8 -textvariable ::sr_restraintesd([lindex $rprint 13]) -takefocus 1 400 $main.restesd$i selection range 0 end 395 401 bind $main.restesd$i <KeyRelease> {SR_Validate_Soft %W esd} 396 402 checkbutton $main.sr_crestraint$i -variable ::sr_crestraint([lindex $rprint 13]) … … 623 629 624 630 entry $srcb1.sr_dminvalue -width 8 -textvariable ::sr_dminvalue -takefocus 1 631 $srcb1.sr_dminvalue selection range 0 end 625 632 entry $srcb1.sr_dmaxvalue -width 8 -textvariable ::sr_dmaxvalue -takefocus 1 633 $srcb1.sr_dmaxvalue selection range 0 end 626 634 entry $srcb2.sr_rvalue -width 8 -textvariable ::sr_rvalue -takefocus 1 635 $srcb2.sr_rvalue selection range 0 end 627 636 entry $srcb2.sr_resd -width 8 -textvariable ::sr_resd -takefocus 1 637 $srcb2.sr_resd selection range 0 end 628 638 629 639 bind $srcb1.sr_dminvalue <KeyRelease> {SR_Validate_Soft %W dmin} -
branches/sandbox/expgui
r1019 r1021 155 155 # setting data range/excluded regions 156 156 source [file join $expgui(scriptdir) exclinit.tcl] 157 # setup DISAGL viewer & editor 158 source [file join $expgui(scriptdir) disagledit.tcl] 159 source [file join $expgui(scriptdir) geo_viewer.tcl] 157 160 #--------------------------------------------------------------------------- 158 161 # override options with locally defined values -
branches/sandbox/gsascmds.tcl
r1019 r1021 1517 1517 proc rundisagl {} { 1518 1518 global expgui txtvw tcl_version tcl_platform 1519 # call up new DISAGL parm edit box 1520 if {[DA_Control_Panel 1]} {return} 1521 # Save the current exp file if needed 1522 savearchiveexp 1519 1523 if {$expgui(disaglSeparateBox)} { 1520 1524 set root [file root $expgui(expfile)] -
branches/sandbox/gsasmenu.tcl
r930 r1021 82 82 bijcalc 83 83 disagl 84 disaglviewer 84 85 reflist 85 86 geometry … … 197 198 disagl {rundisagl { 198 199 Distance/angle calculations} 200 } 201 202 disaglviewer {Geo_Viewer { 203 Show distances and angles in a nice format} 199 204 } 200 205 -
branches/sandbox/readexp.tcl
r1020 r1021 882 882 # for none delete the record & thats all folks 883 883 if {$value == "none"} { 884 catch {unset exparray($key)}884 catch {unset ::exparray($key)} 885 885 return 886 } 886 } 887 887 if {[existsexp $key] == 0} { 888 888 makeexprec $key … … 918 918 # for none delete the record & thats all folks 919 919 if {$value == "none"} { 920 catch {unset exparray($key)}920 catch {unset ::exparray($key)} 921 921 return 922 } 922 } 923 923 if {[existsexp $key] == 0} { 924 924 makeexprec $key … … 953 953 default { 954 954 set msg "Unsupported phaseinfo access: parm=$parm action=$action" 955 tk_dialog .badexp "Error in readexp" $msg error 0 Exit 955 tk_dialog .badexp "Error in readexp" $msg error 0 Exit 956 956 } 957 957 } … … 2836 2836 default { 2837 2837 set msg "Unsupported AtmTypInfo access: parm=$parm action=$action" 2838 tk_dialog .badexp "Error in readexp" $msg error 0 Exit 2838 tk_dialog .badexp "Error in readexp" $msg error 0 Exit 2839 2839 } 2840 2840 }
Note: See TracChangeset
for help on using the changeset viewer.