Changeset 20612

Timestamp:

05/13/16 20:47:20 (9 years ago)

Author:

dlcheng

Message:

CHG: Removing extra print statement in generic.js. Movie slider now shows integer values only.

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic.js (modified) (4 diffs)
• plot/plot_unit.js (modified) (1 diff)

issm/trunk-jpl/src/m/classes/clusters/generic.js

@@ -48 +48 @@
 
                 var request = new XMLHttpRequest();
-                $(".run-button").html("CONNECTING...").prop("disabled", true);
+                $(".run-button").html(sprintf("%-16s", "CONNECTING...")).prop("disabled", true);
                 request.position = 0; //Keep track of current parsing position in repsonseText
                 request.timeout = 30000;
                 request.ontimeout = function (event) { //{{{
-                        $(".run-button").html("RUN").prop("disabled", false);
+                        $(".run-button").html(sprintf("%-16s", "RUN")).prop("disabled", false);
                 } //}}}
                 request.upload.onprogress = function(event) { //{{{
                         var progress = (event.loaded / event.total * 100).toFixed(0);
-                        $(".run-button").html("UPLOADING: " + progress + "%");
+                        $(".run-button").html(sprintf("%-20s", "UPLOADING: " + progress + "%"));
         } //}}}
                 request.onprogress = function (event) { //{{{
@@ -67 +67 @@
                                 endIndex = startIndex + chunkSize;
                                 if (chunkSize >= 65535) { //Arbitrary maximium size of message (Must be below minimium size of model results)
-                                        $(".run-button").html("DOWNLOADING: " + ((request.responseText.length - request.position) / chunkSize * 100).toFixed(0) + "%").prop("disabled", true);
+                                        $(".run-button").html(sprintf("%-20s", "DOWNLOADING: " + ((request.responseText.length - request.position) / chunkSize * 100).toFixed(0) + "%")).prop("disabled", true);
                                 }
                                 else if (request.responseText.length >= endIndex) { //Ensure entire chunk is loaded
@@ -78 +78 @@
                 request.onload = function (event) { //{{{
                         //get context to this.str2ab to avoid duplciation
-                        console.log(event);
                         function str2ab(str) {
                                 var buf = new Uint8Array(str.length);
@@ -95 +94 @@
                                 console.log(e);
                         }
-                        $(".run-button").html("RUN").prop("disabled", false);
+                        $(".run-button").html(sprintf("%-16s", "RUN")).prop("disabled", false);
                         callbackfunction();
                 }; //}}}

issm/trunk-jpl/src/m/plot/plot_unit.js

@@ -255 +255 @@
                                                                 }
                                                         }
-                                                        if (canvas["timeLabel"]) canvas["timeLabel"].html(String(node["movieTimestamps"][node["movieFrame"]]) + " " + options.getfieldvalue("movietimeunit","yr"));
+                                                        if (canvas["timeLabel"]) canvas["timeLabel"].html(node["movieTimestamps"][node["movieFrame"]].toFixed(0) + " " + options.getfieldvalue("movietimeunit","yr"));
                                                         if (canvas["progressBar"]) canvas["progressBar"].slider("value", node["movieFrame"]);
                                                         node["buffers"] = initBuffers(gl,[node["arrays"][0],node["arrays"][1][node["movieFrame"]],node["arrays"][2]]);