Changeset 1021

Timestamp:

Oct 12, 2010 12:46:50 PM (11 years ago)

Author:

chlake

Message:

add disagl edit & viewer

Location:

branches/sandbox

Files:

• Geo_Viewer.tcl (added)
• disagledit.tcl (added)
• distrest.tcl (modified) (5 diffs)
• expgui (modified) (1 diff)
• gsascmds.tcl (modified) (1 diff)
• gsasmenu.tcl (modified) (2 diffs)
• readexp.tcl (modified) (4 diffs)

branches/sandbox/distrest.tcl

@@ -6 +6 @@
 #::sr_lookuplist1
 #::sr_lookuplist2
-#::sr_top
+#sr_top
 #::sr_checkall
 #::sr_entryvar(choicenum)
@@ -93 +93 @@
 
     #Activate Restraint Editor
-    grid [button $editorbox.edit -text "Activate Distance \n Restraint Editor" -command SR_TEST] -column 0 -row 3 \
-        -sticky sw -columnspan 2
+    grid [button $editorbox.edit -text "Activate Restraint \n Editor" -command SR_TEST] -column 0 -row 4 \
+        -columnspan 2 -pady 5
         $editorbox.edit config -bg LightGreen -bd 6
+
+    grid [button $editorbox.search -text "Edit Search Distance \n Parameters" -command DA_Control_Panel] -column 0 -row 3 \
+        -columnspan 2
+        $editorbox.edit config -bd 4
 
 
@@ -317 +321 @@
     pack $sr_rb -side top -fill both -expand 1
 
-    foreach {::sr_top main side lbl} [MakeScrollTable $sr_rb] {}
+    foreach {sr_top main side lbl} [MakeScrollTable $sr_rb] {}
     set     ::contraintmainbox $main
 
-    button $::sr_top.alabel1 -text "Atom 1 " -width 7   \
-        -command "SR_Sort atom1 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
-    button $::sr_top.alabel2 -text "Atom 2 " -width 7 \
-        -command "SR_Sort atom2 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
-    button $::sr_top.dlabel1 -text "Distance " -width 9 \
-        -command "SR_Sort distance $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
-
-    grid $::sr_top.alabel1 -column 1 -row 2
-    grid $::sr_top.alabel2 -column 2 -row 2
-    grid $::sr_top.dlabel1 -column 3 -row 2
-
-    label  $::sr_top.rlabel1 -text "Restraint"
-    label  $::sr_top.rlabel2 -text "esd"
-    grid $::sr_top.rlabel1 -column 4 -row 2 -padx 20
-    grid $::sr_top.rlabel2 -column 5 -row 2 -padx 20
-
-
-    button $::sr_top.rcon1   -text "Check All" -width 10 -command {
-        set ::sr_checkall 1
-        SR_Set_All_Check_Buttons
-        grid forget $::sr_top.rcon1
-        grid $::sr_top.rcon2 -column 6 -row 2 -padx 5
-    }
-
-    button $::sr_top.rcon2   -text "Clear All" -width 10 -command {
-        set ::sr_checkall 0
-        SR_Set_All_Check_Buttons
-        grid forget $::sr_top.rcon2
-        grid $::sr_top.rcon1 -column 6 -row 2 -padx 5
-    }
-
-    grid $::sr_top.rcon1   -column 6 -row 2 -padx 5
+    button $sr_top.alabel1 -text "Atom 1 " -width 7   \
+        -command "SR_Sort atom1 $main $sr_top.alabel1 $sr_top.alabel2 $sr_top.dlabel1"
+    button $sr_top.alabel2 -text "Atom 2 " -width 7 \
+        -command "SR_Sort atom2 $main $sr_top.alabel1 $sr_top.alabel2 $sr_top.dlabel1"
+    button $sr_top.dlabel1 -text "Distance " -width 9 \
+        -command "SR_Sort distance $main $sr_top.alabel1 $sr_top.alabel2 $sr_top.dlabel1"
+
+    grid $sr_top.alabel1 -column 1 -row 2
+    grid $sr_top.alabel2 -column 2 -row 2
+    grid $sr_top.dlabel1 -column 3 -row 2
+
+    label  $sr_top.rlabel1 -text "Restraint"
+    label  $sr_top.rlabel2 -text "esd"
+    grid $sr_top.rlabel1 -column 4 -row 2 -padx 20
+    grid $sr_top.rlabel2 -column 5 -row 2 -padx 20
+
+
+    button $sr_top.rcon1   -text "Check All" -width 10 -command "
+        set ::sr_checkall 1;
+        SR_Set_All_Check_Buttons;
+        grid forget $sr_top.rcon1;
+        grid $sr_top.rcon2 -column 6 -row 2 -padx 5;
+    "
+
+    button $sr_top.rcon2   -text "Clear All" -width 10 -command "
+        set ::sr_checkall 0;
+        SR_Set_All_Check_Buttons;
+        grid forget $sr_top.rcon2;
+        grid $sr_top.rcon1 -column 6 -row 2 -padx 5;
+    "
+
+    grid $sr_top.rcon1   -column 6 -row 2 -padx 5
 
     #SR_Sort atom1 $main
