From b5512f02f316d677592df8352c5884dd3635fabd Mon Sep 17 00:00:00 2001
From: Drew Short <drew@sothr.com>
Date: Fri, 29 Aug 2014 05:58:58 -0500
Subject: [PATCH] Working on some cleanup. Moved setup logic for the image tile
 into it's own class. Reduced the logic in the factory. Need to work on
 context menus and selectable items in the pane next. Might have to be done
 with a custom TilePane that allows selection.

---
 cli/pom.xml                                   |  1 -
 engine/pom.xml                                |  1 -
 .../imagetools/engine/ConcurrentEngine.scala  |  4 +-
 .../sothr/imagetools/engine/hash/AHash.scala  |  3 +
 .../sothr/imagetools/engine/hash/PHash.scala  |  3 +
 gui/pom.xml                                   |  1 -
 .../main/resources/fxml/mainapp/MainApp.fxml  |  5 ++
 .../imagetools/ui/component/ImageTile.scala   | 68 +++++++++++++++++--
 .../ui/component/ImageTileFactory.scala       | 62 ++---------------
 .../ui/controller/AppController.scala         | 20 +++---
 10 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 5a2b0df..a5e716d 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>com.sothr.imagetools</groupId>
   <artifactId>ImageTools-CLI</artifactId>
   <version>0.1.0</version>
   <packaging>jar</packaging>
diff --git a/engine/pom.xml b/engine/pom.xml
index e1c0d3f..2401ed9 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>com.sothr.imagetools</groupId>
   <artifactId>ImageTools-Engine</artifactId>
   <version>0.1.2</version>
   <packaging>jar</packaging>
