pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added multipass ui

Browse source
This commit is contained in:
Teja 2016-01-29 18:11:59 +01:00
parent 8c218b21f8
commit 73749fbb19
5 changed files with 84 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
View file

@ -1160,6 +1160,7 @@ ul.dropdown-menu li a {
#control_zaxis {
display:inline-block;
width: 80px;
margin: 1em auto 0;
}
#control_zaxis_focus {
display:inline-block;
@ -1541,7 +1542,7 @@ td.settings_printerProfiles_profiles_action a.disabled {
.nav-pills>li>a,
select,
textarea,
input,
input, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"],
input.search-query,
.uneditable-input,
.input-append .add-on:last-child,

25
src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css
View file

@ -102,3 +102,28 @@ svg text {
.overrideSlider span {
padding-left: .6em;
}
.repeatGcode .btn-group {
width: 145px;
}
.repeatGcode input, .repeatGcode button {
width: 33%;
}
.repeatGcode input {
margin-bottom:0;
padding-left: 0;
padding-right: 0;
text-align: center;
}
.repeatGcode>span {
padding-left: .6em;
}
.manual_position_input {
padding-top: 12px;
}
#manual_position.warning {
color: #DD0000;
}

23
src/octoprint/static/js/app/viewmodels/control.js
View file

@ -404,6 +404,11 @@ $(function() {
self.onStartup = function () {
self.requestData();
self._configureJogDistanceSlider();
$('#manual_position').keyup(function(e) {
if (e.which === 13){ // 13 == enter
self.manualPosition();
}
});
};
self.updateRotatorWidth = function() {
@ -606,6 +611,24 @@ $(function() {
self.setCoordinateOrigin = function () {
self.sendCustomCommand({type: 'command', command: "G92 X0 Y0"});
};
self.manualPosition = function(){
$('#manual_position').removeClass('warning');
var s = $('#manual_position').val();
var tmp = s.split(/[^0-9.,-\\+]+/);
if (tmp.length === 2) {
var x = parseFloat(tmp[0]);
var y = parseFloat(tmp[1]);
if(!isNaN(x) && !isNaN(y)) {
self.sendCustomCommand({type: 'command', command: "G0X"+x+"Y"+y});
$('#manual_position').val('');
} else {
$('#manual_position').addClass('warning');
}
} else {
$('#manual_position').addClass('warning');
}
};
self.jogDistanceInMM = ko.observable(undefined);

27
src/octoprint/static/js/app/viewmodels/printerstate.js
View file

@ -38,6 +38,7 @@ $(function() {
self.feedrateOverride = ko.observable(100);
self.intensityOverride.extend({ rateLimit: 500 });
self.feedrateOverride.extend({ rateLimit: 500 });
self.numberOfPasses = ko.observable(1);
self.TITLE_PRINT_BUTTON_PAUSED = gettext("Restarts the print job from the beginning");
self.TITLE_PRINT_BUTTON_UNPAUSED = gettext("Starts the print job");
@ -286,12 +287,6 @@ $(function() {
self.currentPos({x: payload.wx, y: payload.wy});
};
self.intensityOverride.subscribe(function(factor){
self._overrideCommand("/intensity "+factor);
});
self.feedrateOverride.subscribe(function(factor){
self._overrideCommand("/feedrate "+factor);
});
self._overrideCommand = function(command, callback) {
$.ajax({
@ -314,9 +309,11 @@ $(function() {
min: 10,
max: 200,
value: 100,
// tooltip: 'hide'
}).on("slideStop", function(ev){
tooltip: 'hide'
}).on("slide", function(ev){
self.intensityOverride(ev.value);
}).on("slideStop", function(ev){
self._overrideCommand("/intensity "+self.intensityOverride());
});
self.feedrateOverrideSlider = $("#feedrate_override_slider").slider({
@ -324,13 +321,23 @@ $(function() {
min: 10,
max: 200,
value: 100,
// tooltip: 'hide'
}).on("slideStop", function(ev){
tooltip: 'hide'
}).on("slide", function(ev){
self.feedrateOverride(ev.value);
}).on("slideStop", function(ev){
self._overrideCommand("/feedrate "+self.feedrateOverride());
});
};
self.increasePasses = function(){
self.numberOfPasses(self.numberOfPasses()+1);
}
self.decreasePasses = function(){
var passes = Math.max(self.numberOfPasses()-1, 1);
self.numberOfPasses(passes);
}
self.onEventPrintDone = function(){
self.feedrateOverrideSlider.slider('setValue', 100);
self.intensityOverrideSlider.slider('setValue', 100);

17
src/octoprint/templates/mrbeam_index.jinja2
View file

@ -123,6 +123,10 @@
<div class="distance">
<input type="text" id="jogDistance" />
</div>
<div class="input-append manual_position_input">
<input id="manual_position" placeholder="x.xx y.yy" onsubmit="manualPosition"/>
<button class="" data-bind="click: manualPosition">Go</button>
</div>
</div>
</div>
</div>
@ -168,6 +172,19 @@
<input id="feedrate_override_slider" type="text" data-bind="sliderValue: feedrateOverride">
<span data-bind="text:feedrateOverride()">100</span>% Feedrate
</div>
<div class="repeatGcode">
<div class="btn-group">
<button type="button" class="btn btn-default btn-number" data-bind="enable: numberOfPasses() > 1, click:decreasePasses">
<span class="icon-minus"></span>
</button>
<input type="text" class="input-mini text-right" value="1" min="1" max="10" data-bind="value:numberOfPasses()">
<button type="button" class="btn btn-default btn-number" data-bind="click:increasePasses">
<span class="icon-plus"></span>
</button>
</div>
<span>Passes</span>
</div>
</div>
<!-- {{ _('Print Time') }}: <strong data-bind="text: printTimeString"></strong><br>