Changeset 5619

Timestamp:

09/19/08 13:16:18 (2 months ago)

Author:

jburel

Message:

Added option to turn channels on/off from the projection window directly

Location:

trunk

Files:

• SRC/org/openmicroscopy/shoola/agents/imviewer/ProjectionSaver.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/ChannelButton.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialog.java (modified) (15 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialogControl.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionRef.java (modified) (6 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionSavingDialog.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ControlPane.java (modified) (7 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerComponent.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerControl.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerModel.java (modified) (6 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerUI.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroImageService.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroImageServiceImpl.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroMetadataServiceImpl.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/data/model/ProjectionParam.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/data/views/ImageDataView.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/data/views/ImageDataViewImpl.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/data/views/calls/ProjectionSaver.java (modified) (4 diffs)
• SRC/org/openmicroscopy/shoola/env/rnd/PixelsServicesFactory.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/env/rnd/RenderingControl.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/env/rnd/RenderingControlProxy.java (modified) (2 diffs)
• TEST/org/openmicroscopy/shoola/env/data/NullRenderingService.java (modified) (1 diff)

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/ProjectionSaver.java

@@ -118 +118 @@
                                 handle = ivView.renderProjected(ref.getPixelsID(), 
                                                 ref.getStartZ(), ref.getEndZ(), ref.getStepping(), 
-                                                ref.getAlgorithm(), this);
+                                                ref.getAlgorithm(), ref.getChannels(), 
+                                                this);
                                 break;
                         case PROJECTION:

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/util/ChannelButton.java

@@ -159 +159 @@
         });
         setToolTipText(DESCRIPTION);
-        //timer = new Timer(DOUBLE_CLICK_THRESHOLD, this);
-        //timer.setCoalesce(true);
     }
     

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialog.java

@@ -31 +31 @@
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -42 +43 @@
 import javax.swing.JButton;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
@@ -47 +49 @@
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
+import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
 import javax.swing.SpinnerNumberModel;
@@ -55 +58 @@
 //Application-internal dependencies
 import org.openmicroscopy.shoola.agents.imviewer.IconManager;
+import org.openmicroscopy.shoola.agents.imviewer.util.ChannelButton;
 import org.openmicroscopy.shoola.agents.imviewer.view.ImViewer;
 import org.openmicroscopy.shoola.util.ui.TitlePanel;
@@ -89 +93 @@
         public static final String              LOAD_DATASETS_PROPERTY = "loadDatasets";
         
+    /** Dimension of the box between the channel buttons. */
+    private static final Dimension      VBOX = new Dimension(1, 10);
+   
+    
+        /** The type of projections supported. */
         private static final Map<Integer, String>       PROJECTIONS;
         
@@ -139 +148 @@
         private boolean                                 applySettings;
         
+    /** One  {@link ChannelButton} per channel. */
+    private List<ChannelButton>         channelButtons;
+    
+    /** Flag indicating that a preview has been done. */
+    private boolean                                     preview;
+    
     /** Reference to the control. */
         private ProjectionDialogControl controller;
@@ -159 +174 @@
                 int index = types.getSelectedIndex();
                 ref.setType(projectionType.get(index));
+                Iterator<ChannelButton> i = channelButtons.iterator();
+                ChannelButton button;
+                List<Integer> channels = new ArrayList<Integer>();
+                while (i.hasNext()) {
+                        button = i.next();
+                        if (button.isSelected()) 
+                                channels.add(button.getChannelIndex());
+                }
+                ref.setChannels(channels);
         }
         
@@ -168 +192 @@
         private void initComponents(Color background)
         {
+                channelButtons = new ArrayList<ChannelButton>();
                 frequency = new JSpinner(new SpinnerNumberModel(1, 1, maxZ, 1));
                 textualSlider = new TextualTwoKnobsSlider(1, maxZ);
@@ -230 +255 @@
         }
         
+    /**
+     * Creates a UI component hosting the {@link ChannelButton}s.
+     * 
+     * @return See above.
+     */
+    private JComponent buildChannelsPane()
+    {
+        JPanel p = new JPanel();
+        p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
+        ChannelButton button;
+        Iterator<ChannelButton> i = channelButtons.iterator();
+        while (i.hasNext()) {
+                        button = i.next();
+                        button.addPropertyChangeListener(controller);
+                        p.add(button);
+            p.add(Box.createRigidArea(VBOX));
+                }
+        if (channelButtons.size() > 10) 
+                return UIUtilities.buildComponentPanelCenter(new JScrollPane(p));
+        return UIUtilities.buildComponentPanelCenter(p);
+    }
+    
         /** 
          * Builds and lays out the main component of the dialog.
@@ -263 +310 @@
         bar.add(Box.createVerticalStrut(10));
         bar.add(projectionButton);
-        return bar;
+        //bar.add(buildChannelsPane());
+        
+        JPanel content = new JPanel();
+        double[][] tl = {{TableLayout.PREFERRED}, 
+                                {TableLayout.PREFERRED, TableLayout.FILL}};
+                content.setLayout(new TableLayout(tl));
+                content.add(bar, "0, 0");
+                content.add(buildChannelsPane(), "0, 1");
+        return content;
         }
         
@@ -311 +366 @@
          * @param imageName       The name of the original image.
          * @param imageWidth  The width of the original image.
-         * @param imageHeight  The width of the original image.
+         * @param imageHeight The width of the original image.
          */
         public ProjectionDialog(JFrame owner, int maxZ, int maxT, String pixelsType, 
-                                     Color background, String imageName, 
-                                     int imageWidth, int imageHeight)
+                                     Color background, String imageName)
         {
                 super(owner);
@@ -324 +378 @@
                 this.imageName = imageName;
                 initComponents(background);
+        }
+        
+        /**
+         * 
+         * @param imageWidth     The width of the original image.
+         * @param imageHeight    The width of the original image.
+         * @param channelButtons
+         */
+        public void initialize(int imageWidth, int imageHeight, 
+                                                        List<ChannelButton> channelButtons)
+        {
+                if (channelButtons != null) 
+                        this.channelButtons = channelButtons;
                 buildGUI();
                 Dimension d = new Dimension(imageWidth, imageHeight);
@@ -354 +421 @@
          */
         String getPixelsType() { return pixelsType; }
-
+        
         /** Projects and previews. */
         void preview()
         {
+                preview = true;
                 enableButtons(false);
                 setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
@@ -364 +432 @@
                 statusLabel.setText("Projecting...");
                 firePropertyChange(PROJECTION_PREVIEW_PROPERTY, null, ref);
-                setModal(true);
+                //setModal(true);
+        }
+        
+        /**
+         * Updates the controls when a new channel is selected or deselected.
+         * 
+         * @param index The index of the channel.
+         * @param value Pass <code>true</code> to select the channel, 
+         *                              <code>false</code> otherwise.
+         */
+        void selectChannel(int index, boolean value)
+        {
+                Iterator<ChannelButton> i = channelButtons.iterator();
+                ChannelButton button;
+                while (i.hasNext()) {
+                        button = i.next();
+                        if (button.getChannelIndex() == index)
+                                button.setSelected(value);
+                }
+                if (preview) preview();
         }
         
@@ -408 +495 @@
          *                                              <code>false</code> otherwise.
          */
-        void project(List<DatasetData> datasets, String name, boolean allChannels,
-                        int startT, int endT, String pixelsType, boolean applySettings)
+        void project(List<DatasetData> datasets, String name, int startT, int endT, 
+                        String pixelsType, boolean applySettings)
         {
                 fillProjectionRef();
                 ref.setImageDescription("Projection type: "+
                                 PROJECTIONS.get(ref.getType()));
-                ref.setAllChannels(allChannels);
                 ref.setDatasets(datasets);
                 ref.setImageName(name);

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialogControl.java

@@ -29 +29 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
 
 //Third-party libraries
 
 //Application-internal dependencies
+import org.openmicroscopy.shoola.agents.imviewer.util.ChannelButton;
 import org.openmicroscopy.shoola.util.ui.UIUtilities;
 
@@ -50 +55 @@
  */
 class ProjectionDialogControl 
-        implements ActionListener
+        implements ActionListener, PropertyChangeListener
 {
         
@@ -101 +106 @@
                 }
         }
+
+        /**
+         * Resets the preview image if a preview has already been done.
+         * @see PropertyChangeListener#propertyChange(PropertyChangeEvent)
+         */
+        public void propertyChange(PropertyChangeEvent evt)
+        {
+                String name = evt.getPropertyName();
+                if (ChannelButton.CHANNEL_SELECTED_PROPERTY.equals(name)) {
+                        Map map = (Map) evt.getNewValue();
+                        if (map == null) return;
+                        if (map.size() != 1) return;
+                        Iterator i = map.keySet().iterator();
+                        Integer index;
+                        while (i.hasNext()) {
+                                index = (Integer) i.next();
+                                model.selectChannel(index.intValue(), 
+                                                ((Boolean) map.get(index)).booleanValue());
+                        }
+                }
+        }
     
 }

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionRef.java

