From cb37a129d1adb403019c96e798e86e2da9667f15 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 17 Nov 2019 17:56:04 -0500
Subject: [PATCH] Maze
---
BiparamEditor.java | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/BiparamEditor.java b/BiparamEditor.java
index 9598f9c..5dd1e62 100644
--- a/BiparamEditor.java
+++ b/BiparamEditor.java
@@ -4,6 +4,8 @@
import javax.swing.*;
import javax.swing.event.*;
+import grafeme.ui.*;
+
class BiparamEditor extends ObjEditor implements ItemListener, ChangeListener, ObjectUI, ActionListener
{
BiparamEditor(Biparam inBP, GroupEditor callee)
@@ -65,11 +67,16 @@
oe.aConstraints.gridwidth = 1;
*/
super.SetupUI2(oe);
-
- uDivsField = AddSlider(oe.ctrlPanel, "U #", biparam.minUDivs, 250+biparam.minUDivs, biparam.uDivs);
- Return();
- vDivsField = AddSlider(oe.ctrlPanel, "V #", biparam.minVDivs, (int)(250/6.28)+biparam.minVDivs, biparam.vDivs);
- Return();
+
+ uvPanel = new cGridBag().setVertical(true);
+
+ int count = 50;
+
+ uDivsField = (cNumberSlider)AddSlider(uvPanel, "U #", biparam.minUDivs, (int)(count*this.biparam.uStretch()) + biparam.minUDivs, biparam.uDivs).getComponent(1);
+ vDivsField = (cNumberSlider)AddSlider(uvPanel, "V #", biparam.minVDivs, (int)(count) + biparam.minVDivs, biparam.vDivs).getComponent(1);
+
+ oe.ctrlPanel.add(uvPanel);
+ oe.ctrlPanel.Return();
// oe.aConstraints.gridwidth = 1;
// oe.aConstraints.fill = GridBagConstraints.VERTICAL;
// oe.ctrlPanel.add(uDivsLabel = new JLabel("U #"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
@@ -96,17 +103,11 @@
// oe.aConstraints.gridwidth = 1;
if (biparam instanceof Cone) // ends)
{
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridwidth = 3;
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
- oe.ctrlPanel.add(optionCB = new JCheckBox("Close Surface", biparam.endcaps), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- optionCB.addItemListener(this);
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
- oe.aConstraints.gridwidth = 1;
+ oe.ctrlPanel.add(optionCB = new JCheckBox("Close Surface", biparam.endcaps)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ optionCB.addItemListener(this);
+ oe.ctrlPanel.Return();
//endcaps.setState(!biparam.endcaps);
}
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridx = 0;
}
void Clear()
@@ -141,6 +142,7 @@
if (//e.getSource() == nameField ||
e.getSource() == optionCB)
{
+ new Exception().printStackTrace();
//System.out.println(e);
applySelf();
//super.applySelf();
@@ -205,7 +207,7 @@
public void applySelf()
{
//System.out.println("Biparam :: applySelf");
- //super.applySelf();
+ super.applySelf();
int udivs = uDivsField.getInteger(); // biparam.minUDivs, 99);
int vdivs = vDivsField.getInteger(); // biparam.minUDivs, 99);
//biparam.name = nameField.getText();
@@ -244,8 +246,9 @@
// oe.ctrlPanel.remove(uDivsLabel);
// oe.ctrlPanel.remove(vDivsLabel);
// //oe.ctrlPanel.repaint();
- Remove(uDivsField);
- Remove(vDivsField);
+// Remove(uDivsField);
+// Remove(vDivsField);
+ oe.ctrlPanel.remove(uvPanel);
super.closeUI();
}
@@ -261,12 +264,14 @@
}
Biparam biparam;
- JLabel uDivsLabel;
- JLabel vDivsLabel;
- NumberSlider uDivsField;
- NumberSlider vDivsField;
+ //JLabel uDivsLabel;
+ //JLabel vDivsLabel;
+ cNumberSlider uDivsField;
+ cNumberSlider vDivsField;
JCheckBox optionCB;
+ cGridBag uvPanel;
+
ObjectUI parent;
//ObjEditor objEditor;
--
Gitblit v1.6.2