From 7ceee9d9331f541a7a0db04e5e82ca0a1fbbba74 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Mon, 10 Dec 2012 10:26:30 +0000
Subject: [PATCH] BIS-229 SP-419 : Made display black & white
SVN: 27893
---
.../1/as/webapps/bottom-up/html/index.html | 4 ++--
.../1/as/webapps/bottom-up/html/webapp.js | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/deep_sequencing_unit/source/core-plugins/ngs-sample-overview-graph/1/as/webapps/bottom-up/html/index.html b/deep_sequencing_unit/source/core-plugins/ngs-sample-overview-graph/1/as/webapps/bottom-up/html/index.html
index 6319eb1672a..b2ed5ca81b7 100644
--- a/deep_sequencing_unit/source/core-plugins/ngs-sample-overview-graph/1/as/webapps/bottom-up/html/index.html
+++ b/deep_sequencing_unit/source/core-plugins/ngs-sample-overview-graph/1/as/webapps/bottom-up/html/index.html
@@ -12,6 +12,8 @@
<script src="assets/js/jquery.js"></script>
<script src="openbis.js"></script>
<script src="openbis-login.js"></script>
+ <script src="assets/js/d3/d3.js"></script>
+ <script src="assets/js/dagre/dagre.js"></script>
<script src="webapp.js"></script>
<script type="text/javascript">
// If this is being shown, we are logged in, so just enter the app.
@@ -82,8 +84,6 @@
<script src="assets/js/bootstrap-collapse.js"></script>
<script src="assets/js/bootstrap-carousel.js"></script>
<script src="assets/js/bootstrap-typeahead.js"></script>
- <script src="assets/js/d3/d3.js"></script>
- <script src="assets/js/dagre/dagre.js"></script>
</body>
</html>
diff --git a/deep_sequencing_unit/source/core-plugins/ngs-sample-overview-graph/1/as/webapps/bottom-up/html/webapp.js b/deep_sequencing_unit/source/core-plugins/ngs-sample-overview-graph/1/as/webapps/bottom-up/html/webapp.js
index 43f68a2cbd2..d1de30c844d 100644
--- a/deep_sequencing_unit/source/core-plugins/ngs-sample-overview-graph/1/as/webapps/bottom-up/html/webapp.js
+++ b/deep_sequencing_unit/source/core-plugins/ngs-sample-overview-graph/1/as/webapps/bottom-up/html/webapp.js
@@ -30,6 +30,10 @@ var LINE_HEIGHT = 20;
// N probably should not be less than 2 and certainly should not be less than 1.
var FIRST_COLLAPSED_COLUMN = 2;
+// The colors used for the different samples. The colors are used when one sample has multiple parents or children to disambiguate.
+//var sampleColors = d3.scale.category10();
+var sampleColors = d3.scale.ordinal().range(['#ccc']);
+
// END CONFIGURATION PARAMTERS
/// The openbisServer we use for our data
@@ -257,7 +261,7 @@ SampleGraphPresenter.prototype.useLineLinkPath = function(source, target) {
*/
SampleGraphPresenter.prototype.initializeGraphSamples = function()
{
- var colors = d3.scale.category10();
+ var colors = sampleColors;
var nodes = COLUMNS.map(function(c) { return model.samplesByType[c.type] });
// Compute the x/y coordinates for each sample
for (var col = 0; col < nodes.length; ++col) {
--
GitLab