← Back to branch summary

~georg-zotti/stellarium/gz_AtmosphereTweaks

« back to all changes in this revision

Viewing changes to src/gui/ConfigureDSOColorsDialog.cpp

  • Committer: Georg Zotti
  • Date: 2017-05-23 13:18:09 UTC
  • mfrom: (8115.1.1321 trunk)
  • Revision ID: georg.zotti@univie.ac.at-20170523131809-a6pus0ogpmjwtmd8
merge-in trunk r9436

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/ConfigureDSOColorsDialog.cpp
138
138
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.labelsColor")->getValue().value<Vec3f>();
139
139
        QColor color(0,0,0);
140
140
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
141
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOLabels->toolTip()));
 
141
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOLabels->toolTip()));
142
142
        if (c.isValid())
143
143
        {
144
144
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
153
153
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.circlesColor")->getValue().value<Vec3f>();
154
154
        QColor color(0,0,0);
155
155
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
156
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOMarkers->toolTip()));
 
156
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOMarkers->toolTip()));
157
157
        if (c.isValid())
158
158
        {
159
159
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
168
168
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.galaxiesColor")->getValue().value<Vec3f>();
169
169
        QColor color(0,0,0);
170
170
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
171
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOGalaxies->toolTip()));
 
171
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOGalaxies->toolTip()));
172
172
        if (c.isValid())
173
173
        {
174
174
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
183
183
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.activeGalaxiesColor")->getValue().value<Vec3f>();
184
184
        QColor color(0,0,0);
185
185
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
186
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOActiveGalaxies->toolTip()));
 
186
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOActiveGalaxies->toolTip()));
187
187
        if (c.isValid())
188
188
        {
189
189
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
198
198
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.radioGalaxiesColor")->getValue().value<Vec3f>();
199
199
        QColor color(0,0,0);
200
200
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
201
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSORadioGalaxies->toolTip()));
 
201
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSORadioGalaxies->toolTip()));
202
202
        if (c.isValid())
203
203
        {
204
204
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
213
213
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.interactingGalaxiesColor")->getValue().value<Vec3f>();
214
214
        QColor color(0,0,0);
215
215
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
216
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOInteractingGalaxies->toolTip()));
 
216
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOInteractingGalaxies->toolTip()));
217
217
        if (c.isValid())
218
218
        {
219
219
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
228
228
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.quasarsColor")->getValue().value<Vec3f>();
229
229
        QColor color(0,0,0);
230
230
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
231
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOQuasars->toolTip()));
 
231
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOQuasars->toolTip()));
232
232
        if (c.isValid())
233
233
        {
234
234
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
243
243
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.possibleQuasarsColor")->getValue().value<Vec3f>();
244
244
        QColor color(0,0,0);
245
245
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
246
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOPossibleQuasars->toolTip()));
 
246
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOPossibleQuasars->toolTip()));
247
247
        if (c.isValid())
248
248
        {
249
249
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
258
258
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.clustersColor")->getValue().value<Vec3f>();
259
259
        QColor color(0,0,0);
260
260
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
261
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOStarClusters->toolTip()));
 
261
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOStarClusters->toolTip()));
262
262
        if (c.isValid())
263
263
        {
264
264
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
273
273
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.openClustersColor")->getValue().value<Vec3f>();
274
274
        QColor color(0,0,0);
275
275
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
276
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOOpenStarClusters->toolTip()));
 
276
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOOpenStarClusters->toolTip()));
277
277
        if (c.isValid())
278
278
        {
279
279
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
288
288
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.globularClustersColor")->getValue().value<Vec3f>();
289
289
        QColor color(0,0,0);
290
290
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
291
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOGlobularStarClusters->toolTip()));
 
291
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOGlobularStarClusters->toolTip()));
292
292
        if (c.isValid())
293
293
        {
294
294
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
303
303
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.stellarAssociationsColor")->getValue().value<Vec3f>();
304
304
        QColor color(0,0,0);
305
305
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
306
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOStellarAssociations->toolTip()));
 
306
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOStellarAssociations->toolTip()));
307
307
        if (c.isValid())
308
308
        {
309
309
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
318
318
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.starCloudsColor")->getValue().value<Vec3f>();
319
319
        QColor color(0,0,0);
320
320
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
321
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOStarClouds->toolTip()));
 
321
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOStarClouds->toolTip()));
322
322
        if (c.isValid())
323
323
        {
324
324
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
333
333
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.planetaryNebulaeColor")->getValue().value<Vec3f>();
334
334
        QColor color(0,0,0);
335
335
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
336
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOPlanetaryNebulae->toolTip()));
 
336
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOPlanetaryNebulae->toolTip()));
337
337
        if (c.isValid())
338
338
        {
339
339
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
348
348
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.darkNebulaeColor")->getValue().value<Vec3f>();
349
349
        QColor color(0,0,0);
350
350
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
351
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSODarkNebulae->toolTip()));
 
351
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSODarkNebulae->toolTip()));
352
352
        if (c.isValid())
