Skip to content
Snippets Groups Projects
Commit 0e5ba239 authored by Amandine TOURNAY's avatar Amandine TOURNAY
Browse files

Update POM description

parents ffda4f74 fae5567d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 409 additions and 375 deletions
.classpath
+ 5
− 38
View file @ 0e5ba239
...@@ -8,43 +8,10 @@ ...@@ -8,43 +8,10 @@
<classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/> <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/> <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="var" path="ICY_HOME/plugins/adufour/blocks/Blocks.jar"/> <classpathentry kind="var" path="ICY_JAR" sourcepath="/ICY_KERNEL"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Blocks"/> <classpathentry kind="var" path="ICY_PLUGINS/adufour/blocks/Blocks.jar"/>
<classpathentry kind="lib" path="F:/SDKs/Java/jdk1.8.0_241/lib/tools.jar"/> <classpathentry kind="var" path="ICY_PLUGINS/adufour/ezplug/EzPlug.jar"/>
<classpathentry kind="lib" path="F:/SDKs/Java/jdk1.8.0_241/lib/tools.jar"/> <classpathentry kind="var" path="ICY_PLUGINS/tprovoost/javadocparser/JavaDocParser.jar"/>
<classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/> <classpathentry kind="var" path="ICY_PLUGINS/stef/library/JavaCLPlugin.jar"/>
<classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/>
<classpathentry kind="lib" path="D:/SDKs/Java/jdk1.8.0_241/lib/tools.jar"/>
<classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-kernel:2.1.0"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: net.sf.ehcache:ehcache:2.10.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.slf4j:slf4j-api:1.7.25"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-bioformats:6.3.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-insubstantial:7.3.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-vtk:6.3.0.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: net.imagej:ij:1.52q"/>
<classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: javax.media:jai-core:1.1.3"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: javax.media:jai-codec:1.1.3"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all:2.1.5-01"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-linux-amd64:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-linux-i586:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-macosx-universal:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-windows-amd64:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-windows-i586:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt:2.1.5-01"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-linux-amd64:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-linux-i586:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-macosx-universal:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-windows-amd64:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-windows-i586:2.1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.javassist:javassist:3.22.0-GA"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: net.sourceforge.jexcelapi:jxl:2.6.12"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: log4j:log4j:1.2.14"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.swinglabs.swingx:swingx-all:1.6.5-1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-blocks:1.0.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-ezplug:3.15.13"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-javadocparser:1.0.0"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: com.nativelibs4java:ochafik-util:0.12"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
.gitignore
+ 1
− 0
View file @ 0e5ba239
...@@ -5,5 +5,6 @@ bin/ ...@@ -5,5 +5,6 @@ bin/
build/ build/
target/ target/
*.iml *.iml
*.eml
.classpath .classpath
.project .project
\ No newline at end of file
export.jardesc
+ 3
− 1
View file @ 0e5ba239
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
</sealing> </sealing>
</manifest> </manifest>
<selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false"> <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
<javaElement handleIdentifier="=Protocols/src"/> <javaElement handleIdentifier="=Protocols/src\/main\/resources"/>
<javaElement handleIdentifier="=Protocols/src\/test\/java"/>
<javaElement handleIdentifier="=Protocols/src\/main\/java"/>
</selectedElements> </selectedElements>
</jardesc> </jardesc>
src/main/java/plugins/adufour/protocols/Protocols.java
+ 1
− 1
View file @ 0e5ba239
...@@ -362,7 +362,7 @@ public class Protocols extends PluginActionable ...@@ -362,7 +362,7 @@ public class Protocols extends PluginActionable
throw new IllegalArgumentException(protocolFile + " is not a valid protocol file"); throw new IllegalArgumentException(protocolFile + " is not a valid protocol file");
System.out.println("Loading workflow..."); System.out.println("Loading workflow...");
WorkFlow workFlow = new WorkFlow(); WorkFlow workFlow = new WorkFlow(true);
BlocksML.getInstance().loadWorkFlow(xml, workFlow); BlocksML.getInstance().loadWorkFlow(xml, workFlow);
workFlow.run(); workFlow.run();
......
src/main/java/plugins/adufour/protocols/gui/MainFrame.java
+ 237
− 206
View file @ 0e5ba239
This diff is collapsed.
src/main/java/plugins/adufour/protocols/gui/ProtocolPanel.java
+ 1
− 1
View file @ 0e5ba239
...@@ -80,7 +80,7 @@ public class ProtocolPanel extends JPanel implements WorkFlowListener, PropertyC ...@@ -80,7 +80,7 @@ public class ProtocolPanel extends JPanel implements WorkFlowListener, PropertyC
public ProtocolPanel(MainFrame frame) public ProtocolPanel(MainFrame frame)
{ {
this(null, new WorkFlow(), frame); this(null, new WorkFlow(true), frame);
} }
private ProtocolPanel(File file, final WorkFlow workFlow, MainFrame frame) private ProtocolPanel(File file, final WorkFlow workFlow, MainFrame frame)
......
src/main/java/plugins/adufour/protocols/gui/block/WorkFlowContainer.java
+ 24
− 3
View file @ 0e5ba239
...@@ -335,7 +335,7 @@ public class WorkFlowContainer extends JLayeredPane implements WorkFlowListener, ...@@ -335,7 +335,7 @@ public class WorkFlowContainer extends JLayeredPane implements WorkFlowListener,
} }
else else
dstBlockPanel.refreshNow(); dstBlockPanel.refreshNow();
repaint(); repaint();
} }
} }
...@@ -368,8 +368,29 @@ public class WorkFlowContainer extends JLayeredPane implements WorkFlowListener, ...@@ -368,8 +368,29 @@ public class WorkFlowContainer extends JLayeredPane implements WorkFlowListener,
} }
panel.drawPanel(); panel.drawPanel();
blockPanels.put(blockDesc, panel); blockPanels.put(blockDesc, panel);
add(panel); add(panel);
// FIX: get exposed links correctly restored on copy/paste as setVisibility isn't called in that case (Stephane)
// this is really an ugly fix but the whole stuff is a complete mess honestly :-/
if (blockDesc.isWorkFlow())
{
synchronized (blockDesc.inputVars)
{
// update exposed links
for (Var<?> var : blockDesc.inputVars)
((WorkFlowPanel) panel).updateExposedLink(var, blockDesc.inputVars.isVisible(var));
}
synchronized (blockDesc.outputVars)
{
// update exposed links
for (Var<?> var : blockDesc.outputVars)
((WorkFlowPanel) panel).updateExposedLink(var, blockDesc.outputVars.isVisible(var));
}
}
// Layer 0 for blocks // Layer 0 for blocks
// Layer 1 for work flows // Layer 1 for work flows
setLayer(panel, blockDesc.isWorkFlow() ? 1 : 0, 0); setLayer(panel, blockDesc.isWorkFlow() ? 1 : 0, 0);
...@@ -531,9 +552,9 @@ public class WorkFlowContainer extends JLayeredPane implements WorkFlowListener, ...@@ -531,9 +552,9 @@ public class WorkFlowContainer extends JLayeredPane implements WorkFlowListener,
workFlow.removeBlock(workFlow.getBlock(i), true); workFlow.removeBlock(workFlow.getBlock(i), true);
} }
workFlow.addBlock(embed.getBlockDescriptor());
MainFrame.pasteSelection(embed, true); MainFrame.pasteSelection(embed, true);
workFlow.addBlock(embed.getBlockDescriptor());
} }
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment