HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r149:23a271e217e1

src/barchart/bar.cpp 0 -4

                 mHeight = size.height();
             }
-            void Bar::setPlotDomain(const PlotDomain& data)
-                mPlotDomain = data;
             void Bar::resize( qreal w, qreal h )
             {

src/barchart/bar_p.h 0 -2

             public: // from ChartItem
                 void setSize(const QSizeF &size);
-                void setPlotDomain(const PlotDomain& data);
                 // Layout Stuff
                 void resize( qreal w, qreal h );   // Size of bar.
                 qreal mYpos;
                 QColor mColor;
-                PlotDomain mPlotDomain;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barlabel.cpp 0 -5

                 mSize = size;
             }
-            void BarLabel::setPlotDomain(const PlotDomain& data)
-                mDomain = data;
             void BarLabel::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 painter->drawText(boundingRect(),mLabel);

src/barchart/barlabel_p.h 0 -2

                 // From ChartItem
                 void setSize(const QSizeF &size);
-                void setPlotDomain(const PlotDomain& data);
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
             private:
-                PlotDomain mDomain;
                 QSizeF mSize;
                 QString mLabel;
                 qreal mXpos;

src/barchart/separator.cpp 0 -5

                 mHeight = size.height();
             }
-            void Separator::setPlotDomain(const PlotDomain& data)
             void Separator::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 qDebug() << "separator::paint" << boundingRect();

src/barchart/separator_p.h 0 -1

                 // From ChartItem
                 void setSize(const QSizeF &size);
-                void setPlotDomain(const PlotDomain& data);
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);

src/chartitem_p.h 0 -1

             #ifndef CHARTITEM_H_
             #define CHARTITEM_H_
-            #include "plotdomain_p.h"
             #include "domain_p.h"
             #include <QGraphicsItem>

src/piechart/piepresenter.cpp +4 -14

@@ -47,19 +47,6 void PiePresenter::seriesChanged()
47	resize();	47	resize();
48	}	48	}
49		49
50	void PiePresenter::setSize(const QSizeF &size)
51	{
52	// TODO: allow user setting the size?
53	// TODO: allow user defining the margins?
54	m_rect.setSize(size);
55	resize();
56	}
57
58	void PiePresenter::setPlotDomain(const PlotDomain& plotDomain)
59	{
60	// TODO
61	}
62
63	void PiePresenter::resize()	50	void PiePresenter::resize()
64	{	51	{
65	m_pieRect = m_rect;	52	m_pieRect = m_rect;
@@ -114,7 +101,10 void PiePresenter::handleDomainChanged(const Domain& domain)
114		101
115	void PiePresenter::handleGeometryChanged(const QRectF& rect)	102	void PiePresenter::handleGeometryChanged(const QRectF& rect)
116	{	103	{
117	setSize(rect.size());	104	// TODO: allow user setting the size?
		105	// TODO: allow user defining the margins?
		106	m_rect.setSize(rect.size());
		107	resize();
118	}	108	}
119		109
120	#include "moc_piepresenter.cpp"	110	#include "moc_piepresenter.cpp"

src/piechart/piepresenter.h 0 -2

                 ~PiePresenter();
             public: // from ChartItem
-                void setSize(const QSizeF &size);
-                void setPlotDomain(const PlotDomain& data);
                 QRectF boundingRect() const { return m_rect; }
                 void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}

src/qchart.cpp 0 -5

             #include "qchart.h"
-            #include "qchartseries.h"
             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qpieseries.h"
             #include "qchartaxis.h"
-            #include "charttheme_p.h"
-            #include "chartitem_p.h"
-            #include "plotdomain_p.h"
-            #include "axisitem_p.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"

src/qscatterseries.cpp +2 -2

                 //m_theme = theme->themeForSeries();
             }
-            void QScatterSeriesPrivate::setPlotDomain(const PlotDomain& plotDomain)
+            void QScatterSeriesPrivate::setPlotDomain(const Domain& plotDomain)
             {
-                m_visibleChartArea = plotDomain;
+                //m_visibleChartArea = plotDomain;
                 changeGeometry();
             }

src/qscatterseries_p.h +3 -3

             #include "qchartseries.h"
             #include "charttheme_p.h"
             #include "chartitem_p.h"
-            #include "plotdomain_p.h"
+            #include "domain_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             public: // from ChartObjectInterface
                 void setSize(const QSizeF &size);
-                void setPlotDomain(const PlotDomain& data);
+                void setPlotDomain(const Domain& data);
             public: // from ChartThemeObserver
                 void themeChanged(ChartTheme *theme);
                 QList<qreal> m_sceney;
                 QColor m_markerColor;
                 //SeriesTheme m_theme;
-                PlotDomain m_visibleChartArea;
+                Domain m_visibleChartArea;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/src.pro 0 -2

                 barchart/separator.cpp \
                 barchart/bargroupbase.cpp \
                 barchart/barchartseriesbase.cpp \
-                plotdomain.cpp \
                 qscatterseries.cpp \
                 qchart.cpp \
                 axisitem.cpp \
                 barchart/barlabel_p.h \
                 barchart/bar_p.h \
                 barchart/separator_p.h \
-                plotdomain_p.h \
                 qscatterseries_p.h \
                 axisitem_p.h \
                 chartitem_p.h \

src/plotdomain.cpp removed 0 -45

NO CONTENT: file was removed

src/plotdomain_p.h removed 0 -28

NO CONTENT: file was removed

	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