Project

General

Profile

« Previous | Next » 

Revision 21a1bf2d

Added by Cherian Mathew almost 9 years ago

EditConceptRelationshipComposite, EditConceptRelationshipPresenter : hack for checking relationship rules (currently only for congruence)
INewTaxonBaseComponentListener, NewTaxonBaseComposite, NewTaxonBasePresenter : Setting default secundum when addin taxon / synonym
StatusComposite, ConceptRelationshipView : added check for already selected item in taxon table
CdmVaadinUtilities : added utility method to check if given item is selected
d3.conceptrelationshiptree_connector.js : cleaned up transition for nodes + removed transition for links
edit.scss, styles.css : added italics also for taxon

View differences:

src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3.conceptrelationshiptree_connector.js
35 35 
            "rightleft": {
36 36 
                size: [height, width],
37 37 
                x: function(d) { return width - d.y; },
38 
                y: function(d) { return d.x; }
38 
                y: function(d) { return d.x; },
39 
                xend: function(d) { return d.y; },
39 40 
            },
40 41 
            "bottomtop": {
41 42 
                size: [width, height],
......
45 46 
            "leftright": {
46 47 
                size: [height, width],
47 48 
                x: function(d) { return d.y; },
48 
                y: function(d) { return d.x; }
49 
                y: function(d) { return d.x; },
50 
                xend: function(d) { return width - d.y; },
49 51 
            }
50 52 
    };
51 53 
    // default setting is left-right
......
133 135 
        // Transition exiting nodes to the parent's new position.
134 136 
        var nodeExit = node.exit().transition()
135 137 
            .duration(duration)
136 
            .attr("transform", function(d) { return "translate(" + source.y + "," + source.x + ")"; })
138 
            .attr("transform", function(d) { return "translate(" + orientation.xend(source) + "," + orientation.y(source) + ")"; })
137 139 
            .remove();
138 140 

  		




  139
  141
  
    
        nodeExit.select("circle")


  		




  ......




  146
  148
  
    
        var link = svg.selectAll("path.link")


  		




  147
  149
  
    
        .data(links, function(d) { return d.target.id; });


  		




  148
  150
  
    

  		




  149
  
  
    
        // Transition exiting nodes to the parent's new position.


  		




  150
  
  
    
        link.exit().transition()


  		




  151
  
  
    
            .duration(duration)


  		




  152
  
  
    
            .attr("d", function(d) {


  		




  153
  
  
    
              var o = {x: source.x, y: source.y};


  		




  154
  
  
    
              return diagonal({source: o, target: o});


  		




  155
  
  
    
            })


  		




  156
  
  
    
            .remove();


  		




  
  151
  
    
        // Remove links without transition


  		




  
  152
  
    
        link.exit().remove();


  		




  157
  153
  
    
        


  		




  158
  154
  
    
        // Enter any new links at the parent's previous position.


  		




  159
  155
  
    
        link.enter().insert("path", "g")


  		












Also available in:  Unified diff