Added more functionality for new DBC editing system. Tweaked graphics of CANDataGrid a bit.

This commit is contained in:
Collin Kidder
2020-07-22 19:15:16 -04:00
parent 38ab58d92a
commit c89bc43795
13 changed files with 525 additions and 171 deletions
+56 -18
View File
@@ -32,6 +32,9 @@
</item>
<item>
<widget class="QToolButton" name="btnNewMessage">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>New Message</string>
</property>
@@ -46,6 +49,9 @@
</item>
<item>
<widget class="QToolButton" name="btnNewSignal">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>New Signal</string>
</property>
@@ -60,6 +66,9 @@
</item>
<item>
<widget class="QToolButton" name="btnDelete">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Delete</string>
</property>
@@ -91,6 +100,27 @@
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QTreeWidget" name="treeDBC">
<property name="dragEnabled">
<bool>false</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::NoDragDrop</enum>
</property>
<property name="defaultDropAction">
<enum>Qt::IgnoreAction</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="indentation">
<number>28</number>
</property>
<property name="headerHidden">
<bool>true</bool>
</property>
<property name="expandsOnDoubleClick">
<bool>false</bool>
</property>
<column>
<property name="text">
<string notr="true">1</string>
@@ -107,30 +137,13 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Find DBC Message:</string>
<string>Find:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineSearch"/>
</item>
<item>
<widget class="QRadioButton" name="radioID">
<property name="text">
<string>Msg ID</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioName">
<property name="text">
<string>Msg Name</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSearch">
<property name="text">
@@ -140,6 +153,31 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="lblSearchPos">
<property name="text">
<string>Search Results: 0 of 0</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSearchNext">
<property name="text">
<string>Next</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSearchPrev">
<property name="text">
<string>Previous</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
+123
View File
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DBCMessageEditor</class>
<widget class="QDialog" name="DBCMessageEditor">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>311</width>
<height>371</height>
</rect>
</property>
<property name="windowTitle">
<string>Message Editor</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Frame ID:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineFrameID"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineMsgName"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Message Name:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineFrameLen"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Frame Length:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Text Color:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Background Color:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Comments:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="lineComment"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Sending Node:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="comboSender"/>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="btnTextColor">
<property name="text">
<string>Set</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="btnBackgroundColor">
<property name="text">
<string>Set</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Sample Colored Output:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="listSample"/>
</item>
<item>
<widget class="QPushButton" name="btnClose">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DBCNodeEditor</class>
<widget class="QDialog" name="DBCNodeEditor">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>311</width>
<height>128</height>
</rect>
</property>
<property name="windowTitle">
<string>Node Editor</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Node Name:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineMsgName"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Comments:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineComment"/>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="btnClose">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>