diff --git a/comparator.cpp b/comparator.cpp index 8297dac..6fc25b4 100644 --- a/comparator.cpp +++ b/comparator.cpp @@ -5,7 +5,6 @@ Comparator::Comparator(const QString &type) : Item(type) { - } QRectF Comparator::boundingRect() const @@ -121,7 +120,7 @@ bool Comparator::state() const if (compare_ == "<") return registerValue_ < registerValue2_; if (compare_ == "=") return registerValue_ == registerValue2_; if (compare_ == ">=") return registerValue_ >= registerValue2_; - if (compare_ == "<") return registerValue_ <= registerValue2_; + if (compare_ == "<=") return registerValue_ <= registerValue2_; return false; } diff --git a/editor.pro.user b/editor.pro.user index 26c4f65..f7010db 100644 --- a/editor.pro.user +++ b/editor.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/hmi.ui b/hmi.ui index 93b29ca..5e74625 100644 --- a/hmi.ui +++ b/hmi.ui @@ -6,35 +6,58 @@ 0 0 - 964 - 550 + 978 + 552 Form - + - 200 + 10 30 - 761 + 171 451 - - QGraphicsView::NoDrag - - + - 10 - 30 - 171 - 451 + 190 + 10 + 781 + 481 + + 0 + + + + Tab 1 + + + + + 0 + 0 + 761 + 451 + + + + QGraphicsView::NoDrag + + + + + + Tab 2 + +