@@ -25 +25 @@
 
 //Java imports
+import java.util.ArrayList;
 import java.util.List;
 
@@ -77 +78 @@
         
         /** The description of the projected image. */
-        private String                    description;
-        
-        /** 
-         * Project all channels if <code>true</code>, project the active channels
-         * if <code>false</code>
-         */
-        private boolean           allChannels;
+        private String                          description;
+        
+        /** The collection of channels to project.*/
+        private List<Integer>           channels;
         
         /** Creates a new instance.  */
@@ -89 +87 @@
         {
                 setStepping(1);
+                channels = new ArrayList<Integer>();
         }
         
@@ -117 +116 @@
                 setStepping(frequence);
                 setType(type);
+                channels = new ArrayList<Integer>();
         }
 
@@ -201 +201 @@
         
         /**
-         * Sets to <code>true</code> to project all channels, to <code>false</code>
-         * to projet the active channels.
-         * 
-         * @param allChannels Pass code>true</code> to project all channels,
-         *                    <code>false</code> to projet the active channels.
-         *                                        
-         */
-        void setAllChannels(boolean allChannels) { this.allChannels = allChannels; }
+         * Sets the collection of channels to project.
+         * 
+         * @param channels The value to set.                                      
+         */
+        void setChannels(List<Integer> channels) { this.channels = channels; }
         
         /**
@@ -232 +229 @@
         
         /**
-         * Returns <code>true</code> to project all channels,  <code>false</code>
-         * to projet the active channels.
-         * 
-         * @return See above.
-         */
-        public boolean isAllChannels() { return allChannels; }
+         * Returns the collection of channels to project/preview.
+         * 
+         * @return See above.
+         */
+        public List<Integer> getChannels() { return channels; }
         
         /**

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionSavingDialog.java

@@ -162 +162 @@
                                 datasets.add(selection.get(box));
                 }
-                boolean all = true;
-                if (activeChannels.isSelected()) all = false;
                 int maxT = model.getMaxT();
                 int startT = 0, endT = 0;
@@ -176 +174 @@
                         if (type.equals(pixelsType)) type = null;
                 }
-                model.project(datasets, nameField.getText(), all, startT, endT, type,
+                model.project(datasets, nameField.getText(), startT, endT, type,
                                 rndSettingsBox.isSelected());
                 close();
@@ -296 +294 @@
                 JPanel p = new JPanel();
                 p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
-                p.add(buildChannelsPanel());
-                p.add(new JSeparator());
+                //p.add(buildChannelsPanel());
+                //p.add(new JSeparator());
                 if (timeSelection != null) {
                         p.add(buildTimeRangePanel());

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ControlPane.java

@@ -32 +32 @@
 import java.awt.event.MouseWheelListener;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
-
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -149 +146 @@
     
     /** One  {@link ChannelButton} per channel. */
-    private Set<ChannelButton>          channelButtons;
+    private List<ChannelButton>         channelButtons;
 
     /** One  {@link ChannelButton} per channel. */
-    private Set<ChannelButton>          channelButtonsGrid;
+    private List<ChannelButton>         channelButtonsGrid;
    
     /** Button to play movie across channel. */
