Context Navigation

Changeset 5540

Timestamp:

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

Author:

jburel

Message:

Fixed layout problem

Location:

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser

Files:

r5399	r5540
26	26	//Java imports
27	27	import java.awt.Color;
	28	import java.awt.Dimension;
28	29	import java.awt.Graphics;
29	30	import java.awt.Graphics2D;
…	…
324	325	public BufferedImage getFullSizeImage() { return fullSizeImage; }
325	326
	327	/**
	328	* Implemented as specified by the {@link Thumbnail} I/F.
	329	* @see Thumbnail#getOriginalSize()
	330	*/
	331	public Dimension getOriginalSize()
	332	{
	333	return new Dimension(originalWidth, originalHeight);
	334	}
326	335	}

r5399	r5540
25	25
26	26	//Java imports
	27	import java.awt.Dimension;
27	28	import java.awt.image.BufferedImage;
28	29	import javax.swing.Icon;
…	…
157	158	public void setFullSizeImage(BufferedImage image);
158	159
	160	/**
	161	* Returns the original size of the thumbnail.
	162	*
	163	* @return See above.
	164	*/
	165	public Dimension getOriginalSize();
	166
159	167	}

r5538	r5540
36	36	//Application-internal dependencies
37	37	import org.openmicroscopy.shoola.agents.dataBrowser.browser.CellDisplay;
	38	import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageDisplay;
38	39	import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageNode;
39	40	import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageSet;
40	41	import org.openmicroscopy.shoola.agents.dataBrowser.browser.WellImageNode;
	42
	43	import pojos.ImageData;
41	44
42	45
…	…
120	123	col.add(cell);
121	124	else row.add(cell);
122		} else
	125	} else {
123	126	l.add(n);
	127	}
	128
124	129	}
125		Dimension maxDim = LayoutUtils.maxChildDim(l);
	130	//Dimension maxDim = LayoutUtils.maxChildDim(l);
	131	Dimension maxDim = new Dimension(0, 0);
	132	Iterator children = l.iterator();
	133	ImageDisplay child;
	134	ImageData img;
	135	while (children.hasNext()) {
	136	child = (ImageDisplay) children.next();
	137	img = (ImageData) child.getHierarchyObject();
	138	if (img.getId() >= 0)
	139	maxDim = LayoutUtils.max(maxDim, child.getPreferredSize());
	140	}
126	141	//First need to set width and height
127	142	Dimension d = col.get(0).getPreferredSize();
…	…
152	167	d = wiNode.getPreferredSize();
153	168	wiNode.setBounds(width+cmaxDim.width, height+rmaxDim.height,
154		~~maxDim.width, maxDim~~.height);
	169	d.width, d.height);
155	170	}
156	171	}

r5539	r5540
77	77	private int columns;
78	78
	79	/** The dimension of a well. */
	80	private Dimension wellDimension;
	81
79	82	/**
80	83	* Creates a new instance.
…	…
88	91	if (wells == null)
89	92	throw new IllegalArgumentException("No wells.");
	93	wellDimension = null;
90	94	this.wells = wells;
91	95	this.parent = parent;
…	…
107	111	node.setRowDisplay(EditorUtil.LETTERS.get(row+1));
108	112	node.setColumnDisplay(""+(column+1));
	113	if (((ImageData) node.getHierarchyObject()).getId() >= 0 &&
	114	wellDimension == null)
	115	wellDimension = node.getThumbnail().getOriginalSize();
109	116	}
110	117	columns++;
…	…
137	144	if (node instanceof WellImageNode) {
138	145	img = (ImageData) node.getHierarchyObject();
139		if (img.getId() < 0)
	146	if (img.getId() < 0 && !refresh) {
140	147	node.getThumbnail().setFullScaleThumb(
141		Factory.createDefaultThumbnail("N/A"));
142		else
	148	Factory.createDefaultThumbnail(wellDimension.width,
	149	wellDimension.height, "N/A"));
	150	} else
143	151	images.add(img);
144	152	}