Skip to content

Commit 348bb3e

Browse files
committed
Remove UI related settings from ConfigurationHeightmap
1 parent 94827e2 commit 348bb3e

3 files changed

Lines changed: 0 additions & 15 deletions

File tree

src/gpilot/core/heightmap/configurationheightmap.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,14 @@ const QMap<QString,QVariant> DEFAULTS = {
1010
{"heightmapAreaY1", 0},
1111
{"heightmapAreaX2", 100},
1212
{"heightmapAreaY2", 100},
13-
{"heightmapAreaShow", false},
1413
{"heightmapGridX", 5},
1514
{"heightmapGridY", 5},
1615
{"heightmapGridZTop", 1},
1716
{"heightmapGridZBottom", -1},
1817
{"heightmapProbeFeed", 10},
19-
{"heightmapGridShow", false},
2018
{"heightmapInterpolationStepX", 5},
2119
{"heightmapInterpolationStepY", 5},
2220
{"heightmapInterpolationType", 0},
23-
{"heightmapInterpolationShow", false},
2421
};
2522

2623
ConfigurationHeightmap::ConfigurationHeightmap(QObject *parent) : AbstractConfigurationModule(parent, DEFAULTS)

src/gpilot/core/heightmap/configurationheightmap.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@ class ConfigurationHeightmap : public AbstractConfigurationModule
1616
Q_PROPERTY(double areaY1 MEMBER m_areaY1 NOTIFY changed)
1717
Q_PROPERTY(double areaX2 MEMBER m_areaX2 NOTIFY changed)
1818
Q_PROPERTY(double areaY2 MEMBER m_areaY2 NOTIFY changed)
19-
Q_PROPERTY(bool areaShow MEMBER m_areaShow NOTIFY changed)
2019
Q_PROPERTY(double gridX MEMBER m_gridX NOTIFY changed)
2120
Q_PROPERTY(double gridY MEMBER m_gridY NOTIFY changed)
2221
Q_PROPERTY(double gridZTop MEMBER m_gridZTop NOTIFY changed)
2322
Q_PROPERTY(double gridZBottom MEMBER m_gridZBottom NOTIFY changed)
2423
Q_PROPERTY(double probeFeed MEMBER m_probeFeed NOTIFY changed)
25-
Q_PROPERTY(bool gridShow MEMBER m_gridShow NOTIFY changed)
2624
Q_PROPERTY(double interpolationStepX MEMBER m_interpolationStepX NOTIFY changed)
2725
Q_PROPERTY(double interpolationStepY MEMBER m_interpolationStepY NOTIFY changed)
2826
Q_PROPERTY(int interpolationType MEMBER m_interpolationType NOTIFY changed)
29-
Q_PROPERTY(bool interpolationShow MEMBER m_interpolationShow NOTIFY changed)
3027

3128
public:
3229
ConfigurationHeightmap(QObject *parent = nullptr);
@@ -37,19 +34,16 @@ class ConfigurationHeightmap : public AbstractConfigurationModule
3734
double areaY1() const { return m_areaY1; }
3835
double areaX2() const { return m_areaX2; }
3936
double areaY2() const { return m_areaY2; }
40-
bool areaShow() const { return m_areaShow; }
4137

4238
double gridX() const { return m_gridX; }
4339
double gridY() const { return m_gridY; }
4440
double gridZTop() const { return m_gridZTop; }
4541
double gridZBottom() const { return m_gridZBottom; }
4642
double probeFeed() const { return m_probeFeed; }
47-
bool gridShow() const { return m_gridShow; }
4843

4944
double interpolationStepX() const { return m_interpolationStepX; }
5045
double interpolationStepY() const { return m_interpolationStepY; }
5146
int interpolationType() const { return m_interpolationType; }
52-
bool interpolationShow() const { return m_interpolationShow; }
5347

5448
static ConfigurationHeightmap& instance();
5549
static void registerWith(Configuration& cfg);
@@ -59,19 +53,16 @@ class ConfigurationHeightmap : public AbstractConfigurationModule
5953
double m_areaY1;
6054
double m_areaX2;
6155
double m_areaY2;
62-
bool m_areaShow;
6356

6457
double m_gridX;
6558
double m_gridY;
6659
double m_gridZTop;
6760
double m_gridZBottom;
6861
double m_probeFeed;
69-
bool m_gridShow;
7062

7163
double m_interpolationStepX;
7264
double m_interpolationStepY;
7365
int m_interpolationType;
74-
bool m_interpolationShow;
7566
};
7667

7768
#endif // CONFIGURATIONHEIGHTMAP_H

src/gpilot/ui/forms/partials/main/partmainheightmap.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,16 @@ void PartMainHeightmap::applyHeightmapConfiguration(ConfigurationHeightmap &conf
8585
ui->txtAreaHeight->setValue(configurationHeightmap.areaY2() - configurationHeightmap.areaY1());
8686
ui->txtAreaX2->setValue(configurationHeightmap.areaY2());
8787
ui->txtAreaY2->setValue(configurationHeightmap.areaY2());
88-
ui->chkShowArea->setChecked(configurationHeightmap.areaShow());
8988

9089
ui->txtGridX->setValue(configurationHeightmap.gridX());
9190
ui->txtGridY->setValue(configurationHeightmap.gridY());
9291
ui->txtGridZTop->setValue(configurationHeightmap.gridZTop());
9392
ui->txtGridZBottom->setValue(configurationHeightmap.gridZBottom());
9493
ui->txtProbeFeed->setValue(configurationHeightmap.probeFeed());
95-
ui->chkShowProbeGrid->setChecked(configurationHeightmap.gridShow());
9694

9795
ui->txtInterpolationStepX->setValue(configurationHeightmap.interpolationStepX());
9896
ui->txtInterpolationStepY->setValue(configurationHeightmap.interpolationStepY());
9997
ui->cboInterpolationMode->setCurrentIndex(configurationHeightmap.interpolationType());
100-
ui->chkShowInterpolation->setChecked(configurationHeightmap.interpolationShow());
10198
}
10299

103100
bool PartMainHeightmap::heightmapMode()

0 commit comments

Comments
 (0)