HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r715:f8597835a464

Add build stamp and git head support for debug

Michal Klocek -

r715:f8597835a464

parent child

Context file:

r715:f8597835a464

Collapse all files

src/chartbackground.cpp +15 -1

             #include "chartbackground_p.h"
+            #include "qchartversion_p.h"
             #include <QPen>
             #include <QBrush>
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartBackground::ChartBackground(QGraphicsItem* parent):QGraphicsRectItem(parent),
             m_diameter(15)
             {
+            #ifndef QT_NO_DEBUG
+                qDebug()<<"buildTime" <<buildTime;
+                qDebug()<<"gitHead" << gitHead;
+            #endif
             }
             ChartBackground::~ChartBackground()
             {
             }
             void ChartBackground::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                Q_UNUSED(option);
                Q_UNUSED(widget);
+               painter->save();
                painter->setPen(pen());
                painter->setBrush(brush());
                painter->drawRoundRect(rect(),roundness(rect().width()),roundness(rect().height()));
+            #ifndef QT_NO_DEBUG
+               painter->setPen(Qt::black);
+               QFont font;
+               QString build("build %1");
+               font.setPointSize(6);
+               painter->setFont(font);
+               painter->drawText(rect().bottomLeft(),build.arg(buildTime));
+            #endif
+               painter->restore();
             }
             int ChartBackground::roundness(qreal size) const
             {
                 return 100*m_diameter/int(size);
             }
             int ChartBackground::diameter() const
             {
                 return m_diameter;
             }
             void ChartBackground::setDimeter(int dimater)
             {
                 m_diameter=dimater;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.cpp 0 -1

             #include "qchart.h"
             #include "qchartaxis.h"
             #include "qlegend.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "chartbackground_p.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \enum QChart::ChartTheme
                 This enum describes the theme used by the chart.
                 \value ChartThemeDefault Follows the GUI style of the Operating System
                 \value ChartThemeLight
                 \value ChartThemeBlueCerulean
                 \value ChartThemeDark
                 \value ChartThemeBrownSand
                 \value ChartThemeBlueNcs
                 \value ChartThemeIcy
                 \value ChartThemeScientific
                 \value ChartThemeCount Not really a theme; the total count of themes.
             */
             /*!
                 \enum QChart::AnimationOption
                 For enabling/disabling animations. Defaults to NoAnimation.
                 \value NoAnimation
                 \value GridAxisAnimations
                 \value SeriesAnimations
                 \value AllAnimations
             */
             /*!
                 \class QChart
                 \brief QtCommercial chart API.
                 QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
                 representation of different types of QChartSeries and other chart related objects like
                 QChartAxis and QChartLegend. If you simply want to show a chart in a layout, you can use the
                 convenience class QChartView instead of QChart.
                 \sa QChartView
             */
             /*!
                 Constructs a chart object which is a child of a\a parent. Parameter \a wFlags is passed to the QGraphicsWidget constructor.
             */
             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
                 m_backgroundItem(0),
                 m_titleItem(0),
                 m_legend(new QLegend(this)),
                 m_dataset(new ChartDataSet(this)),
                 m_presenter(new ChartPresenter(this,m_dataset)),
                 m_padding(50),
                 m_backgroundPadding(10)
             {
                 connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),m_legend,SLOT(handleSeriesRemoved(QSeries*)));
             }
             /*!
                 Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
             */
             QChart::~QChart()
             {
                 //delete first presenter , since this is a root of all the graphical items
                 delete m_presenter;
                 m_presenter=0;
             }
             /*!
                 Adds the \a series and optional \a axisY onto the chart and takes the ownership of the objects.
                 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
                 the y axis).
             */
             void QChart::addSeries(QSeries* series, QChartAxis* axisY)
             {
                 m_dataset->addSeries(series, axisY);
             }
             /*!
                 Removes the \a series specified in a perameter from the QChartView.
                 It releses its ownership of the specified QChartSeries object.
                 It does not delete the pointed QChartSeries data object
                 \sa addSeries(), removeAllSeries()
             */
             void QChart::removeSeries(QSeries* series)
             {
                 m_dataset->removeSeries(series);
             }
             /*!
                 Removes all the QChartSeries that have been added to the QChartView
                 It also deletes the pointed QChartSeries data objects
                 \sa addSeries(), removeSeries()
             */
             void QChart::removeAllSeries()
             {
                 m_dataset->removeAllSeries();
             }
             /*!
                 Sets the \a brush that is used for painting the background of the chart area.
             */
             void QChart::setBackgroundBrush(const QBrush& brush)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setBrush(brush);
                 m_backgroundItem->update();
             }
             QBrush QChart::backgroundBrush() const
             {
                 if(!m_backgroundItem) return QBrush();
                 return m_backgroundItem->brush();
             }
             /*!
                 Sets the \a pen that is used for painting the background of the chart area.
             */
             void QChart::setBackgroundPen(const QPen& pen)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setPen(pen);
                 m_backgroundItem->update();
             }
             QPen QChart::backgroundPen() const
             {
                 if(!m_backgroundItem) return QPen();
                 return m_backgroundItem->pen();
             }
             /*!
                 Sets the chart \a title. The description text that is drawn above the chart.
             */
             void QChart::setTitle(const QString& title)
             {
                 createChartTitleItem();
                 m_titleItem->setText(title);
                 updateLayout();
             }
             /*!
                 Returns the chart title. The description text that is drawn above the chart.
             */
             QString QChart::title() const
             {
                 if(m_titleItem)
                 return m_titleItem->text();
                 else
                 return QString();
             }
             /*!
                 Sets the \a font that is used for rendering the description text that is rendered above the chart.
             */
             void QChart::setTitleFont(const QFont& font)
             {
                 createChartTitleItem();
                 m_titleItem->setFont(font);
                 updateLayout();
             }
             /*!
                 Sets the \a brush used for rendering the title text.
             */
             void QChart::setTitleBrush(const QBrush &brush)
             {
                 createChartTitleItem();
                 m_titleItem->setBrush(brush);
                 updateLayout();
             }
             /*!
                 Returns the brush used for rendering the title text.
             */
             QBrush QChart::titleBrush() const
             {
                 if(!m_titleItem) return QBrush();
                 return m_titleItem->brush();
             }
             void QChart::createChartBackgroundItem()
             {
                 if(!m_backgroundItem) {
                     m_backgroundItem = new ChartBackground(this);
                     m_backgroundItem->setPen(Qt::NoPen);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChart::createChartTitleItem()
             {
                 if(!m_titleItem) {
                     m_titleItem = new QGraphicsSimpleTextItem(this);
                     m_titleItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             /*!
                 Sets the \a theme used by the chart for rendering the graphical representation of the data
                 \sa ChartTheme, chartTheme()
             */
             void QChart::setChartTheme(QChart::ChartTheme theme)
             {
                 m_presenter->setChartTheme(theme);
             }
             /*!
                 Returns the theme enum used by the chart.
                 \sa ChartTheme, setChartTheme()
             */
             QChart::ChartTheme QChart::chartTheme() const
             {
                 return m_presenter->chartTheme();
             }
             /*!
                 Zooms in the view by a factor of 2
             */
             void QChart::zoomIn()
             {
                 m_presenter->zoomIn();
             }
             /*!
                 Zooms in the view to a maximum level at which \a rect is still fully visible.
             */
             void QChart::zoomIn(const QRectF& rect)
             {
                 if(!rect.isValid()) return;
                 m_presenter->zoomIn(rect);
             }
             /*!
                 Restores the view zoom level to the previous one.
             */
             void QChart::zoomOut()
             {
                 m_presenter->zoomOut();
             }
             /*!
                 Returns the pointer to the x axis object of the chart
             */
             QChartAxis* QChart::axisX() const
             {
                 return m_dataset->axisX();
             }
             /*!
                 Returns the pointer to the y axis object of the chart
             */
             QChartAxis* QChart::axisY() const
             {
                 return m_dataset->axisY();
             }
             /*!
                 Returns the legend object of the chart. Ownership stays in chart.
             */
             QLegend* QChart::legend() const
             {
                 return m_legend;
             }
             /*!
                 Resizes and updates the chart area using the \a event data
             */
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 m_rect = QRectF(QPoint(0,0),event->newSize());
                 updateLayout();
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             /*!
                 Sets animation \a options for the chart
             */
             void QChart::setAnimationOptions(AnimationOptions options)
             {
                 m_presenter->setAnimationOptions(options);
             }
             /*!
                 Returns animation options for the chart
             */
             QChart::AnimationOptions QChart::animationOptions() const
             {
                 return m_presenter->animationOptions();
             }
             void QChart::scrollLeft()
             {
                 m_presenter->scroll(-m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
             }
             void QChart::scrollRight()
             {
                 m_presenter->scroll(m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
             }
             void QChart::scrollUp()
             {
                 m_presenter->scroll(0,m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::scrollDown()
             {
             	 m_presenter->scroll(0,-m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::updateLayout()
             {
                 if(!m_rect.isValid()) return;
                 QRectF rect = m_rect.adjusted(m_padding,m_padding, -m_padding, -m_padding);
                 // recalculate title position
                 if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),m_rect.top()/2 + m_padding/2);
                 }
                 //recalculate background gradient
                 if (m_backgroundItem) {
                     m_backgroundItem->setRect(m_rect.adjusted(m_backgroundPadding,m_backgroundPadding, -m_backgroundPadding, -m_backgroundPadding));
                 }
                 // recalculate legend position
                 if (m_legend) {
                     if (m_legend->parentObject() == this) {
                         m_legend->setMaximumSize(rect.size());
                         m_legend->setPos(rect.topLeft());
                     }
                 }
             }
             int QChart::padding() const
             {
                 return m_padding;
             }
             void QChart::setPadding(int padding)
             {
                 if(m_padding==padding){
                 m_padding = padding;
                 m_presenter->handleGeometryChanged();
                 updateLayout();
                 }
             }
             void QChart::setBackgroundPadding(int padding)
             {
                 if(m_backgroundPadding!=padding){
                 m_backgroundPadding = padding;
                 updateLayout();
                 }
             }
             void QChart::setBackgroundDiameter(int diameter)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setDimeter(diameter);
                 m_backgroundItem->update();
             }
             void QChart::setBackgroundVisible(bool visible)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setVisible(visible);
             }
             bool QChart::isBackgroundVisible() const
             {
                 if(!m_backgroundItem) return false;
                 return m_backgroundItem->isVisible();
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/src.pro +11 -1

             !include( ../common.pri ):error( Couldn't find the common.pri file! )
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             win32-msvc*: LIBS += User32.lib
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 $$PWD/chartdataset.cpp \
                 $$PWD/chartpresenter.cpp \
                 $$PWD/charttheme.cpp \
                 $$PWD/domain.cpp \
                 $$PWD/qchart.cpp \
                 $$PWD/qchartview.cpp \
                 $$PWD/qseries.cpp \
                 $$PWD/qlegend.cpp \
                 $$PWD/legendmarker.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chart.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartdataset_p.h \
                 $$PWD/chartitem_p.h \
                 $$PWD/chartpresenter_p.h \
                 $$PWD/charttheme_p.h \
                 $$PWD/domain_p.h \
                 $$PWD/legendmarker_p.h \
                 $$PWD/chartbackground_p.h \
                 $$PWD/chart_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \
                 $$PWD/qseries.h \
                 $$PWD/qchartview.h \
                 $$PWD/qlegend.h
             include(animations/animations.pri)
             include(axis/axis.pri)
             include(xychart/xychart.pri)
             include(linechart/linechart.pri)
             include(areachart/areachart.pri)
             include(barchart/barchart.pri)
             include(piechart/piechart.pri)
             include(scatterseries/scatter.pri)
             include(splinechart/splinechart.pri)
             include(themes/themes.pri)
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             INCLUDEPATH += linechart \
                 barchart \
                 themes \
                 .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             #qt public headers
             #this is very primitive and lame parser , TODO: make perl script insted
             !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
             {
                 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
                  win32:{
                     command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }
                 system($$command)
             }
             for(file, PUBLIC_HEADERS) {
                 name = $$split(file,'/')
                 name = $$last(name)
                 class = "$$cat($$file)"
                 class = $$find(class,class)
                 !isEmpty(class){
                 class = $$split(class,QTCOMMERCIALCHART_EXPORT)
                 class = $$member(class,1)
                 class = $$split(class,' ')
                 class = $$replace(class,' ','')
                 class = $$member(class,0)
                 win32:{
                     command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
                 system($$command)
                 }
             }
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target public_headers
             install_build_public_headers.name = build_public_headers
             install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_public_headers.input = PUBLIC_HEADERS
             install_build_public_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PUBLIC_HEADER_DIR
             install_build_public_headers.CONFIG += target_predeps \
                 no_link
             install_build_private_headers.name = buld_private_headers
             install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_private_headers.input = PRIVATE_HEADERS
             install_build_private_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PRIVATE_HEADER_DIR
             install_build_private_headers.CONFIG += target_predeps \
                 no_link
             QMAKE_EXTRA_COMPILERS += install_build_public_headers \
                 install_build_private_headers \
             chartversion.target = qchartversion_p.h
+            unix:{
                 chartversion.commands = @echo \
-                "build_time" \
+                    "const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" \\; \
+                     const char *gitHead = \\\"`git rev-parse HEAD`\\\" \\; " \
                     > \
                     $$chartversion.target;
+            }else{
+                chartversion.commands = @echo \
+                    "const char *buildTime = \"%date%_%time%\" ; \
+                     const char *gitHead = \"unknown\" ; " \
+                    > \
+                    $$chartversion.target
+            }
             chartversion.depends = $$HEADERS \
                 $$SOURCES
             PRE_TARGETDEPS += qchartversion_p.h
             QMAKE_CLEAN += qchartversion_p.h
             QMAKE_EXTRA_TARGETS += chartversion
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             # treat warnings as errors
             win32-msvc*: {
                 QMAKE_CXXFLAGS += /WX
             } else {
                 QMAKE_CXXFLAGS += -Werror
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages