diff options
| author | kintel <kintel@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2009-01-14 20:50:04 +0000 |
|---|---|---|
| committer | kintel <kintel@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2009-01-14 20:50:04 +0000 |
| commit | 95c5bc56cd5204143405114109f7b88462b9e95e (patch) | |
| tree | 9d437d8c0d0c4ce4c2745867f2ade248205e200c | |
| parent | f2c175172dab1de5491d93d839c2ffac96b46794 (diff) | |
| download | reprap-backup-95c5bc56cd5204143405114109f7b88462b9e95e.tar.gz reprap-backup-95c5bc56cd5204143405114109f7b88462b9e95e.zip | |
Bumped version to V1.0, disabled test button
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@2380 cb376a5e-1013-0410-a455-b6b1f9ac8223
4 files changed, 6 insertions, 5 deletions
diff --git a/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorDialog.java b/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorDialog.java index b14f31d2..1e5481c6 100644 --- a/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorDialog.java +++ b/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorDialog.java @@ -42,7 +42,7 @@ class CSGEvaluatorDialog extends BDialog bc.setDefaultLayout(new LayoutInfo()); - String versionstr = "0.2"; + String versionstr = "1.0"; // FIXME: This was an attempt to pick up the version from the extensions.xml file, // but it didn't work out since the classloader found the wrong file. /* @@ -74,9 +74,9 @@ class CSGEvaluatorDialog extends BDialog button.addEventLink(KeyPressedEvent.class, this, "keyPressed"); // For Esc support button.addEventLink(CommandEvent.class, engine, buttons[i]); } - BButton button = new BButton("test"); - fc.add(button, 1, buttons.length); - button.addEventLink(CommandEvent.class, this, "test"); +// BButton button = new BButton("test"); +// fc.add(button, 1, buttons.length); +// button.addEventLink(CommandEvent.class, this, "test"); // Close button BButton closeButton; diff --git a/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorEngine.java b/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorEngine.java index 64a21741..fc1fda0f 100644 --- a/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorEngine.java +++ b/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorEngine.java @@ -174,7 +174,7 @@ class CSGEvaluatorEngine } - + /* Recursively (Re-)evaluates the object tree rooted at the given root object diff --git a/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorTool.java b/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorTool.java index 4bcdebd1..e5c182ae 100644 --- a/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorTool.java +++ b/trunk/users/metalab/AoI/plugins/CSGEvaluator/src/at/metalab/artofillusion/CSGEvaluatorTool.java @@ -23,6 +23,7 @@ import artofillusion.keystroke.KeystrokeRecord; * TODO:
* o How should we handle materials when combining objects?
* o Idea: Don't hide negative object, but set them to transparent.
+ * o Make window dockable
*/
public class CSGEvaluatorTool implements ModellingTool
{
diff --git a/trunk/users/metalab/AoI/plugins/Plugins/CSGEvaluator.jar b/trunk/users/metalab/AoI/plugins/Plugins/CSGEvaluator.jar Binary files differindex 62c67d5a..6c9ab9f6 100644 --- a/trunk/users/metalab/AoI/plugins/Plugins/CSGEvaluator.jar +++ b/trunk/users/metalab/AoI/plugins/Plugins/CSGEvaluator.jar |