[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview GenericTreeView.java, 1.72, 1.7
Status: Pre-Alpha
Brought to you by:
henryml
|
From: Michael L. <he...@us...> - 2007-03-04 23:34:23
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10300/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: Improved hitdetection of surface/edge intersections slightly. Fixed problem with overlarge CoordinateSystems in hitdetection. Implemented an alternative movetool that is an experiment in moving vertices to a plane, sliding on binding edges. Started implementation of relations, that contains an offset in the form of an expression. Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** GenericTreeView.java 8 Feb 2007 12:24:32 -0000 1.72 --- GenericTreeView.java 4 Mar 2007 23:14:50 -0000 1.73 *************** *** 20,23 **** --- 20,24 ---- import java.util.Iterator; import java.util.LinkedList; + import java.util.List; import java.util.Map; import java.util.Set; *************** *** 44,47 **** --- 45,49 ---- import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Constructor; + import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Entity; *************** *** 51,54 **** --- 53,57 ---- import net.sourceforge.bprocessor.model.Parametric; import net.sourceforge.bprocessor.model.Project; + import net.sourceforge.bprocessor.model.Relation; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; *************** *** 712,727 **** * ConstructorNode */ ! public class ConstructorNode extends ContainerNode { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! /** * Constructor for ConstructorNode ! * @param c The constructor */ ! public ConstructorNode(Constructor c) { ! super(c, c.getConnectedGeometry()); } --- 715,729 ---- * ConstructorNode */ ! public class ConstructorNode extends EntityNode { /** * Constructor for ConstructorNode ! * @param constructor The constructor */ ! public ConstructorNode(Constructor constructor) { ! super(constructor); ! if (constructor instanceof CoordinateSystem) { ! CoordinateSystem system = (CoordinateSystem) constructor; ! add(new ContainerNode("Relations", system.relations())); ! } } *************** *** 742,747 **** model.nodeChanged(this); } ! Constructor c = (Constructor) o; ! super.update(c.getConnectedGeometry()); } } --- 744,751 ---- model.nodeChanged(this); } ! if (o instanceof CoordinateSystem) { ! CoordinateSystem system = (CoordinateSystem) o; ! ((GenericNode)getChildAt(0)).update(system.relations()); ! } } } *************** *** 1313,1317 **** /** ! * ConstraintContainer */ public class TransformationContainer extends ContainerNode { --- 1317,1336 ---- /** ! * RelationContainer ! */ ! public class RelationContainer extends ContainerNode { ! /** ! * Constructs a RelationContainer ! * @param relations The constraints ! * @return ! */ ! public RelationContainer(List<Relation> relations) { ! super("Relations", relations); ! update(relations); ! } ! } ! ! /** ! * TransformationContainer */ public class TransformationContainer extends ContainerNode { |