Changeset 20726

Timestamp:

06/13/16 21:34:50 (9 years ago)

Author:

dlcheng

Message:

ADD (javascript): Adding io/download.js for saving arbitrarily model/variable data. CHG (javascript): Added to Makefile. Minor code cleanup. Starting documentation for js specific code.

Location:

issm/trunk-jpl/src/m

Files:

• Makefile.am (modified) (1 diff)
• classes/clusters/generic.js (modified) (1 diff)
• io/download.js (added)
• plot/gauge.js (modified) (1 diff)
• plot/slider.js (modified) (5 diffs)
• plot/tooltips.js (modified) (2 diffs)

issm/trunk-jpl/src/m/Makefile.am

@@ -135 +135 @@
                                 ${ISSM_DIR}/src/m/io/loadmodel.js \
                                 ${ISSM_DIR}/src/m/io/saveAsFile.js \
+                                ${ISSM_DIR}/src/m/io/download.js \
                                 ${ISSM_DIR}/src/m/materials/paterson.js \
                                 ${ISSM_DIR}/src/m/mesh/triangle.js \

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

@@ -86 +86 @@
                                 return buf;
                         }
-                        var buffer2 = str2ab(window.atob(request.responseText.slice(request.position + 10)));                   
-                        var returnBuffer = new Uint8Array(buffer2);
+                        var buffer = str2ab(window.atob(request.responseText.slice(request.position + 10)));                    
+                        var returnBuffer = new Uint8Array(buffer);
                         var returnBuffer_size = returnBuffer.byteLength;
                         try {

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

@@ -1 @@
-function gauge(){
+//GAGUE - create a gague and label that display a value
+//
+//   Usage:
+//      gauge=gauge(); TODO: Expand
+
+function gauge() {
         //Convert arguments to options
         var args = Array.prototype.slice.call(arguments);
         var options = new pairoptions(args);
 
-        gaugecanvas=options.getfieldvalue('gaugecanvas','gauge');
-        gaugetext=options.getfieldvalue('gaugetext','gauge-text');
-        gaugediv=options.getfieldvalue('gaugediv','slr-controldiv');
-        gaugevalue=options.getfieldvalue('value',0);
-        min=options.getfieldvalue('min',0);
-        max=options.getfieldvalue('max',22);
-        colors=options.getfieldvalue('colors',[[0.0, "#000000" ], [0.50, "#880000"], [1.0, "#ff0000"]]);
-        label=options.getfieldvalue('label','');
+        gaugecanvas = options.getfieldvalue('gaugecanvas','gauge');
+        gaugetext = options.getfieldvalue('gaugetext','gauge-text');
+        gaugediv = options.getfieldvalue('gaugediv','slr-controldiv');
+        gaugevalue = options.getfieldvalue('value',0);
+        min = options.getfieldvalue('min',0);
+        max = options.getfieldvalue('max',22);
+        colors = options.getfieldvalue('colors',[[0.0, "#000000" ], [0.50, "#880000"], [1.0, "#ff0000"]]);
+        label = options.getfieldvalue('label','');
         
         $('<div class="bordered margin-8 padding-8"><canvas id="'+gaugecanvas+'" width="100px" height="50%" class="gauge-canvas"></canvas><div id="'+gaugetext+'" class="gauge-text"></div></div>').appendTo('#'+gaugediv);

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

@@ -1 @@
-function slider(){
-        
+//SLIDER - create a slider bar to set a value
+//
+//   Usage:
+//      slider=slider(); TODO: Expand
+
+function slider() {
         //Convert arguments to options
         var args = Array.prototype.slice.call(arguments);
-        var  options = new pairoptions(args.slice());
+        var options = new pairoptions(args.slice());
 
         //Recover option values:
@@ -31 +35 @@
                 max:max,
                 step:step,
-                slide:function(event,ui){
-                        moveSlide(event,ui,info,middlemessage,precision);
+                slide:function(event,ui,info,middlemessage,precision){
+                        info.text(middlemessage[0]+ui.value.toFixed(precision)+middlemessage[1]);
                 },
-                stop:function(event,ui){
-                        stopSlide(event,ui,info,callback,middlemessage,endmessage,precision);
+                stop:function(event,ui,info,functionvalue,middlemessage,endmessage,precision){
+                        info.text(middlemessage[0]+ui.value.toFixed(precision)+middlemessage[1]);
+                        functionvalue(ui.value);
+                        info.text(endmessage[0]+ui.value.toFixed(precision)+endmessage[1]);
                 }
         });
@@ -53 +59 @@
 }
 
-function moveSlide(event,ui,info,middlemessage,precision){
-        var val=ui.value;
-        info.text(middlemessage[0]+val.toFixed(precision)+middlemessage[1]);
-}
+//PROGRESS - create a progress bar to display a value
+//
+//   Usage:
+//      progress=progress(); TODO: Expand
 
-function stopSlide(event,ui,info,functionvalue,middlemessage,endmessage,precision){
-        var val=ui.value;
-        info.text(middlemessage[0]+val.toFixed(precision)+middlemessage[1]);
-        functionvalue(val);
-        info.text(endmessage[0]+val.toFixed(precision)+endmessage[1]);
-}
-
-function progress(){
+function progress() {
         //Convert arguments to options
         var args = Array.prototype.slice.call(arguments);
-        var  options = new pairoptions(args.slice());
+        var options = new pairoptions(args.slice());
         
         var value = options.getfieldvalue('value',0);
@@ -113 +112 @@
                 max:1,
                 step:1,
-                start:function(event,ui){
-                        startProgress(event,ui,canvas);
+                start:function(event,ui,canvas){
+                        canvas.movieFrame = ui.value;
+                        canvas.movieIncrement = false;
                 },
-                slide:function(event,ui){
-                        moveProgress(event,ui,canvas);
+                slide:function(event,ui,canvas){
+                        canvas.movieFrame = ui.value;
                 },
-                stop:function(event,ui){
-                        stopProgress(event,ui,canvas);
+                stop:function(event,ui,canvas){
+                        canvas.movieFrame = ui.value;
+                        canvas.movieIncrement = true;
                 }
         });
@@ -139 +140 @@
         canvas.progressBar = $('.'+name+'-progressbar');
 }
-
-function startProgress(event,ui,canvas){
-        canvas.movieFrame = ui.value;
-        canvas.movieIncrement = false;
-}
-
-function moveProgress(event,ui,canvas){
-        canvas.movieFrame = ui.value;
-}
-
-function stopProgress(event,ui,canvas){
-        canvas.movieFrame = ui.value;
-        canvas.movieIncrement = true;
-}

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

@@ -1 @@
-function tooltip(){
-        
+//TOOLTIP - create a hidden toolip that shows html formatted info on hover
+//
+//   Usage:
+//      tooltip=tooltip(); TODO: Expand
+
+function tooltip() {
         //Convert arguments to options
         var args = Array.prototype.slice.call(arguments);
-        var  options = new pairoptions(args.slice());
+        var options = new pairoptions(args.slice());
 
         //Recover option values:
@@ -24 +28 @@
                 tooltip.fadeIn();
                 }, function() {
-                $("> div", this).fadeOut(function() {$(this).css("marginLeft", "");});
+                        $("> div", this).fadeOut(function() {$(this).css("marginLeft", "");
+                });
         });
 }