WordPress.org
Get WordPress

Plugin Directory

Changeset 723546


Ignore:
Timestamp:
06/06/2013 02:58:37 PM (13 years ago)
Author:
thmufl
Message:

Support for negative values in horizontal bar charts added. Secont shortcode set with prefix 'ipu-' added. Support for multi-series extensions added.

Location:
ipu-chart
Files:
8 added
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • ipu-chart/tags/0.7.1/ipu-chart.php

    r721286 r723546  
    55    Description: Creates D3/SVG based charts out of your csv, tsv or jason data. Currently supports bar, pie, donut, line, scatter, bubble and world map charts.
    66    Author: Thomas Müller Flury, ipublia
    7     Version: 0.7
     7    Version: 0.7.1
    88    Author URI: https://www.ipublia.com/author/thmufl/
    99    Text Domain: ipuchart
    … …  
    1111 */
    1212
     13// Plugin Folder Path
     14if (!defined('IPUC_PLUGIN_DIR'))
     15    define( 'IPUC_PLUGIN_DIR', WP_PLUGIN_DIR . '/' . basename(dirname( __FILE__ ) ) . '/');
     16   
    1317// Helper to display plugin version in console logs
    1418function plugin_get_version() {
    … …  
    105109add_shortcode("table", "ipuc_table_func");
    106110
     111// Second shortcode set for compability with some themes.
     112add_shortcode("ipu-csv", "ipuc_csv_func");
     113add_shortcode("ipu-tsv", "ipuc_tsv_func");
     114add_shortcode("ipu-json", "ipuc_tsv_func");
     115add_shortcode("ipu-chart", "ipuc_chart_func");
     116add_shortcode("ipu-table", "ipuc_table_func");
     117
    107118function ipuc_render_csv($id, $content) {
    108119    return "<div id='{$id}' class='csv' style='display:none;white-space:pre;'>{$content}</div>";
    … …  
    170181add_action('wp_enqueue_scripts', 'ipuc_add_custom_styles' );
    171182
     183// Add settings page (licenses etc.)
     184function ipuc_settings_menu() {
     185    add_menu_page('IPU-Chart Plugin Settings', 'IPU-Chart', 'administrator', __FILE__, 'ipuc_settings_page', plugins_url('img/ipuc-icon-16x16-bw.png', __FILE__));
     186}
     187add_action('admin_menu', 'ipuc_settings_menu');
    172188
    173 // Create custom plugin settings menu
    174 function ipuc_create_menu() {
    175     //create new top-level menu
    176     add_menu_page( 'IPU-Chart Plugin Settings', 'IPU-Chart', 'administrator', __FILE__, 'ipuc_settings_page', plugins_url('/img/ipuc-icon-16x16-framed.png', __FILE__));
    177     //call register settings function
    178     add_action('admin_init', 'register_ipuc_settings');
    179 }
    180 add_action('admin_menu', 'ipuc_create_menu');
     189require_once IPUC_PLUGIN_DIR . 'include/settings.php';
    181190
    182 function register_ipuc_settings() {
    183     //register our settings
    184     register_setting( 'ipuc-settings-group', 'new_option_name' );
    185     register_setting( 'ipuc-settings-group', 'some_other_option' );
    186     register_setting( 'ipuc-settings-group', 'option_etc' );
    187 }
    188 
    189 function ipuc_settings_page() {
    190191?>
    191     <div class="wrap">
    192         <h2><?php _e('IPU-Chart Settings'); ?></h2>
    193     </div>
    194 <?php
    195 } ?>

  • ipu-chart/tags/0.7.1/js/ipu-chart.js

    r721286 r723546  
    349349    else if(type.toLowerCase().trim() == "table")
    350350        renderTable(figure, data, category, value, debug);
    351        
    352     else if(type.toLowerCase().trim() == "line.multi")
    353         renderLineMulti(figure, data, category, value, format, color, sort, interpolate, animate, debug);
     351   
     352    else
     353        renderMultiSeriesExtension(type, figure, data, category, value, format, color, sort, interpolate, animate, debug);
    354354}
    355355
    … …  
    885885    var svg = figure.select("svg");
    886886   
    887     var margin = {top: 20, right: 30, bottom: 40, left: d3.max(data, function(d) { return 6*d[category].toString().length; })},
     887    var margin = {top: 20, right: 30, bottom: 40, left: d3.max(data, function(d) { return 8*d[category].toString().length; })},
    888888        width = parseInt(svg.attr("width")) - margin.left - margin.right,
    889889        height = parseInt(svg.attr("height")) - margin.top - margin.bottom;
    … …  
    906906       
    907907    y.domain(data.map(function(d) { return d[category]; }));
    908     x.domain([d3.max(data, function(d) { return d[value]; }), 0]);
     908   
     909    var min = d3.min(data, function(d) { return d[value]; });
     910    x.domain([d3.max(data, function(d) { return d[value]; }), d3.min([min, 0])]);
    909911       
    910912    var chart = svg.append("g")
    … …  
    940942        .enter().append("rect")
    941943            .attr("class", "bar")
    942             .attr("x", 0)
     944            .attr("x", function(d) { return d[value] > 0 ? x(0) : x(d[value]); })
    943945            .attr("y", function(d) { return y(d[category]); })
    944946            .attr("height", y.rangeBand())
    945             .attr("width", function(d) { return x(d[value]); })
     947            .attr("width", function(d) { return d[value] > 0 ? x(d[value]) - x(0) : x(0) - x(d[value]); })
    946948            .style("fill", function(d) { return color(d[category]); })
    947949            .style("opacity", defaultOpacity);

  • ipu-chart/tags/0.7.1/readme.txt

    r721286 r723546  
    44Requires at least: 3.0.1
    55Tested up to: 3.5.1
    6 Stable tag: 0.7
     6Stable tag: 0.7.1
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    180180* Minor layout changes (tooltip).
    181181
     182= 0.7.1 =
     183* Support for negative values in horizontal bar charts added.
     184* Second shortcode set with prefix 'ipu-' added.
     185* Support for multi-series extension added.
     186
    182187== Upgrade Notice ==
    183188
    … …  
    228233* Minor layout changes (tooltip).
    229234
    230 
     235= 0.7.1 =
     236This version adds support for negative values for horizontal bar charts. A second shortcode set with the prefix 'ipu-' was added for interoperability with some plugins and themes.
     237
     238

  • ipu-chart/trunk/ipu-chart.php

    r721286 r723546  
    55    Description: Creates D3/SVG based charts out of your csv, tsv or jason data. Currently supports bar, pie, donut, line, scatter, bubble and world map charts.
    66    Author: Thomas Müller Flury, ipublia
    7     Version: 0.7
     7    Version: 0.7.1
    88    Author URI: https://www.ipublia.com/author/thmufl/
    99    Text Domain: ipuchart
    … …  
    1111 */
    1212
     13// Plugin Folder Path
     14if (!defined('IPUC_PLUGIN_DIR'))
     15    define( 'IPUC_PLUGIN_DIR', WP_PLUGIN_DIR . '/' . basename(dirname( __FILE__ ) ) . '/');
     16   
    1317// Helper to display plugin version in console logs
    1418function plugin_get_version() {
    … …  
    105109add_shortcode("table", "ipuc_table_func");
    106110
     111// Second shortcode set for compability with some themes.
     112add_shortcode("ipu-csv", "ipuc_csv_func");
     113add_shortcode("ipu-tsv", "ipuc_tsv_func");
     114add_shortcode("ipu-json", "ipuc_tsv_func");
     115add_shortcode("ipu-chart", "ipuc_chart_func");
     116add_shortcode("ipu-table", "ipuc_table_func");
     117
    107118function ipuc_render_csv($id, $content) {
    108119    return "<div id='{$id}' class='csv' style='display:none;white-space:pre;'>{$content}</div>";
    … …  
    170181add_action('wp_enqueue_scripts', 'ipuc_add_custom_styles' );
    171182
     183// Add settings page (licenses etc.)
     184function ipuc_settings_menu() {
     185    add_menu_page('IPU-Chart Plugin Settings', 'IPU-Chart', 'administrator', __FILE__, 'ipuc_settings_page', plugins_url('img/ipuc-icon-16x16-bw.png', __FILE__));
     186}
     187add_action('admin_menu', 'ipuc_settings_menu');
    172188
    173 // Create custom plugin settings menu
    174 function ipuc_create_menu() {
    175     //create new top-level menu
    176     add_menu_page( 'IPU-Chart Plugin Settings', 'IPU-Chart', 'administrator', __FILE__, 'ipuc_settings_page', plugins_url('/img/ipuc-icon-16x16-framed.png', __FILE__));
    177     //call register settings function
    178     add_action('admin_init', 'register_ipuc_settings');
    179 }
    180 add_action('admin_menu', 'ipuc_create_menu');
     189require_once IPUC_PLUGIN_DIR . 'include/settings.php';
    181190
    182 function register_ipuc_settings() {
    183     //register our settings
    184     register_setting( 'ipuc-settings-group', 'new_option_name' );
    185     register_setting( 'ipuc-settings-group', 'some_other_option' );
    186     register_setting( 'ipuc-settings-group', 'option_etc' );
    187 }
    188 
    189 function ipuc_settings_page() {
    190191?>
    191     <div class="wrap">
    192         <h2><?php _e('IPU-Chart Settings'); ?></h2>
    193     </div>
    194 <?php
    195 } ?>

  • ipu-chart/trunk/js/ipu-chart.js

    r721286 r723546  
    349349    else if(type.toLowerCase().trim() == "table")
    350350        renderTable(figure, data, category, value, debug);
    351        
    352     else if(type.toLowerCase().trim() == "line.multi")
    353         renderLineMulti(figure, data, category, value, format, color, sort, interpolate, animate, debug);
     351   
     352    else
     353        renderMultiSeriesExtension(type, figure, data, category, value, format, color, sort, interpolate, animate, debug);
    354354}
    355355
    … …  
    885885    var svg = figure.select("svg");
    886886   
    887     var margin = {top: 20, right: 30, bottom: 40, left: d3.max(data, function(d) { return 6*d[category].toString().length; })},
     887    var margin = {top: 20, right: 30, bottom: 40, left: d3.max(data, function(d) { return 8*d[category].toString().length; })},
    888888        width = parseInt(svg.attr("width")) - margin.left - margin.right,
    889889        height = parseInt(svg.attr("height")) - margin.top - margin.bottom;
    … …  
    906906       
    907907    y.domain(data.map(function(d) { return d[category]; }));
    908     x.domain([d3.max(data, function(d) { return d[value]; }), 0]);
     908   
     909    var min = d3.min(data, function(d) { return d[value]; });
     910    x.domain([d3.max(data, function(d) { return d[value]; }), d3.min([min, 0])]);
    909911       
    910912    var chart = svg.append("g")
    … …  
    940942        .enter().append("rect")
    941943            .attr("class", "bar")
    942             .attr("x", 0)
     944            .attr("x", function(d) { return d[value] > 0 ? x(0) : x(d[value]); })
    943945            .attr("y", function(d) { return y(d[category]); })
    944946            .attr("height", y.rangeBand())
    945             .attr("width", function(d) { return x(d[value]); })
     947            .attr("width", function(d) { return d[value] > 0 ? x(d[value]) - x(0) : x(0) - x(d[value]); })
    946948            .style("fill", function(d) { return color(d[category]); })
    947949            .style("opacity", defaultOpacity);

  • ipu-chart/trunk/readme.txt

    r721286 r723546  
    44Requires at least: 3.0.1
    55Tested up to: 3.5.1
    6 Stable tag: 0.7
     6Stable tag: 0.7.1
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    180180* Minor layout changes (tooltip).
    181181
     182= 0.7.1 =
     183* Support for negative values in horizontal bar charts added.
     184* Second shortcode set with prefix 'ipu-' added.
     185* Support for multi-series extension added.
     186
    182187== Upgrade Notice ==
    183188
    … …  
    228233* Minor layout changes (tooltip).
    229234
    230 
     235= 0.7.1 =
     236This version adds support for negative values for horizontal bar charts. A second shortcode set with the prefix 'ipu-' was added for interoperability with some plugins and themes.
     237
     238
Note: See TracChangeset for help on using the changeset viewer.