@@ -391 +395 @@
                                 label $main.rdistance$i -text [lindex $rprint 8] -justify center -anchor center
                                 entry $main.restraint$i -width 8 -textvariable ::sr_restraintdist([lindex $rprint 13]) -takefocus 1
-                                bind  $main.restraint$i <KeyRelease> {SR_Validate_Soft %W distance}
+                                      $main.restraint$i selection range 0 end
+                                bind  $main.restraint$i <KeyRelease> {SR_Validate_Soft %W distance}
                                 entry $main.restesd$i -width 8 -textvariable ::sr_restraintesd([lindex $rprint 13]) -takefocus 1
+                                      $main.restesd$i selection range 0 end
                                 bind  $main.restesd$i <KeyRelease> {SR_Validate_Soft %W esd}
                                 checkbutton $main.sr_crestraint$i -variable ::sr_crestraint([lindex $rprint 13])
@@ -623 +629 @@
 
     entry  $srcb1.sr_dminvalue -width 8 -textvariable ::sr_dminvalue        -takefocus 1
+           $srcb1.sr_dminvalue selection range 0 end
     entry  $srcb1.sr_dmaxvalue -width 8 -textvariable ::sr_dmaxvalue        -takefocus 1
+           $srcb1.sr_dmaxvalue selection range 0 end
     entry  $srcb2.sr_rvalue    -width 8 -textvariable ::sr_rvalue           -takefocus 1
+           $srcb2.sr_rvalue selection range 0 end
     entry  $srcb2.sr_resd      -width 8 -textvariable ::sr_resd             -takefocus 1
+           $srcb2.sr_resd selection range 0 end
 
     bind  $srcb1.sr_dminvalue <KeyRelease> {SR_Validate_Soft %W dmin}

branches/sandbox/expgui

@@ -155 +155 @@
 # setting data range/excluded regions
 source [file join $expgui(scriptdir) exclinit.tcl]
+# setup DISAGL viewer & editor
+source [file join $expgui(scriptdir) disagledit.tcl]
+source [file join $expgui(scriptdir) geo_viewer.tcl]
 #---------------------------------------------------------------------------
 # override options with locally defined values

branches/sandbox/gsascmds.tcl

@@ -1517 +1517 @@
 proc rundisagl {} {
     global expgui txtvw tcl_version tcl_platform
+    # call up new DISAGL parm edit box
+    if {[DA_Control_Panel 1]} {return}
+    # Save the current exp file if needed
+    savearchiveexp
     if {$expgui(disaglSeparateBox)} {
         set root [file root $expgui(expfile)] 

branches/sandbox/gsasmenu.tcl

@@ -82 +82 @@
         bijcalc
         disagl
+        disaglviewer
         reflist
         geometry
@@ -197 +198 @@
     disagl      {rundisagl {
         Distance/angle calculations}
+    }
+
+    disaglviewer {Geo_Viewer {
+        Show distances and angles in a nice format}
     }
 

branches/sandbox/readexp.tcl

@@ -882 +882 @@
             # for none delete the record & thats all folks
             if {$value == "none"} {
-                catch {unset exparray($key)}
+                catch {unset ::exparray($key)}
                 return
-            }               
+            }
             if {[existsexp $key] == 0} {
                 makeexprec $key
@@ -918 +918 @@
             # for none delete the record & thats all folks
             if {$value == "none"} {
-                catch {unset exparray($key)}
+                catch {unset ::exparray($key)}
                 return
-            }               
+            }
             if {[existsexp $key] == 0} {
                 makeexprec $key
@@ -953 +953 @@
         default {
             set msg "Unsupported phaseinfo access: parm=$parm action=$action"
-            tk_dialog .badexp "Error in readexp" $msg error 0 Exit 
+            tk_dialog .badexp "Error in readexp" $msg error 0 Exit
         }
     }
@@ -2836 +2836 @@
         default {
             set msg "Unsupported AtmTypInfo access: parm=$parm action=$action"
-            tk_dialog .badexp "Error in readexp" $msg error 0 Exit 
+            tk_dialog .badexp "Error in readexp" $msg error 0 Exit
         }
     }