Commit 2c80ddd2 authored by Robert's avatar Robert Committed by Robert Ohmacht

-fixed: alternating red/blue tinting of scan tiles, after adding them to a view tile

-fixed: incorrect line heights in z-levels selector component in optical scan, when in-/decreasing z-levels to many/low amounts
parent 06d183e1
......@@ -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):
"""
......
......@@ -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()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment