fixed sticky dpi issue in chrome when reimporting same file. thx to j…

…amie for reporting

.gitignore

@@ -2,4 +2,4 @@
 *.pyo
 *.DS_Store
 
-other
+other

backend/app.py

@@ -440,9 +440,10 @@ def run_helper():
 
 print "LasaurApp " + VERSION
 
-# if running on beaglebone, setup UART1 (pin muxing)
 if args.beaglebone:
+    ### if running on beaglebone, setup (pin muxing) and use UART1
     # for details see: http://www.nathandumont.com/node/250
+    SERIAL_PORT = "/dev/ttyO1"
     # echo 0 > /sys/kernel/debug/omap_mux/uart1_txd
     fw = file("/sys/kernel/debug/omap_mux/uart1_txd", "w")
     fw.write("%X" % (0))
@@ -455,18 +456,19 @@ def run_helper():
 if args.list_serial_devices:
     SerialManager.list_devices(BITSPERSECOND)
 else:
-    if args.port:
-        # (1) get the serial device from the argument list
-        SERIAL_PORT = args.port
-        print "Using serial device '"+ SERIAL_PORT +"' from command line."
-    else:
-        # (2) get the serial device from the config file        
-        if os.path.isfile(CONFIG_FILE):
-            fp = open(CONFIG_FILE)
-            line = fp.readline().strip()
-            if len(line) > 3:
-                SERIAL_PORT = line
-                print "Using serial device '"+ SERIAL_PORT +"' from '" + CONFIG_FILE + "'."
+    if not SERIAL_PORT:
+        if args.port:
+            # (1) get the serial device from the argument list
+            SERIAL_PORT = args.port
+            print "Using serial device '"+ SERIAL_PORT +"' from command line."
+        else:
+            # (2) get the serial device from the config file        
+            if os.path.isfile(CONFIG_FILE):
+                fp = open(CONFIG_FILE)
+                line = fp.readline().strip()
+                if len(line) > 3:
+                    SERIAL_PORT = line
+                    print "Using serial device '"+ SERIAL_PORT +"' from '" + CONFIG_FILE + "'."
 
     if not SERIAL_PORT:
         if args.match:

frontend/app.html

@@ -133,6 +133,7 @@
 										<div class="pull-left">
 											<form id="svg_upload_form" action="#" onsubmit="return false;">
 												<input type="file" id="svg_upload_file" name="data" style="visibility:hidden; position:fixed">
+												<input type="text" id="svg_upload_file_temp" style="display:none">			
 											</form>
 										</div>
 									</div>

frontend/js/app_import.js

@@ -39,6 +39,11 @@ $(document).ready(function(){
       // $().uxmessage('notice', "Using fallback: file form upload.");
     }
 
+    // reset file input form field so change event also triggers if
+    // same file is chosen again (but with different dpi)
+    $('#svg_upload_file_temp').val($('#svg_upload_file').val())
+    $('#svg_upload_file').val('')
+
   	e.preventDefault();		
   });
 
@@ -251,7 +256,7 @@ $(document).ready(function(){
     if (any_assingments == true) {     
       gcodeparts.push("S0\nG00X0Y0F16000\n%");
       var gcodestring = gcodeparts.join('');
-      var fullpath = $('#svg_upload_file').val();
+      var fullpath = $('#svg_upload_file_temp').val();
       var filename = fullpath.split('\\').pop().split('/').pop();
       save_and_add_to_job_queue(filename, gcodestring);
       load_into_gcode_widget(gcodestring, filename);