Possibility to start a new analysis from results view.

mikkomaran · mikkomaran · commit 5cfe0fe04dae · 2021-04-08T14:56:00.000+03:00
Zip image hover color and default color change.
Analysis time is measured.
diff --git a/src/main/java/ee/ut/similaritydetector/backend/Analyser.java b/src/main/java/ee/ut/similaritydetector/backend/Analyser.java
@@ -22,6 +22,7 @@ public class Analyser extends Task<Void> {
 
     private int totalSolutionPairsCount;
     private int analysedSolutionPairsCount;
+    private double analysisDuration;
 
     private final MainViewController mainViewController;
 
@@ -66,6 +67,14 @@ public int getAnalysedSolutionPairsCount() {
         return analysedSolutionPairsCount;
     }
 
+    public double getAnalysisDuration() {
+        return analysisDuration;
+    }
+
+    public void setAnalysisDuration(double analysisDuration) {
+        this.analysisDuration = analysisDuration;
+    }
+
     @Override
     protected Void call() {
         updateProgress(0,100);
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/MainViewController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/MainViewController.java
@@ -19,6 +19,8 @@
 import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 import static ee.ut.similaritydetector.ui.utils.AlertUtils.showAlert;
 import static ee.ut.similaritydetector.ui.utils.AlertUtils.showAndWaitAlert;
@@ -135,9 +137,14 @@ private void startAnalysis() {
         //Starts the backend similarity analysis on a new thread
         Thread analyserThread = new Thread(analyser, "analyser_thread");
         analyserThread.setDaemon(true);
+        long startTime = System.nanoTime();
         analyserThread.start();
 
         analyser.setOnSucceeded(workerStateEvent -> {
+            long endTime = System.nanoTime();
+            BigDecimal duration = new BigDecimal(Double.toString(((double) endTime - startTime) / 1000000000));
+            duration = duration.setScale(1, RoundingMode.HALF_UP);
+            analyser.setAnalysisDuration(duration.doubleValue());
             if (analyser.getSimilarSolutionPairs().size() == 0) {
                 showAlert("No similar solutions were detected",
                         "Try lowering the similarity threshold or check if the ZIP structure is correct",
@@ -181,7 +188,7 @@ private void hideOptions(){
     /**
      * Animates the opening of options pane.
      */
-    private void openOptions(){
+    public void openOptions(){
         Duration duration = Duration.millis(300);
         Timeline timeline = new Timeline(
                 new KeyFrame(duration,
@@ -224,9 +231,10 @@ private void openResultsView(Analyser analyser) throws IOException {
         Parent root = loader.load();
         ResultsViewController controller = loader.getController();
         controller.setAnalyser(analyser);
+        controller.setMainViewController(this);
         Platform.runLater(controller::readStatistics);
 
-        Scene resultsViewScene = new Scene(root, 800, 600);
+        Scene resultsViewScene = new Scene(root, MainViewController.stage.getScene().getWidth(), MainViewController.stage.getScene().getHeight());
         stage.setScene(resultsViewScene);
         stage.setTitle("Source code similarity detector - Results - " + analyser.getZipDirectory().getName());
 
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java
@@ -21,6 +21,7 @@
 public class ResultsViewController {
 
     private Analyser analyser;
+    private MainViewController mainViewController;
 
     @FXML
     private MenuBarController menuBarController;
@@ -32,6 +33,8 @@ public class ResultsViewController {
     private Label totalSolutionsLabel;
     @FXML
     private Label solutionPairsLabel;
+    @FXML
+    private Label analysisDurationLabel;
 
     @FXML
     private TableView<ExerciseStatistics> exerciseStatisticsTable;
@@ -50,6 +53,8 @@ public class ResultsViewController {
 
     @FXML
     private Button viewClustersButton;
+    @FXML
+    private Button runNewAnalysisButton;
 
 
     public ResultsViewController() {
@@ -59,6 +64,10 @@ public void setAnalyser(Analyser analyser) {
         this.analyser = analyser;
     }
 
+    public void setMainViewController(MainViewController mainViewController) {
+        this.mainViewController = mainViewController;
+    }
+
     @FXML
     private void initialize() {
     }
@@ -70,6 +79,7 @@ public void readStatistics() {
         title.setText("Results - " + analyser.getZipDirectory().getName());
         totalSolutionsLabel.setText(String.valueOf(analyser.getExercises().stream().mapToInt(Exercise::getSolutionCount).sum()));
         solutionPairsLabel.setText(String.valueOf(analyser.getAnalysedSolutionPairsCount()));
+        analysisDurationLabel.setText(analyser.getAnalysisDuration() + " s");
         fillExerciseStatisticsTable();
         // To remove empty rows from the bottom of the table we have to set fixed cell
         int cellSize = 30;
@@ -92,7 +102,7 @@ private void fillExerciseStatisticsTable() {
     /**
      * If no similar solutions were found then the cluster viewing button is not interactable.
      */
-    public void toggleClusterButtonUsability() {
+    protected void toggleClusterButtonUsability() {
         if (analyser.getSimilarSolutionClusters() != null && analyser.getSimilarSolutionClusters().size() != 0) {
             viewClustersButton.setDisable(false);
         }
@@ -117,15 +127,18 @@ private void viewClusters() {
      *
      * @throws IOException if the code view could not be opened
      */
-    public void openCodeView() throws IOException {
+    private void openCodeView() throws IOException {
         FXMLLoader loader = new FXMLLoader(getClass().getResource(
                 "/ee/ut/similaritydetector/fxml/code_view.fxml"));
         Parent root = loader.load();
         CodeViewController controller = loader.getController();
         controller.setClusters(analyser.getSimilarSolutionClusters());
         Platform.runLater(controller::createClusterItems);
-
-        Scene codeViewScene = new Scene(root, 1200, 700);
+        double width = MainViewController.stage.getScene().getWidth() > 1200 ?
+                MainViewController.stage.getScene().getWidth() : 1200;
+        double height = MainViewController.stage.getScene().getHeight() > 700 ?
+                MainViewController.stage.getScene().getHeight() : 700;
+        Scene codeViewScene = new Scene(root, width, height);
         Stage newWindow = new Stage();
         newWindow.setMinWidth(800);
         newWindow.setMinHeight(600);
@@ -144,4 +157,31 @@ public void openCodeView() throws IOException {
         Platform.runLater(controller::resizeClusterTableColumns);
     }
 
+    @FXML
+    private void runNewAnalysis() {
+        try {
+            openMainView();
+        } catch (IOException e) {
+            e.printStackTrace();
+            showAndWaitAlert("Could not navigate back to main view", "Try restarting the application", Alert.AlertType.ERROR);
+        }
+    }
+
+    private void openMainView() throws IOException {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/ee/ut/similaritydetector/fxml/main_view.fxml"));
+        Parent root = loader.load();
+        loader.setController(mainViewController);
+        MainViewController.stage.setTitle("Source code similarity detector");
+        Scene scene = new Scene(root, MainViewController.stage.getScene().getWidth(), MainViewController.stage.getScene().getHeight());
+        MainViewController.stage.setScene(scene);
+        // Icon from: https://icons-for-free.com/spy-131964785010048699/ [25.03.2021]
+        MainViewController.stage.getIcons().add(new Image(getClass().getResourceAsStream("/ee/ut/similaritydetector/img/app_icon.png")));
+
+        // Persists dark theme if it was activated before
+        Platform.runLater(menuBarController::persistCurrentTheme);
+
+        mainViewController.openOptions();
+        MainViewController.stage.show();
+    }
+
 }
diff --git a/src/main/resources/ee/ut/similaritydetector/fxml/main_view.fxml b/src/main/resources/ee/ut/similaritydetector/fxml/main_view.fxml
@@ -69,9 +69,9 @@
                               <AnchorPane VBox.vgrow="ALWAYS">
                                  <children>
                                     <StackPane prefHeight="150.0" prefWidth="200.0" AnchorPane.bottomAnchor="-125.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                       <Button fx:id="fileChooseButton" alignment="CENTER" mnemonicParsing="false" onAction="#chooseFile" prefHeight="50.0" prefWidth="120.0" text="Choose a ZIP file" />
-                                       <VBox fx:id="fileArea" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" StackPane.alignment="BOTTOM_CENTER">
-                                          <ImageView id="zipImg" fx:id="zipImg" fitHeight="100.0" fitWidth="60.0" onMouseClicked="#chooseFile" pickOnBounds="true" preserveRatio="true">
+                                       <Button fx:id="fileChooseButton" alignment="CENTER" mnemonicParsing="false" onAction="#chooseFile" prefHeight="60.0" prefWidth="175.0" text="Choose the solutions ZIP" />
+                                       <VBox fx:id="fileArea" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" StackPane.alignment="BOTTOM_CENTER" spacing="-10">
+                                          <ImageView id="zipImg" fx:id="zipImg" fitHeight="125.0" fitWidth="80.0" onMouseClicked="#chooseFile" pickOnBounds="true" preserveRatio="true">
                                              <Image url="/ee/ut/similaritydetector/img/zip_icon.png" />
                                           </ImageView>
                                           <Label fx:id="fileNameLabel" alignment="CENTER" contentDisplay="CENTER" onMouseClicked="#chooseFile" prefHeight="50.0" prefWidth="100.0" textAlignment="CENTER" wrapText="true" />
diff --git a/src/main/resources/ee/ut/similaritydetector/fxml/results_view.fxml b/src/main/resources/ee/ut/similaritydetector/fxml/results_view.fxml
@@ -31,6 +31,7 @@
                            <children>
                               <Label text="Total solutions:" />
                               <Label text="Solution pairs analysed:" />
+                              <Label layoutX="310.0" layoutY="37.0" text="Analysis duration:" />
                            </children>
                         </VBox>
                      </children>
@@ -41,6 +42,7 @@
                            <children>
                               <Label fx:id="totalSolutionsLabel" />
                               <Label fx:id="solutionPairsLabel" />
+                              <Label fx:id="analysisDurationLabel" layoutX="10.0" layoutY="51.0" />
                            </children>
                            <padding>
                               <Insets right="50.0" />
@@ -73,11 +75,15 @@
                   <Insets />
                </VBox.margin>
             </VBox>
-            <Button fx:id="viewClustersButton" alignment="CENTER" contentDisplay="CENTER" disable="true" maxHeight="50.0" minHeight="50.0" mnemonicParsing="false" onAction="#viewClusters" prefHeight="50.0" prefWidth="175.0" text="View similar pairs &amp; clusters" textAlignment="CENTER" VBox.vgrow="ALWAYS">
+            <HBox alignment="TOP_CENTER" spacing="50.0" VBox.vgrow="ALWAYS">
+               <children>
+                  <Button fx:id="viewClustersButton" alignment="CENTER" contentDisplay="CENTER" disable="true" maxHeight="65.0" minHeight="55.0" mnemonicParsing="false" onAction="#viewClusters" prefHeight="60.0" prefWidth="175.0" text="View similar pairs &amp; clusters" textAlignment="CENTER" />
+                  <Button fx:id="runNewAnalysisButton" alignment="CENTER" contentDisplay="CENTER" maxHeight="65.0" minHeight="55.0" mnemonicParsing="false" onAction="#runNewAnalysis" prefHeight="60.0" prefWidth="175.0" text="Run new analysis" textAlignment="CENTER" />
+               </children>
                <VBox.margin>
-                  <Insets bottom="50.0" />
+                  <Insets bottom="0.0" />
                </VBox.margin>
-            </Button>
+            </HBox>
          </children>
       </VBox>
    </children>
diff --git a/src/main/resources/ee/ut/similaritydetector/style/main_view_style.scss b/src/main/resources/ee/ut/similaritydetector/style/main_view_style.scss
@@ -4,15 +4,14 @@
 
 #fileNameLabel:hover {
   -fx-cursor: hand;
-  -fx-text-fill: #0388fc;
+  -fx-text-fill: #1eaefc;
 }
 
-#zipImg:hover {
-  -fx-cursor: hand;
+#zipImg {
+  -fx-image: url(/ee/ut/similaritydetector/img/zip_icon_light.png);
 }
 
-#fileArea {
-
+#zipImg:hover {
+  -fx-cursor: hand;
+  -fx-image: url(/ee/ut/similaritydetector/img/zip_icon_hover.png);
 }
-
-

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,14 @@`
`4`	`4`
`5`	`5`	`#fileNameLabel:hover {`
`6`	`6`	`-fx-cursor: hand;`
`7`		`- -fx-text-fill: #0388fc;`
	`7`	`+ -fx-text-fill: #1eaefc;`
`8`	`8`	`}`
`9`	`9`
`10`		`-#zipImg:hover {`
`11`		`- -fx-cursor: hand;`
	`10`	`+#zipImg {`
	`11`	`+ -fx-image: url(/ee/ut/similaritydetector/img/zip_icon_light.png);`
`12`	`12`	`}`
`13`	`13`
`14`		`-#fileArea {`
`15`		`-`
	`14`	`+#zipImg:hover {`
	`15`	`+ -fx-cursor: hand;`
	`16`	`+ -fx-image: url(/ee/ut/similaritydetector/img/zip_icon_hover.png);`
`16`	`17`	`}`
`17`		`-`
`18`		`-`