cubevis 0.5.11__py3-none-any.whl → 0.5.12__py3-none-any.whl

cubevis/__version__.py

@@ -1 +1 @@
-__version__ = '0.5.11'
+__version__ = '0.5.12'

cubevis/bokeh/sources/_image_pipe.py

@@ -208,15 +208,19 @@ class ImagePipe(DataPipe):
             ### --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
             amin = image_plane.min( )           ## array min
             amax = image_plane.max( )           ## array max
-            rg = [ amin if len(self.__quant_adjustments['bounds'][0]) == 0 else self.__quant_adjustments['bounds'][0][0],
-                   amax if len(self.__quant_adjustments['bounds'][1]) == 0 else self.__quant_adjustments['bounds'][1][0] ]
-            umin = min(rg)                      ## user specified min
-            umax = max(rg)                      ## user specified max
+
+            ### --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+            ### Extract user bounds (use array bounds as fallback)
+            ### --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+            umin = amin if len(self.__quant_adjustments['bounds'][0]) == 0 else self.__quant_adjustments['bounds'][0][0]
+            umax = amax if len(self.__quant_adjustments['bounds'][1]) == 0 else self.__quant_adjustments['bounds'][1][0]
+
+            ### --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+            ### Handle cropping (when user bounds are narrower than data)
+            ### --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
             if umin > amin:
-                ## elements that are masked to the minumum color for the image
                 exclude_below = image_plane < umin
             if umax < amax:
-                ## elements that are masked to the maximum color for the image
                 exclude_above = image_plane > umax
 
             ### --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
@@ -240,13 +244,26 @@ class ImagePipe(DataPipe):
                 else:
                     normalize = 0 if umin > 0 else -umin
                     result = np.ma.zeros(image_plane.shape,image_plane.dtype)
-                    result[included] = self.__quant_scaling[selected_scaling]( image_plane[included]+normalize if included is not None else image_plane+normalize,
-                                                                               **self.__quant_adjustments['transfer']['args'] )
-                    if exclude_below is not None:
-                        result[exclude_below] = result[included].min( )
-                    if exclude_above is not None:
-                        result[exclude_above] = result[included].max( )
+
+                    if included is not None:
+
+                        result[included] = self.__quant_scaling[selected_scaling](
+                            image_plane[included] + normalize,
+                            **self.__quant_adjustments['transfer']['args']
+                        )
+
+                        # Set excluded regions to min/max of included values
+                        if exclude_below is not None:
+                            result[exclude_below] = result[included].min( )
+                        if exclude_above is not None:
+                            result[exclude_above] = result[included].max( )
+                    else:
+                        result = self.__quant_scaling[selected_scaling](
+                            image_plane + normalize,
+                            **self.__quant_adjustments['transfer']['args']
+                        )
             else:
+
                 result = image_plane
 
             ### --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---

{cubevis-0.5.11.dist-info → cubevis-0.5.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cubevis
-Version: 0.5.11
+Version: 0.5.12
 Summary: visualization toolkit and apps for casa
 License: LGPL
 Author-email: Darrell Schiebel <darrell@schiebel.us>,Pam Harris <pharris@nrao.edu>

{cubevis-0.5.11.dist-info → cubevis-0.5.12.dist-info}/RECORD

@@ -45,7 +45,7 @@ cubevis/bokeh/models/_tip_button.py,sha256=Dw4aO37o0J3n6EoaJ3ui1y8d04qNn3x2dbKiw
 cubevis/bokeh/sources/__init__.py,sha256=4FsudFuVU4o7VG5OG3K1tiMoxIXcJWNz_K9yzMDE8ls,1581
 cubevis/bokeh/sources/_data_pipe.py,sha256=PI4vZ_4eywHJfGEanyx-eMJvoeuMrPdMcF_ZbScYSi8,13779
 cubevis/bokeh/sources/_image_data_source.py,sha256=ezgTWHtHMpbT-jAd1F_xnq3jdcvIGbqNvN9MTbTOnNs,3537
-cubevis/bokeh/sources/_image_pipe.py,sha256=4v1-fuE-2LnL18hArkvurQeIy0TsaiX0H0_3iN-n4Xw,27770
+cubevis/bokeh/sources/_image_pipe.py,sha256=4pvoy517N199OMD_q40NkPChsGPSMaR58hw1Gb348NU,28475
 cubevis/bokeh/sources/_spectra_data_source.py,sha256=Tbq4JczbmWfW9OPTzY2OuCMPOrr9yGQ1xVB63QTHnOw,2200
 cubevis/bokeh/sources/_updatable_data_source.py,sha256=KlEUTFI26tC7FLu5KF0U36CjjyBmNhSro0-PrLSi7i8,10709
 cubevis/bokeh/state/__init__.py,sha256=pUzr7PWrFKhGa8G1ogrGqBywrT8nUJ5kh3vKr0z4Zao,1628
@@ -126,8 +126,8 @@ cubevis/utils/_pkgs.py,sha256=mu2CCzndmJZYP81UkFhxveW_CisWLUvagJVolHOEVgM,2294
 cubevis/utils/_regions.py,sha256=TdAg4ZUUyhg3nFmX9_KLboqmc0LkyOdEW8M1WDR5Udk,1669
 cubevis/utils/_static.py,sha256=rN-sqXNqQ5R2M3wmPHU1GPP5OTyyWQlUPRuimCrht-g,2347
 cubevis/utils/_tiles.py,sha256=A9W1X61VOhBMTOKXVajzOIoiV2FBdO5N2SFB9SUpDOo,7336
-cubevis/__version__.py,sha256=IB1CJxlYThFf3KnjTGeCxoPXiCTJ_Y8r_YEqVfavyqQ,22
-cubevis-0.5.11.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-cubevis-0.5.11.dist-info/METADATA,sha256=aJ3zH7H6h5nmNT9NndGFo8vlt0nbxq9mbW0oa_Ikkck,2629
-cubevis-0.5.11.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-cubevis-0.5.11.dist-info/RECORD,,
+cubevis/__version__.py,sha256=z3x2AegQWLToL5yMcS7dHEto7D9XUa4VzCOqg91RCYc,22
+cubevis-0.5.12.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+cubevis-0.5.12.dist-info/METADATA,sha256=kKWypQp_9ty8BR68rOpj6EW27-GHplOvNgmBqcDX9hA,2629
+cubevis-0.5.12.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+cubevis-0.5.12.dist-info/RECORD,,