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

quickly added a clear button for the working area. needs ui improvement.

Browse source
This commit is contained in:
Teja 2015-01-29 14:06:56 +01:00
parent 5d9eba510d
commit 06a279b4a4
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/plugins/svgtogcode/static/js/convert.js
View file

@ -257,7 +257,7 @@ function VectorConversionViewModel(params) {
});
// use the class as a flag to avoid double binding of the slideStop event
if($("#svgtogcode_feedrate").attr('class') === 'uninitialized'){
if($("#svgtogcode_feedrate").attr('class') === 'uninitialized'){ // somehow hasClass(...) did not work ???
self.feedrateSlider.on("slideStop", function(ev){
self.laserSpeed(self._calcRealSpeed(ev.value));
});

9
src/octoprint/plugins/svgtogcode/static/js/working_area.js
View file

@ -75,17 +75,20 @@ function WorkingAreaViewModel(params) {
self.placedDesigns = ko.observableArray([]);
self.clear = function(){
snap.selectAll('#userContent>*').remove();
self.placedDesigns([]);
};
self.trigger_resize = function(){
self.availableHeight(document.documentElement.clientHeight - $('body>nav').outerHeight() - $('footer>*').outerHeight() - 39); // magic number
self.availableWidth($('#workingarea div.span8').innerWidth());
};
self.move_laser = function(el){
console.log(event);
var x = self.px2mm(event.offsetX);
// var y = self.px2mm(event.toElement.offsetHeight - event.offsetY); // toElement.offsetHeight is always 0 on svg>* elements ???
var y = self.px2mm(event.toElement.ownerSVGElement.offsetHeight - event.offsetY); // hopefully this works across browsers
console.log("move_laser", y, event.toElement.id, event.toElement.offsetHeight, event.offsetY);
$.ajax({
url: API_BASEURL + "printer/printhead",
type: "POST",
@ -118,7 +121,7 @@ function WorkingAreaViewModel(params) {
self.mm2svgUnits = function(val){
return val * self.svgDPI()/25.4;
}
};
//self.getDivDimensions(); // init

5
src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
View file

@ -205,6 +205,7 @@
<div class="">
<div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse" href="#files"><i class="icon-list"></i> {{ _('Files') }}</a>
<a class="pull-right btn btn-small" data-bind="click: workingArea.clear" style="margin-right: 1em; margin-top: 4px;" ><i class="icon-remove-sign"></i> {{ _('Clear') }}</a>
</div>
<div class="settings-trigger accordion-heading-button btn-group" style="display: none;">
@ -238,12 +239,9 @@
<div class="size">{{ _('Size') }}: <span data-bind="text: formatSize(size)"></span></div>
<div class="additionalInfo hide" data-bind="html: $root.getAdditionalData($data)"></div>
<div class="btn-group action-buttons">
<!--<div class="btn btn-mini toggleAdditionalData" data-bind="click: function() { if ($root.enableAdditionalData($data)) { $root.toggleAdditionalData($data); } else { return; } }, css: { disabled: !$root.enableAdditionalData($data) }"><i class="icon-chevron-down"></i></div>-->
<a class="btn btn-mini" data-bind="attr: {href: $root.downloadLink($data), css: {disabled: !$root.downloadLink($data)}}"><i class="icon-download-alt" title="{{ _('Download') }}"></i></a>
<div class="btn btn-mini" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i></div>
<!--<div class="btn btn-mini" data-bind="click: function() { if ($root.enableSelect($data)) { $root.loadFile($data, false); } else { return; } }, css: {disabled: !$root.enableSelect($data)}"><i class="icon-folder-open" title="{{ _('Load') }}"></i></div>-->
<div class="btn btn-mini" data-bind="click: function() { if ($root.enableSelect($data)) { $root.startGcodeWithSafetyWarning($data); } else { return; } }, css: {disabled: !$root.enableSelect($data)}"><i class="icon-fire" title="{{ _('Load and Laser') }}"></i></div>
<!--<div class="btn btn-mini" data-bind="click: function() { $root.showFile($data); }"><i class="icon-arrow-right" title="{{ _('Preview') }}"></i></div>-->
</div>
</div>
</script>
@ -255,7 +253,6 @@
<div class="size">{{ _('Size') }}: <span data-bind="text: formatSize(size)"></span></div>
<div class="btn-group action-buttons">
<div class="btn btn-mini" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i></div>
<!--<div class="btn btn-mini" data-bind="click: function() { $root.convertSVG($data); }, css: {disabled: !$root.enableSVGConversion($data)}"><i class="icon-play" title="{{ _('Convert to Laserpath') }}"></i></div>-->
<div class="btn btn-mini" data-bind="click: function() { $root.workingArea.placeSVG($data); }, css: {disabled: !$root.enableSVGConversion($data)}"><i class="icon-arrow-right" title="{{ _('Use') }}"></i></div>
</div>
</div>

4
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -27,7 +27,7 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicing
return "-";
return formatSize(self.freeSpace());
});
// initialize list helper
self.listHelper = new ItemListHelper(
"gcodeFiles",
@ -368,6 +368,6 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicing
self.onMetadataAnalysisFinished = function(payload) {
self.requestData();
};
};
}