@@ -269 +266 @@
     private void initComponents()
     {
-        channelButtons = new HashSet<ChannelButton>();
-        channelButtonsGrid = new HashSet<ChannelButton>();
+        channelButtons = new ArrayList<ChannelButton>();
+        channelButtonsGrid = new ArrayList<ChannelButton>();
 
         zSlider = new OneKnobSlider(OneKnobSlider.VERTICAL, 0, 1, 0);
@@ -514 +511 @@
         ChannelMetadata[] data = model.getChannelData();
         ChannelButton button;
-        ChannelMetadata d;
         p.add(Box.createRigidArea(VBOX));
-        boolean gs = model.getColorModel().equals(ImViewer.GREY_SCALE_MODEL);
-        for (int k = 0; k < data.length; k++) {
-            d = data[k];
-            button = new ChannelButton(""+d.getEmissionWavelength(), 
-                    model.getChannelColor(k), k, model.isChannelActive(k));
-            if (gs) button.setGrayedOut(gs);
-            button.addPropertyChangeListener(controller);
-            button.setPreferredSize(ChannelButton.DEFAULT_MIN_SIZE);
-            channelButtons.add(button);
-            p.add(button);
+        channelButtons = createChannelButtons();
+        Iterator<ChannelButton> i = channelButtons.iterator();
+        while (i.hasNext()) {
+                        button = i.next();
+                        button.addPropertyChangeListener(controller);
+                        p.add(button);
             p.add(Box.createRigidArea(VBOX));
-        }
-        
+                }
+       
         JPanel controls = new JPanel();
         double size[][] = {{TableLayout.PREFERRED}, 
@@ -564 +556 @@
     }
   
+    /**
+     * Sets the maximum value of the slider.
+     * 
+     * @param slider The slider to handle.
+     * @param max        The maximum value to set.
+     */
     private void setSliderMax(JSlider slider, int max)
     {
@@ -594 +592 @@
     }
     
-    /** 
-     * This method should be called straight after the metadata and the
-     * rendering settings are loaded.
-     */
-    void buildComponent()
-    {
-        initializeValues();
-        buildGUI();
-    }
-    
-    /**
-     * Returns the UI component hosting the z-section slider.
-     * 
-     * @return See above.
-     */
-    JPanel buildAnnotatorComponent()
-    {
-        return layoutSlider(zSliderAnnotator);
-    }
-    
-    /**
-     * Builds the control panel displayed in the grid view.
-     * 
-     * @return See above.
-     */
-    JPanel buildGridComponent()
-    {
-        JPanel p = createZGridSliderPane();
-        JPanel buttons = new JPanel();
-        buttons.setLayout(new BoxLayout(buttons, BoxLayout.Y_AXIS));
-        ChannelMetadata[] data = model.getChannelData();
-        ChannelButton button;
+    /**
+     * Creates a collection of <code>ChannelButton</code>s.
+     * 
+     * @return See above.
+     */
+    List<ChannelButton> createChannelButtons()
+    {
+        List<ChannelButton> channelButtons = new ArrayList<ChannelButton>();
+        ChannelMetadata[] data = model.getChannelData();
+        boolean gs = model.getColorModel().equals(ImViewer.GREY_SCALE_MODEL);
+        ChannelButton button;
         ChannelMetadata d;
-        buttons.add(Box.createRigidArea(VBOX));
-        boolean gs = model.getColorModel().equals(ImViewer.GREY_SCALE_MODEL);
         for (int k = 0; k < data.length; k++) {
             d = data[k];
@@ -634 +609 @@
                     model.getChannelColor(k), k, model.isChannelActive(k));
             if (gs) button.setGrayedOut(gs);
-            button.addPropertyChangeListener(controller);
             button.setPreferredSize(ChannelButton.DEFAULT_MIN_SIZE);
-            channelButtonsGrid.add(button);
-            buttons.add(button);
+            channelButtons.add(button);
+        }
+        return channelButtons;
+    }
+    
+    /** 
+     * This method should be called straight after the metadata and the
+     * rendering settings are loaded.
+     */
+    void buildComponent()
+    {
+        initializeValues();
+        buildGUI();
+    }
+    
+    /**
+     * Returns the UI component hosting the z-section slider.
+     * 
+     * @return See above.
+     */
+    JPanel buildAnnotatorComponent()
+    {
+        return layoutSlider(zSliderAnnotator);
+    }
+    
+    /**
+     * Builds the control panel displayed in the grid view.