mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-08-22 08:43:54 +08:00
cabana: reduce minimum size (#30223)
reduce minimumsize old-commit-hash: 818d29818fcb54f84e8fbb366fbe6913c70be2b9
This commit is contained in:
@@ -24,6 +24,7 @@ BinaryView::BinaryView(QWidget *parent) : QTableView(parent) {
|
|||||||
delegate = new BinaryItemDelegate(this);
|
delegate = new BinaryItemDelegate(this);
|
||||||
setItemDelegate(delegate);
|
setItemDelegate(delegate);
|
||||||
horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
|
horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
|
||||||
|
horizontalHeader()->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
|
||||||
verticalHeader()->setSectionsClickable(false);
|
verticalHeader()->setSectionsClickable(false);
|
||||||
verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
|
verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
|
||||||
verticalHeader()->setDefaultSectionSize(CELL_HEIGHT);
|
verticalHeader()->setDefaultSectionSize(CELL_HEIGHT);
|
||||||
|
|||||||
@@ -370,6 +370,10 @@ void ChartsWidget::doAutoScroll() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSize ChartsWidget::minimumSizeHint() const {
|
||||||
|
return QSize(CHART_MIN_WIDTH, QWidget::minimumSizeHint().height());
|
||||||
|
}
|
||||||
|
|
||||||
void ChartsWidget::resizeEvent(QResizeEvent *event) {
|
void ChartsWidget::resizeEvent(QResizeEvent *event) {
|
||||||
QWidget::resizeEvent(event);
|
QWidget::resizeEvent(event);
|
||||||
updateLayout();
|
updateLayout();
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ signals:
|
|||||||
void seriesChanged();
|
void seriesChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
QSize minimumSizeHint() const override;
|
||||||
void resizeEvent(QResizeEvent *event) override;
|
void resizeEvent(QResizeEvent *event) override;
|
||||||
bool event(QEvent *event) override;
|
bool event(QEvent *event) override;
|
||||||
void alignCharts();
|
void alignCharts();
|
||||||
|
|||||||
@@ -134,11 +134,13 @@ void DetailWidget::refresh() {
|
|||||||
for (auto s : binary_view->getOverlappingSignals()) {
|
for (auto s : binary_view->getOverlappingSignals()) {
|
||||||
warnings.push_back(tr("%1 has overlapping bits.").arg(s->name));
|
warnings.push_back(tr("%1 has overlapping bits.").arg(s->name));
|
||||||
}
|
}
|
||||||
name_label->setText(QString("%1 (%2)").arg(msgName(msg_id), msg->transmitter));
|
|
||||||
} else {
|
} else {
|
||||||
warnings.push_back(tr("Drag-Select in binary view to create new signal."));
|
warnings.push_back(tr("Drag-Select in binary view to create new signal."));
|
||||||
name_label->setText(msgName(msg_id));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString msg_name = msg ? QString("%1 (%2)").arg(msg->name, msg->transmitter) : msgName(msg_id);
|
||||||
|
name_label->setText(msg_name);
|
||||||
|
name_label->setToolTip(msg_name);
|
||||||
remove_btn->setEnabled(msg != nullptr);
|
remove_btn->setEnabled(msg != nullptr);
|
||||||
|
|
||||||
if (!warnings.isEmpty()) {
|
if (!warnings.isEmpty()) {
|
||||||
|
|||||||
@@ -39,13 +39,15 @@ VideoWidget::VideoWidget(QWidget *parent) : QFrame(parent) {
|
|||||||
group->setExclusive(true);
|
group->setExclusive(true);
|
||||||
|
|
||||||
QHBoxLayout *control_layout = new QHBoxLayout();
|
QHBoxLayout *control_layout = new QHBoxLayout();
|
||||||
play_btn = new QPushButton();
|
play_btn = new QToolButton();
|
||||||
play_btn->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
play_btn->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||||
control_layout->addWidget(play_btn);
|
control_layout->addWidget(play_btn);
|
||||||
if (can->liveStreaming()) {
|
if (can->liveStreaming()) {
|
||||||
control_layout->addWidget(skip_to_end_btn = new QPushButton(utils::icon("skip-end-fill"), {}));
|
control_layout->addWidget(skip_to_end_btn = new QToolButton(this));
|
||||||
|
skip_to_end_btn->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||||
|
skip_to_end_btn->setIcon(utils::icon("skip-end-fill"));
|
||||||
skip_to_end_btn->setToolTip(tr("Skip to the end"));
|
skip_to_end_btn->setToolTip(tr("Skip to the end"));
|
||||||
QObject::connect(skip_to_end_btn, &QPushButton::clicked, [group]() {
|
QObject::connect(skip_to_end_btn, &QToolButton::clicked, [group]() {
|
||||||
// set speed to 1.0
|
// set speed to 1.0
|
||||||
group->buttons()[2]->click();
|
group->buttons()[2]->click();
|
||||||
can->pause(false);
|
can->pause(false);
|
||||||
@@ -54,9 +56,11 @@ VideoWidget::VideoWidget(QWidget *parent) : QFrame(parent) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (float speed : {0.1, 0.5, 1., 2.}) {
|
for (float speed : {0.1, 0.5, 1., 2.}) {
|
||||||
QPushButton *btn = new QPushButton(QString("%1x").arg(speed), this);
|
QToolButton *btn = new QToolButton(this);
|
||||||
|
btn->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||||
|
btn->setText(QString("%1x").arg(speed));
|
||||||
btn->setCheckable(true);
|
btn->setCheckable(true);
|
||||||
QObject::connect(btn, &QPushButton::clicked, [speed]() { can->setSpeed(speed); });
|
QObject::connect(btn, &QToolButton::clicked, [speed]() { can->setSpeed(speed); });
|
||||||
control_layout->addWidget(btn);
|
control_layout->addWidget(btn);
|
||||||
group->addButton(btn);
|
group->addButton(btn);
|
||||||
if (speed == 1.0) btn->setChecked(true);
|
if (speed == 1.0) btn->setChecked(true);
|
||||||
@@ -64,7 +68,7 @@ VideoWidget::VideoWidget(QWidget *parent) : QFrame(parent) {
|
|||||||
main_layout->addLayout(control_layout);
|
main_layout->addLayout(control_layout);
|
||||||
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
|
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
|
||||||
|
|
||||||
QObject::connect(play_btn, &QPushButton::clicked, []() { can->pause(!can->isPaused()); });
|
QObject::connect(play_btn, &QToolButton::clicked, []() { can->pause(!can->isPaused()); });
|
||||||
QObject::connect(can, &AbstractStream::paused, this, &VideoWidget::updatePlayBtnState);
|
QObject::connect(can, &AbstractStream::paused, this, &VideoWidget::updatePlayBtnState);
|
||||||
QObject::connect(can, &AbstractStream::resume, this, &VideoWidget::updatePlayBtnState);
|
QObject::connect(can, &AbstractStream::resume, this, &VideoWidget::updatePlayBtnState);
|
||||||
QObject::connect(&settings, &Settings::changed, this, &VideoWidget::updatePlayBtnState);
|
QObject::connect(&settings, &Settings::changed, this, &VideoWidget::updatePlayBtnState);
|
||||||
|
|||||||
@@ -9,8 +9,8 @@
|
|||||||
|
|
||||||
#include <QFuture>
|
#include <QFuture>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QPushButton>
|
|
||||||
#include <QSlider>
|
#include <QSlider>
|
||||||
|
#include <QToolButton>
|
||||||
|
|
||||||
#include "selfdrive/ui/qt/widgets/cameraview.h"
|
#include "selfdrive/ui/qt/widgets/cameraview.h"
|
||||||
#include "tools/cabana/streams/abstractstream.h"
|
#include "tools/cabana/streams/abstractstream.h"
|
||||||
@@ -80,8 +80,8 @@ protected:
|
|||||||
double maximum_time = 0;
|
double maximum_time = 0;
|
||||||
QLabel *end_time_label;
|
QLabel *end_time_label;
|
||||||
QLabel *time_label;
|
QLabel *time_label;
|
||||||
QPushButton *play_btn;
|
QToolButton *play_btn;
|
||||||
QPushButton *skip_to_end_btn = nullptr;
|
QToolButton *skip_to_end_btn = nullptr;
|
||||||
InfoLabel *alert_label;
|
InfoLabel *alert_label;
|
||||||
Slider *slider;
|
Slider *slider;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user