Skip to content
Snippets Groups Projects
Commit a4a99430 authored by Stephane Dallongeville's avatar Stephane Dallongeville
Browse files

re-introduced all code with VarChannel (with some fixes to make it compiling)

parent 4f5b1987
No related branches found
No related tags found
No related merge requests found
package plugins.stef.micromanager.block.capture; package plugins.stef.micromanager.block.capture;
import icy.util.StringUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import mmcorej.TaggedImage;
import org.json.JSONObject; import org.json.JSONObject;
import org.micromanager.utils.ChannelSpec; import org.micromanager.utils.ChannelSpec;
import org.micromanager.utils.MDUtils; import org.micromanager.utils.MDUtils;
import icy.util.StringUtil;
import mmcorej.TaggedImage;
import plugins.adufour.blocks.util.VarList; import plugins.adufour.blocks.util.VarList;
import plugins.adufour.vars.lang.VarArray; import plugins.adufour.vars.lang.VarArray;
import plugins.adufour.vars.lang.VarObject; import plugins.adufour.vars.lang.VarObject;
import plugins.adufour.vars.util.VarException; import plugins.adufour.vars.util.VarException;
import plugins.stef.micromanager.block.AbstractMicroscopeBlock; import plugins.stef.micromanager.block.AbstractMicroscopeBlock;
import plugins.stef.micromanager.block.lang.EzVarMMGroup;
import plugins.stef.micromanager.block.lang.VarChannels; import plugins.stef.micromanager.block.lang.VarChannels;
import plugins.stef.micromanager.block.lang.VarMMGroup;
import plugins.tprovoost.Microscopy.MicroManager.MicroManager; import plugins.tprovoost.Microscopy.MicroManager.MicroManager;
import plugins.tprovoost.Microscopy.MicroManager.tools.StageMover; import plugins.tprovoost.Microscopy.MicroManager.tools.StageMover;
...@@ -30,7 +28,7 @@ import plugins.tprovoost.Microscopy.MicroManager.tools.StageMover; ...@@ -30,7 +28,7 @@ import plugins.tprovoost.Microscopy.MicroManager.tools.StageMover;
public class MicroscopeSnapChannels extends AbstractMicroscopeBlock public class MicroscopeSnapChannels extends AbstractMicroscopeBlock
{ {
VarObject trigger; VarObject trigger;
EzVarMMGroup group; VarMMGroup group;
VarChannels channels; VarChannels channels;
VarArray<TaggedImage> out; VarArray<TaggedImage> out;
...@@ -39,7 +37,7 @@ public class MicroscopeSnapChannels extends AbstractMicroscopeBlock ...@@ -39,7 +37,7 @@ public class MicroscopeSnapChannels extends AbstractMicroscopeBlock
super(); super();
trigger = new VarObject("Trigger", null); trigger = new VarObject("Trigger", null);
group = new EzVarMMGroup(); group = new VarMMGroup();
channels = new VarChannels(group); channels = new VarChannels(group);
out = new VarArray<TaggedImage>("Tagged image(s)", TaggedImage[].class, new TaggedImage[0]); out = new VarArray<TaggedImage>("Tagged image(s)", TaggedImage[].class, new TaggedImage[0]);
} }
...@@ -61,7 +59,7 @@ public class MicroscopeSnapChannels extends AbstractMicroscopeBlock ...@@ -61,7 +59,7 @@ public class MicroscopeSnapChannels extends AbstractMicroscopeBlock
} }
catch (Exception e) catch (Exception e)
{ {
throw new VarException(group.getVariable(), "Group value is not valid."); throw new VarException(group, "Group value is not valid.");
} }
final List<TaggedImage> result = new ArrayList<TaggedImage>(); final List<TaggedImage> result = new ArrayList<TaggedImage>();
...@@ -126,7 +124,7 @@ public class MicroscopeSnapChannels extends AbstractMicroscopeBlock ...@@ -126,7 +124,7 @@ public class MicroscopeSnapChannels extends AbstractMicroscopeBlock
public void declareInput(VarList inputMap) public void declareInput(VarList inputMap)
{ {
inputMap.add("trigger", trigger); inputMap.add("trigger", trigger);
inputMap.add("group", group.getVariable()); inputMap.add("group", group);
inputMap.add("channels", channels); inputMap.add("channels", channels);
} }
......
package plugins.stef.micromanager.block.lang; package plugins.stef.micromanager.block.lang;
import icy.type.collection.CollectionUtil;
import org.micromanager.utils.ChannelSpec; import org.micromanager.utils.ChannelSpec;
import icy.type.collection.CollectionUtil;
import plugins.adufour.vars.gui.VarEditor; import plugins.adufour.vars.gui.VarEditor;
import plugins.adufour.vars.lang.Var; import plugins.adufour.vars.lang.Var;
import plugins.adufour.vars.lang.VarArray; import plugins.adufour.vars.lang.VarArray;
...@@ -16,7 +15,7 @@ public class VarChannels extends VarArray<ChannelSpec> ...@@ -16,7 +15,7 @@ public class VarChannels extends VarArray<ChannelSpec>
{ {
VarChannelsEditor editor; VarChannelsEditor editor;
public VarChannels(String name, EzVarMMGroup groupVar) public VarChannels(String name, VarMMGroup groupVar)
{ {
super(name, ChannelSpec[].class, null); super(name, ChannelSpec[].class, null);
...@@ -26,7 +25,7 @@ public class VarChannels extends VarArray<ChannelSpec> ...@@ -26,7 +25,7 @@ public class VarChannels extends VarArray<ChannelSpec>
setGroup(groupVar.getValue()); setGroup(groupVar.getValue());
groupVar.getVariable().addListener(new VarListener<String>() groupVar.addListener(new VarListener<String>()
{ {
@Override @Override
public void valueChanged(Var<String> source, String oldValue, String newValue) public void valueChanged(Var<String> source, String oldValue, String newValue)
...@@ -43,7 +42,7 @@ public class VarChannels extends VarArray<ChannelSpec> ...@@ -43,7 +42,7 @@ public class VarChannels extends VarArray<ChannelSpec>
}); });
} }
public VarChannels(EzVarMMGroup groupVar) public VarChannels(VarMMGroup groupVar)
{ {
this("Channels", groupVar); this("Channels", groupVar);
} }
......
...@@ -3,8 +3,8 @@ package plugins.stef.micromanager.block.setting; ...@@ -3,8 +3,8 @@ package plugins.stef.micromanager.block.setting;
import plugins.adufour.blocks.tools.input.InputBlock; import plugins.adufour.blocks.tools.input.InputBlock;
import plugins.adufour.blocks.util.VarList; import plugins.adufour.blocks.util.VarList;
import plugins.stef.micromanager.block.AbstractMicroscopeBlock; import plugins.stef.micromanager.block.AbstractMicroscopeBlock;
import plugins.stef.micromanager.block.lang.EzVarMMGroup;
import plugins.stef.micromanager.block.lang.VarChannels; import plugins.stef.micromanager.block.lang.VarChannels;
import plugins.stef.micromanager.block.lang.VarMMGroup;
/** /**
* Define a list of channel (Micro-Manager) * Define a list of channel (Micro-Manager)
...@@ -14,12 +14,12 @@ import plugins.stef.micromanager.block.lang.VarChannels; ...@@ -14,12 +14,12 @@ import plugins.stef.micromanager.block.lang.VarChannels;
*/ */
public class MicroscopeChannels extends AbstractMicroscopeBlock implements InputBlock public class MicroscopeChannels extends AbstractMicroscopeBlock implements InputBlock
{ {
EzVarMMGroup group; VarMMGroup group;
VarChannels channels; VarChannels channels;
public MicroscopeChannels() public MicroscopeChannels()
{ {
group = new EzVarMMGroup(); group = new VarMMGroup();
channels = new VarChannels(group); channels = new VarChannels(group);
} }
...@@ -33,7 +33,7 @@ public class MicroscopeChannels extends AbstractMicroscopeBlock implements Input ...@@ -33,7 +33,7 @@ public class MicroscopeChannels extends AbstractMicroscopeBlock implements Input
public void declareInput(VarList inputMap) public void declareInput(VarList inputMap)
{ {
if (group != null) if (group != null)
inputMap.add("groups", group.getVariable()); inputMap.add("groups", group);
if (channels != null) if (channels != null)
inputMap.add("channels", channels); inputMap.add("channels", channels);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment