From 89b25e7cc97f6fe221dfd41c4d463500f8a31bc1 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 25 Jun 2019 23:58:09 -0400
Subject: [PATCH] Edit panel pin state.
---
ConeEditor.java | 57 +++++++++++++++++++++++++--------------------------------
1 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/ConeEditor.java b/ConeEditor.java
index 6cc9579..c186a8b 100644
--- a/ConeEditor.java
+++ b/ConeEditor.java
@@ -8,6 +8,8 @@
import javax.swing.*;
import javax.swing.event.*;
+import grafeme.ui.*;
+
class ConeEditor extends BiparamEditor implements ChangeListener, ObjectUI
{
@@ -49,7 +51,6 @@
{
super.SetupUI2(oe);
- oe.aConstraints.fill = 0;
/*
ctrlPanel.add(baseLabel = new JLabel("Base"), aConstraints);
aConstraints.fill = GridBagConstraints.HORIZONTAL;
@@ -58,19 +59,15 @@
ctrlPanel.add(baseField = new NumberField(), aConstraints);
baseField.setVector(cone.base);
baseField.addActionListener(this);
- aConstraints.fill = 0;
- aConstraints.gridy += 1;
- aConstraints.gridx -= 1;
*/
- oe.aConstraints.gridwidth = 1;
- oe.ctrlPanel.add(baseRadLabel = new JLabel("Top"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(baseRadField = new NumberSlider(0.001,10,1), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ topPanel = new cGridBag();
+ topPanel.add(baseRadLabel = new JLabel("Top")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ topPanel.add(baseRadField = new cNumberSlider(this, 0.001,10,1)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
baseRadField.setFloat(cone.baseRadius);
- baseRadField.addChangeListener(this);
- /*
+
+ oe.ctrlPanel.add(topPanel);
+ oe.ctrlPanel.Return();
+ /*
aConstraints.fill = 0;
aConstraints.gridx -= 1;
aConstraints.gridy += 1;
@@ -83,21 +80,13 @@
apexField.setVector(cone.apex);
apexField.addActionListener(this);
*/
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridx -= 1;
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridwidth = 1;
- oe.ctrlPanel.add(apexRadLabel = new JLabel("Base"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.ctrlPanel.add(apexRadField = new NumberSlider(0.001,10,1), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridwidth = 1;
- oe.aConstraints.gridx -= 1;
- oe.aConstraints.fill = 0;
+ basePanel = new cGridBag();
+ basePanel.add(apexRadLabel = new JLabel("Base")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ basePanel.add(apexRadField = new cNumberSlider(this, 0.001,10,1)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
apexRadField.setFloat(cone.apexRadius);
- apexRadField.addChangeListener(this);
- oe.aConstraints.gridy += 1;
+
+ oe.ctrlPanel.add(basePanel);
+ oe.ctrlPanel.Return();
}
public void closeUI()
@@ -106,10 +95,12 @@
apexRadField.removeChangeListener(this);
baseRadField.removeChangeListener(this);
- oe.ctrlPanel.remove(apexRadField);
- oe.ctrlPanel.remove(baseRadField);
- oe.ctrlPanel.remove(apexRadLabel);
- oe.ctrlPanel.remove(baseRadLabel);
+// oe.ctrlPanel.remove(apexRadField);
+// oe.ctrlPanel.remove(baseRadField);
+// oe.ctrlPanel.remove(apexRadLabel);
+// oe.ctrlPanel.remove(baseRadLabel);
+ oe.ctrlPanel.remove(topPanel);
+ oe.ctrlPanel.remove(basePanel);
//oe.ctrlPanel.repaint();
super.closeUI();
@@ -192,9 +183,11 @@
JLabel apexRadLabel;
//NumberField baseField;
//NumberField apexField;
- NumberSlider baseRadField;
- NumberSlider apexRadField;
+ cNumberSlider baseRadField;
+ cNumberSlider apexRadField;
+ cGridBag topPanel;
+ cGridBag basePanel;
//BiparamEditor objEditor;
}
--
Gitblit v1.6.2