Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15982/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
AbstractTool.java SpaceTool.java AbstractPencil.java
Log Message:
Length field stuff
Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** SpaceTool.java 7 May 2007 13:29:48 -0000 1.73
--- SpaceTool.java 8 May 2007 06:08:15 -0000 1.74
***************
*** 688,729 ****
/**
- * @param event KeyEvent
- */
- public void key(KeyEvent event) {
- if (!event.isControlDown() && !event.isMetaDown()) {
- String value;
- if (typing) {
- value = glv.getLengthValue();
- } else {
- value = "";
- }
- char ch = event.getKeyChar();
- if (ch > 31 && ch < 256) {
- value = value + ch;
- glv.setLengthValue(value);
- typing = true;
- } else {
- if (event.getKeyCode() == KeyEvent.VK_ENTER) {
- evaluate(value);
- }
- }
- }
- }
-
- /**
* Delete
*/
@Override
! public void delete() {
! if (typing) {
! String value = glv.getLengthValue();
! int length = value.length();
! if (length > 0) {
! value = value.substring(0, length - 1);
! glv.setLengthValue(value);
! }
! return;
! }
!
Iterator it = Selection.primary().iterator();
List<Geometric> edges = new ArrayList<Geometric>();
--- 688,695 ----
/**
* Delete
*/
@Override
! public void remove() {
Iterator it = Selection.primary().iterator();
List<Geometric> edges = new ArrayList<Geometric>();
Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** AbstractPencil.java 7 May 2007 13:29:48 -0000 1.76
--- AbstractPencil.java 8 May 2007 06:08:15 -0000 1.77
***************
*** 703,789 ****
}
- /**
- * Delete
- */
- public void delete() {
- int length = number.length();
- if (length > 1) {
- number = number.substring(0, length - 1);
- } else {
- number = String.valueOf(0);
- }
- try {
- double d = Double.parseDouble(number);
- setLength(d / 1000);
- } catch (NumberFormatException exp) {
- log.warn(exp);
- }
- }
/**
! * Invoked when a key has been pressed.
! * @param e The KeyEvent
*/
! public void key(KeyEvent e) {
! boolean changed = false;
! if (number == null) {
! number = "";
! }
! if (e.getKeyCode() == KeyEvent.VK_CAPS_LOCK) {
! lock = true;
! } else if (e.getKeyCode() == KeyEvent.VK_1) {
! number += "1";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_2) {
! number += "2";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_3) {
! number += "3";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_4) {
! number += "4";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_5) {
! number += "5";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_6) {
! number += "6";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_7) {
! number += "7";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_8) {
! number += "8";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_9) {
! number += "9";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_0) {
! number += "0";
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
! int length = number.length();
! if (length > 1) {
! number = number.substring(0, length - 1);
! } else {
! number = String.valueOf(0);
! }
! changed = true;
! } else if (e.getKeyCode() == KeyEvent.VK_ENTER) {
! try {
! double d = Double.parseDouble(number);
! apply(d / 1000);
! } catch (NumberFormatException exp) {
! log.warn(exp);
! }
! }
! if (changed) {
! try {
! double d = Double.parseDouble(number);
! setLength(d / 1000);
! } catch (NumberFormatException exp) {
! log.warn(exp);
! }
! }
}
--- 703,714 ----
}
/**
! * {@inheritDoc}
*/
! public Object evaluate(String value) {
! double d = Double.parseDouble(value);
! apply(d / 1000);
! return null;
}
Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** AbstractTool.java 7 May 2007 13:19:07 -0000 1.116
--- AbstractTool.java 8 May 2007 06:08:15 -0000 1.117
***************
*** 511,518 ****
/**
* Invoked when a key has been pressed
! * @param e KeyEvent
*/
! protected void key(KeyEvent e) {
!
}
--- 511,535 ----
/**
* Invoked when a key has been pressed
! * @param event KeyEvent
*/
! protected void key(KeyEvent event) {
! if (!event.isControlDown() && !event.isMetaDown()) {
! String value;
! if (typing) {
! value = glv.getLengthValue();
! } else {
! value = "";
! }
! char ch = event.getKeyChar();
! if (ch > 31 && ch < 256) {
! value = value + ch;
! glv.setLengthValue(value);
! typing = true;
! } else {
! if (event.getKeyCode() == KeyEvent.VK_ENTER) {
! evaluate(value);
! }
! }
! }
}
***************
*** 522,529 ****
--- 539,572 ----
*/
protected void delete() {
+ if (typing) {
+ String value = glv.getLengthValue();
+ int length = value.length();
+ if (length > 0) {
+ value = value.substring(0, length - 1);
+ glv.setLengthValue(value);
+ }
+ } else {
+ remove();
+ }
+ }
+
+ /**
+ *
+ *
+ */
+ protected void remove() {
}
/**
+ * Evaluate the value
+ * @param value
+ */
+ public Object evaluate(String value) {
+ System.out.println("evaluate " + value);
+ return null;
+ }
+
+ /**
* The escape key has been pressed
*
|
