addLabels can take a starting number

ViennaRNA · Apr 14, 2015 · 7213f33 · 7213f33
1 parent 737dbf4
commit 7213f33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/fornaf.js b/src/fornaf.js
@@ -99,7 +99,7 @@ function FornaContainer(element, passedOptions) {
 
         rnaJson = rnaJson.elementsToJson()
         .addPositions("nucleotide", options.positions)
-        .addLabels(options.labelInterval)
+        .addLabels(1, options.labelInterval)
         .reinforceStems()
         .reinforceLoops()
         .connectFakeNodes()
@@ -837,7 +837,7 @@ function FornaContainer(element, passedOptions) {
         .addPseudoknots()
         .addPositions('nucleotide', nucleotide_positions)
         .addUids(uids)
-        .addLabels(self.options.labelInterval)
+        .addLabels(1, self.options.labelInterval)
         .addPositions('label', label_positions)
         .reinforceStems()
         .reinforceLoops()

diff --git a/src/rnagraph.js b/src/rnagraph.js
@@ -647,9 +647,14 @@ function RNAGraph(seq, dotbracket, struct_name) {
         return elements.concat(self.pt_to_elements(pt, level, i, j));
     };
 
-    self.addLabels = function(labelInterval) {
-        if (arguments.length  === 0)
+    self.addLabels = function(startNumber, labelInterval) {
+        if (arguments.length  === 0) {
+            startNumber = 1;
             labelInterval = 10;
+        }
+
+        if (arguments.length === 1) 
+            startNumber = labelInterval = 10;
 
         if (labelInterval === 0)
             return self;
@@ -710,7 +715,7 @@ function RNAGraph(seq, dotbracket, struct_name) {
                 newX = self.nodes[i-1].x + offsetVec[0];
                 newY = self.nodes[i-1].y + offsetVec[1];
 
-                new_node = {'name': i,
+                new_node = {'name': i + startNumber - 1,
                                  'num': -1,
                                  'radius': 6,
                                  'rna': self,