diff options
-rw-r--r-- | main.cpp | 12 | ||||
-rw-r--r-- | main_view.qml | 14 |
2 files changed, 13 insertions, 13 deletions
@@ -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" - }); } } } |