From 80d3fa4b61d02ef3456cfe3b8224be884db16532 Mon Sep 17 00:00:00 2001
From: chrono <chrono@open-resource.org>
Date: Sun, 24 Nov 2013 20:32:04 +0100
Subject: [PATCH] Updated display

---
 .gitignore                       |  2 +-
 public/assets/css/picoreflow.css |  1 +
 public/index.html                | 30 ++++++++++++++++++++++++------
 storage/profiles/lead.json       |  6 +-----
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e01749..391df36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 *.swp
 .DStore/
 thumbs.db
-
+storage/profiles
diff --git a/public/assets/css/picoreflow.css b/public/assets/css/picoreflow.css
index 4389fd8..a072c03 100644
--- a/public/assets/css/picoreflow.css
+++ b/public/assets/css/picoreflow.css
@@ -9,6 +9,7 @@ text-align: right;
 padding-right: 10px;
 font-size: 20px;
 height: 35px;
+line-height: 35px;
 width: 80px;
 vertical-align: middle;
 color: #d8d3c5;
diff --git a/public/index.html b/public/index.html
index 12dcae9..0049828 100644
--- a/public/index.html
+++ b/public/index.html
@@ -21,12 +21,13 @@
  <div class="container">
 
   <!-- Static navbar -->
-  <div class="navbar navbar-default" role="navigation">
+  <div id="main_nav" class="navbar navbar-default" role="navigation">
    <div class="pull-left" style="margin: 14px">
     <span id="act_temp" class="display" style="color: #75890c">25 &deg;C</span>
     <span id="target_temp" class="display">OFF</span>
-    <span id="state" class="display">Idle</span>
-    <span class="display">-</span>
+    <span id="state" class="display" style="font-size: 14px">Idle</span>
+    <span id="eta" class="display" style="width: 60px">-</span>
+    <span id="power" class="display" style="width: 35px;">&nbsp;</span>
    </div>
 
    <div class="pull-right" style="margin: 14px">
@@ -127,6 +128,7 @@ function runTask() {
       console.log(JSON.stringify(test));
 
      ws_control.send(JSON.stringify(test));
+     graph.series[1].setData([]);
 }
 
 
@@ -141,7 +143,12 @@ function enterEditMode() {
     //$('#e2').hide();
     $('#saveas').show();
     $('#e2').select2('container').hide();
+    $('#main_nav').hide();
     $('#form_profile_name').attr('value', profiles[selected_profile].name);
+    graph.series[0].options.marker.enabled=true;
+    graph.series[0].options.draggableX=true;
+    graph.series[0].options.draggableY=true;
+    graph.render();
 }
 
 
@@ -592,6 +599,14 @@ $(function() {
                           $("#nav_start").hide();
                           $("#nav_stop").show();
                         series.addPoint([x.runtime, x.temperature], true, false);
+
+                        left = parseInt(x.totaltime-x.runtime);
+                        var minutes = Math.floor(left / 60);
+                        var seconds = left - minutes * 60;
+                        $('#eta').html(minutes+':'+ (seconds < 10 ? "0" : "") + seconds);
+
+                        $('#power').css("background-color", (x.power > 0.5 ? "#75890c" : "#1F1E1A") );
+
                       }
                       else
                       {
@@ -675,10 +690,13 @@ $(function() {
             [240, 183 ],
             [300, 25 ]
           ],
-          draggableX: true,
-          draggableY: true,
+          draggableX: false,
+          draggableY: false,
           dragMinY: 0,
-          dragMaxY: 250
+          dragMaxY: 250,
+          marker: {
+            enabled: false
+          }
         },
         {
           name: 'Act',
diff --git a/storage/profiles/lead.json b/storage/profiles/lead.json
index b33a0f8..77b368c 100644
--- a/storage/profiles/lead.json
+++ b/storage/profiles/lead.json
@@ -1,5 +1 @@
-{ 
-    "type" : "profile",
-    "name" : "lead",
-    "data" : [[0,20],[60,100],[100,180],[300,0]]
-}
+{"data": [[0, 20], [60, 100], [168.38263665594855, 120.9375], [225.7138263665595, 176.25]], "type": "profile", "name": "lead"}
\ No newline at end of file