On going work on detaching of nodes/strands. Strands detachable now, not visibly...

diff --git a/root/js/relationship.js b/root/js/relationship.js
index 7298613..1be59af 100644 (file)
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -5,6 +5,12 @@ var start_element_height = 0;
 var reltypes = {};
 var readingdata = {};
 
+jQuery.removeFromArray = function(value, arr) {
+    return jQuery.grep(arr, function(elem, index) {
+        return elem !== value;
+    });
+};
+
 function arrayUnique(array) {
     var a = array.concat();
     for(var i=0; i<a.length; ++i) {
@@ -220,6 +226,7 @@ function svgEnlargementLoaded() {
         $.getJSON( rdgpath, function( data ) {
             readingdata = data;
             $('#svgenlargement ellipse').each( function( i, el ) { color_inactive( el ) });
+            detach_node(null);
         });
         $('#loading_overlay').hide(); 
     });
@@ -629,6 +636,84 @@ function draw_relation( source_id, target_id, relation_color ) {
     return relation_element;
 }
 
+function detach_node( readingsgohere ) {
+    var readings = { "n127_0": 
+        { 
+            "grammar_invalid": null,
+            "witnesses": ["Sg524"],
+            "normal_form": "Secundo ",
+            "is_nonsense": null,
+            "lexemes": [],
+            "variants": [],
+            "text": "Secundo",
+            "is_meta": null,
+            "orig_rdg": "n127"
+        }
+    }
+
+    // add new node(s)
+    $.extend( readingdata, readings );
+    // remove from existing readings the witnesses for the new nodes/readings
+    $.each( readings, function( node_id, reading ) {
+        $.each( reading.witnesses, function( index, witness ) {
+            var witnesses = readingdata[ reading.orig_rdg ].witnesses;
+            readingdata[ reading.orig_rdg ].witnesses = $.removeFromArray( witness, witnesses );
+        } );
+    } );    
+    
+    // Todo: .each is getting us in trouble most likely
+    // assuming one element in object readings for now
+    detached_edges = [];
+    $.each( readings, function( node_id, reading ) {
+        var edges = edges_of( get_ellipse( reading.orig_rdg ) );
+        incoming_remaining = [];
+        outgoing_remaining = [];
+        $.each( reading.witnesses, function( index, witness ) {
+            incoming_remaining.push( witness );
+            outgoing_remaining.push( witness );
+        } );
+        $.each( edges, function( index, edge ) {
+            detached_edge = edge.detach_witnesses( reading.witnesses );
+            if( detached_edge != null ) {
+                detached_edges.push( detached_edge );
+                $.each( detached_edge.witnesses, function( index, witness ) {
+                    if( detached_edge.is_incoming == true ) {
+                        incoming_remaining = $.removeFromArray( witness, incoming_remaining );
+                    } else {
+                        outgoing_remaining = $.removeFromArray( witness, outgoing_remaining );
+                    }
+                } );
+            }
+        } );
+        if( outgoing_remaining.length > 0 ) {
+            console.log( 'jo' );
+            $.each( edges, function( index, edge ) {
+                console.log( edge.get_label() );
+                if( edge.get_label() == 'majority' && !edge.is_incoming ) {
+                    detached_edges.push( edge.clone_for( outgoing_remaining ) );
+                }
+            } );
+        }
+        if( incoming_remaining.length > 0 ) {
+            console.log( 'je' );
+            $.each( edges, function( index, edge ) {
+                if( edge.get_label() == 'majority' && edge.is_incoming ) {
+                    detached_edges.push( edge.clone_for( outgoing_remaining ) );
+                }
+            } );
+        }
+        console.log( detached_edges );
+    } );
+            
+    //if not all witnesses of reading are detached in and out clone
+      // clone remaining from 'majority in'
+    //clone node with node_id
+    // in all clones replace reading.orig_rdg with node_id
+    // move cloned node up 20px
+    
+
+}
+
 function Marquee() {
     
     var self = this;

diff --git a/root/src/header.tt b/root/src/header.tt
index 9264603..1821de3 100644 (file)
--- a/root/src/header.tt
+++ b/root/src/header.tt
@@ -19,6 +19,7 @@
 [% IF applicationjs -%]
     <script type="text/javascript" src="[% applicationjs %]?v=[% vstr %]"></script>
 [% END -%]
+    <script type="text/javascript" src="[% c.uri_for('/js/detach_helpers.js') %]"></script>
     [% content %]
     <title>[% pagetitle %]</title>
   </head>