diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/visualization')
44 files changed, 125 insertions, 154 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/VisualizationTask.java b/src/de/lmu/ifi/dbs/elki/visualization/VisualizationTask.java index c648a9dd..04d2c5eb 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/VisualizationTask.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/VisualizationTask.java @@ -38,7 +38,7 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.VisFactory; * @apiviz.landmark * @apiviz.composedOf VisFactory * @apiviz.has SVGPlot - * @apiviz.has VisualizerContext + * @apiviz.has VisFactory * @apiviz.has Projection oneway - 0:1 * @apiviz.has Visualization oneway */ diff --git a/src/de/lmu/ifi/dbs/elki/visualization/VisualizerContext.java b/src/de/lmu/ifi/dbs/elki/visualization/VisualizerContext.java index ed30f3a3..532e7de5 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/VisualizerContext.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/VisualizerContext.java @@ -397,17 +397,15 @@ public class VisualizerContext extends AnyMap<String> implements DataStoreListen } @Override - public void resultAdded(Result child, @SuppressWarnings("unused") Result parent) { + public void resultAdded(Result child, Result parent) { processNewResult(getResult(), child); } - @SuppressWarnings("unused") @Override public void resultChanged(Result current) { // FIXME: need to do anything? } - @SuppressWarnings("unused") @Override public void resultRemoved(Result child, Result parent) { // FIXME: implement diff --git a/src/de/lmu/ifi/dbs/elki/visualization/batikutil/JSVGUpdateSynchronizer.java b/src/de/lmu/ifi/dbs/elki/visualization/batikutil/JSVGUpdateSynchronizer.java index 96d99002..0ecb6e0e 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/batikutil/JSVGUpdateSynchronizer.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/batikutil/JSVGUpdateSynchronizer.java @@ -226,12 +226,12 @@ class JSVGUpdateSynchronizer implements UpdateSynchronizer { * React to an update manager becoming available. */ @Override - public void managerStarted(@SuppressWarnings("unused") UpdateManagerEvent e) { + public void managerStarted(UpdateManagerEvent e) { makeRunnerIfNeeded(); } @Override - public void managerStopped(@SuppressWarnings("unused") UpdateManagerEvent e) { + public void managerStopped(UpdateManagerEvent e) { forgetSynchronizedRunner(); } } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/gui/ResultWindow.java b/src/de/lmu/ifi/dbs/elki/visualization/gui/ResultWindow.java index a3b8a458..c5bdf408 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/gui/ResultWindow.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/gui/ResultWindow.java @@ -165,7 +165,7 @@ public class ResultWindow extends JFrame implements ResultListener { exportItem.setEnabled(false); exportItem.addActionListener(new ActionListener() { @Override - public void actionPerformed(@SuppressWarnings("unused") ActionEvent ae) { + public void actionPerformed(ActionEvent ae) { saveCurrentPlot(); } }); @@ -174,7 +174,7 @@ public class ResultWindow extends JFrame implements ResultListener { quitItem.setMnemonic(KeyEvent.VK_Q); quitItem.addActionListener(new ActionListener() { @Override - public void actionPerformed(@SuppressWarnings("unused") ActionEvent e) { + public void actionPerformed(ActionEvent e) { close(); } }); @@ -184,7 +184,7 @@ public class ResultWindow extends JFrame implements ResultListener { overviewItem.setEnabled(false); overviewItem.addActionListener(new ActionListener() { @Override - public void actionPerformed(@SuppressWarnings("unused") ActionEvent ae) { + public void actionPerformed(ActionEvent ae) { showOverview(); } }); @@ -193,7 +193,7 @@ public class ResultWindow extends JFrame implements ResultListener { editItem.setMnemonic(KeyEvent.VK_T); editItem.addActionListener(new ActionListener() { @Override - public void actionPerformed(@SuppressWarnings("unused") ActionEvent ae) { + public void actionPerformed(ActionEvent ae) { showTableView(); } }); @@ -416,7 +416,7 @@ public class ResultWindow extends JFrame implements ResultListener { final JCheckBoxMenuItem visItem = new JCheckBoxMenuItem(name, enabled); visItem.addItemListener(new ItemListener() { @Override - public void itemStateChanged(@SuppressWarnings("unused") ItemEvent e) { + public void itemStateChanged(ItemEvent e) { // We need SwingUtilities to avoid a deadlock! SwingUtilities.invokeLater(new Runnable() { @Override @@ -432,7 +432,7 @@ public class ResultWindow extends JFrame implements ResultListener { final JRadioButtonMenuItem visItem = new JRadioButtonMenuItem(name, enabled); visItem.addItemListener(new ItemListener() { @Override - public void itemStateChanged(@SuppressWarnings("unused") ItemEvent e) { + public void itemStateChanged(ItemEvent e) { // We need SwingUtilities to avoid a deadlock! SwingUtilities.invokeLater(new Runnable() { @Override @@ -448,19 +448,16 @@ public class ResultWindow extends JFrame implements ResultListener { return null; } - @SuppressWarnings("unused") @Override public void resultAdded(Result child, Result parent) { updateVisualizerMenus(); } - @SuppressWarnings("unused") @Override public void resultChanged(Result current) { updateVisualizerMenus(); } - @SuppressWarnings("unused") @Override public void resultRemoved(Result child, Result parent) { updateVisualizerMenus(); diff --git a/src/de/lmu/ifi/dbs/elki/visualization/gui/SelectionTableWindow.java b/src/de/lmu/ifi/dbs/elki/visualization/gui/SelectionTableWindow.java index c2190e63..6bcf5f0b 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/gui/SelectionTableWindow.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/gui/SelectionTableWindow.java @@ -163,14 +163,14 @@ public class SelectionTableWindow extends JFrame implements DataStoreListener, R closeButton = new JButton("close");
closeButton.addActionListener(new ActionListener() {
@Override
- public void actionPerformed(@SuppressWarnings("unused") ActionEvent arg0) {
+ public void actionPerformed(ActionEvent arg0) {
dispose();
}
});
deleteButton = new JButton("delete");
deleteButton.addActionListener(new ActionListener() {
@Override
- public void actionPerformed(@SuppressWarnings("unused") ActionEvent arg0) {
+ public void actionPerformed(ActionEvent arg0) {
handleDelete();
}
});
@@ -291,7 +291,7 @@ public class SelectionTableWindow extends JFrame implements DataStoreListener, R }
@Override
- public boolean isCellEditable(@SuppressWarnings("unused") int rowIndex, int columnIndex) {
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
if(columnIndex == 0) {
return false;
}
@@ -310,8 +310,7 @@ public class SelectionTableWindow extends JFrame implements DataStoreListener, R }
if(columnIndex == 2 && aValue instanceof String) {
// FIXME: better class label handling!
- SimpleClassLabel lbl = new SimpleClassLabel();
- lbl.init((String) aValue);
+ SimpleClassLabel lbl = new SimpleClassLabel((String) aValue);
crep.set(id, lbl);
}
if(!(aValue instanceof String)) {
@@ -361,13 +360,11 @@ public class SelectionTableWindow extends JFrame implements DataStoreListener, R }
}
- @SuppressWarnings("unused")
@Override
public void resultAdded(Result child, Result parent) {
// TODO Auto-generated method stub
}
- @SuppressWarnings("unused")
@Override
public void resultRemoved(Result child, Result parent) {
// TODO Auto-generated method stub
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/gui/SimpleSVGViewer.java b/src/de/lmu/ifi/dbs/elki/visualization/gui/SimpleSVGViewer.java index e249eed3..a08be9b5 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/gui/SimpleSVGViewer.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/gui/SimpleSVGViewer.java @@ -84,7 +84,7 @@ public class SimpleSVGViewer extends JFrame { exportItem.setMnemonic(KeyEvent.VK_E); exportItem.addActionListener(new ActionListener() { @Override - public void actionPerformed(@SuppressWarnings("unused") ActionEvent ae) { + public void actionPerformed(ActionEvent ae) { saveCurrentPlot(); } }); @@ -93,7 +93,7 @@ public class SimpleSVGViewer extends JFrame { quitItem.setMnemonic(KeyEvent.VK_Q); quitItem.addActionListener(new ActionListener() { @Override - public void actionPerformed(@SuppressWarnings("unused") ActionEvent e) { + public void actionPerformed(ActionEvent e) { close(); } }); diff --git a/src/de/lmu/ifi/dbs/elki/visualization/gui/detail/DetailView.java b/src/de/lmu/ifi/dbs/elki/visualization/gui/detail/DetailView.java index 99bbc78d..341aa69f 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/gui/detail/DetailView.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/gui/detail/DetailView.java @@ -52,9 +52,9 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.VisualizerUtil; * * @author Erich Schubert * - * @apiviz.has VisualizerContext * @apiviz.has Visualization * @apiviz.has PlotItem + * @apiviz.uses VisualizerContext * @apiviz.uses VisualizationTask */ public class DetailView extends SVGPlot implements ResultListener { @@ -245,7 +245,6 @@ public class DetailView extends SVGPlot implements ResultListener { } } - @SuppressWarnings("unused") @Override public void resultAdded(Result child, Result parent) { // Ignore. The PlotItem will need to change. @@ -285,7 +284,6 @@ public class DetailView extends SVGPlot implements ResultListener { } } - @SuppressWarnings("unused") @Override public void resultRemoved(Result child, Result parent) { // Ignore. The PlotItem will need to change. diff --git a/src/de/lmu/ifi/dbs/elki/visualization/gui/overview/OverviewPlot.java b/src/de/lmu/ifi/dbs/elki/visualization/gui/overview/OverviewPlot.java index 5c8b8d44..f05719ae 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/gui/overview/OverviewPlot.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/gui/overview/OverviewPlot.java @@ -64,7 +64,7 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.VisualizerUtil; * * @apiviz.landmark * @apiviz.has VisualizerContext - * @apiviz.composedOf PlotMap + * @apiviz.composedOf RectangleArranger * @apiviz.has DetailViewSelectedEvent * @apiviz.uses DetailView * @apiviz.uses de.lmu.ifi.dbs.elki.visualization.projections.Projection @@ -300,31 +300,33 @@ public class OverviewPlot extends SVGPlot implements ResultListener { boolean refreshcss = false; final int thumbsize = (int) Math.max(screenwidth / plotmap.getWidth(), screenheight / plotmap.getHeight()); for(Entry<PlotItem, double[]> ent : plotmap.entrySet()) { - PlotItem it = ent.getKey(); - for(Iterator<VisualizationTask> iter = it.visIterator(); iter.hasNext(); ) { - VisualizationTask task = iter.next(); - Element parent = vistoelem.get(new Pair<PlotItem, VisualizationTask>(it, task)); - if(parent == null) { - LoggingUtil.warning("No container element produced by " + task); - continue; - } - if(VisualizerUtil.thumbnailEnabled(task) && VisualizerUtil.isVisible(task)) { - // unhide when hidden. - if(parent.hasAttribute(SVGConstants.CSS_VISIBILITY_PROPERTY)) { - parent.removeAttribute(SVGConstants.CSS_VISIBILITY_PROPERTY); + for(Iterator<PlotItem> iter = ent.getKey().itemIterator(); iter.hasNext();) { + PlotItem it = iter.next(); + + for(VisualizationTask task : it.visualizations) { + Element parent = vistoelem.get(new Pair<PlotItem, VisualizationTask>(it, task)); + if(parent == null) { + LoggingUtil.warning("No container element found for " + task); + continue; } - // if not yet rendered, add a thumbnail - if(!parent.hasChildNodes()) { - makeThumbnail(thumbsize, it, task, parent); - refreshcss = true; + if(VisualizerUtil.thumbnailEnabled(task) && VisualizerUtil.isVisible(task)) { + // unhide when hidden. + if(parent.hasAttribute(SVGConstants.CSS_VISIBILITY_PROPERTY)) { + parent.removeAttribute(SVGConstants.CSS_VISIBILITY_PROPERTY); + } + // if not yet rendered, add a thumbnail + if(!parent.hasChildNodes()) { + makeThumbnail(thumbsize, it, task, parent); + refreshcss = true; + } } - } - else { - // hide if there is anything to hide. - if(parent != null && parent.hasChildNodes()) { - parent.setAttribute(SVGConstants.CSS_VISIBILITY_PROPERTY, SVGConstants.CSS_HIDDEN_VALUE); + else { + // hide if there is anything to hide. + if(parent != null && parent.hasChildNodes()) { + parent.setAttribute(SVGConstants.CSS_VISIBILITY_PROPERTY, SVGConstants.CSS_HIDDEN_VALUE); + } + // TODO: unqueue pending thumbnails } - // TODO: unqueue pending thumbnails } } } @@ -419,7 +421,7 @@ public class OverviewPlot extends SVGPlot implements ResultListener { } @Override - public void handleEvent(@SuppressWarnings("unused") Event evt) { + public void handleEvent(Event evt) { triggerSubplotSelectEvent(it); } } @@ -464,7 +466,6 @@ public class OverviewPlot extends SVGPlot implements ResultListener { scheduleUpdate(pr); } - @SuppressWarnings("unused") @Override public void resultAdded(Result child, Result parent) { logger.debug("result added: " + child); @@ -480,7 +481,6 @@ public class OverviewPlot extends SVGPlot implements ResultListener { lazyRefresh(); } - @SuppressWarnings("unused") @Override public void resultRemoved(Result child, Result parent) { logger.debug("result removed: " + child); diff --git a/src/de/lmu/ifi/dbs/elki/visualization/opticsplot/OPTICSColorStatic.java b/src/de/lmu/ifi/dbs/elki/visualization/opticsplot/OPTICSColorStatic.java index 359d3062..af28008e 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/opticsplot/OPTICSColorStatic.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/opticsplot/OPTICSColorStatic.java @@ -47,7 +47,7 @@ public class OPTICSColorStatic implements OPTICSColorAdapter { } @Override - public int getColorForEntry(@SuppressWarnings("unused") ClusterOrderEntry<?> coe) { + public int getColorForEntry(ClusterOrderEntry<?> coe) { return color; } } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java index 06e94891..3836379a 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramFactory.java @@ -40,8 +40,9 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * Produce one-dimensional projections. * * @author Erich Schubert + * + * @apiviz.has HistogramProjector */ -// TODO: re-add maxdim option public class HistogramFactory implements ProjectorFactory { /** * Maximum dimensionality diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java index 5ddc7b32..40bd55ee 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/HistogramProjector.java @@ -46,6 +46,8 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.visunproj.LabelVisFactory; * * @author Erich Schubert * + * @apiviz.has LinearScale + * * @param <V> Vector type */ public class HistogramProjector<V extends NumberVector<?, ?>> extends AbstractHierarchicalResult implements Projector { @@ -80,21 +82,26 @@ public class HistogramProjector<V extends NumberVector<?, ?>> extends AbstractHi @Override public Collection<PlotItem> arrange() { - List<PlotItem> layout = new ArrayList<PlotItem>(1); + List<PlotItem> layout = new ArrayList<PlotItem>(1 + dmax); List<VisualizationTask> tasks = ResultUtil.filterResults(this, VisualizationTask.class); if (tasks.size() > 0){ - PlotItem master = new PlotItem(dmax + .1, .5 + .1, null); - for(int d1 = 1; d1 <= dmax; d1++) { - Projection1D proj = new Simple1D(scales, d1); - final PlotItem it = new PlotItem(d1 - 1 + .1, 0. + .1, 1., .5, proj); + final double xoff = (dmax > 1) ? .1 : 0.; + final double hheight = .5; + final double lheight = .1; + PlotItem master = new PlotItem(dmax + xoff, hheight + lheight, null); + for(int d1 = 0; d1 < dmax; d1++) { + Projection1D proj = new Simple1D(scales, d1 + 1); + final PlotItem it = new PlotItem(d1 + xoff, lheight, 1., hheight, proj); it.visualizations = tasks; master.subitems.add(it); } layout.add(master); - for(int d1 = 1; d1 <= dmax; d1++) { - PlotItem it = new PlotItem(d1 - 1 + .1, 0, 1., .1, null); - final VisualizationTask task = new VisualizationTask("", null, null, new LabelVisFactory(DatabaseUtil.getColumnLabel(rel, d1))); - task.height = .1; + // Add labels + for(int d1 = 0; d1 < dmax; d1++) { + PlotItem it = new PlotItem(d1 + xoff, 0, 1., lheight, null); + LabelVisFactory lbl = new LabelVisFactory(DatabaseUtil.getColumnLabel(rel, d1 + 1)); + final VisualizationTask task = new VisualizationTask("", null, null, lbl); + task.height = lheight; task.width = 1; task.put(VisualizationTask.META_NODETAIL, true); it.visualizations.add(task); diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java index 580eb532..25023029 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjectorFactory.java @@ -36,6 +36,8 @@ import de.lmu.ifi.dbs.elki.visualization.opticsplot.OPTICSPlot; * Produce OPTICS plot projections * * @author Erich Schubert + * + * @apiviz.has OPTICSProjector */ public class OPTICSProjectorFactory implements ProjectorFactory { /** diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java index d0996822..3dbb803f 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ProjectorFactory.java @@ -33,6 +33,8 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.Parameterizable; * detecting appropriate relations in the database. * * @author Erich Schubert + * + * @apiviz.has Projector */ public interface ProjectorFactory extends ResultProcessor, Parameterizable { /** diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java index 3d996bdc..5957233d 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotFactory.java @@ -41,8 +41,9 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * Produce scatterplot projections. * * @author Erich Schubert + * + * @apiviz.has ScatterPlotProjector */ -// TODO: re-add maxdim option public class ScatterPlotFactory implements ProjectorFactory { /** * Maximum number of dimensions to visualize. @@ -114,7 +115,7 @@ public class ScatterPlotFactory implements ProjectorFactory { } @Override - protected Object makeInstance() { + protected ScatterPlotFactory makeInstance() { return new ScatterPlotFactory(maxdim); } } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java index ee692531..a090f523 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/ScatterPlotProjector.java @@ -48,9 +48,10 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.visunproj.LabelVisFactory; * * @author Erich Schubert * + * @apiviz.has LinearScale + * * @param <V> Vector type */ -// FIXME: re-add column labels public class ScatterPlotProjector<V extends NumberVector<?, ?>> extends AbstractHierarchicalResult implements Projector { /** * Relation we project diff --git a/src/de/lmu/ifi/dbs/elki/visualization/savedialog/SaveOptionsPanel.java b/src/de/lmu/ifi/dbs/elki/visualization/savedialog/SaveOptionsPanel.java index 9a678218..9c41fbab 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/savedialog/SaveOptionsPanel.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/savedialog/SaveOptionsPanel.java @@ -171,7 +171,7 @@ public class SaveOptionsPanel extends JPanel { spinnerWidth = new JSpinner(modelWidth); spinnerWidth.addChangeListener(new ChangeListener() { @Override - public void stateChanged(@SuppressWarnings("unused") ChangeEvent e) { + public void stateChanged(ChangeEvent e) { if(aspectRatioLock.isSelected()) { int val = modelWidth.getNumber().intValue(); spinnerHeight.setValue(new Integer((int) Math.round(val / ratio))); @@ -183,7 +183,7 @@ public class SaveOptionsPanel extends JPanel { spinnerHeight = new JSpinner(modelHeight); spinnerHeight.addChangeListener(new ChangeListener() { @Override - public void stateChanged(@SuppressWarnings("unused") ChangeEvent e) { + public void stateChanged(ChangeEvent e) { if(aspectRatioLock.isSelected()) { int val = modelHeight.getNumber().intValue(); spinnerWidth.setValue(new Integer((int) Math.round(val * ratio))); @@ -207,7 +207,7 @@ public class SaveOptionsPanel extends JPanel { resetSizeButton = new JButton(STR_RESET_IMAGE_SIZE); resetSizeButton.addActionListener(new ActionListener() { @Override - public void actionPerformed(@SuppressWarnings("unused") ActionEvent e) { + public void actionPerformed(ActionEvent e) { modelWidth.setValue(width); modelHeight.setValue(height); aspectRatioLock.setSelected(true); diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/AbstractVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/AbstractVisualization.java index 8d1b184d..dab1c6dd 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/AbstractVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/AbstractVisualization.java @@ -169,7 +169,6 @@ public abstract class AbstractVisualization implements Visualization, ContextCha */ protected abstract void redraw(); - @SuppressWarnings("unused") @Override public void resultAdded(Result child, Result parent) { // Ignore by default @@ -183,7 +182,6 @@ public abstract class AbstractVisualization implements Visualization, ContextCha } } - @SuppressWarnings("unused") @Override public void resultRemoved(Result child, Result parent) { // Ignore by default. diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/AbstractOPTICSVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/AbstractOPTICSVisualization.java index 9cb95c23..bcf25a84 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/AbstractOPTICSVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/AbstractOPTICSVisualization.java @@ -39,7 +39,9 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.AbstractVisualization; * Abstract base class for OPTICS visualizer * * @author Erich Schubert - * + * + * @apiviz.uses OPTICSProjector + * * @param <D> */ public abstract class AbstractOPTICSVisualization<D extends Distance<D>> extends AbstractVisualization { @@ -47,12 +49,12 @@ public abstract class AbstractOPTICSVisualization<D extends Distance<D>> extends * The plot */ final protected OPTICSProjector<D> optics; - + /** * Width of plot (in display units) */ protected double plotwidth; - + /** * Height of plot (in display units) */ @@ -60,7 +62,7 @@ public abstract class AbstractOPTICSVisualization<D extends Distance<D>> extends /** * Constructor. - * + * * @param task Visualization task. */ public AbstractOPTICSVisualization(VisualizationTask task) { @@ -79,7 +81,7 @@ public abstract class AbstractOPTICSVisualization<D extends Distance<D>> extends final String transform = SVGUtil.makeMarginTransform(task.getWidth(), task.getHeight(), plotwidth, plotheight, margin / 2); SVGUtil.setAtt(layer, SVGConstants.SVG_TRANSFORM_ATTRIBUTE, transform); } - + /** * Access the raw cluster order * diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSClusterVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSClusterVisualization.java index 0898d9d0..542dcea7 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSClusterVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSClusterVisualization.java @@ -53,8 +53,7 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.Visualization; * * @author Erich Schubert * - * @apiviz.uses ClusterOrderResult - * @apiviz.uses OPTICSPlot + * @apiviz.uses Clustering oneway - - «visualizes» * * @param <D> Distance type (actually unused) */ @@ -210,7 +209,7 @@ public class OPTICSClusterVisualization<D extends Distance<D>> extends AbstractO } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // Don't use thumbnails return false; } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotCutVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotCutVisualization.java index 9f2a5734..08ca7504 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotCutVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotCutVisualization.java @@ -57,9 +57,6 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.Visualization; *
* @author Heidi Kolb
*
- * @apiviz.uses ClusterOrderResult oneway - 1 visualizes
- * @apiviz.uses OPTICSPlot oneway - 1 visualizes
- *
* @param <D> distance type
*/
public class OPTICSPlotCutVisualization<D extends Distance<D>> extends AbstractOPTICSVisualization<D> implements DragableArea.DragListener {
@@ -204,7 +201,7 @@ public class OPTICSPlotCutVisualization<D extends Distance<D>> extends AbstractO }
@Override
- public boolean startDrag(SVGPoint start, @SuppressWarnings("unused") Event evt) {
+ public boolean startDrag(SVGPoint start, Event evt) {
epsilon = getEpsilonFromY(plotheight - start.getY());
// opvis.unsetEpsilonExcept(this);
synchronizedRedraw();
@@ -212,7 +209,7 @@ public class OPTICSPlotCutVisualization<D extends Distance<D>> extends AbstractO }
@Override
- public boolean duringDrag(@SuppressWarnings("unused") SVGPoint start, SVGPoint end, @SuppressWarnings("unused") Event evt, boolean inside) {
+ public boolean duringDrag(SVGPoint start, SVGPoint end, Event evt, boolean inside) {
if(inside) {
epsilon = getEpsilonFromY(plotheight - end.getY());
}
@@ -222,7 +219,7 @@ public class OPTICSPlotCutVisualization<D extends Distance<D>> extends AbstractO }
@Override
- public boolean endDrag(@SuppressWarnings("unused") SVGPoint start, SVGPoint end, @SuppressWarnings("unused") Event evt, boolean inside) {
+ public boolean endDrag(SVGPoint start, SVGPoint end, Event evt, boolean inside) {
if(inside) {
epsilon = getEpsilonFromY(plotheight - end.getY());
// opvis.unsetEpsilonExcept(this);
@@ -294,7 +291,7 @@ public class OPTICSPlotCutVisualization<D extends Distance<D>> extends AbstractO }
@Override
- public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) {
+ public boolean allowThumbnails(VisualizationTask task) {
// Don't use thumbnails
return false;
}
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotSelectionVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotSelectionVisualization.java index b75bd3b5..69bc781e 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotSelectionVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotSelectionVisualization.java @@ -59,8 +59,6 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.Visualization; *
* @author Heidi Kolb
*
- * @apiviz.uses ClusterOrderResult oneway - 1
- * @apiviz.uses OPTICSPlot oneway - 1
* @apiviz.uses DBIDSelection oneway - 1 visualizes
*
* @param <D> distance type
@@ -181,7 +179,7 @@ public class OPTICSPlotSelectionVisualization<D extends Distance<D>> extends Abs }
@Override
- public boolean startDrag(SVGPoint startPoint, @SuppressWarnings("unused") Event evt) {
+ public boolean startDrag(SVGPoint startPoint, Event evt) {
List<ClusterOrderEntry<D>> order = getClusterOrder();
int mouseActIndex = getSelectedIndex(order, startPoint);
if(mouseActIndex >= 0 && mouseActIndex < order.size()) {
@@ -196,7 +194,7 @@ public class OPTICSPlotSelectionVisualization<D extends Distance<D>> extends Abs }
@Override
- public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, @SuppressWarnings("unused") Event evt, @SuppressWarnings("unused") boolean inside) {
+ public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
List<ClusterOrderEntry<D>> order = getClusterOrder();
int mouseDownIndex = getSelectedIndex(order, startPoint);
int mouseActIndex = getSelectedIndex(order, dragPoint);
@@ -213,7 +211,7 @@ public class OPTICSPlotSelectionVisualization<D extends Distance<D>> extends Abs }
@Override
- public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, @SuppressWarnings("unused") boolean inside) {
+ public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
List<ClusterOrderEntry<D>> order = getClusterOrder();
int mouseDownIndex = getSelectedIndex(order, startPoint);
int mouseActIndex = getSelectedIndex(order, dragPoint);
@@ -366,7 +364,7 @@ public class OPTICSPlotSelectionVisualization<D extends Distance<D>> extends Abs }
@Override
- public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) {
+ public boolean allowThumbnails(VisualizationTask task) {
// Don't use thumbnails
return false;
}
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotVisualizer.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotVisualizer.java index 4af5d466..7f4e3248 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotVisualizer.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSPlotVisualizer.java @@ -51,9 +51,6 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.Visualization; * * @author Erich Schubert * - * @apiviz.has OPTICSPlot oneway - 1 visualizes - * @apiviz.has ClusterOrderResult oneway - 1 visualizes - * * @param <D> Distance type */ public class OPTICSPlotVisualizer<D extends Distance<D>> extends AbstractOPTICSVisualization<D> { @@ -138,7 +135,7 @@ public class OPTICSPlotVisualizer<D extends Distance<D>> extends AbstractOPTICSV } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // Don't use thumbnails return false; } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSSteepAreaVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSSteepAreaVisualization.java index f9430145..b082836f 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSSteepAreaVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/optics/OPTICSSteepAreaVisualization.java @@ -215,7 +215,7 @@ public class OPTICSSteepAreaVisualization<D extends Distance<D>> extends Abstrac } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // Don't use thumbnails return false; } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/thumbs/ThumbnailVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/thumbs/ThumbnailVisualization.java index e352d599..25f55d41 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/thumbs/ThumbnailVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/thumbs/ThumbnailVisualization.java @@ -152,7 +152,7 @@ public class ThumbnailVisualization extends AbstractVisualization implements Thu } @Override - public void contentChanged(@SuppressWarnings("unused") DataStoreEvent e) { + public void contentChanged(DataStoreEvent e) { refreshThumbnail(); } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/AbstractTooltipVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/AbstractTooltipVisualization.java index 9b8d19b6..4e0171ae 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/AbstractTooltipVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/AbstractTooltipVisualization.java @@ -172,7 +172,7 @@ public abstract class AbstractTooltipVisualization<NV extends NumberVector<NV, ? abstract protected void setupCSS(SVGPlot svgp); @Override - public void contentChanged(@SuppressWarnings("unused") DataStoreEvent e) { + public void contentChanged(DataStoreEvent e) { synchronizedRedraw(); } }
\ No newline at end of file diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/AxisVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/AxisVisualization.java index 4e927ace..4dc7e820 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/AxisVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/AxisVisualization.java @@ -158,7 +158,7 @@ public class AxisVisualization<NV extends NumberVector<NV, ?>> extends P2DVisual } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // Don't use thumbnails return false; } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ClusterOrderVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ClusterOrderVisualization.java index 644083f9..f758ff99 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ClusterOrderVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ClusterOrderVisualization.java @@ -108,7 +108,7 @@ public class ClusterOrderVisualization<NV extends NumberVector<NV, ?>> extends P } @Override - public void contentChanged(@SuppressWarnings("unused") DataStoreEvent e) { + public void contentChanged(DataStoreEvent e) { synchronizedRedraw(); } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ClusteringVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ClusteringVisualization.java index 58f71ef3..4bef6e11 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ClusteringVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ClusteringVisualization.java @@ -101,7 +101,7 @@ public class ClusteringVisualization<NV extends NumberVector<NV, ?>> extends P2D } @Override - public void contentChanged(@SuppressWarnings("unused") DataStoreEvent e) { + public void contentChanged(DataStoreEvent e) { synchronizedRedraw(); } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/MoveObjectsToolVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/MoveObjectsToolVisualization.java index 66b442f9..6d798247 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/MoveObjectsToolVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/MoveObjectsToolVisualization.java @@ -95,7 +95,7 @@ public class MoveObjectsToolVisualization<NV extends NumberVector<NV, ?>> extend }
@Override
- public void contextChanged(@SuppressWarnings("unused") ContextChangedEvent e) {
+ public void contextChanged(ContextChangedEvent e) {
synchronizedRedraw();
}
@@ -169,19 +169,19 @@ public class MoveObjectsToolVisualization<NV extends NumberVector<NV, ?>> extend }
@Override
- public boolean startDrag(@SuppressWarnings("unused") SVGPoint startPoint, @SuppressWarnings("unused") Event evt) {
+ public boolean startDrag(SVGPoint startPoint, Event evt) {
return true;
}
@Override
- public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, @SuppressWarnings("unused") Event evt, @SuppressWarnings("unused") boolean inside) {
+ public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
deleteChildren(rtag);
rtag.appendChild(svgp.svgLine(startPoint.getX(), startPoint.getY(), dragPoint.getX(), dragPoint.getY()));
return true;
}
@Override
- public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, @SuppressWarnings("unused") Event evt, @SuppressWarnings("unused") boolean inside) {
+ public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
Vector movingVector = new Vector(2);
movingVector.set(0, dragPoint.getX() - startPoint.getX());
movingVector.set(1, dragPoint.getY() - startPoint.getY());
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionConvexHullVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionConvexHullVisualization.java index 9e70ffd8..fde2c00d 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionConvexHullVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionConvexHullVisualization.java @@ -140,7 +140,7 @@ public class SelectionConvexHullVisualization<NV extends NumberVector<NV, ?>> ex }
@Override
- public void contentChanged(@SuppressWarnings("unused") DataStoreEvent e) {
+ public void contentChanged(DataStoreEvent e) {
synchronizedRedraw();
}
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionCubeVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionCubeVisualization.java index 7f6d9c04..087ec6af 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionCubeVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionCubeVisualization.java @@ -95,14 +95,8 @@ public class SelectionCubeVisualization<NV extends NumberVector<NV, ?>> extends */
protected boolean nofill = false;
- /**
- * The result we process
- */
- private SelectionResult result;
-
public SelectionCubeVisualization(VisualizationTask task, boolean nofill) {
super(task);
- this.result = task.getResult();
this.nofill = nofill;
addCSSClasses(svgp);
context.addContextChangeListener(this);
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionDotVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionDotVisualization.java index 283eafaa..06167532 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionDotVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionDotVisualization.java @@ -75,18 +75,12 @@ public class SelectionDotVisualization<NV extends NumberVector<NV, ?>> extends P public static final String MARKER = "selectionDotMarker";
/**
- * The selection result we work on
- */
- private SelectionResult result;
-
- /**
* Constructor.
*
* @param task Task
*/
public SelectionDotVisualization(VisualizationTask task) {
super(task);
- this.result = task.getResult();
context.addContextChangeListener(this);
context.addResultListener(this);
context.addDataStoreListener(this);
@@ -131,7 +125,7 @@ public class SelectionDotVisualization<NV extends NumberVector<NV, ?>> extends P }
@Override
- public void contentChanged(@SuppressWarnings("unused") DataStoreEvent e) {
+ public void contentChanged(DataStoreEvent e) {
synchronizedRedraw();
}
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionToolCubeVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionToolCubeVisualization.java index fc2af9da..ed0b456d 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionToolCubeVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionToolCubeVisualization.java @@ -101,18 +101,12 @@ public class SelectionToolCubeVisualization<NV extends NumberVector<NV, ?>> exte private Element etag;
/**
- * Our result
- */
- private SelectionResult result;
-
- /**
* Constructor.
*
* @param task Task
*/
public SelectionToolCubeVisualization(VisualizationTask task) {
super(task);
- this.result = task.getResult();
this.dim = DatabaseUtil.dimensionality(rel);
context.addContextChangeListener(this);
incrementalRedraw();
@@ -125,7 +119,7 @@ public class SelectionToolCubeVisualization<NV extends NumberVector<NV, ?>> exte }
@Override
- public void contextChanged(@SuppressWarnings("unused") ContextChangedEvent e) {
+ public void contextChanged(ContextChangedEvent e) {
synchronizedRedraw();
}
@@ -184,12 +178,12 @@ public class SelectionToolCubeVisualization<NV extends NumberVector<NV, ?>> exte }
@Override
- public boolean startDrag(@SuppressWarnings("unused") SVGPoint startPoint, @SuppressWarnings("unused") Event evt) {
+ public boolean startDrag(SVGPoint startPoint, Event evt) {
return true;
}
@Override
- public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, @SuppressWarnings("unused") Event evt, @SuppressWarnings("unused") boolean inside) {
+ public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
deleteChildren(rtag);
double x = Math.min(startPoint.getX(), dragPoint.getX());
double y = Math.min(startPoint.getY(), dragPoint.getY());
@@ -200,7 +194,7 @@ public class SelectionToolCubeVisualization<NV extends NumberVector<NV, ?>> exte }
@Override
- public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, @SuppressWarnings("unused") Event evt, @SuppressWarnings("unused") boolean inside) {
+ public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
deleteChildren(rtag);
if(startPoint.getX() != dragPoint.getX() || startPoint.getY() != dragPoint.getY()) {
updateSelection(proj, startPoint, dragPoint);
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionToolDotVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionToolDotVisualization.java index a50a6cbb..7593dac5 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionToolDotVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/SelectionToolDotVisualization.java @@ -95,18 +95,12 @@ public class SelectionToolDotVisualization<NV extends NumberVector<NV, ?>> exten Element etag;
/**
- * Our result
- */
- private SelectionResult result;
-
- /**
* Constructor.
*
* @param task Task
*/
public SelectionToolDotVisualization(VisualizationTask task) {
super(task);
- this.result = task.getResult();
context.addContextChangeListener(this);
incrementalRedraw();
}
@@ -118,7 +112,7 @@ public class SelectionToolDotVisualization<NV extends NumberVector<NV, ?>> exten }
@Override
- public void contextChanged(@SuppressWarnings("unused") ContextChangedEvent e) {
+ public void contextChanged(ContextChangedEvent e) {
synchronizedRedraw();
}
@@ -149,12 +143,12 @@ public class SelectionToolDotVisualization<NV extends NumberVector<NV, ?>> exten }
@Override
- public boolean startDrag(@SuppressWarnings("unused") SVGPoint startPoint, @SuppressWarnings("unused") Event evt) {
+ public boolean startDrag(SVGPoint startPoint, Event evt) {
return true;
}
@Override
- public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, @SuppressWarnings("unused") Event evt, @SuppressWarnings("unused") boolean inside) {
+ public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
deleteChildren(rtag);
double x = Math.min(startPoint.getX(), dragPoint.getX());
double y = Math.min(startPoint.getY(), dragPoint.getY());
@@ -165,7 +159,7 @@ public class SelectionToolDotVisualization<NV extends NumberVector<NV, ?>> exten }
@Override
- public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, @SuppressWarnings("unused") boolean inside) {
+ public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
Mode mode = getInputMode(evt);
deleteChildren(rtag);
if(startPoint.getX() != dragPoint.getX() || startPoint.getY() != dragPoint.getY()) {
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ToolBox2DVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ToolBox2DVisualization.java index ba91975c..c2339fe2 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ToolBox2DVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/ToolBox2DVisualization.java @@ -107,7 +107,7 @@ public class ToolBox2DVisualization<NV extends NumberVector<NV, ?>> extends P2DV }
@Override
- public void contextChanged(@SuppressWarnings("unused") ContextChangedEvent e) {
+ public void contextChanged(ContextChangedEvent e) {
synchronizedRedraw();
}
@@ -232,7 +232,7 @@ public class ToolBox2DVisualization<NV extends NumberVector<NV, ?>> extends P2DV EventTarget targ = (EventTarget) tag;
targ.addEventListener(SVGConstants.SVG_EVENT_CLICK, new EventListener() {
@Override
- public void handleEvent(@SuppressWarnings("unused") Event evt) {
+ public void handleEvent(Event evt) {
handleMouseClick(tool);
}
}, false);
@@ -252,7 +252,7 @@ public class ToolBox2DVisualization<NV extends NumberVector<NV, ?>> extends P2DV }
@Override
- public void resultAdded(Result child, @SuppressWarnings("unused") Result parent) {
+ public void resultAdded(Result child, Result parent) {
if(child instanceof VisualizationTask) {
VisualizationTask task = (VisualizationTask) child;
if(VisualizerUtil.isTool(task)) {
@@ -262,7 +262,7 @@ public class ToolBox2DVisualization<NV extends NumberVector<NV, ?>> extends P2DV }
@Override
- public void resultRemoved(Result child, @SuppressWarnings("unused") Result parent) {
+ public void resultRemoved(Result child, Result parent) {
if(child instanceof VisualizationTask) {
VisualizationTask task = (VisualizationTask) child;
if(VisualizerUtil.isTool(task)) {
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/TreeMBRVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/TreeMBRVisualization.java index 5fe6aac2..cc3dfbe8 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/TreeMBRVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/TreeMBRVisualization.java @@ -179,7 +179,7 @@ public class TreeMBRVisualization<NV extends NumberVector<NV, ?>, N extends Abst } @Override - public void contentChanged(@SuppressWarnings("unused") DataStoreEvent e) { + public void contentChanged(DataStoreEvent e) { synchronizedRedraw(); } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/TreeSphereVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/TreeSphereVisualization.java index 1aec1ead..73a02ddb 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/TreeSphereVisualization.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/vis2d/TreeSphereVisualization.java @@ -248,7 +248,7 @@ public class TreeSphereVisualization<NV extends NumberVector<NV, ?>, D extends N } @Override - public void contentChanged(@SuppressWarnings("unused") DataStoreEvent e) { + public void contentChanged(DataStoreEvent e) { synchronizedRedraw(); } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/ClusterEvaluationVisFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/ClusterEvaluationVisFactory.java index 469d6db5..405ba673 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/ClusterEvaluationVisFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/ClusterEvaluationVisFactory.java @@ -123,7 +123,7 @@ public class ClusterEvaluationVisFactory extends AbstractVisFactory { } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // Don't use thumbnails return false; } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/CurveVisFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/CurveVisFactory.java index a45f2007..4d0e3dc0 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/CurveVisFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/CurveVisFactory.java @@ -235,7 +235,7 @@ public class CurveVisFactory extends AbstractVisFactory { } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // TODO: depending on the curve complexity? return false; } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/HistogramVisFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/HistogramVisFactory.java index c8dfe0c8..81a77c13 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/HistogramVisFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/HistogramVisFactory.java @@ -177,7 +177,7 @@ public class HistogramVisFactory extends AbstractVisFactory { } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // TODO: depending on the histogram complexity? return false; } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/KeyVisFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/KeyVisFactory.java index 69813d99..e3a5dfd4 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/KeyVisFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/KeyVisFactory.java @@ -116,7 +116,7 @@ public class KeyVisFactory extends AbstractVisFactory { } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { return false; } }
\ No newline at end of file diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/PixmapVisualizer.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/PixmapVisualizer.java index 06268dac..825d64b6 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/PixmapVisualizer.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/PixmapVisualizer.java @@ -135,7 +135,7 @@ public class PixmapVisualizer extends AbstractVisualization { } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // Don't use thumbnails return false; } diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/SettingsVisFactory.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/SettingsVisFactory.java index 9be580f7..5d33fede 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/SettingsVisFactory.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/SettingsVisFactory.java @@ -149,7 +149,7 @@ public class SettingsVisFactory extends AbstractVisFactory { } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { return false; } }
\ No newline at end of file diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/SimilarityMatrixVisualizer.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/SimilarityMatrixVisualizer.java index f9b1ef52..17424519 100644 --- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/SimilarityMatrixVisualizer.java +++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/visunproj/SimilarityMatrixVisualizer.java @@ -163,7 +163,7 @@ public class SimilarityMatrixVisualizer extends AbstractVisualization { } @Override - public boolean allowThumbnails(@SuppressWarnings("unused") VisualizationTask task) { + public boolean allowThumbnails(VisualizationTask task) { // Don't use thumbnails return false; } |