Rename and move DoubleMatrix
This commit is contained in:
@@ -22,7 +22,7 @@ import services.MorphologyService;
|
|||||||
import services.OutlineService;
|
import services.OutlineService;
|
||||||
import ui.abstractions.*;
|
import ui.abstractions.*;
|
||||||
import ui.implementation.components.nav.NavBar;
|
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.fitering.global.IdealFilteringView;
|
||||||
import ui.implementation.views.MainView;
|
import ui.implementation.views.MainView;
|
||||||
import ui.implementation.views.fitering.local.LocalFilteringView;
|
import ui.implementation.views.fitering.local.LocalFilteringView;
|
||||||
@@ -58,7 +58,7 @@ public class AppModule extends AbstractModule {
|
|||||||
//--- UI layer ---
|
//--- UI layer ---
|
||||||
bind(INavBar.class).to(NavBar.class);
|
bind(INavBar.class).to(NavBar.class);
|
||||||
bind(IMainView.class).to(MainView.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(IGlobalFilteringView.class).to(IdealFilteringView.class);
|
||||||
bind(ILocalFilteringView.class).to(LocalFilteringView.class);
|
bind(ILocalFilteringView.class).to(LocalFilteringView.class);
|
||||||
bind(IBasicMorphologyView.class).to(BasicMorphologyView.class);
|
bind(IBasicMorphologyView.class).to(BasicMorphologyView.class);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package app.shared;
|
|||||||
import com.google.inject.Inject;
|
import com.google.inject.Inject;
|
||||||
import com.google.inject.Provider;
|
import com.google.inject.Provider;
|
||||||
import ui.abstractions.AbstractView;
|
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.IdealFilteringView;
|
||||||
import ui.implementation.views.fitering.global.NonIdealFilteringView;
|
import ui.implementation.views.fitering.global.NonIdealFilteringView;
|
||||||
import ui.implementation.views.ViewInitializer;
|
import ui.implementation.views.ViewInitializer;
|
||||||
@@ -21,7 +21,7 @@ import ui.implementation.views.threshold.ThresholdingView;
|
|||||||
*/
|
*/
|
||||||
public class SwingNavigator implements INavigator {
|
public class SwingNavigator implements INavigator {
|
||||||
|
|
||||||
private final Provider<DoubleMatrix> doubleMatrixProvider;
|
private final Provider<FourierView> doubleMatrixProvider;
|
||||||
private final Provider<IdealFilteringView> filteringProvider;
|
private final Provider<IdealFilteringView> filteringProvider;
|
||||||
private final Provider<NonIdealFilteringView> nonIdealFilteringProvider;
|
private final Provider<NonIdealFilteringView> nonIdealFilteringProvider;
|
||||||
private final Provider<LocalFilteringView> convolutionFilteringProvider;
|
private final Provider<LocalFilteringView> convolutionFilteringProvider;
|
||||||
@@ -33,7 +33,7 @@ public class SwingNavigator implements INavigator {
|
|||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public SwingNavigator(
|
public SwingNavigator(
|
||||||
Provider<DoubleMatrix> doubleMatrixProvider,
|
Provider<FourierView> doubleMatrixProvider,
|
||||||
Provider<IdealFilteringView> filteringProvider,
|
Provider<IdealFilteringView> filteringProvider,
|
||||||
Provider<NonIdealFilteringView> nonIdealFilteringProvider,
|
Provider<NonIdealFilteringView> nonIdealFilteringProvider,
|
||||||
Provider<LocalFilteringView> convolutionFilterProvider,
|
Provider<LocalFilteringView> convolutionFilterProvider,
|
||||||
@@ -56,7 +56,7 @@ public class SwingNavigator implements INavigator {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void showFourier() {
|
public void showFourier() {
|
||||||
DoubleMatrix view = doubleMatrixProvider.get();
|
FourierView view = doubleMatrixProvider.get();
|
||||||
runView(view);
|
runView(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,17 +2,12 @@ package presenters.doubleMatrix;
|
|||||||
|
|
||||||
import app.state.AppState;
|
import app.state.AppState;
|
||||||
import app.state.DoubleMatrixState;
|
import app.state.DoubleMatrixState;
|
||||||
import com.google.common.eventbus.Subscribe;
|
|
||||||
import com.google.inject.Inject;
|
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.GrayScaleMatrix;
|
||||||
import domain.image.Image;
|
import domain.image.Image;
|
||||||
import domain.image.processing.complex.ComplexMatrix;
|
import domain.image.processing.complex.ComplexMatrix;
|
||||||
import services.ImageService;
|
import services.ImageService;
|
||||||
import ui.abstractions.IDoubleMatrix;
|
import ui.abstractions.IFourierView;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
@@ -20,7 +15,7 @@ import java.io.IOException;
|
|||||||
* @author Laurent Crema
|
* @author Laurent Crema
|
||||||
*/
|
*/
|
||||||
public class DoubleMatrixPresenter implements DoubleMatrixListener {
|
public class DoubleMatrixPresenter implements DoubleMatrixListener {
|
||||||
private IDoubleMatrix view;
|
private IFourierView view;
|
||||||
private final AppState appState;
|
private final AppState appState;
|
||||||
private final DoubleMatrixState state;
|
private final DoubleMatrixState state;
|
||||||
private final ImageService imageService;
|
private final ImageService imageService;
|
||||||
@@ -33,7 +28,7 @@ public class DoubleMatrixPresenter implements DoubleMatrixListener {
|
|||||||
this.state.subscribe(this);
|
this.state.subscribe(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setView(IDoubleMatrix view) {
|
public void setView(IFourierView view) {
|
||||||
this.view = view;
|
this.view = view;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package ui.abstractions;
|
|||||||
|
|
||||||
import domain.image.GrayScaleMatrix;
|
import domain.image.GrayScaleMatrix;
|
||||||
|
|
||||||
public interface IDoubleMatrix {
|
public interface IFourierView {
|
||||||
|
|
||||||
void updateModule(GrayScaleMatrix source, GrayScaleMatrix clipped);
|
void updateModule(GrayScaleMatrix source, GrayScaleMatrix clipped);
|
||||||
void updatePhase(GrayScaleMatrix source, GrayScaleMatrix clipped);
|
void updatePhase(GrayScaleMatrix source, GrayScaleMatrix clipped);
|
||||||
@@ -1,14 +1,13 @@
|
|||||||
package ui.implementation.views;
|
package ui.implementation.views.fourier;
|
||||||
|
|
||||||
import domain.image.GrayScaleMatrix;
|
import domain.image.GrayScaleMatrix;
|
||||||
import jakarta.inject.Inject;
|
import jakarta.inject.Inject;
|
||||||
import presenters.doubleMatrix.DoubleMatrixPresenter;
|
import presenters.doubleMatrix.DoubleMatrixPresenter;
|
||||||
import ui.abstractions.AbstractView;
|
import ui.abstractions.AbstractView;
|
||||||
import ui.implementation.components.image.ImagePanel;
|
|
||||||
import ui.implementation.components.image.TabbedImagePanel;
|
import ui.implementation.components.image.TabbedImagePanel;
|
||||||
import ui.implementation.components.image.TabbedPanelFactory;
|
import ui.implementation.components.image.TabbedPanelFactory;
|
||||||
import ui.implementation.components.intent.FileChooser;
|
import ui.implementation.components.intent.FileChooser;
|
||||||
import ui.abstractions.IDoubleMatrix;
|
import ui.abstractions.IFourierView;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
@@ -20,7 +19,7 @@ import javax.swing.event.ChangeEvent;
|
|||||||
/**
|
/**
|
||||||
* @author Jean-Marc Wagner, Laurent Crema
|
* @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 MODULE_TAB_TILE = "Module";
|
||||||
private static final String PHASE_TAB_TILE = "Phase";
|
private static final String PHASE_TAB_TILE = "Phase";
|
||||||
@@ -46,7 +45,7 @@ public class DoubleMatrix extends AbstractView implements IDoubleMatrix
|
|||||||
private final TabbedPanelFactory tabbedPanelFactory;
|
private final TabbedPanelFactory tabbedPanelFactory;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public DoubleMatrix(
|
public FourierView(
|
||||||
DoubleMatrixPresenter presenter,
|
DoubleMatrixPresenter presenter,
|
||||||
TabbedPanelFactory tabbedPanelFactory
|
TabbedPanelFactory tabbedPanelFactory
|
||||||
)
|
)
|
||||||
Reference in New Issue
Block a user