diff --git a/apis/charts_graphs_amcharts/charts_graphs_amcharts.class.inc b/apis/charts_graphs_amcharts/charts_graphs_amcharts.class.inc index 692e41a..ac41a85 100644 --- a/apis/charts_graphs_amcharts/charts_graphs_amcharts.class.inc +++ b/apis/charts_graphs_amcharts/charts_graphs_amcharts.class.inc @@ -6,7 +6,7 @@ * */ -require_once dirname(__FILE__) . '/../../charts_graphs_flash_canvas.class.inc'; +require_once DRUPAL_ROOT . '/' . dirname(__FILE__) . '/../../charts_graphs_flash_canvas.class.inc'; /** * Implementation of abstract class ChartsGraphsFlashCanvas for amCharts library. @@ -177,8 +177,14 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { $series = $this->merge_xml_values($series, $this->chart_series); $graphs = $this->merge_xml_values($graphs, $this->chart_graphs); - $series = array('#id' => 'series', '#children' => $series); - $graphs = array('#id' => 'graphs', '#children' => $graphs); + $series = array( + '#id' => 'series', + '#children' => $series, + ); + $graphs = array( + '#id' => 'graphs', + '#children' => $graphs, + ); $chart = array( '#id' => 'chart', @@ -300,10 +306,22 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { $data = $this->_preprocess_values(); $settings = array( - array('#id' => 'type', '#value' => $am_type), - array('#id' => 'depth', '#value' => 5), - array('#id' => 'js_enabled', '#value' => 'false'), - array('#id' => 'redraw', '#value' => 'true'), + array( + '#id' => 'type', + '#value' => $am_type, + ), + array( + '#id' => 'depth', + '#value' => 5, + ), + array( + '#id' => 'js_enabled', + '#value' => 'false', + ), + array( + '#id' => 'redraw', + '#value' => 'true', + ), array( '#id' => 'data_labels', '#children' => array( @@ -349,9 +367,9 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { (isset($this->y_min) || isset($this->y_max))) { $children = array(array( - '#id' => 'strict_min_max', - '#value' => 'true', - )); + '#id' => 'strict_min_max', + '#value' => 'true', + )); if (isset($this->y_min)) { $children[] = array( '#id' => 'min', @@ -371,18 +389,33 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { array( '#id' => $y_axis_limits_container, '#children' => $children, - ) - ) + ), + ), ); } if (isset($this->y_legend)) { $label = array( - array('#id' => 'x', '#value' => '2%'), - array('#id' => 'y', '#value' => '100%'), - array('#id' => 'align', '#value' => 'center'), - array('#id' => 'rotate', '#value' => 'true'), - array('#id' => 'text', '#value' => strip_tags($this->y_legend)), + array( + '#id' => 'x', + '#value' => '2%', + ), + array( + '#id' => 'y', + '#value' => '100%', + ), + array( + '#id' => 'align', + '#value' => 'center', + ), + array( + '#id' => 'rotate', + '#value' => 'true', + ), + array( + '#id' => 'text', + '#value' => strip_tags($this->y_legend), + ), ); $settings[] = array( '#id' => 'labels', @@ -393,7 +426,10 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { if (isset($am_column_type)) { $column = array( '#id' => 'column', - '#children' => array('#id' => 'type', '#value' => $am_column_type), + '#children' => array( + '#id' => 'type', + '#value' => $am_column_type, + ), ); $settings[] = $column; } @@ -414,18 +450,36 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { if ($am_type == 'pie') { $pie = array( - array('#id' => 'hover_brightness', '#value' => -20), - array('#id' => 'gradient', '#value' => 'linear'), - array('#id' => 'gradient_ratio', '#value' => '-10,60'), + array( + '#id' => 'hover_brightness', + '#value' => -20, + ), + array( + '#id' => 'gradient', + '#value' => 'linear', + ), + array( + '#id' => 'gradient_ratio', + '#value' => '-10,60', + ), ); if ($inner_radius !== NULL) { - $pie[] = array('#id' => 'inner_radius', '#value' => $inner_radius); + $pie[] = array( + '#id' => 'inner_radius', + '#value' => $inner_radius, + ); } if ($angle_pie_3d !== NULL) { - $pie[] = array('#id' => 'angle', '#value' => $angle_pie_3d); + $pie[] = array( + '#id' => 'angle', + '#value' => $angle_pie_3d, + ); } if ($height_pie_3d !== NULL) { - $pie[] = array('#id' => 'height', '#value' => $height_pie_3d); + $pie[] = array( + '#id' => 'height', + '#value' => $height_pie_3d, + ); } $colors = array_slice( $this->series_colours(), @@ -437,7 +491,10 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { '#value' => implode(',', $colors), ); - $pie = array('#id' => 'pie', '#children' => $pie); + $pie = array( + '#id' => 'pie', + '#children' => $pie, + ); $settings[] = $pie; } else { @@ -449,13 +506,17 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { } $settings = $this->merge_xml_values($settings, $this->settings); - $settings = array('#id' => 'settings', '#children' => $settings); + $settings = array( + '#id' => 'settings', + '#children' => $settings, + ); $this->settings_to_use = array($settings); $wmode = $this->get_wmode(); $mod_path = drupal_get_path('module', $this->getModuleName()); + // TODO The second parameter to this function call should be an array. $file = url( "${mod_path}/downloaded/${am_category}.swf", array('absolute' => TRUE) @@ -467,24 +528,26 @@ class ChartsGraphsAmcharts extends ChartsGraphsFlashCanvas { $tocache = new stdClass(); $tocache->settings = $this->get_xml_file_from_array($this->settings_to_use); $tocache->data = $this->get_xml_file_from_array($this->data_to_use); - cache_set($unique, $tocache, 'cache', time() + 30); //Keep for at least 30 seconds; + cache_set($unique, $tocache, 'cache', REQUEST_TIME + 30); //Keep for at least 30 seconds; $settings_url_query = sprintf('cid=%s', $unique); + // TODO The second parameter to this function call should be an array. $settings_url = url( 'charts_graphs_amcharts/getdata/settings', array( - 'absolute' => TRUE, - 'query' => $settings_url_query, - ) + 'absolute' => TRUE, + 'query' => $settings_url_query, + ) ); $data_url_query = sprintf('cid=%s', $unique); + // TODO The second parameter to this function call should be an array. $data_url = url( 'charts_graphs_amcharts/getdata/data', array( - 'absolute' => TRUE, - 'query' => $data_url_query, - ) + 'absolute' => TRUE, + 'query' => $data_url_query, + ) ); $flashvars = array( diff --git a/apis/charts_graphs_amcharts/charts_graphs_amcharts.info b/apis/charts_graphs_amcharts/charts_graphs_amcharts.info index c0038f4..b4c3c43 100644 --- a/apis/charts_graphs_amcharts/charts_graphs_amcharts.info +++ b/apis/charts_graphs_amcharts/charts_graphs_amcharts.info @@ -4,5 +4,6 @@ description = "amCharts implementation for Charts and Graphs." dependencies[] = charts_graphs dependencies[] = swftools package = "Charts" -core = 6.x +core = 7.x php = 5.1 + diff --git a/apis/charts_graphs_amcharts/charts_graphs_amcharts.install b/apis/charts_graphs_amcharts/charts_graphs_amcharts.install index 77c6591..05a2dac 100644 --- a/apis/charts_graphs_amcharts/charts_graphs_amcharts.install +++ b/apis/charts_graphs_amcharts/charts_graphs_amcharts.install @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_requirements(). + * Implements hook_requirements(). */ function charts_graphs_amcharts_requirements($phase) { $requirements = array(); @@ -28,8 +28,9 @@ function charts_graphs_amcharts_requirements($phase) { 'description' => $t('amCharts for Charts and Graphs needs the %file file to work properly. Please review amCharts !installation_instructions.', array( - '%file' => $file, - '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path)) + '%file' => $file, + '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path), + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Unavailable'), @@ -43,8 +44,9 @@ function charts_graphs_amcharts_requirements($phase) { 'description' => $t('amCharts for Charts and Graphs needs the %file file to work properly. Please review amCharts !installation_instructions.', array( - '%file' => $file, - '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path)) + '%file' => $file, + '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path), + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Unavailable'), @@ -58,8 +60,9 @@ function charts_graphs_amcharts_requirements($phase) { 'description' => $t('amCharts for Charts and Graphsneeds the %file file to work properly. Please review amCharts !installation_instructions.', array( - '%file' => $file, - '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path)) + '%file' => $file, + '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path), + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Unavailable'), @@ -72,7 +75,8 @@ function charts_graphs_amcharts_requirements($phase) { 'description' => $t('amCharts for Charts and Graphs needs DOM support in PHP. Please review amCharts !installation_instructions and enable it.', array( - '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path)) + '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path), + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Unavailable'), diff --git a/apis/charts_graphs_amcharts/charts_graphs_amcharts.module b/apis/charts_graphs_amcharts/charts_graphs_amcharts.module index 30c845a..e12436b 100644 --- a/apis/charts_graphs_amcharts/charts_graphs_amcharts.module +++ b/apis/charts_graphs_amcharts/charts_graphs_amcharts.module @@ -5,15 +5,15 @@ */ /** - * Implementation of hook_chartgraph_provider(). + * Implements hook_chartgraph_provider(). **/ function charts_graphs_amcharts_chartgraph_provider() { $provider = array( - 'path' => dirname(__FILE__) . '/charts_graphs_amcharts.class.inc', // must be full path + 'path' => drupal_get_path('module', 'charts_graphs_amcharts') . '/charts_graphs_amcharts.class.inc', // must be full path 'clazz' => 'ChartsGraphsAmcharts', // implementation class' name 'name' => 'amcharts', // name used when invoking through a factory method - 'nice_name' => 'amCharts', - 'chart_types' => array( + 'nice_name' => 'amCharts', + 'chart_types' => array( 'line' => t('Line'), 'area' => t('Area'), 'donut' => t('Donut'), @@ -31,11 +31,15 @@ function charts_graphs_amcharts_chartgraph_provider() { 'side_bar_3d' => t('3D Side Bar'), ), 'themes' => array(), - ); - + ); + return (object) $provider; } +/** + * @todo Please document this function. + * @see http://drupal.org/node/1354 + */ function charts_graphs_amcharts_menu() { $items = array(); @@ -48,15 +52,19 @@ function charts_graphs_amcharts_menu() { return $items; } +/** + * @todo Please document this function. + * @see http://drupal.org/node/1354 + */ function charts_graphs_amcharts_get_data() { $cid = check_plain($_GET['cid']); $op = check_plain(arg(2)); - + if ($op != 'settings' && $op != 'data') { drupal_not_found(); exit(); } - + $cache = cache_get($cid); if (!$cache || empty($cache->data)) { drupal_not_found(); @@ -64,9 +72,9 @@ function charts_graphs_amcharts_get_data() { } $obj = $cache->data; - + $ret = $obj->$op; - drupal_set_header('Content-Type: text/xml; charset=utf-8'); + drupal_add_http_header('Content-Type', 'text/xml; charset=utf-8'); print $ret; exit(); } diff --git a/apis/charts_graphs_bluff/bluff-src.js b/apis/charts_graphs_bluff/bluff-src.js index 832ce16..eb8de9c 100644 --- a/apis/charts_graphs_bluff/bluff-src.js +++ b/apis/charts_graphs_bluff/bluff-src.js @@ -1,3 +1,4 @@ +(function ($) { /** * Bluff - beautiful graphs in JavaScript * ====================================== @@ -2987,4 +2988,5 @@ Bluff.TableReader = new JS.Class({ } }); -Bluff.Base.include(Bluff.TableReader.Mixin); \ No newline at end of file +Bluff.Base.include(Bluff.TableReader.Mixin); +})(jQuery); diff --git a/apis/charts_graphs_bluff/bluff/bluff-min.js b/apis/charts_graphs_bluff/bluff/bluff-min.js index d862cc9..4f8ad93 100644 --- a/apis/charts_graphs_bluff/bluff/bluff-min.js +++ b/apis/charts_graphs_bluff/bluff/bluff-min.js @@ -1 +1,3 @@ -Bluff={VERSION:'0.3.6',array:function(c){if(c.length===undefined)return[c];var d=[],f=c.length;while(f--)d[f]=c[f];return d},array_new:function(c,d){var f=[];while(c--)f.push(d);return f},each:function(c,d,f){for(var g=0,h=c.length;gthis._5)?g.length:this._5;Bluff.each(g,function(c,d){if(c===undefined)return;if(this.maximum_value===null&&this.minimum_value===null)this.maximum_value=this.minimum_value=c;this.maximum_value=this._1k(c)?c:this.maximum_value;if(this.maximum_value>=0)this._c=true;this.minimum_value=this._1G(c)?c:this.minimum_value;if(this.minimum_value<0)this._c=true},this)},draw:function(){if(this.stacked)this._1H();this._1I();this._x(function(){this._0.rectangle(this.left_margin,this.top_margin,this._b-this.right_margin,this._L-this.bottom_margin);this._0.rectangle(this._2,this._7,this._l,this._g)})},clear:function(){this._M()},on:function(c,d,f){var g=this._10[c]=this._10[c]||[];g.push([d,f])},trigger:function(d,f){var g=this._10[d];if(!g)return;Bluff.each(g,function(c){c[0].call(c[1],f)})},_1I:function(){if(!this._c)return this._1J();this._16();this._1K();if(this.sort)this._1L();this._1M();this._N();this._1N();this._1O()},_16:function(g){if(this._9===null||g===true){this._9=[];if(!this._c)return;this._1l();Bluff.each(this._1,function(d){var f=[];Bluff.each(d[this.klass.DATA_VALUES_INDEX],function(c){if(c===null||c===undefined)f.push(null);else f.push((c-this.minimum_value)/this._i)},this);this._9.push([d[this.klass.DATA_LABEL_INDEX],f,d[this.klass.DATA_COLOR_INDEX]])},this)}},_1l:function(){this._i=this.maximum_value-this.minimum_value;this._i=this._i>0?this._i:1;var c=Math.round(Math.LOG10E*Math.log(this._i));this._1m=Math.pow(10,3-c)},_1K:function(){this._O=this.hide_line_markers?0:this._P(this.marker_font_size);this._1n=this.hide_title?0:this._P(this.title_font_size);this._1o=this.hide_legend?0:this._P(this.legend_font_size);var c,d,f,g,h,i,j;if(this.hide_line_markers){this._2=this.left_margin;this._17=this.right_margin;this._1p=this.bottom_margin}else{d=0;if(this.has_left_labels){c='';for(j in this.labels){c=c.length>this.labels[j].length?c:this.labels[j]}d=this._H(this.marker_font_size,c)*1.25}else{d=this._H(this.marker_font_size,this._Q(this.maximum_value))}f=this.hide_line_numbers&&!this.has_left_labels?0.0:d+this.klass.LABEL_MARGIN*2;this._2=this.left_margin+f+(this.y_axis_label===null?0.0:this._O+this.klass.LABEL_MARGIN*2);g=-Infinity;for(j in this.labels)g=g>Number(j)?g:Number(j);g=Math.round(g);h=(g>=(this._5-1)&&this.center_labels_over_point)?this._H(this.marker_font_size,this.labels[g])/2:0;this._17=this.right_margin+h;this._1p=this.bottom_margin+this._O+this.klass.LABEL_MARGIN}this._l=this._b-this._17;this._6=this._b-this._2-this._17;this._7=this.top_margin+(this.hide_title?this.title_margin:this._1n+this.title_margin)+(this.hide_legend?this.legend_margin:this._1o+this.legend_margin);i=(this.x_axis_label===null)?0.0:this._O+this.klass.LABEL_MARGIN;this._g=this._L-this._1p-i;this._3=this._g-this._7},_1N:function(){if(this.x_axis_label){var c=this._g+this.klass.LABEL_MARGIN*2+this._O;this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='north';this._0.annotate_scaled(this._b,1.0,0.0,c,this.x_axis_label,this._a);this._x(function(){this._0.line(0.0,c,this._b,c)})}},_N:function(){if(this.hide_line_markers)return;if(this.y_axis_increment===null){if(this.marker_count===null){Bluff.each([3,4,5,6,7],function(c){if(!this.marker_count&&this._i%c===0)this.marker_count=c},this);this.marker_count=this.marker_count||4}this._18=(this._i>0)?this._19(this._i/this.marker_count):1}else{this.maximum_value=Math.max(Math.ceil(this.maximum_value),this.y_axis_increment);this.minimum_value=Math.floor(this.minimum_value);this._1l();this._16(true);this.marker_count=Math.round(this._i/this.y_axis_increment);this._18=this.y_axis_increment}this._1P=this._3/(this._i/this._18);var d,f,g,h;for(d=0,f=this.marker_count;d<=f;d++){g=this._7+this._3-d*this._1P;this._0.stroke=this.marker_color;this._0.stroke_width=1;this._0.line(this._2,g,this._l,g);h=d*this._18+this.minimum_value;if(!this.hide_line_numbers){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.font_weight='normal';this._0.stroke='transparent';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='east';this._0.annotate_scaled(this._2-this.klass.LABEL_MARGIN,1.0,0.0,g,this._Q(h),this._a)}}},_1q:function(c){return(this._b-c)/2},_1M:function(){if(this.hide_legend)return;this._I=Bluff.map(this._1,function(c){return c[this.klass.DATA_LABEL_INDEX]},this);var i=this.legend_box_size;if(this.font)this._0.font=this.font;this._0.pointsize=this.legend_font_size;var j=[[]];Bluff.each(this._I,function(c){var d=j.length-1;var f=this._0.get_type_metrics(c);var g=f.width+i*2.7;j[d].push(g);if(Bluff.sum(j[d])>(this._b*0.9))j.push([j[d].pop()])},this);var k=this._1q(Bluff.sum(j[0]));var m=this.hide_title?this.top_margin+this.title_margin:this.top_margin+this.title_margin+this._1n;this._x(function(){this._0.stroke_width=1;this._0.line(0,m,this._b,m)});Bluff.each(this._I,function(c,d){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.legend_font_size);this._0.stroke='transparent';this._0.font_weight='normal';this._0.gravity='west';this._0.annotate_scaled(this._b,1.0,k+(i*1.7),m,c,this._a);this._0.stroke='transparent';this._0.fill=this._1[d][this.klass.DATA_COLOR_INDEX];this._0.rectangle(k,m-i/2.0,k+i,m+i/2.0);this._0.pointsize=this.legend_font_size;var f=this._0.get_type_metrics(c);var g=f.width+(i*2.7),h;j[0].shift();if(j[0].length==0){this._x(function(){this._0.line(0.0,m,this._b,m)});j.shift();if(j.length>0)k=this._1q(Bluff.sum(j[0]));h=Math.max(this._1o,i)+this.legend_margin;if(j.length>0){m+=h;this._7+=h;this._3=this._g-this._7}}else{k+=g}},this);this._w=0},_1O:function(){if(this.hide_title||!this.title)return;this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.title_font_size);this._0.font_weight='bold';this._0.gravity='north';this._0.annotate_scaled(this._b,1.0,0,this.top_margin,this.title,this._a)},_e:function(c,d){if(this.hide_line_markers)return;var f;if(this.labels[d]&&!this._u[d]){f=this._g+this.klass.LABEL_MARGIN;this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.font_weight='normal';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='north';this._0.annotate_scaled(1.0,1.0,c,f,this.labels[d],this._a);this._u[d]=true;this._x(function(){this._0.stroke_width=1;this._0.line(0.0,f,this._b,f)})}},_y:function(d,f,g,h,i,j,k,m){if(!this.tooltips)return;var n=this._0.tooltip(d,f,g,h,i,j,k);Bluff.Event.observe(n,'click',function(){var c={series:i,label:this.labels[m],value:k,color:j};this.trigger('click:datapoint',c)},this)},_1J:function(){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.font_weight='normal';this._0.pointsize=this._d(80);this._0.gravity='center';this._0.annotate_scaled(this._b,this._L/2,0,10,this.no_data_message,this._a)},_M:function(){var c=this._k.background_colors;switch(true){case c instanceof Array:this._1Q.apply(this,c);break;case typeof c==='string':this._1R(c);break;default:this._1S(this._k.background_image);break}},_1R:function(c){this._0.render_solid_background(this._j,this._t,c)},_1Q:function(c,d){this._0.render_gradiated_background(this._j,this._t,c,d)},_1S:function(c){},_1j:function(){this._w=0;this._u={};this._k={};this._0.scale(this._a,this._a)},_2k:function(c){return this._a*c},_d:function(c){var d=c*this._a;return d},_R:function(c,d){return(c>d)?d:c},_1k:function(c,d){return c>this.maximum_value},_1G:function(c,d){return c100){c/=10;d*=10}return Math.floor(c)*d},_1L:function(){var f=this._1T,g=this.klass.DATA_VALUES_INDEX;this._9.sort(function(c,d){return f(d[g])-f(c[g])});this._1.sort(function(c,d){return f(d[g])-f(c[g])})},_1T:function(d){var f=0;Bluff.each(d,function(c){f+=(c||0)});return f},_1H:function(){var g=[],h=this._5;while(h--)g[h]=0;Bluff.each(this._1,function(f){Bluff.each(f[this.klass.DATA_VALUES_INDEX],function(c,d){g[d]+=c},this);f[this.klass.DATA_VALUES_INDEX]=Bluff.array(g)},this)},_x:function(c){if(this.klass.DEBUG){this._0.fill='transparent';this._0.stroke='turquoise';c.call(this)}},_1F:function(){var c=this._w;this._w=(this._w+1)%this.colors.length;return this.colors[c]},_Q:function(c){var d=this.klass.THOUSAND_SEPARATOR,f=(this._i%this.marker_count==0||this.y_axis_increment!==null)?String(Math.round(c)):String(Math.floor(c*this._1m)/this._1m);var g=f.split('.');g[0]=g[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g,'$1'+d);return g.join('.')},_P:function(c){return this._0.caps_height(c)},_H:function(c,d){return this._0.text_width(c,d)}});Bluff.Area=new JS.Class(Bluff.Base,{draw:function(){this.callSuper();if(!this._c)return;this._S=this._6/(this._5-1);this._0.stroke='transparent';Bluff.each(this._9,function(h){var i=[],j=0.0,k=0.0;Bluff.each(h[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._S*d);var g=this._7+(this._3-c*this._3);if(j>0&&k>0){i.push(f);i.push(g)}else{i.push(this._2);i.push(this._g-1);i.push(f);i.push(g)}this._e(f,d);j=f;k=g},this);i.push(this._l);i.push(this._g-1);i.push(this._2);i.push(this._g-1);this._0.fill=h[this.klass.DATA_COLOR_INDEX];this._0.polyline(i)},this)}});Bluff.BarConversion=new JS.Class({mode:null,zero:null,graph_top:null,graph_height:null,minimum_value:null,spread:null,getLeftYRightYscaled:function(c,d){var f;switch(this.mode){case 1:d[0]=this.graph_top+this.graph_height*(1-c)+1;d[1]=this.graph_top+this.graph_height-1;break;case 2:d[0]=this.graph_top+1;d[1]=this.graph_top+this.graph_height*(1-c)-1;break;case 3:f=c-this.minimum_value/this.spread;if(c>=this.zero){d[0]=this.graph_top+this.graph_height*(1-(f-this.zero))+1;d[1]=this.graph_top+this.graph_height*(1-this.zero)-1}else{d[0]=this.graph_top+this.graph_height*(1-(f-this.zero))+1;d[1]=this.graph_top+this.graph_height*(1-this.zero)-1}break;default:d[0]=0.0;d[1]=0.0}}});Bluff.Bar=new JS.Class(Bluff.Base,{bar_spacing:0.9,draw:function(){this.center_labels_over_point=(Bluff.keys(this.labels).length>this._5);this.callSuper();if(!this._c)return;this._T()},_T:function(){this._8=this._6/(this._5*this._1.length);var n=(this._8*(1-this.bar_spacing))/2;this._0.stroke_opacity=0.0;var l=new Bluff.BarConversion();l.graph_height=this._3;l.graph_top=this._7;if(this.minimum_value>=0){l.mode=1}else{if(this.maximum_value<=0){l.mode=2}else{l.mode=3;l.spread=this._i;l.minimum_value=this.minimum_value;l.zero=-this.minimum_value/this._i}}Bluff.each(this._9,function(j,k){var m=this._1[k][this.klass.DATA_VALUES_INDEX];Bluff.each(j[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._8*(k+d+((this._1.length-1)*d)))+n;var g=f+this._8*this.bar_spacing;var h=[];l.getLeftYRightYscaled(c,h);this._0.fill=j[this.klass.DATA_COLOR_INDEX];this._0.rectangle(f,h[0],g,h[1]);this._y(f,h[0],g-f,h[1]-h[0],j[this.klass.DATA_LABEL_INDEX],j[this.klass.DATA_COLOR_INDEX],m[d],d);var i=this._2+(this._1.length*this._8*d)+(this._1.length*this._8/2.0);this._e(i-(this.center_labels_over_point?this._8/2.0:0.0),d)},this)},this);if(this.center_labels_over_point)this._e(this._l,this._5)}});Bluff.Line=new JS.Class(Bluff.Base,{baseline_value:null,baseline_color:null,line_width:null,dot_radius:null,hide_dots:null,hide_lines:null,initialize:function(c){if(arguments.length>3)throw'Wrong number of arguments';if(arguments.length===1||(typeof arguments[1]!=='number'&&typeof arguments[1]!=='string'))this.callSuper(c,null);else this.callSuper();this.hide_dots=this.hide_lines=false;this.baseline_color='red';this.baseline_value=null},draw:function(){this.callSuper();if(!this._c)return;this.x_increment=(this._5>1)?(this._6/(this._5-1)):this._6;var l;if(this._U!==undefined){l=this._7+(this._3-this._U*this._3);this._0.push();this._0.stroke=this.baseline_color;this._0.fill_opacity=0.0;this._0.stroke_width=3.0;this._0.line(this._2,l,this._2+this._6,l);this._0.pop()}Bluff.each(this._9,function(i,j){var k=null,m=null;var n=this._1[j][this.klass.DATA_VALUES_INDEX];this._1U=this._1V(i);Bluff.each(i[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this.x_increment*d);if(typeof c!=='number')return;this._e(f,d);var g=this._7+(this._3-c*this._3);this._0.stroke=i[this.klass.DATA_COLOR_INDEX];this._0.fill=i[this.klass.DATA_COLOR_INDEX];this._0.stroke_opacity=1.0;this._0.stroke_width=this.line_width||this._R(this._j/(this._9[0][this.klass.DATA_VALUES_INDEX].length*6),3.0);var h=this.dot_radius||this._R(this._j/(this._9[0][this.klass.DATA_VALUES_INDEX].length*2),7.0);if(!this.hide_lines&&k!==null&&m!==null){this._0.line(k,m,f,g)}else if(this._1U){this._0.circle(f,g,f-h,g)}if(!this.hide_dots)this._0.circle(f,g,f-h,g);this._y(f-h,g-h,2*h,2*h,i[this.klass.DATA_LABEL_INDEX],i[this.klass.DATA_COLOR_INDEX],n[d],d);k=f;m=g},this)},this)},_16:function(){this.maximum_value=Math.max(this.maximum_value,this.baseline_value);this.callSuper();if(this.baseline_value!==null)this._U=this.baseline_value/this.maximum_value},_1V:function(d){var f=0;Bluff.each(d[this.klass.DATA_VALUES_INDEX],function(c){if(c!==undefined)f+=1});return f===1}});Bluff.Dot=new JS.Class(Bluff.Base,{draw:function(){this.has_left_labels=true;this.callSuper();if(!this._c)return;var k=1.0;this._J=this._3/this._5;this._1a=this._J*k/this._9.length;this._0.stroke_opacity=0.0;var m=Bluff.array_new(this._5,0),n=Bluff.array_new(this._5,this._2),l=(this._J*(1-k))/2;Bluff.each(this._9,function(i,j){Bluff.each(i[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(c*this._6)-Math.round(this._1a/6.0);var g=this._7+(this._J*d)+l+Math.round(this._1a/2.0);if(j===0){this._0.stroke=this.marker_color;this._0.stroke_width=1.0;this._0.opacity=0.1;this._0.line(this._2,g,this._2+this._6,g)}this._0.fill=i[this.klass.DATA_COLOR_INDEX];this._0.stroke='transparent';this._0.circle(f,g,f+Math.round(this._1a/3.0),g);var h=this._7+(this._J*d+this._J/2)+l;this._e(h,d)},this)},this)},_N:function(){if(this.hide_line_markers)return;this._0.stroke_antialias=false;this._0.stroke_width=1;var c=5;var d=this._19(this.maximum_value/c);for(var f=0;f<=c;f++){var g=(this._l-this._2)/c,h=this._l-(g*f)-1,i=f-c,j=Math.abs(i)*d;this._0.stroke=this.marker_color;this._0.line(h,this._g,h,this._g+0.5*this.klass.LABEL_MARGIN);if(!this.hide_line_numbers){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='center';this._0.annotate_scaled(0,0,h,this._g+(this.klass.LABEL_MARGIN*2.0),j,this._a)}this._0.stroke_antialias=true}},_e:function(c,d){if(this.labels[d]&&!this._u[d]){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.font_weight='normal';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='east';this._0.annotate_scaled(1,1,this._2-this.klass.LABEL_MARGIN*2.0,c,this.labels[d],this._a);this._u[d]=true}}});Bluff.Net=new JS.Class(Bluff.Base,{hide_dots:null,line_width:null,dot_radius:null,initialize:function(){this.callSuper();this.hide_dots=false;this.hide_line_numbers=true},draw:function(){this.callSuper();if(!this._c)return;this._z=this._3/2.0;this._A=this._2+(this._6/2.0);this._B=this._7+(this._3/2.0)-10;this._S=this._6/(this._5-1);var s=this.dot_radius||this._R(this._j/(this._9[0][this.klass.DATA_VALUES_INDEX].length*2.5),7.0);this._0.stroke_opacity=1.0;this._0.stroke_width=this.line_width||this._R(this._j/(this._9[0][this.klass.DATA_VALUES_INDEX].length*4),3.0);var r;if(this._U!==undefined){r=this._7+(this._3-this._U*this._3);this._0.push();this._0.stroke_color=this.baseline_color;this._0.fill_opacity=0.0;this._0.stroke_width=5;this._0.line(this._2,r,this._2+this._6,r);this._0.pop()}Bluff.each(this._9,function(o){var p=null,q=null;Bluff.each(o[this.klass.DATA_VALUES_INDEX],function(c,d){if(c===undefined)return;var f=d*Math.PI*2/this._5,g=c*this._z,h=this._A+Math.sin(f)*g,i=this._B-Math.cos(f)*g,j=(d+10){this._0.fill=c[this.klass.DATA_COLOR_INDEX];var f=(c[this.klass.DATA_VALUES_INDEX][0]/o)*360;this._0.circle(n,l,n+k,l,p,p+f+0.5);var g=p+((p+f)-p)/2,h=Math.round((c[this.klass.DATA_VALUES_INDEX][0]/o)*100.0),i;if(h>=this.hide_labels_less_than){i=this._Q(c[this.klass.DATA_VALUES_INDEX][0]);this._e(n,l,g,k+(k*this.klass.TEXT_OFFSET_PERCENTAGE),i,c,d)}p+=f}},this)},_e:function(c,d,f,g,h,i,j){var k=20.0,m=c,n=d,l=g+k,o=l*0.15,p=m+((l+o)*Math.cos(f*Math.PI/180)),q=n+(l*Math.sin(f*Math.PI/180));this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.marker_font_size);this._0.font_weight='bold';this._0.gravity='center';this._0.annotate_scaled(0,0,p,q,h,this._a);this._y(p-20,q-20,40,40,i[this.klass.DATA_LABEL_INDEX],i[this.klass.DATA_COLOR_INDEX],h,j)},_1W:function(){var d=0;Bluff.each(this._1,function(c){d+=c[this.klass.DATA_VALUES_INDEX][0]},this);return d}});Bluff.SideBar=new JS.Class(Bluff.Base,{bar_spacing:0.9,draw:function(){this.has_left_labels=true;this.callSuper();if(!this._c)return;this._T()},_T:function(){this._V=this._3/this._5;this._8=this._V/this._9.length;this._0.stroke_opacity=0.0;var q=Bluff.array_new(this._5,0),s=Bluff.array_new(this._5,this._2),r=(this._8*(1-this.bar_spacing))/2;Bluff.each(this._9,function(l,o){var p=this._1[o][this.klass.DATA_VALUES_INDEX];Bluff.each(l[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._6-c*this._6-q[d]),g=this._2+this._6-q[d],h=g-f,i=s[d]-1,j=this._7+(this._V*d)+(this._8*o)+r,k=i+h,m=j+this._8*this.bar_spacing;q[d]+=(c*this._6);this._0.stroke='transparent';this._0.fill=l[this.klass.DATA_COLOR_INDEX];this._0.rectangle(i,j,k,m);this._y(i,j,k-i,m-j,l[this.klass.DATA_LABEL_INDEX],l[this.klass.DATA_COLOR_INDEX],p[d],d);var n=this._7+(this._V*d+this._V/2);this._e(n,d)},this)},this)},_N:function(){if(this.hide_line_markers)return;this._0.stroke_antialias=false;this._0.stroke_width=1;var c=5;var d=this._19(this._i/c),f,g,h,i;for(var j=0;j<=c;j++){f=(this._l-this._2)/c;g=this._l-(f*j)-1;h=j-c;i=Math.abs(h)*d+this.minimum_value;this._0.stroke=this.marker_color;this._0.line(g,this._g,g,this._7);if(!this.hide_line_numbers){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='center';this._0.annotate_scaled(0,0,g,this._g+(this.klass.LABEL_MARGIN*2.0),this._Q(i),this._a)}}},_e:function(c,d){if(this.labels[d]&&!this._u[d]){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.font_weight='normal';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='east';this._0.annotate_scaled(1,1,this._2-this.klass.LABEL_MARGIN*2.0,c,this.labels[d],this._a);this._u[d]=true}}});Bluff.Spider=new JS.Class(Bluff.Base,{hide_text:null,hide_axes:null,transparent_background:null,initialize:function(c,d,f){this.callSuper(c,f);this._1X=d;this.hide_legend=true},draw:function(){this.hide_line_markers=true;this.callSuper();if(!this._c)return;var c=this._3,d=this._3/2.0,f=this._2+(this._6-c)/2.0,g=this._2+(this._6/2.0),h=this._7+(this._3/2.0)-25;this._1Y=d/this._1X;var i=this._1Z(),j=0.0,k=(2*Math.PI)/this._1.length,m=0.0;if(!this.hide_axes)this._20(g,h,d,k);this._21(g,h,k)},_1s:function(c){return c*this._1Y},_e:function(c,d,f,g,h){var i=50,j=c,k=d+0,m=j+((g+i)*Math.cos(f)),n=k+((g+i)*Math.sin(f));this._0.fill=this.marker_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.legend_font_size);this._0.stroke='transparent';this._0.font_weight='bold';this._0.gravity='center';this._0.annotate_scaled(0,0,m,n,h,this._a)},_20:function(g,h,i,j,k){if(this.hide_axes)return;var m=0.0;Bluff.each(this._1,function(c){this._0.stroke=k||c[this.klass.DATA_COLOR_INDEX];this._0.stroke_width=5.0;var d=i*Math.cos(m);var f=i*Math.sin(m);this._0.line(g,h,g+d,h+f);if(!this.hide_text)this._e(g,h,m,i,c[this.klass.DATA_LABEL_INDEX]);m+=j},this)},_21:function(d,f,g,h){var i=[],j=0.0;Bluff.each(this._1,function(c){i.push(d+this._1s(c[this.klass.DATA_VALUES_INDEX][0])*Math.cos(j));i.push(f+this._1s(c[this.klass.DATA_VALUES_INDEX][0])*Math.sin(j));j+=g},this);this._0.stroke_width=1.0;this._0.stroke=h||this.marker_color;this._0.fill=h||this.marker_color;this._0.fill_opacity=0.4;this._0.polyline(i)},_1Z:function(){var d=0.0;Bluff.each(this._1,function(c){d+=c[this.klass.DATA_VALUES_INDEX][0]},this);return d}});Bluff.Base.StackedMixin=new JS.Module({_1b:function(){var g={};Bluff.each(this._1,function(f){Bluff.each(f[this.klass.DATA_VALUES_INDEX],function(c,d){if(!g[d])g[d]=0.0;g[d]+=c},this)},this);for(var h in g){if(g[h]>this.maximum_value)this.maximum_value=g[h]}this.minimum_value=0}});Bluff.StackedArea=new JS.Class(Bluff.Base,{include:Bluff.Base.StackedMixin,last_series_goes_on_bottom:null,draw:function(){this._1b();this.callSuper();if(!this._c)return;this._S=this._6/(this._5-1);this._0.stroke='transparent';var n=Bluff.array_new(this._5,0);var l=null;var o=this.last_series_goes_on_bottom?'reverse_each':'each';Bluff[o](this._9,function(h){var i=l;l=[];Bluff.each(h[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._S*d);var g=this._7+(this._3-c*this._3-n[d]);n[d]+=(c*this._3);l.push(f);l.push(g);this._e(f,d)},this);var j,k,m;if(i){j=Bluff.array(l);for(k=i.length/2-1;k>=0;k--){j.push(i[2*k]);j.push(i[2*k+1])}j.push(l[0]);j.push(l[1])}else{j=Bluff.array(l);j.push(this._l);j.push(this._g-1);j.push(this._2);j.push(this._g-1);j.push(l[0]);j.push(l[1])}this._0.fill=h[this.klass.DATA_COLOR_INDEX];this._0.polyline(j)},this)}});Bluff.StackedBar=new JS.Class(Bluff.Base,{include:Bluff.Base.StackedMixin,bar_spacing:0.9,draw:function(){this._1b();this.callSuper();if(!this._c)return;this._8=this._6/this._5;var l=(this._8*(1-this.bar_spacing))/2;this._0.stroke_opacity=0.0;var o=Bluff.array_new(this._5,0);Bluff.each(this._9,function(k,m){var n=this._1[m][this.klass.DATA_VALUES_INDEX];Bluff.each(k[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._8*d)+(this._8*this.bar_spacing/2.0);this._e(f,d);if(c==0)return;var g=this._2+(this._8*d)+l;var h=this._7+(this._3-c*this._3-o[d])+1;var i=g+this._8*this.bar_spacing;var j=this._7+this._3-o[d]-1;o[d]+=(c*this._3);this._0.fill=k[this.klass.DATA_COLOR_INDEX];this._0.rectangle(g,h,i,j);this._y(g,h,i-g,j-h,k[this.klass.DATA_LABEL_INDEX],k[this.klass.DATA_COLOR_INDEX],n[d],d)},this)},this)}});Bluff.AccumulatorBar=new JS.Class(Bluff.StackedBar,{draw:function(){if(this._1.length!==1)throw'Incorrect number of datasets';var g=[],h=0,i=[];Bluff.each(this._1[0][this.klass.DATA_VALUES_INDEX],function(d){var f=-Infinity;Bluff.each(i,function(c){f=Math.max(f,c)});i.push((h>0)?(d+f):d);g.push(i[h]-d);h+=1},this);this.data("Accumulator",g);this.callSuper()}});Bluff.SideStackedBar=new JS.Class(Bluff.SideBar,{include:Bluff.Base.StackedMixin,bar_spacing:0.9,draw:function(){this.has_left_labels=true;this._1b();this.callSuper()},_T:function(){this._8=this._3/this._5;var q=Bluff.array_new(this._5,0),s=Bluff.array_new(this._5,this._2),r=(this._8*(1-this.bar_spacing))/2;Bluff.each(this._9,function(l,o){var p=this._1[o][this.klass.DATA_VALUES_INDEX];Bluff.each(l[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._6-c*this._6-q[d])+1;var g=this._2+this._6-q[d]-1;var h=g-f;this._0.fill=l[this.klass.DATA_COLOR_INDEX];var i=s[d],j=this._7+(this._8*d)+r,k=i+h,m=j+this._8*this.bar_spacing;s[d]+=h;q[d]+=(c*this._6-2);this._0.rectangle(i,j,k,m);this._y(i,j,k-i,m-j,l[this.klass.DATA_LABEL_INDEX],l[this.klass.DATA_COLOR_INDEX],p[d],d);var n=this._7+(this._8*d)+(this._8*this.bar_spacing/2.0);this._e(n,d)},this)},this)},_1k:function(c,d){d=d||0;return this._1r(c,d)>this.maximum_value},_1r:function(d,f){var g=0;Bluff.each(this._1,function(c){g+=c[this.klass.DATA_VALUES_INDEX][f]},this);return g}});Bluff.Mini.Legend=new JS.Module({hide_mini_legend:false,_1c:function(){if(this.hide_mini_legend)return;this._I=Bluff.map(this._1,function(c){return c[this.klass.DATA_LABEL_INDEX]},this);var d=this._d(this._1.length*this._1t()+this.top_margin+this.bottom_margin);this._22=this._L;this._23=this._b;switch(this.legend_position){case'right':this._t=Math.max(this._t,d);this._j+=this._24()+this.left_margin;break;default:this._t+=d;break}this._M()},_1t:function(){return this._P(this.legend_font_size)*1.7},_24:function(){var d=0;Bluff.each(this._I,function(c){d=Math.max(this._H(this.legend_font_size,c),d)},this);return this._d(d+40*1.7)},_1d:function(){if(this.hide_mini_legend)return;var f=40.0,g=10.0,h=100.0,i=40.0;if(this.font)this._0.font=this.font;this._0.pointsize=this.legend_font_size;var j,k;switch(this.legend_position){case'right':j=this._23+this.left_margin;k=this.top_margin+i;break;default:j=h,k=this._22+i;break}this._x(function(){this._0.line(0.0,k,this._b,k)});Bluff.each(this._I,function(c,d){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.legend_font_size);this._0.stroke='transparent';this._0.font_weight='normal';this._0.gravity='west';this._0.annotate_scaled(this._b,1.0,j+(f*1.7),k,this._25(c),this._a);this._0.stroke='transparent';this._0.fill=this._1[d][this.klass.DATA_COLOR_INDEX];this._0.rectangle(j,k-f/2.0,j+f,k+f/2.0);k+=this._1t()},this);this._w=0},_25:function(c){var d=String(c);while(this._H(this._d(this.legend_font_size),d)>(this._j-this.legend_left_margin-this.right_margin)&&(d.length>1))d=d.substr(0,d.length-1);return d+(d.length=1?(c*i):1;var k=(d*i)>=1?(d*i):1;var h=this._W(this.pointsize,h);h.style.color=this.fill;h.style.cursor='default';h.style.fontWeight=this.font_weight;h.style.textAlign='center';h.style.left=(this._f*f+this._26(h,j))+'px';h.style.top=(this._h*g+this._27(h,k))+'px'},tooltip:function(d,f,g,h,i,j,k){if(g<0)d+=g;if(h<0)f+=h;var m=this._n.parentNode,n=document.createElement('div');n.className=this.klass.TARGET_CLASS;n.style.cursor='default';n.style.position='absolute';n.style.left=(this._f*d-3)+'px';n.style.top=(this._h*f-3)+'px';n.style.width=(this._f*Math.abs(g)+5)+'px';n.style.height=(this._h*Math.abs(h)+5)+'px';n.style.fontSize=0;n.style.overflow='hidden';Bluff.Event.observe(n,'mouseover',function(c){Bluff.Tooltip.show(i,j,k)});Bluff.Event.observe(n,'mouseout',function(c){Bluff.Tooltip.hide()});m.appendChild(n);return n},circle:function(c,d,f,g,h,i){var j=Math.sqrt(Math.pow(f-c,2)+Math.pow(g-d,2));var k=0,m=2*Math.PI;this._4.fillStyle=this.fill;this._4.beginPath();if(h!==undefined&&i!==undefined&&Math.abs(Math.floor(i-h))!==360){k=h*Math.PI/180;m=i*Math.PI/180;this._4.moveTo(this._f*(c+j*Math.cos(m)),this._h*(d+j*Math.sin(m)));this._4.lineTo(this._f*c,this._h*d);this._4.lineTo(this._f*(c+j*Math.cos(k)),this._h*(d+j*Math.sin(k)))}this._4.arc(this._f*c,this._h*d,this._f*j,k,m,false);this._4.fill()},line:function(c,d,f,g){this._4.strokeStyle=this.stroke;this._4.lineWidth=this.stroke_width;this._4.beginPath();this._4.moveTo(this._f*c,this._h*d);this._4.lineTo(this._f*f,this._h*g);this._4.stroke()},polyline:function(c){this._4.fillStyle=this.fill;this._4.globalAlpha=this.fill_opacity||1;try{this._4.strokeStyle=this.stroke}catch(e){}var d=c.shift(),f=c.shift();this._4.beginPath();this._4.moveTo(this._f*d,this._h*f);while(c.length>0){d=c.shift();f=c.shift();this._4.lineTo(this._f*d,this._h*f)}this._4.fill()},rectangle:function(c,d,f,g){var h;if(c>f){h=c;c=f;f=h}if(d>g){h=d;d=g;g=h}try{this._4.fillStyle=this.fill;this._4.fillRect(this._f*c,this._h*d,this._f*(f-c),this._h*(g-d))}catch(e){}try{this._4.strokeStyle=this.stroke;if(this.stroke!=='transparent')this._4.strokeRect(this._f*c,this._h*d,this._f*(f-c),this._h*(g-d))}catch(e){}},_26:function(c,d){var f=this._K(c).width;switch(this.gravity){case'west':return 0;case'east':return d-f;case'north':case'south':case'center':return(d-f)/2}},_27:function(c,d){var f=this._K(c).height;switch(this.gravity){case'north':return 0;case'south':return d-f;case'west':case'east':case'center':return(d-f)/2}},_1u:function(){var c=this._n.parentNode;if(c.className===this.klass.WRAPPER_CLASS)return c;c=document.createElement('div');c.className=this.klass.WRAPPER_CLASS;c.style.position='relative';c.style.border='none';c.style.padding='0 0 0 0';this._n.parentNode.insertBefore(c,this._n);c.appendChild(this._n);return c},_W:function(c,d){var f=this._28(d);f.style.fontFamily=this.font;f.style.fontSize=(typeof c==='number')?c+'px':c;return f},_28:function(c){var d=document.createElement('div');d.className=this.klass.TEXT_CLASS;d.style.position='absolute';d.appendChild(document.createTextNode(c));this._1u().appendChild(d);return d},_X:function(c){c.parentNode.removeChild(c);if(c.className===this.klass.TARGET_CLASS)Bluff.Event.stopObserving(c)},_K:function(c){var d=c.style.display;return(d&&d!=='none')?{width:c.offsetWidth,height:c.offsetHeight}:{width:c.clientWidth,height:c.clientHeight}}});Bluff.Event={_Y:[],_1v:(window.attachEvent&&navigator.userAgent.indexOf('Opera')===-1),observe:function(d,f,g,h){var i=Bluff.map(this._1w(d,f),function(c){return c._29});if(Bluff.index(i,g)!==-1)return;var j=function(c){g.call(h||null,d,Bluff.Event._2a(c))};this._Y.push({_Z:d,_1e:f,_29:g,_1x:j});if(d.addEventListener)d.addEventListener(f,j,false);else d.attachEvent('on'+f,j)},stopObserving:function(d){var f=d?this._1w(d):this._Y;Bluff.each(f,function(c){if(c._Z.removeEventListener)c._Z.removeEventListener(c._1e,c._1x,false);else c._Z.detachEvent('on'+c._1e,c._1x)})},_1w:function(d,f){var g=[];Bluff.each(this._Y,function(c){if(d&&c._Z!==d)return;if(f&&c._1e!==f)return;g.push(c)});return g},_2a:function(c){if(!this._1v)return c;if(!c)return false;if(c._2b)return c;c._2b=true;var d=this._2c(c);c.target=c.srcElement;c.pageX=d.x;c.pageY=d.y;return c},_2c:function(c){var d=document.documentElement,f=document.body||{scrollLeft:0,scrollTop:0};return{x:c.pageX||(c.clientX+(d.scrollLeft||f.scrollLeft)-(d.clientLeft||0)),y:c.pageY||(c.clientY+(d.scrollTop||f.scrollTop)-(d.clientTop||0))}}};if(Bluff.Event._1v)window.attachEvent('onunload',function(){Bluff.Event.stopObserving();Bluff.Event._Y=null});if(navigator.userAgent.indexOf('AppleWebKit/')>-1)window.addEventListener('unload',function(){},false);Bluff.Tooltip=new JS.Singleton({LEFT_OFFSET:20,TOP_OFFSET:-6,DATA_LENGTH:8,CLASS_NAME:'bluff-tooltip',setup:function(){this._o=document.createElement('div');this._o.className=this.CLASS_NAME;this._o.style.position='absolute';this.hide();document.body.appendChild(this._o);Bluff.Event.observe(document.body,'mousemove',function(c,d){this._o.style.left=(d.pageX+this.LEFT_OFFSET)+'px';this._o.style.top=(d.pageY+this.TOP_OFFSET)+'px'},this)},show:function(c,d,f){f=Number(String(f).substr(0,this.DATA_LENGTH));this._o.innerHTML='  '+c+' '+f+'';this._o.style.display=''},hide:function(){this._o.style.display='none'}});Bluff.Event.observe(window,'load',Bluff.Tooltip.method('setup'));Bluff.TableReader=new JS.Class({NUMBER_FORMAT:/\-?(0|[1-9]\d*)(\.\d+)?(e[\+\-]?\d+)?/i,initialize:function(c,d){this._1f=d||{};this._2d=this._1f.orientation||'auto';this._2e=(typeof c==='string')?document.getElementById(c):c},get_data:function(){if(!this._1)this._1y();return this._1},get_labels:function(){if(!this._1g)this._1y();return this._1g},get_title:function(){return this._2f},get_series:function(c){if(this._1[c])return this._1[c];return this._1[c]={points:[]}},_1y:function(){this._C=this._m=0;this._p=this._q=0;this._1=[];this._1g={};this._r=[];this._s=[];this._1h=[];this._1i=[];this._1z(this._2e);this._2g();this._2h();Bluff.each(this._s,function(c,d){this.get_series(d-this._q).name=c},this);Bluff.each(this._r,function(c,d){this._1g[d-this._p]=c},this)},_1z:function(c){this._2i(c);var d,f=c.childNodes,g=f.length;for(d=0;d=0)return true;var h=f.length;while(h--){if(Bluff.index(g,f[h])>=0)return true}return false},_2g:function(){var d=this._1i.length,f;while(d--){f=this._1i[d];if(f<=this._q)continue;this._s.splice(f-1,1);if(f>=this._q)this._1.splice(f-1-this._q,1)}var d=this._1h.length,f;while(d--){f=this._1h[d];if(f<=this._p)continue;this._r.splice(f-1,1);Bluff.each(this._1,function(c){if(f>=this._p)c.points.splice(f-1-this._p,1)},this)}},_2h:function(){switch(this._2d){case'auto':if((this._r.length>1&&this._s.length===1)||this._r.length]+>/gi,'')},extend:{Mixin:new JS.Module({data_from_table:function(d,f){var g=new Bluff.TableReader(d,f),h=g.get_data();Bluff.each(h,function(c){this.data(c.name,c.points)},this);this.labels=g.get_labels();this.title=g.get_title()||this.title}})}});Bluff.Base.include(Bluff.TableReader.Mixin); \ No newline at end of file +(function ($) { +Bluff={VERSION:'0.3.6',array:function(c){if(c.length===undefined)return[c];var d=[],f=c.length;while(f--)d[f]=c[f];return d},array_new:function(c,d){var f=[];while(c--)f.push(d);return f},each:function(c,d,f){for(var g=0,h=c.length;gthis._5)?g.length:this._5;Bluff.each(g,function(c,d){if(c===undefined)return;if(this.maximum_value===null&&this.minimum_value===null)this.maximum_value=this.minimum_value=c;this.maximum_value=this._1k(c)?c:this.maximum_value;if(this.maximum_value>=0)this._c=true;this.minimum_value=this._1G(c)?c:this.minimum_value;if(this.minimum_value<0)this._c=true},this)},draw:function(){if(this.stacked)this._1H();this._1I();this._x(function(){this._0.rectangle(this.left_margin,this.top_margin,this._b-this.right_margin,this._L-this.bottom_margin);this._0.rectangle(this._2,this._7,this._l,this._g)})},clear:function(){this._M()},on:function(c,d,f){var g=this._10[c]=this._10[c]||[];g.push([d,f])},trigger:function(d,f){var g=this._10[d];if(!g)return;Bluff.each(g,function(c){c[0].call(c[1],f)})},_1I:function(){if(!this._c)return this._1J();this._16();this._1K();if(this.sort)this._1L();this._1M();this._N();this._1N();this._1O()},_16:function(g){if(this._9===null||g===true){this._9=[];if(!this._c)return;this._1l();Bluff.each(this._1,function(d){var f=[];Bluff.each(d[this.klass.DATA_VALUES_INDEX],function(c){if(c===null||c===undefined)f.push(null);else f.push((c-this.minimum_value)/this._i)},this);this._9.push([d[this.klass.DATA_LABEL_INDEX],f,d[this.klass.DATA_COLOR_INDEX]])},this)}},_1l:function(){this._i=this.maximum_value-this.minimum_value;this._i=this._i>0?this._i:1;var c=Math.round(Math.LOG10E*Math.log(this._i));this._1m=Math.pow(10,3-c)},_1K:function(){this._O=this.hide_line_markers?0:this._P(this.marker_font_size);this._1n=this.hide_title?0:this._P(this.title_font_size);this._1o=this.hide_legend?0:this._P(this.legend_font_size);var c,d,f,g,h,i,j;if(this.hide_line_markers){this._2=this.left_margin;this._17=this.right_margin;this._1p=this.bottom_margin}else{d=0;if(this.has_left_labels){c='';for(j in this.labels){c=c.length>this.labels[j].length?c:this.labels[j]}d=this._H(this.marker_font_size,c)*1.25}else{d=this._H(this.marker_font_size,this._Q(this.maximum_value))}f=this.hide_line_numbers&&!this.has_left_labels?0.0:d+this.klass.LABEL_MARGIN*2;this._2=this.left_margin+f+(this.y_axis_label===null?0.0:this._O+this.klass.LABEL_MARGIN*2);g=-Infinity;for(j in this.labels)g=g>Number(j)?g:Number(j);g=Math.round(g);h=(g>=(this._5-1)&&this.center_labels_over_point)?this._H(this.marker_font_size,this.labels[g])/2:0;this._17=this.right_margin+h;this._1p=this.bottom_margin+this._O+this.klass.LABEL_MARGIN}this._l=this._b-this._17;this._6=this._b-this._2-this._17;this._7=this.top_margin+(this.hide_title?this.title_margin:this._1n+this.title_margin)+(this.hide_legend?this.legend_margin:this._1o+this.legend_margin);i=(this.x_axis_label===null)?0.0:this._O+this.klass.LABEL_MARGIN;this._g=this._L-this._1p-i;this._3=this._g-this._7},_1N:function(){if(this.x_axis_label){var c=this._g+this.klass.LABEL_MARGIN*2+this._O;this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='north';this._0.annotate_scaled(this._b,1.0,0.0,c,this.x_axis_label,this._a);this._x(function(){this._0.line(0.0,c,this._b,c)})}},_N:function(){if(this.hide_line_markers)return;if(this.y_axis_increment===null){if(this.marker_count===null){Bluff.each([3,4,5,6,7],function(c){if(!this.marker_count&&this._i%c===0)this.marker_count=c},this);this.marker_count=this.marker_count||4}this._18=(this._i>0)?this._19(this._i/this.marker_count):1}else{this.maximum_value=Math.max(Math.ceil(this.maximum_value),this.y_axis_increment);this.minimum_value=Math.floor(this.minimum_value);this._1l();this._16(true);this.marker_count=Math.round(this._i/this.y_axis_increment);this._18=this.y_axis_increment}this._1P=this._3/(this._i/this._18);var d,f,g,h;for(d=0,f=this.marker_count;d<=f;d++){g=this._7+this._3-d*this._1P;this._0.stroke=this.marker_color;this._0.stroke_width=1;this._0.line(this._2,g,this._l,g);h=d*this._18+this.minimum_value;if(!this.hide_line_numbers){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.font_weight='normal';this._0.stroke='transparent';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='east';this._0.annotate_scaled(this._2-this.klass.LABEL_MARGIN,1.0,0.0,g,this._Q(h),this._a)}}},_1q:function(c){return(this._b-c)/2},_1M:function(){if(this.hide_legend)return;this._I=Bluff.map(this._1,function(c){return c[this.klass.DATA_LABEL_INDEX]},this);var i=this.legend_box_size;if(this.font)this._0.font=this.font;this._0.pointsize=this.legend_font_size;var j=[[]];Bluff.each(this._I,function(c){var d=j.length-1;var f=this._0.get_type_metrics(c);var g=f.width+i*2.7;j[d].push(g);if(Bluff.sum(j[d])>(this._b*0.9))j.push([j[d].pop()])},this);var k=this._1q(Bluff.sum(j[0]));var m=this.hide_title?this.top_margin+this.title_margin:this.top_margin+this.title_margin+this._1n;this._x(function(){this._0.stroke_width=1;this._0.line(0,m,this._b,m)});Bluff.each(this._I,function(c,d){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.legend_font_size);this._0.stroke='transparent';this._0.font_weight='normal';this._0.gravity='west';this._0.annotate_scaled(this._b,1.0,k+(i*1.7),m,c,this._a);this._0.stroke='transparent';this._0.fill=this._1[d][this.klass.DATA_COLOR_INDEX];this._0.rectangle(k,m-i/2.0,k+i,m+i/2.0);this._0.pointsize=this.legend_font_size;var f=this._0.get_type_metrics(c);var g=f.width+(i*2.7),h;j[0].shift();if(j[0].length==0){this._x(function(){this._0.line(0.0,m,this._b,m)});j.shift();if(j.length>0)k=this._1q(Bluff.sum(j[0]));h=Math.max(this._1o,i)+this.legend_margin;if(j.length>0){m+=h;this._7+=h;this._3=this._g-this._7}}else{k+=g}},this);this._w=0},_1O:function(){if(this.hide_title||!this.title)return;this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.title_font_size);this._0.font_weight='bold';this._0.gravity='north';this._0.annotate_scaled(this._b,1.0,0,this.top_margin,this.title,this._a)},_e:function(c,d){if(this.hide_line_markers)return;var f;if(this.labels[d]&&!this._u[d]){f=this._g+this.klass.LABEL_MARGIN;this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.font_weight='normal';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='north';this._0.annotate_scaled(1.0,1.0,c,f,this.labels[d],this._a);this._u[d]=true;this._x(function(){this._0.stroke_width=1;this._0.line(0.0,f,this._b,f)})}},_y:function(d,f,g,h,i,j,k,m){if(!this.tooltips)return;var n=this._0.tooltip(d,f,g,h,i,j,k);Bluff.Event.observe(n,'click',function(){var c={series:i,label:this.labels[m],value:k,color:j};this.trigger('click:datapoint',c)},this)},_1J:function(){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.font_weight='normal';this._0.pointsize=this._d(80);this._0.gravity='center';this._0.annotate_scaled(this._b,this._L/2,0,10,this.no_data_message,this._a)},_M:function(){var c=this._k.background_colors;switch(true){case c instanceof Array:this._1Q.apply(this,c);break;case typeof c==='string':this._1R(c);break;default:this._1S(this._k.background_image);break}},_1R:function(c){this._0.render_solid_background(this._j,this._t,c)},_1Q:function(c,d){this._0.render_gradiated_background(this._j,this._t,c,d)},_1S:function(c){},_1j:function(){this._w=0;this._u={};this._k={};this._0.scale(this._a,this._a)},_2k:function(c){return this._a*c},_d:function(c){var d=c*this._a;return d},_R:function(c,d){return(c>d)?d:c},_1k:function(c,d){return c>this.maximum_value},_1G:function(c,d){return c100){c/=10;d*=10}return Math.floor(c)*d},_1L:function(){var f=this._1T,g=this.klass.DATA_VALUES_INDEX;this._9.sort(function(c,d){return f(d[g])-f(c[g])});this._1.sort(function(c,d){return f(d[g])-f(c[g])})},_1T:function(d){var f=0;Bluff.each(d,function(c){f+=(c||0)});return f},_1H:function(){var g=[],h=this._5;while(h--)g[h]=0;Bluff.each(this._1,function(f){Bluff.each(f[this.klass.DATA_VALUES_INDEX],function(c,d){g[d]+=c},this);f[this.klass.DATA_VALUES_INDEX]=Bluff.array(g)},this)},_x:function(c){if(this.klass.DEBUG){this._0.fill='transparent';this._0.stroke='turquoise';c.call(this)}},_1F:function(){var c=this._w;this._w=(this._w+1)%this.colors.length;return this.colors[c]},_Q:function(c){var d=this.klass.THOUSAND_SEPARATOR,f=(this._i%this.marker_count==0||this.y_axis_increment!==null)?String(Math.round(c)):String(Math.floor(c*this._1m)/this._1m);var g=f.split('.');g[0]=g[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g,'$1'+d);return g.join('.')},_P:function(c){return this._0.caps_height(c)},_H:function(c,d){return this._0.text_width(c,d)}});Bluff.Area=new JS.Class(Bluff.Base,{draw:function(){this.callSuper();if(!this._c)return;this._S=this._6/(this._5-1);this._0.stroke='transparent';Bluff.each(this._9,function(h){var i=[],j=0.0,k=0.0;Bluff.each(h[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._S*d);var g=this._7+(this._3-c*this._3);if(j>0&&k>0){i.push(f);i.push(g)}else{i.push(this._2);i.push(this._g-1);i.push(f);i.push(g)}this._e(f,d);j=f;k=g},this);i.push(this._l);i.push(this._g-1);i.push(this._2);i.push(this._g-1);this._0.fill=h[this.klass.DATA_COLOR_INDEX];this._0.polyline(i)},this)}});Bluff.BarConversion=new JS.Class({mode:null,zero:null,graph_top:null,graph_height:null,minimum_value:null,spread:null,getLeftYRightYscaled:function(c,d){var f;switch(this.mode){case 1:d[0]=this.graph_top+this.graph_height*(1-c)+1;d[1]=this.graph_top+this.graph_height-1;break;case 2:d[0]=this.graph_top+1;d[1]=this.graph_top+this.graph_height*(1-c)-1;break;case 3:f=c-this.minimum_value/this.spread;if(c>=this.zero){d[0]=this.graph_top+this.graph_height*(1-(f-this.zero))+1;d[1]=this.graph_top+this.graph_height*(1-this.zero)-1}else{d[0]=this.graph_top+this.graph_height*(1-(f-this.zero))+1;d[1]=this.graph_top+this.graph_height*(1-this.zero)-1}break;default:d[0]=0.0;d[1]=0.0}}});Bluff.Bar=new JS.Class(Bluff.Base,{bar_spacing:0.9,draw:function(){this.center_labels_over_point=(Bluff.keys(this.labels).length>this._5);this.callSuper();if(!this._c)return;this._T()},_T:function(){this._8=this._6/(this._5*this._1.length);var n=(this._8*(1-this.bar_spacing))/2;this._0.stroke_opacity=0.0;var l=new Bluff.BarConversion();l.graph_height=this._3;l.graph_top=this._7;if(this.minimum_value>=0){l.mode=1}else{if(this.maximum_value<=0){l.mode=2}else{l.mode=3;l.spread=this._i;l.minimum_value=this.minimum_value;l.zero=-this.minimum_value/this._i}}Bluff.each(this._9,function(j,k){var m=this._1[k][this.klass.DATA_VALUES_INDEX];Bluff.each(j[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._8*(k+d+((this._1.length-1)*d)))+n;var g=f+this._8*this.bar_spacing;var h=[];l.getLeftYRightYscaled(c,h);this._0.fill=j[this.klass.DATA_COLOR_INDEX];this._0.rectangle(f,h[0],g,h[1]);this._y(f,h[0],g-f,h[1]-h[0],j[this.klass.DATA_LABEL_INDEX],j[this.klass.DATA_COLOR_INDEX],m[d],d);var i=this._2+(this._1.length*this._8*d)+(this._1.length*this._8/2.0);this._e(i-(this.center_labels_over_point?this._8/2.0:0.0),d)},this)},this);if(this.center_labels_over_point)this._e(this._l,this._5)}});Bluff.Line=new JS.Class(Bluff.Base,{baseline_value:null,baseline_color:null,line_width:null,dot_radius:null,hide_dots:null,hide_lines:null,initialize:function(c){if(arguments.length>3)throw'Wrong number of arguments';if(arguments.length===1||(typeof arguments[1]!=='number'&&typeof arguments[1]!=='string'))this.callSuper(c,null);else this.callSuper();this.hide_dots=this.hide_lines=false;this.baseline_color='red';this.baseline_value=null},draw:function(){this.callSuper();if(!this._c)return;this.x_increment=(this._5>1)?(this._6/(this._5-1)):this._6;var l;if(this._U!==undefined){l=this._7+(this._3-this._U*this._3);this._0.push();this._0.stroke=this.baseline_color;this._0.fill_opacity=0.0;this._0.stroke_width=3.0;this._0.line(this._2,l,this._2+this._6,l);this._0.pop()}Bluff.each(this._9,function(i,j){var k=null,m=null;var n=this._1[j][this.klass.DATA_VALUES_INDEX];this._1U=this._1V(i);Bluff.each(i[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this.x_increment*d);if(typeof c!=='number')return;this._e(f,d);var g=this._7+(this._3-c*this._3);this._0.stroke=i[this.klass.DATA_COLOR_INDEX];this._0.fill=i[this.klass.DATA_COLOR_INDEX];this._0.stroke_opacity=1.0;this._0.stroke_width=this.line_width||this._R(this._j/(this._9[0][this.klass.DATA_VALUES_INDEX].length*6),3.0);var h=this.dot_radius||this._R(this._j/(this._9[0][this.klass.DATA_VALUES_INDEX].length*2),7.0);if(!this.hide_lines&&k!==null&&m!==null){this._0.line(k,m,f,g)}else if(this._1U){this._0.circle(f,g,f-h,g)}if(!this.hide_dots)this._0.circle(f,g,f-h,g);this._y(f-h,g-h,2*h,2*h,i[this.klass.DATA_LABEL_INDEX],i[this.klass.DATA_COLOR_INDEX],n[d],d);k=f;m=g},this)},this)},_16:function(){this.maximum_value=Math.max(this.maximum_value,this.baseline_value);this.callSuper();if(this.baseline_value!==null)this._U=this.baseline_value/this.maximum_value},_1V:function(d){var f=0;Bluff.each(d[this.klass.DATA_VALUES_INDEX],function(c){if(c!==undefined)f+=1});return f===1}});Bluff.Dot=new JS.Class(Bluff.Base,{draw:function(){this.has_left_labels=true;this.callSuper();if(!this._c)return;var k=1.0;this._J=this._3/this._5;this._1a=this._J*k/this._9.length;this._0.stroke_opacity=0.0;var m=Bluff.array_new(this._5,0),n=Bluff.array_new(this._5,this._2),l=(this._J*(1-k))/2;Bluff.each(this._9,function(i,j){Bluff.each(i[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(c*this._6)-Math.round(this._1a/6.0);var g=this._7+(this._J*d)+l+Math.round(this._1a/2.0);if(j===0){this._0.stroke=this.marker_color;this._0.stroke_width=1.0;this._0.opacity=0.1;this._0.line(this._2,g,this._2+this._6,g)}this._0.fill=i[this.klass.DATA_COLOR_INDEX];this._0.stroke='transparent';this._0.circle(f,g,f+Math.round(this._1a/3.0),g);var h=this._7+(this._J*d+this._J/2)+l;this._e(h,d)},this)},this)},_N:function(){if(this.hide_line_markers)return;this._0.stroke_antialias=false;this._0.stroke_width=1;var c=5;var d=this._19(this.maximum_value/c);for(var f=0;f<=c;f++){var g=(this._l-this._2)/c,h=this._l-(g*f)-1,i=f-c,j=Math.abs(i)*d;this._0.stroke=this.marker_color;this._0.line(h,this._g,h,this._g+0.5*this.klass.LABEL_MARGIN);if(!this.hide_line_numbers){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='center';this._0.annotate_scaled(0,0,h,this._g+(this.klass.LABEL_MARGIN*2.0),j,this._a)}this._0.stroke_antialias=true}},_e:function(c,d){if(this.labels[d]&&!this._u[d]){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.font_weight='normal';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='east';this._0.annotate_scaled(1,1,this._2-this.klass.LABEL_MARGIN*2.0,c,this.labels[d],this._a);this._u[d]=true}}});Bluff.Net=new JS.Class(Bluff.Base,{hide_dots:null,line_width:null,dot_radius:null,initialize:function(){this.callSuper();this.hide_dots=false;this.hide_line_numbers=true},draw:function(){this.callSuper();if(!this._c)return;this._z=this._3/2.0;this._A=this._2+(this._6/2.0);this._B=this._7+(this._3/2.0)-10;this._S=this._6/(this._5-1);var s=this.dot_radius||this._R(this._j/(this._9[0][this.klass.DATA_VALUES_INDEX].length*2.5),7.0);this._0.stroke_opacity=1.0;this._0.stroke_width=this.line_width||this._R(this._j/(this._9[0][this.klass.DATA_VALUES_INDEX].length*4),3.0);var r;if(this._U!==undefined){r=this._7+(this._3-this._U*this._3);this._0.push();this._0.stroke_color=this.baseline_color;this._0.fill_opacity=0.0;this._0.stroke_width=5;this._0.line(this._2,r,this._2+this._6,r);this._0.pop()}Bluff.each(this._9,function(o){var p=null,q=null;Bluff.each(o[this.klass.DATA_VALUES_INDEX],function(c,d){if(c===undefined)return;var f=d*Math.PI*2/this._5,g=c*this._z,h=this._A+Math.sin(f)*g,i=this._B-Math.cos(f)*g,j=(d+10){this._0.fill=c[this.klass.DATA_COLOR_INDEX];var f=(c[this.klass.DATA_VALUES_INDEX][0]/o)*360;this._0.circle(n,l,n+k,l,p,p+f+0.5);var g=p+((p+f)-p)/2,h=Math.round((c[this.klass.DATA_VALUES_INDEX][0]/o)*100.0),i;if(h>=this.hide_labels_less_than){i=this._Q(c[this.klass.DATA_VALUES_INDEX][0]);this._e(n,l,g,k+(k*this.klass.TEXT_OFFSET_PERCENTAGE),i,c,d)}p+=f}},this)},_e:function(c,d,f,g,h,i,j){var k=20.0,m=c,n=d,l=g+k,o=l*0.15,p=m+((l+o)*Math.cos(f*Math.PI/180)),q=n+(l*Math.sin(f*Math.PI/180));this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.marker_font_size);this._0.font_weight='bold';this._0.gravity='center';this._0.annotate_scaled(0,0,p,q,h,this._a);this._y(p-20,q-20,40,40,i[this.klass.DATA_LABEL_INDEX],i[this.klass.DATA_COLOR_INDEX],h,j)},_1W:function(){var d=0;Bluff.each(this._1,function(c){d+=c[this.klass.DATA_VALUES_INDEX][0]},this);return d}});Bluff.SideBar=new JS.Class(Bluff.Base,{bar_spacing:0.9,draw:function(){this.has_left_labels=true;this.callSuper();if(!this._c)return;this._T()},_T:function(){this._V=this._3/this._5;this._8=this._V/this._9.length;this._0.stroke_opacity=0.0;var q=Bluff.array_new(this._5,0),s=Bluff.array_new(this._5,this._2),r=(this._8*(1-this.bar_spacing))/2;Bluff.each(this._9,function(l,o){var p=this._1[o][this.klass.DATA_VALUES_INDEX];Bluff.each(l[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._6-c*this._6-q[d]),g=this._2+this._6-q[d],h=g-f,i=s[d]-1,j=this._7+(this._V*d)+(this._8*o)+r,k=i+h,m=j+this._8*this.bar_spacing;q[d]+=(c*this._6);this._0.stroke='transparent';this._0.fill=l[this.klass.DATA_COLOR_INDEX];this._0.rectangle(i,j,k,m);this._y(i,j,k-i,m-j,l[this.klass.DATA_LABEL_INDEX],l[this.klass.DATA_COLOR_INDEX],p[d],d);var n=this._7+(this._V*d+this._V/2);this._e(n,d)},this)},this)},_N:function(){if(this.hide_line_markers)return;this._0.stroke_antialias=false;this._0.stroke_width=1;var c=5;var d=this._19(this._i/c),f,g,h,i;for(var j=0;j<=c;j++){f=(this._l-this._2)/c;g=this._l-(f*j)-1;h=j-c;i=Math.abs(h)*d+this.minimum_value;this._0.stroke=this.marker_color;this._0.line(g,this._g,g,this._7);if(!this.hide_line_numbers){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='center';this._0.annotate_scaled(0,0,g,this._g+(this.klass.LABEL_MARGIN*2.0),this._Q(i),this._a)}}},_e:function(c,d){if(this.labels[d]&&!this._u[d]){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.stroke='transparent';this._0.font_weight='normal';this._0.pointsize=this._d(this.marker_font_size);this._0.gravity='east';this._0.annotate_scaled(1,1,this._2-this.klass.LABEL_MARGIN*2.0,c,this.labels[d],this._a);this._u[d]=true}}});Bluff.Spider=new JS.Class(Bluff.Base,{hide_text:null,hide_axes:null,transparent_background:null,initialize:function(c,d,f){this.callSuper(c,f);this._1X=d;this.hide_legend=true},draw:function(){this.hide_line_markers=true;this.callSuper();if(!this._c)return;var c=this._3,d=this._3/2.0,f=this._2+(this._6-c)/2.0,g=this._2+(this._6/2.0),h=this._7+(this._3/2.0)-25;this._1Y=d/this._1X;var i=this._1Z(),j=0.0,k=(2*Math.PI)/this._1.length,m=0.0;if(!this.hide_axes)this._20(g,h,d,k);this._21(g,h,k)},_1s:function(c){return c*this._1Y},_e:function(c,d,f,g,h){var i=50,j=c,k=d+0,m=j+((g+i)*Math.cos(f)),n=k+((g+i)*Math.sin(f));this._0.fill=this.marker_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.legend_font_size);this._0.stroke='transparent';this._0.font_weight='bold';this._0.gravity='center';this._0.annotate_scaled(0,0,m,n,h,this._a)},_20:function(g,h,i,j,k){if(this.hide_axes)return;var m=0.0;Bluff.each(this._1,function(c){this._0.stroke=k||c[this.klass.DATA_COLOR_INDEX];this._0.stroke_width=5.0;var d=i*Math.cos(m);var f=i*Math.sin(m);this._0.line(g,h,g+d,h+f);if(!this.hide_text)this._e(g,h,m,i,c[this.klass.DATA_LABEL_INDEX]);m+=j},this)},_21:function(d,f,g,h){var i=[],j=0.0;Bluff.each(this._1,function(c){i.push(d+this._1s(c[this.klass.DATA_VALUES_INDEX][0])*Math.cos(j));i.push(f+this._1s(c[this.klass.DATA_VALUES_INDEX][0])*Math.sin(j));j+=g},this);this._0.stroke_width=1.0;this._0.stroke=h||this.marker_color;this._0.fill=h||this.marker_color;this._0.fill_opacity=0.4;this._0.polyline(i)},_1Z:function(){var d=0.0;Bluff.each(this._1,function(c){d+=c[this.klass.DATA_VALUES_INDEX][0]},this);return d}});Bluff.Base.StackedMixin=new JS.Module({_1b:function(){var g={};Bluff.each(this._1,function(f){Bluff.each(f[this.klass.DATA_VALUES_INDEX],function(c,d){if(!g[d])g[d]=0.0;g[d]+=c},this)},this);for(var h in g){if(g[h]>this.maximum_value)this.maximum_value=g[h]}this.minimum_value=0}});Bluff.StackedArea=new JS.Class(Bluff.Base,{include:Bluff.Base.StackedMixin,last_series_goes_on_bottom:null,draw:function(){this._1b();this.callSuper();if(!this._c)return;this._S=this._6/(this._5-1);this._0.stroke='transparent';var n=Bluff.array_new(this._5,0);var l=null;var o=this.last_series_goes_on_bottom?'reverse_each':'each';Bluff[o](this._9,function(h){var i=l;l=[];Bluff.each(h[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._S*d);var g=this._7+(this._3-c*this._3-n[d]);n[d]+=(c*this._3);l.push(f);l.push(g);this._e(f,d)},this);var j,k,m;if(i){j=Bluff.array(l);for(k=i.length/2-1;k>=0;k--){j.push(i[2*k]);j.push(i[2*k+1])}j.push(l[0]);j.push(l[1])}else{j=Bluff.array(l);j.push(this._l);j.push(this._g-1);j.push(this._2);j.push(this._g-1);j.push(l[0]);j.push(l[1])}this._0.fill=h[this.klass.DATA_COLOR_INDEX];this._0.polyline(j)},this)}});Bluff.StackedBar=new JS.Class(Bluff.Base,{include:Bluff.Base.StackedMixin,bar_spacing:0.9,draw:function(){this._1b();this.callSuper();if(!this._c)return;this._8=this._6/this._5;var l=(this._8*(1-this.bar_spacing))/2;this._0.stroke_opacity=0.0;var o=Bluff.array_new(this._5,0);Bluff.each(this._9,function(k,m){var n=this._1[m][this.klass.DATA_VALUES_INDEX];Bluff.each(k[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._8*d)+(this._8*this.bar_spacing/2.0);this._e(f,d);if(c==0)return;var g=this._2+(this._8*d)+l;var h=this._7+(this._3-c*this._3-o[d])+1;var i=g+this._8*this.bar_spacing;var j=this._7+this._3-o[d]-1;o[d]+=(c*this._3);this._0.fill=k[this.klass.DATA_COLOR_INDEX];this._0.rectangle(g,h,i,j);this._y(g,h,i-g,j-h,k[this.klass.DATA_LABEL_INDEX],k[this.klass.DATA_COLOR_INDEX],n[d],d)},this)},this)}});Bluff.AccumulatorBar=new JS.Class(Bluff.StackedBar,{draw:function(){if(this._1.length!==1)throw'Incorrect number of datasets';var g=[],h=0,i=[];Bluff.each(this._1[0][this.klass.DATA_VALUES_INDEX],function(d){var f=-Infinity;Bluff.each(i,function(c){f=Math.max(f,c)});i.push((h>0)?(d+f):d);g.push(i[h]-d);h+=1},this);this.data("Accumulator",g);this.callSuper()}});Bluff.SideStackedBar=new JS.Class(Bluff.SideBar,{include:Bluff.Base.StackedMixin,bar_spacing:0.9,draw:function(){this.has_left_labels=true;this._1b();this.callSuper()},_T:function(){this._8=this._3/this._5;var q=Bluff.array_new(this._5,0),s=Bluff.array_new(this._5,this._2),r=(this._8*(1-this.bar_spacing))/2;Bluff.each(this._9,function(l,o){var p=this._1[o][this.klass.DATA_VALUES_INDEX];Bluff.each(l[this.klass.DATA_VALUES_INDEX],function(c,d){var f=this._2+(this._6-c*this._6-q[d])+1;var g=this._2+this._6-q[d]-1;var h=g-f;this._0.fill=l[this.klass.DATA_COLOR_INDEX];var i=s[d],j=this._7+(this._8*d)+r,k=i+h,m=j+this._8*this.bar_spacing;s[d]+=h;q[d]+=(c*this._6-2);this._0.rectangle(i,j,k,m);this._y(i,j,k-i,m-j,l[this.klass.DATA_LABEL_INDEX],l[this.klass.DATA_COLOR_INDEX],p[d],d);var n=this._7+(this._8*d)+(this._8*this.bar_spacing/2.0);this._e(n,d)},this)},this)},_1k:function(c,d){d=d||0;return this._1r(c,d)>this.maximum_value},_1r:function(d,f){var g=0;Bluff.each(this._1,function(c){g+=c[this.klass.DATA_VALUES_INDEX][f]},this);return g}});Bluff.Mini.Legend=new JS.Module({hide_mini_legend:false,_1c:function(){if(this.hide_mini_legend)return;this._I=Bluff.map(this._1,function(c){return c[this.klass.DATA_LABEL_INDEX]},this);var d=this._d(this._1.length*this._1t()+this.top_margin+this.bottom_margin);this._22=this._L;this._23=this._b;switch(this.legend_position){case'right':this._t=Math.max(this._t,d);this._j+=this._24()+this.left_margin;break;default:this._t+=d;break}this._M()},_1t:function(){return this._P(this.legend_font_size)*1.7},_24:function(){var d=0;Bluff.each(this._I,function(c){d=Math.max(this._H(this.legend_font_size,c),d)},this);return this._d(d+40*1.7)},_1d:function(){if(this.hide_mini_legend)return;var f=40.0,g=10.0,h=100.0,i=40.0;if(this.font)this._0.font=this.font;this._0.pointsize=this.legend_font_size;var j,k;switch(this.legend_position){case'right':j=this._23+this.left_margin;k=this.top_margin+i;break;default:j=h,k=this._22+i;break}this._x(function(){this._0.line(0.0,k,this._b,k)});Bluff.each(this._I,function(c,d){this._0.fill=this.font_color;if(this.font)this._0.font=this.font;this._0.pointsize=this._d(this.legend_font_size);this._0.stroke='transparent';this._0.font_weight='normal';this._0.gravity='west';this._0.annotate_scaled(this._b,1.0,j+(f*1.7),k,this._25(c),this._a);this._0.stroke='transparent';this._0.fill=this._1[d][this.klass.DATA_COLOR_INDEX];this._0.rectangle(j,k-f/2.0,j+f,k+f/2.0);k+=this._1t()},this);this._w=0},_25:function(c){var d=String(c);while(this._H(this._d(this.legend_font_size),d)>(this._j-this.legend_left_margin-this.right_margin)&&(d.length>1))d=d.substr(0,d.length-1);return d+(d.length=1?(c*i):1;var k=(d*i)>=1?(d*i):1;var h=this._W(this.pointsize,h);h.style.color=this.fill;h.style.cursor='default';h.style.fontWeight=this.font_weight;h.style.textAlign='center';h.style.left=(this._f*f+this._26(h,j))+'px';h.style.top=(this._h*g+this._27(h,k))+'px'},tooltip:function(d,f,g,h,i,j,k){if(g<0)d+=g;if(h<0)f+=h;var m=this._n.parentNode,n=document.createElement('div');n.className=this.klass.TARGET_CLASS;n.style.cursor='default';n.style.position='absolute';n.style.left=(this._f*d-3)+'px';n.style.top=(this._h*f-3)+'px';n.style.width=(this._f*Math.abs(g)+5)+'px';n.style.height=(this._h*Math.abs(h)+5)+'px';n.style.fontSize=0;n.style.overflow='hidden';Bluff.Event.observe(n,'mouseover',function(c){Bluff.Tooltip.show(i,j,k)});Bluff.Event.observe(n,'mouseout',function(c){Bluff.Tooltip.hide()});m.appendChild(n);return n},circle:function(c,d,f,g,h,i){var j=Math.sqrt(Math.pow(f-c,2)+Math.pow(g-d,2));var k=0,m=2*Math.PI;this._4.fillStyle=this.fill;this._4.beginPath();if(h!==undefined&&i!==undefined&&Math.abs(Math.floor(i-h))!==360){k=h*Math.PI/180;m=i*Math.PI/180;this._4.moveTo(this._f*(c+j*Math.cos(m)),this._h*(d+j*Math.sin(m)));this._4.lineTo(this._f*c,this._h*d);this._4.lineTo(this._f*(c+j*Math.cos(k)),this._h*(d+j*Math.sin(k)))}this._4.arc(this._f*c,this._h*d,this._f*j,k,m,false);this._4.fill()},line:function(c,d,f,g){this._4.strokeStyle=this.stroke;this._4.lineWidth=this.stroke_width;this._4.beginPath();this._4.moveTo(this._f*c,this._h*d);this._4.lineTo(this._f*f,this._h*g);this._4.stroke()},polyline:function(c){this._4.fillStyle=this.fill;this._4.globalAlpha=this.fill_opacity||1;try{this._4.strokeStyle=this.stroke}catch(e){}var d=c.shift(),f=c.shift();this._4.beginPath();this._4.moveTo(this._f*d,this._h*f);while(c.length>0){d=c.shift();f=c.shift();this._4.lineTo(this._f*d,this._h*f)}this._4.fill()},rectangle:function(c,d,f,g){var h;if(c>f){h=c;c=f;f=h}if(d>g){h=d;d=g;g=h}try{this._4.fillStyle=this.fill;this._4.fillRect(this._f*c,this._h*d,this._f*(f-c),this._h*(g-d))}catch(e){}try{this._4.strokeStyle=this.stroke;if(this.stroke!=='transparent')this._4.strokeRect(this._f*c,this._h*d,this._f*(f-c),this._h*(g-d))}catch(e){}},_26:function(c,d){var f=this._K(c).width;switch(this.gravity){case'west':return 0;case'east':return d-f;case'north':case'south':case'center':return(d-f)/2}},_27:function(c,d){var f=this._K(c).height;switch(this.gravity){case'north':return 0;case'south':return d-f;case'west':case'east':case'center':return(d-f)/2}},_1u:function(){var c=this._n.parentNode;if(c.className===this.klass.WRAPPER_CLASS)return c;c=document.createElement('div');c.className=this.klass.WRAPPER_CLASS;c.style.position='relative';c.style.border='none';c.style.padding='0 0 0 0';this._n.parentNode.insertBefore(c,this._n);c.appendChild(this._n);return c},_W:function(c,d){var f=this._28(d);f.style.fontFamily=this.font;f.style.fontSize=(typeof c==='number')?c+'px':c;return f},_28:function(c){var d=document.createElement('div');d.className=this.klass.TEXT_CLASS;d.style.position='absolute';d.appendChild(document.createTextNode(c));this._1u().appendChild(d);return d},_X:function(c){c.parentNode.removeChild(c);if(c.className===this.klass.TARGET_CLASS)Bluff.Event.stopObserving(c)},_K:function(c){var d=c.style.display;return(d&&d!=='none')?{width:c.offsetWidth,height:c.offsetHeight}:{width:c.clientWidth,height:c.clientHeight}}});Bluff.Event={_Y:[],_1v:(window.attachEvent&&navigator.userAgent.indexOf('Opera')===-1),observe:function(d,f,g,h){var i=Bluff.map(this._1w(d,f),function(c){return c._29});if(Bluff.index(i,g)!==-1)return;var j=function(c){g.call(h||null,d,Bluff.Event._2a(c))};this._Y.push({_Z:d,_1e:f,_29:g,_1x:j});if(d.addEventListener)d.addEventListener(f,j,false);else d.attachEvent('on'+f,j)},stopObserving:function(d){var f=d?this._1w(d):this._Y;Bluff.each(f,function(c){if(c._Z.removeEventListener)c._Z.removeEventListener(c._1e,c._1x,false);else c._Z.detachEvent('on'+c._1e,c._1x)})},_1w:function(d,f){var g=[];Bluff.each(this._Y,function(c){if(d&&c._Z!==d)return;if(f&&c._1e!==f)return;g.push(c)});return g},_2a:function(c){if(!this._1v)return c;if(!c)return false;if(c._2b)return c;c._2b=true;var d=this._2c(c);c.target=c.srcElement;c.pageX=d.x;c.pageY=d.y;return c},_2c:function(c){var d=document.documentElement,f=document.body||{scrollLeft:0,scrollTop:0};return{x:c.pageX||(c.clientX+(d.scrollLeft||f.scrollLeft)-(d.clientLeft||0)),y:c.pageY||(c.clientY+(d.scrollTop||f.scrollTop)-(d.clientTop||0))}}};if(Bluff.Event._1v)window.attachEvent('onunload',function(){Bluff.Event.stopObserving();Bluff.Event._Y=null});if(navigator.userAgent.indexOf('AppleWebKit/')>-1)window.addEventListener('unload',function(){},false);Bluff.Tooltip=new JS.Singleton({LEFT_OFFSET:20,TOP_OFFSET:-6,DATA_LENGTH:8,CLASS_NAME:'bluff-tooltip',setup:function(){this._o=document.createElement('div');this._o.className=this.CLASS_NAME;this._o.style.position='absolute';this.hide();document.body.appendChild(this._o);Bluff.Event.observe(document.body,'mousemove',function(c,d){this._o.style.left=(d.pageX+this.LEFT_OFFSET)+'px';this._o.style.top=(d.pageY+this.TOP_OFFSET)+'px'},this)},show:function(c,d,f){f=Number(String(f).substr(0,this.DATA_LENGTH));this._o.innerHTML='  '+c+' '+f+'';this._o.style.display=''},hide:function(){this._o.style.display='none'}});Bluff.Event.observe(window,'load',Bluff.Tooltip.method('setup'));Bluff.TableReader=new JS.Class({NUMBER_FORMAT:/\-?(0|[1-9]\d*)(\.\d+)?(e[\+\-]?\d+)?/i,initialize:function(c,d){this._1f=d||{};this._2d=this._1f.orientation||'auto';this._2e=(typeof c==='string')?document.getElementById(c):c},get_data:function(){if(!this._1)this._1y();return this._1},get_labels:function(){if(!this._1g)this._1y();return this._1g},get_title:function(){return this._2f},get_series:function(c){if(this._1[c])return this._1[c];return this._1[c]={points:[]}},_1y:function(){this._C=this._m=0;this._p=this._q=0;this._1=[];this._1g={};this._r=[];this._s=[];this._1h=[];this._1i=[];this._1z(this._2e);this._2g();this._2h();Bluff.each(this._s,function(c,d){this.get_series(d-this._q).name=c},this);Bluff.each(this._r,function(c,d){this._1g[d-this._p]=c},this)},_1z:function(c){this._2i(c);var d,f=c.childNodes,g=f.length;for(d=0;d=0)return true;var h=f.length;while(h--){if(Bluff.index(g,f[h])>=0)return true}return false},_2g:function(){var d=this._1i.length,f;while(d--){f=this._1i[d];if(f<=this._q)continue;this._s.splice(f-1,1);if(f>=this._q)this._1.splice(f-1-this._q,1)}var d=this._1h.length,f;while(d--){f=this._1h[d];if(f<=this._p)continue;this._r.splice(f-1,1);Bluff.each(this._1,function(c){if(f>=this._p)c.points.splice(f-1-this._p,1)},this)}},_2h:function(){switch(this._2d){case'auto':if((this._r.length>1&&this._s.length===1)||this._r.length]+>/gi,'')},extend:{Mixin:new JS.Module({data_from_table:function(d,f){var g=new Bluff.TableReader(d,f),h=g.get_data();Bluff.each(h,function(c){this.data(c.name,c.points)},this);this.labels=g.get_labels();this.title=g.get_title()||this.title}})}});Bluff.Base.include(Bluff.TableReader.Mixin); +})(jQuery); diff --git a/apis/charts_graphs_bluff/bluff/js-class.js b/apis/charts_graphs_bluff/bluff/js-class.js index 233a7b3..71a672c 100644 --- a/apis/charts_graphs_bluff/bluff/js-class.js +++ b/apis/charts_graphs_bluff/bluff/js-class.js @@ -1 +1,3 @@ +(function ($) { this.JS=this.JS||{};JS.extend=function(a,b){b=b||{};for(var c in b){if(a[c]===b[c])continue;a[c]=b[c]}return a};JS.extend(JS,{makeFunction:function(){return function(){return this.initialize?(this.initialize.apply(this,arguments)||this):this}},makeBridge:function(a){var b=function(){};b.prototype=a.prototype;return new b},bind:function(){var a=JS.array(arguments),b=a.shift(),c=a.shift()||null;return function(){return b.apply(c,a.concat(JS.array(arguments)))}},callsSuper:function(a){return a.SUPER===undefined?a.SUPER=/\bcallSuper\b/.test(a.toString()):a.SUPER},mask:function(a){var b=a.toString().replace(/callSuper/g,'super');a.toString=function(){return b};return a},array:function(a){if(!a)return[];if(a.toArray)return a.toArray();var b=a.length,c=[];while(b--)c[b]=a[b];return c},indexOf:function(a,b){for(var c=0,d=a.length;c':''),d=this.__meta__=new JS.Module(c?c+'.':'',{},{_1:this});d.include(this.klass.__mod__,false);return d},equals:function(a){return this===a},extend:function(a,b){return this.__eigen__().include(a,b,{_2:this})},hash:function(){return this.__hashcode__=this.__hashcode__||JS.Kernel.getHashCode()},isA:function(a){return this.__eigen__().includes(a)},method:function(a){var b=this,c=b.__mcache__=b.__mcache__||{};if((c[a]||{}).fn===b[a])return c[a].bd;return(c[a]={fn:b[a],bd:JS.bind(b[a],b)}).bd},methods:function(){return this.__eigen__().instanceMethods(true)},tap:function(a,b){a.call(b||null,this);return this}}),{__hashIndex__:0,getHashCode:function(){this.__hashIndex__+=1;return(Math.floor(new Date().getTime()/1000)+this.__hashIndex__).toString(16)}});JS.Module.include(JS.Kernel);JS.extend(JS.Module,JS.Kernel.__fns__);JS.Class.include(JS.Kernel);JS.extend(JS.Class,JS.Kernel.__fns__);JS.Interface=new JS.Class({initialize:function(d){this.test=function(a,b){var c=d.length;while(c--){if(!JS.isFn(a[d[c]]))return b?d[c]:false}return true}},extend:{ensure:function(){var a=JS.array(arguments),b=a.shift(),c,d;while(c=a.shift()){d=c.test(b,true);if(d!==true)throw new Error('object does not implement '+d+'()');}}}});JS.Singleton=new JS.Class({initialize:function(a,b,c){return new(new JS.Class(a,b,c))}}); +})(jQuery); diff --git a/apis/charts_graphs_bluff/charts_graphs_bluff.class.inc b/apis/charts_graphs_bluff/charts_graphs_bluff.class.inc index 7fe735b..785466b 100644 --- a/apis/charts_graphs_bluff/charts_graphs_bluff.class.inc +++ b/apis/charts_graphs_bluff/charts_graphs_bluff.class.inc @@ -21,7 +21,7 @@ class ChartsGraphsBluff extends ChartsGraphsCanvas { * @var */ var $parameters = array(); - + /** * Optional parameter. * @@ -66,9 +66,9 @@ class ChartsGraphsBluff extends ChartsGraphsCanvas { $type = 'StackedArea'; break; - case 'stacked_bar': - $type = 'StackedBar'; - break; + case 'stacked_bar': + $type = 'StackedBar'; + break; default: $type = ucfirst($this->type); @@ -91,13 +91,13 @@ class ChartsGraphsBluff extends ChartsGraphsCanvas { if ($this->y_min) { $parameters['minimum_value'] = $this->y_min; } - if ($this->y_max) { + if ($this->y_max) { $parameters['maximum_value'] = $this->y_max; } - if ($this->y_step) { + if ($this->y_step) { $parameters['y_axis_increment'] = $this->y_step; } - + if (isset($this->theme) && !empty($this->theme)) { $parameters['theme_' . $this->theme] = array(); } @@ -108,9 +108,9 @@ class ChartsGraphsBluff extends ChartsGraphsCanvas { $background_colour = isset($this->colour) ? array($this->colour, $this->colour) : array( - '#d1edf5', - '#ffffff', - ); + '#d1edf5', + '#ffffff', + ); $background_colour = "['" . implode("', '", $background_colour) . "']"; $set_theme = sprintf( "{ @@ -185,7 +185,7 @@ class ChartsGraphsBluff extends ChartsGraphsCanvas { TABLE - , +, $chart_id, $this->title ); @@ -255,13 +255,13 @@ TABLE legend.push("<\/ul>"); - $("#%chart_id-graph") + jQuery("#%chart_id-graph") .parent("div.bluff-wrapper") .append(legend.join("")) .css({height: "auto"}); } - $(window).load(ChartsAndGraphs.init); + jQuery(window).load(ChartsAndGraphs.init); Drupal.behaviors.ChartsAndGraphs_init = function(context) { ChartsAndGraphs.init(); @@ -271,11 +271,11 @@ TABLE $javascript = strtr( $javascript, array( - '%chart_id' => $chart_id, - '%type' => $this->_get_translated_chart_type(), - '%width' => $this->width, - '%height' => $this->height, - '%json_encode' => json_encode($is_pie_chart ? $x_labels : array_keys($series)), + '%chart_id' => $chart_id, + '%type' => $this->_get_translated_chart_type(), + '%width' => $this->width, + '%height' => $this->height, + '%json_encode' => json_encode($is_pie_chart ? $x_labels : array_keys($series)), )); return $html . $javascript; diff --git a/apis/charts_graphs_bluff/charts_graphs_bluff.info b/apis/charts_graphs_bluff/charts_graphs_bluff.info index 979cfb9..b0954b7 100644 --- a/apis/charts_graphs_bluff/charts_graphs_bluff.info +++ b/apis/charts_graphs_bluff/charts_graphs_bluff.info @@ -3,5 +3,6 @@ name = "Charts and Graphs: Bluff" description = "Bluff (Beautiful Graphs in JavaScript) implementation for Charts and Graphs." dependencies[] = charts_graphs package = "Charts" -core = 6.x +core = 7.x php = 5.1 + diff --git a/apis/charts_graphs_bluff/charts_graphs_bluff.install b/apis/charts_graphs_bluff/charts_graphs_bluff.install index 53aa4fc..7c32853 100644 --- a/apis/charts_graphs_bluff/charts_graphs_bluff.install +++ b/apis/charts_graphs_bluff/charts_graphs_bluff.install @@ -7,7 +7,7 @@ */ /** - * Implementation of hook_requirements(). + * Implements hook_requirements(). */ function charts_graphs_bluff_requirements($phase) { $requirements = array(); @@ -28,8 +28,9 @@ function charts_graphs_bluff_requirements($phase) { 'description' => $t('Bluff needs the %file file to work properly. Please review Bluff !installation_instructions.', array( - '%file' => $file, - '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path)) + '%file' => $file, + '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path), + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Unavailable'), @@ -43,8 +44,9 @@ function charts_graphs_bluff_requirements($phase) { 'description' => $t('Bluff needs the %file file to work properly. Please review Bluff !installation_instructions.', array( - '%file' => $file, - '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path)) + '%file' => $file, + '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path), + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Unavailable'), @@ -64,8 +66,9 @@ function charts_graphs_bluff_requirements($phase) { 'description' => $t('Bluff needs the %file file to work properly. Please review Bluff !installation_instructions.', array( - '%file' => $file, - '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path)) + '%file' => $file, + '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path), + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Unavailable'), @@ -78,9 +81,10 @@ function charts_graphs_bluff_requirements($phase) { properly: %files. There are %number of them. Please leave only one. You can review Bluff !installation_instructions.', array( - '%files' => implode(', ', $files), - '%number' => $bluff_count, - '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path)) + '%files' => implode(', ', $files), + '%number' => $bluff_count, + '!installation_instructions' => l(t('installation instructions'), $installation_instructions_path), + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('%number installed', array('%number' => $bluff_count)), diff --git a/apis/charts_graphs_bluff/charts_graphs_bluff.module b/apis/charts_graphs_bluff/charts_graphs_bluff.module index b96c9c1..ec17d9b 100644 --- a/apis/charts_graphs_bluff/charts_graphs_bluff.module +++ b/apis/charts_graphs_bluff/charts_graphs_bluff.module @@ -5,11 +5,11 @@ */ /** - * Implementation of hook_chartgraph_provider(). - **/ + * Implements hook_chartgraph_provider(). + **/ function charts_graphs_bluff_chartgraph_provider() { $provider = array( - 'path' => dirname(__FILE__) . '/charts_graphs_bluff.class.inc', // must be full path + 'path' => drupal_get_path('module', 'charts_graphs_bluff') . '/charts_graphs_bluff.class.inc', // must be full path 'clazz' => 'ChartsGraphsBluff', // implementation class' name 'name' => 'bluff', // name used when invoking through a factory method 'nice_name' => 'Bluff', @@ -29,10 +29,10 @@ function charts_graphs_bluff_chartgraph_provider() { 'themes' => array( 'keynote' => t('Keynote'), '37signals' => t('37 Signals'), - 'rails_keynote' => t('Rails Keynote'), - 'odeo' => t('Odeo'), - 'pastel' => t('Pastel'), - 'greyscale' => t('Greyscale'), + 'rails_keynote' => t('Rails Keynote'), + 'odeo' => t('Odeo'), + 'pastel' => t('Pastel'), + 'greyscale' => t('Greyscale'), ), ); diff --git a/apis/charts_graphs_google_charts/charts_graphs_google_charts.class.inc b/apis/charts_graphs_google_charts/charts_graphs_google_charts.class.inc index 4d0d74a..a31783c 100644 --- a/apis/charts_graphs_google_charts/charts_graphs_google_charts.class.inc +++ b/apis/charts_graphs_google_charts/charts_graphs_google_charts.class.inc @@ -46,15 +46,15 @@ class ChartsGraphsGoogleCharts extends ChartsGraphsCanvas { * TRUE: counts the number of data series available * FALSE: counts the munber of data poitns in the first serie. This last * behaviour is used with pie charts. - * + * * @var */ var $colour_count_series = TRUE; - + /** * Parameters set directly by the user. * - * @var + * @var */ var $parameters = array(); @@ -85,18 +85,18 @@ class ChartsGraphsGoogleCharts extends ChartsGraphsCanvas { $type = 'bvo'; break; - case 'stacked_bar': - $type = 'bvs'; - break; + case 'stacked_bar': + $type = 'bvs'; + break; - case 'stacked_side_bar': - $type = 'bhs'; - break; + case 'stacked_side_bar': + $type = 'bhs'; + break; - case 'pie_3d': - $type = 'p3'; - $this->colour_count_series = FALSE; - break; + case 'pie_3d': + $type = 'p3'; + $this->colour_count_series = FALSE; + break; } $this->parameters_to_send[CHARTS_GRAPHS_GOOGLE_CHARTS_CHART_TYPE] = $type; } @@ -119,7 +119,7 @@ class ChartsGraphsGoogleCharts extends ChartsGraphsCanvas { $max_serie = reset($serie); $serie_as_string = ''; foreach ($serie as $val) { - $serie_as_string .= ',' . drupal_urlencode($val); + $serie_as_string .= ',' . drupal_encode_path($val); if ($val < $min_serie) { $min_serie = $val; } @@ -155,7 +155,7 @@ class ChartsGraphsGoogleCharts extends ChartsGraphsCanvas { $max_y = $this->y_max; } - $chds = drupal_urlencode($min_y) . ',' . drupal_urlencode($max_y); + $chds = drupal_encode_path($min_y) . ',' . drupal_encode_path($max_y); if ($is_pie) { $chdl = $this->x_labels; $chl = reset($this->series); @@ -180,7 +180,7 @@ class ChartsGraphsGoogleCharts extends ChartsGraphsCanvas { } if ($this->y_legend) { $this->parameters_to_send[CHARTS_GRAPHS_GOOGLE_CHARTS_VISIBLE_AXIS_PARAMETER] .= $y_legend_axis; - $y_legend = '2:|' . drupal_urlencode($this->y_legend) . '|'; + $y_legend = '2:|' . drupal_encode_path($this->y_legend) . '|'; $this->parameters_to_send[CHARTS_GRAPHS_GOOGLE_CHARTS_LABEL_POSITION] = '2,50'; } else { @@ -201,8 +201,8 @@ class ChartsGraphsGoogleCharts extends ChartsGraphsCanvas { $max_y = $this->y_max; } $this->parameters_to_send[CHARTS_GRAPHS_GOOGLE_CHARTS_AXIS_RANGE_PARAMETER] = - $scale_axis_identifier . ',' . drupal_urlencode($min_y) . ',' . - drupal_urlencode($max_y); + $scale_axis_identifier . ',' . drupal_encode_path($min_y) . ',' . + drupal_encode_path($max_y); /** * Applying user defined step for y axis values. */ @@ -271,15 +271,15 @@ class ChartsGraphsGoogleCharts extends ChartsGraphsCanvas { array_reverse($this->x_labels) : $this->x_labels; foreach ($x_labels as $label) { - $chxl .= '|' . drupal_urlencode($label); + $chxl .= '|' . drupal_encode_path($label); } } return $chxl; } - + protected function _encode_other_parameters() { - $this->parameters_to_send[CHARTS_GRAPHS_GOOGLE_CHARTS_CHART_TITLE] = drupal_urlencode($this->title); - $this->parameters_to_send[CHARTS_GRAPHS_GOOGLE_CHARTS_CHART_SIZE] = drupal_urlencode(sprintf( + $this->parameters_to_send[CHARTS_GRAPHS_GOOGLE_CHARTS_CHART_TITLE] = drupal_encode_path($this->title); + $this->parameters_to_send[CHARTS_GRAPHS_GOOGLE_CHARTS_CHART_SIZE] = drupal_encode_path(sprintf( '%ux%u', $this->width, $this->height @@ -334,7 +334,7 @@ class ChartsGraphsGoogleCharts extends ChartsGraphsCanvas { } } else { - $encoded_value = drupal_urlencode($value); + $encoded_value = drupal_encode_path($value); } return $encoded_value; } diff --git a/apis/charts_graphs_google_charts/charts_graphs_google_charts.info b/apis/charts_graphs_google_charts/charts_graphs_google_charts.info index 7a799b2..da82685 100644 --- a/apis/charts_graphs_google_charts/charts_graphs_google_charts.info +++ b/apis/charts_graphs_google_charts/charts_graphs_google_charts.info @@ -3,5 +3,6 @@ name = "Charts and Graphs: Google Charts" description = "Google Charts implementation for Charts and Graphs." dependencies[] = charts_graphs package = "Charts" -core = 6.x +core = 7.x php = 5.1 + diff --git a/apis/charts_graphs_google_charts/charts_graphs_google_charts.module b/apis/charts_graphs_google_charts/charts_graphs_google_charts.module index 9070b1e..482e026 100644 --- a/apis/charts_graphs_google_charts/charts_graphs_google_charts.module +++ b/apis/charts_graphs_google_charts/charts_graphs_google_charts.module @@ -5,11 +5,14 @@ */ /** - * Implementation of hook_chartgraph_provider(). - **/ + * Implements hook_chartgraph_provider(). + **/ function charts_graphs_google_charts_chartgraph_provider() { + + drupal_get_path($type, $project); + $provider = array( - 'path' => dirname(__FILE__) . '/charts_graphs_google_charts.class.inc', // must be full path + 'path' => drupal_get_path('module', 'charts_graphs_google_charts') . '/charts_graphs_google_charts.class.inc', // must be full path 'clazz' => 'ChartsGraphsGoogleCharts', // implementation class' name 'name' => 'google-charts', // name used when invoking through a factory method 'nice_name' => 'Google Charts', diff --git a/apis/charts_graphs_open_flash/charts_graphs_open_flash.class.inc b/apis/charts_graphs_open_flash/charts_graphs_open_flash.class.inc index 6e331bb..43c81e2 100644 --- a/apis/charts_graphs_open_flash/charts_graphs_open_flash.class.inc +++ b/apis/charts_graphs_open_flash/charts_graphs_open_flash.class.inc @@ -7,7 +7,7 @@ * */ -require_once dirname(__FILE__) . '/../../charts_graphs_flash_canvas.class.inc'; +require_once DRUPAL_ROOT . '/' . dirname(__FILE__) . '/../../charts_graphs_flash_canvas.class.inc'; /** * Implementation of abstract class ChartsGraphsFlashCanvas for Open Charts @@ -45,7 +45,7 @@ class ChartsGraphsOpenFlash extends ChartsGraphsFlashCanvas { $this->title->style = 'font-size: 20px; color:#0000ff; font-family: Verdana; text-align: center;'; $this->type = $canvas->translated_type; - + $is_pie = ($this->type === 'pie'); $this->y_legend = new stdClass(); @@ -82,7 +82,7 @@ class ChartsGraphsOpenFlash extends ChartsGraphsFlashCanvas { $x->labels->labels = $x_labels; $this->x_axis = $x; - + $series_colours = array_values($canvas->series_colours); /** @@ -180,11 +180,11 @@ class ChartsGraphsOpenFlash extends ChartsGraphsFlashCanvas { } return $new_vals; - /** - * Default action is just filtering values with nulled labels (leftovers - * from out joins). - */ - default: + /** + * Default action is just filtering values with nulled labels (leftovers + * from out joins). + */ + default: $new_vals = array(); $new_labels = array(); foreach ($values as $val) { @@ -231,13 +231,14 @@ class ChartsGraphsOpenFlash extends ChartsGraphsFlashCanvas { $generic = (object) $arr; //Keep for at least 30 seconds; - cache_set($unique, $generic, 'cache', time() + 30); + cache_set($unique, $generic, 'cache', REQUEST_TIME + 30); $mod_path = drupal_get_path('module', $this->getModuleName()); $openflash_swf_uri = $base_url . '/' . $mod_path . '/open-flash-chart.swf'; + // TODO The second parameter to this function call should be an array. $data_URL = url( - 'charts_graphs_open_flash/data/' . $unique, + 'charts_graphs_open_flash/data/' . $unique, array('absolute' => TRUE) ); diff --git a/apis/charts_graphs_open_flash/charts_graphs_open_flash.info b/apis/charts_graphs_open_flash/charts_graphs_open_flash.info index 1316596..da161ba 100644 --- a/apis/charts_graphs_open_flash/charts_graphs_open_flash.info +++ b/apis/charts_graphs_open_flash/charts_graphs_open_flash.info @@ -3,5 +3,6 @@ description = "Open Flash Charts 2 implementation for Charts and Graphs." dependencies[] = charts_graphs dependencies[] = swftools package = "Charts" -core = 6.x +core = 7.x php = 5.1 + diff --git a/apis/charts_graphs_open_flash/charts_graphs_open_flash.module b/apis/charts_graphs_open_flash/charts_graphs_open_flash.module index fa3545f..1070847 100644 --- a/apis/charts_graphs_open_flash/charts_graphs_open_flash.module +++ b/apis/charts_graphs_open_flash/charts_graphs_open_flash.module @@ -1,15 +1,15 @@ dirname(__FILE__) . '/charts_graphs_open_flash.class.inc', //must be full path + 'path' => drupal_get_path('module', 'charts_graphs_open_flash ') . '/charts_graphs_open_flash.class.inc', //must be full path 'clazz' => 'ChartsGraphsOpenFlash', //implementation class' name 'name' => 'open-flash', //name used when invoking through a factroy method 'nice_name' => 'Open Flash Chart 2', @@ -34,7 +34,7 @@ function charts_graphs_open_flash_chartgraph_provider() { } /** - * Implementation of hook_menu(). + * Implements hook_menu(). */ function charts_graphs_open_flash_menu() { $items = array(); @@ -61,11 +61,11 @@ function charts_graphs_open_flash_data($cid = NULL) { exit(); } $canvas = $cache->data; - + $chart = charts_graphs_get_graph('open-flash'); - + $chart->get_data_from_cache($cid); - drupal_json($chart); + drupal_json_output($chart); exit(); } diff --git a/charts_graphs.info b/charts_graphs.info index 214f79c..b612b1f 100755 --- a/charts_graphs.info +++ b/charts_graphs.info @@ -2,5 +2,8 @@ name = "Charts and Graphs" description = "Charts and Graphs Core API." package = "Charts" -core = 6.x +core = 7.x php = 5.1 + +files[] = charts_graphs_canvas.class.inc +files[] = charts_graphs_flash_canvas.class.inc diff --git a/charts_graphs.install b/charts_graphs.install index 636ff19..bd69694 100644 --- a/charts_graphs.install +++ b/charts_graphs.install @@ -7,15 +7,19 @@ */ /** - * Implementation of hook_uninstall(). + * Implements hook_uninstall(). */ function charts_graphs_uninstall() { - db_query("DELETE FROM {variable} WHERE name LIKE 'charts_graphs_%%'"); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("DELETE FROM {variable} WHERE name LIKE 'charts_graphs_%%'") */ + db_delete('variable') + ->condition('name', 'charts_graphs_%%', 'LIKE') + ->execute(); cache_clear_all('variables', 'cache'); } /** - * Implementation of hook_requirements(). + * Implements hook_requirements(). */ function charts_graphs_requirements($phase) { $requirements = array(); @@ -31,7 +35,7 @@ function charts_graphs_requirements($phase) { 'description' => $t('Charts and Graphs requires at least one charting library enabled. Please go to !modules_page and enable at least one charting library.', - array('!modules_page' => l(t('modules list page'), 'admin/build/modules/list')) + array('!modules_page' => l(t('modules list page'), 'admin/modules/list')) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('None enabled'), @@ -61,9 +65,9 @@ function charts_graphs_requirements($phase) { copy the downloaded files from the old %downloaded_path path to the new one", array( - '%old_path' => $file, - '%downloaded_path' => $file . '/downloaded/', - ) + '%old_path' => $file, + '%downloaded_path' => $file . '/downloaded/', + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Old path'), @@ -92,9 +96,9 @@ function charts_graphs_requirements($phase) { copy the downloaded files from the old %downloaded_path path to the new one", array( - '%old_path' => $file, - '%downloaded_path' => $file . '/bluff/', - ) + '%old_path' => $file, + '%downloaded_path' => $file . '/bluff/', + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Old path'), @@ -112,19 +116,19 @@ function charts_graphs_requirements($phase) { the first. If you don't want this warning to be shown any more, please set the proper option at !charts_graphs_settings_page.", array( - '!charts_graphs' => l( + '!charts_graphs' => l( t('Charts and Graphs'), 'http://drupal.org/project/charts_graphs' ), - '!chart_api' => l( + '!chart_api' => l( t('Chart API'), 'http://drupal.org/project/chart' ), - '!charts_graphs_settings_page' => l( + '!charts_graphs_settings_page' => l( t('Charts and Graphs settings page'), - 'admin/settings/charts_graphs' + 'admin/config/charts_graphs' ), - ) + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Enabled'), @@ -142,19 +146,19 @@ function charts_graphs_requirements($phase) { the first. If you don't want this warning to be shown any more, please set the proper option at !charts_graphs_settings_page.", array( - '!charts_graphs' => l( + '!charts_graphs' => l( t('Charts and Graphs'), 'http://drupal.org/project/charts_graphs' ), - '!charts' => l( + '!charts' => l( t('Charts'), 'http://drupal.org/project/charts' ), - '!charts_graphs_settings_page' => l( + '!charts_graphs_settings_page' => l( t('Charts and Graphs settings page'), - 'admin/settings/charts_graphs' + 'admin/config/charts_graphs' ), - ) + ) ), 'severity' => REQUIREMENT_ERROR, 'value' => $t('Enabled'), diff --git a/charts_graphs.module b/charts_graphs.module index 475abfe..bd17699 100755 --- a/charts_graphs.module +++ b/charts_graphs.module @@ -6,10 +6,10 @@ */ /** - * Implementation of hook_init(). + * Implements hook_init(). */ function charts_graphs_init() { - require_once(dirname(__FILE__) . '/charts_graphs_canvas.class.inc'); + require_once drupal_get_path('module', 'charts_graphs') . '/charts_graphs_canvas.class.inc'; $api_providers = array(); $hook = 'chartgraph_provider'; @@ -25,7 +25,7 @@ function charts_graphs_init() { } /** - * Implementation of hook_menu(). + * Implements hook_menu(). * */ function charts_graphs_menu() { @@ -38,7 +38,7 @@ function charts_graphs_menu() { 'type' => MENU_CALLBACK, ); - $items['admin/settings/charts_graphs'] = array( + $items['admin/config/charts_graphs'] = array( 'title' => 'Charts and Graphs', 'description' => 'Main configurations for Charts and Graphs', 'page callback' => 'drupal_get_form', @@ -53,7 +53,7 @@ function charts_graphs_menu() { /** * Main Charts and Graphs settings form. */ -function charts_graphs_main_settings_form() { +function charts_graphs_main_settings_form($form, &$form_state) { $form = array(); $form['charts_graphs_check_chart_api'] = array( @@ -65,16 +65,16 @@ function charts_graphs_main_settings_form() { !status_page complaining about both the Charts and Graphs module and the Chart API module being installed at the same time.', array( - '!charts_graphs' => l( + '!charts_graphs' => l( t('Charts and Graphs'), 'http://drupal.org/project/charts_graphs' ), - '!chart_api' => l( + '!chart_api' => l( t('Chart API'), 'http://drupal.org/project/chart' ), - '!status_page' => l(t('Status report'), 'admin/reports/status'), - ) + '!status_page' => l(t('Status report'), 'admin/reports/status'), + ) ), '#default_value' => variable_get('charts_graphs_check_chart_api', 1), '#required' => TRUE, @@ -89,16 +89,16 @@ function charts_graphs_main_settings_form() { !status_page complaining about both the Charts and Graphs module and the Charts module being installed at the same time.', array( - '!charts_graphs' => l( + '!charts_graphs' => l( t('Charts and Graphs'), 'http://drupal.org/project/charts_graphs' ), - '!charts' => l( + '!charts' => l( t('Charts'), 'http://drupal.org/project/charts' ), - '!status_page' => l(t('Status report'), 'admin/reports/status'), - ) + '!status_page' => l(t('Status report'), 'admin/reports/status'), + ) ), '#default_value' => variable_get('charts_graphs_check_charts', 1), '#required' => TRUE, @@ -110,7 +110,7 @@ function charts_graphs_main_settings_form() { /** * For testing and Advanced Help examples. * - * @return + * @return */ function charts_graphs_test($submodule = NULL, $type = 'bar', $title = 'The Title', $series = NULL, $labels = NULL) { if ($submodule === NULL) { @@ -137,7 +137,7 @@ function charts_graphs_test($submodule = NULL, $type = 'bar', $title = 'The Titl 'six', 'seven', 'eight', - 'nine' + 'nine', ); } else { @@ -188,16 +188,16 @@ function charts_graphs_apis($api_class = NULL) { /** * Factory method that allows instantiating of a charting implementation class * by implementation name. - * + * * @param $name - * @return + * @return */ function charts_graphs_get_graph($name) { $apis = charts_graphs_apis(); $api = $apis[$name]; if (!empty($api) && is_object($api)) { - require_once($api->path); + require_once DRUPAL_ROOT . '/' . $api->path; $canvas = new $api->clazz($api->modulename); return $canvas; } @@ -208,9 +208,9 @@ function charts_graphs_get_graph($name) { /** * Sequential generator of IDs, guaranteeing unique value per HTTP request. - * + * * @staticvar $id - * @return + * @return */ function charts_graphs_chart_id_generator() { static $id = 0; @@ -221,10 +221,10 @@ function charts_graphs_chart_id_generator() { } /** - * Random, unique string generator, to be used for cache_id in async data + * Random, unique string generator, to be used for cache_id in async data * retrieval. - * - * @return + * + * @return */ function charts_graphs_random_hash() { list($usec, $sec) = explode(' ', microtime()); diff --git a/charts_graphs_canvas.class.inc b/charts_graphs_canvas.class.inc index 9d81f5a..a628e06 100644 --- a/charts_graphs_canvas.class.inc +++ b/charts_graphs_canvas.class.inc @@ -17,6 +17,13 @@ abstract class ChartsGraphsCanvas { var $width; var $type; + //TODO comment these + var $y_min; + var $y_max; + var $y_step; + + + /** * Text presented next to the left Y axis. *