Changeset 19850

Timestamp:

12/01/15 22:54:24 (9 years ago)

Author:

dlcheng

Message:

CHG: Fixing colorbarcanvasid handling for labelsw

File:

• issm/trunk-jpl/src/m/plot/applyoptions.js (modified) (2 diffs)

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

@@ -147 +147 @@
                         ccanvas=document.getElementById(ccanvasid);
                         if(ccanvas==null){
-                                ccanvas = $('<canvas id="'+ccanvasid+' width="'+String(cwidth*4)+'" height="'+String(cheight+cheightoffset)+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
-                                ccanvas.css({'display':'inline-block','position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
+                                ccanvas = $('<canvas id="'+ccanvasid+'" width="'+String(cwidth+cheightoffset*4)+'" height="'+String(cheight+cheightoffset)+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
+                                ccanvas.css({'position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
                                 ccontext = ccanvas[0].getContext('2d');
                         }
@@ -154 +154 @@
                                 ccanvas = $('#'+ccanvasid);
                                 if (options.exist('colorbarcanvasid')){
+                                        //store actual colobar size
                                         cheight=ccanvas.height();
-                                        cwidth=ccanvas.width(); 
+                                        cwidth=ccanvas.width();
+                                        //get html object instead of jqurey object to modify height/width to accomodate labels
+                                        document.getElementById(ccanvasid).width=ccanvas.width()+cheightoffset*6;
+                                        document.getElementById(ccanvasid).width=ccanvas.height()+cheightoffset;
                                 }
-                                ccanvas.css({'display':'inline-block','position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
                                 ccontext = ccanvas[0].getContext('2d');
                                 /*erase existing colorbar:*/