diff --git a/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala b/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
index 129afcf..67458fa 100644
--- a/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
@@ -234,7 +234,7 @@ class ConcurrentEngineProcessingController extends Actor with ActorLogging {
    */
   def checkForResults() = {
     try {
-      listener ! SubmitMessage(s"Finished Processing ${processed}/${processed} images")
+      listener ! SubmitMessage(s"Finished Processing $processed/$processed images")
       processorsFinished = 0
       toProcess = 0
       processed = 0
@@ -396,7 +396,7 @@ class ConcurrentEngineSimilarityController extends Actor with ActorLogging {
    */
   def checkForResults() = {
     try {
-      listener ! SubmitMessage(s"Finished Scanning ${processed}/${processed} images")
+      listener ! SubmitMessage(s"Finished Scanning $processed/$processed images")
       processorsFinished = 0
       toProcess = 0
       processed = 0
diff --git a/engine/src/main/scala/com/sothr/imagetools/engine/hash/AHash.scala b/engine/src/main/scala/com/sothr/imagetools/engine/hash/AHash.scala
index 8fda977..16a04e2 100644
--- a/engine/src/main/scala/com/sothr/imagetools/engine/hash/AHash.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/hash/AHash.scala
@@ -3,6 +3,9 @@ package com.sothr.imagetools.engine.hash
 import grizzled.slf4j.Logging
 
 /**
+ * Speedy AHash Perceptual Hashing
+ * Uses the average value of the pixels as a baseline
+ *
  * Created by dev on 1/22/14.
  */
 object AHash extends PerceptualHasher with Logging {
diff --git a/engine/src/main/scala/com/sothr/imagetools/engine/hash/PHash.scala b/engine/src/main/scala/com/sothr/imagetools/engine/hash/PHash.scala
index 49aac58..232e96f 100644
--- a/engine/src/main/scala/com/sothr/imagetools/engine/hash/PHash.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/hash/PHash.scala
@@ -4,6 +4,9 @@ import edu.emory.mathcs.jtransforms.dct.FloatDCT_2D
 import grizzled.slf4j.Logging
 
 /**
+ * Complex perceptual hash
+ * Uses FFT to get
+ *
  * Created by dev on 1/22/14.
  */
 object PHash extends PerceptualHasher with Logging {
diff --git a/gui/pom.xml b/gui/pom.xml
index d146026..0da165e 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -9,7 +9,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>com.sothr.imagetools</groupId>
   <artifactId>ImageTools-GUI</artifactId>
   <version>0.1.0</version>
   <packaging>jar</packaging>
diff --git a/gui/src/main/resources/fxml/mainapp/MainApp.fxml b/gui/src/main/resources/fxml/mainapp/MainApp.fxml
index 8772b33..969ae59 100644
--- a/gui/src/main/resources/fxml/mainapp/MainApp.fxml
+++ b/gui/src/main/resources/fxml/mainapp/MainApp.fxml
@@ -65,6 +65,11 @@
                       <bottom>
                         <FlowPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="60.0" prefWidth="220.0" BorderPane.alignment="CENTER">
                           <children>
+                                          <CheckBox fx:id="doRecursiveProcessing" mnemonicParsing="false" text="Recursive">
+                                             <FlowPane.margin>
+                                                <Insets bottom="5.0" />
+                                             </FlowPane.margin>
+                                          </CheckBox>
                             <Button maxWidth="1.7976931348623157E308" minWidth="220.0" mnemonicParsing="false" onAction="#showAllImages" text="Show All Images">
                               <FlowPane.margin>
                                 <Insets bottom="5.0" />
diff --git a/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala b/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala
index 9792613..9845805 100644
--- a/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala
+++ b/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTile.scala
@@ -1,22 +1,76 @@
 package com.sothr.imagetools.ui.component
 
+import java.io.FileInputStream
+import javafx.event.EventHandler
+import javafx.geometry.Pos
+import javafx.scene.control.{Tooltip, Label}
+import javafx.scene.image.{ImageView}
+import javafx.scene.input.MouseEvent
 import javafx.scene.layout.VBox
 
-import com.sothr.imagetools.engine.image.Image
+import grizzled.slf4j.Logging
+import resource._
 
 /**
  * ImageTile class that is a special VBox
  *
  * Created by drew on 8/22/14.
  */
-class ImageTile extends VBox {
-  var imageData: Image = null
+class ImageTile(thumbnailWidth: Integer, image: com.sothr.imagetools.engine.image.Image) extends VBox with Logging {
+  val imageData: com.sothr.imagetools.engine.image.Image = image
+  val preferedTileSize = (thumbnailWidth + 32).toDouble
+  //set tile size
+  this.setPrefSize(preferedTileSize, preferedTileSize)
+  this.setMinSize(preferedTileSize, preferedTileSize)
+  this.setMaxSize(preferedTileSize, preferedTileSize)
 
-  def getImageData: Image = {
-    imageData
+  this.setAlignment(Pos.TOP_CENTER)
+  this.addEventFilter(MouseEvent.MOUSE_PRESSED, new EventHandler[MouseEvent] {
+    override def handle(event: MouseEvent): Unit = {
+      if (event.isPrimaryButtonDown) {
+        //double click
+        if (event.getClickCount == 2) {
+          // Look into http://stackoverflow.com/questions/228477/how-do-i-programmatically-determine-operating-system-in-java
+          // for proper multi-platform opening support
+          //Desktop.getDesktop.open(new File(image.getImagePath))
+        } else {
+
+        }
+      } else if (event.isSecondaryButtonDown) {
+        //right click context menu
+      }
+    }
+  })
+
+  // Image
+  val genImageView = new ImageView()
+  debug(s"Getting thumbnail from: ${image.getThumbnailPath}")
+  managed(new FileInputStream(image.getThumbnailPath)) acquireAndGet {
+    thumbSource =>
+      val thumbnail = new javafx.scene.image.Image(thumbSource)
+      genImageView.setImage(thumbnail)
+      if (thumbnail.getHeight > thumbnail.getWidth) {
+        genImageView.setFitHeight(128.0)
+      } else {
+        genImageView.setFitWidth(128.0)
+      }
   }
+  genImageView.setPreserveRatio(true)
+
+  this.getChildren.add(genImageView)
 
-  def setImageData(image: Image) = {
-    this.imageData = image
+  //Label
+  val imageLabel = new Label()
+  imageLabel.setText(s"${image.getHeight}x${image.getWidth}")
+  imageLabel.setWrapText(true)
+
+  //Tooltip
+  val tooltip = new Tooltip()
+  tooltip.setText(s"${image.getName}")
+  imageLabel.setTooltip(tooltip)
+  this.getChildren.add(imageLabel)
+
+  def getImageData: com.sothr.imagetools.engine.image.Image = {
+    imageData
   }
 }
diff --git a/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala b/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala
index 8cbb35b..017eaab 100644
--- a/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala
+++ b/gui/src/main/scala/com/sothr/imagetools/ui/component/ImageTileFactory.scala
@@ -1,15 +1,9 @@
 package com.sothr.imagetools.ui.component
 
-import java.awt.Desktop
-import java.io.{File, FileInputStream}
-import javafx.event.EventHandler
-import javafx.geometry.{Insets, Pos}
-import javafx.scene.control.{Label, Tooltip}
-import javafx.scene.image.{Image, ImageView}
-import javafx.scene.input.MouseEvent
+import javafx.geometry.Insets
 
+import com.sothr.imagetools.engine.util.PropertiesService
 import grizzled.slf4j.Logging
-import resource._
 
 /**
  * Created by drew on 8/6/14.
@@ -19,58 +13,10 @@ import resource._
 object ImageTileFactory extends Logging {
 
   def get(image: com.sothr.imagetools.engine.image.Image): ImageTile = {
-    val imageTile = new ImageTile()
-    imageTile.setImageData(image)
-    //set tile size
-    imageTile.setPrefSize(160.0d, 160.0d)
-    imageTile.setMinSize(160.0d, 160.0d)
-    imageTile.setMaxSize(160.0d, 160.0d)
+    val thumbnailWidth = PropertiesService.get("app.thumbnail.size","128").toInt
+    val imageTile = new ImageTile(thumbnailWidth, image)
     //set padding
     imageTile.setPadding(new Insets(2, 2, 2, 2))
-    //imageTile.setSpacing(5.0d)
-    imageTile.setAlignment(Pos.TOP_CENTER)
-    imageTile.addEventFilter(MouseEvent.MOUSE_PRESSED, new EventHandler[MouseEvent] {
-      override def handle(event: MouseEvent): Unit = {
-        if (event.isPrimaryButtonDown) {
-          //double click
-          if (event.getClickCount == 2) {
-            Desktop.getDesktop.open(new File(image.getImagePath))
-          } else {
-
-          }
-        } else if (event.isSecondaryButtonDown) {
-          //right click context menu
-        }
-      }
-    })
-
-    // Image
-    val genImageView = new ImageView()
-    debug(s"Getting thumbnail from: ${image.getThumbnailPath}")
-    managed(new FileInputStream(image.getThumbnailPath)) acquireAndGet {
-      thumbSource =>
-        val thumbnail = new Image(thumbSource)
-        genImageView.setImage(thumbnail)
-        if (thumbnail.getHeight > thumbnail.getWidth) {
-          genImageView.setFitHeight(128.0)
-        } else {
-          genImageView.setFitWidth(128.0)
-        }
-    }
-    genImageView.setPreserveRatio(true)
-
-    imageTile.getChildren.add(genImageView)
-
-    //Label
-    val imageLabel = new Label()
-    imageLabel.setText(s"${image.getHeight}x${image.getWidth}")
-    imageLabel.setWrapText(true)
-
-    //Tooltip
-    val tooltip = new Tooltip()
-    tooltip.setText(s"${image.getName}")
-    imageLabel.setTooltip(tooltip)
-    imageTile.getChildren.add(imageLabel)
 
     imageTile
   }
diff --git a/gui/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala b/gui/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala
index abbfd13..336489a 100644
--- a/gui/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala
+++ b/gui/src/main/scala/com/sothr/imagetools/ui/controller/AppController.scala
@@ -1,13 +1,12 @@
 package com.sothr.imagetools.ui.controller
 
 import java.io.{File, IOException}
-import java.util.ArrayList
 import java.util.Scanner
 import javafx.application.Platform
 import javafx.event.ActionEvent
 import javafx.fxml.FXML
 import javafx.scene.control._
-import javafx.scene.layout.{VBox, TilePane, AnchorPane}
+import javafx.scene.layout.{AnchorPane, TilePane, VBox}
 import javafx.scene.text.{Text, TextAlignment}
 import javafx.scene.web.WebView
 import javafx.scene.{Group, Node, Scene}
@@ -15,17 +14,17 @@ import javafx.stage.{DirectoryChooser, Stage, StageStyle}
 import javafx.util.Callback
 
 import akka.actor._
+import com.sothr.imagetools.engine._
 import com.sothr.imagetools.engine.image.{Image, SimilarImages}
 import com.sothr.imagetools.engine.util.{PropertiesService, ResourceLoader}
-import com.sothr.imagetools.engine._
 import com.sothr.imagetools.ui.component.ImageTileFactory
 import grizzled.slf4j.Logging
 import org.markdown4j.Markdown4jProcessor
 
 import scala.collection.mutable
+import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent._
 import scala.util.{Failure, Success}
-import ExecutionContext.Implicits.global
 
 /**
  * Main Application controller
@@ -48,6 +47,7 @@ class AppController extends Logging {
   // Others
   @FXML var progressBar: ProgressBar = null
   @FXML var paginator: Pagination = null
+  @FXML var doRecursiveProcessing: CheckBox = null
 
   // Engine
   val engine: Engine = new ConcurrentEngine()
@@ -164,9 +164,9 @@ class AppController extends Logging {
   @FXML
   def showAllImages(event: ActionEvent) = {
     resetPaginator()
-    imageTilePane.getChildren.setAll(new ArrayList[Node]())
+    imageTilePane.getChildren.setAll(new java.util.ArrayList[Node]())
     val f: Future[List[Image]] = Future {
-      engine.getImagesForDirectory(currentDirectory)
+      engine.getImagesForDirectory(currentDirectory, recursive = doRecursiveProcessing.isSelected)
     }
 
     f onComplete {
@@ -187,10 +187,10 @@ class AppController extends Logging {
   @FXML
   def showSimilarImages(event: ActionEvent) = {
     resetPaginator()
-    imageTilePane.getChildren.setAll(new ArrayList[Node]())
+    imageTilePane.getChildren.setAll(new java.util.ArrayList[Node]())
 
     val f: Future[List[SimilarImages]] = Future {
-      engine.getSimilarImagesForDirectory(currentDirectory)
+      engine.getSimilarImagesForDirectory(currentDirectory, recursive = doRecursiveProcessing.isSelected)
     }
 
     f onComplete {
@@ -234,9 +234,9 @@ class AppController extends Logging {
   def showPage(pageIndex: Integer) = {
     val itemsPerPage = PropertiesService.get("app.ui.thumbsPerPage", "50").toInt
     val startIndex = pageIndex * itemsPerPage
-    val endIndex = if ((startIndex + itemsPerPage) > this.currentImages.size) this.currentImages.length else (startIndex + itemsPerPage)
+    val endIndex = if ((startIndex + itemsPerPage) > this.currentImages.size) this.currentImages.length else startIndex + itemsPerPage
     //clear and populate the scrollpane
-    imageTilePane.getChildren.setAll(new ArrayList[Node]())
+    imageTilePane.getChildren.setAll(new java.util.ArrayList[Node]())
     val images = this.currentImages.slice(startIndex, endIndex)
     Platform.runLater(new Runnable() {
       override def run() {