From e9d14f93498832687cbdbeb79748f9030e49fb2f Mon Sep 17 00:00:00 2001
From: Samuel Fadel <samuelfadel@gmail.com>
Date: Thu, 21 Jan 2016 14:50:39 +0100
Subject: Added second bar chart.

Bar charts are now exclusive to the type of points they are assigned
to (either CPs or RPs).
---
 main_view.qml | 46 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 7 deletions(-)

(limited to 'main_view.qml')

diff --git a/main_view.qml b/main_view.qml
index 561c07d..4c5c7a7 100644
--- a/main_view.qml
+++ b/main_view.qml
@@ -111,19 +111,50 @@ ApplicationWindow {
                 }
             }
 
-            Rectangle { id: secret
-                Layout.minimumHeight: 80
+            Rectangle {
+                Layout.minimumHeight: 60
                 Layout.fillHeight: true
                 width: mainView.width
                 color: "#ffffff"
 
                 Item {
-                    id: bottomView
+                    id: bottomViewCP
                     anchors.fill: parent
 
                     BarChart {
-                        id: barChart
-                        objectName: "barChart"
+                        id: cpBarChart
+                        objectName: "cpBarChart"
+                        anchors.fill: parent
+                    }
+
+                    //HistoryGraph {
+                    //    id: history
+                    //    objectName: "history"
+                    //    anchors.fill: parent
+                    //}
+                }
+
+                Rectangle {
+                    anchors.fill: parent
+                    border.width: 1
+                    border.color: "#cccccc"
+                    color: "transparent"
+                }
+            }
+
+            Rectangle {
+                Layout.minimumHeight: 60
+                Layout.fillHeight: true
+                width: mainView.width
+                color: "#ffffff"
+
+                Item {
+                    id: bottomViewRP
+                    anchors.fill: parent
+
+                    BarChart {
+                        id: rpBarChart
+                        objectName: "rpBarChart"
                         anchors.fill: parent
                     }
 
@@ -257,7 +288,7 @@ ApplicationWindow {
                         SpinBox {
                             id: rpGlyphSizeSpinBox
                             maximumValue: 100
-                            minimumValue: 6
+                            minimumValue: 2
                             value: rpPlot.glyphSize()
                             decimals: 1
                             stepSize: 1
@@ -367,7 +398,8 @@ ApplicationWindow {
                             id: barChartColormapCombo
                             model: colormapModel
                             onActivated: {
-                                Main.setBarChartColorScale(model.get(index).value);
+                                Main.setCPBarChartColorScale(model.get(index).value);
+                                Main.setRPBarChartColorScale(model.get(index).value);
                             }
                         }
                     }
-- 
cgit v1.2.3