Commit f76a3e39 authored by Aliaksandr Halavatyi's avatar Aliaksandr Halavatyi

removing obsolete gui calls from JobDistribotor

parent e2cc4568
......@@ -15,7 +15,7 @@
<groupId>embl.almf</groupId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
<name>Fly_Embryo_Feedback</name>
<inceptionYear>2017</inceptionYear>
......
......@@ -2,13 +2,10 @@ package feedback.fly.embryo.jobdistributors;
import ij.gui.GenericDialog;
import ij.gui.WaitForUserDialog;
import ij.plugin.PlugIn;
import automic.online.jobdistributors.JobDistributor_Abstract;
import automic.online.jobs.common.Job_AutofocusInitOffset;
import automic.parameters.ParameterCollection;
import automic.parameters.gui.ParameterGuiManager;
import automic.table.TableModel;
import automic.table.TableProcessor;
import feedback.fly.embryo.jobs.Job_FocusEmbryoAutoDatasetSplit;
......@@ -23,50 +20,10 @@ public class JobDistributor_AutoSelectionMultiple_AFocus_Rotation_Split extends
@Override
protected void fillJobList(){
Job_AutofocusInitOffset job1=new Job_AutofocusInitOffset();
ParameterCollection job1Parameters=job1.createJobParameters();
job1Parameters.setUndefinedValuesFromDefaults();
ParameterGuiManager pgManager1=new ParameterGuiManager(job1Parameters);
try{
pgManager1.refineParametersViaDialog("Coverslip focusing");
}catch(Exception _ex){
new WaitForUserDialog("error in parameter values");
}
super.addImageJob(Job_AutofocusInitOffset.class, "DE_1_", "AFocus", true);
super.addImageJob(Job_SelectMultipleEmbryosAuto.class, "DE_2_", "LZ.Image", true);
job1.parseInputParameterValues(pgManager1.getParameterCollection());
super.addImageJob(job1, "DE_1_", "AFocus", true);
Job_SelectMultipleEmbryosAuto job2=new Job_SelectMultipleEmbryosAuto();
ParameterCollection job2Parameters=job2.createJobParameters();
job2Parameters.setUndefinedValuesFromDefaults();
ParameterGuiManager pgManager2=new ParameterGuiManager(job2Parameters);
try{
pgManager2.refineParametersViaDialog("Parameters for embryo selection");
}catch(Exception _ex){
new WaitForUserDialog("error in parameter values");
}
job2.parseInputParameterValues(pgManager2.getParameterCollection());
super.addImageJob(job2, "DE_2_", "LZ.Image", true);
Job_FocusEmbryoAutoDatasetSplit job3=new Job_FocusEmbryoAutoDatasetSplit();
ParameterCollection job3Parameters=job3.createJobParameters();
job3Parameters.setUndefinedValuesFromDefaults();
ParameterGuiManager pgManager3=new ParameterGuiManager(job3Parameters);
try{
pgManager3.refineParametersViaDialog("Parameters for embryo focusing");
}catch(Exception _ex){
new WaitForUserDialog("error in parameter values");
}
job3.parseInputParameterValues(pgManager3.getParameterCollection());
super.addImageJob(job3, "TR1_1_", "Focus.Image", true);
super.addImageJob(Job_FocusEmbryoAutoDatasetSplit.class, "TR1_1_", "Focus.Image", true);
super.addImageJob(Job_RecordFinishDataset.class, "TR2_1_", "Result.Image", true);
......
......@@ -2,13 +2,10 @@ package feedback.fly.embryo.jobdistributors;
import ij.gui.GenericDialog;
import ij.gui.WaitForUserDialog;
import ij.plugin.PlugIn;
import automic.online.jobdistributors.JobDistributor_Abstract;
import automic.online.jobs.common.Job_AutofocusInitOffset;
import automic.parameters.ParameterCollection;
import automic.parameters.gui.ParameterGuiManager;
import automic.table.TableModel;
import automic.table.TableProcessor;
import feedback.fly.embryo.jobs.Job_FocusEmbryoAutoDatasetSplit;
......@@ -22,51 +19,11 @@ public class JobDistributor_ManualSelection3DMultiple_AFocus_Rotation_Split exte
@Override
protected void fillJobList(){
super.addImageJob(Job_AutofocusInitOffset.class, "DE_1_", "AFocus", true);
super.addImageJob(Job_SelectMultipleEmbryosManual3D.class, "DE_2_", "LZ.Image", true);
Job_AutofocusInitOffset job1=new Job_AutofocusInitOffset();
ParameterCollection job1Parameters=job1.createJobParameters();
job1Parameters.setUndefinedValuesFromDefaults();
ParameterGuiManager pgManager1=new ParameterGuiManager(job1Parameters);
try{
pgManager1.refineParametersViaDialog("Coverslip focusing");
}catch(Exception _ex){
new WaitForUserDialog("error in parameter values");
}
job1.parseInputParameterValues(pgManager1.getParameterCollection());
super.addImageJob(job1, "DE_1_", "AFocus", true);
Job_SelectMultipleEmbryosManual3D job2=new Job_SelectMultipleEmbryosManual3D();
ParameterCollection job2Parameters=job2.createJobParameters();
job2Parameters.setUndefinedValuesFromDefaults();
ParameterGuiManager pgManager2=new ParameterGuiManager(job2Parameters);
try{
pgManager2.refineParametersViaDialog("Parameters for manual embryo selection");
}catch(Exception _ex){
new WaitForUserDialog("error in parameter values");
}
job2.parseInputParameterValues(pgManager2.getParameterCollection());
super.addImageJob(job2, "DE_2_", "LZ.Image", true);
Job_FocusEmbryoAutoDatasetSplit job3=new Job_FocusEmbryoAutoDatasetSplit();
ParameterCollection job3Parameters=job3.createJobParameters();
job3Parameters.setUndefinedValuesFromDefaults();
ParameterGuiManager pgManager3=new ParameterGuiManager(job3Parameters);
try{
pgManager3.refineParametersViaDialog("Parameters for embryo focusing");
}catch(Exception _ex){
new WaitForUserDialog("error in parameter values");
}
job3.parseInputParameterValues(pgManager3.getParameterCollection());
super.addImageJob(job3, "TR1_1_", "Focus.Image", true);
super.addImageJob(Job_FocusEmbryoAutoDatasetSplit.class, "TR1_1_", "Focus.Image", true);
super.addImageJob(Job_RecordFinishDataset.class, "TR2_1_", "Result.Image", true);
......
......@@ -29,7 +29,7 @@ public class FindEmbryoOrientationTischi {
final OpService opService = ij.op();
final String inputPath = "X:\\group\\ALMFstuff\\Aliaksandr\\User_data\\Crocker-fly-feedback\\03082019_march_test\\test03_DE_W0002_P0001\\test03_DE_2_W0002_P0001_T0001\\test03_TR1_W0001_P0010\\test03_TR1_1_W0001_P0010_T0001.lsm";
final String inputPath = "X:/group/Aliaksandr/User_data/Crocker-fly-feedback/03082019_march_test/test03_DE_W0002_P0001/test03_DE_2_W0002_P0001_T0001/test03_TR1_W0001_P0008/test03_TR1_1_W0001_P0008_T0001.lsm";
System.out.println(new File(inputPath).exists());
final ImagePlus imagePlus = BF.openImagePlus(inputPath)[0];
......
Markdown is supported
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