Changeset 7108

Timestamp:

10/21/10 21:10:51 (9 years ago)

Author:

aivar

Message:

New UI; not working.

File:

• branches/maven/projects/slim-plugin/src/main/java/loci/slim/SLIMProcessor.java (modified) (14 diffs)

branches/maven/projects/slim-plugin/src/main/java/loci/slim/SLIMProcessor.java

@@ -70 +70 @@
 import loci.slim.ui.IStartStopListener;
 import loci.slim.ui.IUserInterfacePanel;
+import loci.slim.ui.IUserInterfacePanelListener;
 import loci.slim.ui.UserInterfacePanel;
 import loci.common.DataTools;
@@ -124 +125 @@
 
     private Object m_synchFit = new Object();
+    private volatile boolean m_quit;
+    private volatile boolean m_cancel;
     private volatile boolean m_fitInProgress;
     private volatile boolean m_fitted;
@@ -189 +192 @@
 
     public SLIMProcessor() {
+        m_quit = false;
+        m_cancel = false;
         m_fitInProgress = false;
         m_fitted = false;
@@ -195 +200 @@
     public void processImage(Image<T> image) {
         boolean success = false;
-System.out.println("processImage " + image);
+
         if (newLoadData(image)) {
             // create a grayscale image from the data
             createGlobalGrayScale();
-            while (true) {
+            
+            // show the UI; do fits
+            final IUserInterfacePanel uiPanel = new UserInterfacePanel(true);
+            uiPanel.setListener(
+                    new IUserInterfacePanelListener() {
+                        public void doFit() {
+                            m_cancel = false;
+                            getFitSettings(uiPanel);
+                            fitData();
+                            uiPanel.reset();
+                        }
+
+                        public void cancelFit() {
+                            m_cancel = true;
+                        }
+
+                    }
+                );
+
+
+            while (!m_quit) {
+                try {
+                    Thread.sleep(1000);
+                }
+                catch (InterruptedException e) {
+
+                }
+            }
+        }
+
+     /*       while (true) {
                 // ask what kind fo fit
                 if (!showFitDialog()) {
@@ -210 +245 @@
                 fitData();
             }
-        }
+        } */
         /*
         m_width = ImageUtils.getWidth(image);
@@ -274 +309 @@
             // create a grayscale image from the data
             createGlobalGrayScale();
-            while (true) {
+
+            // show the UI; do fits
+            final IUserInterfacePanel uiPanel = new UserInterfacePanel(true);
+            uiPanel.setListener(
+                    new IUserInterfacePanelListener() {
+                        public void doFit() {
+                            m_cancel = false;
+                            getFitSettings(uiPanel);
+                            fitData();
+                            uiPanel.reset();
+                        }
+
+                        public void cancelFit() {
+                            m_cancel = true;
+                        }
+
+                    }
+                );
+
+            while (!m_quit) {
+                try {
+                    Thread.sleep(1000);
+                }
+                catch (InterruptedException e) {
+                    
+                }
+            }
+
+
+
+
+
+
+           /* while (true) {
                 // ask what kind fo fit
                 if (!showFitDialog()) {
@@ -284 +352 @@
                 }
                 fitData();
-            }
-        }
+            } */
+        }
+    }
+
+    private void getFitSettings(IUserInterfacePanel uiPanel) {
+        m_region = uiPanel.getRegion();
+        m_algorithm = uiPanel.getAlgorithm();
+        m_function = uiPanel.getFunction();
+
+        m_x = uiPanel.getX();
+        m_y = uiPanel.getY();
+        m_startBin = uiPanel.getStart();
+        m_stopBin = uiPanel.getStop();
+        m_threshold = uiPanel.getThreshold();
+
+        int components = uiPanel.getComponents();
+        m_param = uiPanel.getParameters();
+        m_free = uiPanel.getFree();
     }
 
@@ -1180 +1264 @@
             while (pixelIterator.hasNext()) {
                 ++pixelCount;
+                if (m_cancel) {
+                    return;
+                }
                 IJ.showProgress(pixelCount, m_height * m_width);
                 ChunkyPixel pixel = pixelIterator.next();
@@ -1204 +1291 @@
                 }
             }
-            if (0 < pixelsToProcessCount) {
+            if (!m_cancel && 0 < pixelsToProcessCount) {
                 processPixels(dataColorizer, m_height, curveFitDataList.toArray(new ICurveFitData[0]), pixelList.toArray(new ChunkyPixel[0]));
             }
@@ -1223 +1310 @@
                                 for (int channel = 0; channel < m_channels; ++channel) {
                                     if (channel != visibleChannel) {
+                                        if (m_cancel) {
+                                            return;
+                                        }
                                         if (wantFitted(bounds.x + x, bounds.y + y)) {
                                             curveFitData = new CurveFitData();
@@ -1248 +1338 @@
                         for (int y = 0; y < m_height; ++y) {
                             for (int x = 0; x < m_width; ++x) {
+                                if (m_cancel) {
+                                    return;
+                                }
                                 if (aboveThreshold(x, y)) {
                                     curveFitData = new CurveFitData();
@@ -1269 +1362 @@
         //TODO break the fit up into chunks to lower memory requirements
         ICurveFitData dataArray[] = curveFitDataList.toArray(new ICurveFitData[0]);
+        if (m_cancel) {
+            return;
+        }
         doFit(dataArray);
         //TODO save results
@@ -1540 +1636 @@
         if (0 < dataArray.length) {
             //TODO need to be able to examine any fitted pixel; for now just show the last fitted pixel. // first!
-            DecayGraph decayGraph = new DecayGraph(m_timeRange, m_startBin, m_stopBin, dataArray[0]); //dataArray.length - 1]);
+            DecayGraph decayGraph = new DecayGraph(m_startBin, m_stopBin, m_timeBins, m_timeRange, dataArray[0]); //dataArray.length - 1]);
             decayGraph.setStartStopListener(new MyListener());
-                    JFrame window = new JFrame("SLIM");
-                    JComponent component = decayGraph.getComponent();
-                    window.getContentPane().add(component);
-                    window.setSize(450, 450);
-                    window.pack();
-                    window.setVisible(true);
+            JFrame frame = decayGraph.getFrame();
+            frame.setVisible(true);
         }
         
@@ -1787 +1879 @@
         if (0 < dataArray.length) {
             //TODO need to be able to examine any fitted pixel; for now just show the last fitted pixel. // first!
-            DecayGraph decayGraph = new DecayGraph(curveFitter.getXInc(), m_startBin, m_stopBin, dataArray[0]); //dataArray.length - 1]);
+            DecayGraph decayGraph = new DecayGraph(m_startBin, m_stopBin, m_timeBins, curveFitter.getXInc(), dataArray[0]); //dataArray.length - 1]);
             decayGraph.setStartStopListener(new MyListener());
-                    JFrame window = new JFrame("SLIM");
-                    JComponent component = decayGraph.getComponent();
-                    window.getContentPane().add(component);
-                    window.setSize(450, 450);
-                    window.pack();
-                    window.setVisible(true);
+            JFrame frame = decayGraph.getFrame();
+            frame.setVisible(true);
         }