X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship.js;h=9a4a1690cb6e17ee63539ade0012aeea39a893b4;hb=89aae3eec7a0e23f314597cd09bd3ffc696c7412;hp=0e253d8ff1132dbc05e04f31ab7213667f07a815;hpb=e4bdf6606498d358c80e45b8cee69250b3bee6d3;p=scpubgit%2Fstemmaweb.git

diff --git a/root/js/relationship.js b/root/js/relationship.js
index 0e253d8..9a4a169 100644
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -4,6 +4,7 @@ var svg_root_element = null;
 var start_element_height = 0;
 var reltypes = {};
 var readingdata = {};
+var text_direction = 'LR';
 
 jQuery.removeFromArray = function(value, arr) {
     return jQuery.grep(arr, function(elem, index) {
@@ -224,7 +225,10 @@ function svgEnlargementLoaded() {
     
     //initialize marquee
     marquee = new Marquee();
-    
+
+	if (text_direction == 'RL') {
+		scrollToEnd();
+	}
 }
 
 function add_relations( callback_fn ) {
@@ -247,8 +251,9 @@ function add_relations( callback_fn ) {
 			var type_index = $.inArray(rel_info.type, rel_types);
 			var source_found = get_ellipse( rel_info.source_id );
 			var target_found = get_ellipse( rel_info.target_id );
+			var emphasis = rel_info.is_significant;
 			if( type_index != -1 && source_found.size() && target_found.size() ) {
-				var relation = relation_manager.create( rel_info.source_id, rel_info.target_id, type_index );
+				var relation = relation_manager.create( rel_info.source_id, rel_info.target_id, type_index, emphasis );
 				// Save the relationship data too.
 				$.each( rel_info, function( k, v ) {
 					relation.data( k, v );
@@ -559,10 +564,10 @@ function relation_factory() {
             temporary = null; 
         }
     }
-    this.create = function( source_node_id, target_node_id, color_index ) {
+    this.create = function( source_node_id, target_node_id, color_index, emphasis ) {
         //TODO: Protect from (color_)index out of bound..
         var relation_color = self.relation_colors[ color_index ];
-        var relation = draw_relation( source_node_id, target_node_id, relation_color );
+        var relation = draw_relation( source_node_id, target_node_id, relation_color, emphasis );
         get_node_obj( source_node_id ).update_elements();
         get_node_obj( target_node_id ).update_elements();
         return relation;
@@ -660,7 +665,7 @@ function get_related_nodes( relation_id ) {
 	return srctotarg.split('-...-');
 }
 
-function draw_relation( source_id, target_id, relation_color ) {
+function draw_relation( source_id, target_id, relation_color, emphasis ) {
     var source_ellipse = get_ellipse( source_id );
     var target_ellipse = get_ellipse( target_id );
     var relation_id = get_relation_id( source_id, target_id );
@@ -673,7 +678,8 @@ function draw_relation( source_id, target_id, relation_color ) {
     var ey = parseInt( target_ellipse.attr('cy') );
     var relation = svg.group( $("#svgenlargement svg g"), { 'class':'relation', 'id':relation_id } );
     svg.title( relation, source_id + '->' + target_id );
-    svg.path( relation, path.move( sx, sy ).curveC( sx + (2*rx), sy, ex + (2*rx), ey, ex, ey ), {fill: 'none', stroke: relation_color, strokeWidth: 4});
+    var stroke_width = emphasis === "yes" ? 6 : emphasis === "maybe" ? 4 : 2;
+    svg.path( relation, path.move( sx, sy ).curveC( sx + (2*rx), sy, ex + (2*rx), ey, ex, ey ), {fill: 'none', stroke: relation_color, strokeWidth: stroke_width });
     var relation_element = $('#svgenlargement .relation').filter( ':last' );
     relation_element.insertBefore( $('#svgenlargement g g').filter(':first') );
     return relation_element;
@@ -816,22 +822,22 @@ function merge_nodes( source_node_id, target_node_id, consequences ) {
                 parent_g = svg.group( $('#svgenlargement svg g') );
                 var ids_text = node_ids[0] + '-' + node_ids[1]; 
                 var merge_id = 'merge-' + ids_text;
-                svg.image( parent_g, xC, (yC-8), 16, 16, merge_button_yes, { id: merge_id } );
-                svg.image( parent_g, (xC+20), (yC-8), 16, 16, merge_button_no, { id: 'no' + merge_id } );
-                $( '#' + merge_id ).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
-                $( '#no' + merge_id ).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
-                $( '#' + merge_id ).click( function( evt ){ 
+                var yes = svg.image( parent_g, xC, (yC-8), 16, 16, merge_button_yes, { id: merge_id } );
+                var no = svg.image( parent_g, (xC+20), (yC-8), 16, 16, merge_button_no, { id: 'no' + merge_id } );
+                $(yes).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
+                $(no).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
+                $(yes).click( function( evt ){ 
                     merge_node( node_ids[0], node_ids[1] );
                     temp_relation.remove();
-                    $( '#' + merge_id ).parent().remove();
+                    $(evt.target).parent().remove();
                     //notify backend
                     var ncpath = getTextURL( 'merge' );
                     var form_values = "source_id=" + node_ids[0] + "&target_id=" + node_ids[1] + "&single=true";
                     $.post( ncpath, form_values );
                 } );
-                $( '#no' + merge_id ).click( function( evt ) {
+                $(no).click( function( evt ) {
                     temp_relation.remove();
-                    $( '#' + merge_id ).parent().remove();
+                    $(evt.target).parent().remove();
                 } );
             } );
         }
@@ -979,6 +985,21 @@ function readings_equivalent( source, target ) {
 	return false;
 }
 
+function scrollToEnd() {
+	var stateTf = svg_root_element.getCTM().inverse();
+
+	var vbdim = svg_root.viewBox.baseVal;
+	var width = Math.floor(svg_root_element.getBoundingClientRect().width) - vbdim.width;
+
+	var p = svg_root.createSVGPoint();
+	p.x = width;
+	p.y = 0;
+	p = p.matrixTransform(stateTf);
+
+	var matrix = stateTf.inverse().translate(-p.x, -100);
+	var s = "matrix(" + matrix.a + "," + matrix.b + "," + matrix.c + "," + matrix.d + "," + matrix.e + "," + matrix.f + ")";
+	svg_root_element.setAttribute("transform", s);
+}
 
 $(document).ready(function () {
     
@@ -1059,22 +1080,24 @@ $(document).ready(function () {
 	$( '#dialog-form' ).dialog( {
 	autoOpen: false,
 	height: 350,
-	width: 330,
+	width: 340,
 	modal: true,
 	buttons: {
 	  'Merge readings': function( evt ) {
-		  $( evt.target ).button( 'disable' );
+	  	  var mybuttons = $(evt.target).closest('button').parent().find('button');
+		  mybuttons.button( 'disable' );
 		  $( '#status' ).empty();
 		  form_values = $( '#collapse_node_form' ).serialize();
 		  ncpath = getTextURL( 'merge' );
 		  var jqjson = $.post( ncpath, form_values, function( data ) {
 			  merge_nodes( $( '#source_node_id' ).val(), $( '#target_node_id' ).val(), data );
-			  $(evt.target).button( 'enable' );
+			  mybuttons.button( 'enable' );
               $( '#dialog-form' ).dialog( 'close' );
 		  } );
 	  },
 	  OK: function( evt ) {
-		$( evt.target ).button( 'disable' );
+	  	var mybuttons = $(evt.target).closest('button').parent().find('button');
+		mybuttons.button( 'disable' );
 		$( '#status' ).empty();
 		form_values = $( '#collapse_node_form' ).serialize();
 		ncpath = getTextURL( 'relationships' );
@@ -1084,13 +1107,14 @@ $(document).ready(function () {
 				var target_found = get_ellipse( source_target[1] );
 				var relation_found = $.inArray( source_target[2], $( '#keymap' ).data( 'relations' ) );
 				if( source_found.size() && target_found.size() && relation_found > -1 ) {
-					var relation = relation_manager.create( source_target[0], source_target[1], relation_found );
+					var emphasis = $('#is_significant option:selected').attr('value');
+					var relation = relation_manager.create( source_target[0], source_target[1], relation_found, emphasis );
 					relation_manager.toggle_active( relation.attr('id') );
 					$.each( $('#collapse_node_form').serializeArray(), function( i, k ) {
 						relation.data( k.name, k.value );
 					});
 				}
-				$(evt.target).button( 'enable' );
+				mybuttons.button( 'enable' );
 		   });
 			$( '#dialog-form' ).dialog( 'close' );
 		}, 'json' );
@@ -1221,12 +1245,13 @@ $(document).ready(function () {
         Cancel: function() { $( this ).dialog( "close" ); },
         Detach: function ( evt ) { 
             var self = $(this);
-            $( evt.target ).button( "disable" );
+	  		var mybuttons = $(evt.target).closest('button').parent().find('button');
+			mybuttons.button( 'disable' );
             var form_values = $('#detach_collated_form').serialize();
             ncpath = getTextURL( 'duplicate' );
             var jqjson = $.post( ncpath, form_values, function(data) {
                 detach_node( data );
-                $(evt.target).button("enable");
+                mybuttons.button("enable");
                 self.dialog( "close" );
             } );
         }
@@ -1308,7 +1333,8 @@ $(document).ready(function () {
 			},
 			Update: function( evt ) {
 				// Disable the button
-				$(evt.target).button("disable");
+	  			var mybuttons = $(evt.target).closest('button').parent().find('button');
+				mybuttons.button( 'disable' );
 				$('#reading_status').empty();
 				var reading_id = $('#reading_id').val()
 				form_values = {
@@ -1335,7 +1361,7 @@ $(document).ready(function () {
 					if( $('#update_workspace_button').data('locked') == false ) {
 						color_inactive( get_ellipse( reading_id ) );
 					}
-					$(evt.target).button("enable");
+					mybuttons.button("enable");
 					$( "#reading-form" ).dialog( "close" );
 				});
 				// Re-color the node if necessary
@@ -1461,7 +1487,9 @@ function expandFillPageClients() {
 	});
 }
 
-function loadSVG(svgData) {
+function loadSVG(svgData, direction) {
+	text_direction = direction;
+
 	var svgElement = $('#svgenlargement');
 
 	$(svgElement).svg('destroy');