Skip to content

Commit

Permalink
Merge pull request #81 from VisBOL/revert-79-limit-with-omitted
Browse files Browse the repository at this point in the history
Revert "Limit with omitted"
  • Loading branch information
cjmyers authored Jul 13, 2018
2 parents 17842fe + 482df94 commit 4b7f5ac
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 293 deletions.
20 changes: 7 additions & 13 deletions browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ var genbank = require('./lib/genbank')

var getDisplayList = require('./lib/getDisplayList')

const maxGlyphsLimit = 30;

var design = new Design({
element: document.getElementById('design'),
Expand Down Expand Up @@ -229,20 +228,10 @@ var editors = [
}

sbol.componentDefinitions.forEach(function(componentDefinition) {
console.log(getDisplayList(componentDefinition))
component.segments = component.segments.concat(getDisplayList(componentDefinition,null,null,maxGlyphsLimit).components[0].segments[0])

component.segments = component.segments.concat(getDisplayList(componentDefinition).components[0].segments[0])
})

var segment = component.segments;
segment.forEach(function(segments){
var sequences = segments.sequence;
if (sequences.length > maxGlyphsLimit) {
sequences[maxGlyphsLimit].type = "omitted";
sequences[maxGlyphsLimit].name = "Omitted";
}

});

callback({
version: 1,
components: [
Expand Down Expand Up @@ -367,3 +356,8 @@ var splitter = $("#split").splitter({
outline: true,
resizeTo: window
});





81 changes: 40 additions & 41 deletions font/sbolv/main.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,43 @@

module.exports = {
'aptamer': require('./aptamer'),
'assembly-scar': require('./assembly-scar'),
'non-coding-rna-gene': require('./non-coding-rna-gene'),
'signature': require('./signature'),
'sticky-restriction-site-5': require('./sticky-restriction-site-5'),
'primer-binding-site': require('./primer-binding-site'),
'overhang-site-5': require('./overhang-site-5'),
'overhang-site-3': require('./overhang-site-3'),
'biopolymer-junction': require('./biopolymer-junction'),
'biopolymer-base': require('./biopolymer-base'),
'biopolymer-amino-acid': require('./biopolymer-amino-acid'),
'blunt-restriction-site': require('./blunt-restriction-site'),
'cds': require('./cds'),
'engineered-region': require('./engineered-region'),
'helix': require('./helix'),
'insulator': require('./insulator'),
'mature-transcript-region': require('./mature-transcript-region'),
'omitted': require('./omitted'),
'operator': require('./operator'),
'origin-of-replication': require('./origin-of-replication'),
'origin-of-transfer': require('./origin-of-transfer'),
'poly-a': require('./poly-a'),
'promoter': require('./promoter'),
'protease-site': require('./protease-site'),
'protein-stability': require('./protein-stability'),
'protein-domain': require('./protein-domain'),
'recombination-site': require('./recombination-site'),
'res': require('./res'),
'restriction-site': require('./restriction-site'),
'ribonuclease-site': require('./ribonuclease-site'),
'rna-stability': require('./rna-stability'),
'stem-loop': require('./stem-loop'),
'tag': require('./tag'),
'terminator': require('./terminator'),
'no-glyph-assigned': require('./no-glyph-assigned'),
'unspecified': require('./unspecified'),
'protein': require('./protein'),
'molecule': require('./small-molecule-circle'),
'rna': require('./rna'),
'dna': require('./dna'),
'complex': require('./complex'),
'aptamer': require('./aptamer'),
'assembly-scar': require('./assembly-scar'),
'non-coding-rna-gene': require('./non-coding-rna-gene'),
'signature': require('./signature'),
'sticky-restriction-site-5': require('./sticky-restriction-site-5'),
'primer-binding-site': require('./primer-binding-site'),
'overhang-site-5': require('./overhang-site-5'),
'overhang-site-3': require('./overhang-site-3'),
'biopolymer-junction': require('./biopolymer-junction'),
'biopolymer-base': require('./biopolymer-base'),
'biopolymer-amino-acid': require('./biopolymer-amino-acid'),
'blunt-restriction-site': require('./blunt-restriction-site'),
'cds': require('./cds'),
'engineered-region': require('./engineered-region'),
'helix': require('./helix'),
'insulator': require('./insulator'),
'mature-transcript-region': require('./mature-transcript-region'),
'operator': require('./operator'),
'origin-of-replication': require('./origin-of-replication'),
'origin-of-transfer': require('./origin-of-transfer'),
'poly-a': require('./poly-a'),
'promoter': require('./promoter'),
'protease-site': require('./protease-site'),
'protein-stability': require('./protein-stability'),
'protein-domain': require('./protein-domain'),
'recombination-site': require('./recombination-site'),
'res': require('./res'),
'restriction-site': require('./restriction-site'),
'ribonuclease-site': require('./ribonuclease-site'),
'rna-stability': require('./rna-stability'),
'stem-loop': require('./stem-loop'),
'tag': require('./tag'),
'terminator': require('./terminator'),
'no-glyph-assigned': require('./no-glyph-assigned'),
'unspecified': require('./unspecified'),
'protein': require('./protein'),
'molecule': require('./small-molecule-circle'),
'rna': require('./rna'),
'dna': require('./dna'),
'complex': require('./complex'),
}
221 changes: 0 additions & 221 deletions font/sbolv/omitted.js

This file was deleted.

Loading

0 comments on commit 4b7f5ac

Please sign in to comment.