#194 Added scroll zoom to projections.

Rich2 · Feb 3, 2023 · 5364348 · 5364348
1 parent 5cb6dfc
commit 5364348
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/Geom/srcGui/CanvasPanelled.scala b/Geom/srcGui/CanvasPanelled.scala
@@ -1,4 +1,4 @@
-/* Copyright 2018-21 Richard Oliver. Licensed under Apache Licence version 2.0. */
+/* Copyright 2018-23 Richard Oliver. Licensed under Apache Licence version 2.0. */
 package ostrat; package pgui
 import geom._
 

diff --git a/Geom/srcGui/CanvasPlatform.scala b/Geom/srcGui/CanvasPlatform.scala
@@ -22,7 +22,7 @@ trait CanvasPlatform extends RectCenlign
   var mouseDragged: (Pt2, MouseButton) => Unit = (v, b) => {}
   var keyDown: (String) => Unit = (s) => {}
   var keyUp: (String) => Unit = (s) => {}
-  var onScroll: Boolean => Unit = b => {}
+  var onScroll: Boolean => Unit = { b => }
   var resize: () => Unit = () => {}
   def clip(pts: Polygon): Unit
 

diff --git a/Geom/srcGui/CmdBarGui.scala b/Geom/srcGui/CmdBarGui.scala
@@ -28,6 +28,7 @@ abstract class CmdBarGui(title: String) extends CanvasPanelled(title)
     topBar.repaint(a +% st)
   }
 
+  canv.onScroll = b => mainPanel.onScroll(b)
   def mainMouseUp: (MouseButton, AnyArr, Pt2) => Unit = mainPanel.mouseUp
   def mainMouseUp_= (f: (MouseButton, AnyArr, Pt2) => Unit): Unit = { mainPanel.mouseUp = f }
   var selected: AnyArr = AnyArr()

diff --git a/Geom/srcGui/Panel.scala b/Geom/srcGui/Panel.scala
@@ -17,7 +17,7 @@ case class Panel(private val outerCanv: CanvasPanelled, clipPoly: Polygon, cover
   val clipVec: Vec2 = clipPoly.cenVec
   def width = clipPoly.boundingWidth
   def height = clipPoly.boundingHeight
-
+  var onScroll: Boolean => Unit = { b => }
   def repaint(elems: RArr[GraphicElem]): Unit = { canvObjs = elems; outerCanv.refreshPanel(this) }
   def repaints(elems: GraphicElem*): Unit = repaint(elems.toArr)
 }

diff --git a/Tiling/src/prid/TSysProjection.scala b/Tiling/src/prid/TSysProjection.scala
@@ -50,6 +50,14 @@ trait TSysProjection
     setStatusText(pixTileScaleStr)
   }
 
+  panel.onScroll = { b =>
+    pixelsPerC = ife(b, pixelsPerC * 1.1, pixelsPerC / 1.1)
+    setGChild
+    panel.repaint(getFrame())
+    setStatusText(pixTileScaleStr)
+  }
+
+
   val buttons: RArr[PolygonCompound]
 
   /** Projected [[Polygon]]s of the tiles. */