q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

custom terminal filter WIP

master
Gina Häußge 2013-08-18 18:42:09 +02:00
parent 5631a45006
commit 03c9c684bf
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
octoprint/static/js/app/viewmodels/terminal.js
View File

@ -19,6 +19,8 @@ function TerminalViewModel(loginStateViewModel) {
self.filterM105 = ko.observable(false);
self.filterM27 = ko.observable(false);
self.filters = ko.observableArray();
self.regexM105 = /(Send: M105)|(Recv: ok T:)/;
self.regexM27 = /(Send: M27)|(Recv: SD printing byte)/;
@ -30,6 +32,10 @@ function TerminalViewModel(loginStateViewModel) {
self.updateOutput();
});
self.filters.subscribe(function(newValue) {
self.updateOutput();
});
self.fromCurrentData = function(data) {
self._processStateData(data.state);
self._processCurrentLogData(data.logs);
@ -69,6 +75,17 @@ function TerminalViewModel(loginStateViewModel) {
var output = "";
for (var i = 0; i < self.log.length; i++) {
var filters = self.filters();
var filtered = false;
for (var j = 0; j < filters.length; j++) {
var filter = filters[j];
if (self.log[i].match(filter.regex)) {
filtered = true;
break;
}
}
if (filtered) continue;
if (self.filterM105() && self.log[i].match(self.regexM105)) continue;
if (self.filterM27() && self.log[i].match(self.regexM27)) continue;