##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Adding missing functions to API
Michal Klocek -
r1552:701e99c620a7
parent child
Show More
Side by Side Unified
Context file:
r1552:701e99c620a7 Loading diff...:
Show file before | Show file after | Hide comments
@@ -63,6 +63,10 public:
63 bool isVisible() const;
63 bool isVisible() const;
64 QChart* chart() const;
64 QChart* chart() const;
65
65
66 void adjustView();
67 void show();
68 void hide();
69
66 Q_SIGNALS:
70 Q_SIGNALS:
67 void nameChanged();
71 void nameChanged();
68 void visibleChanged();
72 void visibleChanged();
Show file before | Show file after | Hide comments
@@ -356,33 +356,56 QChart::AnimationOptions QChart::animationOptions() const
356 /*!
356 /*!
357 Scrolls the visible area of the chart to the left by the distance between two x axis ticks
357 Scrolls the visible area of the chart to the left by the distance between two x axis ticks
358 */
358 */
359 void QChart::scrollLeft()
359 void QChart::scrollLeft(qreal dx)
360 {
360 {
361 <<<<<<< Updated upstream
361 // d_ptr->m_presenter->scroll(-d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
362 // d_ptr->m_presenter->scroll(-d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
363 =======
364 //TODO:
365 Q_UNUSED(dx);
366 // d_ptr->m_presenter->scroll(-d_ptr->m_presenter->geometry().width()/(axisX()->d_ptr->ticksCount()-1),0);
367 >>>>>>> Stashed changes
362 }
368 }
363
369
364 /*!
370 /*!
365 Scrolls the visible area of the chart to the right by the distance between two x axis ticks
371 Scrolls the visible area of the chart to the right by the distance between two x axis ticks
366 */
372 */
367 void QChart::scrollRight()
373 void QChart::scrollRight(qreal dx)
368 {
374 {
375 <<<<<<< Updated upstream
369 // d_ptr->m_presenter->scroll(d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
376 // d_ptr->m_presenter->scroll(d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
377 =======
378 //TODO:
379 Q_UNUSED(dx);
380 // d_ptr->m_presenter->scroll(d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
381 >>>>>>> Stashed changes
370 }
382 }
371
383
372 /*!
384 /*!
373 Scrolls the visible area of the chart up by the distance between two y axis ticks
385 Scrolls the visible area of the chart up by the distance between two y axis ticks
374 */
386 */
375 void QChart::scrollUp()
387 void QChart::scrollUp(qreal dy)
376 {
388 {
389 <<<<<<< Updated upstream
390 =======
391 //TODO:
392 Q_UNUSED(dy);
393 >>>>>>> Stashed changes
377 // d_ptr->m_presenter->scroll(0,d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
394 // d_ptr->m_presenter->scroll(0,d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
378 }
395 }
379
396
380 /*!
397 /*!
381 Scrolls the visible area of the chart down by the distance between two y axis ticks
398 Scrolls the visible area of the chart down by the distance between two y axis ticks
382 */
399 */
383 void QChart::scrollDown()
400 void QChart::scrollDown(qreal dy)
384 {
401 {
402 <<<<<<< Updated upstream
385 // d_ptr->m_presenter->scroll(0,-d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
403 // d_ptr->m_presenter->scroll(0,-d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
404 =======
405 //TODO:
406 Q_UNUSED(dy);
407 // d_ptr->m_presenter->scroll(0,-d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
408 >>>>>>> Stashed changes
386 }
409 }
387
410
388 /*!
411 /*!
Show file before | Show file after | Hide comments
@@ -107,12 +107,14 public:
107 void zoomIn(const QRectF &rect);
107 void zoomIn(const QRectF &rect);
108 void zoomOut();
108 void zoomOut();
109 void zoom(qreal factor);
109 void zoom(qreal factor);
110 void scrollLeft();
110 void scrollLeft(qreal dx);
111 void scrollRight();
111 void scrollRight(qreal dx);
112 void scrollUp();
112 void scrollUp(qreal dy);
113 void scrollDown();
113 void scrollDown(qreal dy);
114 void scroll(const QPointF &delta);
114 void scroll(const QPointF &delta);
115
115
116 void adjustViewToSeries(QAbstractSeries* series= 0);
117
116 QLegend* legend() const;
118 QLegend* legend() const;
117
119
118 void setMarginsMinimum(const QRectF& margins);
120 void setMarginsMinimum(const QRectF& margins);
General Comments 0
You need to be logged in to leave comments. Login now