HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2034:40ab6eb6f3e9

Fixed a bug with legend attach requiring a screen resize to update UI

Tero Ahola -

r2034:40ab6eb6f3e9

parent child

Context file:

r2034:40ab6eb6f3e9

Collapse all files

doc/images/examples_legend_detach2.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

doc/images/examples_legend_detach.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

doc/src/examples-legend.qdoc +5 -1

              	In example we use barseries where we add or remove barsets. The legend reflects the changes in series. Legend can be detached or attached back to chart and its alignment can be modified.
              	When legend is detached, it can be resized and positioned freely.
-                 \image examples_legend_detach.png
+                 \table
+                     \row
+                         \o \inlineimage examples_legend_detach.png
+                         \o \inlineimage examples_legend_detach2.png
+                 \endtable
              	Here we turn legend visible and set its alignment to the bottom of the chart.

examples/legend/main.cpp +1 -1

                  QApplication a(argc, argv);
                  MainWidget w;
-                 w.resize(1024,768);
+                 w.resize(720, 480);
                  w.show();
                  return a.exec();

examples/legend/mainwidget.cpp +34 -48

              {
                  // Create buttons for ui
                  m_buttonLayout = new QGridLayout();
-                 QPushButton *detachLegendButton = new QPushButton("detach legend");
-                 connect(detachLegendButton, SIGNAL(clicked()), this, SLOT(detachLegend()));
+                 QPushButton *detachLegendButton = new QPushButton("Toggle attached");
+                 connect(detachLegendButton, SIGNAL(clicked()), this, SLOT(toggleAttached()));
                  m_buttonLayout->addWidget(detachLegendButton, 0, 0);
-                 QPushButton *attachLegendButton = new QPushButton("attach legend");
-                 connect(attachLegendButton, SIGNAL(clicked()), this, SLOT(attachLegend()));
-                 m_buttonLayout->addWidget(attachLegendButton, 1, 0);
                  QPushButton *addSetButton = new QPushButton("add barset");
                  connect(addSetButton, SIGNAL(clicked()), this, SLOT(addBarset()));
                  connect(removeBarsetButton, SIGNAL(clicked()), this, SLOT(removeBarset()));
                  m_buttonLayout->addWidget(removeBarsetButton, 3, 0);
-                 QPushButton *leftButton = new QPushButton("Align legend left");
-                 connect(leftButton, SIGNAL(clicked()), this, SLOT(setLegendLeft()));
-                 m_buttonLayout->addWidget(leftButton, 4, 0);
-                 QPushButton *rightButton = new QPushButton("Align legend right");
-                 connect(rightButton, SIGNAL(clicked()), this, SLOT(setLegendRight()));
-                 m_buttonLayout->addWidget(rightButton, 5, 0);
-                 QPushButton *topButton = new QPushButton("Align legend top");
-                 connect(topButton, SIGNAL(clicked()), this, SLOT(setLegendTop()));
-                 m_buttonLayout->addWidget(topButton, 6, 0);
-                 QPushButton *bottomButton = new QPushButton("Align legend bottom");
-                 connect(bottomButton, SIGNAL(clicked()), this, SLOT(setLegendBottom()));
-                 m_buttonLayout->addWidget(bottomButton, 7, 0);
+                 QPushButton *alignButton = new QPushButton("Align (Bottom)");
+                 connect(alignButton, SIGNAL(clicked()), this, SLOT(setLegendAlignment()));
+                 m_buttonLayout->addWidget(alignButton, 4, 0);
                  QPushButton *boldButton = new QPushButton("Toggle bold");
                  connect(boldButton, SIGNAL(clicked()), this, SLOT(toggleBold()));
                  connect(m_legendHeight, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                  QFormLayout* legendLayout = new QFormLayout();
-                 legendLayout->addRow("Horizontal position", m_legendPosX);
-                 legendLayout->addRow("Vertical position", m_legendPosY);
+                 legendLayout->addRow("HPos", m_legendPosX);
+                 legendLayout->addRow("VPos", m_legendPosY);
                  legendLayout->addRow("Width", m_legendWidth);
                  legendLayout->addRow("Height", m_legendHeight);
                  m_legendSettings = new QGroupBox("Detached legend");
              }
-             void MainWidget::detachLegend()
+             void MainWidget::toggleAttached()
              {
-             //![2]
                  QLegend *legend = m_chart->legend();
+                 if (legend->isAttachedToChart()) {
+                     //![2]
                  legend->detachFromChart();
                  m_chart->legend()->setBackgroundVisible(true);
                  m_chart->legend()->setBrush(QBrush(QColor(128,128,128,128)));
                  m_chart->legend()->setPen(QPen(QColor(192,192,192,192)));
              //![2]
                  showLegendSpinbox();
                  updateLegendLayout();
-                 update();
+             }
-             void MainWidget::attachLegend()
+             {
+                 } else {
              //![3]
-                 QLegend *legend = m_chart->legend();
                  legend->attachToChart();
-                 m_chart->legend()->setBackgroundVisible(false);
+                     legend->setBackgroundVisible(false);
              //![3]
                  hideLegendSpinbox();
+                 }
                  update();
              }
                  }
              }
-             void MainWidget::setLegendLeft()
+             void MainWidget::setLegendAlignment()
              {
-                 m_chart->legend()->setAlignment(Qt::AlignLeft);
+             }
+                 QPushButton *button = qobject_cast<QPushButton *>(sender());
-             void MainWidget::setLegendRight()
+             {
+                 switch (m_chart->legend()->alignment()) {
+                 case Qt::AlignTop:
+                     m_chart->legend()->setAlignment(Qt::AlignLeft);
+                     if (button)
+                         button->setText("Align (Left)");
+                     break;
+                 case Qt::AlignLeft:
+                     m_chart->legend()->setAlignment(Qt::AlignBottom);
+                     if (button)
+                         button->setText("Align (Bottom)");
+                     break;
+                 case Qt::AlignBottom:
                  m_chart->legend()->setAlignment(Qt::AlignRight);
+             }
-             void MainWidget::setLegendTop()
+             {
+                     if (button)
+                         button->setText("Align (Right)");
+                     break;
+                 default:
+                     if (button)
+                         button->setText("Align (Top)");
                  m_chart->legend()->setAlignment(Qt::AlignTop);
+                     break;
              }
-             void MainWidget::setLegendBottom()
+             {
-                 m_chart->legend()->setAlignment(Qt::AlignBottom);
              }
              void MainWidget::toggleBold()

examples/legend/mainwidget.h +2 -6

              signals:
              public slots:
-                 void detachLegend();
-                 void attachLegend();
+                 void toggleAttached();
                  void addBarset();
                  void removeBarset();
-                 void setLegendLeft();
-                 void setLegendRight();
-                 void setLegendTop();
-                 void setLegendBottom();
+                 void setLegendAlignment();
                  void toggleBold();
                  void toggleItalic();

src/legend/qlegend.cpp +1 -1

              void QLegend::attachToChart()
              {
                  d_ptr->m_attachedToChart = true;
-                 d_ptr->m_layout->invalidate();
+                 d_ptr->m_presenter->layout()->invalidate();
                  setParent(d_ptr->m_chart);
              }

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