diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index d2caec0220..d829f46459 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -43,7 +43,7 @@ UM.Dialog TextField { id: peak_height objectName: "Peak_Height" - validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: -500; top: 500;} + validator: RegExpValidator {regExp: /^-?\d{1,3}([\,|\.]\d*)?$/} width: 180 * screenScaleFactor onTextChanged: { manager.onPeakHeightChanged(text) } } @@ -66,7 +66,7 @@ UM.Dialog TextField { id: base_height objectName: "Base_Height" - validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 0; top: 500;} + validator: RegExpValidator {regExp: /^\d{1,3}([\,|\.]\d*)?$/} width: 180 * screenScaleFactor onTextChanged: { manager.onBaseHeightChanged(text) } } @@ -90,7 +90,7 @@ UM.Dialog id: width objectName: "Width" focus: true - validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;} + validator: RegExpValidator {regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/} width: 180 * screenScaleFactor onTextChanged: { manager.onWidthChanged(text) } } @@ -113,7 +113,7 @@ UM.Dialog id: depth objectName: "Depth" focus: true - validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;} + validator: RegExpValidator {regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/} width: 180 * screenScaleFactor onTextChanged: { manager.onDepthChanged(text) } } diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 40ea15f7a0..a7909f131b 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -107,7 +107,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 @@ -120,7 +120,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 @@ -132,14 +132,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 @@ -149,7 +149,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)