Changeset 5657

Timestamp:

10/08/08 21:24:48 (6 weeks ago)

Author:

jburel

Message:

Fixed various bug due to migration to blitz

Location:

trunk

Files:

• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerModel.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/agents/treeviewer/browser/BrowserModel.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroDataServiceImpl.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroImageService.java (modified) (4 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroImageServiceImpl.java (modified) (8 diffs)
• SRC/org/openmicroscopy/shoola/env/data/util/PojoMapper.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/rnd/RenderingControl.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/rnd/RenderingControlProxy.java (modified) (2 diffs)
• TEST/org/openmicroscopy/shoola/env/data/NullRenderingService.java (modified) (3 diffs)

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

@@ -39 +39 @@
 
 //Application-internal dependencies
-import omero.model.Pixels;
 import omero.romio.PlaneDef;
 import org.openmicroscopy.shoola.agents.events.iviewer.CopyRndSettings;
@@ -194 +193 @@
 
         /** The pixels set to copy the rendering settings from. */
-        private Pixels                                          pixels;
+        private PixelsData                                  pixels;
 
         /** 

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/browser/BrowserModel.java

@@ -52 +52 @@
 import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewer;
 import org.openmicroscopy.shoola.env.LookupNames;
-import pojos.CategoryData;
-import pojos.CategoryGroupData;
 import pojos.DatasetData;
 import pojos.ExperimenterData;
@@ -561 +559 @@
                                 klass = ProjectData.class;
                                 break;
-                        case Browser.CATEGORY_EXPLORER:
-                                klass = CategoryGroupData.class;
-                                break;
                         case Browser.IMAGES_EXPLORER:
                                 klass =  ImageData.class;

trunk/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java

@@ -3344 +3344 @@
             Iterator i = rootNodeIDs.iterator();
             Long id;
-            Map<Long, Integer> m = new HashMap<Long, Integer>();
+            Map<Long, Long> m = new HashMap<Long, Long>();
             
             while (i.hasNext()) {
                                 id = (Long) i.next();
                                 param.addLong("tagID", id);
-                                m.put(id, service.findAllByQuery(query, param).size());
+                                m.put(id, new Long(service.findAllByQuery(query, param).size()));
                         }
                         return m;
@@ -3576 +3576 @@
                         long imageID = service.projectPixels(pixelsID, type, algorithm, 
                                         startT, endT, channels, stepping, startZ, endZ, name);
+                        return getImage(imageID);
+                } catch (Exception e) {
+                        handleException(e, "Cannot project the image.");
+                }
+                return null;
+        }
+        
+        /**
+         * Returns the image and loaded pixels.
+         * 
+         * @param imageID The id of the image to load.
+         * @return See above.
+         * @throws DSOutOfServiceException  If the connection is broken, or logged
+         *                                  in.
+         * @throws DSAccessException        If an error occured while trying to 
+         *                                  retrieve data from OMEDS service.
+         */
+        ImageData getImage(long imageID)
+                throws DSOutOfServiceException, DSAccessException
+        {
+                try {
                         StringBuilder sb = new StringBuilder();
                         sb.append("select img from Image as img ");
@@ -3589 +3610 @@
                 ParametersI param = new ParametersI();
                         param.addLong("id", imageID);
-                ImageData image = (ImageData) PojoMapper.asDataObject(
-                                getQueryService().findByQuery(sb.toString(), param));
-                        return image;
+                return (ImageData) PojoMapper.asDataObject(
+                                getQueryService().findByQuery(sb.toString(), param)
+                                );
                 } catch (Exception e) {
                         handleException(e, "Cannot project the image.");

trunk/SRC/org/openmicroscopy/shoola/env/data/OmeroDataServiceImpl.java

@@ -740 +740 @@
                 po.leaves();
                 po.exp(new RLong(userID));
-                po.startTime(new RTime(startTime.getTime()));
-                po.endTime(new RTime(endTime.getTime()));
+                if (startTime != null) po.startTime(new RTime(startTime.getTime()));
+                if (endTime != null) po.endTime(new RTime(endTime.getTime()));
                 return gateway.getImages(po.map());
         }
@@ -776 +776 @@
                         object = (Image) i.next();
                         evt = object.getDetails().creationEvent;
-                        times.add(new Timestamp(evt.getTime().val));
+                        if (evt != null)
+                                times.add(new Timestamp(evt.getTime().val));
                 }
                 return times;

trunk/SRC/org/openmicroscopy/shoola/env/data/OmeroImageService.java

@@ -29 +29 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 //Third-party libraries
@@ -35 +34 @@
 //Application-internal dependencies
 import omero.constants.projection.ProjectionType;
-import omero.model.Pixels;
 import omero.model.PixelsDimensions;
 import omero.romio.PlaneDef;
@@ -43 +41 @@
 import org.openmicroscopy.shoola.env.rnd.RndProxyDef;
 import pojos.ImageData;
+import pojos.PixelsData;
 
 /** 
@@ -213 +212 @@
          *                                  retrieve data from OMEDS service.
          */
-        public Pixels loadPixels(long pixelsID)
+        public PixelsData loadPixels(long pixelsID)
                 throws DSOutOfServiceException, DSAccessException;
 

trunk/SRC/org/openmicroscopy/shoola/env/data/OmeroImageServiceImpl.java

@@ -33 +33 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import javax.imageio.ImageIO;
 
@@ -40 +39 @@
 //Application-internal dependencies
 import omero.RString;
-import omero.api.RenderingEngine;
 import omero.api.RenderingEnginePrx;
 import omero.model.IObject;
@@ -49 +47 @@
 import omero.romio.PlaneDef;
 import omero.util.PojoOptionsI;
-
 import org.openmicroscopy.shoola.env.LookupNames;
 import org.openmicroscopy.shoola.env.config.Registry;
@@ -63 +60 @@
 import pojos.ExperimenterData;
 import pojos.ImageData;
+import pojos.PixelsData;
 
 
@@ -312 +310 @@
                 throws DSOutOfServiceException, DSAccessException
         {
+                if (pixelsID < 0) 
+                        throw new IllegalArgumentException("Pixels' ID not valid.");
                 return gateway.getPixelsDimensions(pixelsID);
         }
@@ -319 +319 @@
          * @see OmeroImageService#loadPixels(long)
          */
-        public Pixels loadPixels(long pixelsID)
-                throws DSOutOfServiceException, DSAccessException
-        {
-                return gateway.getPixels(pixelsID);
+        public PixelsData loadPixels(long pixelsID)
+                throws DSOutOfServiceException, DSAccessException
+        {
+                if (pixelsID < 0) 
+                        throw new IllegalArgumentException("Pixels' ID not valid.");
+                return (PixelsData) PojoMapper.asDataObject(
+                                gateway.getPixels(pixelsID));
         }
 
@@ -332 +335 @@
                 throws DSOutOfServiceException, DSAccessException
         {
+                if (pixelsID < 0) 
+                        throw new IllegalArgumentException("Pixels' ID not valid.");
                 return gateway.getPlane(pixelsID, z, t, c);
         }
@@ -422 +427 @@
                         PojoMapper.asDataObject(
                                         gateway.updateObject(img, new PojoOptionsI().map()));
+                image = gateway.getImage(image.getId());
                 List<DatasetData> datasets =  ref.getDatasets();
                 if (datasets != null && datasets.size() > 0) {

trunk/SRC/org/openmicroscopy/shoola/env/data/util/PojoMapper.java

@@ -142 +142 @@
         else if (object instanceof BooleanAnnotation) {
                 BooleanAnnotation ann = (BooleanAnnotation) object;
-                if (ArchivedAnnotationData.IMPORTER_ARCHIVED_NS.equals(ann.getNs().val))
+                if (ArchivedAnnotationData.IMPORTER_ARCHIVED_NS.equals(
+                                ann.getNs().val))
                         return new ArchivedAnnotationData(ann);
                 return new BooleanAnnotationData(ann);

trunk/SRC/org/openmicroscopy/shoola/env/rnd/RenderingControl.java

@@ -38 +38 @@
 import org.openmicroscopy.shoola.env.data.model.ChannelMetadata;
 
+import pojos.PixelsData;
+
 
 /** 
@@ -610 +612 @@
          * @return See above.
          */
-        public boolean validatePixels(Pixels pixels);
+        public boolean validatePixels(PixelsData pixels);
         
         /**

trunk/SRC/org/openmicroscopy/shoola/env/rnd/RenderingControlProxy.java

@@ -56 +56 @@
 import org.openmicroscopy.shoola.env.data.model.ProjectionParam;
 import org.openmicroscopy.shoola.util.image.geom.Factory;
+
+import pojos.PixelsData;
 
 
@@ -1264 +1266 @@
         /** 
          * Implemented as specified by {@link RenderingControl}. 
-         * @see RenderingControl#validatePixels(Pixels)
-         */
-        public boolean validatePixels(Pixels pixels)
+         * @see RenderingControl#validatePixels(PixelsData)
+         */
+        public boolean validatePixels(PixelsData pixels)
         {
                 if (pixels == null) return false;
                 DataServicesFactory.isSessionAlive(context);
-                if (getPixelsDimensionsC() != pixels.getSizeC().val)
+                if (getPixelsDimensionsC() != pixels.getSizeC())
                         return false;
-                if (getPixelsDimensionsY() != pixels.getSizeY().val)
+                if (getPixelsDimensionsY() != pixels.getSizeY())
                         return false;
-                if (getPixelsDimensionsX() != pixels.getSizeX().val)
+                if (getPixelsDimensionsX() != pixels.getSizeX())
                         return false;
-                String s = pixels.getPixelsType().getValue().val;
+                String s = pixels.getPixelType();
                 String value = pixs.getPixelsType().getValue().val;
                 if (!value.equals(s)) return false;

trunk/TEST/org/openmicroscopy/shoola/env/data/NullRenderingService.java

@@ -36 +36 @@
 
 //Application-internal dependencies
-import omero.model.Pixels;
 import omero.model.PixelsDimensions;
 import omero.romio.PlaneDef;
@@ -44 +43 @@
 import org.openmicroscopy.shoola.env.rnd.RndProxyDef;
 import pojos.ImageData;
+import pojos.PixelsData;
 
 
@@ -105 +105 @@
      * @see OmeroImageService#loadPixels(long)
      */
-        public Pixels loadPixels(long pixelsID) 
+        public PixelsData loadPixels(long pixelsID) 
                 throws DSOutOfServiceException, DSAccessException 
         {