Changeset 1024

Timestamp:

Oct 12, 2010 4:40:02 PM (12 years ago)

Author:

chlake

Message:

Added Mouse Scroll Wheel Focus

Location:

branches/sandbox

Files:

• Geo_Viewer.tcl (modified) (9 diffs)
• distrest.tcl (modified) (2 diffs)
• gsascmds.tcl (modified) (2 diffs)

branches/sandbox/Geo_Viewer.tcl

@@ -38 +38 @@
 
 proc Geo_Initialize {} {
-#     set ::geo_entryvar(phase) "1"
      set ::geo_entryvar(atomtype) "all"
      catch {unset ::geo_enable}
@@ -53 +52 @@
 
    if {[file exists $filename]} {
-   #puts "$filename from [pwd] is opened"
    set fh [open $filename r]
    } else {
      puts "$filename not found in directory [pwd]"
    }
-
-   # read information from DISAGL File
 
    set bond_total -1
@@ -106 +102 @@
             set atom2 [lindex $temp 6]
             set atom3 [lindex $temp 7]
-#            set atype1 [atominfo $phase [lindex $temp 5] type]
-#            set atype2 [atominfo $phase [lindex $temp 6] type]
-#            set atype3 [atominfo $phase [lindex $temp 7] type]
-#            set atype1 [lindex [split $atype1 {+-}] 0]
-#            set atype2 [lindex [split $atype2 {+-}] 0]
-#            set atype3 [lindex [split $atype3 {+-}] 0]
             set alabel1 [atominfo $phase [lindex $temp 5] label]
             set alabel2 [atominfo $phase [lindex $temp 6] label]
@@ -119 +109 @@
             set key1 [string map {" " ""} [set t2 "${symmcode1}_[lindex $atom1]"]]
             set key3 [string map {" " ""} [set t3 "${symmcode3}_[lindex $atom3]"]]
-#            set symm2 [lindex $temp 8]
-#            set trans2 [lindex $temp 9]
-#            set symm3 [lindex $temp 10]
-#            set trans3 [lindex $temp 11]
             lappend t1 $phase $atom1 $atom2 $atom3 $alabel1 $alabel2 $alabel3 \
                          $b_angle $b_esd $key1 $key3
             lappend ::geo_phase_list $phase
             set ::geo_angles($phase,$key1,$atom2,$key3) $t1
-#            lappend ::geo_angle_keys($phase,$atom2) $key1 $key3
-#            set ::geo_angle_keys($phase,$atom2) [lsort -uniq [set ::geo_angle_keys($phase,$atom2)]]
         }
    }
@@ -136 +120 @@
 
 proc Geo_Viewer {args} {
-     #destroy .maincontrolbox
-#            puts [trace vinfo ::geo_entryvar(phase)]
-#            puts [trace vinfo ::geo_entryvar(atomtype)]
-#   foreach item [trace vinfo ::geo_entryvar(phase)] {
-#       eval trace vdelete ::geo_entryvar(phase) $item
-#   }
-#   foreach item [trace vinfo ::geo_entryvar(atomtype)] {
-#       eval trace vdelete ::geo_entryvar(atomtype) $item
-#   }
 
     # Run DISAGL
@@ -205 +180 @@
      grid $sc.atom1 -column 0 -row 1
 
-     #grid $sc.engage -column 0 -row 2 -columnspan 2
-
      label $as.atom -text "Choose Atom(s)"
 
      grid $as.atom -row 0 -column 1
-
-#     label $ad.label -text "Distance and Angle List"
-#     grid $ad.label -row 0 -column 0
-
 
      foreach {top main side lbl} [MakeScrollTable $as] {}
@@ -232 +201 @@
        $as.can config -width [lindex [$as.can cget -scrollregion] 2]
 
-   #bind $as <Configure> "catch {ResizeScrollTable $as}"
-   #bind $ad <Configure> "catch {ResizeScrollTable $ad}"
    }
 
@@ -356 +323 @@
                     label $::geo_main.$counter -text [lindex $::geo_angles($phase,$k,$atom,$key) 7]
                     grid $::geo_main.$counter -row $rownum -column $colnum -padx 5
+
                     incr colnum
                     incr counter
@@ -387 +355 @@
 }
 ResizeScrollTable [winfo parent [winfo parent $::geo_main]]
+MouseWheelScrollTable [winfo parent [winfo parent $::geo_main]]
 }
 proc Geo_Print {} {

branches/sandbox/distrest.tcl

@@ -103 +103 @@
 
     foreach {top main side lbl} [MakeScrollTable $rightfr] {}
-
+    MouseWheelScrollTable $rightfr
     set atom1_state  1
     set atom2_state  1
@@ -360 +360 @@
     SR_Fill_Display  $main
     bind $sr_rb <Configure> "ResizeScrollTable $sr_rb"
+    MouseWheelScrollTable $sr_rb
     # see if reset of grab fixes tk bug with tk_optionMenu
     grab release .mainrestraintbox

branches/sandbox/gsascmds.tcl

@@ -2350 +2350 @@
     $box.can create window 0 0 -anchor nw  -window [frame $box.can.f -bd 2]
     $box.side create window 0 0 -anchor nw  -window [frame $box.side.f -bd 2]
-
     grid columnconfig $box 1 -weight 1
     grid rowconfig $box 1 -weight 1
@@ -2383 +2382 @@
         grid $box.yscroll -sticky ns -column 2 -row 1
     } else {
-        grid forget $box.yscroll 
+        grid forget $box.yscroll
     }
     if {[lindex $sizes 2] > [winfo width $box.can]} {
         grid $box.scroll -sticky ew -column 1 -row 2
     } else {
-        grid forget $box.scroll 
-    }
-}
+        grid forget $box.scroll
+    }
+}
+
+proc MouseWheelScrollTable {box} {
+     # causes mouse wheel to operate scroll for main canvas in ScrollTable
+     # mousewheel can be operated anywhere in parent window
+    bind [winfo toplevel $box] <MouseWheel> "$box.can yview scroll \[expr {-abs(%D)/%D}\] unit"
+}
+
 
 # this is used in cifselect -- not sure why anymore