diff --git a/scenePyramid.py b/scenePyramid.py index fdc2ca6607b57cce972c74966d615ad66d91534d..e21f9adbdd21badfa1441e41ec7cdfa66739810a 100644 --- a/scenePyramid.py +++ b/scenePyramid.py @@ -52,7 +52,7 @@ class ScenePyramid: 'fullImageHeight': 0 } - def __init__(self, view: QtWidgets.QGraphicsView, logger): + def __init__(self, view: QtWidgets.QGraphicsView, logger=None): # references to other objects self.view: QtWidgets.QGraphicsView = view self.scene = self.view.scene() @@ -532,8 +532,6 @@ class ScenePyramid: :param fullimgsize: :return: """ - self.preScanModeComplete = True - self.fullImageWidth = current_full_image_width = fullimgsize[self.cvWidthIdx] self.fullImageHeight = current_full_image_height = fullimgsize[self.cvHeightIdx] @@ -613,7 +611,7 @@ class ScenePyramid: :return: """ tile_path = os.path.join(self.dataset.getTilePath(), f"tile_{slice_nr}_{i}_{j}.tif") - cv2imwrite_fix(tile_path, cv2.cvtColor(img, cv2.COLOR_RGB2BGR)) + cv2imwrite_fix(tile_path, img) if slice_nr not in self.tileWorkingSets: self.tileWorkingSets[slice_nr] = {} @@ -888,7 +886,7 @@ class ScenePyramid: def imageOut(self, img, name): path = os.path.join(self.dataset.getTilePath(), name) - cv2imwrite_fix(path, cv2.cvtColor(img, cv2.COLOR_RGB2BGR)) + cv2imwrite_fix(path, img) def setTileOpacity(self, opacity): """ diff --git a/zlevelsetter.py b/zlevelsetter.py index ad13d0140a3c34d4808c48b64e7760abe7f15ced..fbfcf1be08b49fa0440e8d2e497e4fa0c6afb64c 100644 --- a/zlevelsetter.py +++ b/zlevelsetter.py @@ -228,7 +228,7 @@ class ZLevelSetter(QtWidgets.QLabel): :return: """ width = 400 - height = 100 + self.numLevelsSpinbox.value()*30 + height = 170 + self.numLevelsSpinbox.value()*23 self.setFixedSize(width, height) self.sizeChanged.emit()