HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r285:46d1e061b6ff

else clause added to QChartView mousePressEvent. Added some more docs to QChart and QChartView

Marek Rosa -

r285:46d1e061b6ff

parent child

Context file:

r285:46d1e061b6ff

Collapse all files

example/gdpbarchart/widget.cpp +4 -3

              */
              void Widget::refreshChart()
              {
-                 chartArea->removeSeries(series0);
+                 chartArea->removeAllSeries();
                  // selected countries items list is not sorted. copy the values to QStringlist and sort them.
                  QStringList selectedCountriesStrings;
                      for (int i = 0; i < selectedYearsInts.size(); i++)
                      {
                          query.exec("SELECT country,gdpvalue FROM gdp2 where year=" + QString("%1").arg(selectedYearsInts[i]) + " AND " + countriesQuery);
-                         QBarSet* barSet = new QBarSet;
+                         QBarSet* barSet = new QBarSet(QString("GDP_%1").arg(selectedYearsInts[i]));
                          //        while (query.next()) {
                          //            qDebug() << query.value(0).toString() << " : " << query.value(1).toString();
                          //        }
                                  qDebug() << "Putting 0 for Bosnia" << " : " << QString("%1").arg(selectedYearsInts[i]) << " " << query.value(0).toInt();
                              }
                          }
-                         chartArea->axisX()->setRange(selectedYearsInts[selectedYearsInts.size() - 1] + 1, selectedYearsInts[0] - 1);
+             //            chartArea->axisX()->setRange(selectedYearsInts[selectedYearsInts.size() - 1] + 1, selectedYearsInts[0] - 1);
                          chartArea->addSeries(series);
                      }
+                     chartArea->axisX()->setRange(selectedYearsInts[selectedYearsInts.size() - 1] + 1, selectedYearsInts[0] - 1);
                  }
              }

src/qchart.cpp +14 -5

              */
              /*!
-                 Constructs a chart object which is a child of parent.
+                 Constructs a chart object which is a child of a\a parent.
              */
              QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
                  m_backgroundItem(0),
              }
              /*!
-                 Adds the \a series and optional y axis onto the chart and takes the ownership of the objects.
+                 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).
              */
              }
              /*!
-                 Removes the QChartSeries specified in a perameter from the QChartView.
+                 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 removeSeries(), removeAllSeries()
+                 \sa addSeries(), removeAllSeries()
              */
              void QChart::removeSeries(QChartSeries* series)
              {
              }
              /*!
-                 Sets the \a theme used by the chart for rendering data graphical representation
+                 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)
                  return m_presenter->chartTheme();
              }
+             /*!
+                 Zooms in the view by a factor of 2
+             */
              void QChart::zoomIn()
              {
                  if (!m_dataset->nextDomain()) {
                  }
              }
+             /*!
+                 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_dataset->addDomain(r,m_presenter->geometry());
              }
+             /*!
+                 Restores the view zoom level to the previous one.
+             */
              void QChart::zoomOut()
              {
                  m_dataset->previousDomain();

src/qchart.h +1 -1

                  Q_OBJECT
              public:
                  enum ChartTheme {
-                     /*! The default theme follows the GUI style of the Operating System */
-                     ChartThemeDefault,
                      ChartThemeVanilla,
                      ChartThemeIcy,
                      ChartThemeGrayscale,
                      ChartThemeScientific
                      //ChartThemeUnnamed1
+                     /*! The default theme follows the GUI style of the Operating System */
                  };
              public:

src/qchartview.cpp +34 -5

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
+             /*!
+                 Constructs a chartView object which is a child of a\a parent.
+             */
              QChartView::QChartView(QWidget *parent) :
              QGraphicsView(parent),
              m_scene(new QGraphicsScene(this)),
              }
              /*!
-                 Adds the series and optional y axis onto the chart and takes the ownership of the objects.
+                 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).
-                 \sa removeSeries, removeAllSeries
+                 \sa removeSeries(), removeAllSeries()
              */
              void QChartView::addSeries(QChartSeries* series,QChartAxis *axisY)
              {
              }
              /*!
-                 Removes the QChartSeries specified in a perameter from the QChartView.
+                 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 removeSeries(), removeAllSeries()
+                 \sa addSeries(), removeAllSeries()
              */
              void QChartView::removeSeries(QChartSeries* series)
              {
                  m_chart->removeAllSeries();
              }
+             /*!
+                 Zooms in the view by a factor of 2
+             */
              void QChartView::zoomIn()
              {
                  m_chart->zoomIn();
              }
+             /*!
+                 Zooms in the view to a maximum level at which \a rect is still fully visible.
+             */
              void QChartView::zoomIn(const QRect& rect)
              {
                  m_chart->zoomIn(rect);
              }
+             /*!
+                 Restores the view zoom level to the previous one.
+             */
              void QChartView::zoomOut()
              {
                  m_chart->zoomOut();
              }
              /*!
-                 Sets the chart \a tile. A description text that is rendered above the chart.
+                 Sets the chart \a title. A description text that is rendered above the chart.
              */
              void QChartView::setChartTitle(const QString& title)
              {
                  m_chart->setChartBackgroundPen(pen);
              }
+             /*!
+                 Sets the RubberBandPlicy to \a policy. Selected policy determines the way zooming is performed.
+             */
              void QChartView::setRubberBandPolicy(const RubberBandPolicy policy)
              {
                  switch(policy) {
                  }
              }
+             /*!
+                 Returns the RubberBandPolicy that is currently being used by the widget.
+             */
              QChartView::RubberBandPolicy QChartView::rubberBandPolicy() const
              {
                  if(m_horizonalRubberBand && m_verticalRubberBand) return RectangleRubberBand;
                  return NoRubberBand;
              }
+             /*!
+                 If Left mouse button is pressed and the RubberBandPolicy is enabled the \a event is accepted and the rubber band is displayed on the screen allowing the user to select the zoom area.
+                 If different mouse button is pressed and/or the RubberBandPolicy is disabled then the \a event is not consumed.
+             */
              void QChartView::mousePressEvent(QMouseEvent *event)
              {
                  if(m_rubberBand && m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {
                          event->accept();
                      }
                  }
+                 else {
+                     QGraphicsView::mousePressEvent(event);
+                 }
              }
              void QChartView::mouseMoveEvent(QMouseEvent *event)
                  }
              }
+             /*!
+                 If left mouse button is release and RubberBand is enabled then \a event is accepted and the view is zoomed in to rect specified by RubberBand
+                 If it is the right mouse button \a event then RubberBand is dissmissed and zoom is canceled.
+             */
              void QChartView::mouseReleaseEvent(QMouseEvent *event)
              {
                  if(m_rubberBand) {

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