mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 14:37:29 -06:00
Merge branch '3.1'
This commit is contained in:
commit
2236e0016d
6 changed files with 70 additions and 17 deletions
|
@ -101,7 +101,7 @@ class ImageReaderUI(QObject):
|
|||
def onWidthChanged(self, value):
|
||||
if self._ui_view and not self._disable_size_callbacks:
|
||||
if len(value) > 0:
|
||||
self._width = float(value)
|
||||
self._width = float(value.replace(",", "."))
|
||||
else:
|
||||
self._width = 0
|
||||
|
||||
|
@ -114,7 +114,7 @@ class ImageReaderUI(QObject):
|
|||
def onDepthChanged(self, value):
|
||||
if self._ui_view and not self._disable_size_callbacks:
|
||||
if len(value) > 0:
|
||||
self._depth = float(value)
|
||||
self._depth = float(value.replace(",", "."))
|
||||
else:
|
||||
self._depth = 0
|
||||
|
||||
|
@ -126,14 +126,14 @@ class ImageReaderUI(QObject):
|
|||
@pyqtSlot(str)
|
||||
def onBaseHeightChanged(self, value):
|
||||
if (len(value) > 0):
|
||||
self.base_height = float(value)
|
||||
self.base_height = float(value.replace(",", "."))
|
||||
else:
|
||||
self.base_height = 0
|
||||
|
||||
@pyqtSlot(str)
|
||||
def onPeakHeightChanged(self, value):
|
||||
if (len(value) > 0):
|
||||
self.peak_height = float(value)
|
||||
self.peak_height = float(value.replace(",", "."))
|
||||
else:
|
||||
self.peak_height = 0
|
||||
|
||||
|
@ -143,7 +143,4 @@ class ImageReaderUI(QObject):
|
|||
|
||||
@pyqtSlot(int)
|
||||
def onImageColorInvertChanged(self, value):
|
||||
if (value == 1):
|
||||
self.image_color_invert = True
|
||||
else:
|
||||
self.image_color_invert = False
|
||||
self.image_color_invert = (value == 1)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue