Skip to content

Commit

Permalink
tuning the charts
Browse files Browse the repository at this point in the history
  • Loading branch information
oetiker committed Oct 31, 2014
1 parent e4e2e76 commit e93c720
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 36 deletions.
20 changes: 10 additions & 10 deletions software/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for extopus 0.4.0.
# Generated by GNU Autoconf 2.69 for extopus 0.5.0.
#
# Report bugs to <support@oetiker.ch>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='extopus'
PACKAGE_TARNAME='extopus'
PACKAGE_VERSION='0.4.0'
PACKAGE_STRING='extopus 0.4.0'
PACKAGE_VERSION='0.5.0'
PACKAGE_STRING='extopus 0.5.0'
PACKAGE_BUGREPORT='support@oetiker.ch'
PACKAGE_URL=''

Expand Down Expand Up @@ -1220,7 +1220,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures extopus 0.4.0 to adapt to many kinds of systems.
\`configure' configures extopus 0.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1286,7 +1286,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of extopus 0.4.0:";;
short | recursive ) echo "Configuration of extopus 0.5.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1379,7 +1379,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
extopus configure 0.4.0
extopus configure 0.5.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand All @@ -1396,7 +1396,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by extopus $as_me 0.4.0, which was
It was created by extopus $as_me 0.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2263,7 +2263,7 @@ fi
# Define the identity of the package.
PACKAGE='extopus'
VERSION='0.4.0'
VERSION='0.5.0'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -3381,7 +3381,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by extopus $as_me 0.4.0, which was
This file was extended by extopus $as_me 0.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -3434,7 +3434,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
extopus config.status 0.4.0
extopus config.status 0.5.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
29 changes: 3 additions & 26 deletions software/frontend/source/class/ep/visualizer/chart/BrowserChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ qx.Class.define("ep.visualizer.chart.BrowserChart", {
'stroke': '#000',
'stroke-opacity': '.2',
'stroke-dasharray': '1,1'
},
'.y.axis.minor line': {
'stroke': '#888'
}
},
MARGIN: {
Expand Down Expand Up @@ -249,17 +246,7 @@ qx.Class.define("ep.visualizer.chart.BrowserChart", {

return this.__yAxisPainter;
},
getYAxisMinorPainter: function(){
if (this.__yAxisMinorPainter) return this.__yAxisMinorPainter;
var d3 = this.__d3;
this.__yAxisMinorPainter = d3.svg.axis()
.scale(this.getYScale())
.orient("left")
.tickFormat("");

return this.__yAxisMinorPainter;
},


getXScale: function(){
if (this.__xScale) return this.__xScale;
this.__xScale = this.__d3.time.scale();
Expand Down Expand Up @@ -336,13 +323,6 @@ qx.Class.define("ep.visualizer.chart.BrowserChart", {
return this.__yAxisNode;
},

getYAxisMinorNode: function(){
if (this.__yAxisMinorNode) return this.__yAxisMinorNode;
this.__yAxisMinorNode = this.__chart.append("g")
.attr("class", "y axis minor");
return this.__yAxisMinorNode;
},

getClipPath: function(){
if (this.__clipPath) return this.__clipPath;
ID++;
Expand Down Expand Up @@ -449,10 +429,6 @@ qx.Class.define("ep.visualizer.chart.BrowserChart", {
.tickSize(width)
.ticks(Math.round(height/50));

this.getYAxisMinorPainter()
.tickSize(-width)
.ticks(Math.round(height/25));

this.getXAxisPainter().tickSize(-height,0);

for (var i=0;i<this.getChartDef().length;i++){
Expand Down Expand Up @@ -496,7 +472,7 @@ qx.Class.define("ep.visualizer.chart.BrowserChart", {
this.getYScale().domain([0,maxValue]).nice();

this.getYAxisNode().call(this.getYAxisPainter());
this.getYAxisMinorNode().call(this.getYAxisMinorPainter());

for(var i=0;i<this.getChartDef().length;i++){
var node = this.getDataNode(i);
if (node.data()[0]){
Expand All @@ -505,6 +481,7 @@ qx.Class.define("ep.visualizer.chart.BrowserChart", {
}
}
},

redraw: function(){
var dates = this.getXScale().domain();
var start = Math.round(dates[0].getTime()/1000);
Expand Down

0 comments on commit e93c720

Please sign in to comment.