Changeset 19785

Timestamp:

11/22/15 19:40:51 (9 years ago)

Author:

dlcheng

Message:

CHG:Adding colorbar label support for test101

Location:

issm/trunk-jpl

Files:

• src/m/plot/applyoptions.js (modified) (3 diffs)
• test/NightlyRun/test101.html (modified) (1 diff)

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

@@ -143 +143 @@
                                 var cdivisions = cheight/4;
                                 var color;
-                                var ccanvas = $('<canvas id="'+options.getfieldvalue('canvasid')+'-colorbar" width="'+cwidth+'" height="'+cheight+'"></canvas>').insertAfter("#"+options.getfieldvalue('canvasid'));
-                                ccanvas.css({"vertical-align":"top","margin":"0px "+String(cwidth/4)+"px 0px "+String(cwidth/4)+"px"});
+                                var ccanvas = $('<canvas id="'+options.getfieldvalue('canvasid')+'_colorbar" width="'+cwidth+'" height="'+cheight+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
+                                ccanvas.css({'vertical-align':'top','margin':'0px '+String(cwidth/4)+'px 0px '+String(cwidth/4)+'px'});
                                 var ccontext = ccanvas[0].getContext('2d');
                                 for (var i = 0; i < cdivisions; i++) {
@@ -150 +150 @@
                                         color = colorbar[(colorbar.length - 1) - cindex];
                                         color = [Math.round(color[0] * 255), Math.round(color[1] * 255), Math.round(color[2] * 255)];   
-                                        ccontext.fillStyle = "rgba(" + color.toString() + ",1.0)";
+                                        ccontext.fillStyle = 'rgba(' + color.toString() + ',1.0)';
                                         ccontext.fillRect(0, Math.floor(i * cheight / cdivisions), cwidth, Math.ceil(cheight / cdivisions));
                                 }
@@ -218 +218 @@
                                 set(gca,'Position',posaxes);
                         }
-                        if exist(options,'cbYTickLabel');
-                                tick_vals=options.getfieldvalue('cbYTickLabel');
-                                if ~isnumeric(tick_vals) & strcmp(tick_vals,'on')
-                                        tick_vals=get(c,'YTick')';
-                                        if exist(options,'log')
-                                                logval= options.getfieldvalue('log');
-                                                for i= 1:numel(tick_vals)
-                                                        tick_vals(i)= logval^(tick_vals(i));
-                                                }
-                                        elseif numel(tick_vals) == 3
-                                                tick_vals=[tick_vals(1); mean(tick_vals(1:2)); tick_vals(2); ...
-                                                        mean(tick_vals(2:3)); tick_vals(3)];
-                                                set(c,'YTick',tick_vals);
-                                        }
-                                else
-                                        if exist(options,'log')
-                                                logvalue=options.getfieldvalue('log');
-                                                set(c,'YTick',log(tick_vals)./log(logvalue));
-                                        else
-                                                set(c,'YTick',tick_vals);
+                        */ //}}}
+                        if (options.exist('cbYTickLabel')) {
+                                var cwidth = options.getfieldvalue('colorbarwidth',options.getfieldvalue('canvassize',480)/20);
+                                var clabels = $('<ul id="'+options.getfieldvalue('canvasid')+'_colorbar_labels"></ul>').insertAfter('#'+options.getfieldvalue('canvasid')+'_colorbar');
+                                clabels.css({'width':'auto','height':String(options.getfieldvalue('canvassize',480)),'vertical-align':'top','list-style-type':'none','display':'inline-table','padding':'0px','margin':'0px '+String(cwidth/4)+'px 0px '+String(cwidth/4)+'px'});
+                                var tick_vals = options.getfieldvalue('cbYTickLabel');
+                                var labels = [];
+                                var cdivisions = 8;
+                                var caxisdelta = caxis[1] - caxis[0];
+                                var clabelitem;
+                                if (options.exist('log')) {
+                                        //logvalue=options.getfieldvalue('log');
+                                        //set(c,'YTick',log(tick_vals)./log(logvalue));
+                                } else {
+                                        for (var i = cdivisions; i >= 0; i--) {
+                                                var clabelitem = $('<li><div>'+(caxisdelta*i/cdivisions-caxis[0]).toFixed(2)+'</div></li>')
+                                                clabelitem.css({'display':'table-row'});
+                                                clabelitem.find('div').css({'display':'table-cell','vertical-align':'middle'});
+                                                clabelitem.appendTo('#'+options.getfieldvalue('canvasid')+'_colorbar_labels');
                                         }
                                 }
-                                labels = cell(1,numel(tick_vals));
-                                for i = 1:numel(tick_vals)
-                                        labels{i} = num2str(tick_vals(i));
-                                }
-                                set(c,'YTickLabel',labels);
-                        }
-                        */ //}}}
+                        }
                 }
         } else {

issm/trunk-jpl/test/NightlyRun/test101.html

@@ -95 +95 @@
         //md=solve(md,StressbalanceSolutionEnum());
 
-        plotmodel(md,'data',md.initialization.vel,'colorbar',1, 'data',md.initialization.vx,
+        plotmodel(md,'data',md.initialization.vel,'colorbar',1,'cbYTickLabel',1, 'data',md.initialization.vx,
         'data',md.initialization.temperature, 'data',md.basalforcings.floatingice_melting_rate,'data','mesh');