([\s\S]*)<.div>/mi;
let template = '
';
- let mctmpl = $($.parseHTML('
' + $("#files_template_machinecode").text() + '
')[0]);
+ let mc = $("#files_template_machinecode");
+ let mctmpl = $($.parseHTML('
' + mc.text() + '
')[0]);
let actions = mctmpl.find('.action-buttons');
actions.attr('data-bind', "css: 'cpq-' + display.split('.')[1]");
actions.append(template);
@@ -25,7 +26,16 @@ $(function() {
title.append(`
`);
title.append('
');
- $("#files_template_machinecode").text(mctmpl.html());
+ mc.text(mctmpl.html());
+
+ // Also inject the add-to-queue button for models, which can be auto-sliced
+ let mdl = $("#files_template_model");
+ let modeltmpl = $($.parseHTML('
' + mdl.text() + '
')[0]);
+ actions = modeltmpl.find('.action-buttons');
+ actions.attr('data-bind', "css: 'cpq-' + display.split('.')[1]");
+ actions.append(template);
+
+ mdl.text(modeltmpl.html());
// This injects the status of the queue into PrinterStateViewModel (the "State" panel)
$("#state .accordion-inner").prepend(`
diff --git a/continuousprint/static/js/continuousprint_api.js b/continuousprint/static/js/continuousprint_api.js
index 79d12a0..504ad9d 100644
--- a/continuousprint/static/js/continuousprint_api.js
+++ b/continuousprint/static/js/continuousprint_api.js
@@ -101,6 +101,9 @@ class CPAPI {
this._call_base(`${this.BASE}/set_active`, {active}, cb);
}
+ simulate(automation, symtable, cb, err_cb) {
+ this._call(this.AUTOMATION, 'simulate', {symtable: JSON.stringify(symtable), automation: JSON.stringify(automation)}, cb, err_cb, false);
+ }
}
try {
diff --git a/continuousprint/static/js/continuousprint_job.js b/continuousprint/static/js/continuousprint_job.js
index 9880e0d..f713a00 100644
--- a/continuousprint/static/js/continuousprint_job.js
+++ b/continuousprint/static/js/continuousprint_job.js
@@ -10,11 +10,18 @@ if (typeof ko === "undefined" || ko === null) {
}
if (typeof CPSet === "undefined" || CPSet === null) {
CPSet = require('./continuousprint_set');
+ CPStats = require('./continuousprint_stats');
+ CP_STATS_DIMENSIONS={
+ completed: null,
+ count: null,
+ remaining: null,
+ total: null,
+ };
}
// jobs and sets are derived from self.queue, but they must be
// observableArrays in order for Sortable to be able to reorder it.
-function CPJob(obj, peers, api, profile, materials) {
+function CPJob(obj, peers, api, profile, materials, stats_dimensions=CP_STATS_DIMENSIONS) {
if (api === undefined) {
throw Error("API must be provided when creating CPJob");
}
@@ -113,42 +120,6 @@ function CPJob(obj, peers, api, profile, materials) {
api.edit(api.JOB, data, self._update);
}
- self._safeParse = function(v) {
- v = parseInt(v, 10);
- if (isNaN(v)) {
- return 0;
- }
- return v;
- }
-
-
- self.humanize = function(num, unit="") {
- // Humanizes numbers by condensing and adding units
- let v = '';
- if (num < 1000) {
- v = (num % 1 === 0) ? num : num.toFixed(1);
- } else if (num < 100000) {
- let k = (num/1000);
- v = ((k % 1 === 0) ? k : k.toFixed(1)) + 'k';
- }
- return v + unit;
- };
-
- self.humanTime = function(s) {
- // Humanizes time values; parameter is seconds
- if (s < 60) {
- return Math.round(s) + 's';
- } else if (s < 3600) {
- return Math.round(s/60) + 'm';
- } else if (s < 86400) {
- let h = s/3600;
- return ((h % 1 === 0) ? h : h.toFixed(1)) + 'h';
- } else {
- let d = s/86400;
- return ((d % 1 === 0) ? d : d.toFixed(1)) + 'd';
- }
- };
-
self.getMaterialLinearMasses = ko.computed(function() {
let result = [];
for (let m of materials()) {
@@ -162,101 +133,8 @@ function CPJob(obj, peers, api, profile, materials) {
return result;
});
- self.raw_stats = ko.computed(function() {
- let result = {completed: 0, remaining: 0, count: 0};
- for (let qs of self.sets()) {
- if (!qs.profile_matches()) {
- continue;
- }
- result.remaining += self._safeParse(qs.remaining());
- result.count += self._safeParse(qs.count());
- result.completed += self._safeParse(qs.completed());
- }
- return result;
- });
-
self.totals = ko.computed(function() {
- let r = [
- {legend: 'Total items', title: null},
- {legend: 'Total time', title: "Uses Octoprint's file analysis estimate; may be inaccurate"},
- {legend: 'Total mass', title: "Mass is calculated using active spool(s) in SpoolManager"},
- ];
-
- let linmasses = self.getMaterialLinearMasses();
-
- for (let t of r) {
- t.count = 0;
- t.completed = 0;
- t.remaining = 0;
- t.total = 0;
- t.error = 0;
- }
-
- for (let qs of self.sets()) {
- if (!qs.profile_matches()) {
- continue;
- }
-
- let rem = self._safeParse(qs.remaining())
- let tot = self._safeParse(qs.length_remaining());
- let count = self._safeParse(qs.count());
- let cplt = self._safeParse(qs.completed());
-
- let meta = qs.metadata;
- let ept = meta && meta.estimatedPrintTime
- let len = meta && meta.filamentLengths;
-
- // Update print count totals
- r[0].remaining += rem;
- r[0].total += tot;
- r[0].count += count;
- r[0].completed += cplt;
-
- if (ept === null || ept === undefined) {
- r[1].error += 1;
- } else {
- r[1].remaining += rem * ept;
- r[1].total += tot * ept
- r[1].count += count * ept;
- r[1].completed += cplt * ept;
- }
-
- if (len === null || len === undefined || len.length === 0) {
- r[2].error += 1;
- } else {
- let mass = 0;
- for (let i = 0; i < len.length; i++) {
- mass += linmasses[i] * len[i];
- }
-
- if (!isNaN(mass)) {
- r[2].remaining += rem * mass;
- r[2].total += tot * mass;
- r[2].count += count * mass;
- r[2].completed += cplt * mass;
- } else {
- r[2].error += 1;
- }
- }
-
- }
- // Assign error texts
- r[0].error = '';
- r[1].error = (r[1].error > 0) ? `${r[1].error} sets missing time estimates` : '';
- r[2].error = (r[2].error > 0) ? `${r[1].error} errors calculating mass` : '';
-
- for (let k of ['remaining', 'total', 'count', 'completed']) {
- r[0][k] = self.humanize(r[0][k]);
- r[1][k] = self.humanTime(r[1][k]);
- r[2][k] = self.humanize(r[2][k], 'g');
- }
-
- // Hide mass details if linmasses is empty (implies SpoolManager not set up)
- if (linmasses.length === 0) {
- r.splice(2,1);
- }
-
- return r;
+ return new CPStats(() => [self], stats_dimensions);
});
self.checkFraction = ko.computed(function() {
diff --git a/continuousprint/static/js/continuousprint_job.test.js b/continuousprint/static/js/continuousprint_job.test.js
index 4bface3..0485dbe 100644
--- a/continuousprint/static/js/continuousprint_job.test.js
+++ b/continuousprint/static/js/continuousprint_job.test.js
@@ -52,9 +52,11 @@ test('onSetModified existing', () => {
});
test('totals', () => {
- let j = new Job({count: 3, completed: 2, remaining: 1, sets: sets()}, [], api(), prof(), mats());
+ let j = new Job({
+ count: 3, completed: 2, remaining: 1, sets: sets()
+ }, [], api(), prof(), mats());
- let t = j.totals();
+ let t = j.totals().values_humanized();
expect(t[0]).toStrictEqual({
completed: "2", // sets have 1/2 completed this run
count: "4", // 2 sets each with count=2
diff --git a/continuousprint/static/js/continuousprint_queue.js b/continuousprint/static/js/continuousprint_queue.js
index b194cf6..7c09ac9 100644
--- a/continuousprint/static/js/continuousprint_queue.js
+++ b/continuousprint/static/js/continuousprint_queue.js
@@ -9,12 +9,19 @@ if (typeof CPJob === "undefined" || CPJob === null) {
// In the testing environment, dependencies must be manually imported
ko = require('knockout');
CPJob = require('./continuousprint_job');
+ CPStats = require('./continuousprint_stats');
+ CP_STATS_DIMENSIONS={
+ completed: null,
+ count: null,
+ remaining: null,
+ total: null,
+ };
log = {
"getLogger": () => {return console;}
};
}
-function CPQueue(data, api, files, profile, materials) {
+function CPQueue(data, api, files, profile, materials, stats_dimensions=CP_STATS_DIMENSIONS) {
var self = this;
self.api = api;
self.files = files;
@@ -23,7 +30,7 @@ function CPQueue(data, api, files, profile, materials) {
self.addr = data.addr;
self.jobs = ko.observableArray([]);
self._pushJob = function(jdata) {
- self.jobs.push(new CPJob(jdata, data.peers, self.api, profile, materials));
+ self.jobs.push(new CPJob(jdata, data.peers, self.api, profile, materials, stats_dimensions));
};
for (let j of data.jobs) {
self._pushJob(j);
@@ -31,6 +38,7 @@ function CPQueue(data, api, files, profile, materials) {
self.shiftsel = ko.observable(-1);
self.details = ko.observable("");
self.fullDetails = ko.observable("");
+ self.showStats = ko.observable(true);
self.ready = ko.observable(data.name === 'local' || Object.keys(data.peers).length > 0);
if (self.addr !== null && data.peers !== undefined) {
let pkeys = Object.keys(data.peers);
@@ -95,18 +103,19 @@ function CPQueue(data, api, files, profile, materials) {
break;
case "Unstarted Jobs":
for (let j of self.jobs()) {
- j.onChecked(j.sets().length !== 0 && j.raw_stats().completed === 0);
+ let t = j.totals().values()[0];
+ j.onChecked(j.sets().length !== 0 && t.completed === 0 && j.completed() === 0);
}
break;
case "Incomplete Jobs":
for (let j of self.jobs()) {
- let t = j.raw_stats();
- j.onChecked(t.remaining > 0 && t.remaining < t.count);
+ let t = j.totals().values()[0];
+ j.onChecked(j.remaining() > 0 && (j.completed() > 0 || t.completed > 0));
}
break;
case "Completed Jobs":
for (let j of self.jobs()) {
- j.onChecked(j.sets().length !== 0 && j.raw_stats().remaining == 0);
+ j.onChecked(j.sets().length !== 0 && j.remaining() === 0);
}
break;
default:
@@ -158,6 +167,10 @@ function CPQueue(data, api, files, profile, materials) {
e.preventDefault();
}
+ self.totals = ko.computed(function() {
+ return new CPStats(self.jobs, stats_dimensions);
+ });
+
// *** ko template methods ***
self._getSelections = function() {
let jobs = [];
diff --git a/continuousprint/static/js/continuousprint_queue.test.js b/continuousprint/static/js/continuousprint_queue.test.js
index 6f527c0..262312b 100644
--- a/continuousprint/static/js/continuousprint_queue.test.js
+++ b/continuousprint/static/js/continuousprint_queue.test.js
@@ -90,7 +90,7 @@ test('setCount', () => {
describe('batchSelect', () => {
let v = init(njobs=4);
v.jobs()[0].sets([]); // job 1 is empty
- // job 2 is unstarted; no action needed
+ // job 2 (idx 1) is unstarted; no action needed
v.jobs()[2].sets()[0].count(3); // Job 3 is incomplete, set 5 is incomplete
v.jobs()[2].sets()[0].completed(1);
v.jobs()[2].sets()[0].remaining(2);
diff --git a/continuousprint/static/js/continuousprint_settings.js b/continuousprint/static/js/continuousprint_settings.js
index 0bda78b..87267c0 100644
--- a/continuousprint/static/js/continuousprint_settings.js
+++ b/continuousprint/static/js/continuousprint_settings.js
@@ -9,14 +9,17 @@ if (typeof log === "undefined" || log === null) {
CP_CUSTOM_EVENTS = [];
CP_LOCAL_IP = '';
CPAPI = require('./continuousprint_api');
+ CP_SIMULATOR_DEFAULT_SYMTABLE = function() {return {};};
+ CPSettingsEvent = require('./continuousprint_settings_event');
+ OctoPrint = undefined;
}
-function CPSettingsViewModel(parameters, profiles=CP_PRINTER_PROFILES, default_scripts=CP_GCODE_SCRIPTS, custom_events=CP_CUSTOM_EVENTS) {
+function CPSettingsViewModel(parameters, profiles=CP_PRINTER_PROFILES, default_scripts=CP_GCODE_SCRIPTS, custom_events=CP_CUSTOM_EVENTS, default_symtable=CP_SIMULATOR_DEFAULT_SYMTABLE, octoprint=OctoPrint) {
var self = this;
self.PLUGIN_ID = "octoprint.plugins.continuousprint";
self.log = log.getLogger(self.PLUGIN_ID);
self.settings = parameters[0];
- self.files = parameters[1]
+ self.files = parameters[1];
self.api = parameters[2] || new CPAPI();
self.loading = ko.observable(false);
self.api.init(self.loading, function(code, reason) {
@@ -31,6 +34,40 @@ function CPSettingsViewModel(parameters, profiles=CP_PRINTER_PROFILES, default_s
});
self.local_ip = ko.observable(CP_LOCAL_IP || '');
+ // We have to use the global slicer data retriever instead of
+ // slicingViewModel because the latter does not make its profiles
+ // available without modifying the slicing modal.
+ self.slicers = ko.observable({});
+ self.slicer = ko.observable();
+ self.slicer_profile = ko.observable();
+ if (octoprint !== undefined) {
+ octoprint.slicing.listAllSlicersAndProfiles().done(function (data) {
+ let result = {};
+ for (let d of Object.values(data)) {
+ let profiles = [];
+ let default_profile = null;
+ for (let p of Object.keys(d.profiles)) {
+ if (d.profiles[p].default) {
+ default_profile = p;
+ continue;
+ }
+ profiles.push(p);
+ }
+ if (default_profile) {
+ profiles.unshift(default_profile);
+ }
+ result[d.key] = {
+ name: d.displayName,
+ key: d.key,
+ profiles,
+ };
+ }
+ self.slicers(result);
+ });
+ }
+ self.slicerProfiles = ko.computed(function() {
+ return (self.slicers()[self.slicer()] || {}).profiles;
+ });
// Constants defined in continuousprint_settings.jinja2, passed from the plugin (see `get_template_vars()` in __init__.py)
self.profiles = {};
for (let prof of profiles) {
@@ -306,6 +343,8 @@ function CPSettingsViewModel(parameters, profiles=CP_PRINTER_PROFILES, default_s
self.selected_model(prof.model);
break;
}
+ self.slicer(self.settings.settings.plugins.continuousprint.cp_slicer());
+ self.slicer_profile(self.settings.settings.plugins.continuousprint.cp_slicer_profile());
}
// Queues and scripts are stored in the DB; we must fetch them whenever
// the settings page is loaded
@@ -343,10 +382,7 @@ function CPSettingsViewModel(parameters, profiles=CP_PRINTER_PROFILES, default_s
preprocessor: ko.observable(preprocessors[a.preprocessor]),
});
}
- events.push({
- ...k,
- actions: ko.observableArray(actions),
- });
+ events.push(new CPSettingsEvent(k, actions, self.api, default_symtable()));
}
events.sort((a, b) => a.display < b.display);
self.events(events);
@@ -356,6 +392,10 @@ function CPSettingsViewModel(parameters, profiles=CP_PRINTER_PROFILES, default_s
// Called automatically by SettingsViewModel
self.onSettingsBeforeSave = function() {
+ let cpset = self.settings.settings.plugins.continuousprint;
+ cpset.cp_slicer(self.slicer());
+ cpset.cp_slicer_profile(self.slicer_profile());
+
let queues = self.queues();
if (JSON.stringify(queues) !== self.queue_fingerprint) {
// Sadly it appears flask doesn't have good parsing of nested POST structures,
@@ -375,19 +415,9 @@ function CPSettingsViewModel(parameters, profiles=CP_PRINTER_PROFILES, default_s
}
let events = {};
for (let e of self.events()) {
- let ks = [];
- for (let a of e.actions()) {
- let pp = a.preprocessor()
- if (pp !== null) {
- pp = pp.name();
- }
- ks.push({
- script: a.script.name(),
- preprocessor: pp,
- });
- }
- if (ks.length !== 0) {
- events[e.event] = ks;
+ let e2 = e.pack();
+ if (e2) {
+ events[e.event] = e2;
}
}
let data = {scripts, preprocessors, events};
diff --git a/continuousprint/static/js/continuousprint_settings.test.js b/continuousprint/static/js/continuousprint_settings.test.js
index 69a62f6..9bd8c4c 100644
--- a/continuousprint/static/js/continuousprint_settings.test.js
+++ b/continuousprint/static/js/continuousprint_settings.test.js
@@ -37,6 +37,14 @@ const EVENTS = [
{event: 'e1'},
];
+function mock_oprint() {
+ return {
+ slicing: {
+ listAllSlicersAndProfiles: jest.fn(),
+ },
+ };
+}
+
function mocks() {
return [
{
@@ -46,6 +54,8 @@ function mocks() {
cp_bed_clearing_script: jest.fn(),
cp_queue_finished_script: jest.fn(),
cp_printer_profile: jest.fn(),
+ cp_slicer: jest.fn(),
+ cp_slicer_profile: jest.fn(),
},
},
},
@@ -61,6 +71,7 @@ function mocks() {
init: jest.fn(),
get: jest.fn((_, cb) => cb([])),
edit: jest.fn(),
+ simulate: jest.fn(),
},
];
}
@@ -289,3 +300,55 @@ test('add new preprocessor from Events tab', () =>{
expect(v.gotoTab).toHaveBeenCalled();
});
+
+test('Get slicers and profiles for dropdowns', () => {
+ let op = mock_oprint();
+ let cb = null;
+
+ op.slicing.listAllSlicersAndProfiles = () => {
+ return {
+ done: (c) => cb = c
+ };
+ };
+ let v = new VM.CPSettingsViewModel(mocks(), PROFILES, SCRIPTS, EVENTS, CP_SIMULATOR_DEFAULT_SYMTABLE, op);
+ cb({"preprintservice":{
+ "configured":false,
+ "default":false,
+ "displayName":"PrePrintService",
+ "extensions":{
+ "destination":["gco","gcode","g"],
+ "source":["stl"]
+ },
+ "key":"preprintservice",
+ "profiles":{
+ "profile_015mm_brim":{
+ "default":true,
+ "description":"Imported ...",
+ "displayName":"profile_015mm_brim\n",
+ "key":"profile_015mm_brim",
+ "resource":"http://localhost:5000/api/slicing/preprintservice/profiles/profile_015mm_brim"
+ }
+ },
+ "sameDevice":false
+ }});
+ expect(v.slicers()).toEqual({
+ "preprintservice": {
+ "key": "preprintservice",
+ "name": "PrePrintService",
+ "profiles": ["profile_015mm_brim"],
+ },
+ });
+});
+
+test('Set slicer & profile before save', () => {
+ let v = new VM.CPSettingsViewModel(mocks(), PROFILES, SCRIPTS, EVENTS);
+ v.slicers({slicername: {key: "slicername", name: "Slicer", profiles: ["profile1", "profile2"]}});
+
+ v.slicer("slicername");
+ expect(v.slicerProfiles()).toEqual(["profile1", "profile2"]);
+ v.slicer_profile("profile2");
+
+ v.onSettingsBeforeSave();
+ expect(v.settings.settings.plugins.continuousprint.cp_slicer).toHaveBeenCalledWith("slicername");
+ expect(v.settings.settings.plugins.continuousprint.cp_slicer_profile).toHaveBeenCalledWith("profile2");
+});
diff --git a/continuousprint/static/js/continuousprint_settings_event.js b/continuousprint/static/js/continuousprint_settings_event.js
new file mode 100644
index 0000000..41ea5c2
--- /dev/null
+++ b/continuousprint/static/js/continuousprint_settings_event.js
@@ -0,0 +1,176 @@
+if (typeof log === "undefined" || log === null) {
+ // In the testing environment, dependencies must be manually imported
+ ko = require('knockout');
+ log = {
+ "getLogger": () => {return console;}
+ };
+ CP_PRINTER_PROFILES = [];
+ CP_GCODE_SCRIPTS = [];
+ CP_CUSTOM_EVENTS = [];
+ CP_LOCAL_IP = '';
+ CPAPI = require('./continuousprint_api');
+}
+
+function CPSettingsEvent(evt, actions, api, default_symtable) {
+ var self = this;
+ self.api = api;
+ self.name = evt.name;
+ self.event = evt.event;
+ self.display = evt.display;
+ self.desc = evt.desc;
+
+ // Construct symtable used for simulating output
+ let sym = default_symtable;
+ if (sym.current) {
+ sym.current.state = evt.sym_state;
+ }
+ self.symtable = ko.observable(sym);
+ self.symtableEdit = ko.observable(JSON.stringify(sym, null, 2));
+ self.symtableEditError = ko.observable(null);
+ self.symtableEdit.subscribe(function(newValue) {
+ try {
+ let v = JSON.parse(newValue);
+ self.symtableEditError(null);
+ self.symtable(v);
+ } catch(e) {
+ self.symtableEditError(e.toString());
+ }
+ });
+
+ // actions is an array of {script, preprocessor (observable)}
+ self.actions = ko.observableArray(actions);
+
+ self.timeout = null;
+ self.running = ko.observable(false);
+ self.simulation = ko.observable({
+ gcode: "",
+ stdout: "",
+ stderr: "",
+ symtable_diff: {},
+ });
+ self.simGcodeOutput = ko.computed(function() {
+ let s = self.simulation();
+ if (self.running()) {
+ return "...";
+ } else if (s.stderr !== "") {
+ return "@PAUSE; Preprocessor error";
+ } else {
+ return s.gcode;
+ }
+ });
+ self.combinedSimOutput = ko.computed(function() {
+ let s = self.simulation();
+ if (self.running()) {
+ return "...";
+ }
+ return s.stdout + '\n' + s.stderr;
+ });
+ self.simSymtable = ko.computed(function() {
+ let s = self.simulation();
+ if (self.running()) {
+ return [];
+ }
+ let r = [];
+ for (let k of Object.keys(s.symtable_diff)) {
+ r.push({key: k, value: s.symtable_diff[k]});
+ }
+ return r;
+ });
+ self.apply = function() {
+ // This is called by the sortable code for some reason, no idea why
+ // but otherwise it raises an exception.
+ };
+ let numlines = function(text) {
+ if (text === "") {
+ return 0;
+ }
+ let m = text.match(/\n/g);
+ if (m === null) {
+ return 1;
+ } else if (text[text.length-1] == "\n") {
+ return m.length;
+ }
+ return m.length + 1;
+ }
+ self.simSummary = ko.computed(function() {
+ let s = self.simulation();
+ if (self.running()) {
+ return "running simulation...";
+ } else if (s.stderr !== "") {
+ return "Simulation: execution error!";
+ }
+ let r = "Simulation OK: ";
+ let gline = numlines(s.gcode);
+ r += (gline === 1) ? '1 line' : `${gline} lines`;
+ let nline = numlines(s.stdout);
+ if (nline > 0) {
+ r += (nline === 1) ? ', 1 notification' : `, ${nline} notifications`;
+ }
+ return r;
+ });
+ self.simExpanded = ko.observable(true);
+ self.symtableExpanded = ko.observable(true);
+ self.updater = ko.computed(function() {
+ // Computed function doesn't return anything itself, but does
+ // update the simulation observable above. It does need to be
+ // referenced from the HTML though.
+ // We operate after a timeout so as not to send unnecessary load
+ // to the server.
+ self.running(true);
+
+ // This must run on *every* call to the updater, so that the
+ // correct listeners are applied
+ let automation = [];
+ let sym = self.symtable();
+ for (let a of self.actions()) {
+ let pp = a.preprocessor();
+ automation.push([
+ a.script.body(),
+ (pp && pp.body())
+ ]);
+ }
+
+ if (self.timeout !== null) {
+ clearTimeout(self.timeout);
+ }
+ self.timeout = setTimeout(function() {
+ self.api.simulate(automation, sym, (result) => {
+ self.simulation(result);
+ self.timeout = null;
+ self.running(false);
+ }, (code, reason) => {
+ let msg = `Server error (${code}): ${reason}`;
+ console.error(msg);
+ self.simulation({
+ gcode: '',
+ stdout: '',
+ stderr: msg,
+ symtable_diff: [],
+ });
+ self.timeout = null;
+ self.running(false);
+ });
+ }, 1000);
+ });
+
+ self.pack = function() {
+ let ks = [];
+ for (let a of self.actions()) {
+ let pp = a.preprocessor();
+ if (pp !== null) {
+ pp = pp.name();
+ }
+ ks.push({
+ script: a.script.name(),
+ preprocessor: pp,
+ });
+ }
+ if (ks.length !== 0) {
+ return ks;
+ }
+ };
+}
+
+try {
+module.exports = CPSettingsEvent;
+} catch {}
diff --git a/continuousprint/static/js/continuousprint_settings_event.test.js b/continuousprint/static/js/continuousprint_settings_event.test.js
new file mode 100644
index 0000000..a40d1f1
--- /dev/null
+++ b/continuousprint/static/js/continuousprint_settings_event.test.js
@@ -0,0 +1,120 @@
+const CPSettingsEvent = require('./continuousprint_settings_event');
+
+function testAction(n, gcode, py) {
+ return {
+ script: {name: ko.observable('s' + n), body: ko.observable(gcode)},
+ preprocessor: ko.observable({name: ko.observable('p' + n), body: ko.observable(py)}),
+ }
+}
+
+function testEvent() {
+ return new CPSettingsEvent(
+ {name: 'name', event: 'event', display: 'display', desc: 'desc', sym_state: 'evt_state'},
+ [testAction(0, "g1", "p1"), testAction(1, "g2", "p2")],
+ {simulate: jest.fn()},
+ {defaultsym: 'asdf'}
+ );
+}
+
+describe('visible text computed vars', () => {
+ test('sim running', () => {
+ let vm = testEvent();
+ vm.running(true);
+
+ expect(vm.simGcodeOutput()).toEqual("...");
+ expect(vm.combinedSimOutput()).toEqual("...");
+ expect(vm.simSymtable()).toEqual([]);
+ expect(vm.simSummary()).toEqual("running simulation...");
+ });
+ test('sim successful', () => {
+ let vm = testEvent();
+ vm.simulation({
+ gcode: "gcode",
+ stdout: "stdout",
+ stderr: "",
+ symtable_diff: {a: 'foo'},
+ });
+ vm.running(false);
+
+ expect(vm.simGcodeOutput()).toEqual("gcode");
+ expect(vm.combinedSimOutput()).toEqual("stdout\n");
+ expect(vm.simSymtable()).toEqual([{key: 'a', value: 'foo'}]);
+ expect(vm.simSummary()).toEqual("Simulation OK: 1 line, 1 notification");
+ });
+ test('sim error', () => {
+ let vm = testEvent();
+ vm.simulation({
+ gcode: "gcode ignored",
+ stdout: "stdout",
+ stderr: "stderr",
+ symtable_diff: {a: 'foo'},
+ });
+ vm.running(false);
+
+ expect(vm.simGcodeOutput()).toEqual("@PAUSE; Preprocessor error");
+ expect(vm.combinedSimOutput()).toEqual("stdout\nstderr");
+ expect(vm.simSymtable()).toEqual([{key: 'a', value: 'foo'}]);
+ expect(vm.simSummary()).toEqual("Simulation: execution error!");
+ });
+});
+
+describe('symtableEdit', () => {
+ test('updates symtable when symtableEdit edited successfully', () => {
+ let vm = testEvent();
+ vm.symtableEdit("123");
+ expect(vm.symtable()).toEqual(123);
+ });
+ test('updates symtableEditError when JSON parse fails', () => {
+ let vm = testEvent();
+ vm.symtableEdit("not parseable");
+ expect(vm.symtableEditError()).toMatch(/^SyntaxError.*/);
+ });
+});
+
+describe('updater', () => {
+ test('updates simulation values exactly once', () => {
+ jest.useFakeTimers();
+ let vm = testEvent();
+ let want = {symtable_diff: [], gcode: "result", stdout: "", stderr: ""};
+ vm.api.simulate = jest.fn((auto, sym, cb, errcb) => {
+ cb(want);
+ });
+ vm.actions(vm.actions()); // Set dirty bit
+ vm.updater();
+ expect(vm.timer).not.toEqual(null);
+ expect(vm.running()).toEqual(true);
+
+ // Trigger updater a couple more times for good measure
+ for (let i = 0; i < 10; i++) {
+ vm.actions(vm.actions()); // Set dirty bit
+ vm.updater();
+ }
+
+ jest.runAllTimers();
+ expect(vm.api.simulate).toHaveBeenCalledTimes(1);
+
+ expect(vm.running()).toEqual(false);
+ expect(vm.simulation()).toEqual(want);
+ });
+ test('handles server error', () => {
+ jest.useFakeTimers();
+ let vm = testEvent();
+ let want = {symtable_diff: [], gcode: "result", stdout: "", stderr: ""};
+ vm.api.simulate = jest.fn((auto, sym, cb, errcb) => {
+ errcb(123, "test");
+ });
+ vm.actions(vm.actions()); // Set dirty bit
+ vm.updater();
+ jest.runAllTimers();
+ expect(vm.running()).toEqual(false);
+ expect(vm.simulation().stderr).toEqual('Server error (123): test');
+ });
+});
+
+test('pack', () => {
+ let vm = testEvent();
+ expect(vm.pack()).toEqual([
+ {"preprocessor": "p0", "script": "s0"},
+ {"preprocessor": "p1", "script": "s1"}
+ ]);
+});
diff --git a/continuousprint/static/js/continuousprint_stats.js b/continuousprint/static/js/continuousprint_stats.js
new file mode 100644
index 0000000..05a9237
--- /dev/null
+++ b/continuousprint/static/js/continuousprint_stats.js
@@ -0,0 +1,158 @@
+/*
+ * View model for OctoPrint-Print-Queue
+ *
+ * Contributors: Michael New, Scott Martin
+ * License: AGPLv3
+ */
+
+if (typeof ko === "undefined" || ko === null) {
+ ko = require('knockout');
+}
+if (typeof CPSet === "undefined" || CPSet === null) {
+ CPSet = require('./continuousprint_set');
+}
+
+// Computes aggregate statistics of time, filament, counts etc.
+function CPStats(jobs, stats_dimensions) {
+ var self = this;
+
+ const Stat = {
+ COUNT: 0,
+ TIME: 1,
+ MASS: 2,
+ };
+
+ self.header = [
+ {legend: 'Total items', title: null},
+ {legend: 'Total time', title: "Uses Octoprint's file analysis estimate; may be inaccurate"},
+ {legend: 'Total mass', title: "Mass is calculated using active spool(s) in SpoolManager"}
+ ];
+
+ self._safeParse = function(v) {
+ v = parseInt(v, 10);
+ return (isNaN(v)) ? 0 : v;
+ };
+
+ self._appendCount = function(r, d) {
+ for (let dim of Object.keys(stats_dimensions)) {
+ r[Stat.COUNT][dim] += d[dim];
+ }
+ };
+
+ self._appendTime = function(r, d) {
+ if (d.ept === null || d.ept === undefined) {
+ r[Stat.TIME].error += 1;
+ return;
+ }
+ for (let dim of Object.keys(stats_dimensions)) {
+ r[Stat.TIME][dim] += d[dim] * d.ept;
+ }
+ };
+
+ self._appendMass = function(r, d) {
+ if (d.len === null || d.len === undefined || d.len.length === 0) {
+ r[Stat.MASS].error += 1;
+ return;
+ }
+ let mass = 0;
+ for (let i = 0; i < d.len.length; i++) {
+ mass += d.linmasses[i] * d.len[i];
+ }
+ if (isNaN(mass)) {
+ r[Stat.MASS].error += 1;
+ return;
+ }
+ for (let dim of Object.keys(stats_dimensions)) {
+ r[Stat.MASS][dim] += d[dim] * mass;
+ }
+ };
+
+ self.values = ko.computed(function() {
+ r = Array(Object.keys(Stat).length);
+ for (let i = 0; i < Object.keys(Stat).length; i++) {
+ r[i] = {error:0};
+ for (let d of Object.keys(stats_dimensions)) {
+ r[i][d] = 0;
+ }
+ }
+ for (let j of jobs()) {
+ let lm = j.getMaterialLinearMasses();
+ for (let qs of j.sets()) {
+ if (!qs.profile_matches()) {
+ continue;
+ }
+ let meta = qs.metadata;
+ let d = {
+ remaining: self._safeParse(qs.remaining()),
+ total: self._safeParse(qs.length_remaining()),
+ count: self._safeParse(qs.count()),
+ completed: self._safeParse(qs.completed()),
+ ept: meta && meta.estimatedPrintTime,
+ len: meta && meta.filamentLengths,
+ linmasses: lm,
+ };
+ self._appendCount(r, d);
+ self._appendTime(r, d);
+ self._appendMass(r, d);
+ }
+ }
+ return r;
+ });
+
+ self.humanize = function(num, unit="") {
+ // Humanizes numbers by condensing and adding units
+ let v = '';
+ if (num < 1000) {
+ v = (num % 1 === 0) ? num : num.toFixed(1);
+ } else if (num < 100000) {
+ let k = (num/1000);
+ v = ((k % 1 === 0) ? k : k.toFixed(1)) + 'k';
+ }
+ return v + unit;
+ };
+
+ self.humanTime = function(s) {
+ // Humanizes time values; parameter is seconds
+ if (s < 60) {
+ return Math.round(s) + 's';
+ } else if (s < 3600) {
+ return Math.round(s/60) + 'm';
+ } else if (s < 86400) {
+ let h = s/3600;
+ return ((h % 1 === 0) ? h : h.toFixed(1)) + 'h';
+ } else {
+ let d = s/86400;
+ return ((d % 1 === 0) ? d : d.toFixed(1)) + 'd';
+ }
+ };
+
+ self.values_humanized = ko.computed(function() {
+ let r = JSON.parse(JSON.stringify(self.values())); // Simple but expensive deep-copy, otherwise changes here will affect the result of values()
+ for (let i=0; i < r.length; i++) {
+ r[i] = { ...self.header[i], ...r[i]};
+ }
+ for (let k of Object.keys(stats_dimensions)) {
+ r[Stat.COUNT][k] = self.humanize(r[0][k]);
+ r[Stat.TIME][k] = self.humanTime(r[1][k]);
+ r[Stat.MASS][k] = self.humanize(r[2][k], 'g');
+ }
+ // Assign error texts
+ r[Stat.COUNT].error = '';
+ r[Stat.TIME].error = (r[1].error > 0) ? `${r[1].error} sets missing time estimates` : '';
+ r[Stat.MASS].error = (r[2].error > 0) ? `${r[1].error} errors calculating mass` : '';
+
+ // Hide mass details if mass is zero (implies SpoolManager not set up)
+ let hasMass = false;
+ for (let d of Object.keys(stats_dimensions)) {
+ hasMass |= (r[Stat.MASS][d] !== '0g');
+ }
+ if (!hasMass) {
+ r.splice(Stat.MASS,1);
+ }
+ return r;
+ });
+}
+
+try {
+ module.exports = CPStats;
+} catch {}
diff --git a/continuousprint/static/js/continuousprint_viewmodel.js b/continuousprint/static/js/continuousprint_viewmodel.js
index abca6fa..ab32a9e 100644
--- a/continuousprint/static/js/continuousprint_viewmodel.js
+++ b/continuousprint/static/js/continuousprint_viewmodel.js
@@ -112,7 +112,6 @@ function CPViewModel(parameters) {
self.hideRemoveConfirmModal();
};
self.showSettingsHelp = function() {
- console.log(self.settings);
self.settings.show('settings_plugin_continuousprint');
$(`#settings_plugin_continuousprint a[href="#settings_continuousprint_help"]`).tab('show');
};
diff --git a/continuousprint/storage/database.py b/continuousprint/storage/database.py
index 956c37d..c27e3b6 100644
--- a/continuousprint/storage/database.py
+++ b/continuousprint/storage/database.py
@@ -21,12 +21,20 @@
import datetime
from enum import IntEnum, auto
import sys
+import logging
import inspect
import os
import yaml
import time
+logging.getLogger("peewee").setLevel(logging.INFO)
+
+
+class STLResolveError(Exception):
+ pass
+
+
# Defer initialization
class DB:
# Adding foreign_keys pragma is necessary for ON DELETE behavior
@@ -102,7 +110,8 @@ def as_dict(self):
class JobView:
"""The job view contains functions used to manipulate an underlying Job model.
- This is distinct from the Job class to facilitate other storage implementations (e.g. LAN queue data)"""
+ This is distinct from the Job class to facilitate other storage implementations (e.g. LAN queue data)
+ """
def refresh_sets(self):
raise NotImplementedError()
@@ -132,7 +141,7 @@ def _next_set(self, profile, custom_filter):
# for the given profile/filter. If this is False then
# decrementing the set/job won't do anything WRT set availability
any_printable = False
- for s in self.sets:
+ for s in sorted(self.sets, key=lambda s: s.rank):
if custom_filter is not None and not custom_filter(s):
continue
printable = s.is_printable(profile)
@@ -218,6 +227,20 @@ def decrement(self, profile):
self.save() # Save must occur before job is observed
return self.job.next_set(profile)
+ def resolve(self, override=None):
+ if override is not None:
+ self._resolved = override
+
+ # TODO use registered slicer object types per octoprint hook
+ if not hasattr(self, "_resolved") or self._resolved is None:
+ raise NotImplementedError(
+ "Implementer of SetView must implement .resolve()"
+ )
+ elif self._resolved.endswith(".stl"):
+ raise STLResolveError(f"Set path {self._resolved} requires slicing")
+ else:
+ return self._resolved
+
@classmethod
def from_dict(self, s):
raise NotImplementedError
@@ -285,6 +308,11 @@ def from_dict(self, s):
del s[listform]
return Set(**s)
+ def resolve(self, override=None):
+ if getattr(self, "_resolved", None) is None:
+ self._resolved = self.path
+ return super().resolve(override)
+
class Run(Model):
# Runs are totally decoupled from queues, jobs, and sets - this ensures that
@@ -462,7 +490,7 @@ def migrateScriptsFromSettings(clearing_script, finished_script, cooldown_script
# In v2.2.0 and earlier, a fixed list of scripts were stored in OctoPrint settings.
# This converts them to DB format for use in events.
with DB.automation.atomic():
- for (evt, name, body) in [
+ for evt, name, body in [
(CustomEvents.PRINT_SUCCESS, BED_CLEARING_SCRIPT, clearing_script),
(CustomEvents.FINISH, FINISHING_SCRIPT, finished_script),
(CustomEvents.COOLDOWN, COOLDOWN_SCRIPT, cooldown_script),
diff --git a/continuousprint/storage/database_test.py b/continuousprint/storage/database_test.py
index 1f750c6..441d7b6 100644
--- a/continuousprint/storage/database_test.py
+++ b/continuousprint/storage/database_test.py
@@ -11,11 +11,13 @@
migrateQueuesV2ToV3,
Job,
Set,
+ SetView,
Run,
Script,
EventHook,
StorageDetails,
DEFAULT_QUEUE,
+ STLResolveError,
)
from ..data import CustomEvents
import tempfile
@@ -27,10 +29,7 @@ class QueuesDBTest(unittest.TestCase):
def setUp(self):
self.tmpQueues = tempfile.NamedTemporaryFile(delete=True)
self.addCleanup(self.tmpQueues.close)
- init_queues(
- self.tmpQueues.name,
- logger=logging.getLogger(),
- )
+ init_queues(self.tmpQueues.name)
self.q = Queue.get(name=DEFAULT_QUEUE)
@@ -38,10 +37,7 @@ class AutomationDBTest(unittest.TestCase):
def setUp(self):
self.tmpAutomation = tempfile.NamedTemporaryFile(delete=True)
self.addCleanup(self.tmpAutomation.close)
- init_automation(
- self.tmpAutomation.name,
- logger=logging.getLogger(),
- )
+ init_automation(self.tmpAutomation.name)
class DBTest(QueuesDBTest, AutomationDBTest):
@@ -292,13 +288,14 @@ def setUp(self):
queue=self.q, name="a", rank=0, count=5, remaining=5, draft=False
)
self.s = []
- for name in ("a", "b"):
+ # Note: b's rank is earlier than A but inserted later (i.e. later DB id)
+ for name, rank in (("a", 1), ("b", 0)):
self.s.append(
Set.create(
path="a",
sd=False,
job=self.j,
- rank=0,
+ rank=rank,
count=2,
remaining=2,
material_keys="m1,m2",
@@ -306,15 +303,15 @@ def setUp(self):
)
)
- def testSetsAreSequential(self):
+ def testSetsAreSequentialByRank(self):
p = dict(name="p1")
- self.assertEqual(self.j.next_set(p), self.s[0])
- Set.get(1).decrement(p)
- self.assertEqual(self.j.next_set(p), self.s[0])
- Set.get(1).decrement(p)
self.assertEqual(self.j.next_set(p), self.s[1])
Set.get(2).decrement(p)
self.assertEqual(self.j.next_set(p), self.s[1])
+ Set.get(2).decrement(p)
+ self.assertEqual(self.j.next_set(p), self.s[0])
+ Set.get(1).decrement(p)
+ self.assertEqual(self.j.next_set(p), self.s[0])
class TestSet(QueuesDBTest):
@@ -360,6 +357,23 @@ def testDecrementEndNotDoubleCounted(self):
self.assertEqual(self.j.remaining, 0)
self.assertEqual(self.s.remaining, 0)
+ def testResolveUnimplemented(self):
+ sv = SetView()
+ with self.assertRaises(NotImplementedError):
+ sv.resolve()
+
+ def testResolveGcode(self):
+ self.assertEqual(self.s.resolve(), self.s.path)
+
+ def testResolveSTL(self):
+ self.s.path = "testpath.stl"
+ with self.assertRaises(STLResolveError):
+ self.s.resolve()
+
+ def testResolveAlreadySet(self):
+ self.s._resolved = "testval"
+ self.assertEqual(self.s.resolve(), "testval")
+
def testFromDict(self):
d = self.s.as_dict()
s = Set.from_dict(d)
diff --git a/continuousprint/storage/lan.py b/continuousprint/storage/lan.py
index 272ec75..638dc90 100644
--- a/continuousprint/storage/lan.py
+++ b/continuousprint/storage/lan.py
@@ -52,7 +52,7 @@ def refresh_sets(self):
self.save()
-class ResolveError(Exception):
+class LANResolveError(Exception):
pass
@@ -71,13 +71,13 @@ def __init__(self, data, job, rank):
self.profile_keys = ",".join(data.get("profiles", []))
self._resolved = None
- def resolve(self) -> str:
+ def resolve(self, override=None) -> str:
if self._resolved is None:
try:
self._resolved = str(Path(self.job.get_base_dir()) / self.path)
except HTTPError as e:
- raise ResolveError(f"Failed to resolve {self.path}") from e
- return self._resolved
+ raise LANResolveError(f"Failed to resolve {self.path}") from e
+ return super().resolve(override)
def save(self):
self.job.save()
diff --git a/continuousprint/storage/lan_test.py b/continuousprint/storage/lan_test.py
index f85d0f4..91ece90 100644
--- a/continuousprint/storage/lan_test.py
+++ b/continuousprint/storage/lan_test.py
@@ -1,6 +1,7 @@
import unittest
from unittest.mock import MagicMock
-from .lan import LANJobView, LANSetView, ResolveError
+from .database import STLResolveError
+from .lan import LANJobView, LANSetView, LANResolveError
from requests.exceptions import HTTPError
@@ -25,6 +26,13 @@ def test_resolve_file(self):
self.lq.get_gjob_dirpath.return_value = "/path/to/"
self.assertEqual(self.s.resolve(), "/path/to/a.gcode")
+ def test_resolve_stl(self):
+ # Ensure STL checking from the parent class is still triggered
+ self.j.sets[0].path = "a.stl"
+ self.lq.get_gjob_dirpath.return_value = "/path/to/"
+ with self.assertRaises(STLResolveError):
+ self.s.resolve()
+
def test_remap_set_paths(self):
self.lq.get_gjob_dirpath.return_value = "/path/to/"
self.j.remap_set_paths()
@@ -32,7 +40,7 @@ def test_remap_set_paths(self):
def test_resolve_http_error(self):
self.lq.get_gjob_dirpath.side_effect = HTTPError
- with self.assertRaises(ResolveError):
+ with self.assertRaises(LANResolveError):
self.s.resolve()
def test_decrement_refreshes_sets_and_saves(self):
diff --git a/continuousprint/storage/queries.py b/continuousprint/storage/queries.py
index cdacd59..1874d3b 100644
--- a/continuousprint/storage/queries.py
+++ b/continuousprint/storage/queries.py
@@ -245,8 +245,8 @@ def _rankBalance(cls):
with DB.queues.atomic():
# TODO discriminate by queue - may case weirdness with archived jobs
ranker = _genRank(cls.select().count())
- for (l, c) in zip(ranker, cls.select().order_by(cls.rank)):
- c.rank = l
+ for r, c in zip(ranker, cls.select().order_by(cls.rank)):
+ c.rank = r
c.save()
@@ -499,47 +499,14 @@ def getAutomation():
return dict(scripts=scripts, events=events, preprocessors=preprocessors)
-def genEventScript(evt: CustomEvents, interp=None, logger=None) -> str:
- result = []
- for e in (
- EventHook.select()
- .join_from(EventHook, Script, JOIN.LEFT_OUTER)
- .join_from(EventHook, Preprocessor, JOIN.LEFT_OUTER)
- .where(EventHook.name == evt.event)
- .order_by(EventHook.rank)
- ):
- procval = True
- if e.preprocessor is not None and e.preprocessor.body.strip() != "":
- procval = interp(e.preprocessor.body)
- if logger:
- logger.info(
- f"EventHook preprocessor for script {e.script.name} ({e.preprocessor.name}): {e.preprocessor.body}\nSymbols: {interp.symtable}\nResult: {procval}"
- )
-
- if procval is None or procval is False:
- continue
- elif procval is True:
- formatted = e.script.body
- elif type(procval) is dict:
- if logger:
- logger.info(
- f"Appending script {e.script.name} using formatting data {procval}"
- )
- formatted = e.script.body.format(**procval)
- else:
- raise Exception(
- f"Invalid return type {type(procval)} for peprocessor {e.preprocessor.name}"
- )
-
- leftovers = re.findall(r"\{.*?\}", formatted)
- if len(leftovers) > 0:
- ppname = (
- f"f from preprocessor {e.preprocessor.name}"
- if e.preprocessor is not None
- else ""
- )
- raise Exception(
- f"Unformatted placeholders in {e.script.name}{ppname}: {leftovers}"
- )
- result.append(formatted)
- return "\n".join(result)
+def getAutomationForEvent(evt: CustomEvents) -> list:
+ return [
+ (e.script.body, e.preprocessor.body if e.preprocessor else None)
+ for e in (
+ EventHook.select()
+ .join_from(EventHook, Script, JOIN.LEFT_OUTER)
+ .join_from(EventHook, Preprocessor, JOIN.LEFT_OUTER)
+ .where(EventHook.name == evt.event)
+ .order_by(EventHook.rank)
+ )
+ ]
diff --git a/continuousprint/storage/queries_test.py b/continuousprint/storage/queries_test.py
index 45f1800..2c9ceb7 100644
--- a/continuousprint/storage/queries_test.py
+++ b/continuousprint/storage/queries_test.py
@@ -300,7 +300,7 @@ def rank():
)
def testMoveJob(self):
- for (moveArgs, want) in [((1, 2), [2, 1]), ((2, None), [2, 1])]:
+ for moveArgs, want in [((1, 2), [2, 1]), ((2, None), [2, 1])]:
with self.subTest(f"moveJob({moveArgs}) -> want {want}"):
q.moveJob(*moveArgs)
self.assertEqual([j.id for j in q.getJobsAndSets(DEFAULT_QUEUE)], want)
@@ -380,7 +380,7 @@ def testAssignGet(self):
self.assertEqual(got["events"][evt], [dict(script="foo", preprocessor=None)])
def testAssignBadEventKey(self):
- with self.assertRaisesRegexp(KeyError, "No such CPQ event"):
+ with self.assertRaisesRegex(KeyError, "No such CPQ event"):
q.assignAutomation(
dict(), dict(), dict(evt=[dict(script="foo", preprocessor=None)])
)
@@ -409,7 +409,10 @@ def testMultiScriptEvent(self):
]
),
)
- self.assertEqual(q.genEventScript(CustomEvents.PRINT_SUCCESS), "gcode1\ngcode2")
+ self.assertEqual(
+ [a[0] for a in q.getAutomationForEvent(CustomEvents.PRINT_SUCCESS)],
+ ["gcode1", "gcode2"],
+ )
# Ordering of event matters
q.assignAutomation(
@@ -427,57 +430,7 @@ def testMultiScriptEvent(self):
]
),
)
- self.assertEqual(q.genEventScript(CustomEvents.PRINT_SUCCESS), "gcode2\ngcode1")
-
- def testPreprocessorEvalTrueFalseNone(self):
- e = CustomEvents.PRINT_SUCCESS
- q.assignAutomation(
- dict(s1="gcode1"),
- dict(p1="python1"),
- dict([(e.event, [dict(script="s1", preprocessor="p1")])]),
- )
-
- self.assertEqual(q.genEventScript(e, lambda cond: True), "gcode1")
- self.assertEqual(q.genEventScript(e, lambda cond: False), "")
- self.assertEqual(q.genEventScript(e, lambda cond: None), "")
-
- def testNoProcessorPlaceholder(self):
- e = CustomEvents.PRINT_SUCCESS
- q.assignAutomation(
- dict(s1="{foo} will never be formatted!"),
- dict(),
- dict([(e.event, [dict(script="s1", preprocessor=None)])]),
- )
- with self.assertRaises(Exception):
- q.genEventScript(e, lambda cond: False)
-
- def testProcessorEvalFormat(self):
- e = CustomEvents.PRINT_SUCCESS
- q.assignAutomation(
- dict(s1="Hello {val}"),
- dict(p1="mocked"),
- dict([(e.event, [dict(script="s1", preprocessor="p1")])]),
- )
self.assertEqual(
- q.genEventScript(e, lambda cond: dict(val="World")), "Hello World"
- )
-
- def testProcessorEvalBadType(self):
- e = CustomEvents.PRINT_SUCCESS
- q.assignAutomation(
- dict(s1="don'tcare"),
- dict(p1="mocked"),
- dict([(e.event, [dict(script="s1", preprocessor="p1")])]),
+ [a[0] for a in q.getAutomationForEvent(CustomEvents.PRINT_SUCCESS)],
+ ["gcode2", "gcode1"],
)
- with self.assertRaises(Exception):
- q.genEventScript(e, lambda cond: 7)
-
- def testProcessorEvalMissedPlaceholder(self):
- e = CustomEvents.PRINT_SUCCESS
- q.assignAutomation(
- dict(s1="{foo} will never be formatted!"),
- dict(p1="mocked"),
- dict([(e.event, [dict(script="s1", preprocessor="p1")])]),
- )
- with self.assertRaises(Exception):
- q.genEventScript(e, lambda cond: dict(bar="baz"))
diff --git a/continuousprint/templates/continuousprint_settings.jinja2 b/continuousprint/templates/continuousprint_settings.jinja2
index d04401a..9a48b5d 100644
--- a/continuousprint/templates/continuousprint_settings.jinja2
+++ b/continuousprint/templates/continuousprint_settings.jinja2
@@ -9,6 +9,30 @@
const CP_CUSTOM_EVENTS = {{plugin_continuousprint_custom_events|tojson|safe}};
const CP_LOCAL_IP = {{plugin_continuousprint_local_ip|tojson|safe}};
const CP_EXCEPTIONS = {{plugin_continuousprint_exceptions|tojson|safe}};
+ const CP_SIMULATOR_DEFAULT_SYMTABLE = function() {return {{plugin_continuousprint_simulator_default_symtable|tojson|safe}}; };
+
+ const CP_STATS_DIMENSIONS = {
+ completed: {
+ name: "completed",
+ display: "Complete",
+ desc: "Number of prints completed for this iteration of the job",
+ },
+ count: {
+ name: "count",
+ display: "Per Run",
+ desc: "Number of prints per each iteration of the job",
+ },
+ remaining: {
+ name: "remaining",
+ display: "This Run",
+ desc: "Number of prints yet to be printed for the current job iteration",
+ },
+ total: {
+ name: "total",
+ display: "Pending",
+ desc: "Total number of prints yet to be printed across all remaining iterations of the job",
+ },
+ };