Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
marcus-lodspeakr
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
uib-ub
Spesialsamlingene
marcus-lodspeakr
Commits
e6412a26
Commit
e6412a26
authored
12 years ago
by
alvaro
Browse files
Options
Downloads
Patches
Plain Diff
added prefixes in line chart
parent
aa83f8be
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php
+4
-0
4 additions, 0 deletions
lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php
lib/Haanga/lib/Haanga/Extension/Filter/D3stackedcolumnchart.php
+2
-1
2 additions, 1 deletion
...anga/lib/Haanga/Extension/Filter/D3stackedcolumnchart.php
with
6 additions
and
1 deletion
lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php
+
4
−
0
View file @
e6412a26
...
...
@@ -111,6 +111,10 @@ class Haanga_Extension_Filter_D3LineChart{
$pre
=
"<div id='"
.
$divId
.
"'></div>
<script src='http://d3js.org/d3.v2.min.js?2.9.3'></script>
<script type='text/javascript'>
//Adding namespaces
d3.ns.prefix['vsr'] = 'http://purl.org/twc/vocab/vsr#';
d3.ns.prefix['rdf'] = 'http://www.w3.org/2000/01/rdf-schema#';
var options_
$divId
= "
.
json_encode
(
$options
)
.
";
var dataset_
$divId
= "
.
json_encode
(
$data
)
.
";
var color = d3.scale.category10();
...
...
This diff is collapsed.
Click to expand it.
lib/Haanga/lib/Haanga/Extension/Filter/D3stackedcolumnchart.php
+
2
−
1
View file @
e6412a26
...
...
@@ -240,7 +240,7 @@ tooltip_$divId = svg.append('text').style('opacity', 0).style('font-family', 'sa
//Events
d3.selectAll('rect.bar')
.on('mouseover', function(e){
newX = parseFloat(d3.select(this).attr('x')) + 0*parseFloat(d3.select(this).attr('width')
);
console.log('asd'
);
newY = parseFloat(d3.select(this).attr('y'));
if(newY > maxHeight_
$divId
){
newY -=10;
...
...
@@ -248,6 +248,7 @@ d3.selectAll('rect.bar')
if(newY < 10){
newY +=11;
}
console.log('asd');
tooltip_
$divId
.style('opacity', 1).attr('y', newY).attr('x', newX).text(e.values);
d3.select(this).style('opacity', 1);
}).on('mouseout', function(){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment