HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2866:bbf52870f4e3

Merge remote-tracking branch 'origin/5.6' into 5.7...

Liang Qi -

r2866:bbf52870f4e3

parent child

Context file:

r2866:bbf52870f4e3

src/charts/chartpresenter.cpp +4 -1

                      return QString::number(value);
              }
-             void ChartPresenter::ensureGLWidget()
+             void ChartPresenter::updateGLWidget()
              {
              #ifndef QT_NO_OPENGL
                  // GLWidget pointer is wrapped in QPointer as its parent is not in our control, and therefore
                          m_glWidget->show();
                      }
                  }
+                 // Make sure we update the widget in a timely manner
+                 if (!m_glWidget.isNull())
+                     m_glWidget->update();
              #endif
              }

src/charts/chartpresenter_p.h +1 -1

                  QString numberToString(double value, char f = 'g', int prec = 6);
                  QString numberToString(int value);
-                 void ensureGLWidget();
+                 void updateGLWidget();
                  void glSetUseWidget(bool enable) { m_glUseWidget = enable; }
              private:

src/charts/xychart/xychart.cpp +1 -1

              void XYChart::updateGlChart()
              {
-                 presenter()->ensureGLWidget();
                  dataSet()->glXYSeriesDataManager()->setPoints(m_series, domain());
+                 presenter()->updateGLWidget();
                  updateGeometry();
              }

src/chartsqml2/declarativechart.cpp +3 -1

                  QSize chartSize = m_chart->size().toSize();
                  if (!m_sceneImage || chartSize != m_sceneImage->size()) {
                      delete m_sceneImage;
-                     m_sceneImage = new QImage(chartSize, QImage::Format_ARGB32);
+                     qreal dpr = window() ? window()->devicePixelRatio() : 1.0;
+                     m_sceneImage = new QImage(chartSize * dpr, QImage::Format_ARGB32);
+                     m_sceneImage->setDevicePixelRatio(dpr);
                      m_sceneImageNeedsClear = true;
                  }

sync.profile +2 -2

              #   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
              #
              %dependencies = (
-                 "qtbase" => "refs/heads/dev",
-                 "qtdeclarative" => "refs/heads/dev",
+                 "qtbase" => "",
+                 "qtdeclarative" => "",
              );

General Comments 0

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

No TODOs yet

	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