Memory opt

build.gradle

@@ -21,6 +21,7 @@ test {
 
 dependencies {
     implementation files ("lib/algs4.jar")
+    implementation 'net.sf.trove4j:trove4j:3.0.3'
     implementation fileTree(include: ['*.jar'], dir: 'lib')
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'

src/main/java/Main.java

@@ -17,6 +17,7 @@ public class Main extends Application {
     public void start(Stage stage) {
 
         mainView = new MainView(stage);
+
         stage.show();
 
     }
@@ -33,6 +34,14 @@ public void stop(){
                 f.delete();
             }
         }
+
+        String destDirChunks = System.getProperty("user.dir").toString() + "\\src\\main\\resources\\chunks\\";
+        File chunkFile = new File(destDirChunks);
+        if(chunkFile.isDirectory()){
+            for(File f : chunkFile.listFiles()){
+                f.delete();
+            }
+        }
     }
 
 }

src/main/java/gui/Controller.java

@@ -2,23 +2,30 @@
 import java.net.URL;
 import java.util.ResourceBundle;
 
+import gui.GraphicsHandler.GraphicStyle;
 import gui.MainView.StageSelect;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
-import javafx.scene.control.Label;
+import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 
 public class Controller implements Initializable, ControllerInterface{
 
+
+    ObservableList<String> style = FXCollections.observableArrayList(
+        "default", "dark", "gray scale");
+
     @FXML private Button menuButton1;
     @FXML private Button menuButton2;
+    @FXML private Button menuButton3;
     @FXML private Button layerButton;
     @FXML private Button searchButton;
     @FXML private Pane leftBurgerMenu;
@@ -29,8 +36,11 @@ public class Controller implements Initializable, ControllerInterface{
     @FXML private VBox graphicVBox;
     @FXML private HBox mainUIHBox;
     @FXML private BorderPane mainBorderPane;
-    @FXML private ImageView zoomLevelImage;
-    @FXML private Label zoomLevelText;
+    @FXML private ChoiceBox<String> styleChoiceBox;
+
+
+
+
 
     private boolean isMenuOpen = false;
     private static MainView mainView;
@@ -53,12 +63,12 @@ public void start(MainView mw){ // this is only ran after the stage is shown
         c.widthProperty().bind(p.widthProperty());
         c.heightProperty().bind(p.heightProperty());
 
+        System.out.println("DRAWING MAP");
+
         panZoomInitialize();
-
     }
 
     private void panZoomInitialize(){ 
-
         mainView.canvas.setOnMousePressed(e -> {
             lastX = e.getX();
             lastY = e.getY();
@@ -72,12 +82,7 @@ private void panZoomInitialize(){
 
             mainView.getDrawingMap().zoom(Math.pow(zoomMultiplier,event.getDeltaY()), event.getX(), event.getY());
 
-            zoomLevelText.setText("50m");
-
-            String meters = zoomLevelText.getText().replaceAll("m", "");
-
-            // TODO: Fix
-            // zoomLevelImage.setFitWidth(mainView.getDrawingMap().metersToPixels(Integer.parseInt(meters)));
+
 
         });
 
@@ -95,6 +100,46 @@ private void panZoomInitialize(){
     @Override
     public void initialize(URL location, ResourceBundle resources) { // This runs when the fxml is loaded and the canvas is injected (before stage is shown)
 
+        mainMenuVBox.setVisible(false);
+        leftBurgerMenu.setVisible(false);
+        graphicVBox.setVisible(false);
+
+        styleChoiceBox.setItems(style);
+        styleChoiceBox.setValue("default");
+
+        styleChoiceBox.setOnAction((ActionEvent e) -> {
+
+            switch(styleChoiceBox.getValue()){
+                case "default" : {
+
+                    GraphicsHandler.setGraphicsStyle(GraphicStyle.DEFAULT);
+                    mainView.draw();
+
+                    System.out.println("HELLO");
+                    break;
+                }
+                case "dark" : {
+                    System.out.println("DARKMODE");
+                    GraphicsHandler.setGraphicsStyle(GraphicStyle.DARKMODE);
+                    mainView.draw();
+
+                    break;
+
+                }
+                case "gray scale" : {
+                    System.out.println("GRAY SCALE");
+                    GraphicsHandler.setGraphicsStyle(GraphicStyle.GRAYSCALE);
+                    mainView.draw();
+                    break;
+
+
+                }
+            }
+
+
+        });
+
+
         mainMenuButton.setOnAction((ActionEvent e) -> {
             mainView.drawScene(StageSelect.MainMenu);
         });
@@ -103,20 +148,24 @@ public void initialize(URL location, ResourceBundle resources) { // This runs wh
             leftBurgerMenu.setVisible(!isMenuOpen);
             mainMenuVBox.setVisible(!isMenuOpen);
             isMenuOpen = !isMenuOpen;
-
         });
         menuButton2.setOnAction((ActionEvent e) -> {
             leftBurgerMenu.setVisible(!isMenuOpen);
             mainMenuVBox.setVisible(!isMenuOpen);
             isMenuOpen = !isMenuOpen;
-
+        });
+        menuButton3.setOnAction((ActionEvent e) -> {
+            leftBurgerMenu.setVisible(!isMenuOpen);
+            graphicVBox.setVisible(!isMenuOpen);
+            isMenuOpen = !isMenuOpen;
         });
         layerButton.setOnAction((ActionEvent e) -> {
             graphicVBox.setVisible(true);
             mainMenuVBox.setVisible(false);
 
         });
 
+
         searchBarStart.setOnAction((ActionEvent e) -> {
             System.out.println("Searching for startpoint: " + searchBarStart.getText());
             searchForAdress(searchBarStart.getText());