Ajout progress bar pendant la génération de dataset + début progress bar...

Ajout progress bar pendant la génération de dataset + début progress bar classify (Progressable implémenté dans Classification et learningResult

src/mustic/gui/MainFrame.java

@@ -3967,7 +3967,7 @@ public class MainFrame extends JFrame {
 			        true);
 		
 		
-					t = new ClassificationThread(classif, classificationImage.getProgressBar(), 
+					t = new ClassificationThread(classif, classificationImage.getProgressBar(),classificationImage.getStatusBar(), 
 							classificationImage, null, false, null);
 					t.start();
 					try {

src/mustic/gui/panels/classifier/ClassifierPanel.java

@@ -695,8 +695,7 @@ public class ClassifierPanel extends JPanel {
 				if (this.timeCheckBox.isSelected()) {
 					classification.setTimeExec(1);
 				}
-
-				new ClassificationThread(classification, classificationImage.getProgressBar(), 
+				new ClassificationThread(classification, classificationImage.getProgressBar(),classificationImage.getStatusBar(), 
 						classificationImage, this.rmiServer, false, null).start();
 				try {
 					dataSession.associatedFrame.setMaximum(true);
@@ -717,6 +716,7 @@ public class ClassifierPanel extends JPanel {
 
 				// On lance le thread de classif
 				new ClassificationThread(classification, ((ClassificationModel) this.container_).getProgressBar(),
+						((ClassificationModel) this.container_).getStatusBar(),
 				        (ClassificationModel) this.container_, this.rmiServer, false, null).start();
 
 			}

src/mustic/gui/panels/data/DataConstructPanel.java

@@ -124,6 +124,9 @@ public class DataConstructPanel extends JPanel implements ToUpdateObject {
 	}
 
 	private void generateData() {
+		new Thread() {
+			@Override
+			public void run() {
 				ImageData data = null;
 				
 				if (sourcePanel.isSequenceMaskSelected() && sample instanceof ImageSampler 
@@ -151,6 +154,8 @@ public class DataConstructPanel extends JPanel implements ToUpdateObject {
 				DataConstructFrame.getInstance().updateDataConstructPanel();
 				DataConstructFrame.getInstance().dispose();
 			}
+		}.start();
+	}
 	
 	public void updateSamplingSelectionPanel() {
 		samplingPanel.updatedSample();

src/mustic/io/ImageData.java

@@ -13,6 +13,7 @@ import jcl.data.sampling.Sampler;
 import jcl.utils.exceptions.MethodNotImplementedException;
 import mustic.gui.ImageSession;
 import mustic.gui.MainFrame;
+import mustic.models.thread.ProgressThreadJCL;
 import mustic.utils.jclAdapters.ImageSampler;
 
 /**
@@ -225,7 +226,7 @@ public class ImageData extends SimpleData implements Serializable {
 	
 	/**
 	 * <p>
-	 * Construcor from an already built set of DataObject of a sampler,
+	 * Constructor from an already built set of DataObject of a sampler,
 	 * the path is only used to gather the image informations
 	 * </p>
 	 * 
@@ -237,6 +238,7 @@ public class ImageData extends SimpleData implements Serializable {
 	 * 			a mask to apply to the sampler
 	 */
 	public ImageData(Sampler sampler, RawImage path, Mask mask) {
+		System.out.println("ImageData(Sampler sampler, RawImage path, Mask mask)");
 		if (MainFrame.DEBUG_MODE) {
 			System.out.println(">> ImageData(Sampler,String) <<");
 		}
@@ -269,7 +271,8 @@ public class ImageData extends SimpleData implements Serializable {
 		dimensions[0] = rawImages.get(0).width;
 		dimensions[1] = rawImages.get(0).height;
 
-//		new ProgressThreadJCL(sampler, MainFrame.getProgressBar(), MainFrame.getProgressStatus()).start();
+		new ProgressThreadJCL(sampler, MainFrame.getProgressBar(), MainFrame.getProgressStatus()).start();
+		
 		if (mask != null) {
 			currentView = sampler.getDataObjects(mask);
 		} else {
@@ -294,7 +297,7 @@ public class ImageData extends SimpleData implements Serializable {
 	
 	/**
 	 * <p>
-	 * Construcor from an already built set of DataObject of a sampler,
+	 * Constructor from an already built set of DataObject of a sampler,
 	 * the path is only used to gather the image informations
 	 * </p>
 	 * 
@@ -322,6 +325,8 @@ public class ImageData extends SimpleData implements Serializable {
 	 * 			a mask to apply to the sampler
 	 */
 	public ImageData(Sampler sampler, Vector<RawImage> images, Mask mask) {
+		System.out.println("ImageData(Sampler sampler, Vector<RawImage> images, Mask mask)");
+
 		for(RawImage s : images) {
 			this.rawImages.add(s);
 		}

src/mustic/models/gui/ClassificationModel.java

@@ -33,6 +33,7 @@ import mustic.models.gui.panels.HybridClassificationMonitor;
 import mustic.models.gui.panels.MaclawClassificationMonitor;
 import mustic.models.gui.panels.ResultPanel;
 import mustic.models.gui.widgets.ClassificationManager;
+import mustic.utils.tools.ProgressStatus;
 import net.infonode.tabbedpanel.Tab;
 import net.infonode.tabbedpanel.TabDragEvent;
 import net.infonode.tabbedpanel.TabEvent;
@@ -290,6 +291,10 @@ public abstract class ClassificationModel extends JPanel {
 		return MainFrame.getProgressBar();
 	}
 	
+	public ProgressStatus getStatusBar() {
+		return MainFrame.getProgressStatus();
+	}
+
 	/**
 	 * <p>
 	 * Methode ajoutant un onglet pour suivre le deroulement de la

src/mustic/models/gui/panels/ClassifierPanel.java

@@ -534,7 +534,7 @@ public class ClassifierPanel extends JPanel {
 		System.out.println("DEBUT CLASSIF");
 		/* On lance le thread de classification */
 		new ClassificationThread(classification,
-				this.container_.getProgressBar(), this.container_,
+				this.container_.getProgressBar(),this.container_.getStatusBar(), this.container_,
 				this.rmiServer, false, null).start();
 	}
 

src/mustic/models/thread/ClassificationThread.java

@@ -8,8 +8,10 @@ import jcl.Classification;
 import jcl.clustering.constraints.Constraint;
 import jcl.jcld.RmiServer;
 import jcl.learning.IterativeClassification;
+import jcl.learning.LearningMethod;
 import jcl.learning.methods.multistrategy.samarah4.comm.ClassificationSAM4;
 import mustic.models.gui.ClassificationModel;
+import mustic.utils.tools.ProgressStatus;
 
 /**
  * <p>
@@ -29,6 +31,9 @@ public class ClassificationThread extends Thread {
 	/** Barre d'avancement de la classification */
 	private JProgressBar progressBar_;
 	
+	/** Etat d'avancement de la classification */
+	private ProgressStatus statusBar_;
+
 	/** Server Rmi ou deporte le calcul */
 	private RmiServer rmiServer_;
 	
@@ -55,6 +60,18 @@ public class ClassificationThread extends Thread {
 	 * @param constraints
 	 * 			  constraints used for the new iteration
 	 */
+	public ClassificationThread(Classification classification,
+			JProgressBar progressBar, ProgressStatus statusBar, ClassificationModel container,
+			RmiServer rmiServer, boolean newIterationMode, Vector<Constraint> constraints) {
+		this.classification_ = classification;
+		this.progressBar_ = progressBar;
+		this.statusBar_ = statusBar;
+		this.container_ = container;
+		this.rmiServer_ = rmiServer;
+		this.newIterationMode = newIterationMode;
+		this.constraints = constraints;
+	}
+	
 	public ClassificationThread(Classification classification,
 			JProgressBar progressBar, ClassificationModel container,
 			RmiServer rmiServer, boolean newIterationMode, Vector<Constraint> constraints) {
@@ -70,10 +87,13 @@ public class ClassificationThread extends Thread {
 	public void run() {
 		/* Si on a une barre de progression on monitore la classification */
 
-		if (this.rmiServer_ != null && !this.rmiServer_.useRmi())
-			if (this.progressBar_ != null)
-				new ProgressThreadJCL(this.classification_.getLearningMethod(),
-						this.progressBar_).start();
+ 
+			if (this.progressBar_ != null && this.statusBar_ != null) {
+				LearningMethod lm = this.classification_.getLearningMethod();
+				new ProgressThreadJCL(lm, this.progressBar_,this.statusBar_).start();
+//				lm.incProgress();
+//				lm.setStatus("Clustering test !");
+			}
 
 		/* teste si le calcul est a faire avec rmi */
 		if ((this.rmiServer_ != null) && (this.rmiServer_.useRmi())) {

src/mustic/models/thread/ProgressThreadJCL.java

 package mustic.models.thread;
 
+import java.util.Date;
+
 import javax.swing.JProgressBar;
 
 import jcl.utils.Progressable;
@@ -63,11 +65,13 @@ public class ProgressThreadJCL extends Thread {
 		{
 			while (prog != 100) {
 				prog = this.p.getProgress();
-//				status = this.p.getStatus();
+				status = this.p.getStatus();
+//				long time = new Date().getTime();
+//				System.out.println("prog:"+prog+" status:"+status+" time : "+time);
 				this.b.setValue(prog);
 				MainFrame.getProgressStatus().setMessage(status);
 				try {
-					sleep(1000);
+					sleep(200);
 				} catch (Exception ex) {
 					ex.printStackTrace();
 					System.exit(1);
@@ -82,7 +86,7 @@ public class ProgressThreadJCL extends Thread {
 				prog = this.p.getProgress();
 				this.b.setValue(prog);
 				try {
-					sleep(1000);
+					sleep(200);
 				} catch (Exception ex) {
 					ex.printStackTrace();
 					System.exit(1);

src/mustic/utils/jclAdapters/ImageSampler.java

@@ -253,8 +253,9 @@ public class ImageSampler extends Sampler {
 	 * @return the sample 
 	 */
 	private List<DataObject>  getDataFromOneImage() {
+		//System.out.println("getDataFromOneImage()");
+		setStatus("Loading sampler...");		
 		List<DataObject> result = new ArrayList<DataObject>(sizeByCount);
-		setStatus("loading sampler...");		
 		int index = 0;
 		int x = 0;
 		int y = 0;
@@ -279,8 +280,7 @@ public class ImageSampler extends Sampler {
 		}
 
 		resetProgress();
-		int jalon = sizeByCount/10;
-
+		int jalon = sizeByCount/100;
 		for(int i = 0; i < sizeByCount ; i++) {
 			index = getIndex(i);
 			x = (index) % imageWidth;
@@ -297,8 +297,11 @@ public class ImageSampler extends Sampler {
 
 			if(i == jalon)
 			{
-				jalon+=sizeByCount/10;
+				jalon+=sizeByCount/100;
+				//System.out.println("jalon:"+jalon);
 				incProgress();
+				System.out.print("  p:"+this.progress);
+
 			}
 		}
 		endProgress();	
@@ -317,6 +320,7 @@ public class ImageSampler extends Sampler {
 	 * @return the sample 
 	 */
 	private List<DataObject> getDataFromOneImage(final Mask mask, int mandatoryPixelCount) {
+		System.out.println("getDataFromOneImage(final Mask mask, int mandatoryPixelCount)");
 		List<DataObject> result = new ArrayList<DataObject>(sizeByCount);
 		setStatus("loading sampler...");
 		int x = 0;
@@ -1265,7 +1269,7 @@ public class ImageSampler extends Sampler {
 	@Override
 	public void incProgress()
 	{
-		this.progress+=progressM/10;
+		this.progress+=progressM/100;
 		
 	}