Changeset 5540 for trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/layout/PlateLayout.java

Timestamp:

07/11/08 21:11:12 (4 months ago)

Author:

jburel

Message:

Fixed layout problem

Files:

• trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/layout/PlateLayout.java (modified) (3 diffs)

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/layout/PlateLayout.java

@@ -36 +36 @@
 //Application-internal dependencies
 import org.openmicroscopy.shoola.agents.dataBrowser.browser.CellDisplay;
+import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageDisplay;
 import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageNode;
 import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageSet;
 import org.openmicroscopy.shoola.agents.dataBrowser.browser.WellImageNode;
+
+import pojos.ImageData;
 
 
@@ -120 +123 @@
                                                 col.add(cell);
                                         else row.add(cell);
-                                } else 
+                                } else {
                                         l.add(n);
+                                }
+                                        
                         }
-                Dimension maxDim = LayoutUtils.maxChildDim(l);
+                //Dimension maxDim = LayoutUtils.maxChildDim(l);
+                Dimension maxDim = new Dimension(0, 0);
+            Iterator children = l.iterator();
+            ImageDisplay child;
+            ImageData img;
+            while (children.hasNext()) {
+                child = (ImageDisplay) children.next();
+                img = (ImageData) child.getHierarchyObject();
+                if (img.getId() >= 0)
+                        maxDim = LayoutUtils.max(maxDim, child.getPreferredSize());
+            }
                  //First need to set width and height
                 Dimension d = col.get(0).getPreferredSize();
@@ -152 +167 @@
                         d = wiNode.getPreferredSize();
                         wiNode.setBounds(width+c*maxDim.width, height+r*maxDim.height, 
-                                                        maxDim.width, maxDim.height);
+                                                        d.width, d.height);
                         }
         }