From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Thu, 18 Jul 2013 03:39:06 +0000 (-0500)
Subject: Debugged merging of edges
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=759f18682e630024a3b3d30cc8cf1b0e7ebdfb43;p=scpubgit%2Fstemmaweb.git

Debugged merging of edges
---

diff --git a/root/images/no_entry.png b/root/images/no_entry.png
new file mode 100644
index 0000000..c8bdc54
Binary files /dev/null and b/root/images/no_entry.png differ
diff --git a/root/images/tick_circle_frame.png b/root/images/tick_circle_frame.png
new file mode 100644
index 0000000..7865f8d
Binary files /dev/null and b/root/images/tick_circle_frame.png differ
diff --git a/root/js/detach_helpers.js b/root/js/detach_helpers.js
index 640020e..f77a03e 100644
--- a/root/js/detach_helpers.js
+++ b/root/js/detach_helpers.js
@@ -1,13 +1,14 @@
 function edges_of( ellipse ) {
   var edges = new Array();
   var node_id = ellipse.parent().attr('id');
-  var edge_in_pattern = new RegExp( node_id + '$' );
+  var edge_outgoing_pattern = new RegExp( '^' + node_id + '-' );
+  var edge_incoming_pattern = new RegExp( node_id + '$' );
   $.each( $('#svgenlargement .edge'), function(index) {
       title = $(this).children('title').text();
-      if( title.search( node_id ) > -1 ) {
+      if( edge_outgoing_pattern.test(title) || edge_incoming_pattern.test(title) ) {
           var edge = new Edge( $(this) );
           edge.node_id = node_id;
-          if( edge_in_pattern.test(title) ) {
+          if( edge_incoming_pattern.test(title) ) {
               edge.is_incoming  = true;
           }
           edges.push( edge );
@@ -76,11 +77,10 @@ function Edge( g_elem ) {
     }
     
     this.attach_witnesses = function( witnesses ) {
-        self.witnesses.concat( witnesses );
+        self.witnesses = self.witnesses.concat( witnesses );
         self.g_elem.children( 'text' ).text( self.create_label( self.witnesses ) );
         var edge_weight = 0.8 + ( 0.2 * self.witnesses.length );
         self.g_elem.children( 'path' ).attr( 'stroke-width', edge_weight );
-        
     }
     
     this.attach_endpoint = function( target_node_id ) {
@@ -88,10 +88,12 @@ function Edge( g_elem ) {
         // in that case we need to remove this edge and transfer the witnesses to the 
         // appropriate edge of the target_node
         $.each( edges_of( get_ellipse( target_node_id ) ), function( index, target_edge ) {
-            if( (self != null) && (self.start_node_id == target_edge.start_node_id) ) {
-                target_edge.attach_witnesses( self.witnesses );
-                self.g_elem.remove();
-                self = null;
+            if( (self != null) && (target_edge.is_incoming == true) ) {
+                if( self.start_node_id == target_edge.start_node_id) {
+                    target_edge.attach_witnesses( self.witnesses );
+                    self.g_elem.remove();
+                    self = null;
+                }
             }
         } );
         // if not let's really move the end pointer towards the target node
@@ -102,13 +104,13 @@ function Edge( g_elem ) {
                 var path_segments = self.g_elem.children('path')[0].pathSegList;
                 var edge_path = new svgpath( path_segments.getItem(path_segments.numberOfItems - 1), self.g_elem.children('path') );
                 var target_ellipse = get_ellipse( target_node_id );
-                var target_cx = target_ellipse.attr( 'cx' );
-                var target_cy = target_ellipse.attr( 'cy' );
-                var target_rx = target_ellipse.attr( 'rx' );
+                var target_cx = parseFloat( target_ellipse.attr( 'cx' ) );
+                var target_cy = parseFloat( target_ellipse.attr( 'cy' ) );
+                var target_rx = parseFloat( target_ellipse.attr( 'rx' ) );
                 var source_ellipse = get_ellipse( self.end_node_id );
-                var source_cx = source_ellipse.attr( 'cx' );
-                var source_cy = source_ellipse.attr( 'cy' );
-                var source_rx = source_ellipse.attr( 'rx' );
+                var source_cx = parseFloat( source_ellipse.attr( 'cx' ) );
+                var source_cy = parseFloat( source_ellipse.attr( 'cy' ) );
+                var source_rx = parseFloat( source_ellipse.attr( 'rx' ) );
                 var dx = (target_cx - target_rx) - (source_cx - source_rx);
                 var dy = (target_cy - source_cy);
                 end_point_arrowhead.reposition( dx, dy );
@@ -122,24 +124,26 @@ function Edge( g_elem ) {
         // in that case we need to remove this edge and transfer the witnesses to the 
         // appropriate edge of the target_node
         $.each( edges_of( get_ellipse( target_node_id ) ), function( index, target_edge ) {
-            if( (self != null) && (self.end_node_id == target_edge.end_node_id) ) {
-                target_edge.attach_witnesses( self.witnesses );
-                self.g_elem.remove();
-                self = null;
+            if( (self != null) && (target_edge.is_incoming != true ) ) {
+                if( self.end_node_id == target_edge.end_node_id) {
+                    target_edge.attach_witnesses( self.witnesses );
+                    self.g_elem.remove();
+                    self = null;
+                }
             }
         } );
-        // if not let's really move the end pointer towards the target node
+        // if not let's really move the start point towards the target node
         if( self != null ) {
             var path_segments = self.g_elem.children('path')[0].pathSegList;                
             var edge_path = new svgpath( path_segments.getItem(0), self.g_elem.children('path') );
             var target_ellipse = get_ellipse( target_node_id );
-            var target_cx = target_ellipse.attr( 'cx' );
-            var target_cy = target_ellipse.attr( 'cy' );
-            var target_rx = target_ellipse.attr( 'rx' );
+            var target_cx = parseFloat( target_ellipse.attr( 'cx' ) );
+            var target_cy = parseFloat( target_ellipse.attr( 'cy' ) );
+            var target_rx = parseFloat( target_ellipse.attr( 'rx' ) );
             var source_ellipse = get_ellipse( self.start_node_id );
-            var source_cx = source_ellipse.attr( 'cx' );
-            var source_cy = source_ellipse.attr( 'cy' );
-            var source_rx = source_ellipse.attr( 'rx' );
+            var source_cx = parseFloat( source_ellipse.attr( 'cx' ) );
+            var source_cy = parseFloat( source_ellipse.attr( 'cy' ) );
+            var source_rx = parseFloat( source_ellipse.attr( 'rx' ) );
             var dx = (target_cx + target_rx) - (source_cx + source_rx);
             var dy = (target_cy - source_cy);
             edge_path.reposition( dx, dy );
diff --git a/root/js/relationship.js b/root/js/relationship.js
index a056ee7..d0f307e 100644
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -796,6 +796,10 @@ function merge_nodes( source_node_id, target_node_id, consequences ) {
                     merge_node( node_ids[0], node_ids[1] );
                     temp_relation.remove();
                     $( '#' + merge_id ).parent().remove();
+                    //notify backend
+                    var ncpath = getTextURL( 'merge' );
+                    var form_values = "source_id=" + source_node_id + "&target_id=" + target_node_id + "&single=true";
+                    $.post( ncpath, form_values );
                 } );
                 $( '#no' + merge_id ).click( function( evt ) {
                     temp_relation.remove();