From 0d21538a1dd1aa0ed233685473d7acd8790d60a8 Mon Sep 17 00:00:00 2001 From: cdtank Date: Wed, 23 Mar 2011 17:13:45 +0000 Subject: [PATCH] 1. Improved language for the message to be displayed when it takes a long time to display temporal vis. 2. Fix for unreadable y-axis numbers for huge values. (see http://issues.library.cornell.edu/browse/NIHVIVO-2277) 3. Changed display text for last cached at date. --- .../images/visualization/refresh-16.png | Bin 0 -> 3062 bytes .../images/visualization/refresh-green.png | Bin 0 -> 566 bytes productMods/images/visualization/refresh.png | Bin 0 -> 588 bytes .../entitycomparison/gui-event-manager.js | 16 +++-- .../js/visualization/entitycomparison/util.js | 67 +++++++++++++----- 5 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 productMods/images/visualization/refresh-16.png create mode 100644 productMods/images/visualization/refresh-green.png create mode 100644 productMods/images/visualization/refresh.png diff --git a/productMods/images/visualization/refresh-16.png b/productMods/images/visualization/refresh-16.png new file mode 100644 index 0000000000000000000000000000000000000000..850bf01b00db1118cbec5e68f3be7f630f668c83 GIT binary patch literal 3062 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 0 && lastCachedAtDateTimes.length > 0) { $("#incomplete-data-disclaimer").attr( "title", - $("#incomplete-data-disclaimer").attr("title") + " as of " + parseXSDateTime(lastCachedAtDateTimes[0])); + $("#incomplete-data-disclaimer").attr("title") + " as of " + getReadableDateForLastCachedAtDate(parseXSDateTime(lastCachedAtDateTimes[0]))); } - } - } \ No newline at end of file diff --git a/productMods/js/visualization/entitycomparison/util.js b/productMods/js/visualization/entitycomparison/util.js index c504e801..9ff1662f 100644 --- a/productMods/js/visualization/entitycomparison/util.js +++ b/productMods/js/visualization/entitycomparison/util.js @@ -563,25 +563,53 @@ function setLineWidthAndTickSize(yearRange, flotOptions) { } -/** - * Dynamically change the ticksize of y-axis. - */ -function setTickSizeOfYAxis(maxValue, flotOptions){ +var TickSize = { + + maxValue: 0.0, - var tickSize = 0; + maxTicks: { + yAxis: 12.0 + }, - if (maxValue > 0 && maxValue <= 5) { - flotOptions.yaxis.tickSize = 1; - } else if (maxValue > 5 && maxValue <= 10) { - flotOptions.yaxis.tickSize = 2; - } else if (maxValue > 10 && maxValue <= 15) { - flotOptions.yaxis.tickSize = 5; - } else if (maxValue > 15 && maxValue <= 70) { - flotOptions.yaxis.tickSize = 5; - } else { - flotOptions.yaxis.tickSize = 10; - } -} + tickSizeUnits: { + yAxis: [1.0, 2.5, 5.0] + }, + + getApproximateTickSize: function(allowedMaxTicks) { + return Math.max(Math.ceil(parseFloat(this.maxValue) / allowedMaxTicks), 1.0); + }, + + getFinalTickSizeForYaxis: function(unitTickSizeGenerator) { + tickSizeMultiplier = 1.0; + finalTickSize = 1.0; + approximateTickSize = this.getApproximateTickSize(this.maxTicks.yAxis); + + while (true) { + if (approximateTickSize <= (unitTickSizeGenerator[0] * tickSizeMultiplier)) { + finalTickSize = unitTickSizeGenerator[0] * tickSizeMultiplier; + break; + } + if (approximateTickSize <= (unitTickSizeGenerator[1] * tickSizeMultiplier)) { + finalTickSize = unitTickSizeGenerator[1] * tickSizeMultiplier; + break; + } + if (approximateTickSize <= (unitTickSizeGenerator[2] * tickSizeMultiplier)) { + finalTickSize = unitTickSizeGenerator[2] * tickSizeMultiplier; + break; + } + tickSizeMultiplier *= 10.0; + } + + return finalTickSize; + }, + + getTickSize: function(value, onAxis) { + this.maxValue = value; + if (onAxis.trim().toLowerCase() === 'y') { + return this.getFinalTickSizeForYaxis(this.tickSizeUnits.yAxis); + } + } +}; /** * Create a div that represents the rectangular bar A hidden input class that is @@ -1186,5 +1214,8 @@ function setTickSizeOfAxes(){ var normalizedYearRange = getNormalizedYearRange(); setLineWidthAndTickSize(normalizedYearRange.normalizedRange, FlotOptions); - setTickSizeOfYAxis(calcMaxWithinComparisonParameter(checkedLabelToEntityRecord), FlotOptions); + + FlotOptions.yaxis.tickSize = + TickSize.getTickSize(calcMaxWithinComparisonParameter(checkedLabelToEntityRecord), 'y'); + } \ No newline at end of file