diff --git a/src/main/java/fr/pasteur/ida/zellige/gui/ParameterSliderInteger.java b/src/main/java/fr/pasteur/ida/zellige/gui/ParameterSliderInteger.java index 38041a838db704d68dc80e30a7734fdad26c2630..e7c720064052c18def5f502913e28a87524fe293 100644 --- a/src/main/java/fr/pasteur/ida/zellige/gui/ParameterSliderInteger.java +++ b/src/main/java/fr/pasteur/ida/zellige/gui/ParameterSliderInteger.java @@ -75,4 +75,6 @@ public class ParameterSliderInteger extends ParameterSlider } + + } diff --git a/src/main/java/fr/pasteur/ida/zellige/gui/controller/SelectionController.java b/src/main/java/fr/pasteur/ida/zellige/gui/controller/SelectionController.java index 9ddc97e3a5a2315737f8aceff9c011f5107e8e9e..6ff85c95503aba6d2ea033cb2013dd5c1d42639d 100644 --- a/src/main/java/fr/pasteur/ida/zellige/gui/controller/SelectionController.java +++ b/src/main/java/fr/pasteur/ida/zellige/gui/controller/SelectionController.java @@ -37,6 +37,7 @@ import fr.pasteur.ida.zellige.gui.model.SelectionModel; import fr.pasteur.ida.zellige.gui.parameter.ZelligeParameters; import fr.pasteur.ida.zellige.gui.task.*; import javafx.beans.property.DoubleProperty; +import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.fxml.FXML; @@ -269,7 +270,8 @@ public class SelectionController< T extends RealType< T > & NativeType< T > > im - private void setParameterValue( ParameterSlider slider, DoubleProperty property) + + private void setParameterValue( ParameterSlider slider, IntegerProperty property) { if ( !property.getValue().equals( slider.getValue())) { @@ -420,7 +422,7 @@ public class SelectionController< T extends RealType< T > & NativeType< T > > im } - public void resetOutputFromParameter( SimpleObjectProperty< ? > result, DoubleProperty property ) + public void resetOutputFromParameter( SimpleObjectProperty< ? > result, IntegerProperty property ) { property.addListener( ( observable, oldValue, newValue ) -> result.set( null ) ); diff --git a/src/main/java/fr/pasteur/ida/zellige/gui/model/SelectionModel.java b/src/main/java/fr/pasteur/ida/zellige/gui/model/SelectionModel.java index d6ebe7255c8061456f5fd7fafd11278d652bef14..689ec640f99da5b47091dc7e45b365d01c7b8d13 100644 --- a/src/main/java/fr/pasteur/ida/zellige/gui/model/SelectionModel.java +++ b/src/main/java/fr/pasteur/ida/zellige/gui/model/SelectionModel.java @@ -29,10 +29,7 @@ package fr.pasteur.ida.zellige.gui.model; import fr.pasteur.ida.zellige.gui.ClassifiedImages; -import javafx.beans.property.DoubleProperty; -import javafx.beans.property.SimpleBooleanProperty; -import javafx.beans.property.SimpleDoubleProperty; -import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.property.*; import javafx.scene.image.ImageView; import net.imglib2.img.Img; import net.imglib2.type.logic.BitType; @@ -40,11 +37,11 @@ import net.imglib2.type.numeric.real.FloatType; public class SelectionModel { - private final DoubleProperty amplitude; - private final DoubleProperty otsu; - private final DoubleProperty island; - private final DoubleProperty xyBlur; - private final DoubleProperty zBlur; + private final IntegerProperty amplitude; + private final IntegerProperty otsu; + private final IntegerProperty island; + private final IntegerProperty xyBlur; + private final IntegerProperty zBlur; private final SimpleBooleanProperty disableGUI = new SimpleBooleanProperty(); private final SimpleObjectProperty< Img< BitType > > islandSearchImage = new SimpleObjectProperty<>(); private final SimpleObjectProperty< ClassifiedImages< FloatType > > images = new SimpleObjectProperty<>(); @@ -59,11 +56,11 @@ public class SelectionModel public SelectionModel() { - amplitude = new SimpleDoubleProperty(); - otsu = new SimpleDoubleProperty(); - island = new SimpleDoubleProperty(); - xyBlur = new SimpleDoubleProperty(); - zBlur = new SimpleDoubleProperty(); + amplitude = new SimpleIntegerProperty(); + otsu = new SimpleIntegerProperty(); + island = new SimpleIntegerProperty(); + xyBlur = new SimpleIntegerProperty(); + zBlur = new SimpleIntegerProperty(); } public double getAmplitude() @@ -71,12 +68,12 @@ public class SelectionModel return amplitude.get(); } - public void setAmplitude( double amplitude ) + public void setAmplitude( int amplitude ) { this.amplitude.set( amplitude ); } - public DoubleProperty amplitudeProperty() + public IntegerProperty amplitudeProperty() { return amplitude; } @@ -86,12 +83,12 @@ public class SelectionModel return otsu.get(); } - public void setOtsu( double otsu ) + public void setOtsu( int otsu ) { this.otsu.set( otsu ); } - public DoubleProperty otsuProperty() + public IntegerProperty otsuProperty() { return otsu; } @@ -101,22 +98,22 @@ public class SelectionModel return island.get(); } - public void setIsland( double island ) + public void setIsland( int island ) { this.island.set( island ); } - public DoubleProperty islandProperty() + public IntegerProperty islandProperty() { return island; } - public DoubleProperty xyBlurProperty() + public IntegerProperty xyBlurProperty() { return xyBlur; } - public DoubleProperty zBlurProperty() + public IntegerProperty zBlurProperty() { return zBlur; } diff --git a/src/main/java/fr/pasteur/ida/zellige/gui/task/IslandSearchTask.java b/src/main/java/fr/pasteur/ida/zellige/gui/task/IslandSearchTask.java index 66a8a4c2bccd99c1764ef795e32d107f0764a3cb..b20c2eaa2f61f93ffbc98255d305880169a4dd56 100644 --- a/src/main/java/fr/pasteur/ida/zellige/gui/task/IslandSearchTask.java +++ b/src/main/java/fr/pasteur/ida/zellige/gui/task/IslandSearchTask.java @@ -29,7 +29,7 @@ package fr.pasteur.ida.zellige.gui.task; import fr.pasteur.ida.zellige.steps.selection.postTreatment.PostTreatment; -import javafx.beans.property.DoubleProperty; +import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleObjectProperty; import net.imglib2.img.Img; import net.imglib2.type.logic.BitType; @@ -43,9 +43,9 @@ public class IslandSearchTask extends AbstractTask< Img< BitType > > private final static Logger LOGGER = LoggerFactory.getLogger( IslandSearchTask.class ); private final SimpleObjectProperty< Img< BitType > > image; - private final DoubleProperty islandSize; + private final IntegerProperty islandSize; - public IslandSearchTask( SimpleObjectProperty< Img< BitType > > image, DoubleProperty islandSize ) + public IslandSearchTask( SimpleObjectProperty< Img< BitType > > image, IntegerProperty islandSize ) { this.image = image; this.islandSize = islandSize; diff --git a/src/main/java/fr/pasteur/ida/zellige/gui/task/SmoothingTask.java b/src/main/java/fr/pasteur/ida/zellige/gui/task/SmoothingTask.java index 6466287da58049bd0007238c044ad5c200c35db9..dd3d7110363b1237eeb3d15dba76650e4e77ef49 100644 --- a/src/main/java/fr/pasteur/ida/zellige/gui/task/SmoothingTask.java +++ b/src/main/java/fr/pasteur/ida/zellige/gui/task/SmoothingTask.java @@ -28,9 +28,8 @@ */ package fr.pasteur.ida.zellige.gui.task; -import fr.pasteur.ida.zellige.element.Pixels; import fr.pasteur.ida.zellige.steps.selection.postTreatment.PostTreatment; -import javafx.beans.property.DoubleProperty; +import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleObjectProperty; import net.imglib2.img.Img; import net.imglib2.type.logic.BitType; @@ -45,10 +44,10 @@ public class SmoothingTask extends AbstractTask<Img < FloatType >> private final static Logger LOGGER = LoggerFactory.getLogger( SmoothingTask.class ); private final SimpleObjectProperty< Img< BitType > > islandSearchImage; - private final DoubleProperty sigmaXY; - private final DoubleProperty sigmaZ; + private final IntegerProperty sigmaXY; + private final IntegerProperty sigmaZ; - public SmoothingTask( SimpleObjectProperty< Img< BitType > > islandSearchImage, DoubleProperty sigmaXY, DoubleProperty sigmaZ ) + public SmoothingTask( SimpleObjectProperty< Img< BitType > > islandSearchImage, IntegerProperty sigmaXY, IntegerProperty sigmaZ ) { this.islandSearchImage = islandSearchImage; this.sigmaXY = sigmaXY;