diff --git a/css/main.css b/css/main.css index 87c0c8c31f145f486613e5ec374c31ab0c316550..23e34fdffa02f48f4a7a34b6a9b69461ee1407c2 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 b74c137cc48b1447b9687a4272b4a4216b6717c0..68e35c3a36172248b5039f4c4bf2ec6ed8193584 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 fd5dbfd1a815726e0c58c8638f75de1a314c2dd7..aed6a7dc88272875d115570c1ae99ccfd5326746 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 fc06e73547875546725829f777d096d9287032b3..eca849755b48ec224c5879033542df191cf3bdcd 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/>