Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/constraints
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8836/src/net/sourceforge/bprocessor/model/constraints
Modified Files:
OffsetConstraint.java
Log Message:
Improved handling of globals
Index: OffsetConstraint.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/constraints/OffsetConstraint.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OffsetConstraint.java 16 May 2006 15:42:10 -0000 1.3
--- OffsetConstraint.java 30 May 2006 09:28:56 -0000 1.4
***************
*** 26,29 ****
--- 26,30 ----
import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Parametric;
+ import net.sourceforge.bprocessor.model.Project;
import net.sourceforge.bprocessor.model.Surface;
import net.sourceforge.bprocessor.model.Vertex;
***************
*** 59,66 ****
ExpressionLexer lexer = new ExpressionLexer(input);
ExpressionParser parser = new ExpressionParser(lexer);
! HashMap env = new HashMap();
! env.put("pi", new Double(Math.PI));
! env.put("e", new Double(Math.E));
! env.put("wall", new Double(0.5));
double value = 1.0;
try {
--- 60,64 ----
ExpressionLexer lexer = new ExpressionLexer(input);
ExpressionParser parser = new ExpressionParser(lexer);
! HashMap env = Project.getInstance().getGlobals().environment();
double value = 1.0;
try {
|