353
353
        {
354
354
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
363
363
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.reflectionNebulaeColor")->getValue().value<Vec3f>();
364
364
        QColor color(0,0,0);
365
365
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
366
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOReflectionNebulae->toolTip()));
 
366
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOReflectionNebulae->toolTip()));
367
367
        if (c.isValid())
368
368
        {
369
369
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
378
378
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.bipolarNebulaeColor")->getValue().value<Vec3f>();
379
379
        QColor color(0,0,0);
380
380
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
381
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOBipolarNebulae->toolTip()));
 
381
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOBipolarNebulae->toolTip()));
382
382
        if (c.isValid())
383
383
        {
384
384
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
393
393
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.emissionNebulaeColor")->getValue().value<Vec3f>();
394
394
        QColor color(0,0,0);
395
395
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
396
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOEmissionNebulae->toolTip()));
 
396
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOEmissionNebulae->toolTip()));
397
397
        if (c.isValid())
398
398
        {
399
399
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
408
408
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.possiblePlanetaryNebulaeColor")->getValue().value<Vec3f>();
409
409
        QColor color(0,0,0);
410
410
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
411
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOPossiblePlanetaryNebulae->toolTip()));
 
411
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOPossiblePlanetaryNebulae->toolTip()));
412
412
        if (c.isValid())
413
413
        {
414
414
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
423
423
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.protoplanetaryNebulaeColor")->getValue().value<Vec3f>();
424
424
        QColor color(0,0,0);
425
425
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
426
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOProtoplanetaryNebulae->toolTip()));
 
426
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOProtoplanetaryNebulae->toolTip()));
427
427
        if (c.isValid())
428
428
        {
429
429
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
438
438
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.clusterWithNebulosityColor")->getValue().value<Vec3f>();
439
439
        QColor color(0,0,0);
440
440
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
441
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSONebulosityClusters->toolTip()));
 
441
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSONebulosityClusters->toolTip()));
442
442
        if (c.isValid())
443
443
        {
444
444
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
453
453
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.nebulaeColor")->getValue().value<Vec3f>();
454
454
        QColor color(0,0,0);
455
455
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
456
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSONebulae->toolTip()));
 
456
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSONebulae->toolTip()));
457
457
        if (c.isValid())
458
458
        {
459
459
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
468
468
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.hydrogenRegionsColor")->getValue().value<Vec3f>();
469
469
        QColor color(0,0,0);
470
470
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
471
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOHydrogenRegions->toolTip()));
 
471
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOHydrogenRegions->toolTip()));
472
472
        if (c.isValid())
473
473
        {
474
474
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
483
483
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.interstellarMatterColor")->getValue().value<Vec3f>();
484
484
        QColor color(0,0,0);
485
485
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
486
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOInterstellarMatter->toolTip()));
 
486
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOInterstellarMatter->toolTip()));
487
487
        if (c.isValid())
488
488
        {
489
489
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
498
498
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.emissionObjectsColor")->getValue().value<Vec3f>();
499
499
        QColor color(0,0,0);
500
500
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
501
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOEmissionObjects->toolTip()));
 
501
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOEmissionObjects->toolTip()));
502
502
        if (c.isValid())
503
503
        {
504
504
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
513
513
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.molecularCloudsColor")->getValue().value<Vec3f>();
514
514
        QColor color(0,0,0);
515
515
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
516
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOMolecularClouds->toolTip()));
 
516
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOMolecularClouds->toolTip()));
517
517
        if (c.isValid())
518
518
        {
519
519
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
528
528
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.blLacObjectsColor")->getValue().value<Vec3f>();
529
529
        QColor color(0,0,0);
530
530
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
531
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOBLLacObjects->toolTip()));
 
531
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOBLLacObjects->toolTip()));
532
532
        if (c.isValid())
533
533
        {
534
534
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
543
543
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.blazarsColor")->getValue().value<Vec3f>();
544
544
        QColor color(0,0,0);
545
545
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
546
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOBlazars->toolTip()));
 
546
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOBlazars->toolTip()));
547
547
        if (c.isValid())
548
548
        {
549
549
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
558
558
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.youngStellarObjectsColor")->getValue().value<Vec3f>();
559
559
        QColor color(0,0,0);
560
560
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
561
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOYoungStellarObjects->toolTip()));
 
561
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOYoungStellarObjects->toolTip()));
562
562
        if (c.isValid())
563
563
        {
564
564
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
573
573
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.supernovaRemnantsColor")->getValue().value<Vec3f>();
574
574
        QColor color(0,0,0);
575
575
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
576
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOSupernovaRemnants->toolTip()));
 
576
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOSupernovaRemnants->toolTip()));
577
577
        if (c.isValid())
578
578
        {
579
579
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
588
588
        Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getProperty("NebulaMgr.starsColor")->getValue().value<Vec3f>();
589
589
        QColor color(0,0,0);
590
590
        color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
591
 
        QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOStars->toolTip()));
 
591
        QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOStars->toolTip()));
592
592
        if (c.isValid())
593
593
        {
594
594
                vColor = Vec3f(c.redF(), c.greenF(), c.blueF());