diff --git a/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/fitting/FittingController.java b/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/fitting/FittingController.java index 01cb243c..96f2e038 100644 --- a/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/fitting/FittingController.java +++ b/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/fitting/FittingController.java @@ -313,7 +313,7 @@ public void setFittingParameters(int scanSize, float min, float max) fittingModel.selections.getFittingParameters().setCalibration(min, max, scanSize); fittingModel.proposals.getFittingParameters().setCalibration(min, max, scanSize); - //TODO: Why is this here? Are we just resetting it to be sure they stay in sync? + //Keep the other settings in sync fittingModel.selections.getFittingParameters().setDetectorMaterial(getDetectorMaterial()); fittingModel.proposals.getFittingParameters().setDetectorMaterial(getDetectorMaterial()); diff --git a/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/view/SessionViewModel.java b/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/view/SessionViewModel.java index 034c83e9..7c8eb1b2 100644 --- a/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/view/SessionViewModel.java +++ b/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/view/SessionViewModel.java @@ -13,7 +13,6 @@ public class SessionViewModel { public float zoom; public boolean logTransform; public boolean showTitle; - public boolean darkMode; public SessionViewModel() { @@ -23,7 +22,6 @@ public SessionViewModel() { zoom = 1.0f; logTransform = true; showTitle = false; - darkMode = false; } @@ -61,7 +59,6 @@ public void copy(SessionViewModel view) { this.zoom = view.zoom; this.logTransform = view.logTransform; this.showTitle = view.showTitle; - this.darkMode = view.darkMode; } } diff --git a/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/view/ViewController.java b/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/view/ViewController.java index 8913c7b9..dfe23075 100644 --- a/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/view/ViewController.java +++ b/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/view/ViewController.java @@ -14,6 +14,8 @@ public class ViewController extends EventfulBeacon { private SessionViewModel viewModel; private PlotController plot; + // Don't save dark mode in the session view model or else it'll end up in the session files. + private boolean darkMode = false; private static final String SETTING_MONOCHROME = "org.peakaboo.controller.plotter.view.monochrome"; private static final String SETTING_CONSTSCALE = "org.peakaboo.controller.plotter.view.constantscale"; @@ -190,11 +192,11 @@ public void setShowTitle(boolean showTitle) { public boolean getDarkMode() { - return viewModel.darkMode; + return this.darkMode; } public void setDarkMode(boolean dark) { - viewModel.darkMode = dark; + this.darkMode = dark; updateListeners(); }