From 359c48b58d4e12a3fad6841f67ddd40bfcdc245a Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 13 Dec 2023 15:13:29 +0000 Subject: [PATCH] OMERO_NUMPY_DTYPES holds types not strings --- src/omero/gateway/__init__.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/omero/gateway/__init__.py b/src/omero/gateway/__init__.py index aeba38ac5..bdb4753b6 100644 --- a/src/omero/gateway/__init__.py +++ b/src/omero/gateway/__init__.py @@ -87,14 +87,14 @@ logger = logging.getLogger(__name__) THISPATH = os.path.dirname(os.path.abspath(__file__)) OMERO_NUMPY_DTYPES = { - PixelsTypeint8: 'int8', - PixelsTypeuint8: 'uint8', - PixelsTypeint16: 'int16', - PixelsTypeuint16: 'uint16', - PixelsTypeint32: 'int32', - PixelsTypeuint32: 'uint32', - PixelsTypefloat: 'float32', - PixelsTypedouble: 'double' + PixelsTypeint8: numpy.int8, + PixelsTypeuint8: numpy.uint8, + PixelsTypeint16: numpy.int16, + PixelsTypeuint16: numpy.uint16, + PixelsTypeint32: numpy.int32, + PixelsTypeuint32: numpy.uint32, + PixelsTypefloat: numpy.float32, + PixelsTypedouble: numpy.float64, } try: @@ -3802,7 +3802,7 @@ def createImage(firstPlane, channelList): img = self.getObject("Image", iId.getValue()) newPtype = img.getPrimaryPixels().getPixelsType().getValue() if OMERO_NUMPY_DTYPES[newPtype] != firstPlane.dtype.name: - convertToType = numpy.dtype(OMERO_NUMPY_DTYPES[newPtype]) + convertToType = OMERO_NUMPY_DTYPES[newPtype] img._obj.setName(rstring(imageName)) img._obj.setSeries(rint(0)) updateService.saveObject(img._obj, self.SERVICE_OPTS) @@ -7498,7 +7498,7 @@ def getPlane(self, theZ=0, theC=0, theT=0): def get_numpy_pixels_type(self): pixels_type = self.getPixelsType().value - return numpy.dtype(OMERO_NUMPY_DTYPES[pixels_type]) + return OMERO_NUMPY_DTYPES[pixels_type] def getTiles(self, zctTileList): """