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

Add selection of graph charts and slider to change chart range to flow view

Browse Source
This commit is contained in:
Viktor Verebelyi
2021-11-26 03:32:54 +00:00
parent efe1247bbb
commit 3a4f9c6699
3 changed files with 363 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/flowviewwindow.cpp
+39 -2
View File
@@ -104,6 +104,15 @@ FlowViewWindow::FlowViewWindow(const QVector<CANFrame> *frames, QWidget *parent)
connect(ui->txtTrigger5, SIGNAL(textEdited(QString)), this, SLOT(updateTriggerValues())); connect(ui->txtTrigger5, SIGNAL(textEdited(QString)), this, SLOT(updateTriggerValues()));
connect(ui->txtTrigger6, SIGNAL(textEdited(QString)), this, SLOT(updateTriggerValues())); connect(ui->txtTrigger6, SIGNAL(textEdited(QString)), this, SLOT(updateTriggerValues()));
connect(ui->txtTrigger7, SIGNAL(textEdited(QString)), this, SLOT(updateTriggerValues())); connect(ui->txtTrigger7, SIGNAL(textEdited(QString)), this, SLOT(updateTriggerValues()));
connect(ui->graphRangeSlider, &QSlider::valueChanged, this, &FlowViewWindow::graphRangeChanged);
connect(ui->check_0, &QCheckBox::stateChanged, this, &FlowViewWindow::changeGraphVisibility);
connect(ui->check_1, &QCheckBox::stateChanged, this, &FlowViewWindow::changeGraphVisibility);
connect(ui->check_2, &QCheckBox::stateChanged, this, &FlowViewWindow::changeGraphVisibility);
connect(ui->check_3, &QCheckBox::stateChanged, this, &FlowViewWindow::changeGraphVisibility);
connect(ui->check_4, &QCheckBox::stateChanged, this, &FlowViewWindow::changeGraphVisibility);
connect(ui->check_5, &QCheckBox::stateChanged, this, &FlowViewWindow::changeGraphVisibility);
connect(ui->check_6, &QCheckBox::stateChanged, this, &FlowViewWindow::changeGraphVisibility);
connect(ui->check_7, &QCheckBox::stateChanged, this, &FlowViewWindow::changeGraphVisibility);
// Using lambda expression to strip away the possible filter label before passing the ID to updateDetailsWindow // Using lambda expression to strip away the possible filter label before passing the ID to updateDetailsWindow
connect(ui->listFrameID, &QListWidget::currentTextChanged, connect(ui->listFrameID, &QListWidget::currentTextChanged,
@@ -234,6 +243,21 @@ bool FlowViewWindow::eventFilter(QObject *obj, QEvent *event)
} }
} }
void FlowViewWindow::changeGraphVisibility(int state){
QCheckBox *sender = qobject_cast<QCheckBox *>(QObject::sender());
if(sender){
sender->objectName();
int graphId = sender->objectName().right(1).toInt();
for (int k = 0; k < 8; k++)
{
if (k == graphId && graphRef[k] && graphRef[k]->data()){
graphRef[k]->setVisible(state);
}
}
ui->graphView->replot();
}
}
void FlowViewWindow::gotCellClick(int x, int y) void FlowViewWindow::gotCellClick(int x, int y)
{ {
int bitnum = (7-x) + (8 * y); int bitnum = (7-x) + (8 * y);
@@ -243,6 +267,11 @@ void FlowViewWindow::gotCellClick(int x, int y)
qDebug() << "Bit Num: " << bitnum << " Hex of trigger bits: " << QString::number(triggerBits, 16); qDebug() << "Bit Num: " << bitnum << " Hex of trigger bits: " << QString::number(triggerBits, 16);
} }
void FlowViewWindow::graphRangeChanged(int range) {
ui->rangeValue->setText(QString::number(range));
updateGraphLocation();
}
void FlowViewWindow::updateTriggerValues() void FlowViewWindow::updateTriggerValues()
{ {
triggerValues[0] = Utility::ParseStringToNum(ui->txtTrigger0->text()); triggerValues[0] = Utility::ParseStringToNum(ui->txtTrigger0->text());
@@ -623,6 +652,14 @@ void FlowViewWindow::changeID(QString newID)
memcpy(refBytes, currBytes, 8); memcpy(refBytes, currBytes, 8);
updateDataView(); updateDataView();
ui->check_0->setChecked(true);
ui->check_1->setChecked(true);
ui->check_2->setChecked(true);
ui->check_3->setChecked(true);
ui->check_4->setChecked(true);
ui->check_5->setChecked(true);
ui->check_6->setChecked(true);
ui->check_7->setChecked(true);
} }
void FlowViewWindow::btnBackOneClick() void FlowViewWindow::btnBackOneClick()
@@ -800,9 +837,9 @@ void FlowViewWindow::updatePosition(bool forward)
void FlowViewWindow::updateGraphLocation() void FlowViewWindow::updateGraphLocation()
{ {
if (frameCache.count() == 0) return; if (frameCache.count() == 0) return;
int start = currentPosition - 5; int start = currentPosition - ui->graphRangeSlider->value();
if (start < 0) start = 0; if (start < 0) start = 0;
int end = currentPosition + 5; int end = currentPosition + ui->graphRangeSlider->value();
if (end >= frameCache.count()) end = frameCache.count() - 1; if (end >= frameCache.count()) end = frameCache.count() - 1;
if (ui->cbTimeGraph->isChecked()) if (ui->cbTimeGraph->isChecked())
{ {
re/flowviewwindow.h
+3
View File
@@ -2,6 +2,7 @@
#define FLOWVIEWWINDOW_H #define FLOWVIEWWINDOW_H
#include <QDialog> #include <QDialog>
#include <QLocale>
#include "qcustomplot.h" #include "qcustomplot.h"
#include "can_structs.h" #include "can_structs.h"
@@ -38,6 +39,8 @@ private slots:
void gotCenterTimeID(int32_t ID, double timestamp); void gotCenterTimeID(int32_t ID, double timestamp);
void updateTriggerValues(); void updateTriggerValues();
void gotCellClick(int x, int y); void gotCellClick(int x, int y);
void graphRangeChanged(int range);
void changeGraphVisibility(int state);
signals: signals:
void sendCenterTimeID(uint32_t ID, double timestamp); void sendCenterTimeID(uint32_t ID, double timestamp);
ui/flowviewwindow.ui
+321 -136
View File
@@ -1030,26 +1030,19 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Data Byte Colors:</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_21"> <widget class="QCheckBox" name="check_0">
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>0</red> <red>52</red>
<green>0</green> <green>101</green>
<blue>255</blue> <blue>164</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -1058,9 +1051,9 @@
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>0</red> <red>52</red>
<green>0</green> <green>101</green>
<blue>255</blue> <blue>164</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -1078,27 +1071,30 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>0 = Blue</string> <string>0</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="3">
<widget class="QLabel" name="label_23"> <widget class="QCheckBox" name="check_2">
<property name="text">
<string>2 = Black</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_24">
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>255</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
@@ -1109,7 +1105,7 @@
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>255</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
@@ -1129,65 +1125,85 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="text"> <property name="font">
<string>3 = Red</string> <font>
</property> <pointsize>13</pointsize>
</widget> <weight>75</weight>
</item> <bold>true</bold>
<item row="1" column="1"> </font>
<widget class="QLabel" name="label_25">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>133</red>
<green>133</green>
<blue>199</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>133</red>
<green>133</green>
<blue>199</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>120</red>
<green>120</green>
<blue>120</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property> </property>
<property name="text"> <property name="text">
<string>4 = Gray</string> <string>2</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_22"> <widget class="QCheckBox" name="check_1">
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>0</red> <red>78</red>
<green>170</green> <green>154</green>
<blue>6</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>78</red>
<green>154</green>
<blue>6</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>120</red>
<green>120</green>
<blue>120</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>1</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="check_3">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>204</red>
<green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -1197,8 +1213,8 @@
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>0</red> <red>204</red>
<green>170</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -1217,22 +1233,140 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>1 = Green</string> <string>3</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="check_4">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>136</red>
<green>138</green>
<blue>133</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>136</red>
<green>138</green>
<blue>133</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>120</red>
<green>120</green>
<blue>120</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>4</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="check_5">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>233</green>
<blue>79</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>233</green>
<blue>79</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>120</red>
<green>120</green>
<blue>120</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>5</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QLabel" name="label_26"> <widget class="QCheckBox" name="check_6">
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>203</red> <red>114</red>
<green>203</green> <green>159</green>
<blue>0</blue> <blue>207</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -1241,9 +1375,9 @@
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>203</red> <red>114</red>
<green>203</green> <green>159</green>
<blue>0</blue> <blue>207</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -1261,22 +1395,32 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>5 = Yellow</string> <string>6</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="3">
<widget class="QLabel" name="label_27"> <widget class="QCheckBox" name="check_7">
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>68</red> <red>173</red>
<green>204</green> <green>127</green>
<blue>204</blue> <blue>168</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -1285,9 +1429,9 @@
<colorrole role="WindowText"> <colorrole role="WindowText">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>68</red> <red>173</red>
<green>204</green> <green>127</green>
<blue>204</blue> <blue>168</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -1305,52 +1449,18 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="text"> <property name="font">
<string>6 = Cyan</string> <font>
</property> <pointsize>13</pointsize>
</widget> <weight>75</weight>
</item> <bold>true</bold>
<item row="2" column="1"> </font>
<widget class="QLabel" name="label_28">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>180</red>
<green>0</green>
<blue>180</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>180</red>
<green>0</green>
<blue>180</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>120</red>
<green>120</green>
<blue>120</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property> </property>
<property name="text"> <property name="text">
<string>7 = Dk Magenta</string> <string>7</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@@ -1368,6 +1478,81 @@
<item> <item>
<widget class="QCustomPlot" name="graphView" native="true"/> <widget class="QCustomPlot" name="graphView" native="true"/>
</item> </item>
<item>
<layout class="QFormLayout" name="formLayout"/>
</item>
<item>
<widget class="QFrame" name="horizontalFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,0">
<item>
<widget class="QLabel" name="label_29">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Chart range</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="rangeValue">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>50</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QSlider" name="graphRangeSlider">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>500</number>
</property>
<property name="value">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>10</number>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>