From 21ac57b36a9e3b909853c7d64ac29b7ad72490a3 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 02 Sep 2019 16:52:19 -0400
Subject: [PATCH] Figure panel.
---
BlobEditor.java | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 48 insertions(+), 53 deletions(-)
diff --git a/BlobEditor.java b/BlobEditor.java
index 6b74d1b..0d5fd8c 100644
--- a/BlobEditor.java
+++ b/BlobEditor.java
@@ -43,61 +43,56 @@
{
super.SetupUI2(oe);
- oe.ctrlPanel.add(thresholdLabel = new JLabel("Threshold"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(thresholdField = new NumberField(), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- thresholdField.addActionListener(this);
- oe.aConstraints.gridwidth = 1;
- thresholdField.setFloat(blob.threshold);
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(newButton = new JButton("New Ball"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- newButton.addActionListener(this);
- oe.aConstraints.gridx += 2;
- oe.ctrlPanel.add(deleteButton = new JButton("Delete Ball"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- deleteButton.addActionListener(this);
- oe.aConstraints.gridwidth = 1;
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridy += 1;
- oe.ctrlPanel.add(strengthLabel = new JLabel("Strength"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.aConstraints.gridx += 1;
- oe.ctrlPanel.add(strengthField = new NumberField(), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- strengthField.addActionListener(this);
- oe.aConstraints.gridwidth = 1;
- toCompFields();
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridy += 1;
-
- oe.ctrlPanel.add(sizeLabel = new JLabel("Depth"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(sizeField = new NumberField(), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- sizeField.addActionListener(this);
- oe.aConstraints.gridwidth = 1;
- sizeField.setFloat(blob.cellSize);
- oe.aConstraints.gridy += 1;
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridx = 0;
+ oe.ctrlPanel.add(thresholdLabel = new JLabel("Threshold:")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.ctrlPanel.add(tolLabel = new JLabel("Tolerance"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(tolField = new NumberField(), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ oe.ctrlPanel.Return();
+
+ oe.ctrlPanel.add(thresholdField = new NumberField()); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ thresholdField.addActionListener(this);
+ thresholdField.setFloat(blob.threshold);
+
+ oe.ctrlPanel.Return();
+
+ oe.ctrlPanel.add(newButton = new JButton("New Ball")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ newButton.addActionListener(this);
+ oe.ctrlPanel.Return();
+
+ oe.ctrlPanel.add(deleteButton = new JButton("Delete Ball")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ deleteButton.addActionListener(this);
+ oe.ctrlPanel.Return();
+
+ /*
+ oe.ctrlPanel.add(strengthLabel = new JLabel("Strength:")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+
+ oe.ctrlPanel.Return();
+
+ oe.ctrlPanel.add(strengthField = new NumberField()); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ strengthField.addActionListener(this);
+
+ oe.ctrlPanel.Return();
+ */
+
+ toCompFields();
+
+ oe.ctrlPanel.add(sizeLabel = new JLabel("Depth:")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+
+ oe.ctrlPanel.Return();
+
+ oe.ctrlPanel.add(sizeField = new NumberField()); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ sizeField.addActionListener(this);
+ sizeField.setFloat(blob.cellSize);
+
+ oe.ctrlPanel.Return();
+
+ oe.ctrlPanel.add(tolLabel = new JLabel("Tolerance:")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+
+ oe.ctrlPanel.Return();
+
+ oe.ctrlPanel.add(tolField = new NumberField()); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
tolField.addActionListener(this);
- oe.aConstraints.gridwidth = 1;
- tolField.setFloat(blob.tolerance);
- oe.aConstraints.gridy += 1;
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridx = 0;
+ tolField.setFloat(blob.tolerance);
+
+ oe.ctrlPanel.Return();
}
public void closeUI()
--
Gitblit v1.6.2