$.getJSON( textrelpath, function(data) {
$.each(data, function( index, rel_info ) {
var type_index = $.inArray(rel_info.type, rel_types);
- var source_found = get_ellipse( rel_info.source );
- var target_found = get_ellipse( rel_info.target );
+ var source_found = get_ellipse( rel_info.source_id );
+ var target_found = get_ellipse( rel_info.target_id );
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 relation = relation_manager.create( rel_info.source_id, rel_info.target_id, type_index );
+ // Save the relationship data too.
+ $.each( rel_info, function( k, v ) {
+ relation.data( k, v );
+ });
if( editable ) {
- var node_obj = get_node_obj(rel_info.source);
+ var node_obj = get_node_obj(rel_info.source_id);
node_obj.set_selectable( false );
node_obj.ellipse.data( 'node_obj', null );
- node_obj = get_node_obj(rel_info.target);
+ node_obj = get_node_obj(rel_info.target_id);
node_obj.set_selectable( false );
node_obj.ellipse.data( 'node_obj', null );
}
var target_node_text = $('ellipse[fill="#ffccff"]').siblings("text").text();
$('#source_node_id').val( source_node_id );
$('#source_node_text').val( source_node_text );
+ $('.rel_rdg_a').text( "'" + source_node_text + "'" );
$('#target_node_id').val( target_node_id );
$('#target_node_text').val( target_node_text );
+ $('.rel_rdg_b').text( "'" + target_node_text + "'" );
$('#dialog-form').dialog( 'open' );
};
$('body').unbind('mousemove');
this.showinfo = function(relation) {
$('#delete_relation_type').text( relation.data('type') );
$('#delete_relation_scope').text( relation.data('scope') );
+ $('#delete_relation_attributes').empty();
+ if( relation.data( 'a_derivable_from_b' ) ) {
+ $('#delete_relation_attributes').append(
+ "'" + relation.data('source_text') + "' derivable from '" + relation.data('target_text') + "'<br/>");
+ }
+ if( relation.data( 'b_derivable_from_a' ) ) {
+ $('#delete_relation_attributes').append(
+ "'" + relation.data('target_text') + "' derivable from '" + relation.data('source_text') + "'<br/>");
+ }
+ if( relation.data( 'non_independent' ) ) {
+ $('#delete_relation_attributes').append(
+ "Variance unlikely to arise coincidentally<br/>");
+ }
if( relation.data( 'note' ) ) {
$('#delete_relation_note').text('note: ' + relation.data( 'note' ) );
}
}
function detach_node( readings ) {
-
+ // separate out the deleted relationships, discard for now
+ if( 'DELETED' in readings ) {
+ // Remove each of the deleted relationship links.
+ $.each( readings['DELETED'], function( idx, pair ) {
+ var relation_id = get_relation_id( pair[0], pair[1] );
+ var relation = $( jq( relation_id ) );
+ if( relation.size() == 0 ) {
+ relation_id = get_relation_id( pair[1], pair[0] );
+ }
+ relation_manager.remove( relation_id );
+ });
+ delete readings['DELETED'];
+ }
// add new node(s)
$.extend( readingdata, readings );
// remove from existing readings the witnesses for the new nodes/readings
merge_node( source_node_id, target_node_id );
if( consequences.checkalign != null ) {
$.each( consequences.checkalign, function( index, node_ids ) {
- temp_relation = draw_relation( node_ids[0], node_ids[1], "#89a02c" );
+ var temp_relation = draw_relation( node_ids[0], node_ids[1], "#89a02c" );
var sy = parseInt( temp_relation.children('path').attr('d').split('C')[0].split(',')[1] );
var ey = parseInt( temp_relation.children('path').attr('d').split(' ')[2].split(',')[1] );
var yC = ey + (( sy - ey )/2);
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, '/images/tick_circle_frame.png', { id: merge_id } );
- svg.image( parent_g, (xC+20), (yC-8), 16, 16, '/images/no_entry.png', { id: 'no' + merge_id } );
+ 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 ){
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=" + node_ids[0] + "&target_id=" + node_ids[1] + "&single=true";
+ $.post( ncpath, form_values );
} );
$( '#no' + merge_id ).click( function( evt ) {
temp_relation.remove();
$( '#dialog-form' ).dialog( {
autoOpen: false,
height: 270,
- width: 290,
+ width: 330,
modal: true,
buttons: {
'Merge readings': function( evt ) {
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' );
$( '#dialog-form' ).dialog( 'close' );
} );
},
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 );
- relation.data( 'type', source_target[2] );
- relation.data( 'scope', $('#scope :selected').text() );
- relation.data( 'note', $('#note').val() );
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' );
});
projects / scpubgit/stemmaweb.git / blobdiff