From a123a817839eb435058e78357e7d5e549dd0d433 Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Thu, 19 Feb 2015 14:53:38 +0100
Subject: [PATCH] several bugfixes for the beta release

---
 .../plugins/svgtogcode/static/css/mrbeam.css  |  2 +-
 .../plugins/svgtogcode/static/js/convert.js   | 23 +++++++++++--------
 .../templates/override_index.jinja2           |  2 +-
 .../svgtogcode/templates/svgtogcode.jinja2    |  2 +-
 .../static/js/app/viewmodels/terminal.js      |  4 ++--
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
index 3656bbd2..a6b26306 100644
--- a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
+++ b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
@@ -1620,7 +1620,7 @@ input.search-query,
 }
 */
 
-.file_list_entry .title {
+#files .file_list_entry .title {
 	margin-left: 3.3em;
 }
 
diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js
index 7c6c9c4f..cefecafa 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/convert.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js
@@ -44,8 +44,6 @@ $(function(){
 		self.show_conversion_dialog = function() {
 			self.svg = self.workingArea.getCompositionSVG();
 			self.gcodeFilesToAppend = self.workingArea.getPlacedGcodes();
-			var gcodeFile = self.create_gcode_filename(self.workingArea.placedDesigns());
-			self.gcodeFilename(gcodeFile);
 			
 			if(self.svg !== undefined){
 				if(self.laserIntensity() === undefined){
@@ -58,6 +56,9 @@ $(function(){
 				}
 
 				// TODO: js svg conversion
+				var gcodeFile = self.create_gcode_filename(self.workingArea.placedDesigns());
+				self.gcodeFilename(gcodeFile);
+				
 				self.title(gettext("Converting"));
 				$("#dialog_vector_graphics_conversion").modal("show"); // calls self.convert() afterwards
 			} else {
@@ -90,13 +91,21 @@ $(function(){
 				if(uniqueDesigns > 1){
 					gcode_name += "_"+(uniqueDesigns-1)+"more";
 				}
-				return gcode_name + ".gco";
+				
+				return gcode_name;
 			} else { 
 //				return "tmp"+Date.now()+".gco"; 
 				console.error("no designs placed.");
 				return;
 			}
 		};
+		
+		self.settingsString = ko.computed(function(){
+			var intensity = self.laserIntensity();
+			var feedrate = self.laserSpeed();
+			var settingsString = "_i" + intensity + "s" + Math.round(feedrate);
+			return settingsString;
+		});
 
 		self.slicer.subscribe(function(newValue) {
 			self.profilesForSlicer(newValue);
@@ -190,12 +199,8 @@ $(function(){
 			if(self.gcodeFilesToAppend.length === 1 && self.svg === undefined){
 				self.files.startGcodeWithSafetyWarning(self.gcodeFilesToAppend[0]);
 			} else {
-				var gcodeFilename = self._sanitize(self.gcodeFilename());
-				if (!_.endsWith(gcodeFilename.toLowerCase(), ".gco")
-					&& !_.endsWith(gcodeFilename.toLowerCase(), ".gcode")
-					&& !_.endsWith(gcodeFilename.toLowerCase(), ".g")) {
-					gcodeFilename = gcodeFilename + ".gco";
-				}
+				var filename = self.gcodeFilename() + self.settingsString() + '.gco';
+				var gcodeFilename = self._sanitize(filename);
 
 				var data = {
 					command: "convert",
diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index 5699e84f..a82fc124 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -309,7 +309,7 @@
 										<li><a href="#" data-bind="click: function() { $root.listHelper.changeSorting('size'); }"><i class="icon-ok" data-bind="style: {visibility: listHelper.currentSorting() == 'size' ? 'visible' : 'hidden'}"></i> {{ _('Sort by file size') }} ({{ _('descending') }})</a></li>
 										<li class="divider"></li>
 										<li><a href="#" data-bind="click: function() { $root.listHelper.toggleFilter('machinecode'); }"><i class="icon-ok" data-bind="style: {visibility: _.contains(listHelper.currentFilters(), 'machinecode') ? 'visible' : 'hidden'}"></i> {{ _('Only show GCode files') }}</a></li>
-										<li><a href="#" data-bind="click: function() { $root.listHelper.toggleFilter('model'); }"><i class="icon-ok" data-bind="style: {visibility: _.contains(listHelper.currentFilters(), 'model') ? 'visible' : 'hidden'}"></i> {{ _('Only show non GCode files') }}</a></li>
+										<li><a href="#" data-bind="click: function() { $root.listHelper.toggleFilter('model'); }"><i class="icon-ok" data-bind="style: {visibility: _.contains(listHelper.currentFilters(), 'model') ? 'visible' : 'hidden'}"></i> {{ _('Only show design files') }}</a></li>
 										<li class="divider"></li>
 									</ul>
 									<div class="muted text-right">
diff --git a/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2 b/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2
index 549c5ccf..52713d9c 100644
--- a/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2
@@ -27,7 +27,7 @@
                 <div class="controls">
                     <div class="input-append">
                         <input type="text" data-bind="value: gcodeFilename">
-                        <span class="add-on">.gco</span>
+                        <span class="add-on"><span data-bind="text:settingsString"></span>.gco</span>
                     </div>
                 </div>
             </div>
diff --git a/src/octoprint/static/js/app/viewmodels/terminal.js b/src/octoprint/static/js/app/viewmodels/terminal.js
index 6cbf92a4..24d9d47f 100644
--- a/src/octoprint/static/js/app/viewmodels/terminal.js
+++ b/src/octoprint/static/js/app/viewmodels/terminal.js
@@ -99,10 +99,10 @@ function TerminalViewModel(loginStateViewModel, settingsViewModel) {
         }
 
         //var re = /^([gmt][0-9]+)(\s.*)?/;
-        var re = /^(([gmtfs][0-9]+)|(\$[cinhgx#$])|([?~!]))(\s.*)?/; // grbl style
+        var re = /^([gmtfs][0-9]+|\$[cinhgx#$]|[?~!])(.*)?/; // grbl style
         var commandMatch = command.match(re);
         if (commandMatch != null) {
-            command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2] : "");
+            command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2].toUpperCase() : "");
         }
 
         if (command) {