#194 HSysProjectionEarth now providing outer sides for GridWorldGui.

Rich2 · Aug 14, 2022 · 122cc10 · 122cc10
1 parent 27bcda0
commit 122cc10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Tiling/src/egrid/GridWorldGui.scala b/Tiling/src/egrid/GridWorldGui.scala
@@ -85,7 +85,7 @@ class GridWorldGui(val canv: CanvasPlatform, scenIn: EScenWarm, viewIn: HGView)
     val outers2 = outers.fromLatLongFocus(focus)
     val outers3 = outers2.filter(_.zsPos)
     val outers4 = outers3.map(_.xyLineSeg(scale).draw(Gold, 3))
-    def outers5 = ifGScale(4, outers4)
+    def outers5 = Arr(proj.outerSidesDraw(3, Gold))//  ifGScale(4, outers4)
 
     val irrLines = irr1.map { a => a._2.map(_ / scale).draw(White) }
     def irrLines2 = ifGScale(2, irrLines)

diff --git a/Tiling/src/egrid/HSysProjectionEarth.scala b/Tiling/src/egrid/HSysProjectionEarth.scala
@@ -5,8 +5,18 @@ import geom._, prid._, phex._, pglobe._, pgui._
 case class HSysProjectionEarth(gridSys: EGridSys, panel: Panel) extends HSysProjection
 {
   override type GridT = EGridSys
-  var focus: LatLong = 0 ll 0//gridSys.hCoordLL(viewIn.hCoord)
-  var scale: Length = 20.km
+  var focus: LatLong = 0 ll 0
+  var scale: Length = 4.km
+  def gScale: Double = gridSys.cScale / scale
+
+  override def setView(view: Any): Unit = view match {
+    case hv: HGView => {
+      scale = gridSys.cScale / hv.pxScale
+      focus = gridSys.hCoordLL(hv.hCoord)
+    }
+    //case d: Double => cPScale = d
+    case _ =>
+  }
 //  val sides0 = sTerrs.truesMap(_.lineSegHC.map(gridSys.hCoordLL(_)))
 //
 //  def sides1: LineSegM3Arr = sides0.map {