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);
}
|
