finalize the commands for undo redo

Author: carlosuc3m

src/main/java/ai/nets/samj/ij/ui/Consumer.java

@@ -31,6 +31,7 @@
 import ai.nets.samj.gui.components.ComboBoxItem;
 import ai.nets.samj.ij.ui.commands.AddRoiCommand;
 import ai.nets.samj.ij.ui.commands.Command;
+import ai.nets.samj.ij.ui.commands.DeleteRoiCommand;
 import ai.nets.samj.ij.utils.RoiManagerPrivateViolator;
 import ai.nets.samj.models.AbstractSamJ;
 import ai.nets.samj.ui.ConsumerInterface;
@@ -781,6 +782,7 @@ public void intervalAdded(ListDataEvent e) {}
 	public void intervalRemoved(ListDataEvent e) {
 		List<String> roiManagerNames = new ArrayList<String>();
 		List<Mask> deleteList = new ArrayList<Mask>();
+		List<Roi> deleteListRoi = new ArrayList<Roi>();
 		Enumeration<String> elems = listModel.elements();
 		while (elems.hasMoreElements())
 			roiManagerNames.add(elems.nextElement());
@@ -789,6 +791,7 @@ public void intervalRemoved(ListDataEvent e) {
 				if (roiManagerNames.contains(annotatedMask.get(i).getMasks().get(j).getName()))
 					continue;
 				deleteList.add(annotatedMask.get(i).getMasks().get(j));
+				
 			}
 		}
 		Command command = new DeleteRoiCommand(this.roiManager, deleteList);

src/main/java/ai/nets/samj/ij/ui/commands/AddRoiCommand.java

@@ -1,6 +1,5 @@
 package ai.nets.samj.ij.ui.commands;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -51,7 +50,6 @@ public List<Mask> getMasks(){
 	@Override
 	public void execute() {
 		int resNo = 1;
-		List<PolygonRoi> undoRois = new ArrayList<PolygonRoi>();
 		for (Mask m : polys) {
 			final PolygonRoi pRoi = new PolygonRoi(m.getContour(), PolygonRoi.POLYGON);
 			String name = promptCount + "." + (resNo ++) + "_"+shape + "_" + modelName;
@@ -66,7 +64,6 @@ else if (shape.equals(""))
 			m.setName(name);
 			rois.add(pRoi);
 			if (isAddingToRoiManager) roiManager.addRoi(pRoi);;
-			undoRois.add(pRoi);
 		}
 	}
 

src/main/java/ai/nets/samj/ij/ui/commands/DeleteRoiCommand.java

@@ -1,44 +1,57 @@
 package ai.nets.samj.ij.ui.commands;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 
 import ai.nets.samj.annotation.Mask;
+import ai.nets.samj.ij.utils.RoiManagerPrivateViolator;
+import ij.gui.PolygonRoi;
 import ij.gui.Roi;
 import ij.plugin.frame.RoiManager;
 
 public class DeleteRoiCommand implements Command {
 	private RoiManager roiManager;
 	private final List<Mask> polys;
-	private List<Roi> rois;
+	private final List<Roi> rois;
 	private boolean isAddingToRoiManager = true;
-	private String shape = "";
-	private int promptCount = ThreadLocalRandom.current().nextInt(0, Integer.MAX_VALUE);
-	private String modelName = "";
 
 	public DeleteRoiCommand(RoiManager roiManager, List<Mask> polys) {
 		this.roiManager = roiManager;
 		this.polys = polys;
+		rois = new ArrayList<Roi>();
+		for (Mask m : polys) {
+			Roi roi = new PolygonRoi(m.getContour(), PolygonRoi.POLYGON);
+			roi.setName(m.getName());
+			rois.add(roi);
+		}
 	}
 
 	public void execute() {
-		model.remove(mask);
+		if (!isAddingToRoiManager)
+			return;
+		for (int n = roiManager.getCount() - 1; n >= 0; n --) {
+			if (!rois.contains(roiManager.getRoi(n)))
+				continue;
+			try {
+				RoiManagerPrivateViolator.deleteRoiAtPosition(roiManager, n);
+			} catch (Exception ex) {ex.printStackTrace();}
+		}
 	}
 
 	public void undo() {
-		model.add(mask);
+		for (Roi m : rois) {
+			if (isAddingToRoiManager) roiManager.addRoi(m);;
+		}
 	}
 
 	@Override
 	public void setAddingToRoiManager(boolean addToRoiManager) {
-		// TODO Auto-generated method stub
-		
+		this.isAddingToRoiManager = addToRoiManager;
 	}
 
 	@Override
 	public List<Roi> getImageJRois() {
-		// TODO Auto-generated method stub
-		return null;
+		return rois;
 	}
 
 	@Override