HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r654:c52c8b56cc6c

examples/barchart/main.cpp 0 -1

                  //! [4]
                  // Enable tooltip
                  series->setToolTipEnabled();
-                 series->setSeparatorsVisible(true);
                  // Connect clicked signal of set to toggle floating values of set.
                  QObject::connect(set0,SIGNAL(clicked(QString)),set0,SIGNAL(toggleFloatingValues()));

src/barchart/barchart.pri 0 -2

                  $$PWD/qbarset.cpp \
                  $$PWD/qpercentbarseries.cpp \
                  $$PWD/qstackedbarseries.cpp \
-                 $$PWD/separator.cpp \
                  $$PWD/stackedbarpresenter.cpp \
                  $$PWD/barvalue.cpp
                  $$PWD/barpresenter_p.h \
                  $$PWD/barpresenterbase_p.h \
                  $$PWD/percentbarpresenter_p.h \
-                 $$PWD/separator_p.h \
                  $$PWD/stackedbarpresenter_p.h \
                  $$PWD/barvalue_p.h

src/barchart/barpresenter.cpp +1 -12

              #include "barpresenter_p.h"
              #include "bar_p.h"
              #include "barvalue_p.h"
-             #include "separator_p.h"
              #include "qbarset.h"
              #include <QDebug>
                          xPos += mBarWidth;
                      }
                  }
-             /*
-                 // Position separators
-                 qreal xPos = categoryWidth + categoryWidth/2;
-                 for (int s=0; s < mSeparators.count(); s++) {
-                     Separator* sep = mSeparators.at(s);
-                     sep->setPos(xPos,0);
-                     sep->setSize(QSizeF(1,mHeight));
-                     sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme
-                     xPos += categoryWidth;
+                 }
-             */
                  // Position floating values
                  itemIndex = 0;
                  for (int category=0; category < mSeries->categoryCount(); category++) {

src/barchart/barpresenterbase.cpp +1 -24

              #include "barpresenterbase_p.h"
              #include "bar_p.h"
              #include "barvalue_p.h"
-             #include "separator_p.h"
              #include "qbarset.h"
              #include "qbarseries.h"
              #include "qchart.h"
                  mChart(parent)
              {
                  connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
-             //    connect(series,SIGNAL(enableSeparators(bool)),this,SLOT(enableSeparators(bool)));
-             //    enableSeparators(series->separatorsVisible());
                  setZValue(ChartPresenter::BarSeriesZValue);
                  initAxisLabels();
                  dataChanged();
              BarPresenterBase::~BarPresenterBase()
              {
                  disconnect(this,SLOT(showToolTip(QPoint,QString)));
-             //    disconnect(this,SLOT(enableSeparators(bool)));
              }
              void BarPresenterBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
                  }
                  mBars.clear();
-             //    mSeparators.clear();
                  mFloatingValues.clear();
                  // Create new graphic items for bars
                          connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaveEvent()));
                      }
                  }
-             /*
-                 // Create separators
-                 int count = mSeries->categoryCount() - 1;   // There is one less separator than columns
-                 for (int i=0; i<count; i++) {
-                     Separator* sep = new Separator(this);
-                     sep->setVisible(mSeries->separatorsVisible());
-                     childItems().append(sep);
-                     mSeparators.append(sep);
+                 }
-             */
                  // Create floating values
                  for (int category=0; category<mSeries->categoryCount(); category++) {
                      for (int s=0; s<mSeries->barsetCount(); s++) {
                  QToolTip::showText(pos,tip);
              }
-             /*
-             void BarPresenterBase::enableSeparators(bool enabled)
+             {
-                 for (int i=0; i<mSeparators.count(); i++) {
-                     mSeparators.at(i)->setVisible(enabled);
+                 }
+             }
-             */
              #include "moc_barpresenterbase_p.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barpresenterbase_p.h 0 -3

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              class Bar;
-             class Separator;
              class BarValue;
              class QChartAxisCategories;
              class QChart;
                  // Internal slots
                  void showToolTip(QPoint pos, QString tip);      // shows tooltip (if enabled)
-             //    void enableSeparators(bool enabled);
              protected:
                  // Not owned.
                  QBarSeries* mSeries;
                  QList<Bar*> mBars;
-             //    QList<Separator*> mSeparators;
                  QList<BarValue*> mFloatingValues;
                  QChart* mChart;
              };

