Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Kuipers <t.kuipers@ultimaker.com>2019-05-20 15:55:10 +0300
committerTim Kuipers <t.kuipers@ultimaker.com>2019-05-20 15:58:26 +0300
commit236b7574c0bf5415535fde6ca559ebfa7bc8eeb7 (patch)
treefa1f0c8bb2e372b7372d45f9a0b5ac2bcae09863 /plugins/ImageReader
parent3e0b756a6d9654ed180f97d47a8b0412dc063a66 (diff)
fix litho thickness computation
Diffstat (limited to 'plugins/ImageReader')
-rw-r--r--plugins/ImageReader/ImageReader.py4
-rw-r--r--plugins/ImageReader/ImageReaderUI.py2
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