diff options
author | Tim Kuipers <t.kuipers@ultimaker.com> | 2019-05-20 15:55:10 +0300 |
---|---|---|
committer | Tim Kuipers <t.kuipers@ultimaker.com> | 2019-10-24 18:26:28 +0300 |
commit | 5915947a7a54502b48367a9ba5e47e5888d5351b (patch) | |
tree | b8c612ada9cf4046cace56d2691d0f83b3028929 /plugins/ImageReader | |
parent | 364483f6533905b710b5c2d8f2ff3d77b5d73598 (diff) |
fix litho thickness computation
Diffstat (limited to 'plugins/ImageReader')
-rw-r--r-- | plugins/ImageReader/ImageReader.py | 4 | ||||
-rw-r--r-- | plugins/ImageReader/ImageReaderUI.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index 0086736f6d..2084844548 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -108,7 +108,7 @@ class ImageReader(MeshReader): Job.yieldThread() - if not lighter_is_higher: + if lighter_is_higher is use_transparency_model: height_data = 1 - height_data for _ in range(0, blur_iterations): @@ -133,7 +133,7 @@ class ImageReader(MeshReader): min_luminance = 2.0 ** ((peak_height - base_height) / p) for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] - height_data[y, x] = peak_height - p * math.log(mapped_luminance, 2) + height_data[y, x] = base_height + p * math.log(mapped_luminance, 2) else: height_data *= scale_vector.y height_data += base_height diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 41d8741b38..0fb9ea78de 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -35,7 +35,7 @@ class ImageReaderUI(QObject): self.smoothing = 1 self.lighter_is_higher = False; self.use_transparency_model = True; - self.transmittance_1mm = 40.0; + self.transmittance_1mm = 20.0; # based on pearl PLA self._ui_lock = threading.Lock() self._cancelled = False |