src/barchart/percentbarpresenter.cpp +1 -11

              #include "percentbarpresenter_p.h"
              #include "bar_p.h"
              #include "barvalue_p.h"
-             #include "separator_p.h"
              #include "qbarset.h"
              #include <QDebug>
                      }
                      xPos += xStep;
                  }
-             /*
-                 // Position separators
-                 xPos = xStep + xStep/2;
-                 for (int s=0; s < mSeries->categoryCount() - 1; s++) {
-                     Separator* sep = mSeparators.at(s);
-                     sep->setPos(xPos,0);
-                     sep->setSize(QSizeF(1,mHeight));
-                     xPos += xStep;
+                 }
-             */
                  // Position floating values
                  itemIndex = 0;
                  xPos = (tW/tC);

src/barchart/qbarseries.cpp 0 -16

                  }
              }
-             /*!
-                 Enables or disables separators depending on parameter \a enabled.
-                 Separators are visual elements that are drawn between categories.
-                 Calling without parameter \a enabled, enables the separators
-             */
-             void QBarSeries::setSeparatorsVisible(bool visible)
+             {
-                 mSeparatorsVisible = visible;
-                 emit enableSeparators(visible);
+             }
              /*!
                  \internal \a category
                  return *mModel;
              }
-             bool QBarSeries::separatorsVisible()
+             {
-                 return mSeparatorsVisible;
+             }
              bool QBarSeries::setModel(QAbstractItemModel* model)
              {
                  // disconnect signals from old model

src/barchart/qbarseries.h 0 -4

                  qreal categorySum(int category);
                  qreal maxCategorySum();
                  BarChartModel& model();
-                 bool separatorsVisible();
                  // <--- TO PIMPL
              signals:
                  // TODO: internal signals, these to private implementation.
                  // TODO: TO PIMPL --->
-                 void enableSeparators(bool enable);
                  void showToolTip(QPoint pos, QString tip);
                  // <--- TO PIMPL
              public Q_SLOTS:
                  void setToolTipEnabled(bool enabled=true);           // enables tooltips
-                 void setSeparatorsVisible(bool visible=true);        // enables separators between categories
                  // TODO: TO PIMPL --->
                  void barsetClicked(QString category);
              protected:
                  BarChartModel* mModel;
-                 bool mSeparatorsVisible;
                  QAbstractItemModel* m_model;
                  int m_mapCategories;

src/barchart/stackedbarpresenter.cpp +1 -11

              #include "stackedbarpresenter_p.h"
              #include "bar_p.h"
              #include "barvalue_p.h"
-             #include "separator_p.h"
              #include "qbarset.h"
              #include <QDebug>
                      }
                      xPos += xStep;
                  }
-             /*
-                 // Position separators
-                 xPos = xStep + xStep/2;
-                 for (int s=0; s < mSeries->categoryCount() - 1; s++) {
-                     Separator* sep = mSeparators.at(s);
-                     sep->setPos(xPos,0);
-                     sep->setSize(QSizeF(1,mHeight));
-                     xPos += xStep;
+                 }
-             */
                  // Position floating values
                  itemIndex = 0;
                  xPos = (tW/tC);

test/chartwidgettest/mainwidget.cpp 0 -1

                      // TODO: new implementation of setFloatingValuesEnabled with signals
                      //series->setFloatingValuesEnabled(true);
                      series->setToolTipEnabled(true);
-                     series->setSeparatorsVisible(false);
                      m_chartView->addSeries(series);
                  } else if (seriesName == "Spline") {
                      for (int j(0); j < data.count(); j ++) {

	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