diff --git a/src/main/java/app/AppModule.java b/src/main/java/app/AppModule.java index d47181c..9a1b090 100644 --- a/src/main/java/app/AppModule.java +++ b/src/main/java/app/AppModule.java @@ -22,7 +22,7 @@ import services.MorphologyService; import services.OutlineService; import ui.abstractions.*; import ui.implementation.components.nav.NavBar; -import ui.implementation.views.DoubleMatrix; +import ui.implementation.views.fourier.FourierView; import ui.implementation.views.fitering.global.IdealFilteringView; import ui.implementation.views.MainView; import ui.implementation.views.fitering.local.LocalFilteringView; @@ -58,7 +58,7 @@ public class AppModule extends AbstractModule { //--- UI layer --- bind(INavBar.class).to(NavBar.class); bind(IMainView.class).to(MainView.class); - bind(IDoubleMatrix.class).to(DoubleMatrix.class); + bind(IFourierView.class).to(FourierView.class); bind(IGlobalFilteringView.class).to(IdealFilteringView.class); bind(ILocalFilteringView.class).to(LocalFilteringView.class); bind(IBasicMorphologyView.class).to(BasicMorphologyView.class); diff --git a/src/main/java/app/shared/SwingNavigator.java b/src/main/java/app/shared/SwingNavigator.java index 7c1eb50..ed60c20 100644 --- a/src/main/java/app/shared/SwingNavigator.java +++ b/src/main/java/app/shared/SwingNavigator.java @@ -3,7 +3,7 @@ package app.shared; import com.google.inject.Inject; import com.google.inject.Provider; import ui.abstractions.AbstractView; -import ui.implementation.views.DoubleMatrix; +import ui.implementation.views.fourier.FourierView; import ui.implementation.views.fitering.global.IdealFilteringView; import ui.implementation.views.fitering.global.NonIdealFilteringView; import ui.implementation.views.ViewInitializer; @@ -21,7 +21,7 @@ import ui.implementation.views.threshold.ThresholdingView; */ public class SwingNavigator implements INavigator { - private final Provider doubleMatrixProvider; + private final Provider doubleMatrixProvider; private final Provider filteringProvider; private final Provider nonIdealFilteringProvider; private final Provider convolutionFilteringProvider; @@ -33,7 +33,7 @@ public class SwingNavigator implements INavigator { @Inject public SwingNavigator( - Provider doubleMatrixProvider, + Provider doubleMatrixProvider, Provider filteringProvider, Provider nonIdealFilteringProvider, Provider convolutionFilterProvider, @@ -56,7 +56,7 @@ public class SwingNavigator implements INavigator { @Override public void showFourier() { - DoubleMatrix view = doubleMatrixProvider.get(); + FourierView view = doubleMatrixProvider.get(); runView(view); } diff --git a/src/main/java/presenters/doubleMatrix/DoubleMatrixPresenter.java b/src/main/java/presenters/doubleMatrix/DoubleMatrixPresenter.java index 0d0e0d4..b546150 100644 --- a/src/main/java/presenters/doubleMatrix/DoubleMatrixPresenter.java +++ b/src/main/java/presenters/doubleMatrix/DoubleMatrixPresenter.java @@ -2,17 +2,12 @@ package presenters.doubleMatrix; import app.state.AppState; import app.state.DoubleMatrixState; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; -import domain.events.fourier.ImaginaryChangedEvent; -import domain.events.fourier.ModuleChangedEvent; -import domain.events.fourier.PhaseChangedEvent; -import domain.events.fourier.RealChangedEvent; import domain.image.GrayScaleMatrix; import domain.image.Image; import domain.image.processing.complex.ComplexMatrix; import services.ImageService; -import ui.abstractions.IDoubleMatrix; +import ui.abstractions.IFourierView; import java.io.IOException; @@ -20,7 +15,7 @@ import java.io.IOException; * @author Laurent Crema */ public class DoubleMatrixPresenter implements DoubleMatrixListener { - private IDoubleMatrix view; + private IFourierView view; private final AppState appState; private final DoubleMatrixState state; private final ImageService imageService; @@ -33,7 +28,7 @@ public class DoubleMatrixPresenter implements DoubleMatrixListener { this.state.subscribe(this); } - public void setView(IDoubleMatrix view) { + public void setView(IFourierView view) { this.view = view; } diff --git a/src/main/java/ui/abstractions/IDoubleMatrix.java b/src/main/java/ui/abstractions/IFourierView.java similarity index 91% rename from src/main/java/ui/abstractions/IDoubleMatrix.java rename to src/main/java/ui/abstractions/IFourierView.java index d2c1bc8..d1337b2 100644 --- a/src/main/java/ui/abstractions/IDoubleMatrix.java +++ b/src/main/java/ui/abstractions/IFourierView.java @@ -2,7 +2,7 @@ package ui.abstractions; import domain.image.GrayScaleMatrix; -public interface IDoubleMatrix { +public interface IFourierView { void updateModule(GrayScaleMatrix source, GrayScaleMatrix clipped); void updatePhase(GrayScaleMatrix source, GrayScaleMatrix clipped); diff --git a/src/main/java/ui/implementation/views/DoubleMatrix.java b/src/main/java/ui/implementation/views/fourier/FourierView.java similarity index 98% rename from src/main/java/ui/implementation/views/DoubleMatrix.java rename to src/main/java/ui/implementation/views/fourier/FourierView.java index 398a848..afe6041 100644 --- a/src/main/java/ui/implementation/views/DoubleMatrix.java +++ b/src/main/java/ui/implementation/views/fourier/FourierView.java @@ -1,14 +1,13 @@ -package ui.implementation.views; +package ui.implementation.views.fourier; import domain.image.GrayScaleMatrix; import jakarta.inject.Inject; import presenters.doubleMatrix.DoubleMatrixPresenter; import ui.abstractions.AbstractView; -import ui.implementation.components.image.ImagePanel; import ui.implementation.components.image.TabbedImagePanel; import ui.implementation.components.image.TabbedPanelFactory; import ui.implementation.components.intent.FileChooser; -import ui.abstractions.IDoubleMatrix; +import ui.abstractions.IFourierView; import java.awt.*; import java.awt.event.ActionEvent; @@ -20,7 +19,7 @@ import javax.swing.event.ChangeEvent; /** * @author Jean-Marc Wagner, Laurent Crema */ -public class DoubleMatrix extends AbstractView implements IDoubleMatrix +public class FourierView extends AbstractView implements IFourierView { private static final String MODULE_TAB_TILE = "Module"; private static final String PHASE_TAB_TILE = "Phase"; @@ -46,7 +45,7 @@ public class DoubleMatrix extends AbstractView implements IDoubleMatrix private final TabbedPanelFactory tabbedPanelFactory; @Inject - public DoubleMatrix( + public FourierView( DoubleMatrixPresenter presenter, TabbedPanelFactory tabbedPanelFactory )