Changeset 19786

Timestamp:

11/22/15 20:02:28 (9 years ago)

Author:

dlcheng

Message:

CHG:Fixing default behvaior for applyoptions colorbar labels

Location:

issm/trunk-jpl

Files:

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

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

@@ -153 +153 @@
                                         ccontext.fillRect(0, Math.floor(i * cheight / cdivisions), cwidth, Math.ceil(cheight / cdivisions));
                                 }
+                                //Set colorbar lables
+                                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 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));
+                                        for (var i = cdivisions; i >= 0; i--) {
+                                                labels[i] = (caxisdelta*i/cdivisions-caxis[0]).toFixed(2);
+                                        }
+                                } else {
+                                        for (var i = cdivisions; i >= 0; i--) {
+                                                labels[i] = (caxisdelta*i/cdivisions-caxis[0]).toFixed(2);
+                                        }
+                                }
+                                for (var i = cdivisions; i >= 0; i--) {
+                                        var clabelitem = $('<li><div>'+labels[i]+'</div></li>')
+                                        clabelitem.css({'display':'table-row'});
+                                        clabelitem.find('div').css({'display':'table-cell','vertical-align':'middle'});
+                                        clabelitem.appendTo('#'+options.getfieldvalue('canvasid')+'_colorbar_labels');
+                                }
                         }
                         /* //{{{
@@ -218 +243 @@
                                 set(gca,'Position',posaxes);
                         }
+                        if (options.exist('cbYTickLabel')) {
+                        }
                         */ //}}}
-                        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');
-                                        }
-                                }
-                        }
                 }
         } else {

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

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