Skip to content
Snippets Groups Projects
Commit d436de84 authored by Tanguy Raufflet's avatar Tanguy Raufflet
Browse files

Correctif opération à virgule non ppssible dans les opérations sur les pixels

parent 3cfd08b6
No related branches found
No related tags found
No related merge requests found
...@@ -25,14 +25,16 @@ ...@@ -25,14 +25,16 @@
#include <QRegExpValidator> #include <QRegExpValidator>
#include <QIntValidator> #include <QIntValidator>
#include <QDoubleValidator> #include <QDoubleValidator>
#include "Widgets/ImageWidgets/MyDoubleValidator.h"
class MyQLineEdit : public QLineEdit { class MyQLineEdit : public QLineEdit {
Q_OBJECT Q_OBJECT
public: public:
MyQLineEdit(QWidget *parent = nullptr) : QLineEdit(parent){};
MyQLineEdit(const QString &contents, QWidget *parent = nullptr) : QLineEdit(contents, parent){}; explicit MyQLineEdit(QWidget *parent = nullptr) : QLineEdit(parent){};
explicit MyQLineEdit(const QString &contents, QWidget *parent = nullptr) : QLineEdit(contents, parent){};
public slots: public slots:
void updateValidator(const QString &text){ void updateValidator(const QString &text){
...@@ -40,10 +42,10 @@ class MyQLineEdit : public QLineEdit { ...@@ -40,10 +42,10 @@ class MyQLineEdit : public QLineEdit {
QRegExp regLogicalExp("^[1]d*|0$"); QRegExp regLogicalExp("^[1]d*|0$");
/*Allow positive integer as input*/ /*Allow positive integer as input*/
QRegExp regShiftExp("^\\d+$"); QRegExp regShiftExp("^\\d+$");
QRegExpValidator* logicalValidator = new QRegExpValidator(regLogicalExp,0); auto* logicalValidator = new QRegExpValidator(regLogicalExp, nullptr);
QRegExpValidator* shiftValidator = new QRegExpValidator(regShiftExp,0); auto* shiftValidator = new QRegExpValidator(regShiftExp,nullptr);
QIntValidator* intValidator = new QIntValidator(); auto* intValidator = new QIntValidator();
QDoubleValidator* doubleValidator = new QDoubleValidator(); auto* doubleValidator = new genericinterface::MyDoubleValidator();
if(text.contains("NOT")){ if(text.contains("NOT")){
this->setEnabled(false); this->setEnabled(false);
...@@ -53,11 +55,15 @@ class MyQLineEdit : public QLineEdit { ...@@ -53,11 +55,15 @@ class MyQLineEdit : public QLineEdit {
if(text.contains("logical")){ if(text.contains("logical")){
this->setValidator(logicalValidator); this->setValidator(logicalValidator);
printf("111111111111");
}else if(text.contains("<<") || text.contains(">>")){ }else if(text.contains("<<") || text.contains(">>")){
this->setValidator(shiftValidator); this->setValidator(shiftValidator);
printf("2222222222");
}else if(text.contains("bit-wise")){ }else if(text.contains("bit-wise")){
this->setValidator(intValidator); this->setValidator(intValidator);
printf("33333333333");
}else{ }else{
printf("444444444444");
this->setValidator(doubleValidator); this->setValidator(doubleValidator);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment