Changeset 4031 for trunk/gui/scripts/geoviewer.tcl

Timestamp:

Nov 4, 2013, 10:49:37 AM (11 years ago)

Author:

ldelgass

Message:

Don't hard code map now that loading works. Send raw mouse coords instead of
normalized, since server is using a different event queue now.

File:

• trunk/gui/scripts/geoviewer.tcl (modified) (2 diffs)

trunk/gui/scripts/geoviewer.tcl

@@ -716 +716 @@
         }
 
-        SendCmd "renderer load /usr/share/osgearth/maps/gdal_tiff.earth"
-
         set w [winfo width $itk_component(view)]
         set h [winfo height $itk_component(view)]
@@ -991 +989 @@
 
 itcl::body Rappture::GeoViewer::MouseClick {button x y} {
+    if {0} {
     set w [winfo width $itk_component(view)]
     set h [winfo height $itk_component(view)]
     set x [expr {(2.0 * double($x)/$w) - 1.0}]
     set y [expr {(2.0 * double($y)/$h) - 1.0}]
+    }
     SendCmd "mouse click $button $x $y"
 }
 
 itcl::body Rappture::GeoViewer::MouseDoubleClick {button x y} {
+    if {0} {
     set w [winfo width $itk_component(view)]
     set h [winfo height $itk_component(view)]
     set x [expr {(2.0 * double($x)/$w) - 1.0}]
     set y [expr {(2.0 * double($y)/$h) - 1.0}]
+    }
     SendCmd "mouse dblclick $button $x $y"
 }
 
 itcl::body Rappture::GeoViewer::MouseDrag {button x y} {
+    if {0} {
     set w [winfo width $itk_component(view)]
     set h [winfo height $itk_component(view)]
     set x [expr {(2.0 * double($x)/$w) - 1.0}]
     set y [expr {(2.0 * double($y)/$h) - 1.0}]
+    }
     SendCmd "mouse drag $button $x $y"
 }
 
 itcl::body Rappture::GeoViewer::MouseRelease {button x y} {
+    if {0} {
     set w [winfo width $itk_component(view)]
     set h [winfo height $itk_component(view)]
     set x [expr {(2.0 * double($x)/$w) - 1.0}]
     set y [expr {(2.0 * double($y)/$h) - 1.0}]
+    }
     SendCmd "mouse release $button $x $y"
 }
 
 itcl::body Rappture::GeoViewer::MouseMotion {x y} {
+    if {0} {
     set w [winfo width $itk_component(view)]
     set h [winfo height $itk_component(view)]
     set x [expr {(2.0 * double($x)/$w) - 1.0}]
     set y [expr {(2.0 * double($y)/$h) - 1.0}]
+    }
     SendCmd "mouse motion $x $y"
 }