diff --git a/public/assets/css/picoreflow.css b/public/assets/css/picoreflow.css index d89dcf7..c2ff553 100644 --- a/public/assets/css/picoreflow.css +++ b/public/assets/css/picoreflow.css @@ -98,6 +98,21 @@ body { text-shadow: 0 0 25px rgba(0, 0, 0, 1); } +.ds-input { + color: #d8d3c5; + font-family: "Digi"; + font-size: 24px; + text-shadow: 0 0 12px rgba(0, 0, 0, 1); + background: #3F3E3A url('/picoreflow/assets/images/panel_bg.png') repeat; + -moz-box-shadow: inset 0 0 12px 0 #000; + -webkit-box-shadow: inset 0 0 12px 0 #000; + box-shadow: inset 0 0 12px 0 #000; + text-align: right; + padding: 0; + padding-right: 7px; + +} + .ds-unit { font-family: "Arial"; font-size: 22px; @@ -107,7 +122,7 @@ body { } .ds-led { -margin: 0; + margin: 0; margin-top: 1px; padding-top: 1px; font-family: "NoticeStd"; @@ -298,6 +313,6 @@ margin: 0; color: #fff; } -td { +.modal-body td { width: 50%; } diff --git a/public/assets/js/picoreflow.js b/public/assets/js/picoreflow.js index 8375f6e..54c2ae2 100644 --- a/public/assets/js/picoreflow.js +++ b/public/assets/js/picoreflow.js @@ -66,25 +66,29 @@ function updateProgress(percentage) function updateProfileTable() { - var html = '

Profile Points

'; var dps = 0; + var slope = ""; + var color = []; + + var html = '

Profile Points

'; + html += ''; for(var i=0; i'; - html += ''; - html += '
'; - html += ''; - html += '
'; + if (i>=1) dps = Math.round( (graph.profile.data[i][1]-graph.profile.data[i-1][1])/(graph.profile.data[i][0]-graph.profile.data[i-1][0]) * 10) / 10; + if (dps > 0) { slope = "up"; color[0]="red"; color[1]="rgba(233, 28, 0, 0.54)"; } else + if (dps < 0) { slope = "down"; color[0]="blue"; color[1]="rgba(74, 159, 255, 0.54)"; dps *= -1; } else + if (dps == 0) { slope = "right"; color[0]="white"; color[1]="grey"; } - if (i>=1) dps = (graph.profile.data[i][1]-graph.profile.data[i-1][1])/(graph.profile.data[i][0]-graph.profile.data[i-1][0]); - - html += ''; - html += '
'; + html += '
'; + html += ''; + html += ''; + html += ''; + html += ''; } - html += ''; + html += '
#Target TimeTarget TemperatureSlope in °C/s

' + i + '

 
'; $('#profile_table').html(html); } @@ -453,7 +457,7 @@ $(document).ready(function() ws_control.onopen = function() { - + }; ws_control.onmessage = function(e) diff --git a/storage/profiles/leadfree.json b/storage/profiles/leadfree.json index 7952dd8..e1531ba 100644 --- a/storage/profiles/leadfree.json +++ b/storage/profiles/leadfree.json @@ -1 +1 @@ -{"type": "profile", "data": [[0, 20], [71.39490824491047, 115.00000000000001], [209.77995110024452, 248.12734082397003], [300, 0]], "name": "leadfree"} \ No newline at end of file +{"type": "profile", "data": [[0, 25], [90, 150], [180, 183], [211, 237], [234, 184], [280, 25]], "name": "leadfree"} \ No newline at end of file