Browse Source

修改了HMI模块的ui

master
鹏鹏 李 2 days ago
parent
commit
08f8e50530
3 changed files with 38 additions and 16 deletions
  1. +1
    -2
      comparator.cpp
  2. +1
    -1
      editor.pro.user
  3. +36
    -13
      hmi.ui

+ 1
- 2
comparator.cpp View File

@@ -5,7 +5,6 @@


Comparator::Comparator(const QString &type) : Item(type) Comparator::Comparator(const QString &type) : Item(type)
{ {

} }


QRectF Comparator::boundingRect() const 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_; if (compare_ == ">=") return registerValue_ >= registerValue2_;
if (compare_ == "<") return registerValue_ <= registerValue2_;
if (compare_ == "<=") return registerValue_ <= registerValue2_;
return false; return false;
} }




+ 1
- 1
editor.pro.user View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2025-08-09T12:58:16. -->
<!-- Written by QtCreator 4.11.1, 2025-08-10T15:47:26. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>


+ 36
- 13
hmi.ui View File

@@ -6,35 +6,58 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>964</width>
<height>550</height>
<width>978</width>
<height>552</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<widget class="MyGraphicsView" name="graphicsView">
<widget class="QListWidget" name="listWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>200</x>
<x>10</x>
<y>30</y> <y>30</y>
<width>761</width>
<width>171</width>
<height>451</height> <height>451</height>
</rect> </rect>
</property> </property>
<property name="dragMode">
<enum>QGraphicsView::NoDrag</enum>
</property>
</widget> </widget>
<widget class="QListWidget" name="listWidget">
<widget class="QTabWidget" name="tabWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x>
<y>30</y>
<width>171</width>
<height>451</height>
<x>190</x>
<y>10</y>
<width>781</width>
<height>481</height>
</rect> </rect>
</property> </property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Tab 1</string>
</attribute>
<widget class="MyGraphicsView" name="graphicsView">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>761</width>
<height>451</height>
</rect>
</property>
<property name="dragMode">
<enum>QGraphicsView::NoDrag</enum>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Tab 2</string>
</attribute>
</widget>
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>


Loading…
Cancel
Save