3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reworked UI so that it matches 15.04 UI, and made each field in the UI do the same thing that they do in 15.04.

Browse source
This commit is contained in:
Kurt Loeffler 2016-01-13 20:00:30 -08:00
parent b8cf51349c
commit b28bfc9602
3 changed files with 235 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

25
plugins/ImageReader/ImageReader.py
View file

@ -23,6 +23,20 @@ class ImageReader(MeshReader):
self._ui = ImageReaderUI(self)
def preRead(self, file_name):
img = QImage(file_name)
if img.isNull():
Logger.log("e", "Image is corrupt.")
return MeshReader.PreReadResult.failed
width = img.width()
depth = img.height()
largest = max(width, depth)
width = width/largest*self._ui.defaultWidth
depth = depth/largest*self._ui.defaultDepth
self._ui.setWidthAndDepth(width, depth)
self._ui.showConfigUI()
self._ui.waitForUIToClose()
@ -31,9 +45,10 @@ class ImageReader(MeshReader):
return MeshReader.PreReadResult.accepted
def read(self, file_name):
return self._generateSceneNode(file_name, self._ui.size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512)
size = max(self._ui.getWidth(), self._ui.getDepth())
return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.image_color_invert)
def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size):
def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, image_color_invert):
mesh = None
scene_node = None
@ -56,9 +71,10 @@ class ImageReader(MeshReader):
img = img.scaled(width, height, Qt.IgnoreAspectRatio)
base_height = max(base_height, 0)
peak_height = max(peak_height, -base_height)
xz_size = max(xz_size, 1)
scale_vector = Vector(xz_size, max(peak_height - base_height, -base_height), xz_size)
scale_vector = Vector(xz_size, peak_height, xz_size)
if width > height:
scale_vector.setZ(scale_vector.z * aspect)
@ -92,6 +108,9 @@ class ImageReader(MeshReader):
Job.yieldThread()
if image_color_invert:
height_data = 1-height_data
for i in range(0, blur_iterations):
copy = numpy.pad(height_data, ((1, 1), (1, 1)), mode='edge')