t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vast reworking of DBC editing system.

Browse Source 
Currently not functional but the overall graphical layout is more or less complete.
This commit is contained in:
Collin Kidder
2020-07-19 20:29:14 -04:00
parent 067292108d
commit fc6dc4ea55
32 changed files with 462 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/dbcmaineditor.ui
+80 -16
View File
@@ -13,33 +13,95 @@
<property name="windowTitle">
<string>DBC Editing Window</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,3">
<layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,5,1">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_2">
<widget class="QToolButton" name="btnNewNode">
<property name="text">
<string>Nodes</string>
<string>New Node</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/images/node_new.png</normaloff>:/icons/images/node_new.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QTableWidget" name="NodesTable"/>
<widget class="QToolButton" name="btnNewMessage">
<property name="text">
<string>New Message</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/images/message_new.png</normaloff>:/icons/images/message_new.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnNewSignal">
<property name="text">
<string>New Signal</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/images/signal_new.png</normaloff>:/icons/images/signal_new.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnDelete">
<property name="text">
<string>Delete</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/images/skull.png</normaloff>:/icons/images/skull.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QTreeWidget" name="treeDBC">
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Messages</string>
</property>
</widget>
</item>
<item>
<widget class="QTableWidget" name="MessagesTable"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@@ -82,6 +144,8 @@
</item>
</layout>
</widget>
<resources/>
<resources>
<include location="../icons.qrc"/>
</resources>
<connections/>
</ui>
ui/dbcsignaleditor.ui
+3 -7
View File
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1239</width>
<width>967</width>
<height>644</height>
</rect>
</property>
@@ -15,10 +15,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="10,1,4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2,1">
<item>
<widget class="QListWidget" name="signalsList"/>
</item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="2,1">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -210,7 +207,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Value Table For Selected Signal:</string>
<string>Value Table:</string>
</property>
</widget>
</item>
@@ -228,7 +225,6 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>signalsList</tabstop>
<tabstop>txtName</tabstop>
<tabstop>rbNotMulti</tabstop>
<tabstop>rbMultiplexed</tabstop>