From 06a279b4a42ae8f43ccb428ab11fb613fb4de319 Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Thu, 29 Jan 2015 14:06:56 +0100
Subject: [PATCH] quickly added a clear button for the working area. needs ui
 improvement.

---
 src/octoprint/plugins/svgtogcode/static/js/convert.js    | 2 +-
 .../plugins/svgtogcode/static/js/working_area.js         | 9 ++++++---
 .../plugins/svgtogcode/templates/override_index.jinja2   | 5 +----
 src/octoprint/static/js/app/viewmodels/files.js          | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js
index f2a0e348..fd91df70 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/convert.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js
@@ -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));
 			});
diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
index 1b33d014..fb5eaa33 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
@@ -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
 	
diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index f5eee306..7853fc80 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -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>
diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 5869b367..83433aa2 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -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();
-    };
+    };	
 }