Some fixes to mm3/sec calculation

Author: hudbrog

.gitignore

@@ -0,0 +1 @@
+.idea/

js/Worker.js

@@ -220,7 +220,7 @@
                         volSpeedsByLayer[cmds[j].prevZ][volIndex] = volPerMM;
                     }
 
-                    var extrusionSpeed = volPerMM*cmds[j].speed;
+                    var extrusionSpeed = cmds[j].volPerMM*(cmds[j].speed/60);
                     extrusionSpeed = parseFloat(extrusionSpeed).toFixed(3);
                     var volIndex = extrusionSpeeds.indexOf(extrusionSpeed);
                     if(volIndex === -1){
@@ -325,7 +325,7 @@
                         case 'c':
                             assumeNonDC = true;
                             extruder = argChar;
-                            numSlice = parseFloat(args[j].slice(1)).toFixed(3);
+                            numSlice = parseFloat(args[j].slice(1)).toFixed(6);
 
                             if(!extrudeRelative){
                                 // absolute extrusion positioning
@@ -369,7 +369,7 @@
                 }
                 if(!model[layer])model[layer]=[];
                 //if(typeof(x) !== 'undefined' || typeof(y) !== 'undefined' ||typeof(z) !== 'undefined'||retract!=0)
-                    model[layer][model[layer].length] = {x: Number(x), y: Number(y), z: Number(z), extrude: extrude, retract: Number(retract), noMove: false, extrusion: (extrude||retract)?Number(prev_extrude["abs"]):0, extruder: extruder, prevX: Number(prevX), prevY: Number(prevY), prevZ: Number(prevZ), speed: Number(lastF), gcodeLine: Number(i), volPerMM: typeof(volPerMM)==='undefined'?-1:volPerMM.toFixed(3)};
+                    model[layer][model[layer].length] = {x: Number(x), y: Number(y), z: Number(z), extrude: extrude, retract: Number(retract), noMove: false, extrusion: (extrude||retract)?Number(prev_extrude["abs"]):0, extruder: extruder, prevX: Number(prevX), prevY: Number(prevY), prevZ: Number(prevZ), speed: Number(lastF), gcodeLine: Number(i), volPerMM: typeof(volPerMM)==='undefined'?-1:volPerMM};
                 //{x: x, y: y, z: z, extrude: extrude, retract: retract, noMove: false, extrusion: (extrude||retract)?prev_extrude["abs"]:0, prevX: prevX, prevY: prevY, prevZ: prevZ, speed: lastF, gcodeLine: i};
                 if(typeof(x) !== 'undefined') prevX = x;
                 if(typeof(y) !== 'undefined') prevY = y;

js/renderer.js

@@ -283,7 +283,7 @@ GCODE.renderer = (function(){
                 }else if(renderOptions['speedDisplayType'] === displayType.expermm){
                     speedIndex = volSpeeds.indexOf(cmds[i].volPerMM);
                 }else if(renderOptions['speedDisplayType'] === displayType.volpersec){
-                    speedIndex = extrusionSpeeds.indexOf((cmds[i].volPerMM*cmds[i].speed).toFixed(3));
+                    speedIndex = extrusionSpeeds.indexOf((cmds[i].volPerMM*cmds[i].speed/60).toFixed(3));
                 }else{
                     speedIndex=0;
                 }

js/ui.js

@@ -112,7 +112,7 @@ GCODE.ui = (function(){
             if(typeof(layerSpeeds[z][i])==='undefined'){continue;}
             speedIndex = i;
             if(speedIndex > colorLen -1){speedIndex = speedIndex % (colorLen-1);}
-            output.push("<div id='colorBox"+i+"' class='colorBox' style='background-color: "+colors[speedIndex] + "'></div>  = " + (parseFloat(layerSpeeds[z][i]*3.141*gCodeOptions['filamentDia']/10*gCodeOptions['filamentDia']/10/4)).toFixed(3)+"mm^3/sec");
+            output.push("<div id='colorBox"+i+"' class='colorBox' style='background-color: "+colors[speedIndex] + "'></div>  = " + (parseFloat(layerSpeeds[z][i]*3.141*gCodeOptions['filamentDia']*gCodeOptions['filamentDia']/4)).toFixed(3)+"mm^3/sec");
         }
 
         return output;
@@ -462,7 +462,10 @@ GCODE.ui = (function(){
             if(document.getElementById('speedDisplayRadio').checked)GCODE.renderer.setOption({speedDisplayType: displayType.speed});
             if(document.getElementById('exPerMMRadio').checked)GCODE.renderer.setOption({speedDisplayType: displayType.expermm});
             if(document.getElementById('volPerSecRadio').checked)GCODE.renderer.setOption({speedDisplayType: displayType.volpersec});
-
+            if(GCODE.gCodeReader.getModelInfo().layerTotal > 0){
+                printModelInfo();
+                printLayerInfo($( "#slider-vertical" ).slider("value"));
+            }
         },
 
         updateOptions: function(){