aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Fadel <samuelfadel@gmail.com>2016-01-29 11:08:21 +0100
committerSamuel Fadel <samuelfadel@gmail.com>2016-01-29 11:08:21 +0100
commitdc5102d5fccac6e527913128f219c6199f1b8882 (patch)
treebc6d14f73b0e37e0cf64810b01e32eb389d0d0ad
parent9b3c79e34d543b78ff200d14e67d2bc96cb0995f (diff)
Changed default color scale to a rainbow variant.
-rw-r--r--main.cpp12
-rw-r--r--main_view.qml14
2 files changed, 13 insertions, 13 deletions
diff --git a/main.cpp b/main.cpp
index 77cce74..d478146 100644
--- a/main.cpp
+++ b/main.cpp
@@ -245,12 +245,12 @@ int main(int argc, char **argv)
m->cpBarChart->setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton);
m->rpBarChart->setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton);
- m->setColormapColorScale(Main::ColorScaleContinuous);
- m->setCPPlotColorScale(Main::ColorScaleContinuous);
- m->setRPPlotColorScale(Main::ColorScaleContinuous);
- m->setSplatColorScale(Main::ColorScaleContinuous);
- m->setCPBarChartColorScale(Main::ColorScaleContinuous);
- m->setRPBarChartColorScale(Main::ColorScaleContinuous);
+ m->setColormapColorScale(Main::ColorScaleRainbow);
+ m->setCPPlotColorScale(Main::ColorScaleRainbow);
+ m->setRPPlotColorScale(Main::ColorScaleRainbow);
+ m->setSplatColorScale(Main::ColorScaleRainbow);
+ m->setCPBarChartColorScale(Main::ColorScaleRainbow);
+ m->setRPBarChartColorScale(Main::ColorScaleRainbow);
m->cpPlot->setAutoScale(false);
m->rpPlot->setAutoScale(false);
diff --git a/main_view.qml b/main_view.qml
index 2336e44..48caa12 100644
--- a/main_view.qml
+++ b/main_view.qml
@@ -126,7 +126,8 @@ ApplicationWindow {
anchors.fill: parent
Label {
- width: parent.width
+ anchors.fill: parent
+ anchors.margins: 5
horizontalAlignment: Text.AlignRight
text: "Control points"
}
@@ -163,8 +164,8 @@ ApplicationWindow {
anchors.fill: parent
Label {
+ anchors.fill: parent
anchors.margins: 5
- width: parent.width
horizontalAlignment: Text.AlignRight
text: "Regular points"
}
@@ -429,7 +430,6 @@ ApplicationWindow {
text: "&Save data"
shortcut: "Ctrl+S"
onTriggered: {
- console.log("Saving control points' map...")
Main.saveData()
}
}
@@ -454,6 +454,10 @@ ApplicationWindow {
Component.onCompleted: {
this.append({
+ "value": Main.ColorScaleRainbow,
+ "text": "Rainbow"
+ });
+ this.append({
"value": Main.ColorScaleContinuous,
"text": "Continuous"
});
@@ -465,10 +469,6 @@ ApplicationWindow {
"value": Main.ColorScaleDivergent,
"text": "Divergent"
});
- this.append({
- "value": Main.ColorScaleRainbow,
- "text": "Rainbow"
- });
}
}
}