From 95cf091f7256ca92419aa55907374e35c8622ed1 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 15 Sep 2015 02:31:05 -0400
Subject: [PATCH] display and save seq to file
---
css/main.css | 10 ++++++++
js/cells/supercells/GIKSuperCell.js | 1 +
js/dnaExport/dnaExport.js | 9 +++++---
js/menus/templates/DNAExportMenuView.html | 28 ++++++++++++++++-------
4 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/css/main.css b/css/main.css
index 87c0c8c3..23e34fdf 100644
--- a/css/main.css
+++ b/css/main.css
@@ -508,4 +508,14 @@ label {
display: inline-block;
text-overflow: ellipsis;
position: absolute;
+}
+
+.sequenceOutput {
+ background-color: white;
+ overflow: auto;
+ max-height: 200px;
+ margin: 10px 10px;
+ padding: 5px 10px 20px 10px;
+ font-size: 14px;
+ font-family: Courier, monospace;
}
\ No newline at end of file
diff --git a/js/cells/supercells/GIKSuperCell.js b/js/cells/supercells/GIKSuperCell.js
index b74c137c..68e35c3a 100644
--- a/js/cells/supercells/GIKSuperCell.js
+++ b/js/cells/supercells/GIKSuperCell.js
@@ -99,6 +99,7 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'superCell',
if (i==0) seq = seq.split('').reverse().join('');
sequence += seq;
}
+ if (sequence == "-") return "";
return sequence;
};
diff --git a/js/dnaExport/dnaExport.js b/js/dnaExport/dnaExport.js
index fd5dbfd1..aed6a7dc 100644
--- a/js/dnaExport/dnaExport.js
+++ b/js/dnaExport/dnaExport.js
@@ -30,9 +30,12 @@ define(['underscore', 'backbone', 'lattice', 'appState', 'fileSaver'],
var sequences16 = [];
lattice.loopCells(function(cell, x, y, z){
if (!cell) return;
- if (cell.getLength() == 2) sequences32.push(cell.getSequence());
- else if (cell.getLength() == 1) sequences16.push(cell.getSequence());
- else console.warn("unexpected cell of length " + cell.getLength());
+ var seq = cell.getSequence();
+ if (seq && seq != ""){
+ if (cell.getLength() == 2) sequences32.push(seq);
+ else if (cell.getLength() == 1) sequences16.push(seq);
+ else console.warn("unexpected cell of length " + cell.getLength());
+ }
});
this.set("sequence32", sequences32);
this.set("sequence16", sequences16);
diff --git a/js/menus/templates/DNAExportMenuView.html b/js/menus/templates/DNAExportMenuView.html
index fc06e735..eca84975 100644
--- a/js/menus/templates/DNAExportMenuView.html
+++ b/js/menus/templates/DNAExportMenuView.html
@@ -1,9 +1,21 @@
-32bp sequences:<br/>
-<% _.each(sequence32, function(seq){ %>
- <%= seq %><br/>
-<% }); %><br/>
-16bp sequences:<br/>
-<% _.each(sequence16, function(seq){ %>
- <%= seq %><br/>
-<% }); %><br/>
+<% if(sequence32.length > 0){ %>
+ 32bp sequences:<br/>
+ <div class="sequenceOutput">
+ <% _.each(sequence32, function(seq){ %>
+ <%= seq %><br/>
+ <% }); %>
+ </div>
+<% } else { %>
+ no 32bp sequences<br/><br/>
+<% } %>
+<% if(sequence16.length > 0){ %>
+ 16bp sequences:<br/>
+ <div class="sequenceOutput">
+ <% _.each(sequence16, function(seq){ %>
+ <%= seq %><br/>
+ <% }); %>
+ </div>
+<% } else { %>
+ no 16bp sequences<br/>
+<% } %><br/>
<a href="#" id="saveSequences" class="btn btn-block btn-lg btn-success">Save to File</a><br/>
--
GitLab