bprocessor-commit Mailing List for B-processor (Page 96)
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-10-10 15:04:43
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29966/src/net/sourceforge/bprocessor/gl/tool Modified Files: Pencil.java Log Message: Moving drag handling to abstractpencil Index: Pencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Pencil.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Pencil.java 5 Oct 2006 11:26:59 -0000 1.14 --- Pencil.java 10 Oct 2006 15:03:01 -0000 1.15 *************** *** 25,32 **** */ public class Pencil extends AbstractPencil { - - /** Wherter or not the pencil is being dragged */ - private boolean dragging; - /** * Constructor for Pencil --- 25,28 ---- *************** *** 81,84 **** --- 77,81 ---- if (start == null) { start = current; + active = true; } else { if (start.vertex().equalEps(current.vertex())) { *************** *** 108,138 **** glv.repaint(); } - - /** - * @param e MouseEvent - */ - protected void dragged(MouseEvent e) { - if (!dragging) { - dragging = true; - } - moved(e); - } - - /** - * @param e MouseEvent - */ - protected void released(MouseEvent e) { - if (dragging) { - pressed(e); - dragging = false; - } - } - - /** - * Clean up - */ - public void cleanUp() { - super.cleanUp(); - dragging = false; - } } --- 105,107 ---- |
|
From: Nordholt <nor...@us...> - 2006-10-10 15:04:09
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30356/src/net/sourceforge/bprocessor/gl/tool Modified Files: TapeMeasureTool.java Log Message: Moving drag handling to abstractpencil Index: TapeMeasureTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasureTool.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** TapeMeasureTool.java 11 Sep 2006 12:47:32 -0000 1.20 --- TapeMeasureTool.java 10 Oct 2006 15:03:50 -0000 1.21 *************** *** 87,97 **** } } - - /** - * Invoked when the mouse is held pressed and moved - * @param e The MouseEvent object - */ - protected void dragged(MouseEvent e) { - } /** --- 87,90 ---- *************** *** 103,111 **** if (current != null && current.object() instanceof Edge) { start = current; currentEdge = (Edge)current.object(); constructionPoint = start.vertex().copy(); currentConstruction = new Line(constructionPoint, currentEdge.getDirection(), true, false); - } } else { --- 96,104 ---- if (current != null && current.object() instanceof Edge) { start = current; + active = true; currentEdge = (Edge)current.object(); constructionPoint = start.vertex().copy(); currentConstruction = new Line(constructionPoint, currentEdge.getDirection(), true, false); } } else { *************** *** 133,143 **** } } - - /** - * Invoked when a mouse button has been released on a component. - * @param e The MouseEvent - */ - protected void released(MouseEvent e) { - } /** --- 126,129 ---- *************** *** 146,150 **** private void endTapeMeasure() { if (currentConstruction != null) { - // currentConstruction.setEditable(true); Geometry.insertConstructor(currentConstruction); constructors(new LinkedList()); --- 132,135 ---- *************** *** 153,156 **** --- 138,142 ---- start = null; lockDirection = null; + super.cleanUp(); glv.repaint(); } |
|
From: Nordholt <nor...@us...> - 2006-10-10 15:03:30
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30340/src/net/sourceforge/bprocessor/gl/tool Modified Files: RectTool.java Log Message: Moving drag handling to abstractpencil Index: RectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RectTool.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** RectTool.java 11 Sep 2006 12:47:32 -0000 1.16 --- RectTool.java 10 Oct 2006 15:03:26 -0000 1.17 *************** *** 40,47 **** where the rectangle was moved */ private Vertex lastCurrent; - - /** Dragging flag */ - private boolean dragging; - /** * Constructor --- 40,43 ---- *************** *** 150,153 **** --- 146,150 ---- start = current; lastCurrent = start.vertex(); + active = true; } else if (baseEdge == null) { if (start.vertex().distance(current.vertex()) > 0.0) { *************** *** 163,186 **** updateFeedback(); } - - /** - * @param e MouseEvent - */ - protected void dragged(MouseEvent e) { - moved(e); - if (!dragging) { - dragging = true; - } - } - - /** - * @param e MouseEvent - */ - protected void released(MouseEvent e) { - if (dragging && start != null) { - pressed(e); - dragging = false; - } - } /** --- 160,163 ---- |
|
From: Nordholt <nor...@us...> - 2006-10-10 15:02:34
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29910/src/net/sourceforge/bprocessor/gl/tool Modified Files: OffsetTool.java Log Message: Moving drag handling to abstractpencil Index: OffsetTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OffsetTool.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** OffsetTool.java 9 Oct 2006 13:27:15 -0000 1.10 --- OffsetTool.java 10 Oct 2006 15:02:25 -0000 1.11 *************** *** 55,61 **** private Vertex outNormal; - /** Dragging flag */ - private boolean dragging; - /** The point the offset are started from */ private Vertex edgePoint; --- 55,58 ---- |
|
From: Nordholt <nor...@us...> - 2006-10-10 15:02:09
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29872/src/net/sourceforge/bprocessor/gl/tool Modified Files: MoveTool.java Log Message: Moving drag handling to abstractpencil Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** MoveTool.java 11 Sep 2006 13:13:07 -0000 1.70 --- MoveTool.java 10 Oct 2006 15:02:07 -0000 1.71 *************** *** 50,60 **** /** To */ private Vertex to; ! ! /** active */ ! private boolean active; ! ! /** dragging flag */ ! private boolean dragging = false; ! /** * Constructor for MoveTool --- 50,54 ---- /** To */ private Vertex to; ! /** * Constructor for MoveTool *************** *** 210,233 **** } } - - /** - * @see net.sourceforge.bprocessor.gl.tool.AbstractTool#dragged() - */ - protected void dragged(MouseEvent e) { - if (!dragging) { - dragging = true; - } - moved(e); - } - - /** - * @see net.sourceforge.bprocessor.gl.tool.AbstractTool#released() - */ - protected void released(MouseEvent e) { - if (dragging) { - dragging = false; - pressed(e); - } - } /** --- 204,207 ---- |
|
From: Nordholt <nor...@us...> - 2006-10-10 15:01:13
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29138/src/net/sourceforge/bprocessor/gl/tool Modified Files: ExtrudeTool.java Log Message: Moving drag handling to abstractpencil Index: ExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ExtrudeTool.java 5 Oct 2006 11:26:59 -0000 1.24 --- ExtrudeTool.java 10 Oct 2006 15:01:01 -0000 1.25 *************** *** 36,42 **** static final int UNDICIDED = 0; - /** If the input mode is dragging */ - static final int DRAG_MODE = 1; - /** If the input mode is press - press */ static final int MOVE_MODE = 2; --- 36,39 ---- *************** *** 437,463 **** } } - - /** - * Invoked when the mouse is held pressed and moved - * @param e The MouseEvent object - */ - protected void dragged(MouseEvent e) { - if (Math.abs(prevX - e.getX()) + Math.abs(prevY - e.getY()) > 10) { - mode = DRAG_MODE; - } - if (mode == DRAG_MODE) { - doThing(e); - } - } - - /** - * Invoked when a mouse button has been released on a component. - * @param e The MouseEvent - */ - protected void released(MouseEvent e) { - if (mode == DRAG_MODE) { - finishExtrusion(); - } - } /** --- 434,437 ---- |
|
From: Nordholt <nor...@us...> - 2006-10-10 15:00:50
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29109/src/net/sourceforge/bprocessor/gl/tool Modified Files: ConstructorTool.java Log Message: Moving drag handling to abstractpencil Index: ConstructorTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ConstructorTool.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ConstructorTool.java 18 Aug 2006 08:24:16 -0000 1.11 --- ConstructorTool.java 10 Oct 2006 15:00:43 -0000 1.12 *************** *** 143,146 **** --- 143,147 ---- p1 = current; start = p1; + active = true; } else { if (p1.vertex().equalEps(current.vertex())) { *************** *** 167,182 **** updateFeedback(); } - - /** - * @param e MouseEvent - */ - protected void dragged(MouseEvent e) { - } - - /** - * @param e MouseEvent - */ - protected void released(MouseEvent e) { - } - } --- 168,170 ---- |
|
From: Nordholt <nor...@us...> - 2006-10-10 15:00:29
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29092/src/net/sourceforge/bprocessor/gl/tool Modified Files: ArcTool.java Log Message: Moving drag handling to abstractpencil Index: ArcTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ArcTool.java 11 Sep 2006 12:47:32 -0000 1.13 --- ArcTool.java 10 Oct 2006 15:00:26 -0000 1.14 *************** *** 29,35 **** private Intersection end; - /** Wherther or not the arc tool is being dragged */ - private boolean dragging; - /** Radius of the current arc */ private double radius = 0; --- 29,32 ---- *************** *** 191,194 **** --- 188,192 ---- if (start == null) { start = current; + active = true; } else { if (end == null) { *************** *** 198,201 **** --- 196,200 ---- start = null; end = null; + active = false; } } *************** *** 204,229 **** } } - - /** - * @param e MouseEvent - */ - protected void dragged(MouseEvent e) { - if (!dragging) { - dragging = true; - } - moved(e); - } - - - /** - * @param e MouseEvent - */ - protected void released(MouseEvent e) { - if (dragging) { - pressed(e); - dragging = false; - } - - } /** --- 203,206 ---- |
|
From: Nordholt <nor...@us...> - 2006-10-10 14:59:43
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28668/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractPencil.java Log Message: Moving drag handling to abstractpencil Index: AbstractPencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** AbstractPencil.java 5 Oct 2006 13:06:15 -0000 1.69 --- AbstractPencil.java 10 Oct 2006 14:59:33 -0000 1.70 *************** *** 97,100 **** --- 97,106 ---- protected Timer timer; + /** Wherther or not the tool is doing some work */ + protected boolean active; + + /** Wherther or not the tool is dragging */ + protected boolean dragging; + /** * Constructor *************** *** 107,110 **** --- 113,117 ---- timer.setRepeats(false); lock = false; + active = false; plane = new Plane (0, 0, 1, 0); } *************** *** 618,621 **** --- 625,650 ---- /** + * handles dragging + * @param e the mouseevent + */ + protected void dragged(MouseEvent e) { + if (!dragging && active) { + dragging = true; + } + moved(e); + } + + /** + * handles mouse-released + *@param e the mouseevent + */ + protected void released(MouseEvent e) { + if (dragging) { + dragging = false; + pressed(e); + } + } + + /** * onVertex - current vertex is pressed */ *************** *** 772,775 **** --- 801,806 ---- glv.repaint(); timer.stop(); + active = false; + dragging = false; super.cleanUp(); } |
|
From: Michael L. <he...@us...> - 2006-10-10 14:41:41
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21565/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: Syntax for creating strings and literal arrays Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** SpaceTool.java 10 Oct 2006 14:02:43 -0000 1.49 --- SpaceTool.java 10 Oct 2006 14:41:33 -0000 1.50 *************** *** 630,633 **** --- 630,640 ---- } }); + globals.put("length", new Builtin() { + public void evaluate(Environment env, Stack stack) { + List argument = (List) env.get(0); + stack.push(new Double(argument.size())); + } + }); + globals.put("vertex", new Builtin() { public void evaluate(Environment env, Stack stack) { |
|
From: Michael L. <he...@us...> - 2006-10-10 14:41:39
|
Update of /cvsroot/bprocessor/bscript/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21574/src/etc Modified Files: bscript.g Log Message: Syntax for creating strings and literal arrays Index: bscript.g =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/etc/bscript.g,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** bscript.g 10 Oct 2006 13:49:35 -0000 1.10 --- bscript.g 10 Oct 2006 14:41:36 -0000 1.11 *************** *** 29,32 **** --- 29,34 ---- LB : '[' ; RB : ']' ; + LC : '{' ; + RC : '}' ; Equal: '=' ; LtEq: "<=" ; *************** *** 56,59 **** --- 58,64 ---- ; + String + : ( '"' ( ~'"' )* '"' ) + ; *************** *** 159,162 **** --- 164,173 ---- ; + protected list[Function env] + : LC { env.append(new Mark()); } + expression[env] ( Comma expression[env] ) * + RC { env.append(new Primitive(Primitive.LST)); } + ; + simpleton[Function env] : value[env] *************** *** 164,167 **** --- 175,179 ---- | Lt procedurecall[env] Gt | unarysimpleton[env] + | list[env] ; *************** *** 203,206 **** --- 215,219 ---- | unaryatom[env] | functioncall[env] + | list[env] ; *************** *** 210,215 **** --- 223,231 ---- ; + + literal[Function env] : n:Number { env.append(new Literal(new Double(n.getText()))); } + | s:String { env.append(new Literal(s.getText().substring(1, s.getText().length() - 1))); } ; |
|
From: Michael L. <he...@us...> - 2006-10-10 14:41:38
|
Update of /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21574/src/net/sourceforge/bprocessor/model/evaluator Modified Files: Primitive.java Log Message: Syntax for creating strings and literal arrays Index: Primitive.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Primitive.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Primitive.java 29 Sep 2006 07:13:16 -0000 1.5 --- Primitive.java 10 Oct 2006 14:41:36 -0000 1.6 *************** *** 8,11 **** --- 8,12 ---- package net.sourceforge.bprocessor.model.evaluator; + import java.util.ArrayList; import java.util.List; import java.util.Stack; *************** *** 33,37 **** /** get */ public static final int GET = 9; ! /** opcode */ private int opcode; --- 34,39 ---- /** get */ public static final int GET = 9; ! /** list */ ! public static final int LST = 10; /** opcode */ private int opcode; *************** *** 106,109 **** --- 108,126 ---- break; } + case LST: { + int length = stack.search(Function.mark) - 1; + List arguments = new ArrayList(length); + for (int i = 0; i < length; i++) { + arguments.add(null); + } + while (length > 0) { + Object current = stack.pop(); + arguments.set(length - 1, current); + length--; + } + stack.pop(); + stack.push(arguments); + break; + } } return 1; |
|
From: rimestad <rim...@us...> - 2006-10-10 14:04:53
|
Update of /cvsroot/bprocessor/model/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6739/src/etc Modified Files: bprocessor.xsd Log Message: Some way in the impl. of modellor to xml but not all so dont use load save (that is undo as well) when using modellors it will crash Index: bprocessor.xsd =================================================================== RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** bprocessor.xsd 9 Oct 2006 08:49:21 -0000 1.18 --- bprocessor.xsd 10 Oct 2006 14:04:45 -0000 1.19 *************** *** 13,16 **** --- 13,17 ---- jaxb:version="1.0"> + <!-- Needed for subtypeing --> <xsd:annotation> <xsd:appinfo> *************** *** 23,39 **** <!-- Type definitions --> <xsd:complexType name="EntityType"> - <xsd:attribute name="id" type="xsd:long" use="required"/> - <xsd:attribute name="progid" type="xsd:long" use="optional"/> - </xsd:complexType> - - <xsd:complexType name="ConstructorType"> <xsd:complexContent> ! <xsd:extension base="EntityType"> ! <xsd:sequence> ! <xsd:element ref="vertex" maxOccurs="1" minOccurs="0"/> ! </xsd:sequence> ! <xsd:attribute name="active" type="xsd:boolean" use="required"/> ! <xsd:attribute name="editable" type="xsd:boolean" use="required"/> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> --- 24,32 ---- <!-- Type definitions --> <xsd:complexType name="EntityType"> <xsd:complexContent> ! <xsd:extension base="Types"> ! <xsd:attribute name="id" type="xsd:long" use="required"/> ! <xsd:attribute name="progid" type="xsd:long" use="optional"/> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> *************** *** 47,50 **** --- 40,44 ---- <xsd:element name="boundary" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/> <xsd:element name="constructor" type="ConstructorType" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element name="modellor" type="ModellorType" maxOccurs="1" minOccurs="0"/> <xsd:element ref="space" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="surface" maxOccurs="unbounded" minOccurs="0"/> *************** *** 110,113 **** --- 104,119 ---- </xsd:complexType> + <xsd:complexType name="ConstructorType"> + <xsd:complexContent> + <xsd:extension base="EntityType"> + <xsd:sequence> + <xsd:element ref="vertex" maxOccurs="1" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="active" type="xsd:boolean" use="required"/> + <xsd:attribute name="editable" type="xsd:boolean" use="required"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:complexType name="LineType"> <xsd:complexContent> *************** *** 141,147 **** <xsd:complexType name="VertexesType"> ! <xsd:sequence> ! <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/> ! </xsd:sequence> </xsd:complexType> --- 147,200 ---- <xsd:complexType name="VertexesType"> ! <xsd:sequence> ! <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/> ! </xsd:sequence> ! </xsd:complexType> ! ! <xsd:complexType name="ModellorType"> ! <xsd:complexContent> ! <xsd:extension base="EntityType"> ! <xsd:sequence> ! <xsd:element name="attribute" type="MapElementType" maxOccurs="unbounded" minOccurs="0"/> ! </xsd:sequence> ! <xsd:attribute name="ty" type="xsd:string"/> ! </xsd:extension> ! </xsd:complexContent> ! </xsd:complexType> ! ! <xsd:complexType name="Types"> ! </xsd:complexType> ! ! <xsd:complexType name="IntegerType"> ! <xsd:complexContent> ! <xsd:extension base="Types"> ! <xsd:sequence> ! <xsd:element name="integer" type="xsd:int" maxOccurs="1" minOccurs="1"/> ! </xsd:sequence> ! </xsd:extension> ! </xsd:complexContent> ! </xsd:complexType> ! ! <xsd:complexType name="StringType"> ! <xsd:complexContent> ! <xsd:extension base="Types"> ! <xsd:sequence> ! <xsd:element name="string" type="xsd:string" maxOccurs="1" minOccurs="1"/> ! </xsd:sequence> ! </xsd:extension> ! </xsd:complexContent> ! </xsd:complexType> ! ! <xsd:complexType name="MapElementType"> ! <xsd:sequence> ! <xsd:element name="key" type="xsd:string" maxOccurs="1" minOccurs="1"/> ! <xsd:element name="value" type="Types" maxOccurs="1" minOccurs="1"/> ! </xsd:sequence> ! </xsd:complexType> ! ! <xsd:complexType name="TransformType"> ! <xsd:sequence> ! <xsd:element name="content"/> ! </xsd:sequence> </xsd:complexType> |
|
From: rimestad <rim...@us...> - 2006-10-10 14:04:48
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6739/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: Some way in the impl. of modellor to xml but not all so dont use load save (that is undo as well) when using modellors it will crash Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Persistence.java 9 Oct 2006 08:49:21 -0000 1.10 --- Persistence.java 10 Oct 2006 14:04:45 -0000 1.11 *************** *** 7,11 **** package net.sourceforge.bprocessor.model; ! import net.sourceforge.bprocessor.model.xml.Bmodel; import net.sourceforge.bprocessor.model.xml.ConstructorType; --- 7,11 ---- package net.sourceforge.bprocessor.model; ! import net.sourceforge.bprocessor.model.modellor.Modellor; import net.sourceforge.bprocessor.model.xml.Bmodel; import net.sourceforge.bprocessor.model.xml.ConstructorType; *************** *** 13,20 **** --- 13,24 ---- import net.sourceforge.bprocessor.model.xml.EdgeType; import net.sourceforge.bprocessor.model.xml.EntityType; + import net.sourceforge.bprocessor.model.xml.IntegerType; import net.sourceforge.bprocessor.model.xml.LineType; + import net.sourceforge.bprocessor.model.xml.MapElementType; import net.sourceforge.bprocessor.model.xml.MaterialType; + import net.sourceforge.bprocessor.model.xml.ModellorType; import net.sourceforge.bprocessor.model.xml.PointType; import net.sourceforge.bprocessor.model.xml.SpaceType; + import net.sourceforge.bprocessor.model.xml.StringType; import net.sourceforge.bprocessor.model.xml.SurfaceType; import net.sourceforge.bprocessor.model.xml.VertexType; *************** *** 23,28 **** --- 27,35 ---- import net.sourceforge.bprocessor.model.xml.impl.CoordinateSystemTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.EdgeImpl; + import net.sourceforge.bprocessor.model.xml.impl.IntegerTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.LineTypeImpl; + import net.sourceforge.bprocessor.model.xml.impl.MapElementTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.MaterialImpl; + import net.sourceforge.bprocessor.model.xml.impl.ModellorTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.PointTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.SpaceImpl; *************** *** 138,141 **** --- 145,150 ---- space.setClassification(xml.getClassification()); mapper.put(new Long(xml.getId()), space); + space.setModellor(internalizeModellor(xml.getModellor())); + xmls.add(xml); { *************** *** 206,209 **** --- 215,258 ---- } + /** + * Internalize the modellor + * @param xml the xml version of the modellor + * @return the model modellor + */ + private static Modellor internalizeModellor(ModellorType xml) { + if (xml != null) { + Class model; + try { + model = Class.forName(xml.getTy()); + } catch (ClassNotFoundException cnf) { + log.error("Internalization of modellor failed for :" + xml.getTy() + + " \nBecause of " + cnf.toString()); + return null; + } + try { + Modellor m = (Modellor)model.getConstructor(new Class[0]).newInstance(new Object[0]); + HashMap content = new HashMap(); + Iterator iter = xml.getAttribute().iterator(); + while (iter.hasNext()) { + MapElementType elem = (MapElementType)iter.next(); + Object val = elem.getValue(); + if (val instanceof IntegerType) { + content.put(elem.getKey(), elem.getValue()); + } else if (val instanceof StringType) { + content.put(elem.getKey(), elem.getValue()); + } else { + log.warn("Non supported type"); + } + } + m.setContent(content); + return m; + } catch (Exception e) { + log.error("Modellor were missing empty constructor " + e.getMessage()); + return null; + } + } else { + return null; + } + } /** *************** *** 523,526 **** --- 572,608 ---- /** + * Save the modellor + * @param m the modellor to save + * @param map The map + * @return The xml object + */ + private static ModellorType externalizeModellor(Modellor m, Map map) { + ModellorType xml = new ModellorTypeImpl(); + xml.setId(counter++); + if (m.getId() != null) { + xml.setProgid(m.getId().longValue()); + } + xml.setTy(m.getClass().getName()); + List att = xml.getAttribute(); + Map cont = m.getContent(); + if (cont != null) { + Iterator iter = map.entrySet().iterator(); + while (iter.hasNext()) { + Map.Entry o = (Map.Entry)iter.next(); + MapElementType elem = new MapElementTypeImpl(); + elem.setKey((String)o.getKey()); + Object val = o.getValue(); + if (val instanceof Integer) { + IntegerType t = new IntegerTypeImpl(); + t.setInteger(((Integer)val).intValue()); + elem.setValue(t); + } + att.add(elem); + } + } + return xml; + } + + /** * Create an xml SpaceImpl and place it in the map * @param space The space *************** *** 537,540 **** --- 619,625 ---- xml.setDescription(space.getDescription().toString()); xml.setClassification(space.getClassification().toString()); + if (space.getModellor() != null) { + xml.setModellor(externalizeModellor(space.getModellor(), map)); + } map.put(space, xml); |
|
From: rimestad <rim...@us...> - 2006-10-10 14:02:53
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5934/src/net/sourceforge/bprocessor/facade/modellor Modified Files: FacadeModellor.java WindowModellor.java Log Message: added set and get content to Modellor and its subclasses, most of them are just empty for now, but will come later Index: WindowModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/WindowModellor.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** WindowModellor.java 5 Oct 2006 11:27:07 -0000 1.12 --- WindowModellor.java 10 Oct 2006 14:02:37 -0000 1.13 *************** *** 9,16 **** --- 9,18 ---- import java.util.ArrayList; import java.util.Collection; + import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Iterator; + import java.util.Map; import java.util.Set; *************** *** 240,242 **** --- 242,261 ---- return "Window modellor"; } + + /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */ + public void setContent(Map m) { + // TODO Auto-generated method stub + + } + + /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */ + public Map getContent() { + Map what = new HashMap(); + what.put("name", getName()); + what.put("Framewidth", new Double(framewidth)); + what.put("Framedepth", new Double(framedepth)); + what.put("Offset", new Double(offset)); + what.put("Sign", new Integer(sign)); + return what; + } } Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** FacadeModellor.java 5 Oct 2006 11:27:07 -0000 1.21 --- FacadeModellor.java 10 Oct 2006 14:02:37 -0000 1.22 *************** *** 750,752 **** --- 750,764 ---- } } + + /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */ + public void setContent(Map m) { + // TODO Auto-generated method stub + + } + + /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */ + public Map getContent() { + + return null; + } } |
|
From: rimestad <rim...@us...> - 2006-10-10 14:02:53
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5944/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: added set and get content to Modellor and its subclasses, most of them are just empty for now, but will come later Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** SpaceTool.java 10 Oct 2006 13:49:32 -0000 1.48 --- SpaceTool.java 10 Oct 2006 14:02:43 -0000 1.49 *************** *** 23,26 **** --- 23,27 ---- import java.util.LinkedList; import java.util.List; + import java.util.Map; import java.util.Stack; *************** *** 371,374 **** --- 372,386 ---- return null; } + + /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */ + public void setContent(Map m) { + // TODO Auto-generated method stub + } + + /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */ + public Map getContent() { + // TODO Auto-generated method stub + return null; + } } |
|
From: rimestad <rim...@us...> - 2006-10-10 14:02:42
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5925/src/net/sourceforge/bprocessor/model/modellor Modified Files: Modellor.java LayerModellor.java Log Message: added set and get content to Modellor and its subclasses, most of them are just empty for now, but will come later Index: Modellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/Modellor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Modellor.java 29 Aug 2006 10:06:18 -0000 1.2 --- Modellor.java 10 Oct 2006 14:02:32 -0000 1.3 *************** *** 111,113 **** --- 111,126 ---- */ public abstract Modellor newInstance(Space s); + + /** + * Set the entire content of the modellor to the given map key to value pairs + * @param m the map containing the values; + */ + public abstract void setContent(Map m); + + /** + * Get the content of the modellor to be used for persistence + * @return A map of key to value pairs of the content + */ + public abstract Map getContent(); + } Index: LayerModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/LayerModellor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LayerModellor.java 5 Oct 2006 13:24:47 -0000 1.6 --- LayerModellor.java 10 Oct 2006 14:02:32 -0000 1.7 *************** *** 12,15 **** --- 12,16 ---- import java.util.LinkedList; import java.util.List; + import java.util.Map; import java.util.Set; *************** *** 205,207 **** --- 206,220 ---- } } + + /** @see net.sourceforge.bprocessor.model.modellor.Modellor#setContent(Map) */ + public void setContent(Map m) { + // TODO Auto-generated method stub + + } + + /** @see net.sourceforge.bprocessor.model.modellor.Modellor#getContent() */ + public Map getContent() { + // TODO Auto-generated method stub + return null; + } } |
|
From: Michael L. <he...@us...> - 2006-10-10 13:49:44
|
Update of /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv583/src/net/sourceforge/bprocessor/model/evaluator Modified Files: Environment.java Log Message: Improvements to scripting Index: Environment.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Environment.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Environment.java 19 Sep 2006 19:22:42 -0000 1.5 --- Environment.java 10 Oct 2006 13:49:35 -0000 1.6 *************** *** 10,16 **** import java.util.HashMap; import java.util.List; - import net.sourceforge.bprocessor.model.Project; - import net.sourceforge.bprocessor.model.Space; - import net.sourceforge.bprocessor.model.Vertex; /** * Environment --- 10,13 ---- *************** *** 77,91 **** } } - if (value == null) { - Space active = Project.getInstance().getActiveSpace(); - if (name.charAt(0) == 'v') { - String sub = name.substring(1, name.length()); - Long id = Long.valueOf(sub); - value = (Vertex) active.getVertex(id.longValue()); - } - } - if (value == null) { - value = new Double(8.9); - } return value; } --- 74,77 ---- |
|
From: Michael L. <he...@us...> - 2006-10-10 13:49:40
|
Update of /cvsroot/bprocessor/bscript/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv583/src/etc Modified Files: bscript.g Log Message: Improvements to scripting Index: bscript.g =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/etc/bscript.g,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** bscript.g 29 Sep 2006 07:13:16 -0000 1.9 --- bscript.g 10 Oct 2006 13:49:35 -0000 1.10 *************** *** 32,35 **** --- 32,36 ---- LtEq: "<=" ; GtEq: ">=" ; + Assign: ":=" ; protected Letter *************** *** 100,104 **** assignment[Function env] ! : name:Identifier Equal simpleton[env] { env.append(new Assign(name.getText())); } ; --- 101,105 ---- assignment[Function env] ! : name:Identifier Equal expression[env] { env.append(new Assign(name.getText())); } ; *************** *** 152,164 **** ; simpleton[Function env] ! : variable[env] ! | literal[env] | StartTerm expression[env] EndTerm ! | Lt statement[env] Gt ; ! expression[Function env] : evaluation[env] ( Equal evaluation[env] { env.append(new Primitive(Primitive.EQ)); } --- 153,176 ---- ; + protected value[Function env] + : literal[env] + | variable[env] + | variable[env] LB ( expression[env] ) RB { env.append(new Primitive(Primitive.GET)); } + ; + simpleton[Function env] ! : value[env] | StartTerm expression[env] EndTerm ! | Lt procedurecall[env] Gt ! | unarysimpleton[env] ! ; ! ! unarysimpleton[Function env] ! : Plus simpleton[env] ! | Minus simpleton[env] { env.append(new Primitive(Primitive.NEG)); } ; ! protected expression[Function env] : evaluation[env] ( Equal evaluation[env] { env.append(new Primitive(Primitive.EQ)); } *************** *** 171,175 **** ! evaluation[Function env] : term[env] ( Plus term[env] { env.append(new Primitive(Primitive.ADD)); } --- 183,187 ---- ! protected evaluation[Function env] : term[env] ( Plus term[env] { env.append(new Primitive(Primitive.ADD)); } *************** *** 186,198 **** atom[Function env] ! : literal[env] ! | variable[env] ! | variable[env] LB ( expression[env] ) RB { env.append(new Primitive(Primitive.GET)); } | StartTerm expression[env] EndTerm ! | unary[env] ! | call[env] ; ! unary[Function env] : Plus atom[env] | Minus atom[env] { env.append(new Primitive(Primitive.NEG)); } --- 198,209 ---- atom[Function env] ! : value[env] | StartTerm expression[env] EndTerm ! | Lt procedurecall[env] Gt ! | unaryatom[env] ! | functioncall[env] ; ! unaryatom[Function env] : Plus atom[env] | Minus atom[env] { env.append(new Primitive(Primitive.NEG)); } *************** *** 207,211 **** ; ! call[Function env] : name1:Identifier { env.append(new Mark()); } StartTerm EndTerm --- 218,222 ---- ; ! functioncall[Function env] : name1:Identifier { env.append(new Mark()); } StartTerm EndTerm |
|
From: Michael L. <he...@us...> - 2006-10-10 13:49:40
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv605/src/net/sourceforge/bprocessor/model Modified Files: ParameterBlock.java Log Message: Improvements to scripting Index: ParameterBlock.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ParameterBlock.java 11 Sep 2006 14:01:37 -0000 1.2 --- ParameterBlock.java 10 Oct 2006 13:49:38 -0000 1.3 *************** *** 72,75 **** --- 72,87 ---- /** + * @param env HashMap + */ + public void define(HashMap env) { + Iterator iter = parameters.iterator(); + while (iter.hasNext()) { + Attribute current = (Attribute) iter.next(); + String key = current.getName(); + Object value = env.get(key); + current.setValue(value); + } + } + /** * Name * @return String |
|
From: Michael L. <he...@us...> - 2006-10-10 13:49:37
|
Update of /cvsroot/bprocessor/bscript In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv583 Modified Files: .classpath build.xml Log Message: Improvements to scripting Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/bscript/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .classpath 12 Sep 2006 09:27:31 -0000 1.3 --- .classpath 10 Oct 2006 13:49:35 -0000 1.4 *************** *** 4,8 **** <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="/tools/antlr/antlr.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/model"/> <classpathentry kind="output" path="build"/> </classpath> --- 4,7 ---- Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/bscript/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 13 Sep 2006 13:36:32 -0000 1.4 --- build.xml 10 Oct 2006 13:49:35 -0000 1.5 *************** *** 31,39 **** <target name="compile" depends="compile-grammar,init"> - <copy todir="${lib.dir}"> - <fileset dir="${model.dir}/dist"> - <include name="**/model*"/> - </fileset> - </copy> <ant dir="src" target="compile"/> </target> --- 31,34 ---- |
|
From: Michael L. <he...@us...> - 2006-10-10 13:49:34
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv569/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java SpaceTool.java Log Message: Improvements to scripting Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** SpaceTool.java 10 Oct 2006 09:23:49 -0000 1.47 --- SpaceTool.java 10 Oct 2006 13:49:32 -0000 1.48 *************** *** 599,602 **** --- 599,604 ---- transform = new TransformStack(); HashMap globals = Project.getInstance().getGlobals().environment(); + + globals.put("echo", new Builtin() { public void evaluate(Environment env, Stack stack) { *************** *** 704,708 **** } try { - log.info("evaluate '" + value + "'"); Environment global = new Environment(globals, null); Environment env = new Environment(global, new HashMap(), new LinkedList()); --- 706,709 ---- *************** *** 714,717 **** --- 715,721 ---- Stack stack = new Stack(); function.evaluate(env, stack); + Project.getInstance().getGlobals().define(globals); + Project.getInstance().changed(Project.getInstance().getGlobals()); + Space space = Project.getInstance().getActiveSpace(); while (!stack.empty()) { Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** AbstractTool.java 10 Oct 2006 11:05:44 -0000 1.103 --- AbstractTool.java 10 Oct 2006 13:49:31 -0000 1.104 *************** *** 42,45 **** --- 42,46 ---- private static Logger log = Logger.getLogger(AbstractTool.class); + /** minimum drag length */ private static final int MIN_DRAG_LENGTH = 5; *************** *** 293,297 **** } else if (selectMode) { select.dragged(e); ! } else if (Math.sqrt(dx * dx + dy * dy) > MIN_DRAG_LENGTH) { dragged(e); } --- 294,298 ---- } else if (selectMode) { select.dragged(e); ! } else if (Math.sqrt(dx * dx + dy * dy) > MIN_DRAG_LENGTH) { dragged(e); } |
|
From: Nordholt <nor...@us...> - 2006-10-10 11:05:50
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv445/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java Log Message: made small minimum drag distance Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** AbstractTool.java 5 Oct 2006 13:07:53 -0000 1.102 --- AbstractTool.java 10 Oct 2006 11:05:44 -0000 1.103 *************** *** 42,45 **** --- 42,47 ---- private static Logger log = Logger.getLogger(AbstractTool.class); + private static final int MIN_DRAG_LENGTH = 5; + /** Simple selection mechanism **/ protected boolean directMode = false; *************** *** 291,295 **** } else if (selectMode) { select.dragged(e); ! } else { dragged(e); } --- 293,297 ---- } else if (selectMode) { select.dragged(e); ! } else if (Math.sqrt(dx * dx + dy * dy) > MIN_DRAG_LENGTH) { dragged(e); } |
|
From: Michael L. <he...@us...> - 2006-10-10 09:24:06
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24241/src/net/sourceforge/bprocessor/model Modified Files: Surface.java Space.java Log Message: extrusion operation suitable for scripting Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** Surface.java 10 Oct 2006 06:35:28 -0000 1.113 --- Surface.java 10 Oct 2006 09:23:57 -0000 1.114 *************** *** 434,439 **** */ public Surface extrusion(double delta, Set sides) { ! return null; } --- 434,527 ---- */ public Surface extrusion(double delta, Set sides) { + Vertex normal = normal(); + normal.scale(delta); + List vertices = getVertices(); + List edges = getEdges(); + int n = vertices.size(); + Vertex[] v = new Vertex[n]; + Edge[] e = new Edge[n]; + Vertex[] vmap = new Vertex[n]; + Edge[] topmap = new Edge[n]; + Edge[] sidemap = new Edge[n]; + Surface[] facemap = new Surface[n]; + Surface top = null; + vertices.toArray(v); + edges.toArray(e); ! for (int i = 0; i < n; i++) { ! vmap[i] = v[i].copy().add(normal); ! } ! ! for (int i = 0; i < n; i++) { ! topmap[i] = new Edge(vmap[i], vmap[(i + 1) % n]); ! } ! ! for (int i = 0; i < n; i++) { ! sidemap[i] = new Edge(v[i], vmap[i]); ! } ! ! for (int i = 0; i < n; i++) { ! Edge b = e[i]; ! Edge r = sidemap[i]; ! Edge l = sidemap[(i + 1) % n]; ! Edge t = topmap[i]; ! List newEdges = new LinkedList(); ! newEdges.add(r); ! newEdges.add(t); ! newEdges.add(l); ! newEdges.add(b); ! facemap[i] = new Surface(newEdges); ! sides.add(facemap[i]); ! } ! ! { ! List newEdges = new LinkedList(); ! for (int i = 0; i < n; i++) { ! newEdges.add(topmap[n - i - 1]); ! } ! top = new Surface(newEdges); ! } ! ! // FIXME should return the sides instead of assigning ! // spaces here. ! boolean flip = false; ! ! if (exterior != null) { ! Vertex n0 = normal(); ! Vertex n1 = exterior.normal(); ! Vertex o = n0.add(n1); ! if (o.isZero()) { ! flip = true; ! } ! } ! ! for (int i = 0; i < n; i++) { ! if (delta < 0) { ! facemap[i].setBackDomain(getBackDomain()); ! if (exterior != null) { ! if (flip) { ! facemap[i].setFrontDomain(exterior.getFrontDomain()); ! } else { ! facemap[i].setFrontDomain(exterior.getBackDomain()); ! } ! } ! } else { ! facemap[i].setFrontDomain(getFrontDomain()); ! if (exterior != null) { ! if (flip) { ! facemap[i].setBackDomain(exterior.getBackDomain()); ! } else { ! facemap[i].setBackDomain(exterior.getFrontDomain()); ! } ! } ! } ! } ! if (delta < 0) { ! top.setBackDomain(getBackDomain()); ! } else { ! top.setFrontDomain(getFrontDomain()); ! } ! ! return top; } Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** Space.java 9 Oct 2006 14:03:15 -0000 1.75 --- Space.java 10 Oct 2006 09:23:57 -0000 1.76 *************** *** 878,881 **** --- 878,882 ---- surface.setEdges(actual); add(surface); + Geometry.holeAnalysis(surface); return surface; } |
|
From: Michael L. <he...@us...> - 2006-10-10 09:23:54
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24233/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: extrusion operation suitable for scripting Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** GUI.java 5 Oct 2006 11:26:56 -0000 1.44 --- GUI.java 10 Oct 2006 09:23:52 -0000 1.45 *************** *** 95,100 **** setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); instance = this; ! Thread sc = new SpaceChecker(); ! sc.start(); } --- 95,100 ---- setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); instance = this; ! //Thread sc = new SpaceChecker(); ! //sc.start(); } |
