Implemented the remaining file loading formats (busmaster log, CRTD), switched the way signals are connected on the main window, hooked up frame count, auto scroll, and clear frame button

This commit is contained in:
Collin Kidder
2015-05-03 22:03:40 -04:00
parent 78af6adf83
commit 17e17c6f65
3 changed files with 209 additions and 81 deletions
+59 -69
View File
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -23,7 +23,7 @@
</size>
</property>
<property name="windowTitle">
<string>MainWindow</string>
<string>SavvyCAN</string>
</property>
<widget class="QWidget" name="centralWidget">
<widget class="QTableView" name="canFramesView">
@@ -32,7 +32,7 @@
<x>20</x>
<y>10</y>
<width>675</width>
<height>400</height>
<height>421</height>
</rect>
</property>
<property name="font">
@@ -85,6 +85,61 @@
<string>Connect To Dongle</string>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>720</x>
<y>160</y>
<width>71</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string># of frames:</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
<widget class="QPushButton" name="btnClearFrames">
<property name="geometry">
<rect>
<x>710</x>
<y>180</y>
<width>201</width>
<height>28</height>
</rect>
</property>
<property name="text">
<string>Clear Frames</string>
</property>
</widget>
<widget class="QLabel" name="lbNumFrames">
<property name="geometry">
<rect>
<x>810</x>
<y>160</y>
<width>55</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
<widget class="QCheckBox" name="cbAutoScroll">
<property name="geometry">
<rect>
<x>710</x>
<y>250</y>
<width>201</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Auto scroll window</string>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
@@ -186,72 +241,7 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections>
<connection>
<sender>actionOpen_Log_File</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>handleLoadFile()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>507</x>
<y>299</y>
</hint>
</hints>
</connection>
<connection>
<sender>btnConnect</sender>
<signal>clicked()</signal>
<receiver>MainWindow</receiver>
<slot>connButtonPress()</slot>
<hints>
<hint type="sourcelabel">
<x>820</x>
<y>103</y>
</hint>
<hint type="destinationlabel">
<x>463</x>
<y>249</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionGraph_Dta</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>showGraphingWindow()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>463</x>
<y>249</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionFrame_Data_Analysis</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>showFrameDataAnalysis()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>463</x>
<y>249</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
<slots>
<slot>handleLoadFile()</slot>
<slot>connButtonPress()</slot>