kopia lustrzana https://github.com/jbruce12000/kiln-controller
Broken edit timeshifting
rodzic
54480706b8
commit
5544e6f993
|
@ -77,6 +77,20 @@
|
|||
points[didx*ps+1] = newy;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// funny hack to make drag resizing usable
|
||||
if (newx > ax.max)
|
||||
{
|
||||
graph.plot = $.plot("#graph_container", [ graph.profile, graph.live ] , getOptions());
|
||||
}
|
||||
else if (newx < (ax.max*0.8))
|
||||
{
|
||||
console.log('baba');
|
||||
ax.max = ax.max*0.9;
|
||||
//ax2.max = ax2.max*0.9;
|
||||
}
|
||||
|
||||
plot.draw();
|
||||
|
||||
// hack to update the profile points after dragging graph in edit mode
|
||||
|
|
|
@ -2802,10 +2802,6 @@ Licensed under the MIT license.
|
|||
smallestDistance = maxDistance * maxDistance + 1,
|
||||
item = null, foundPoint = false, i, j, ps;
|
||||
|
||||
console.log('max dist:' + maxDistance);
|
||||
|
||||
|
||||
|
||||
for (i = series.length - 1; i >= 0; --i) {
|
||||
if (!seriesFilter(series[i]))
|
||||
continue;
|
||||
|
|
|
@ -6,7 +6,6 @@ var profiles = [];
|
|||
var selected_profile = 0;
|
||||
var selected_profile_name = "leadfree";
|
||||
|
||||
|
||||
var host = "ws://" + window.location.hostname + ":8080";
|
||||
var ws_status = new WebSocket(host+"/status");
|
||||
var ws_control = new WebSocket(host+"/control");
|
||||
|
@ -284,13 +283,25 @@ function getOptions()
|
|||
|
||||
series:
|
||||
{
|
||||
lines: { show: true },
|
||||
points: { show: true }
|
||||
lines:
|
||||
{
|
||||
show: true
|
||||
},
|
||||
|
||||
points:
|
||||
{
|
||||
show: true,
|
||||
radius: 5,
|
||||
symbol: "circle"
|
||||
},
|
||||
|
||||
shadowSize: 3
|
||||
|
||||
},
|
||||
|
||||
xaxis:
|
||||
{
|
||||
tickSize: 30,
|
||||
//tickSize: 30,
|
||||
min: 0,
|
||||
tickColor: 'rgba(216, 211, 197, 0.2)',
|
||||
font:
|
||||
|
|
|
@ -1 +1 @@
|
|||
{"type": "profile", "data": [[0, 25], [90, 150], [180, 183], [211, 237], [234, 184], [280, 25]], "name": "leadfree"}
|
||||
{"type": "profile", "data": [[0, 25], [90, 150], [180, 183], [211, 237], [234, 184], [2297420, 137]], "name": "leadfree"}
|
Ładowanie…
Reference in New Issue