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

gCodeVisualizer can be enabled as a feature in config now (enabled by 

default)
master
Alex Ustyantsev 2013-02-02 19:45:36 +03:00
parent a5518f7877
commit e49669430b
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octoprint/server.py
View File

@ -28,7 +28,8 @@ def index():
"index.html", "index.html",
webcamStream=settings().get("webcam", "stream"), webcamStream=settings().get("webcam", "stream"),
enableTimelapse=(settings().get("webcam", "snapshot") is not None and settings().get("webcam", "ffmpeg") is not None), enableTimelapse=(settings().get("webcam", "snapshot") is not None and settings().get("webcam", "ffmpeg") is not None),
enableEstimations=(settings().getBoolean("feature", "analyzeGcode")) enableEstimations=(settings().getBoolean("feature", "analyzeGcode")),
gCodeVisualizer=settings().get("feature", "gCodeVisualizer")
) )
#~~ Printer state #~~ Printer state

3
octoprint/settings.py
View File

@ -39,7 +39,8 @@ old_default_settings = {
"timelapse_tmp": None "timelapse_tmp": None
}, },
"feature": { "feature": {
"analyzeGcode": True "analyzeGcode": True,
"gCodeVisualizer": True
}, },
} }

14
octoprint/static/js/ui.js
View File

@ -812,6 +812,12 @@ function GcodeViewModel() {
self.loadedFilename = undefined; self.loadedFilename = undefined;
self.status = 'idle'; self.status = 'idle';
self.enabled = false;
self.initialize = function(){
self.enabled = true;
GCODE.ui.initHandlers();
}
self.loadFile = function(filename){ self.loadFile = function(filename){
if(self.status == 'idle'){ if(self.status == 'idle'){
@ -849,6 +855,8 @@ function GcodeViewModel() {
} }
self._processData = function(data) { self._processData = function(data) {
if(!self.enabled)return;
if(self.loadedFilename == data.job.filename){ if(self.loadedFilename == data.job.filename){
var cmdIndex = GCODE.gCodeReader.getLinesCmdIndex(data.progress.progress); var cmdIndex = GCODE.gCodeReader.getLinesCmdIndex(data.progress.progress);
if(cmdIndex){ if(cmdIndex){
@ -1056,8 +1064,10 @@ $(function() {
if (webcamElement) { if (webcamElement) {
ko.applyBindings(webcamViewModel, document.getElementById("webcam")); ko.applyBindings(webcamViewModel, document.getElementById("webcam"));
} }
var gCodeVisualizerElement = document.getElementById("tab2d");
GCODE.ui.initHandlers(); if(gCodeVisualizerElement){
gcodeViewModel.initialize();
}
//~~ startup commands //~~ startup commands
connectionViewModel.requestData(); connectionViewModel.requestData();

2
octoprint/templates/index.html
View File

@ -128,7 +128,7 @@
<ul class="nav nav-tabs" id="tabs"> <ul class="nav nav-tabs" id="tabs">
<li class="active"><a href="#temp" data-toggle="tab">Temperature</a></li> <li class="active"><a href="#temp" data-toggle="tab">Temperature</a></li>
<li><a href="#controls" data-toggle="tab">Controls</a></li> <li><a href="#controls" data-toggle="tab">Controls</a></li>
<li><a href="#tab2d" data-toggle="tab">GCode Viewer</a></li> {% if gCodeVisualizer %}<li><a href="#tab2d" data-toggle="tab">GCode Viewer</a></li>{% endif %}
<!--<li><a href="#speed" data-toggle="tab">Speed</a></li>--> <!--<li><a href="#speed" data-toggle="tab">Speed</a></li>-->
<li><a href="#term" data-toggle="tab">Terminal</a></li> <li><a href="#term" data-toggle="tab">Terminal</a></li>
{% if webcamStream %}<li><a href="#webcam" data-toggle="tab">Webcam</a></li>{% endif %} {% if webcamStream %}<li><a href="#webcam" data-toggle="tab">Webcam</a></li>{% endif %}