Loading GPR files will not unload others, and GPR file panes will be …

src/main/java/com/github/thecoldwine/sigrun/common/ext/FoundTracesLayer.java

@@ -6,7 +6,6 @@
 
 import com.ugcs.gprvisualizer.app.auxcontrol.BaseObject;
 import com.ugcs.gprvisualizer.draw.Layer;
-import com.ugcs.gprvisualizer.draw.WhatChanged;
 import com.ugcs.gprvisualizer.gpr.Model;
 
 import javafx.geometry.Point2D;
@@ -59,19 +58,13 @@ public void draw(Graphics2D g2, MapField fixedField) {
 
 	}
 
-	@Override
-	public void somethingChanged(WhatChanged changed) {
-
-	}
-
 	@Override
 	public boolean mousePressed(Point2D point) {
 		for(BaseObject bo : model.getAuxElements()) {
 			if(bo.mousePressHandle(point, model.getMapField())) {
 				return true;
 			}			
 		}
-
 		return false;
 	}
 }

src/main/java/com/github/thecoldwine/sigrun/common/ext/ProfileField.java

@@ -9,12 +9,10 @@
 
 public class ProfileField extends ScrollableData {
 
-	public static final double ZOOM_A = 1.2;
 	public static final double ASPECT_A = 1.14;
 
 	private final Model model;
 
-	private int zoom = 1;
 	private double aspect = -15;
 
 	// screen coordinates
@@ -30,16 +28,18 @@ public class ProfileField extends ScrollableData {
 	private Rectangle clipInfoRect = new Rectangle();
 
 	//
-	public int visibleStart;
-	public int visibleFinish;
-
-	private double vertScale = 1;
+	private int visibleStart;
+	//private int visibleFinish;
 
 	public ProfileField(Model model) {
 		this.model  = model;		
 	}
 
-/*	public ProfileField(ProfileField copy) {
+	public int getVisibleStart() {
+		return visibleStart;
+	}
+
+	/*	public ProfileField(ProfileField copy) {
 
 		this.model  = copy.model;
 
@@ -65,9 +65,10 @@ public ProfileField(Model model) {
 		this.clipInfoRect = copy.clipInfoRect; 	
 	}*/
 
+	@Override
 	public void clear() {
-		zoom = 1;
-		aspect = -15;		
+		super.clear();
+		aspect = -15;
 		startSample = 0;
 		if (model.isActive() && model.getGprTracesCount() > 0) {
 			fitFull();
@@ -172,15 +173,6 @@ public void setAspect(double aspect) {
 		this.aspect = aspect;
 	}
 
-	public int getZoom() {
-		return zoom;
-	}
-
-	public void setZoom(int zoom) {
-		this.zoom = zoom;
-		vertScale = Math.pow(ZOOM_A, getZoom());
-	}
-
 	public Rectangle getTopRuleRect() {
 		return topRuleRect;
 	}

src/main/java/com/github/thecoldwine/sigrun/common/ext/TraceSample.java

@@ -1,30 +1,11 @@
 package com.github.thecoldwine.sigrun.common.ext;
 
-public class TraceSample {
-
-	private int trace;
-	private int sample;
-
-	public TraceSample(int trace, int sample) {
-
-		this.setTrace(trace);
-		this.setSample(sample);
-
-	}
-
+public record TraceSample (int trace, int sample) {
 	public int getTrace() {
 		return trace;
 	}
 
-	public void setTrace(int trace) {
-		this.trace = trace;
-	}
-
 	public int getSample() {
 		return sample;
 	}
-
-	public void setSample(int sample) {
-		this.sample = sample;
-	}
-}
+}

src/main/java/com/ugcs/gprvisualizer/app/AppContext.java

@@ -4,8 +4,6 @@
 import java.util.Set;
 
 import com.ugcs.gprvisualizer.app.intf.Status;
-import com.ugcs.gprvisualizer.draw.SmthChangeListener;
-import com.ugcs.gprvisualizer.draw.WhatChanged;
 import com.ugcs.gprvisualizer.gpr.Model;
 
 import javafx.application.Platform;
@@ -21,22 +19,4 @@ public class AppContext {
 	public static Model model;
 	public static Status status;
 
-	private static Set<SmthChangeListener> smthListener = new HashSet<>();
-
-	public static void setItems(Set<SmthChangeListener> it) {
-		smthListener = it;
-	}
-
-	public static void notifyAll(WhatChanged changed) {
-
-		Platform.runLater(() -> {
-				for (SmthChangeListener lst : AppContext.smthListener) {
-					try {
-						lst.somethingChanged(changed);
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
-		});		
-	}	
-}
+}

src/main/java/com/ugcs/gprvisualizer/app/AuxElementEditHandler.java

@@ -6,9 +6,13 @@
 
 import com.ugcs.gprvisualizer.app.auxcontrol.BaseObjectImpl;
 import com.ugcs.gprvisualizer.app.auxcontrol.ClickPlace;
+import com.ugcs.gprvisualizer.event.FileOpenedEvent;
+import com.ugcs.gprvisualizer.event.WhatChanged;
 import javafx.geometry.Point2D;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 import com.github.thecoldwine.sigrun.common.ext.CsvFile;
@@ -17,9 +21,6 @@
 import com.github.thecoldwine.sigrun.common.ext.SgyFile;
 import com.ugcs.gprvisualizer.app.auxcontrol.BaseObject;
 import com.ugcs.gprvisualizer.app.auxcontrol.FoundPlace;
-import com.ugcs.gprvisualizer.draw.Change;
-import com.ugcs.gprvisualizer.draw.SmthChangeListener;
-import com.ugcs.gprvisualizer.draw.WhatChanged;
 import com.ugcs.gprvisualizer.gpr.Model;
 
 import javafx.scene.Cursor;
@@ -32,17 +33,17 @@
 import javafx.scene.layout.VBox;
 
 @Component
-public class AuxElementEditHandler extends BaseObjectImpl implements SmthChangeListener, InitializingBean {
+public class AuxElementEditHandler extends BaseObjectImpl implements InitializingBean {
+
+	@Autowired
+	private ApplicationEventPublisher eventPublisher;
 
 	@Autowired
 	private Model model;
 
 	@Autowired
 	private ProfileView profileView;
 
-	@Autowired
-	private Broadcast broadcast;
-
 	private ProfileField field;	
 	private BaseObject selected;
 	private BaseObject mouseInput;
@@ -87,7 +88,8 @@
 		}
 
 		if (processed) {
-			profileView.repaintEvent();
+			eventPublisher.publishEvent(new WhatChanged(this, WhatChanged.Change.justdraw));
+			//profileView.repaintEvent();
 		}
 
 		return processed;
@@ -148,8 +150,8 @@
 			}
 
 			model.updateAuxElements();
-			profileView.repaintEvent();
-			broadcast.notifyAll(new WhatChanged(Change.justdraw));
+			//profileView.repaintEvent();
+			eventPublisher.publishEvent(new WhatChanged(this, WhatChanged.Change.justdraw));
 		});
 
 		addFoundBtn.setOnAction(e -> {				
@@ -189,7 +191,7 @@
 	}
 
 	protected void updateViews() {
-		broadcast.notifyAll(new WhatChanged(Change.justdraw));		
+		eventPublisher.publishEvent(new WhatChanged(this, WhatChanged.Change.justdraw));
 	}
 
 	private void clearAuxElements() {
@@ -211,9 +213,9 @@
 
 
 		model.updateAuxElements();		
-		profileView.repaintEvent();
+		//profileView.repaintEvent();
 
-		broadcast.notifyAll(new WhatChanged(Change.justdraw));
+		eventPublisher.publishEvent(new WhatChanged(this, WhatChanged.Change.justdraw));
 	}
 
 	private boolean processPress(List<BaseObject> controls2, 
@@ -253,29 +255,26 @@
 		}
 	}
 
-	//@Override
-	public boolean mouseReleaseHandle(Point2D localPoint, ProfileField profField) {
+	@Override
+	public boolean mouseReleaseHandle(Point2D localPoint, ScrollableData profField) {
 
 		if (mouseInput != null) {			
 			mouseInput.mouseReleaseHandle(localPoint, profField);
 			mouseInput = null;
 
 			profileView.getImageView().setCursor(Cursor.DEFAULT);
-
-			profileView.repaintEvent();
+			eventPublisher.publishEvent(new WhatChanged(this, WhatChanged.Change.justdraw));
 			return true;
 		}
 		return false;
 	}
 
-	//@Override
-	public boolean mouseMoveHandle(Point2D localPoint, ProfileField profField) {
+	@Override
+	public boolean mouseMoveHandle(Point2D localPoint, ScrollableData profField) {
 
 		if (mouseInput != null) {			
 			mouseInput.mouseMoveHandle(localPoint, profField);
-
-			profileView.repaintEvent();
-
+			eventPublisher.publishEvent(new WhatChanged(this, WhatChanged.Change.justdraw));
 			return true;
 		} else {
 			if (aboveControl(localPoint, profField)) {
@@ -285,12 +284,11 @@
 			} else {
 				profileView.getImageView().setCursor(Cursor.DEFAULT);
 			}			
-		}		
-
+		}
 		return false;
 	}
 
-	private boolean aboveControl(Point2D localPoint, ProfileField profField) {
+	private boolean aboveControl(Point2D localPoint, ScrollableData profField) {
 		if (model.getControls() == null) {
 			return false;
 		}
@@ -303,7 +301,7 @@
 		return false;
 	}
 
-	private boolean aboveElement(Point2D localPoint, ProfileField profField) {
+	private boolean aboveElement(Point2D localPoint, ScrollableData profField) {
 		if (model.getAuxElements() == null) {
 			return false;
 		}
@@ -333,13 +331,19 @@
 		this.selected = selected;
 	}
 
-	@Override
-	public void somethingChanged(WhatChanged changed) {
-		if (changed.isFileopened() || changed.isTraceCut()) {
-
+	@EventListener
+	private void somethingChanged(WhatChanged changed) {
+		if (changed.isTraceCut()) {
 			mouseInput = null;
 			setSelected(null);
 			model.setControls(null);			
-		}		
+		}
+	}
+
+	@EventListener
+	private void fileOpened(FileOpenedEvent fileOpenedEvent) {
+		mouseInput = null;
+		setSelected(null);
+		model.setControls(null);
 	}
-}
+}