sani7/qwt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix examples + playground

Browse Source
This commit is contained in:
Sander Speetjens
2025-04-05 13:40:07 +02:00
parent 254e7cd03e
commit 3dc0ec2929
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/stockchart/Plot.cpp
View File

@@ -58,8 +58,8 @@ namespace
class DateScaleDraw : public QwtDateScaleDraw class DateScaleDraw : public QwtDateScaleDraw
{ {
public: public:
DateScaleDraw( Qt::TimeSpec timeSpec ) DateScaleDraw( QTimeZone timeZone )
: QwtDateScaleDraw( timeSpec ) : QwtDateScaleDraw( timeZone )
{ {
// as we have dates from 2010 only we use // as we have dates from 2010 only we use
// format strings without the year // format strings without the year
@@ -98,8 +98,8 @@ namespace
void setInterval( const QDate& date1, const QDate& date2 ) void setInterval( const QDate& date1, const QDate& date2 )
{ {
const QDateTime dt1( date1, QTime(), Qt::UTC ); const QDateTime dt1( date1, QTime(), QTimeZone::UTC );
const QDateTime dt2( date2, QTime(), Qt::UTC ); const QDateTime dt2( date2, QTime(), QTimeZone::UTC );
QwtPlotZoneItem::setInterval( QwtDate::toDouble( dt1 ), QwtPlotZoneItem::setInterval( QwtDate::toDouble( dt1 ),
QwtDate::toDouble( dt2 ) ); QwtDate::toDouble( dt2 ) );
@@ -112,8 +112,8 @@ Plot::Plot( QWidget* parent )
{ {
setTitle( "Trading Chart" ); setTitle( "Trading Chart" );
QwtDateScaleDraw* scaleDraw = new DateScaleDraw( Qt::UTC ); QwtDateScaleDraw* scaleDraw = new DateScaleDraw( QTimeZone::UTC );
QwtDateScaleEngine* scaleEngine = new QwtDateScaleEngine( Qt::UTC ); QwtDateScaleEngine* scaleEngine = new QwtDateScaleEngine( QTimeZone::UTC );
setAxisTitle( QwtAxis::XBottom, QString( "2010" ) ); setAxisTitle( QwtAxis::XBottom, QString( "2010" ) );
setAxisScaleDraw( QwtAxis::XBottom, scaleDraw ); setAxisScaleDraw( QwtAxis::XBottom, scaleDraw );

2
examples/stockchart/QuoteFactory.cpp
View File

@@ -833,7 +833,7 @@ QVector< QwtOHLCSample > QuoteFactory::samples2010( Stock stock )
QVector< QwtOHLCSample > samples; QVector< QwtOHLCSample > samples;
samples.reserve( numSamples ); samples.reserve( numSamples );
QDateTime year2010( QDate( 2010, 1, 1 ), QTime( 0, 0 ), Qt::UTC ); QDateTime year2010( QDate( 2010, 1, 1 ), QTime( 0, 0 ), QTimeZone::UTC );
for ( int i = 0; i < numSamples; i++ ) for ( int i = 0; i < numSamples; i++ )
{ {

4
playground/timescale/MainWindow.cpp
View File

@@ -58,8 +58,8 @@ void MainWindow::updatePanel()
const QwtScaleDiv scaleDiv = m_plot->axisScaleDiv( QwtAxis::YLeft ); const QwtScaleDiv scaleDiv = m_plot->axisScaleDiv( QwtAxis::YLeft );
Settings settings = m_panel->settings(); Settings settings = m_panel->settings();
settings.startDateTime = QwtDate::toDateTime( scaleDiv.lowerBound(), Qt::LocalTime ); settings.startDateTime = QwtDate::toDateTime( scaleDiv.lowerBound(), QTimeZone::LocalTime );
settings.endDateTime = QwtDate::toDateTime( scaleDiv.upperBound(), Qt::LocalTime ); settings.endDateTime = QwtDate::toDateTime( scaleDiv.upperBound(), QTimeZone::LocalTime );
m_panel->setSettings( settings ); m_panel->setSettings( settings );
} }

10
playground/timescale/Plot.cpp
View File

@@ -23,9 +23,9 @@ Plot::Plot( QWidget* parent )
plotLayout()->setAlignCanvasToScales( true ); plotLayout()->setAlignCanvasToScales( true );
initAxis( QwtAxis::YLeft, "Local Time", Qt::LocalTime ); initAxis( QwtAxis::YLeft, "Local Time", QTimeZone::LocalTime );
initAxis( QwtAxis::YRight, initAxis( QwtAxis::YRight,
"Coordinated Universal Time ( UTC )", Qt::UTC ); "Coordinated Universal Time ( UTC )", QTimeZone::UTC );
QwtPlotPanner* panner = new QwtPlotPanner( canvas() ); QwtPlotPanner* panner = new QwtPlotPanner( canvas() );
QwtPlotMagnifier* magnifier = new QwtPlotMagnifier( canvas() ); QwtPlotMagnifier* magnifier = new QwtPlotMagnifier( canvas() );
@@ -51,12 +51,12 @@ Plot::Plot( QWidget* parent )
} }
void Plot::initAxis( int axis, void Plot::initAxis( int axis,
const QString& title, Qt::TimeSpec timeSpec ) const QString& title, QTimeZone timeZone )
{ {
setAxisTitle( axis, title ); setAxisTitle( axis, title );
QwtDateScaleDraw* scaleDraw = new QwtDateScaleDraw( timeSpec ); QwtDateScaleDraw* scaleDraw = new QwtDateScaleDraw( timeZone );
QwtDateScaleEngine* scaleEngine = new QwtDateScaleEngine( timeSpec ); QwtDateScaleEngine* scaleEngine = new QwtDateScaleEngine( timeZone );
#if 0 #if 0
if ( timeSpec == Qt::LocalTime ) if ( timeSpec == Qt::LocalTime )

3
playground/timescale/Plot.h
View File

@@ -6,6 +6,7 @@
#pragma once #pragma once
#include <QwtPlot> #include <QwtPlot>
#include <QTimeZone>
class Settings; class Settings;
@@ -20,6 +21,6 @@ class Plot : public QwtPlot
void applySettings( const Settings& ); void applySettings( const Settings& );
private: private:
void initAxis( int axis, const QString& title, Qt::TimeSpec ); void initAxis( int axis, const QString& title, QTimeZone );
void applyAxisSettings( int axis, const Settings& ); void applyAxisSettings( int axis, const Settings& );
}; };