Dan Bolser has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64536
Change subject: simplifying scale calculation
......................................................................
simplifying scale calculation
Change-Id: If168245a37227feac667cac7b424c05420653cdc
---
M specials/SD_BrowseData.php
1 file changed, 2 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticDrilldown
refs/changes/36/64536/1
diff --git a/specials/SD_BrowseData.php b/specials/SD_BrowseData.php
index 0ceac38..8b502fe 100644
--- a/specials/SD_BrowseData.php
+++ b/specials/SD_BrowseData.php
@@ -595,9 +595,7 @@
if ( $sdgFiltersSmallestFontSize > 0 &&
$sdgFiltersLargestFontSize > 0 ) {
$lowest_num_results = min( $filter_values );
$highest_num_results = max( $filter_values );
- $num_results_midpoint = ( $lowest_num_results +
$highest_num_results ) / 2;
- $font_size_midpoint = ( $sdgFiltersSmallestFontSize +
$sdgFiltersLargestFontSize ) / 2;
- $num_results_per_font_pixel = ( $highest_num_results +
1 - $lowest_num_results ) / ( $sdgFiltersLargestFontSize + 1 -
$sdgFiltersSmallestFontSize );
+ $scale_factor = ( $sdgFiltersLargestFontSize -
$sdgFiltersSmallestFontSize ) / ( $highest_num_results - $lowest_num_results );
}
// now print the values
$num_printed_values = 0;
@@ -607,7 +605,7 @@
$filter_text .= " ($num_results)";
$filter_url = $cur_url . urlencode( str_replace( ' ',
'_', $f->name ) ) . '=' . urlencode( str_replace( ' ', '_', $value_str ) );
if ( $sdgFiltersSmallestFontSize > 0 &&
$sdgFiltersLargestFontSize > 0 ) {
- $font_size = round( $font_size_midpoint + ( (
$num_results - $num_results_midpoint ) / $num_results_per_font_pixel ) );
+ $font_size = round( (($num_results -
$lowest_num_results) * $scale_factor ) + $sdgFiltersSmallestFontSize );
$results_line .= "\n
" . '<a href="' . $filter_url . '" title="' . wfMsg(
'sd_browsedata_filterbyvalue' ) . '" style="font-size: ' . $font_size . 'px">'
. $filter_text . '</a>';
} else {
$results_line .= "\n
" . '<a href="' . $filter_url . '" title="' . wfMsg(
'sd_browsedata_filterbyvalue' ) . '">' . $filter_text . '</a>';
--
To view, visit https://gerrit.wikimedia.org/r/64536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If168245a37227feac667cac7b424c05420653cdc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticDrilldown
Gerrit-Branch: master
Gerrit-Owner: Dan Bolser <dan.bol...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
