X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=stemmaweb%2Froot%2Fjs%2Frelationship.js;h=807b5d4dc44b82ef5dab13bf2139b5799c50e0ee;hb=4aa3aa3db8d45952a7ede6ffac2a06ec2d18c6e3;hp=608d1edca349fe6e0146c05ba8cae3899be0fd99;hpb=7fd1d97a0e7b50b8f0e30190aeb62eaaf239552c;p=scpubgit%2Fstemmatology.git

diff --git a/stemmaweb/root/js/relationship.js b/stemmaweb/root/js/relationship.js
index 608d1ed..807b5d4 100644
--- a/stemmaweb/root/js/relationship.js
+++ b/stemmaweb/root/js/relationship.js
@@ -1,8 +1,20 @@
+var MARGIN=30;
+var svg_root = null;
+var svg_root_element = null;
+var start_element_height = 0;
+var reltypes = {};
+var readingdata = {};
+
 function getTextPath() {
-    var currpath = window.location.pathname
+    var currpath = window.location.pathname;
+    // Get rid of trailing slash
     if( currpath.lastIndexOf('/') == currpath.length - 1 ) { 
     	currpath = currpath.slice( 0, currpath.length - 1) 
     };
+    // Get rid of query parameters
+    if( currpath.lastIndexOf('?') != -1 ) {
+    	currpath = currpath.slice( 0, currpath.lastIndexOf('?') );
+    };
     var path_elements = currpath.split('/');
     var textid = path_elements.pop();
     var basepath = path_elements.join( '/' );
@@ -10,74 +22,240 @@ function getTextPath() {
     return path_parts;
 }
 
-function svgLoaded() {
-  // some initial scaling
-  var svg_element = $('#svgbasics').children('svg');
-  var svg_graph = svg_element.svg().svg('get').root();
-  var svg_vbwidth = svg_graph.viewBox.baseVal.width;
-  var svg_vbheight = svg_graph.viewBox.baseVal.height;
-  var scroll_padding = $('#graph_container').width();
-  // (Use attr('width') to set width attr, otherwise style="width: npx;" is set.)
-  var svg_element_width = svg_vbwidth/svg_vbheight * parseInt(svg_element.attr('height'));
-  svg_element_width += scroll_padding;
-  svg_element.attr( 'width', svg_element_width );
-  $('ellipse').attr( {stroke:'black', fill:'#fff'} );
+function getRelativePath() {
+	var path_parts = getTextPath();
+	return path_parts[0];
+}
+
+function getTextURL( which ) {
+	var path_parts = getTextPath();
+	return path_parts[0] + '/' + path_parts[1] + '/' + which;
+}
+
+function getReadingURL( reading_id ) {
+	var path_parts = getTextPath();
+	return path_parts[0] + '/' + path_parts[1] + '/reading/' + reading_id;
+}
+
+// Make an XML ID into a valid selector
+function jq(myid) { 
+	return '#' + myid.replace(/(:|\.)/g,'\\$1');
+}
+
+// Actions for opening the reading panel
+function node_dblclick_listener( evt ) {
+  	// Open the reading dialogue for the given node.
+  	// First get the reading info
+  	var reading_id = $(this).attr('id');
+  	var reading_info = readingdata[reading_id];
+  	// and then populate the dialog box with it.
+  	// Set the easy properties first
+  	$('#reading-form').dialog( 'option', 'title', 'Reading information for "' + reading_info['text'] + '"' );
+  	$('#reading_id').val( reading_id );
+  	toggle_checkbox( $('#reading_is_nonsense'), reading_info['is_nonsense'] );
+  	toggle_checkbox( $('#reading_grammar_invalid'), reading_info['grammar_invalid'] );
+  	// Use .text as a backup for .normal_form
+  	var normal_form = reading_info['normal_form'];
+  	if( !normal_form ) {
+  		normal_form = reading_info['text'];
+  	}
+  	var nfboxsize = 10;
+  	if( normal_form.length > 9 ) {
+  		nfboxsize = normal_form.length + 1;
+  	}
+  	$('#reading_normal_form').attr( 'size', nfboxsize )
+  	$('#reading_normal_form').val( normal_form );
+  	// Now do the morphological properties.
+  	morphology_form( reading_info['lexemes'] );
+  	// and then open the dialog.
+  	$('#reading-form').dialog("open");
+}
+
+function toggle_checkbox( box, value ) {
+	if( value == null ) {
+		value = false;
+	}
+	box.attr('checked', value );
+}
+
+function morphology_form ( lexlist ) {
+  	$('#morphology').empty();
+  	$.each( lexlist, function( idx, lex ) {
+  		var morphoptions = [];
+  		if( 'wordform_matchlist' in lex ) {
+			$.each( lex['wordform_matchlist'], function( tdx, tag ) {
+				var tagstr = stringify_wordform( tag );
+				morphoptions.push( tagstr );
+			});
+		}
+  		var formtag = 'morphology_' + idx;
+  		var formstr = '';
+  		if( 'form' in lex ) {
+  			formstr = stringify_wordform( lex['form'] );
+  		} 
+  		var form_morph_elements = morph_elements( 
+  			formtag, lex['string'], formstr, morphoptions );
+		$.each( form_morph_elements, function( idx, el ) {
+			$('#morphology').append( el );
+		});
+  	});
+}
+
+function stringify_wordform ( tag ) {
+	if( tag ) {
+		var elements = tag.split(' // ');
+		return elements[1] + ' // ' + elements[2];
+	}
+	return ''
+}
+
+function morph_elements ( formtag, formtxt, currform, morphoptions ) {
+	var clicktag = '(Click to select)';
+	if ( !currform ) {
+		currform = clicktag;
+	}
+	var formlabel = $('<label/>').attr( 'id', 'label_' + formtag ).attr( 
+		'for', 'reading_' + formtag ).text( formtxt + ': ' );
+	var forminput = $('<input/>').attr( 'id', 'reading_' + formtag ).attr( 
+		'name', 'reading_' + formtag ).attr( 'size', '50' ).attr(
+		'class', 'reading_morphology' ).val( currform );
+	forminput.autocomplete({ source: morphoptions, minLength: 0	});
+	forminput.focus( function() { 
+		if( $(this).val() == clicktag ) {
+			$(this).val('');
+		}
+		$(this).autocomplete('search', '') 
+	});
+	var morphel = [ formlabel, forminput, $('<br/>') ];
+	return morphel;
+}
+
+function color_inactive ( el ) {
+	var reading_id = $(el).parent().attr('id');
+	var reading_info = readingdata[reading_id];
+	// If the reading info has any non-disambiguated lexemes, color it yellow;
+	// otherwise color it green.
+	$(el).attr( {stroke:'green', fill:'#b3f36d'} );
+	$.each( reading_info['lexemes'], function ( idx, lex ) {
+		if( !lex['is_disambiguated'] || lex['is_disambiguated'] == 0 ) {
+			$(el).attr( {stroke:'orange', fill:'#fee233'} );
+		}
+	});
+}
+
+function relemmatize () {
+	// Send the reading for a new lemmatization and reopen the form.
+	$('#relemmatize_pending').show();
+	var reading_id = $('#reading_id').val()
+	ncpath = getReadingURL( reading_id );
+	form_values = { 
+		'normal_form': $('#reading_normal_form').val(), 
+		'relemmatize': 1 };
+	var jqjson = $.post( ncpath, form_values, function( data ) {
+		// Update the form with the return
+		if( 'id' in data ) {
+			// We got back a good answer. Stash it
+			readingdata[reading_id] = data;
+			// and regenerate the morphology form.
+			morphology_form( data['lexemes'] );
+		} else {
+			alert("Could not relemmatize as requested: " + data['error']);
+		}
+		$('#relemmatize_pending').hide();
+	});
 }
 
+// Initialize the SVG once it exists
 function svgEnlargementLoaded() {
-  // some initial scaling
-  var svg_element = $('#svgenlargement').children('svg');
-  var svg_graph = svg_element.svg().svg('get').root()
-  var svg_vbwidth = svg_graph.viewBox.baseVal.width;
-  var svg_vbheight = svg_graph.viewBox.baseVal.height;
-  var scroll_padding = $('#enlargement_container').width();
-  // (Use attr('width') to set width attr, otherwise style="width: npx;" is set.)
-  var svg_element_width = svg_vbwidth/svg_vbheight * parseInt(svg_element.attr('height'));
-  svg_element_width += scroll_padding;
-  svg_element.attr( 'width', svg_element_width );
-    $('ellipse').attr({
-        stroke: 'black',
-        fill: '#fff'
-    });
-  var svg_height = parseInt( $('#svgenlargement').height() );
-  scroll_enlargement_ratio = svg_height/svg_vbheight;
-    add_relations();
+	//Give some visual evidence that we are working
+	$('#loading_overlay').show();
+	lo_height = $("#enlargement_container").outerHeight();
+	lo_width = $("#enlargement_container").outerWidth();
+	$("#loading_overlay").height( lo_height );
+	$("#loading_overlay").width( lo_width );
+	$("#loading_overlay").offset( $("#enlargement_container").offset() );
+	$("#loading_message").offset(
+		{ 'top': lo_height / 2 - $("#loading_message").height() / 2,
+		  'left': lo_width / 2 - $("#loading_message").width() / 2 });
+    //Set viewbox widht and height to widht and height of $('#svgenlargement svg').
+    $('#update_workspace_button').data('locked', false);
+    $('#update_workspace_button').css('background-position', '0px 44px');
+    //This is essential to make sure zooming and panning works properly.
+	var rdgpath = getTextURL( 'readings' );
+		$.getJSON( rdgpath, function( data ) {
+  		readingdata = data;
+	    $('#svgenlargement ellipse').each( function( i, el ) { color_inactive( el ) });
+  	});
+    $('#svgenlargement ellipse').parent().dblclick( node_dblclick_listener );
+    var graph_svg = $('#svgenlargement svg');
+    var svg_g = $('#svgenlargement svg g')[0];
+    if (!svg_g) return;
+    svg_root = graph_svg.svg().svg('get').root();
+
+    // Find the real root and ignore any text nodes
+    for (i = 0; i < svg_root.childNodes.length; ++i) {
+        if (svg_root.childNodes[i].nodeName != '#text') {
+		svg_root_element = svg_root.childNodes[i];
+		break;
+	   }
+    }
+
+    svg_root.viewBox.baseVal.width = graph_svg.attr( 'width' );
+    svg_root.viewBox.baseVal.height = graph_svg.attr( 'height' );
+    //Now set scale and translate so svg height is about 150px and vertically centered in viewbox.
+    //This is just to create a nice starting enlargement.
+    var initial_svg_height = 250;
+    var scale = initial_svg_height/graph_svg.attr( 'height' );
+    var additional_translate = (graph_svg.attr( 'height' ) - initial_svg_height)/(2*scale);
+    var transform = svg_g.getAttribute('transform');
+    var translate = parseFloat( transform.match( /translate\([^\)]*\)/ )[0].split('(')[1].split(' ')[1].split(')')[0] );
+    translate += additional_translate;
+    var transform = 'rotate(0) scale(' + scale + ') translate(4 ' + translate + ')';
+    svg_g.setAttribute('transform', transform);
+    //used to calculate min and max zoom level:
+    start_element_height = $('#__START__').children('ellipse')[0].getBBox().height;
+    add_relations( function() { $('#loading_overlay').hide(); });
 }
 
-function add_relations() {
-	var pathparts = getTextPath();
-    $.getJSON( pathparts[0] + '/definitions', function(data) {
+function add_relations( callback_fn ) {
+	var basepath = getRelativePath();
+	var textrelpath = getTextURL( 'relationships' );
+    $.getJSON( basepath + '/definitions', function(data) {
         var rel_types = data.types.sort();
-        var pathparts = getTextPath();
-        $.getJSON( pathparts[0] + '/' + pathparts[1] + '/relationships',
+        $.getJSON( textrelpath,
         function(data) {
             $.each(data, function( index, rel_info ) {
                 var type_index = $.inArray(rel_info.type, rel_types);
-                if( type_index != -1 ) {
-                    console.log( 'drawing' );
-                    relation_manager.create( rel_info.source, rel_info.target, type_index );
-                } else {
-                    console.log( 'not drawing' );
+                var source_found = get_ellipse( rel_info.source );
+                var target_found = get_ellipse( rel_info.target );
+                if( type_index != -1 && source_found.size() && target_found.size() ) {
+                    var relation = relation_manager.create( rel_info.source, rel_info.target, type_index );
+                    relation.data( 'type', rel_info.type );
+                    relation.data( 'scope', rel_info.scope );
+                    relation.data( 'note', rel_info.note );
+                    var node_obj = get_node_obj(rel_info.source);
+                    node_obj.set_draggable( false );
+                    node_obj.ellipse.data( 'node_obj', null );
+                    node_obj = get_node_obj(rel_info.target);
+                    node_obj.set_draggable( false );
+                    node_obj.ellipse.data( 'node_obj', null );
                 }
-            })
-        });    
+            });
+            callback_fn.call();
+        });
     });
 }
 
 function get_ellipse( node_id ) {
-  return $('#svgenlargement .node').children('title').filter( function(index) {
-    return $(this).text() == node_id;
-  }).siblings('ellipse');
+	return $( jq( node_id ) + ' ellipse');
 }
 
 function get_node_obj( node_id ) {
-  return get_ellipse( node_id ).data( 'node_obj' );
-}
-
-function get_edge( edge_id ) {
-  return $('#svgenlargement .edge').filter( function(index) {
-    return $(this).children( 'title' ).text() == $('<div/>').html(edge_id).text() ;
-  });
+    var node_ellipse = get_ellipse( node_id );
+    if( node_ellipse.data( 'node_obj' ) == null ) {
+        node_ellipse.data( 'node_obj', new node_obj(node_ellipse) );
+    };
+    return node_ellipse.data( 'node_obj' );
 }
 
 function node_obj(ellipse) {
@@ -91,17 +269,19 @@ function node_obj(ellipse) {
   this.node_elements = node_elements_for(self.ellipse);
 
   this.get_id = function() {
-    return self.ellipse.siblings('title').text()
+    return $(self.ellipse).parent().attr('id')
   }
   
   this.set_draggable = function( draggable ) {
     if( draggable ) {
-      self.ellipse.attr( {stroke:'black', fill:'#fff'} );
-      self.ellipse.mousedown( this.mousedown_listener );
-      self.ellipse.hover( this.enter_node, this.leave_node );  
+      $(self.ellipse).attr( {stroke:'black', fill:'#fff'} );
+      $(self.ellipse).parent().mousedown( this.mousedown_listener );
+      $(self.ellipse).parent().hover( this.enter_node, this.leave_node ); 
+      self.ellipse.siblings('text').attr('class', 'noselect draggable');
     } else {
-      self.ellipse.unbind('mouseenter').unbind('mouseleave').unbind('mousedown');
-      self.ellipse.attr( {stroke:'green', fill:'#b3f36d'} );
+      self.ellipse.siblings('text').attr('class', '');
+	  $(self.ellipse).parent().unbind( 'mouseenter' ).unbind( 'mouseleave' ).unbind( 'mousedown' );     
+      color_inactive( self.ellipse );
     }
   }
 
@@ -111,33 +291,40 @@ function node_obj(ellipse) {
     self.y = evt.clientY;
     $('body').mousemove( self.mousemove_listener );
     $('body').mouseup( self.mouseup_listener );
-    self.ellipse.unbind('mouseenter').unbind('mouseleave')
+    $(self.ellipse).parent().unbind('mouseenter').unbind('mouseleave')
     self.ellipse.attr( 'fill', '#ff66ff' );
     first_node_g_element = $("#svgenlargement g .node" ).filter( ":first" );
     if( first_node_g_element.attr('id') !== self.get_g().attr('id') ) { self.get_g().insertBefore( first_node_g_element ) };
   }
 
   this.mousemove_listener = function(evt) {
-    self.dx = (evt.clientX - self.x) / mousemove_enlargement_ratio;
-    self.dy = (evt.clientY - self.y) / mousemove_enlargement_ratio;
+    self.dx = (evt.clientX - self.x) / mouse_scale;
+    self.dy = (evt.clientY - self.y) / mouse_scale;
     self.move_elements();
+    evt.returnValue = false;
+    evt.preventDefault();
+    return false;
   }
 
   this.mouseup_listener = function(evt) {    
     if( $('ellipse[fill="#ffccff"]').size() > 0 ) {
-        var source_node_id = self.ellipse.siblings('title').text();
-        var target_node_id = $('ellipse[fill="#ffccff"]').siblings("title").text();
+        var source_node_id = $(self.ellipse).parent().attr('id');
+        var source_node_text = self.ellipse.siblings('text').text();
+        var target_node_id = $('ellipse[fill="#ffccff"]').parent().attr('id');
+        var target_node_text = $('ellipse[fill="#ffccff"]').siblings("text").text();
         $('#source_node_id').val( source_node_id );
+        $('#source_node_text').val( source_node_text );
         $('#target_node_id').val( target_node_id );
+        $('#target_node_text').val( target_node_text );
         $('#dialog-form').dialog( 'open' );
     };
     $('body').unbind('mousemove');
     $('body').unbind('mouseup');
     self.ellipse.attr( 'fill', '#fff' );
-    self.ellipse.hover( self.enter_node, self.leave_node );
-        self.reset_elements();
+    $(self.ellipse).parent().hover( self.enter_node, self.leave_node );
+    self.reset_elements();
   }
-
+  
   this.cpos = function() {
     return { x: self.ellipse.attr('cx'), y: self.ellipse.attr('cy') };
   }
@@ -222,12 +409,14 @@ function svgpath( path_element, svg_element ) {
       if( this.svg_element.parent(filter).size() != 0 ) {
           this.svg_element.attr('stroke', '#e5e5e5');
           this.svg_element.siblings('text').attr('fill', '#e5e5e5');
+          this.svg_element.siblings('text').attr('class', 'noselect');
       }
   }
   this.un_grey_out = function(filter) {
       if( this.svg_element.parent(filter).size() != 0 ) {
           this.svg_element.attr('stroke', '#000000');
           this.svg_element.siblings('text').attr('fill', '#000000');
+          this.svg_element.siblings('text').attr('class', '');
       }
   }
 }
@@ -241,7 +430,7 @@ function node_elements_for( ellipse ) {
 
 function get_edge_elements_for( ellipse ) {
   edge_elements = new Array();
-  node_id = ellipse.siblings('title').text();
+  node_id = ellipse.parent().attr('id');
   edge_in_pattern = new RegExp( node_id + '$' );
   edge_out_pattern = new RegExp( '^' + node_id );
   $.each( $('#svgenlargement .edge,#svgenlargement .relation').children('title'), function(index) {
@@ -270,13 +459,9 @@ function relation_factory() {
     this.relation_colors = [ "#5CCCCC", "#67E667", "#F9FE72", "#6B90D4", "#FF7673", "#E467B3", "#AA67D5", "#8370D8", "#FFC173" ];
 
     this.create_temporary = function( source_node_id, target_node_id ) {
-    var relation = $('#svgenlargement .relation').filter( function(index) {
-        var relation_id = $(this).children('title').text();
-            if( ( relation_id == ( source_node_id + '->' + target_node_id ) ) || ( relation_id == ( target_node_id + '->' + source_node_id ) ) ) {
-            return true;
-        } 
-    } );
-    if( relation.size() == 0 ) {
+    	var relation_id = get_relation_id( source_node_id, target_node_id );
+        var relation = $( jq( relation_id ) );
+        if( relation.size() == 0 ) { 
             draw_relation( source_node_id, target_node_id, self.temp_color );
         } else {
             self.color_memo = relation.children('path').attr( 'stroke' );
@@ -289,74 +474,167 @@ function relation_factory() {
             path_element.attr( 'stroke', self.color_memo );
             self.color_memo = null;
         } else {
-            path_element.parent('g').remove();
+            var temporary = path_element.parent('g').remove();
+            temporary.empty();
+            temporary = null; 
         }
     }
     this.create = function( source_node_id, target_node_id, color_index ) {
         //TODO: Protect from (color_)index out of bound..
         var relation_color = self.relation_colors[ color_index ];
-        draw_relation( source_node_id, target_node_id, relation_color );
-        var source_node = get_node_obj( source_node_id );
-        var target_node = get_node_obj( target_node_id );
-        if( source_node != null ) { source_node.update_elements() };
-        if( target_node != null ) { target_node.update_elements() };
+        var relation = draw_relation( source_node_id, target_node_id, relation_color );
+        get_node_obj( source_node_id ).update_elements();
+        get_node_obj( target_node_id ).update_elements();
+        return relation;
+    }
+    this.toggle_active = function( relation_id ) {
+        var relation = $( jq( relation_id ) );
+        var relation_path = relation.children('path');
+        if( !relation.data( 'active' ) ) {
+            relation_path.css( {'cursor':'pointer'} );
+            relation_path.mouseenter( function(event) { 
+                outerTimer = setTimeout( function() { 
+                    timer = setTimeout( function() { 
+                        var related_nodes = get_related_nodes( relation_id );
+                        var source_node_id = related_nodes[0];
+                        var target_node_id = related_nodes[1];
+                        $('#delete_source_node_id').val( source_node_id );
+                        $('#delete_target_node_id').val( target_node_id );
+                        self.showinfo(relation); 
+                    }, 500 ) 
+                }, 1000 );
+            });
+            relation_path.mouseleave( function(event) {
+                clearTimeout(outerTimer); 
+                if( timer != null ) { clearTimeout(timer); } 
+            });
+            relation.data( 'active', true );
+        } else {
+            relation_path.unbind( 'mouseenter' );
+            relation_path.unbind( 'mouseleave' );
+            relation_path.css( {'cursor':'inherit'} );
+            relation.data( 'active', false );
+        }
+    }
+    this.showinfo = function(relation) {
+    	var htmlstr = 'type: ' + relation.data( 'type' ) + '<br/>scope: ' + relation.data( 'scope' );
+    	if( relation.data( 'note' ) ) {
+    		htmlstr = htmlstr + '<br/>note: ' + relation.data( 'note' );
+    	}
+        $('#delete-form-text').html( htmlstr );
+        var points = relation.children('path').attr('d').slice(1).replace('C',' ').split(' ');
+        var xs = parseFloat( points[0].split(',')[0] );
+        var xe = parseFloat( points[1].split(',')[0] );
+        var ys = parseFloat( points[0].split(',')[1] );
+        var ye = parseFloat( points[3].split(',')[1] );
+        var p = svg_root.createSVGPoint();
+        p.x = xs + ((xe-xs)*1.1);
+        p.y = ye - ((ye-ys)/2);
+        var ctm = svg_root_element.getScreenCTM();
+        var nx = p.matrixTransform(ctm).x;
+        var ny = p.matrixTransform(ctm).y;
+        var dialog_aria = $ ("div[aria-labelledby='ui-dialog-title-delete-form']");
+        $('#delete-form').dialog( 'open' );
+        dialog_aria.offset({ left: nx, top: ny });
     }
-    this.remove = function( source_node_id, target_id ) {
-        //TODO (When needed)
-        console.log( "Unsupported function node_obj.remove()." );
+    this.remove = function( relation_id ) {
+        var relation = $( jq( relation_id ) );
+        relation.remove();
     }
 }
 
+// Utility function to create/return the ID of a relation link between
+// a source and target.
+function get_relation_id( source_id, target_id ) {
+	var idlist = [ source_id, target_id ];
+	idlist.sort();
+	return 'relation-' + idlist[0] + '-...-' + idlist[1];
+}
+
+function get_related_nodes( relation_id ) {
+	var srctotarg = relation_id.substr( 9 );
+	return srctotarg.split('-...-');
+}
+
 function draw_relation( source_id, target_id, relation_color ) {
-        var source_ellipse = get_ellipse( source_id );
-        var target_ellipse = get_ellipse( target_id );
-        var svg = $('#svgenlargement').children('svg').svg().svg('get');
-        var path = svg.createPath(); 
-        var sx = parseInt( source_ellipse.attr('cx') );
-        var rx = parseInt( source_ellipse.attr('rx') );
-        var sy = parseInt( source_ellipse.attr('cy') );
-        var ex = parseInt( target_ellipse.attr('cx') );
-        var ey = parseInt( target_ellipse.attr('cy') );
-        var relation = svg.group( $("#svgenlargement svg g"), {'class':'relation'} );
-        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 source_ellipse = get_ellipse( source_id );
+    var target_ellipse = get_ellipse( target_id );
+    var relation_id = get_relation_id( source_id, target_id );
+    var svg = $('#svgenlargement').children('svg').svg().svg('get');
+    var path = svg.createPath(); 
+    var sx = parseInt( source_ellipse.attr('cx') );
+    var rx = parseInt( source_ellipse.attr('rx') );
+    var sy = parseInt( source_ellipse.attr('cy') );
+    var ex = parseInt( target_ellipse.attr('cx') );
+    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 relation_element = $('#svgenlargement .relation').filter( ':last' );
     relation_element.insertBefore( $('#svgenlargement g g').filter(':first') );
+    return relation_element;
 }
 
+
 $(document).ready(function () {
-  
+    
+  timer = null;
   relation_manager = new relation_factory();
+  $('#update_workspace_button').data('locked', false);
   
-  scroll_ratio =  $('#enlargement').height() / $('#graph').height();
-  
-  $('#graph').mousedown(function (event) {
+  $('#enlargement').mousedown(function (event) {
     $(this)
-      .data('down', true)
-      .data('x', event.clientX)
-      .data('scrollLeft', this.scrollLeft);
-      return false;
+        .data('down', true)
+        .data('x', event.clientX)
+        .data('y', event.clientY)
+        .data('scrollLeft', this.scrollLeft)
+        stateTf = svg_root_element.getCTM().inverse();
+        var p = svg_root.createSVGPoint();
+        p.x = event.clientX;
+        p.y = event.clientY;
+        stateOrigin = p.matrixTransform(stateTf);
+        event.returnValue = false;
+        event.preventDefault();
+        return false;
   }).mouseup(function (event) {
-    $(this).data('down', false);
+        $(this).data('down', false);
   }).mousemove(function (event) {
-    if ($(this).data('down') == true ) {
-      if ( $('#update_workspace_button').data('locked') != true ) {
-          var scroll_left = $(this).data('scrollLeft') + $(this).data('x') - event.clientX;
-          this.scrollLeft = scroll_left;
-          var enlarged_scroll_left = scroll_left * scroll_ratio; 
-          $('#enlargement').scrollLeft( enlarged_scroll_left );
-          color_enlarged();
-      }
+    if( timer != null ) { clearTimeout(timer); } 
+    if ( ($(this).data('down') == true) && ($('#update_workspace_button').data('locked') == false) ) {
+        var p = svg_root.createSVGPoint();
+        p.x = event.clientX;
+        p.y = event.clientY;
+        p = p.matrixTransform(stateTf);
+        var matrix = stateTf.inverse().translate(p.x - stateOrigin.x, p.y - stateOrigin.y);
+        var s = "matrix(" + matrix.a + "," + matrix.b + "," + matrix.c + "," + matrix.d + "," + matrix.e + "," + matrix.f + ")";
+        svg_root_element.setAttribute("transform", s);
     }
+    event.returnValue = false;
+    event.preventDefault();
   }).mousewheel(function (event, delta) {
-      if ( $('#update_workspace_button').data('locked') != true ) {
-          var scroll_left = delta * 30;
-          this.scrollLeft -= scroll_left;
-          var enlarged_scroll_left = $('#enlargement').scrollLeft();
-          enlarged_scroll_left -= (scroll_left * scroll_ratio);
-          $('#enlargement').scrollLeft( enlarged_scroll_left );
-          color_enlarged();
-      }
+    event.returnValue = false;
+    event.preventDefault();
+    if ( $('#update_workspace_button').data('locked') == false ) {
+        if (!delta || delta == null || delta == 0) delta = event.originalEvent.wheelDelta;
+        if (!delta || delta == null || delta == 0) delta = -1 * event.originalEvent.detail;
+        if( delta < -9 ) { delta = -9 }; 
+        var z = 1 + delta/10;
+        z = delta > 0 ? 1 : -1;
+        var g = svg_root_element;
+        if (g && ((z<1 && (g.getScreenCTM().a * start_element_height) > 4.0) || (z>=1 && (g.getScreenCTM().a * start_element_height) < 100))) {
+            var root = svg_root;
+            var p = root.createSVGPoint();
+            p.x = event.originalEvent.clientX;
+            p.y = event.originalEvent.clientY;
+            p = p.matrixTransform(g.getCTM().inverse());
+            var scaleLevel = 1+(z/20);
+            var k = root.createSVGMatrix().translate(p.x, p.y).scale(scaleLevel).translate(-p.x, -p.y);
+            var matrix = g.getCTM().multiply(k);
+            var s = "matrix(" + matrix.a + "," + matrix.b + "," + matrix.c + "," + matrix.d + "," + matrix.e + "," + matrix.f + ")";
+            g.setAttribute("transform", s);
+        }
+    }
   }).css({
     'overflow' : 'hidden',
     'cursor' : '-moz-grab'
@@ -369,132 +647,281 @@ $(document).ready(function () {
     width: 290,
     modal: true,
     buttons: {
-      "Ok": function() {
+      "Ok": function( evt ) {
+      	$(evt.target).button("disable");
         $('#status').empty();
-        form_values = $('#collapse_node_form').serialize()
-        pathparts = getTextPath();
-        ncpath = pathparts[0] + '/' + pathparts[1] + '/relationship';
+        form_values = $('#collapse_node_form').serialize();
+        ncpath = getTextURL( 'relationships' );
         var jqjson = $.post( ncpath, form_values, function(data) {
             $.each( data, function(item, source_target) { 
-                relation_manager.create( source_target[0], source_target[1], $('#rel_type').attr('selectedIndex') );
-            });
-            relation_manager.remove_temporary();
+            	var source_found = get_ellipse( source_target[0] );
+            	var target_found = get_ellipse( source_target[1] );
+            	if( source_found.size() && target_found.size() ) {
+                    var relation = relation_manager.create( source_target[0], source_target[1], $('#rel_type')[0].selectedIndex-1 );
+					relation.data( 'type', $('#rel_type :selected').text()  );
+					relation.data( 'scope', $('#scope :selected').text()  );
+					relation.data( 'note', $('#note').val()  );
+					relation_manager.toggle_active( relation.attr('id') );
+				}
+   				$(evt.target).button("enable");
+           });
             $( "#dialog-form" ).dialog( "close" );
-        }, 'json');
+        }, 'json' );
       },
       Cancel: function() {
-          relation_manager.remove_temporary();
           $( this ).dialog( "close" );
       }
     },
     create: function(event, ui) { 
         $(this).data( 'relation_drawn', false );
         //TODO? Err handling?
-        var pathparts = getTextPath();
-        var jqjson = $.getJSON( pathparts[0] + '/definitions', function(data) {
+		var basepath = getRelativePath();
+        var jqjson = $.getJSON( basepath + '/definitions', function(data) {
             var types = data.types.sort();
             $.each( types, function(index, value) {   
-                 $('#rel_type').append( $('<option>').attr( "value", value ).text(value) ); 
+                 $('#rel_type').append( $('<option />').attr( "value", value ).text(value) ); 
                  $('#keymaplist').append( $('<li>').css( "border-color", relation_manager.relation_colors[index] ).text(value) ); 
             });
             var scopes = data.scopes;
             $.each( scopes, function(index, value) {   
-                 $('#scope').append( $('<option>').attr( "value", value ).text(value) ); 
+                 $('#scope').append( $('<option />').attr( "value", value ).text(value) ); 
             });
         });        
     },
     open: function() {
         relation_manager.create_temporary( $('#source_node_id').val(), $('#target_node_id').val() );
-      $(".ui-widget-overlay").css("background", "none");
-      $("#dialog_overlay").show();
-      $("#dialog_overlay").height( $("#enlargement_container").height() );
-      $("#dialog_overlay").width( $("#enlargement_container").width() );
-      $("#dialog_overlay").offset( $("#enlargement_container").offset() );
+        $(".ui-widget-overlay").css("background", "none");
+        $("#dialog_overlay").show();
+        $("#dialog_overlay").height( $("#enlargement_container").height() );
+        $("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
+        $("#dialog_overlay").offset( $("#enlargement_container").offset() );
     },
     close: function() {
+        relation_manager.remove_temporary();
         $( '#status' ).empty();
         $("#dialog_overlay").hide();
     }
   }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
-      if( ( ajaxSettings.url.split("?")[0] == 'set_relationship' ) && jqXHR.status == 403 ) {
-          $('#status').append( '<p class="error">The relationship can not be made in this way between these nodes.</p>' );
+      if( ajaxSettings.url == getTextURL('relationships') 
+      	&& ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
+      	  var errobj = jQuery.parseJSON( jqXHR.responseText );
+          $('#status').append( '<p class="error">Error: ' + errobj.error + '</br>The relationship cannot be made.</p>' );
+		  $(event.target).parent().find('.ui-button').button("enable");
       }
   } );
 
+  $( "#delete-form" ).dialog({
+    autoOpen: false,
+    height: 135,
+    width: 160,
+    modal: false,
+    buttons: {
+        Cancel: function() {
+            $( this ).dialog( "close" );
+        },
+        Delete: function() {
+          form_values = $('#delete_relation_form').serialize();
+          ncpath = getTextURL( 'relationships' );
+          var jqjson = $.ajax({ url: ncpath, data: form_values, success: function(data) {
+              $.each( data, function(item, source_target) { 
+                  relation_manager.remove( get_relation_id( source_target[0], source_target[1] ) );
+              });
+              $( "#delete-form" ).dialog( "close" );
+          }, dataType: 'json', type: 'DELETE' });
+        }
+    },
+    create: function(event, ui) {
+        var buttonset = $(this).parent().find( '.ui-dialog-buttonset' ).css( 'width', '100%' );
+        buttonset.find( "button:contains('Cancel')" ).css( 'float', 'right' );
+        var dialog_aria = $("div[aria-labelledby='ui-dialog-title-delete-form']");  
+        dialog_aria.mouseenter( function() {
+            if( mouseWait != null ) { clearTimeout(mouseWait) };
+        })
+        dialog_aria.mouseleave( function() {
+            mouseWait = setTimeout( function() { $("#delete-form").dialog( "close" ) }, 2000 );
+        })
+    },
+    open: function() {
+        mouseWait = setTimeout( function() { $("#delete-form").dialog( "close" ) }, 2000 );
+    },
+    close: function() {
+    }
+  });
+
+  // function for reading form dialog should go here; for now hide the element
+  $('#reading-form').dialog({
+  	autoOpen: false,
+  	height: 400,
+  	width: 600,
+  	modal: true,
+  	buttons: {
+  		Cancel: function() {
+  			$( this ).dialog( "close" );
+  		},
+  		Update: function( evt ) {
+  			// Disable the button
+  			$(evt.target).button("disable");
+  			$('#reading_status').empty();
+			var reading_id = $('#reading_id').val()
+  			form_values = {
+  				'id' : reading_id,
+  				'is_nonsense': $('#reading_is_nonsense').is(':checked'),
+  				'grammar_invalid': $('#reading_grammar_invalid').is(':checked'),
+  				'normal_form': $('#reading_normal_form').val() };
+  			// Add the morphology values
+  			$('.reading_morphology').each( function() {
+  				var rmid = $(this).attr('id');
+  				rmid = rmid.substring(8);
+  				form_values[rmid] = $(this).val();
+  			});
+  			// Make the JSON call
+			ncpath = getReadingURL( reading_id );
+			var reading_element = readingdata[reading_id];
+			// $(':button :contains("Update")').attr("disabled", true);
+			var jqjson = $.post( ncpath, form_values, function(data) {
+				$.each( data, function(key, value) { 
+					reading_element[key] = value;
+				});
+				if( $('#update_workspace_button').data('locked') == false ) {
+					color_inactive( get_ellipse( reading_id ) );
+				}
+  				$(evt.target).button("enable");
+				$( "#reading-form" ).dialog( "close" );
+			});
+			// Re-color the node if necessary
+			return false;
+  		}
+  	},
+  	create: function() {
+  	},
+  	open: function() {
+        $(".ui-widget-overlay").css("background", "none");
+        $("#dialog_overlay").show();
+        $('#reading_status').empty();
+        $("#dialog_overlay").height( $("#enlargement_container").height() );
+        $("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
+        $("#dialog_overlay").offset( $("#enlargement_container").offset() );
+  	},
+	close: function() {
+		$("#dialog_overlay").hide();
+	}
+  }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
+      if( ajaxSettings.url.lastIndexOf( getReadingURL('') ) > -1
+      	&& ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
+      	  var errobj = jQuery.parseJSON( jqXHR.responseText );
+          $('#reading_status').append( '<p class="error">Error: ' + errobj.error + '</p>' );
+		  $(event.target).parent().find('.ui-button').button("enable");
+      }
+  });
+  
+
   $('#update_workspace_button').click( function() {
      var svg_enlargement = $('#svgenlargement').svg().svg('get').root();
-     if( $(this).data('locked')==true) {
-         $.each( ellipses_in_magnifier, function( index, ellipse ) {
-             ellipse.data( 'node_obj' ).ungreyout_edges();
-             ellipse.data( 'node_obj' ).set_draggable( false );
-             ellipse.data( 'node_obj', null );
+     mouse_scale = svg_root_element.getScreenCTM().a;
+     if( $(this).data('locked') == true ) {
+         $('#svgenlargement ellipse' ).each( function( index ) {
+             if( $(this).data( 'node_obj' ) != null ) {
+                 $(this).data( 'node_obj' ).ungreyout_edges();
+                 $(this).data( 'node_obj' ).set_draggable( false );
+                 var node_id = $(this).data( 'node_obj' ).get_id();
+                 toggle_relation_active( node_id );
+                 $(this).data( 'node_obj', null );
+             }
          })
-         svg_enlargement.children[0].setAttribute( 'transform', $(this).data('transform_memo') );
-         $('#enlargement').scrollLeft( $(this).data('scrollleft_memo') );
          $(this).data('locked', false);
-         $(this).css('background-position', '0px 0px');
+         $(this).css('background-position', '0px 44px');
      } else {
-         $(this).css('background-position', '0px 17px');
-         var y_min = parseInt( ellipses_in_magnifier[0].attr('cy') ) - parseInt( ellipses_in_magnifier[0].attr('ry') ); 
-         var y_max = parseInt( ellipses_in_magnifier[0].attr('cy') ) + parseInt( ellipses_in_magnifier[0].attr('ry') ); 
-         $.each( ellipses_in_magnifier, function( index, ellipse ) {
-             var ny_min = parseInt( ellipse.attr('cy') ) - parseInt( ellipse.attr('ry') ); 
-             var ny_max = parseInt( ellipse.attr('cy') ) + parseInt( ellipse.attr('ry') ); 
-             if( ny_min < y_min ) { y_min = ny_min }; 
-             if( ny_max > y_max ) { y_max = ny_max };
-             if( ellipse.data( 'node_obj' ) == null ) {
-                 ellipse.data( 'node_obj', new node_obj( ellipse ) );
-             } else {
-                 ellipse.data( 'node_obj' ).set_draggable( true );
+         var left = $('#enlargement').offset().left;
+         var right = left + $('#enlargement').width();
+         var tf = svg_root_element.getScreenCTM().inverse(); 
+         var p = svg_root.createSVGPoint();
+         p.x=left;
+         p.y=100;
+         var cx_min = p.matrixTransform(tf).x;
+         p.x=right;
+         var cx_max = p.matrixTransform(tf).x;
+         $('#svgenlargement ellipse').each( function( index ) {
+             var cx = parseInt( $(this).attr('cx') );
+             if( cx > cx_min && cx < cx_max) { 
+                 if( $(this).data( 'node_obj' ) == null ) {
+                     $(this).data( 'node_obj', new node_obj( $(this) ) );
+                 } else {
+                     $(this).data( 'node_obj' ).set_draggable( true );
+                 }
+                 $(this).data( 'node_obj' ).greyout_edges();
+                 var node_id = $(this).data( 'node_obj' ).get_id();
+                 toggle_relation_active( node_id );
              }
-             ellipse.data( 'node_obj' ).greyout_edges();
-         })
-         var graph_frag_height = y_max - y_min ;
-         var svg_enlargement_vbheight = svg_enlargement.viewBox.baseVal.height;
-         var svg_enlargement_vbwidth = svg_enlargement.viewBox.baseVal.width;
-         var scale = svg_enlargement_vbheight / graph_frag_height;
-         mousemove_enlargement_ratio = scroll_enlargement_ratio * scale;
-         var scroll_padding = $('#enlargement_container').width();
-         var scroll_scale =  svg_enlargement_vbwidth / ( parseFloat( $('#svgenlargement svg').attr('width') ) - scroll_padding );
-         var vbx_of_scroll = ( $('#enlargement').scrollLeft() ) * scroll_scale;
-         var translate_x = vbx_of_scroll;
-         var transform = svg_enlargement.children[0].getAttribute('transform');
-         $(this).data('transform_memo', transform );
-         $(this).data('scrollleft_memo', $('#enlargement').scrollLeft() ); 
+         });
+         $(this).css('background-position', '0px 0px');
          $(this).data('locked', true );
-         $('#enlargement').scrollLeft(0);
-         transform = 'scale(' + scale + ') translate(' + (-1 * translate_x) + ',' + (-1 * y_min) + ')';
-         svg_enlargement.children[0].setAttribute( 'transform', transform );
      }
   });
   
-});
+  $('.helptag').popupWindow({ 
+	  height:500, 
+	  width:800, 
+	  top:50, 
+	  left:50,
+	  scrollbars:1 
+  }); 
 
-$(window).mouseout(function (event) {
-  if ($('#graph').data('down')) {
-    try {
-      if (event.originalTarget.nodeName == 'BODY' || event.originalTarget.nodeName == 'HTML') {
-        $('#graph').data('down', false);
-      }                
-    } catch (e) {}
+  
+  function toggle_relation_active( node_id ) {
+      $('#svgenlargement .relation').find( "title:contains('" + node_id +  "')" ).each( function(index) {
+          matchid = new RegExp( "^" + node_id );
+          if( $(this).text().match( matchid ) != null ) {
+          	  var relation_id = $(this).parent().attr('id');
+              relation_manager.toggle_active( relation_id );
+          };
+      });
   }
+
+  expandFillPageClients();
+  $(window).resize(function() {
+    expandFillPageClients();
+  });
+
 });
 
-function color_enlarged() {
-    ellipses_in_magnifier = [];
-    var scroll_offset = parseInt( $('#enlargement').scrollLeft() );
-    var scroll_padding = $('#enlargement_container').width()/2;
-    $('#svgenlargement ellipse,#svgbasics ellipse' ).each( function( index ) {
-        var cpos_inscrollcoor = parseInt( $(this).attr('cx') ) * scroll_enlargement_ratio;
-        if ( ( cpos_inscrollcoor > (scroll_offset - scroll_padding) ) && ( cpos_inscrollcoor < ( scroll_offset + scroll_padding ) ) ) {
-           $(this).attr( {stroke:'green', fill:'#b3f36d'} );
-           if( $(this).parents('#svgenlargement').size() == 1 ) { ellipses_in_magnifier.push( $(this) ) };
-        } else {
-           $(this).attr( {stroke:'black', fill:'#fff'} );
-        }
-    });   
+
+function expandFillPageClients() {
+	$('.fillPage').each(function () {
+		$(this).height($(window).height() - $(this).offset().top - MARGIN);
+	});
+}
+
+function loadSVG(svgData) {
+	var svgElement = $('#svgenlargement');
+
+	$(svgElement).svg('destroy');
+
+	$(svgElement).svg({
+		loadURL: svgData,
+		onLoad : svgEnlargementLoaded
+	});
 }
 
 
+/*	OS Gadget stuff
 
+function svg_select_callback(topic, data, subscriberData) {
+	svgData = data;
+	loadSVG(svgData);
+}
 
+function loaded() {
+	var prefs = new gadgets.Prefs();
+	var preferredHeight = parseInt(prefs.getString('height'));
+	if (gadgets.util.hasFeature('dynamic-height')) gadgets.window.adjustHeight(preferredHeight);
+	expandFillPageClients();
+}
+
+if (gadgets.util.hasFeature('pubsub-2')) {
+	gadgets.HubSettings.onConnect = function(hum, suc, err) {
+		subId = gadgets.Hub.subscribe("interedition.svg.selected", svg_select_callback);
+		loaded();
+	};
+}
+else gadgets.util.registerOnLoadHandler(loaded);
+*/