@ -2,12 +2,13 @@
# include <QFutureSynchronizer> # include <QFutureSynchronizer>
# include <QGraphicsLayout> # include <QGraphicsLayout>
# include <QGridLayout>
# include <QRubberBand> # include <QRubberBand>
# include <QTimer> # include <QTimer>
# include <QToolButton>
# include <QtCharts/QLineSeries> # include <QtCharts/QLineSeries>
# include <QtCharts/QValueAxis> # include <QtCharts/QValueAxis>
# include <QtConcurrent> # include <QtConcurrent>
# include <QToolBar>
// ChartsWidget
// ChartsWidget
@ -15,41 +16,24 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) {
QVBoxLayout * main_layout = new QVBoxLayout ( this ) ; QVBoxLayout * main_layout = new QVBoxLayout ( this ) ;
main_layout - > setContentsMargins ( 0 , 0 , 0 , 0 ) ; main_layout - > setContentsMargins ( 0 , 0 , 0 , 0 ) ;
// title bar
// toolbar
title_bar = new QWidget ( this ) ; QToolBar * toolbar = new QToolBar ( tr ( " Charts " ) , this ) ;
title_bar - > setVisible ( false ) ; title_label = new QLabel ( ) ;
QHBoxLayout * title_layout = new QHBoxLayout ( title_bar ) ; title_label - > setSizePolicy ( QSizePolicy : : Expanding , QSizePolicy : : Preferred ) ;
title_layout - > setContentsMargins ( 0 , 0 , 0 , 0 ) ; toolbar - > addWidget ( title_label ) ;
title_label = new QLabel ( tr ( " Charts " ) ) ; toolbar - > addWidget ( range_label = new QLabel ( ) ) ;
reset_zoom_btn = toolbar - > addAction ( " ⟲ " ) ;
title_layout - > addWidget ( title_label ) ;
title_layout - > addStretch ( ) ;
range_label = new QLabel ( ) ;
title_layout - > addWidget ( range_label ) ;
reset_zoom_btn = new QPushButton ( " ⟲ " , this ) ;
reset_zoom_btn - > setFixedSize ( 30 , 30 ) ;
reset_zoom_btn - > setToolTip ( tr ( " Reset zoom (drag on chart to zoom X-Axis) " ) ) ; reset_zoom_btn - > setToolTip ( tr ( " Reset zoom (drag on chart to zoom X-Axis) " ) ) ;
title_layout - > addWidget ( reset_zoom_btn ) ; remove_all_btn = toolbar - > addAction ( " ✖ " ) ;
remove_all_btn = new QPushButton ( " ✖ " , this ) ;
remove_all_btn - > setToolTip ( tr ( " Remove all charts " ) ) ; remove_all_btn - > setToolTip ( tr ( " Remove all charts " ) ) ;
remove_all_btn - > setFixedSize ( 30 , 30 ) ; dock_btn = toolbar - > addAction ( " " ) ;
title_layout - > addWidget ( remove_all_btn ) ; main_layout - > addWidget ( toolbar ) ;
updateToolBar ( ) ;
dock_btn = new QPushButton ( ) ;
dock_btn - > setFixedSize ( 30 , 30 ) ;
title_layout - > addWidget ( dock_btn ) ;
main_layout - > addWidget ( title_bar , 0 , Qt : : AlignTop ) ;
// charts
// charts
QWidget * charts_container = new QWidget ( this ) ; QWidget * charts_container = new QWidget ( this ) ;
QVBoxLayout * charts_main = new QVBoxLayout ( charts_container ) ; charts_layout = new QVBoxLayout ( charts_container ) ;
charts_layout = new QVBoxLayout ( ) ; charts_layout - > addStretch ( ) ;
charts_main - > addLayout ( charts_layout ) ;
charts_main - > addStretch ( ) ;
QScrollArea * charts_scroll = new QScrollArea ( this ) ; QScrollArea * charts_scroll = new QScrollArea ( this ) ;
charts_scroll - > setWidgetResizable ( true ) ; charts_scroll - > setWidgetResizable ( true ) ;
@ -61,19 +45,23 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) {
QObject : : connect ( dbc ( ) , & DBCManager : : DBCFileChanged , [ this ] ( ) { removeAll ( nullptr ) ; } ) ; QObject : : connect ( dbc ( ) , & DBCManager : : DBCFileChanged , [ this ] ( ) { removeAll ( nullptr ) ; } ) ;
QObject : : connect ( dbc ( ) , & DBCManager : : signalRemoved , this , & ChartsWidget : : removeAll ) ; QObject : : connect ( dbc ( ) , & DBCManager : : signalRemoved , this , & ChartsWidget : : removeAll ) ;
QObject : : connect ( dbc ( ) , & DBCManager : : signalUpdated , this , & ChartsWidget : : signalUpdated ) ; QObject : : connect ( dbc ( ) , & DBCManager : : signalUpdated , this , & ChartsWidget : : signalUpdated ) ;
QObject : : connect ( dbc ( ) , & DBCManager : : msgUpdated , [ this ] ( const QString & msg_id ) { QObject : : connect ( dbc ( ) , & DBCManager : : msgRemoved , [ this ] ( uint32_t address ) {
for ( auto c : charts . toVector ( ) )
if ( DBCManager : : parseId ( c - > id ) . second = = address ) removeChart ( c ) ;
} ) ;
QObject : : connect ( dbc ( ) , & DBCManager : : msgUpdated , [ this ] ( uint32_t address ) {
for ( auto c : charts ) { for ( auto c : charts ) {
if ( c - > id = = msg_id ) c - > updateTitle ( ) ; if ( DBCManager : : parseId ( c - > id ) . second = = address ) c - > updateTitle ( ) ;
} }
} ) ; } ) ;
QObject : : connect ( can , & CANMessages : : eventsMerged , this , & ChartsWidget : : eventsMerged ) ; QObject : : connect ( can , & CANMessages : : eventsMerged , this , & ChartsWidget : : eventsMerged ) ;
QObject : : connect ( can , & CANMessages : : updated , this , & ChartsWidget : : updateState ) ; QObject : : connect ( can , & CANMessages : : updated , this , & ChartsWidget : : updateState ) ;
QObject : : connect ( remove_all_btn , & QPushButton : : click ed , [ this ] ( ) { removeAll ( ) ; } ) ; QObject : : connect ( remove_all_btn , & QAction : : trigger ed , [ this ] ( ) { removeAll ( ) ; } ) ;
QObject : : connect ( reset_zoom_btn , & QPushButton : : click ed , this , & ChartsWidget : : zoomReset ) ; QObject : : connect ( reset_zoom_btn , & QAction : : trigger ed , this , & ChartsWidget : : zoomReset ) ;
QObject : : connect ( dock_btn , & QPushButton : : click ed , [ this ] ( ) { QObject : : connect ( dock_btn , & QAction : : trigger ed , [ this ] ( ) {
emit dock ( ! docking ) ; emit dock ( ! docking ) ;
docking = ! docking ; docking = ! docking ;
updateTitle Bar ( ) ; updateTool Bar ( ) ;
} ) ; } ) ;
} }
@ -92,7 +80,7 @@ void ChartsWidget::eventsMerged() {
void ChartsWidget : : zoomIn ( double min , double max ) { void ChartsWidget : : zoomIn ( double min , double max ) {
zoomed_range = { min , max } ; zoomed_range = { min , max } ;
is_zoomed = zoomed_range ! = display_range ; is_zoomed = zoomed_range ! = display_range ;
updateTitle Bar ( ) ; updateTool Bar ( ) ;
emit rangeChanged ( min , max , is_zoomed ) ; emit rangeChanged ( min , max , is_zoomed ) ;
updateState ( ) ; updateState ( ) ;
} }
@ -120,27 +108,22 @@ void ChartsWidget::updateState() {
if ( prev_range ! = display_range ) { if ( prev_range ! = display_range ) {
QFutureSynchronizer < void > future_synchronizer ; QFutureSynchronizer < void > future_synchronizer ;
for ( auto c : charts ) for ( auto c : charts )
future_synchronizer . addFuture ( QtConcurrent : : run ( c - > chart_view , & ChartView : : updateSeries , display_range ) ) ; future_synchronizer . addFuture ( QtConcurrent : : run ( c , & ChartView : : updateSeries , display_range ) ) ;
} }
} }
const auto & range = is_zoomed ? zoomed_range : display_range ; const auto & range = is_zoomed ? zoomed_range : display_range ;
for ( auto c : charts ) { for ( auto c : charts ) {
c - > chart_view - > setRange ( range . first , range . second ) ; c - > setRange ( range . first , range . second ) ;
c - > chart_view - > updateLineMarker ( current_sec ) ; c - > updateLineMarker ( current_sec ) ;
} }
} }
void ChartsWidget : : updateTitleBar ( ) { void ChartsWidget : : updateToolBar ( ) {
title_bar - > setVisible ( ! charts . isEmpty ( ) ) ; remove_all_btn - > setEnabled ( ! charts . isEmpty ( ) ) ;
if ( charts . isEmpty ( ) ) return ;
range_label - > setVisible ( is_zoomed ) ;
reset_zoom_btn - > setEnabled ( is_zoomed ) ; reset_zoom_btn - > setEnabled ( is_zoomed ) ;
if ( is_zoomed ) { range_label - > setText ( is_zoomed ? tr ( " %1 - %2 " ) . arg ( zoomed_range . first , 0 , ' f ' , 2 ) . arg ( zoomed_range . second , 0 , ' f ' , 2 ) : " " ) ;
range_label - > setText ( tr ( " %1 - %2 " ) . arg ( zoomed_range . first , 0 , ' f ' , 2 ) . arg ( zoomed_range . second , 0 , ' f ' , 2 ) ) ; title_label - > setText ( charts . size ( ) > 0 ? tr ( " Charts (%1) " ) . arg ( charts . size ( ) ) : tr ( " Charts " ) ) ;
}
title_label - > setText ( tr ( " Charts (%1) " ) . arg ( charts . size ( ) ) ) ;
dock_btn - > setText ( docking ? " ⬈ " : " ⬋ " ) ; dock_btn - > setText ( docking ? " ⬈ " : " ⬋ " ) ;
dock_btn - > setToolTip ( docking ? tr ( " Undock charts " ) : tr ( " Dock charts " ) ) ; dock_btn - > setToolTip ( docking ? tr ( " Undock charts " ) : tr ( " Dock charts " ) ) ;
} }
@ -150,17 +133,17 @@ void ChartsWidget::showChart(const QString &id, const Signal *sig, bool show) {
if ( it ! = charts . end ( ) ) { if ( it ! = charts . end ( ) ) {
if ( ! show ) removeChart ( ( * it ) ) ; if ( ! show ) removeChart ( ( * it ) ) ;
} else if ( show ) { } else if ( show ) {
auto chart = new ChartWidget ( id , sig , this ) ; auto chart = new ChartView ( id , sig , this ) ;
chart - > chart_view - > updateSeries ( display_range ) ; chart - > updateSeries ( display_range ) ;
QObject : : connect ( chart , & ChartWidget : : remove , [ = ] ( ) { removeChart ( chart ) ; } ) ; QObject : : connect ( chart , & ChartView : : remove , [ = ] ( ) { removeChart ( chart ) ; } ) ;
QObject : : connect ( chart - > chart_view , & ChartView : : zoomIn , this , & ChartsWidget : : zoomIn ) ; QObject : : connect ( chart , & ChartView : : zoomIn , this , & ChartsWidget : : zoomIn ) ;
QObject : : connect ( chart - > chart_view , & ChartView : : zoomReset , this , & ChartsWidget : : zoomReset ) ; QObject : : connect ( chart , & ChartView : : zoomReset , this , & ChartsWidget : : zoomReset ) ;
charts_layout - > insertWidget ( 0 , chart ) ; charts_layout - > insertWidget ( 0 , chart ) ;
charts . push_back ( chart ) ; charts . push_back ( chart ) ;
emit chartOpened ( chart - > id , chart - > signal ) ; emit chartOpened ( chart - > id , chart - > signal ) ;
updateState ( ) ; updateState ( ) ;
} }
updateTitle Bar ( ) ; updateTool Bar ( ) ;
} }
bool ChartsWidget : : isChartOpened ( const QString & id , const Signal * sig ) { bool ChartsWidget : : isChartOpened ( const QString & id , const Signal * sig ) {
@ -168,92 +151,36 @@ bool ChartsWidget::isChartOpened(const QString &id, const Signal *sig) {
return it ! = charts . end ( ) ; return it ! = charts . end ( ) ;
} }
void ChartsWidget : : removeChart ( ChartWidget * chart ) { void ChartsWidget : : removeChart ( ChartView * chart ) {
charts . removeOne ( chart ) ; charts . removeOne ( chart ) ;
chart - > deleteLater ( ) ; chart - > deleteLater ( ) ;
updateTitle Bar ( ) ; updateTool Bar ( ) ;
emit chartClosed ( chart - > id , chart - > signal ) ; emit chartClosed ( chart - > id , chart - > signal ) ;
} }
void ChartsWidget : : removeAll ( const Signal * sig ) { void ChartsWidget : : removeAll ( const Signal * sig ) {
QMutableListIterator < ChartWidget * > it ( charts ) ; for ( auto c : charts . toVector ( ) )
while ( it . hasNext ( ) ) { if ( ! sig | | c - > signal = = sig ) removeChart ( c ) ;
auto c = it . next ( ) ;
if ( sig = = nullptr | | c - > signal = = sig ) {
c - > deleteLater ( ) ;
emit chartClosed ( c - > id , c - > signal ) ;
it . remove ( ) ;
}
}
updateTitleBar ( ) ;
} }
void ChartsWidget : : signalUpdated ( const Signal * sig ) { void ChartsWidget : : signalUpdated ( const Signal * sig ) {
for ( auto c : charts ) { for ( auto c : charts ) {
if ( c - > signal = = sig ) { if ( c - > signal = = sig ) {
c - > updateTitle ( ) ; c - > updateTitle ( ) ;
c - > chart_view - > updateSeries ( display_range ) ; c - > updateSeries ( display_range ) ;
c - > chart_view - > setRange ( display_range . first , display_range . second , true ) ; c - > setRange ( display_range . first , display_range . second , true ) ;
} }
} }
} }
bool ChartsWidget : : eventFilter ( QObject * obj , QEvent * event ) { bool ChartsWidget : : eventFilter ( QObject * obj , QEvent * event ) {
if ( obj ! = this & & event - > type ( ) = = QEvent : : Close ) { if ( obj ! = this & & event - > type ( ) = = QEvent : : Close ) {
emit dock_btn - > click ed( ) ; emit dock_btn - > trigger ed( ) ;
return true ; return true ;
} }
return false ; return false ;
} }
// ChartWidget
ChartWidget : : ChartWidget ( const QString & id , const Signal * sig , QWidget * parent ) : id ( id ) , signal ( sig ) , QWidget ( parent ) {
QVBoxLayout * main_layout = new QVBoxLayout ( this ) ;
main_layout - > setSpacing ( 0 ) ;
main_layout - > setContentsMargins ( 0 , 0 , 0 , 0 ) ;
header = new QWidget ( this ) ;
QGridLayout * header_layout = new QGridLayout ( header ) ;
header_layout - > setContentsMargins ( 11 , 11 , 11 , 0 ) ;
msg_name_label = new QLabel ( this ) ;
msg_name_label - > setTextFormat ( Qt : : RichText ) ;
header_layout - > addWidget ( msg_name_label , 0 , 0 , Qt : : AlignLeft ) ;
sig_name_label = new QLabel ( this ) ;
header_layout - > addWidget ( sig_name_label , 0 , 1 , Qt : : AlignCenter ) ; //, 0, Qt::AlignCenter);
remove_btn = new QPushButton ( " ✖ " , this ) ;
remove_btn - > setFixedSize ( 20 , 20 ) ;
remove_btn - > setToolTip ( tr ( " Remove chart " ) ) ;
header_layout - > addWidget ( remove_btn , 0 , 2 , Qt : : AlignRight ) ;
main_layout - > addWidget ( header ) ;
chart_view = new ChartView ( id , sig , this ) ;
main_layout - > addWidget ( chart_view ) ;
main_layout - > addStretch ( ) ;
setSizePolicy ( QSizePolicy : : Expanding , QSizePolicy : : Fixed ) ;
updateTitle ( ) ;
updateFromSettings ( ) ;
QObject : : connect ( remove_btn , & QPushButton : : clicked , [ = ] ( ) { emit remove ( id , sig ) ; } ) ;
QObject : : connect ( & settings , & Settings : : changed , this , & ChartWidget : : updateFromSettings ) ;
}
void ChartWidget : : updateTitle ( ) {
msg_name_label - > setText ( tr ( " %1 <font color= \" gray \" >%2</font> " ) . arg ( dbc ( ) - > msg ( id ) - > name . c_str ( ) ) . arg ( id ) ) ;
sig_name_label - > setText ( signal - > name . c_str ( ) ) ;
}
void ChartWidget : : updateFromSettings ( ) {
header - > setStyleSheet ( settings . chart_theme = = 0 ? " background-color:white " : " background-color:#23242c " ) ;
QString color_style = settings . chart_theme = = 0 ? " color:black " : " color:white " ;
sig_name_label - > setStyleSheet ( " font-weight:bold; " + color_style ) ;
msg_name_label - > setStyleSheet ( color_style ) ;
remove_btn - > setStyleSheet ( color_style ) ;
chart_view - > updateFromSettings ( ) ;
}
// ChartView
// ChartView
ChartView : : ChartView ( const QString & id , const Signal * sig , QWidget * parent ) ChartView : : ChartView ( const QString & id , const Signal * sig , QWidget * parent )
@ -264,45 +191,64 @@ ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent)
chart - > addSeries ( series ) ; chart - > addSeries ( series ) ;
chart - > createDefaultAxes ( ) ; chart - > createDefaultAxes ( ) ;
chart - > legend ( ) - > hide ( ) ; chart - > legend ( ) - > hide ( ) ;
chart - > setMargins ( { 0 , 0 , 0 , 0 } ) ;
chart - > layout ( ) - > setContentsMargins ( 0 , 0 , 0 , 0 ) ; chart - > layout ( ) - > setContentsMargins ( 0 , 0 , 0 , 0 ) ;
line_marker = new QGraphicsLineItem ( chart ) ;
line_marker - > setZValue ( chart - > zValue ( ) + 10 ) ;
track_line = new QGraphicsLineItem ( chart ) ; track_line = new QGraphicsLineItem ( chart ) ;
track_line - > setZValue ( chart - > zValue ( ) + 10 ) ;
track_line - > setPen ( QPen ( Qt : : darkGray , 1 , Qt : : DashLine ) ) ; track_line - > setPen ( QPen ( Qt : : darkGray , 1 , Qt : : DashLine ) ) ;
track_ellipse = new QGraphicsEllipseItem ( chart ) ; track_ellipse = new QGraphicsEllipseItem ( chart ) ;
track_ellipse - > setZValue ( chart - > zValue ( ) + 10 ) ;
track_ellipse - > setBrush ( Qt : : darkGray ) ; track_ellipse - > setBrush ( Qt : : darkGray ) ;
value_text = new QGraphicsTextItem ( chart ) ; value_text = new QGraphicsTextItem ( chart ) ;
value_text - > setZValue ( chart - > zValue ( ) + 10 ) ; item_group = scene ( ) - > createItemGroup ( { track_line , track_ellipse , value_text } ) ;
line_marker = new QGraphicsLineItem ( chart ) ; item_group - > setZValue ( chart - > zValue ( ) + 10 ) ;
line_marker - > setZValue ( chart - > zValue ( ) + 10 ) ;
// title
msg_title = new QGraphicsTextItem ( chart ) ;
QToolButton * remove_btn = new QToolButton ( ) ;
remove_btn - > setText ( " X " ) ;
remove_btn - > setAutoRaise ( true ) ;
remove_btn - > setToolTip ( tr ( " Remove Chart " ) ) ;
close_btn_proxy = new QGraphicsProxyWidget ( chart ) ;
close_btn_proxy - > setWidget ( remove_btn ) ;
setChart ( chart ) ; setChart ( chart ) ;
setRenderHint ( QPainter : : Antialiasing ) ; setRenderHint ( QPainter : : Antialiasing ) ;
setRubberBand ( QChartView : : HorizontalRubberBand ) ; setRubberBand ( QChartView : : HorizontalRubberBand ) ;
if ( auto rubber = findChild < QRubberBand * > ( ) ) { updateFromSettings ( ) ;
QPalette pal ; updateTitle ( ) ;
pal . setBrush ( QPalette : : Base , QColor ( 0 , 0 , 0 , 80 ) ) ;
rubber - > setPalette ( pal ) ;
}
QTimer * timer = new QTimer ( this ) ; QTimer * timer = new QTimer ( this ) ;
timer - > setInterval ( 100 ) ; timer - > setInterval ( 100 ) ;
timer - > setSingleShot ( true ) ; timer - > setSingleShot ( true ) ;
timer - > callOnTimeout ( this , & ChartView : : adjustChartMargins ) ; timer - > callOnTimeout ( this , & ChartView : : adjustChartMargins ) ;
QObject : : connect ( & settings , & Settings : : changed , this , & ChartView : : updateFromSettings ) ;
QObject : : connect ( remove_btn , & QToolButton : : clicked , [ = ] ( ) { emit remove ( id , sig ) ; } ) ;
QObject : : connect ( chart , & QChart : : plotAreaChanged , [ = ] ( const QRectF & plotArea ) { QObject : : connect ( chart , & QChart : : plotAreaChanged , [ = ] ( const QRectF & plotArea ) {
// use a singleshot timer to avoid recursion call.
// use a singleshot timer to avoid recursion call.
timer - > start ( ) ; timer - > start ( ) ;
} ) ; } ) ;
} }
void ChartView : : resizeEvent ( QResizeEvent * event ) {
QChartView : : resizeEvent ( event ) ;
msg_title - > setPos ( 11 , 6 ) ;
close_btn_proxy - > setPos ( event - > size ( ) . width ( ) - close_btn_proxy - > size ( ) . width ( ) - 11 , 8 ) ;
}
void ChartView : : updateTitle ( ) {
chart ( ) - > setTitle ( signal - > name . c_str ( ) ) ;
msg_title - > setHtml ( tr ( " %1 <font color= \" gray \" >%2</font> " ) . arg ( dbc ( ) - > msg ( id ) - > name . c_str ( ) ) . arg ( id ) ) ;
}
void ChartView : : updateFromSettings ( ) { void ChartView : : updateFromSettings ( ) {
setFixedHeight ( settings . chart_height ) ; setFixedHeight ( settings . chart_height ) ;
chart ( ) - > setTheme ( settings . chart_theme = = 0 ? QChart : : ChartThemeLight : QChart : : QChart : : ChartThemeDark ) ; chart ( ) - > setTheme ( settings . chart_theme = = 0 ? QChart : : ChartThemeLight : QChart : : QChart : : ChartThemeDark ) ;
line_marker - > setPen ( QPen ( settings . chart_theme = = 0 ? Qt : : black : Qt : : white , 2 ) ) ; auto color = chart ( ) - > titleBrush ( ) . color ( ) ;
line_marker - > setPen ( QPen ( color , 2 ) ) ;
msg_title - > setDefaultTextColor ( color ) ;
} }
void ChartView : : setRange ( double min , double max , bool force_update ) { void ChartView : : setRange ( double min , double max , bool force_update ) {
@ -318,7 +264,7 @@ void ChartView::adjustChartMargins() {
const int aligned_pos = 60 ; const int aligned_pos = 60 ;
if ( chart ( ) - > plotArea ( ) . left ( ) ! = aligned_pos ) { if ( chart ( ) - > plotArea ( ) . left ( ) ! = aligned_pos ) {
const float left_margin = chart ( ) - > margins ( ) . left ( ) + aligned_pos - chart ( ) - > plotArea ( ) . left ( ) ; const float left_margin = chart ( ) - > margins ( ) . left ( ) + aligned_pos - chart ( ) - > plotArea ( ) . left ( ) ;
chart ( ) - > setMargins ( QMargins ( left_margin , 0 , 0 , 0 ) ) ; chart ( ) - > setMargins ( QMargins ( left_margin , 11 , 0 , 0 ) ) ;
} }
} }
@ -327,7 +273,7 @@ void ChartView::updateLineMarker(double current_sec) {
int x = chart ( ) - > plotArea ( ) . left ( ) + int x = chart ( ) - > plotArea ( ) . left ( ) +
chart ( ) - > plotArea ( ) . width ( ) * ( current_sec - axis_x - > min ( ) ) / ( axis_x - > max ( ) - axis_x - > min ( ) ) ; chart ( ) - > plotArea ( ) . width ( ) * ( current_sec - axis_x - > min ( ) ) / ( axis_x - > max ( ) - axis_x - > min ( ) ) ;
if ( int ( line_marker - > line ( ) . x1 ( ) ) ! = x ) { if ( int ( line_marker - > line ( ) . x1 ( ) ) ! = x ) {
line_marker - > setLine ( x , 0 , x , height ( ) ) ; line_marker - > setLine ( x , chart ( ) - > plotArea ( ) . top ( ) - chart ( ) - > margins ( ) . top ( ) + 3 , x , height ( ) ) ;
} }
} }
@ -335,12 +281,9 @@ void ChartView::updateSeries(const std::pair<double, double> range) {
auto events = can - > events ( ) ; auto events = can - > events ( ) ;
if ( ! events ) return ; if ( ! events ) return ;
auto l = id . split ( ' : ' ) ;
int bus = l [ 0 ] . toInt ( ) ;
uint32_t address = l [ 1 ] . toUInt ( nullptr , 16 ) ;
vals . clear ( ) ; vals . clear ( ) ;
vals . reserve ( ( range . second - range . first ) * 1000 ) ; // [n]seconds * 1000hz
vals . reserve ( ( range . second - range . first ) * 1000 ) ; // [n]seconds * 1000hz
auto [ bus , address ] = DBCManager : : parseId ( id ) ;
double route_start_time = can - > routeStartTime ( ) ; double route_start_time = can - > routeStartTime ( ) ;
Event begin_event ( cereal : : Event : : Which : : INIT_DATA , ( route_start_time + range . first ) * 1e9 ) ; Event begin_event ( cereal : : Event : : Which : : INIT_DATA , ( route_start_time + range . first ) * 1e9 ) ;
auto begin = std : : lower_bound ( events - > begin ( ) , events - > end ( ) , & begin_event , Event : : lessThan ( ) ) ; auto begin = std : : lower_bound ( events - > begin ( ) , events - > end ( ) , & begin_event , Event : : lessThan ( ) ) ;
@ -380,17 +323,8 @@ void ChartView::updateAxisY() {
} }
} }
void ChartView : : enterEvent ( QEvent * event ) {
track_line - > setVisible ( true ) ;
value_text - > setVisible ( true ) ;
track_ellipse - > setVisible ( true ) ;
QChartView : : enterEvent ( event ) ;
}
void ChartView : : leaveEvent ( QEvent * event ) { void ChartView : : leaveEvent ( QEvent * event ) {
track_line - > setVisible ( false ) ; item_group - > setVisible ( false ) ;
value_text - > setVisible ( false ) ;
track_ellipse - > setVisible ( false ) ;
QChartView : : leaveEvent ( event ) ; QChartView : : leaveEvent ( event ) ;
} }
@ -427,7 +361,7 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) {
if ( ! is_zooming ) { if ( ! is_zooming ) {
const auto plot_area = chart ( ) - > plotArea ( ) ; const auto plot_area = chart ( ) - > plotArea ( ) ;
auto axis_x = dynamic_cast < QValueAxis * > ( chart ( ) - > axisX ( ) ) ; auto axis_x = dynamic_cast < QValueAxis * > ( chart ( ) - > axisX ( ) ) ;
double x = std : : clamp ( ( double ) ev - > pos ( ) . x ( ) , plot_area . left ( ) , plot_area . right ( ) - 1 ) ; double x = std : : clamp ( ( double ) ev - > pos ( ) . x ( ) , plot_area . left ( ) , plot_area . right ( ) - 1 ) ;
double sec = axis_x - > min ( ) + ( axis_x - > max ( ) - axis_x - > min ( ) ) * ( x - plot_area . left ( ) ) / plot_area . width ( ) ; double sec = axis_x - > min ( ) + ( axis_x - > max ( ) - axis_x - > min ( ) ) * ( x - plot_area . left ( ) ) / plot_area . width ( ) ;
auto value = std : : upper_bound ( vals . begin ( ) , vals . end ( ) , sec , [ ] ( double x , auto & p ) { return x < p . x ( ) ; } ) ; auto value = std : : upper_bound ( vals . begin ( ) , vals . end ( ) , sec , [ ] ( double x , auto & p ) { return x < p . x ( ) ; } ) ;
if ( value ! = vals . end ( ) ) { if ( value ! = vals . end ( ) ) {
@ -442,9 +376,7 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) {
} }
value_text - > setPos ( text_x , pos . y ( ) - 10 ) ; value_text - > setPos ( text_x , pos . y ( ) - 10 ) ;
} }
track_line - > setVisible ( value ! = vals . end ( ) ) ; item_group - > setVisible ( value ! = vals . end ( ) ) ;
value_text - > setVisible ( value ! = vals . end ( ) ) ;
track_ellipse - > setVisible ( value ! = vals . end ( ) ) ;
} else { } else {
setViewportUpdateMode ( QGraphicsView : : FullViewportUpdate ) ; setViewportUpdateMode ( QGraphicsView : : FullViewportUpdate ) ;
} }
royjr
3 years ago