Nodes created now use the new cell viewer.

knime-ip · Jul 7, 2016 · 4c174bc · 4c174bc
1 parent b31c47d
commit 4c174bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/org.knime.knip.imagej2.core/META-INF/MANIFEST.MF b/org.knime.knip.imagej2.core/META-INF/MANIFEST.MF
@@ -33,7 +33,8 @@ Require-Bundle: org.knime.workbench.repository;bundle-version="[3.0.0,4.0.0)",
  imglib2-roi;bundle-version="0.2.1",
  imagej-deprecated;bundle-version="0.1.0",
  scripting-javascript;bundle-version="0.4.1",
- org.knime.scijava.core;bundle-version="0.2.0"
+ org.knime.scijava.core;bundle-version="0.2.0",
+ org.knime.knip.cellviewer;bundle-version="1.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: ij2-core.jar
 Bundle-ActivationPolicy: lazy

diff --git a/org.knime.knip.imagej2.core/src/org/knime/knip/imagej2/core/node/IJNodeFactory.java b/org.knime.knip.imagej2.core/src/org/knime/knip/imagej2/core/node/IJNodeFactory.java
@@ -48,17 +48,9 @@
  */
 package org.knime.knip.imagej2.core.node;
 
-import ij.ImagePlus;
-
 import java.net.URL;
 import java.util.Iterator;
 
-import net.imagej.Dataset;
-import net.imagej.display.ImageDisplay;
-import net.imglib2.img.Img;
-import net.imglib2.labeling.Labeling;
-import net.imagej.ImgPlus;
-
 import org.knime.core.data.DataValue;
 import org.knime.core.node.DynamicNodeFactory;
 import org.knime.core.node.InvalidSettingsException;
@@ -67,6 +59,7 @@
 import org.knime.core.node.config.ConfigRO;
 import org.knime.core.node.config.ConfigWO;
 import org.knime.knip.base.nodes.view.TableCellViewNodeView;
+import org.knime.knip.cellviewer.CellNodeView;
 import org.knime.knip.imagej2.core.IJGateway;
 import org.knime.knip.imagej2.core.adapter.IJAdapterProvider;
 import org.knime.knip.imagej2.core.adapter.IJInputAdapter;
@@ -84,6 +77,13 @@
 import org.scijava.module.ModuleItem;
 import org.scijava.service.Service;
 
+import ij.ImagePlus;
+import net.imagej.Dataset;
+import net.imagej.ImgPlus;
+import net.imagej.display.ImageDisplay;
+import net.imglib2.img.Img;
+import net.imglib2.labeling.Labeling;
+
 /**
  * Node factory for ImageJ2 plugins. Contains internal settings that associate an instance of IJNodeFactory with a
  * specific ImageJ2 plugin, that is created as KNIME node by the factory instance.
@@ -143,7 +143,7 @@ protected int getNrNodeViews() {
     @Override
     public NodeView<AbstractIJNodeModel> createNodeView(final int viewIndex, final AbstractIJNodeModel nodeModel) {
         if (getNrNodeViews() == 1) {
-            return new TableCellViewNodeView<AbstractIJNodeModel>(nodeModel);
+            return new CellNodeView<AbstractIJNodeModel>(nodeModel);
         }
         return null;
     }