#206 Tidying up.

Rich2 · Mar 23, 2023 · c464920 · c464920
1 parent eeeef17
commit c464920
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Dev/srcStrat/dless/DLessGui.scala b/Dev/srcStrat/dless/DLessGui.scala
@@ -20,10 +20,8 @@ case class DLessGui(canv: CanvasPlatform, scenIn: DLessScen, viewIn: HGView, isF
 
   override def frame: GraphicElems =
   {
-    //def lines2: GraphicElems = proj.ifTileScale(50, lines1)
-
-    def hexStrs: RArr[TextGraphic] = terrs.hcOptFlatMap { (hc, terr) =>
-      proj.transOptCoord(hc).map { pt =>
+    def hexStrs: RArr[TextGraphic] = terrs.hcOptFlatMap { (hc, terr) => if (armies(hc).nonEmpty) None
+    else  proj.transOptCoord(hc).map { pt =>
         val strs: StrArr = StrArr(hc.rcStr32) /*.appendOption(proj.hCoordOptStr(hc))*/ +% hc.strComma
         TextGraphic.lines(strs, 12, pt, terr.contrastBW)
       }

diff --git a/EGrid/src/egrid/EGridBaseGui.scala b/EGrid/src/egrid/EGridBaseGui.scala
@@ -1,6 +1,6 @@
 /* Copyright 2018-23 Richard Oliver. Licensed under Apache Licence version 2.0. */
 package ostrat; package egrid
-import geom._, pglobe._, prid._, phex._, egrid._
+import geom._, prid._, phex._
 
 abstract class EGridBaseGui(title: String)  extends HGridSysGui(title)
 { implicit val gridSys: HGridSys
@@ -55,5 +55,5 @@ abstract class EGridBaseGui(title: String)  extends HGridSysGui(title)
     }
   }
 
-  def lines4: GraphicElems = proj.ifTileScale(50, lines3)
+  def lines4: GraphicElems = proj.ifTileScale(150, lines3)
 }