bprocessor-commit Mailing List for B-processor (Page 133)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Nordholt <nor...@us...> - 2006-02-16 21:11:44
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28552 Modified Files: ExtrudeTool.java Log Message: Prevented null pointer exception that sometimes occured Index: ExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ExtrudeTool.java 2 Feb 2006 14:18:31 -0000 1.9 --- ExtrudeTool.java 16 Feb 2006 21:11:35 -0000 1.10 *************** *** 74,77 **** --- 74,78 ---- public ExtrudeTool(GLView glv, Cursor cursor) { super(glv, cursor); + number = new String(); } *************** *** 312,317 **** } } ! } ! if (number.equals("") || number.equals("-")) { glv.setLength(0); --- 313,318 ---- } } ! } ! if (number.equals("") || number.equals("-")) { glv.setLength(0); *************** *** 325,330 **** } super.keyPressed(e); ! } ! ! } --- 326,329 ---- } super.keyPressed(e); ! } } |
|
From: Nordholt <nor...@us...> - 2006-02-16 21:05:05
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25343 Modified Files: Edge.java Log Message: Added method for getting the direction of the Edge as a vertex Index: Edge.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Edge.java 11 Feb 2006 16:20:27 -0000 1.34 --- Edge.java 16 Feb 2006 21:04:53 -0000 1.35 *************** *** 408,411 **** --- 408,420 ---- return false; } + + /** + * Gets a vector representing the direction of the edge. + * From the "from" point and to the "to" point + * @return the direction. + */ + public Vertex getDirection() { + return to.minus(from); + } /** |
|
From: Nordholt <nor...@us...> - 2006-02-16 21:02:34
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24278 Modified Files: Direction.java Log Message: Changed header to be able to compile |
|
From: Nordholt <nor...@us...> - 2006-02-16 20:58:22
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22141/tool Modified Files: MoveTool.java Log Message: Experimenting with having to press shift first when selecting. Added check to see if slide-edges are parrallel to the moved edge in the controlled move-mode Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** MoveTool.java 15 Feb 2006 11:26:35 -0000 1.37 --- MoveTool.java 16 Feb 2006 20:58:14 -0000 1.38 *************** *** 118,122 **** /** ! * Updat selection * */ --- 118,122 ---- /** ! * Update selection * */ *************** *** 136,139 **** --- 136,140 ---- Project.getInstance().changed(vertices); } + /** * Invoked when a mouse button has been pressed on a component. *************** *** 142,167 **** protected void pressed(MouseEvent e) { findTarget(e); ! clearConstructors(moveConstructors); ! if (target != null) { ! if (moveMode != THREE_CLICK) { ! super.pressed(e); ! initial = findInitial(target, e); ! from = initial.copy(); ! ! setupConstructors(); ! displayConstructors(moveConstructors); ! ! vertices = new HashSet(); ! moveEntities = selection; ! collect(selection, vertices); ! if (moveMode == CONTROLLED) { ! if (target instanceof Edge) { ! controlled = (Edge)target; ! } else { ! log.warn("Controlled move only works with edges"); } } - } else { - threeClickMove(e); } } --- 143,172 ---- protected void pressed(MouseEvent e) { findTarget(e); ! if (e.isShiftDown()) { ! super.pressed(e); ! } else { ! clearConstructors(moveConstructors); ! if (target != null) { ! if (moveMode != THREE_CLICK) { ! //super.pressed(e); ! initial = findInitial(target, e); ! from = initial.copy(); ! ! setupConstructors(); ! displayConstructors(moveConstructors); ! ! vertices = new HashSet(); ! moveEntities = selection; ! collect(selection, vertices); ! if (moveMode == CONTROLLED) { ! if (target instanceof Edge) { ! controlled = (Edge)target; ! } else { ! log.warn("Controlled move only works with edges"); ! } } + } else { + threeClickMove(e); } } } *************** *** 458,461 **** --- 463,471 ---- glv.getView().makeTarget(target); dragPlane = targetSurface.plane(); + Vertex controlledDir = controlled.getDirection(); + Vertex surfaceNormal = targetSurface.normal(); + restrictionVector = controlledDir.cross(surfaceNormal); + restrictionVector.scale(1 / restrictionVector.length()); + List edges = targetSurface.getEdges(); int index = edges.indexOf(controlled); *************** *** 472,491 **** rightEdge = (Edge)edges.get(index + 1); } ! Vertex to = controlled.getTo(); ! Vertex from = controlled.getFrom(); ! if (to.getEdges().contains(leftEdge) && ! from.getEdges().contains(rightEdge)) { ! toSlideEdge = leftEdge; ! fromSlideEdge = rightEdge; ! } else if (from.getEdges().contains(leftEdge) && ! to.getEdges().contains(rightEdge)) { ! fromSlideEdge = leftEdge; ! toSlideEdge = rightEdge; } - - Vertex edgeDirection = controlled.getTo().minus(controlled.getFrom()); - Vertex surfaceNormal = targetSurface.normal(); - restrictionVector = edgeDirection.cross(surfaceNormal); - restrictionVector.scale(1 / restrictionVector.length()); } } --- 482,503 ---- rightEdge = (Edge)edges.get(index + 1); } ! if (controlledDir.cross(leftEdge.getDirection()).length() > 0.00001 && ! controlledDir.cross(rightEdge.getDirection()).length() > 0.00001) { ! Vertex to = controlled.getTo(); ! Vertex from = controlled.getFrom(); ! if (to.getEdges().contains(leftEdge) && ! from.getEdges().contains(rightEdge)) { ! toSlideEdge = leftEdge; ! fromSlideEdge = rightEdge; ! } else if (from.getEdges().contains(leftEdge) && ! to.getEdges().contains(rightEdge)) { ! fromSlideEdge = leftEdge; ! toSlideEdge = rightEdge; ! } ! } else { ! dragPlane = null; ! restrictionVector = null; ! log.warn("This edge is bound"); } } } |
|
From: Nordholt <nor...@us...> - 2006-02-16 20:55:23
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20797/tool Modified Files: MultiExtrudeTool.java Log Message: Changed header to be able to compile |
|
From: Nordholt <nor...@us...> - 2006-02-16 20:54:31
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20320/tool Modified Files: PencilTool.java Log Message: made corrections to remove strange behaviour when drawing several consecutive parrellel edges, and to remove unwanted vertices created when presseing ESC while drawing Index: PencilTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** PencilTool.java 25 Jan 2006 10:02:09 -0000 1.59 --- PencilTool.java 16 Feb 2006 20:54:21 -0000 1.60 *************** *** 440,444 **** Edge edge2 = null; edge1 = (Edge)it.next(); ! edge2 = (Edge)it.next();; currentPlane = planeFromEdges(edge1, edge2); } else if (target instanceof Surface) { --- 440,444 ---- Edge edge2 = null; edge1 = (Edge)it.next(); ! edge2 = (Edge)it.next(); currentPlane = planeFromEdges(edge1, edge2); } else if (target instanceof Surface) { *************** *** 449,453 **** /** ! * Calculates the plane of two edges * @param e1 the first edge * @param e2 the second edge --- 449,453 ---- /** ! * Calculates the plane of two edges. Edges can not be parrallel. * @param e1 the first edge * @param e2 the second edge *************** *** 458,465 **** Vertex dir2 = e2.getTo().minus(e2.getFrom()); Vertex normal = dir1.cross(dir2); ! return new Plane(normal.getX(), normal.getY(), normal.getZ(), ! (-normal.getX() * e1.getTo().getX() - ! normal.getY() * e1.getTo().getY() - ! normal.getZ() * e1.getTo().getZ())); } --- 458,469 ---- Vertex dir2 = e2.getTo().minus(e2.getFrom()); Vertex normal = dir1.cross(dir2); ! if (normal.length() > 0) { ! return new Plane(normal.getX(), normal.getY(), normal.getZ(), ! (-normal.getX() * e1.getTo().getX() - ! normal.getY() * e1.getTo().getY() - ! normal.getZ() * e1.getTo().getZ())); ! } else { ! return null; ! } } *************** *** 673,680 **** Project.getInstance().delete(active); } ! Iterator it = edges.iterator(); ! while (it.hasNext()) { ! Edge edge = (Edge)it.next(); ! Project.getInstance().delete(edge); } edges = null; --- 677,689 ---- Project.getInstance().delete(active); } ! if (edges != null) { ! Iterator it = edges.iterator(); ! while (it.hasNext()) { ! Edge edge = (Edge)it.next(); ! Project.getInstance().delete(edge); ! } ! } ! if (from != null) { ! Project.getInstance().delete(from); } edges = null; |
|
From: Michael L. <he...@us...> - 2006-02-16 20:36:55
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12516/src/net/sourceforge/bprocessor/model Added Files: Direction.java Log Message: Still trying to fix header-comment - the problem is that the file was added as ASCII with keyword compression (-kk) instead of ASCII with keyword expansion (-kkv) --- NEW FILE: Direction.java --- //--------------------------------------------------------------------------------- // $Id$ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; /** * Class representing a vertex and its direction for movement */ public class Direction { /** The Vertex */ private Vertex vertex; /** The direction */ private Vertex direction; /** * Constructor * @param which the point * @param dir the direction of the point */ public Direction(Vertex which, Vertex dir) { vertex = which; direction = dir; } /** * change the direction to v projected on the sum of v and direction * @param v The vertex to alter with */ public void alterDirection(Vertex v) { Vertex sum = v.add(direction); double value = sum.dot(direction) / (direction.length() * direction.length()); direction.scale(value); } /** * @return Returns the direction. */ public Vertex getDirection() { return direction; } /** * @param direction The direction to set. */ public void setDirection(Vertex direction) { this.direction = direction; } /** * @return Returns the vertex. */ public Vertex getVertex() { return vertex; } /** * @param vertex The vertex to set. */ public void setVertex(Vertex vertex) { this.vertex = vertex; } } |
|
From: Michael L. <he...@us...> - 2006-02-16 20:35:43
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12017/src/net/sourceforge/bprocessor/model Removed Files: Direction.java Log Message: Still trying to fix header-comment - the problem is that the file was added as ASCII with keyword compression (-kk) instead of ASCII with keyword expansion (-kkv) --- Direction.java DELETED --- |
|
From: Michael L. <he...@us...> - 2006-02-16 20:29:15
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9098/src/net/sourceforge/bprocessor/model Added Files: Direction.java Log Message: Still trying to fix header-comment --- NEW FILE: Direction.java --- //--------------------------------------------------------------------------------- // $Id$ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; /** * Class representing a vertex and its direction for movement */ public class Direction { /** The Vertex */ private Vertex vertex; /** The direction */ private Vertex direction; /** * Constructor * @param which the point * @param dir the direction of the point */ public Direction(Vertex which, Vertex dir) { vertex = which; direction = dir; } /** * change the direction to v projected on the sum of v and direction * @param v The vertex to alter with */ public void alterDirection(Vertex v) { Vertex sum = v.add(direction); double value = sum.dot(direction) / (direction.length() * direction.length()); direction.scale(value); } /** * @return Returns the direction. */ public Vertex getDirection() { return direction; } /** * @param direction The direction to set. */ public void setDirection(Vertex direction) { this.direction = direction; } /** * @return Returns the vertex. */ public Vertex getVertex() { return vertex; } /** * @param vertex The vertex to set. */ public void setVertex(Vertex vertex) { this.vertex = vertex; } } |
|
From: Michael L. <he...@us...> - 2006-02-16 20:28:19
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8655/src/net/sourceforge/bprocessor/model Removed Files: Direction.java Log Message: Still trying to fix header-comment --- Direction.java DELETED --- |
|
From: Michael L. <he...@us...> - 2006-02-16 20:27:11
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7972/src/net/sourceforge/bprocessor/model Modified Files: Direction.java Log Message: Still trying to fix header-comment Index: Direction.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Direction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Direction.java 16 Feb 2006 20:26:36 -0000 1.6 --- Direction.java 16 Feb 2006 20:27:00 -0000 1.7 *************** *** 1,2 **** --- 1,8 ---- + //--------------------------------------------------------------------------------- + // $Id$ + // + // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) + // Released under the Lesser GNU Public License v2.1 + //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; |
|
From: Michael L. <he...@us...> - 2006-02-16 20:26:45
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7872/src/net/sourceforge/bprocessor/model Modified Files: Direction.java Log Message: Still trying to fix header-comment Index: Direction.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Direction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Direction.java 16 Feb 2006 20:25:51 -0000 1.5 --- Direction.java 16 Feb 2006 20:26:36 -0000 1.6 *************** *** 1,8 **** - //--------------------------------------------------------------------------------- - // $Id$ - // - // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) - // Released under the Lesser GNU Public License v2.1 - //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; --- 1,2 ---- |
|
From: Michael L. <he...@us...> - 2006-02-16 20:26:00
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7497/src/net/sourceforge/bprocessor/model Modified Files: Direction.java Log Message: Still trying to fix header-comment Index: Direction.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Direction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Direction.java 16 Feb 2006 20:23:54 -0000 1.4 --- Direction.java 16 Feb 2006 20:25:51 -0000 1.5 *************** *** 1,2 **** --- 1,8 ---- + //--------------------------------------------------------------------------------- + // $Id$ + // + // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) + // Released under the Lesser GNU Public License v2.1 + //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; |
|
From: Michael L. <he...@us...> - 2006-02-16 20:24:05
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6473/src/net/sourceforge/bprocessor/model Modified Files: Direction.java Log Message: Still trying to fix header-comment Index: Direction.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Direction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Direction.java 16 Feb 2006 20:19:58 -0000 1.3 --- Direction.java 16 Feb 2006 20:23:54 -0000 1.4 *************** *** 1,8 **** - //--------------------------------------------------------------------------------- - // $Id$ - // - // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) - // Released under the Lesser GNU Public License v2.1 - //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; --- 1,2 ---- |
|
From: Michael L. <he...@us...> - 2006-02-16 20:20:16
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4573/src/net/sourceforge/bprocessor/model Modified Files: Direction.java Log Message: Attempting to fix a weird problem with comments in the header of two files Index: Direction.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Direction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Direction.java 16 Feb 2006 15:25:08 -0000 1.2 --- Direction.java 16 Feb 2006 20:19:58 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- + package net.sourceforge.bprocessor.model; |
|
From: Michael L. <he...@us...> - 2006-02-16 20:20:13
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4643/src/net/sourceforge/bprocessor/gl/tool Modified Files: MultiExtrudeTool.java Log Message: Attempting to fix a weird problem with comments in the header of two files Index: MultiExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MultiExtrudeTool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MultiExtrudeTool.java 16 Feb 2006 15:25:05 -0000 1.2 --- MultiExtrudeTool.java 16 Feb 2006 20:20:04 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- + package net.sourceforge.bprocessor.gl.tool; |
|
From: Michael L. <he...@us...> - 2006-02-16 15:25:17
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10245/src/net/sourceforge/bprocessor/model Modified Files: Direction.java Log Message: Small changes to make it compile |
|
From: Michael L. <he...@us...> - 2006-02-16 15:25:14
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10151/src/net/sourceforge/bprocessor/gl/tool Modified Files: MultiExtrudeTool.java Log Message: Small changes to make it compile Index: MultiExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MultiExtrudeTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MultiExtrudeTool.java 16 Feb 2006 14:03:30 -0000 1.1 --- MultiExtrudeTool.java 16 Feb 2006 15:25:05 -0000 1.2 *************** *** 153,161 **** iter = c.iterator(); while (iter.hasNext()) { ! Surface s = ((Surface)iter.next()).extrude(1, elements, e2e, v2e, e2s, v2dir, v2v); ! if (extrudeSurface == null) { ! extrudeSurface = s; ! } ! elements.add(s); } return elements; --- 153,162 ---- iter = c.iterator(); while (iter.hasNext()) { ! // FIXME: following lines cannot compile ! // Surface s = ((Surface)iter.next()).extrude(1, elements, e2e, v2e, e2s, v2dir, v2v); ! // if (extrudeSurface == null) { ! // extrudeSurface = s; ! // } ! // elements.add(s); } return elements; |
|
From: rimestad <rim...@us...> - 2006-02-16 14:04:11
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12193/src/net/sourceforge/bprocessor/model Added Files: Direction.java Log Message: start of new extrusion not added to the toolbar yet because of lack of functionality --- NEW FILE: Direction.java --- //--------------------------------------------------------------------------------- // $Id$ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; /** * Class representing a vertex and its direction for movement */ public class Direction { /** The Vertex */ private Vertex vertex; /** The direction */ private Vertex direction; /** * Constructor * @param which the point * @param dir the direction of the point */ public Direction(Vertex which, Vertex dir) { vertex = which; direction = dir; } /** * change the direction to v projected on the sum of v and direction * @param v The vertex to alter with */ public void alterDirection(Vertex v) { Vertex sum = v.add(direction); double value = sum.dot(direction) / (direction.length() * direction.length()); direction.scale(value); } /** * @return Returns the direction. */ public Vertex getDirection() { return direction; } /** * @param direction The direction to set. */ public void setDirection(Vertex direction) { this.direction = direction; } /** * @return Returns the vertex. */ public Vertex getVertex() { return vertex; } /** * @param vertex The vertex to set. */ public void setVertex(Vertex vertex) { this.vertex = vertex; } } |
|
From: rimestad <rim...@us...> - 2006-02-16 14:04:10
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12152/src/net/sourceforge/bprocessor/gl/tool Added Files: MultiExtrudeTool.java Log Message: start of new extrusion not added to the toolbar yet because of lack of functionality --- NEW FILE: MultiExtrudeTool.java --- //--------------------------------------------------------------------------------- // $Id$ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.gl.tool; import java.awt.Cursor; import java.awt.event.MouseEvent; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.Iterator; import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.Transformation; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.Direction; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Plane; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; /** * The ExtrudeTool */ public class MultiExtrudeTool extends SelectTool { /** The dragSurface and extrudesurface */ private Surface top, extrudeSurface; /** A vertex-direction map */ private Map v2dir; /** The Plane to draw in */ private Plane dragPlane; /** The vertices to extrude */ private List vertices; /** The previous coordinate */ private int prevX, prevY; /** * Constructor * @param glv THe GLCanvas * @param cursor The cursor */ public MultiExtrudeTool(GLView glv, Cursor cursor) { super(glv, cursor); } /** * Invoked when a mouse button has been pressed on a component. * @param e The MouseEvent object */ protected void pressed(MouseEvent e) { extrudeSurface = null; top = null; v2dir = new HashMap(); super.pressed(e); if (target instanceof Surface) { // lav extrudsionen af selectionen extrudeSurface = (Surface)target; View view = glv.getView(); Transformation trans = view.transformation(); double x = prevX; double y = View.getHeight() - prevY; Vertex near = new Vertex(x, y, 0.0); Vertex far = new Vertex(x, y, 1.0); Edge ray = new Edge(near, far); ray = trans.unProject(ray); dragPlane = extrudeSurface.plane().orthogonalPlane(ray); } } /** * Invoked when the mouse is held pressed and moved * @param e The MouseEvent object */ protected void dragged(MouseEvent e) { if (v2dir != null) { if (top == null) { //make the extrusion Set elements = makeExtrusion(Selection.primary()); } // Find the move direction Vertex normal; if (top == null) { normal = extrudeSurface.normal(); } else { normal = top.normal(); } View view = glv.getView(); Vertex from = view.toPlaneCoords(new double[] {prevX, prevY}, dragPlane); Vertex to = view.toPlaneCoords(new double[] {e.getX(), e.getY()}, dragPlane); Vertex delta = to.minus(from); double normDotDelta = normal.dot(delta); move(v2dir.values(), normDotDelta); } } /** * Move a collection of vertex, direction pairs * @param which The colelction of pairs * @param delta The amount of the direction each vertex should move */ private void move(Collection which, double delta) { Iterator iter = which.iterator(); while (iter.hasNext()) { Direction d = (Direction)iter.next(); Vertex movement = d.getDirection(); movement.scale(delta); d.getVertex().move(movement.getX(), movement.getY(), movement.getZ()); } } /** * Invoked when a mouse button has been released on a component. * @param e The MouseEvent */ protected void released(MouseEvent e) { super.released(e); } /** * Make the extrusion from a set of surfaces * @param c the collection of surfaces to extrude * @return the elements created for extrusion */ private Set makeExtrusion(Collection c) { Set elements = new HashSet(); Map e2e = new HashMap(); // edge to edge map Map e2s = new HashMap(); // edge to surface map Map v2v = new HashMap(); // vertex to extruded edge map v2dir = new HashMap(); // vertex to direction map Map v2e = new HashMap(); // vertex to edge map // Check for selection of only surfaces Iterator iter = c.iterator(); while (iter.hasNext()) { if (!(iter.next() instanceof Surface)) { extrudeSurface = null; return null; } } iter = c.iterator(); while (iter.hasNext()) { Surface s = ((Surface)iter.next()).extrude(1, elements, e2e, v2e, e2s, v2dir, v2v); if (extrudeSurface == null) { extrudeSurface = s; } elements.add(s); } return elements; } } |
|
From: Michael L. <he...@us...> - 2006-02-15 11:36:00
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26745/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: New icons in d-view Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GenericTreeView.java 14 Feb 2006 14:10:28 -0000 1.14 --- GenericTreeView.java 15 Feb 2006 11:35:50 -0000 1.15 *************** *** 7,10 **** --- 7,12 ---- package net.sourceforge.bprocessor.gui.treeview; + import java.awt.Component; + import java.net.URL; import java.util.Collection; import java.util.Iterator; *************** *** 12,15 **** --- 14,19 ---- import java.util.Set; + import javax.swing.ImageIcon; + import javax.swing.JTree; import javax.swing.SwingUtilities; import javax.swing.event.TreeSelectionEvent; *************** *** 36,55 **** */ public class GenericTreeView extends TreeView implements Observer { - - /** - * Renderer - */ - public class Renderer extends DefaultTreeCellRenderer { - /** - * Constructor - */ - public Renderer() { - super(); - } - } /** Show numbers of elements in display-string of container-nodes */ private static final boolean SHOW_COUNTERS = false; /** The model */ protected DefaultTreeModel model; --- 40,86 ---- */ public class GenericTreeView extends TreeView implements Observer { /** Show numbers of elements in display-string of container-nodes */ private static final boolean SHOW_COUNTERS = false; + /** Space icon */ + protected static ImageIcon spaceicon; + + /** Space group icon*/ + protected static ImageIcon spacegroupicon; + + /** Surface icon */ + protected static ImageIcon surfaceicon; + + /** Surface group icon */ + protected static ImageIcon surfacegroupicon; + + /** Edge icon */ + protected static ImageIcon edgeicon; + + /** Edge group */ + protected static ImageIcon edgegroupicon; + + /** Vertex icon */ + protected static ImageIcon vertexicon; + + /** Vertex group icon */ + protected static ImageIcon vertexgroupicon; + + /** Generic group icon */ + protected static ImageIcon genericgroupicon; + + static { + spaceicon = loadIcon("Biconspace.gif"); + spacegroupicon = loadIcon("Biconspacegroup.gif"); + surfaceicon = loadIcon("Biconsurface.gif"); + surfacegroupicon = loadIcon("Biconsurfacegroup.gif"); + edgeicon = loadIcon("Biconedge.gif"); + edgegroupicon = loadIcon("Biconedgegroup.gif"); + vertexicon = loadIcon("Biconvertex.gif"); + vertexgroupicon = loadIcon("Biconvertexgroup.gif"); + genericgroupicon = loadIcon("Bicongenericgroup.gif"); + } + /** The model */ protected DefaultTreeModel model; *************** *** 65,68 **** --- 96,157 ---- /** + * Renderer + */ + public class Renderer extends DefaultTreeCellRenderer { + /** + * Constructor + */ + public Renderer() { + super(); + } + + /** + * Customize icon + * @param tree Tree + * @param value Object + * @param sel Boolean + * @param expanded Boolean + * @param leaf Boolean + * @param row Integer + * @param hasFocus Boolean + * @return Component + */ + public Component getTreeCellRendererComponent( + JTree tree, + Object value, + boolean sel, + boolean expanded, + boolean leaf, + int row, + boolean hasFocus) { + + super.getTreeCellRendererComponent( + tree, value, sel, + expanded, leaf, row, + hasFocus); + if (value instanceof GenericNode) { + GenericNode node = (GenericNode) value; + ImageIcon icon = node.icon(); + if (icon != null) { + setIcon(icon); + } + } + return this; + } + } + + /** + * Load an icon + * @param name Filename of icon + * @return Icon + */ + public static ImageIcon loadIcon(String name) { + ClassLoader classloader = Thread.currentThread().getContextClassLoader(); + URL url = classloader.getResource(name); + ImageIcon icon = new ImageIcon(url); + return icon; + } + + /** * Constructor for GenericTreeView */ *************** *** 78,81 **** --- 167,171 ---- model.nodeStructureChanged(root); isChanged = false; + setCellRenderer(new Renderer()); changed(); } *************** *** 125,131 **** /** * ContainerNode */ ! public class ContainerNode extends DefaultMutableTreeNode { /** * Constructor for ContainerNode --- 215,241 ---- /** + * GenericNode + */ + public class GenericNode extends DefaultMutableTreeNode { + /** + * Constructor + * @param object The value + */ + public GenericNode(Object object) { + super(object); + } + + /** + * Return icon + * @return Icon + */ + public ImageIcon icon() { + return null; + } + } + /** * ContainerNode */ ! public class ContainerNode extends GenericNode { /** * Constructor for ContainerNode *************** *** 153,156 **** --- 263,275 ---- return false; } + + /** + * Return icon + * @return Icon + */ + public ImageIcon icon() { + return genericgroupicon; + } + } *************** *** 158,162 **** * The EntityNode */ ! public class EntityNode extends DefaultMutableTreeNode { /** * Constructor for EntityNode --- 277,281 ---- * The EntityNode */ ! public class EntityNode extends GenericNode { /** * Constructor for EntityNode *************** *** 192,201 **** super(space); Set surfaces = space.getEnvelope(); ! add(new SurfaceContainer("Surface", surfaces)); ! add(new ContainerNode("Element")); if (space.getModellor() != null) { add(new ModellorNode(space.getModellor())); } } } --- 311,328 ---- super(space); Set surfaces = space.getEnvelope(); ! add(new SurfaceContainer("Envelope", surfaces)); ! add(new ContainerNode("Interior")); if (space.getModellor() != null) { add(new ModellorNode(space.getModellor())); } } + + /** + * Return icon + * @return icon + */ + public ImageIcon icon() { + return spaceicon; + } } *************** *** 210,214 **** public SurfaceNode(Surface surface) { super(surface); ! add(new EdgeContainer("Edge", surface.getEdges())); } } --- 337,349 ---- public SurfaceNode(Surface surface) { super(surface); ! add(new EdgeContainer("Contour", surface.getEdges())); ! } ! ! /** ! * Return icon ! * @return Icon ! */ ! public ImageIcon icon() { ! return surfaceicon; } } *************** *** 227,230 **** --- 362,373 ---- add(new VertexNode(edge.getTo())); } + + /** + * Return icon + * @return Icon + */ + public ImageIcon icon() { + return edgeicon; + } } *************** *** 240,243 **** --- 383,395 ---- super(vertex); } + + /** + * Return icon + * @return Icon + */ + public ImageIcon icon() { + return vertexicon; + } + } *************** *** 285,288 **** --- 437,449 ---- } } + + /** + * Return icon + * @return Icon + */ + public ImageIcon icon() { + return spacegroupicon; + } + } *************** *** 304,307 **** --- 465,477 ---- } } + + /** + * Return icon + * @return Icon + */ + public ImageIcon icon() { + return surfacegroupicon; + } + } *************** *** 323,326 **** --- 493,505 ---- } } + + /** + * Return icon + * @return Icon + */ + public ImageIcon icon() { + return edgegroupicon; + } + } |
|
From: Michael L. <he...@us...> - 2006-02-15 11:36:00
|
Update of /cvsroot/bprocessor/gui/src/gfx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26745/src/gfx Added Files: Biconedge.gif Biconvertexgroup.gif Bicongenericgroup.gif Biconedgegroup.gif Biconsurface.gif Biconspace.gif Biconsurfacegroup.gif Biconspacegroup.gif Biconvertex.gif Log Message: New icons in d-view --- NEW FILE: Biconedgegroup.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Biconsurface.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Bicongenericgroup.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Biconspace.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Biconspacegroup.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Biconedge.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Biconsurfacegroup.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Biconvertex.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Biconvertexgroup.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Nordholt <nor...@us...> - 2006-02-15 11:27:57
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24452 Modified Files: ToolFactory.java Log Message: you can choose the controlled move Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ToolFactory.java 9 Feb 2006 15:02:22 -0000 1.30 --- ToolFactory.java 15 Feb 2006 11:27:48 -0000 1.31 *************** *** 628,631 **** --- 628,634 ---- mi.addActionListener(mpal); pm.add(mi); + mi = new JMenuItem("Controlled"); + mi.addActionListener(mpal); + pm.add(mi); pm.show(button, 0, button.getHeight()); } *************** *** 633,637 **** /** ! listener */ class MovePopupActionListener implements ActionListener { --- 636,640 ---- /** ! listener for the move popup. */ class MovePopupActionListener implements ActionListener { *************** *** 647,650 **** --- 650,655 ---- } else if (actionEvent.getActionCommand().equals("Free plane")) { move.setMoveMode(move.FREE_SNAP); + } else if (actionEvent.getActionCommand().equals("Controlled")) { + move.setMoveMode(move.CONTROLLED); } } *************** *** 652,654 **** } } - --- 657,658 ---- |
|
From: Nordholt <nor...@us...> - 2006-02-15 11:26:44
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24141 Modified Files: MoveTool.java Log Message: implemented first draft controlled move Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** MoveTool.java 15 Feb 2006 11:10:39 -0000 1.36 --- MoveTool.java 15 Feb 2006 11:26:35 -0000 1.37 *************** *** 50,53 **** --- 50,56 ---- public static final int THREE_CLICK = 2; + /** The controlled movement mode */ + public static final int CONTROLLED = 3; + /** The initial movepoint */ private Vertex initial; *************** *** 88,91 **** --- 91,103 ---- /** The Collection of entities being moved */ private Collection moveEntities; + + /** Sliding edge of the to point */ + private Edge toSlideEdge; + + /** Sliding edge of the from point */ + private Edge fromSlideEdge; + + /** The edge being moved in a controlled way */ + private Edge controlled; /** *************** *** 99,102 **** --- 111,116 ---- restrictionVector = null; snapEntity = null; + toSlideEdge = null; + fromSlideEdge = null; numberOfClicks = 1; moveMode = AXIS_RESTRICTED; *************** *** 104,108 **** /** ! * Update selection * */ --- 118,122 ---- /** ! * Updat selection * */ *************** *** 141,144 **** --- 155,165 ---- moveEntities = selection; collect(selection, vertices); + if (moveMode == CONTROLLED) { + if (target instanceof Edge) { + controlled = (Edge)target; + } else { + log.warn("Controlled move only works with edges"); + } + } } else { threeClickMove(e); *************** *** 229,232 **** --- 250,255 ---- restrictionVector = null; dragPlane = null; + toSlideEdge = null; + fromSlideEdge = null; number = ""; } *************** *** 266,271 **** --- 289,332 ---- if (parentPos != null) { Vertex delta = parentPos.minus(from); + //Restricting movement to fit movement mode. delta = restrict(delta, e); + + if (moveMode == CONTROLLED) { + Vertex toDelta; + Vertex fromDelta; + + Vertex deltaUnit = delta.copy(); + deltaUnit.scale(1 / deltaUnit.length()); + + Vertex toDir = toSlideEdge.getTo().minus(toSlideEdge.getFrom()); + double toScale; + if (delta.getX() != 0) { + toScale = delta.getX() / (toDir.dot(deltaUnit) * deltaUnit.getX()); + } else if (delta.getY() != 0) { + toScale = delta.getY() / (toDir.dot(deltaUnit) * deltaUnit.getY()); + } else { + toScale = delta.getZ() / (toDir.dot(deltaUnit) * deltaUnit.getZ()); + } + + Vertex fromDir = fromSlideEdge.getTo().minus(fromSlideEdge.getFrom()); + double fromScale; + if (delta.getX() != 0) { + fromScale = delta.getX() / (fromDir.dot(deltaUnit) * deltaUnit.getX()); + } else if (delta.getY() != 0) { + fromScale = delta.getY() / (fromDir.dot(deltaUnit) * deltaUnit.getY()); + } else { + fromScale = delta.getZ() / (fromDir.dot(deltaUnit) * deltaUnit.getZ()); + } + + toDir.scale(toScale); + toDelta = toDir; + fromDir.scale(fromScale); + fromDelta = fromDir; + + + controlled.getTo().move(toDelta.getX(), toDelta.getY(), toDelta.getZ()); + controlled.getFrom().move(fromDelta.getX(), fromDelta.getY(), fromDelta.getZ()); + } if (log.isDebugEnabled()) { *************** *** 274,279 **** } ! delta = snapToInitial(delta); ! move(vertices, delta); from.move(delta.getX(), delta.getY(), delta.getZ()); glv.setLength(from.minus(initial).length()); --- 335,342 ---- } ! //delta = snapToInitial(delta); ! if (moveMode != CONTROLLED) { ! move(vertices, delta); ! } from.move(delta.getX(), delta.getY(), delta.getZ()); glv.setLength(from.minus(initial).length()); *************** *** 331,334 **** --- 394,402 ---- } } + } else if (moveMode == CONTROLLED) { + Vertex restrictCopy = restrictionVector.copy(); + restrictCopy.scale(1 / restrictCopy.length()); + restrictCopy.scale(delta.dot(restrictCopy)); + delta = restrictCopy; } return delta; *************** *** 382,385 **** --- 450,494 ---- clearConstructors(moveConstructors); } + } else if (moveMode == CONTROLLED && controlled != null) { + if (toSlideEdge == null && fromSlideEdge == null) { + findTarget(e); + if (target instanceof Surface) { + Surface targetSurface = (Surface)target; + if (controlled.getSurfaces().contains(targetSurface)) { + glv.getView().makeTarget(target); + dragPlane = targetSurface.plane(); + List edges = targetSurface.getEdges(); + int index = edges.indexOf(controlled); + Edge leftEdge; + Edge rightEdge; + if (index == 0) { + leftEdge = (Edge)edges.get(edges.size() - 1); + rightEdge = (Edge)edges.get(index + 1); + } else if (index == (edges.size() - 1)) { + leftEdge = (Edge)edges.get(index - 1); + rightEdge = (Edge)edges.get(0); + } else { + leftEdge = (Edge)edges.get(index - 1); + rightEdge = (Edge)edges.get(index + 1); + } + Vertex to = controlled.getTo(); + Vertex from = controlled.getFrom(); + if (to.getEdges().contains(leftEdge) && + from.getEdges().contains(rightEdge)) { + toSlideEdge = leftEdge; + fromSlideEdge = rightEdge; + } else if (from.getEdges().contains(leftEdge) && + to.getEdges().contains(rightEdge)) { + fromSlideEdge = leftEdge; + toSlideEdge = rightEdge; + } + + Vertex edgeDirection = controlled.getTo().minus(controlled.getFrom()); + Vertex surfaceNormal = targetSurface.normal(); + restrictionVector = edgeDirection.cross(surfaceNormal); + restrictionVector.scale(1 / restrictionVector.length()); + } + } + } } } *************** *** 512,516 **** } } - Project.getInstance().changed(sel); } --- 621,624 ---- |
|
From: rimestad <rim...@us...> - 2006-02-15 11:13:11
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20305/src/net/sourceforge/bprocessor/gui/attrview Modified Files: GenericAttribute.java StringAttribute.java GenericPanel.java Log Message: Removed the update method from the attributes and let the genericPanel do the cleaning and re - building of the attributeview Index: StringAttribute.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/StringAttribute.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StringAttribute.java 13 Feb 2006 21:16:39 -0000 1.5 --- StringAttribute.java 15 Feb 2006 11:12:51 -0000 1.6 *************** *** 239,243 **** editor.removeKeyListener(this); editor = null; ! component.add(createValueLabel((String)attribute.getValue())); component.revalidate(); } --- 239,243 ---- editor.removeKeyListener(this); editor = null; ! component.add(createValueLabel(attribute.getValue())); component.revalidate(); } *************** *** 245,257 **** /** - * Update the content - */ - public void update() { - component.remove(0); - component.add(createValueLabel((String)attribute.getValue())); - component.revalidate(); - } - - /** * Respond to the enter key by stopping editing. * @param event The KeyEvent --- 245,248 ---- Index: GenericPanel.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GenericPanel.java 13 Feb 2006 21:16:39 -0000 1.6 --- GenericPanel.java 15 Feb 2006 11:12:51 -0000 1.7 *************** *** 8,12 **** import java.awt.BorderLayout; - import java.awt.Component; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; --- 8,11 ---- *************** *** 116,120 **** where.add(more); } else { ! System.out.println("[GenericPanel] Something were not implemented"); } } --- 115,119 ---- where.add(more); } else { ! log.info("[GenericPanel] Something were not implemented"); } } *************** *** 235,244 **** */ public void update() { ! Component[] c = content.getComponents(); ! for (int i = 0; i < content.getComponentCount(); i++) { ! if (c[i] instanceof GenericAttribute) { ! ((GenericAttribute)c[i]).update(); ! } ! } revalidate(); } --- 234,240 ---- */ public void update() { ! //FIXME need to delay call to a reasonable time ! content.removeAll(); ! generateContent(obj.getAttributes(), content); revalidate(); } Index: GenericAttribute.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericAttribute.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GenericAttribute.java 11 Feb 2006 18:02:40 -0000 1.2 --- GenericAttribute.java 15 Feb 2006 11:12:51 -0000 1.3 *************** *** 50,56 **** public abstract void cancelEditing(); - /** - * Update the content - */ - public abstract void update(); } --- 50,52 ---- |
