HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r420:ad444fe37cf4

             const Domain ChartDataSet::domain(QChartAxis *axisY) const
             {
-            	int i = m_domainMap.count(axisY);
+                int i = m_domainMap.count(axisY);
-            	if(i == 0){
+                if(i == 0) {
-            		return Domain();
+                    return Domain();
+                }
-            	i = i - m_domainIndex -1;
+                i = i - m_domainIndex -1;
                 return m_domainMap.values(axisY).at(i);
             }
             {
                 // TODO: we should check the series not already added
-                series->setParent(this); // take ownership
+                series->setParent(this);// take ownership
                 clearDomains();
                 if(axisY==0) axisY = m_axisY;
-                axisY->setParent(this); // take ownership
+                axisY->setParent(this);// take ownership
-                QList<QSeries*>  seriesList = m_seriesMap.values(axisY);
+                QList<QSeries*> seriesList = m_seriesMap.values(axisY);
                 QList<Domain> domainList = m_domainMap.values(axisY);
                         break;
                     }
                     case QSeries::SeriesTypeBar: {
-                    qDebug() << "QChartSeries::SeriesTypeBar";
+                        qDebug() << "QChartSeries::SeriesTypeBar";
                         QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                         qreal x = barSeries->categoryCount();
                         qreal y = barSeries->max();
                         break;
                     }
                     case QSeries::SeriesTypeStackedBar: {
-                    qDebug() << "QChartSeries::SeriesTypeStackedBar";
+                        qDebug() << "QChartSeries::SeriesTypeStackedBar";
                         QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                         qreal x = stackedBarSeries->categoryCount();
                         break;
                     }
                     case QSeries::SeriesTypePercentBar: {
-                    qDebug() << "QChartSeries::SeriesTypePercentBar";
+                        qDebug() << "QChartSeries::SeriesTypePercentBar";
                         QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                         qreal x = percentBarSeries->categoryCount();
             {
                 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
                 foreach(QChartAxis* axis , keys) {
-                    if(m_seriesMap.contains(axis,series)){
+                    if(m_seriesMap.contains(axis,series)) {
                         emit seriesRemoved(series);
                         m_seriesMap.remove(axis,series);
                         //remove axis if no longer there
-                        if(!m_seriesMap.contains(axis)){
+                        if(!m_seriesMap.contains(axis)) {
                             emit axisRemoved(axis);
                             m_domainMap.remove(axis);
                             if(axis != m_axisY)
                 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
                 foreach(QChartAxis* axis , keys) {
                     QList<QSeries*> seriesList = m_seriesMap.values(axis);
-                    for(int i =0 ; i < seriesList.size();i++ )
+                    for(int i =0; i < seriesList.size();i++ )
                     {
                         emit seriesRemoved(seriesList.at(i));
                         delete(seriesList.at(i));
                     m_domainMap.remove(axis);
                     emit axisRemoved(axis);
                     if(axis != m_axisY) delete axis;
+                }
                 m_domainIndex=0;
             }
                 Q_ASSERT(i>=0);
                 Domain domain = m_domainMap.values(axis).at(i);
                 {
-                QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
+                    QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
-                QList<QSeries*> seriesList = m_seriesMap.values(axis);
+                    QList<QSeries*> seriesList = m_seriesMap.values(axis);
-                foreach(QSeries* series, seriesList) {
+                    foreach(QSeries* series, seriesList) {
-                    emit seriesDomainChanged(series,domain);
+                        emit seriesDomainChanged(series,domain);
+                    }
-                axis->updateRange(domain.m_minY,domain.m_maxY);
+                    axis->updateRange(domain.m_minY,domain.m_maxY);
-                emit axisRangeChanged(axis,labels);
+                    emit axisRangeChanged(axis,labels);
                 }
                 QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
                 emit axisRangeChanged(axisX(),labels);
             }
             void ChartDataSet::clearDomains(int toIndex)
             {
                 Q_ASSERT(toIndex>=0);
                     QList<Domain> domains = m_domainMap.values(key);
                     m_domainMap.remove(key);
                     int i = domains.size() - toIndex - 1;
-                    while(i--){
+                    while(i--) {
                         domains.removeFirst();
                     }
-                    for(int j=domains.size()-1; j>=0 ;j--)
+                    for(int j=domains.size()-1; j>=0;j--)
-                        m_domainMap.insert(key,domains.at(j));
+                    m_domainMap.insert(key,domains.at(j));
                 }
             }
                 Domain domain;
-                foreach (QChartAxis* axis , domainList){
+                foreach (QChartAxis* axis , domainList) {
                     domain = m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height());
                     m_domainMap.insert(axis,domain);
                 }
                 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
                 foreach(QChartAxis* axis , keys) {
-                    if(m_seriesMap.contains(axis,series)){
+                    if(m_seriesMap.contains(axis,series)) {
                         return axis;
                     }
                 }
                 int ticks = axis->ticksCount()-1;
-                for(int i=0; i<= ticks; i++){
+                for(int i=0; i<= ticks; i++) {
                     qreal value = min + (i * (max - min)/ ticks);
                     QString label = axis->axisTickLabel(value);
-                    if(label.isEmpty()){
+                    if(label.isEmpty()) {
                         labels << QString::number(value);
-                    }else{
+                    else {
                         labels << label;
                     }
                 }
                 return labels;
             }
             void ChartDataSet::handleRangeChanged(QChartAxis* axis)
             {
                 qreal min = axis->min();
                     setDomain(m_domainIndex,axis);
                 }
             }
             void ChartDataSet::handleTickChanged(QChartAxis* axis)
             {
-                if(axis==axisX()){
+                if(axis==axisX()) {
                     Domain domain = m_domainMap.value(axisY());
                     QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX);
                     emit axisRangeChanged(axis,labels);
-                }else{
+                else {
                     Domain domain = m_domainMap.value(axis);
                     QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
                     emit axisRangeChanged(axis,labels);

25

26

const Domain ChartDataSet::domain(QChartAxis *axisY) const

26

const Domain ChartDataSet::domain(QChartAxis *axisY) const

27

{

27

{

28

int i = m_domainMap.count(axisY);

28

int i = m_domainMap.count(axisY);

29

if(i == 0){

29

if(i == 0) {

30

return Domain();

30

return Domain();

31

}

31

}

32

i = i - m_domainIndex -1;

32

i = i - m_domainIndex -1;

33

return m_domainMap.values(axisY).at(i);

33

return m_domainMap.values(axisY).at(i);

34

}

34

}

35

37

{

37

{

38

// TODO: we should check the series not already added

38

// TODO: we should check the series not already added

39

40

series->setParent(this); // take ownership

40

series->setParent(this);// take ownership

41

clearDomains();

41

clearDomains();

42

43

if(axisY==0) axisY = m_axisY;

43

if(axisY==0) axisY = m_axisY;

44

axisY->setParent(this); // take ownership

44

axisY->setParent(this);// take ownership

45

46

QList<QSeries*> seriesList = m_seriesMap.values(axisY);

46

QList<QSeries*> seriesList = m_seriesMap.values(axisY);

47

48

QList<Domain> domainList = m_domainMap.values(axisY);

48

QList<Domain> domainList = m_domainMap.values(axisY);

49

71

break;

71

break;

72

}

72

}

73

case QSeries::SeriesTypeBar: {

73

case QSeries::SeriesTypeBar: {

74

qDebug() << "QChartSeries::SeriesTypeBar";

74

qDebug() << "QChartSeries::SeriesTypeBar";

75

QBarSeries* barSeries = static_cast<QBarSeries*>(series);

75

QBarSeries* barSeries = static_cast<QBarSeries*>(series);

76

qreal x = barSeries->categoryCount();

76

qreal x = barSeries->categoryCount();

77

qreal y = barSeries->max();

77

qreal y = barSeries->max();

82

break;

82

break;

83

}

83

}

84

case QSeries::SeriesTypeStackedBar: {

84

case QSeries::SeriesTypeStackedBar: {

85

qDebug() << "QChartSeries::SeriesTypeStackedBar";

85

qDebug() << "QChartSeries::SeriesTypeStackedBar";

86

87

QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);

87

QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);

88

qreal x = stackedBarSeries->categoryCount();

88

qreal x = stackedBarSeries->categoryCount();

94

break;

94

break;

95

}

95

}

96

case QSeries::SeriesTypePercentBar: {

96

case QSeries::SeriesTypePercentBar: {

97

qDebug() << "QChartSeries::SeriesTypePercentBar";

97

qDebug() << "QChartSeries::SeriesTypePercentBar";

98

99

QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);

99

QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);

100

qreal x = percentBarSeries->categoryCount();

100

qreal x = percentBarSeries->categoryCount();

157

{

157

{

158

QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();

158

QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();

159

foreach(QChartAxis* axis , keys) {

159

foreach(QChartAxis* axis , keys) {

160

if(m_seriesMap.contains(axis,series)){

160

if(m_seriesMap.contains(axis,series)) {

161

emit seriesRemoved(series);

161

emit seriesRemoved(series);

162

m_seriesMap.remove(axis,series);

162

m_seriesMap.remove(axis,series);

163

//remove axis if no longer there

163

//remove axis if no longer there

164

if(!m_seriesMap.contains(axis)){

164

if(!m_seriesMap.contains(axis)) {

165

emit axisRemoved(axis);

165

emit axisRemoved(axis);

166

m_domainMap.remove(axis);

166

m_domainMap.remove(axis);

167

if(axis != m_axisY)

167

if(axis != m_axisY)

178

QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();

178

QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();

179

foreach(QChartAxis* axis , keys) {

179

foreach(QChartAxis* axis , keys) {

180

QList<QSeries*> seriesList = m_seriesMap.values(axis);

180

QList<QSeries*> seriesList = m_seriesMap.values(axis);

181

for(int i =0 ; i < seriesList.size();i++ )

181

for(int i =0; i < seriesList.size();i++ )

182

{

182

{

183

emit seriesRemoved(seriesList.at(i));

183

emit seriesRemoved(seriesList.at(i));

184

delete(seriesList.at(i));

184

delete(seriesList.at(i));

187

m_domainMap.remove(axis);

187

m_domainMap.remove(axis);

188

emit axisRemoved(axis);

188

emit axisRemoved(axis);

189

if(axis != m_axisY) delete axis;

189

if(axis != m_axisY) delete axis;

190

}

190

}

191

m_domainIndex=0;

191

m_domainIndex=0;

192

}

192

}

193

250

Q_ASSERT(i>=0);

250

Q_ASSERT(i>=0);

251

Domain domain = m_domainMap.values(axis).at(i);

251

Domain domain = m_domainMap.values(axis).at(i);

252

{

252

{

253

QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);

253

QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);

254

QList<QSeries*> seriesList = m_seriesMap.values(axis);

254

QList<QSeries*> seriesList = m_seriesMap.values(axis);

255

foreach(QSeries* series, seriesList) {

255

foreach(QSeries* series, seriesList) {

256

emit seriesDomainChanged(series,domain);

256

emit seriesDomainChanged(series,domain);

257

}

257

}

258

axis->updateRange(domain.m_minY,domain.m_maxY);

258

axis->updateRange(domain.m_minY,domain.m_maxY);

259

emit axisRangeChanged(axis,labels);

259

emit axisRangeChanged(axis,labels);

260

}

260

}

261

262

QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);

262

QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);

264

emit axisRangeChanged(axisX(),labels);

264

emit axisRangeChanged(axisX(),labels);

265

}

265

}

266

267

268

void ChartDataSet::clearDomains(int toIndex)

267

void ChartDataSet::clearDomains(int toIndex)

269

{

268

{

270

Q_ASSERT(toIndex>=0);

269

Q_ASSERT(toIndex>=0);

278

QList<Domain> domains = m_domainMap.values(key);

277

QList<Domain> domains = m_domainMap.values(key);

279

m_domainMap.remove(key);

278

m_domainMap.remove(key);

280

int i = domains.size() - toIndex - 1;

279

int i = domains.size() - toIndex - 1;

281

while(i--){

280

while(i--) {

282

domains.removeFirst();

281

domains.removeFirst();

283

}

282

}

284

for(int j=domains.size()-1; j>=0 ;j--)

283

for(int j=domains.size()-1; j>=0;j--)

285

m_domainMap.insert(key,domains.at(j));

284

m_domainMap.insert(key,domains.at(j));

286

}

285

}

287

}

286

}

288

287

297

296

298

Domain domain;

297

Domain domain;

299

298

300

foreach (QChartAxis* axis , domainList){

299

foreach (QChartAxis* axis , domainList) {

301

domain = m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height());

300

domain = m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height());

302

m_domainMap.insert(axis,domain);

301

m_domainMap.insert(axis,domain);

303

}

302

}

312

QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();

311

QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();

313

312

314

foreach(QChartAxis* axis , keys) {

313

foreach(QChartAxis* axis , keys) {

315

if(m_seriesMap.contains(axis,series)){

314

if(m_seriesMap.contains(axis,series)) {

316

return axis;

315

return axis;

317

}

316

}

318

}

317

}

327

326

328

int ticks = axis->ticksCount()-1;

327

int ticks = axis->ticksCount()-1;

329

328

330

for(int i=0; i<= ticks; i++){

329

for(int i=0; i<= ticks; i++) {

331

qreal value = min + (i * (max - min)/ ticks);

330

qreal value = min + (i * (max - min)/ ticks);

332

QString label = axis->axisTickLabel(value);

331

QString label = axis->axisTickLabel(value);

333

if(label.isEmpty()){

332

if(label.isEmpty()) {

334

labels << QString::number(value);

333

labels << QString::number(value);

335

}~~else~~{

334

}

335

else {

336

labels << label;

336

labels << label;

337

}

337

}

338

}

338

}

339

return labels;

339

return labels;

340

}

340

}

341

342

343

void ChartDataSet::handleRangeChanged(QChartAxis* axis)

342

void ChartDataSet::handleRangeChanged(QChartAxis* axis)

344

{

343

{

345

qreal min = axis->min();

344

qreal min = axis->min();

383

setDomain(m_domainIndex,axis);

382

setDomain(m_domainIndex,axis);

384

}

383

}

385

384

386

387

}

385

}

388

386

389

void ChartDataSet::handleTickChanged(QChartAxis* axis)

387

void ChartDataSet::handleTickChanged(QChartAxis* axis)

390

{

388

{

391

if(axis==axisX()){

389

if(axis==axisX()) {

392

Domain domain = m_domainMap.value(axisY());

390

Domain domain = m_domainMap.value(axisY());

393

QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX);

391

QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX);

394

emit axisRangeChanged(axis,labels);

392

emit axisRangeChanged(axis,labels);

395

}~~else~~{

393

}

394

else {

396

Domain domain = m_domainMap.value(axis);

395

Domain domain = m_domainMap.value(axis);

397

QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);

396

QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);

398

emit axisRangeChanged(axis,labels);

397

emit axisRangeChanged(axis,labels);

	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