pull/27806/head
Justin Newberry 2 years ago
parent 46bcb06e63
commit 69d7ce1350
  1. 14
      settings
  2. 19
      tools/cabana/tools/search.cc
  3. 1
      tools/cabana/tools/search.h

@ -0,0 +1,14 @@
[General]
chart_column_count=1
chart_height=200
chart_range=905
chart_series_type=0
fps=10
geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\a\x80\0\0\0\x17\0\0\x11\x7f\0\0\x5o\0\0\a\x80\0\0\0\x17\0\0\x11\x7f\0\0\x5o\0\0\0\0\0\0\0\0\x19\0\0\0\a\x80\0\0\0\x17\0\0\x11\x7f\0\0\x5o)
last_dir=/home/justin/openpilot/opendbc
last_route_dir=/home/justin
max_cached_minutes=30
message_header_state=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xf4\0\0\0\x6\0\x1\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x84\0\0\0\0\0\0\0\x6\0\0\0\x96\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64)
recent_files=/home/justin/openpilot/opendbc/subaru_global_2017_generated.dbc, /home/justin/openpilot/opendbc/chrysler_ram_dt_generated.dbc
video_splitter_state=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x1\x44\0\0\x3\xd4\x1\xff\xff\xff\xff\x1\0\0\0\x2\0)
window_state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\x1\x93\0\0\x5/\xfc\x2\0\0\0\x1\xfb\0\0\0\x1a\0M\0\x65\0s\0s\0\x61\0g\0\x65\0s\0P\0\x61\0n\0\x65\0l\x1\0\0\0\x14\0\0\x5/\0\0\0\x93\0\xff\xff\xff\0\0\0\x1\0\0\x5\x46\0\0\x5/\xfc\x2\0\0\0\x1\xfb\0\0\0\x14\0V\0i\0\x64\0\x65\0o\0P\0\x61\0n\0\x65\0l\x1\0\0\0\x14\0\0\x5/\0\0\x1-\0\xff\xff\xff\0\0\x3\x1f\0\0\x5/\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)

@ -92,6 +92,9 @@ SearchDlg::SearchDlg(QWidget *parent) : QDialog(parent) {
main_layout->addLayout(search_results_layout); main_layout->addLayout(search_results_layout);
update(); update();
QObject::connect(can, &AbstractStream::received, this, &SearchDlg::updateRowData);
QObject::connect(can, &AbstractStream::seekedTo, this, &SearchDlg::updateRowData);
} }
void SearchDlg::setRowData(int row, QString msgID, QString bitRange, QString currentValue, QString previousValue){ void SearchDlg::setRowData(int row, QString msgID, QString bitRange, QString currentValue, QString previousValue){
@ -110,14 +113,18 @@ void SearchDlg::setRowData(int row, QString msgID, QString bitRange, QString cur
void SearchDlg::updateRowData(){ void SearchDlg::updateRowData(){
data_table->clear(); data_table->clear();
data_table->setRowCount(filteredSignals.size() + 1); data_table->setRowCount(0);
setRowData(0, QString("Message ID"), QString("Bit Range"), QString("Current Value"), QString("Previous Value")); if(filteredSignals.size() < 1000){
data_table->setRowCount(filteredSignals.size() + 1);
int row=1; setRowData(0, QString("Message ID"), QString("Bit Range"), QString("Current Value"), QString("Previous Value"));
for(auto &sig : filteredSignals){
setRowData(row, sig.messageID.toString(), QString("%1:%2").arg(sig.offset).arg(sig.offset+sig.size), QString::number(sig.getValue()), QString::number(sig.previousValue)); int row=1;
row++; for(auto &sig : filteredSignals){
setRowData(row, sig.messageID.toString(), QString("%1:%2").arg(sig.offset).arg(sig.offset+sig.size), QString::number(sig.getValue()), QString::number(sig.previousValue));
row++;
}
} }
} }

@ -165,6 +165,7 @@ private:
void undoScan(); void undoScan();
void update(); void update();
void updateRowData();
void setRowData(int row, QString msgID, QString bitRange, QString currentValue, QString previousValue); void setRowData(int row, QString msgID, QString bitRange, QString currentValue, QString previousValue);
std::vector<ScanType> enabledScanTypes(); std::vector<ScanType> enabledScanTypes();

Loading…
Cancel
Save