bprocessor-commit Mailing List for B-processor (Page 3)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael L. <he...@us...> - 2011-07-27 07:19:38
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview
In directory vz-cvs-4.sog:/tmp/cvs-serv14164/src/net/sourceforge/bprocessor/gui/attrview
Modified Files:
AttributeView.java
Log Message:
Index: AttributeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/AttributeView.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** AttributeView.java 18 May 2011 22:08:38 -0000 1.48
--- AttributeView.java 27 Jul 2011 07:19:36 -0000 1.49
***************
*** 7,11 ****
package net.sourceforge.bprocessor.gui.attrview;
- import net.sourceforge.bprocessor.gui.monitor.CommandMonitor;
import net.sourceforge.bprocessor.model.Command;
import net.sourceforge.bprocessor.model.Geometric;
--- 7,10 ----
***************
*** 79,89 ****
Command command = (Command) object;
Object monitor = command.getMonitor();
! if (monitor == null) {
! monitor = new CommandMonitor((Command) object);;
! command.setMonitor(monitor);
}
- object = (Parametric) monitor;
}
! add(BorderLayout.NORTH, new GenericPanel(object));
}
revalidate();
--- 78,88 ----
Command command = (Command) object;
Object monitor = command.getMonitor();
! if (monitor != null) {
! object = null;
}
}
! if (object != null) {
! add(BorderLayout.NORTH, new GenericPanel(object));
! }
}
revalidate();
|
|
From: Michael L. <he...@us...> - 2011-07-27 07:19:35
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory vz-cvs-4.sog:/tmp/cvs-serv14156/src/net/sourceforge/bprocessor/gl/view
Modified Files:
PopupMenu.java
Log Message:
Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** PopupMenu.java 18 May 2011 22:08:41 -0000 1.52
--- PopupMenu.java 27 Jul 2011 07:19:32 -0000 1.53
***************
*** 242,245 ****
--- 242,254 ----
}
+ private abstract class TargetAction extends AbstractAction {
+ protected Command target;
+
+ public TargetAction(Command command, String title) {
+ super(title);
+ this.target = command;
+ }
+ }
+
class CommandAction extends AbstractAction {
***************
*** 968,975 ****
return menu;
}
/** {@inheritDoc} */
public JPopupMenu menuFor(Collection<? extends Entity> geometrics) {
-
if (geometrics.isEmpty()) {
return getBackgroundMenu();
--- 977,1001 ----
return menu;
}
+
+ /**
+ *
+ * @param command Command
+ * @return menu
+ */
+ public JPopupMenu getCommandMenu(Command command) {
+ JPopupMenu menu = new JPopupMenu();
+ AbstractAction action = new TargetAction(command, "Toggle Panel") {
+ public void actionPerformed(ActionEvent arg0) {
+ if (target.getMonitor() != null) {
+ GUI.getInstance().togglePanel((java.awt.Component) target.getMonitor());
+ }
+ }
+ };
+ menu.add(action);
+ return menu;
+ }
/** {@inheritDoc} */
public JPopupMenu menuFor(Collection<? extends Entity> geometrics) {
if (geometrics.isEmpty()) {
return getBackgroundMenu();
***************
*** 1006,1012 ****
/** {@inheritDoc} */
public JPopupMenu menuFor(Entity entity) {
! Collection<Entity> c = new LinkedList<Entity>();
! c.add(entity);
! return menuFor(c);
}
}
--- 1032,1042 ----
/** {@inheritDoc} */
public JPopupMenu menuFor(Entity entity) {
! if (entity instanceof Command) {
! return getCommandMenu((Command) entity);
! } else {
! Collection<Entity> c = new LinkedList<Entity>();
! c.add(entity);
! return menuFor(c);
! }
}
}
|
|
From: Michael L. <he...@us...> - 2011-06-30 10:58:10
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory vz-cvs-2.sog:/tmp/cvs-serv29811/src/net/sourceforge/bprocessor/model
Modified Files:
Space.java
Log Message:
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.259
retrieving revision 1.260
diff -C2 -d -r1.259 -r1.260
*** Space.java 29 Jun 2011 13:56:08 -0000 1.259
--- Space.java 30 Jun 2011 10:58:07 -0000 1.260
***************
*** 1855,1859 ****
*/
public void collectSpaces(Collection<Space> spaces) {
- if (isUnion() || isNet()) {
for (Item item : getElements()) {
if (item instanceof Space) {
--- 1855,1858 ----
***************
*** 1862,1868 ****
}
}
! } else {
! spaces.add(this);
! }
}
--- 1861,1867 ----
}
}
! if (getEnvelope().size() > 0) {
! spaces.add(this);
! }
}
|
|
From: Sebastian G. <sg...@us...> - 2011-06-30 10:08:23
|
Update of /cvsroot/bprocessor/bprocessor/.settings In directory vz-cvs-2.sog:/tmp/cvs-serv15525/.settings Added Files: org.eclipse.ltk.core.refactoring.prefs Log Message: physics tool buttons --- NEW FILE: org.eclipse.ltk.core.refactoring.prefs --- #Thu Jun 16 16:31:21 CEST 2011 eclipse.preferences.version=1 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false |
|
From: Michael L. <he...@us...> - 2011-06-29 13:56:11
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory vz-cvs-2.sog:/tmp/cvs-serv1348/src/net/sourceforge/bprocessor/model
Modified Files:
Space.java Project.java
Log Message:
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.258
retrieving revision 1.259
diff -C2 -d -r1.258 -r1.259
*** Space.java 15 Jun 2011 13:23:14 -0000 1.258
--- Space.java 29 Jun 2011 13:56:08 -0000 1.259
***************
*** 1775,1779 ****
}
}
! interior.orient(interior.getEnvelope().iterator().next());
return holder;
}
--- 1775,1782 ----
}
}
! Set<Surface> envelope = interior.getEnvelope();
! if (envelope.size() > 0) {
! interior.orient(envelope.iterator().next());
! }
return holder;
}
***************
*** 1852,1856 ****
*/
public void collectSpaces(Collection<Space> spaces) {
! if (isUnion()) {
for (Item item : getElements()) {
if (item instanceof Space) {
--- 1855,1859 ----
*/
public void collectSpaces(Collection<Space> spaces) {
! if (isUnion() || isNet()) {
for (Item item : getElements()) {
if (item instanceof Space) {
Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** Project.java 16 May 2011 06:11:01 -0000 1.207
--- Project.java 29 Jun 2011 13:56:08 -0000 1.208
***************
*** 1029,1034 ****
//res.add(new Attribute("Display Geometry", Boolean.valueOf(doDisplayGeometry)));
//res.add(new Attribute("Use display lists", Boolean.valueOf(useDisplayLists)));
! // res.add(new Attribute("Export", Boolean.valueOf(doExport)));
! // res.add(new Attribute("Export Path", getExportPath()));
if (SENSE) {
res.add(new Attribute("Live Update", Boolean.valueOf(liveUpdate)));
--- 1029,1034 ----
//res.add(new Attribute("Display Geometry", Boolean.valueOf(doDisplayGeometry)));
//res.add(new Attribute("Use display lists", Boolean.valueOf(useDisplayLists)));
! //res.add(new Attribute("Export", Boolean.valueOf(doExport)));
! //res.add(new Attribute("Export Path", getExportPath()));
if (SENSE) {
res.add(new Attribute("Live Update", Boolean.valueOf(liveUpdate)));
|
|
From: Michael L. <he...@us...> - 2011-06-29 13:56:07
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton
In directory vz-cvs-2.sog:/tmp/cvs-serv1338/src/net/sourceforge/bprocessor/packages/skeleton
Modified Files:
SkeletonPackage.java
Log Message:
Index: SkeletonPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton/SkeletonPackage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SkeletonPackage.java 15 Jun 2011 13:54:54 -0000 1.7
--- SkeletonPackage.java 29 Jun 2011 13:56:05 -0000 1.8
***************
*** 74,77 ****
--- 74,81 ----
return active;
}
+
+ public String getName() {
+ return "Skeleton";
+ }
}
public static class SkeletonTool extends AbstractTool {
***************
*** 200,211 ****
content.add(buttonRow);
}
! JButton toolBtn = new JButton("Tool");
! toolBtn.addActionListener(new ActionListener() {
! public void actionPerformed(ActionEvent event) {
! Editor.instance().changeTool(tool);
! }
! });
! content.add(toolBtn);
!
//Sebastian look here!
{
--- 204,220 ----
content.add(buttonRow);
}
! {
! Box buttonRow = Box.createHorizontalBox();
! buttonRow.add(Box.createHorizontalStrut(5));
! JButton toolBtn = new JButton(new SkeletonAction("folder.png") {
! public void actionPerformed(ActionEvent e) {
! Editor.instance().changeTool(tool);
! }
! });
! buttonRow.add(toolBtn);
!
! buttonRow.add(Box.createHorizontalGlue());
! content.add(buttonRow);
! }
//Sebastian look here!
{
|
|
From: Michael L. <he...@us...> - 2011-06-15 13:54:59
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton
In directory vz-cvs-2.sog:/tmp/cvs-serv17989/src/net/sourceforge/bprocessor/packages/skeleton
Modified Files:
SkeletonPackage.java
Added Files:
BooleanControl.java BooleanValue.java
Log Message:
--- NEW FILE: BooleanValue.java ---
package net.sourceforge.bprocessor.packages.skeleton;
public class BooleanValue implements ControlValue {
private boolean value;
public BooleanValue(boolean value) {
this.value = value;
}
public boolean getValue() {
return value;
}
public void setValue(boolean value) {
this.value = value;
}
public String format() {
return value ? "YES" : "NO";
}
public void parse(String string) {
if (string.equalsIgnoreCase("YES")) {
value = true;
} else if (string.equalsIgnoreCase("TRUE")) {
value = true;
} else if (string.equalsIgnoreCase("NO")) {
value = false;
} else if (string.equalsIgnoreCase("FALSE")) {
value = false;
}
}
}
--- NEW FILE: BooleanControl.java ---
package net.sourceforge.bprocessor.packages.skeleton;
import java.awt.Insets;
import javax.swing.Box;
import javax.swing.JCheckBox;
import javax.swing.JToggleButton;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import net.sourceforge.bprocessor.gui.attrview.AttributeView;
public class BooleanControl extends Control implements ChangeListener {
private Box row;
private JToggleButton valueLabel;
private BooleanValue value;
private ControlDelegate delegate;
public BooleanControl(BooleanValue value, ControlDelegate delegate, String label) {
this.value = value;
this.delegate = delegate;
row = Box.createHorizontalBox();
valueLabel = new JCheckBox(label);
valueLabel.setSelected(value.getValue());
valueLabel.setFont(AttributeView.FONT_PLAIN);
valueLabel.setMargin(new Insets(1, 1, 1, 1));
row.add(Box.createHorizontalStrut(5));
row.add(valueLabel);
row.add(Box.createHorizontalGlue());
valueLabel.addChangeListener(this);
}
public Box row() {
return row;
}
public void stateChanged(ChangeEvent arg0) {
if (valueLabel.isSelected() != value.getValue()) {
value.setValue(valueLabel.isSelected());
if (delegate != null) {
delegate.changed(this);
}
}
}
}
Index: SkeletonPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton/SkeletonPackage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SkeletonPackage.java 5 Jun 2011 19:57:14 -0000 1.6
--- SkeletonPackage.java 15 Jun 2011 13:54:54 -0000 1.7
***************
*** 45,48 ****
--- 45,49 ----
private DoubleValue skeletonConstant;
private StringValue skeletonName;
+ private BooleanValue active;
//getters for parameters
***************
*** 59,62 ****
--- 60,64 ----
skeletonConstant = new DoubleValue(42);
skeletonName = new StringValue("Mike");
+ active = new BooleanValue(false);
panel = new ControlPanel(this);
GUI.getInstance().registerControlPanel(panel);
***************
*** 67,70 ****
--- 69,76 ----
System.out.println("skeleton-constant: " + skeletonConstant.getValue());
System.out.println("name: " + skeletonName.getValue());
+ System.out.println("active: " + active.format());
+ }
+ public BooleanValue getActive() {
+ return active;
}
}
***************
*** 213,216 ****
--- 219,227 ----
content.add(labelled.row());
}
+ {
+
+ BooleanControl control = new BooleanControl(skeleton.getActive(), this, "Active");
+ content.add(control.row());
+ }
}
public void changed(Object source) {
|
|
From: Michael L. <he...@us...> - 2011-06-15 13:23:16
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory vz-cvs-2.sog:/tmp/cvs-serv5286/src/net/sourceforge/bprocessor/model
Modified Files:
Space.java
Log Message:
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.257
retrieving revision 1.258
diff -C2 -d -r1.257 -r1.258
*** Space.java 11 May 2011 10:14:45 -0000 1.257
--- Space.java 15 Jun 2011 13:23:14 -0000 1.258
***************
*** 1589,1592 ****
--- 1589,1593 ----
edges.addAll(Surface.edges(envelope));
Set<Edge> interior = new HashSet();
+ interior.addAll(getEdges());
for (Item current : getElements()) {
interior.addAll(current.hiliteEdges());
|
|
From: Michael L. <he...@us...> - 2011-06-15 13:23:13
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory vz-cvs-2.sog:/tmp/cvs-serv5273/src/net/sourceforge/bprocessor/gl/view
Modified Files:
Display.java
Log Message:
Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** Display.java 26 May 2011 13:53:29 -0000 1.111
--- Display.java 15 Jun 2011 13:23:11 -0000 1.112
***************
*** 1423,1426 ****
--- 1423,1427 ----
for (Geometric current : geometrics) {
if (current instanceof Item) {
+
Item space = (Item) current;
Collection<Edge> edges = space.hiliteEdges();
|
|
From: Michael L. <he...@us...> - 2011-06-15 13:23:10
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory vz-cvs-2.sog:/tmp/cvs-serv5261/src/net/sourceforge/bprocessor/gui
Modified Files:
GUI.java
Log Message:
Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** GUI.java 18 May 2011 22:08:38 -0000 1.127
--- GUI.java 15 Jun 2011 13:23:07 -0000 1.128
***************
*** 873,877 ****
holder.add(BorderLayout.SOUTH, vfiller);
! splitPaneMiddleRight.setRightComponent(holder);
getContentPane().setLayout(new BorderLayout());
--- 873,877 ----
holder.add(BorderLayout.SOUTH, vfiller);
! splitPaneMiddleRight.setRightComponent(new JScrollPane(holder));
getContentPane().setLayout(new BorderLayout());
|
|
From: Sebastian G. <sg...@us...> - 2011-06-05 19:57:17
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton
In directory vz-cvs-2.sog:/tmp/cvs-serv31814/src/net/sourceforge/bprocessor/packages/skeleton
Modified Files:
SkeletonPackage.java
Log Message:
Plugins updated using skeleton package
Index: SkeletonPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton/SkeletonPackage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SkeletonPackage.java 25 May 2011 13:46:11 -0000 1.5
--- SkeletonPackage.java 5 Jun 2011 19:57:14 -0000 1.6
***************
*** 42,48 ****
--- 42,57 ----
public static class SkeletonCommand extends NetCommand {
private ControlPanel panel;
+ //parameters for user-control
private DoubleValue skeletonConstant;
private StringValue skeletonName;
+ //getters for parameters
+ public DoubleValue getSkeletonConstant() {
+ return skeletonConstant;
+ }
+ public StringValue getSkeletonName() {
+ return skeletonName;
+ }
+
public void initialize(Space net) {
super.initialize(net);
***************
*** 53,62 ****
GUI.getInstance().registerControlPanel(panel);
}
! public DoubleValue getSkeletonConstant() {
! return skeletonConstant;
! }
! public StringValue getSkeletonName() {
! return skeletonName;
! }
public void evaluate() {
System.out.println("evaluate " + net);
--- 62,66 ----
GUI.getInstance().registerControlPanel(panel);
}
!
public void evaluate() {
System.out.println("evaluate " + net);
***************
*** 64,68 ****
System.out.println("name: " + skeletonName.getValue());
}
-
}
public static class SkeletonTool extends AbstractTool {
--- 68,71 ----
|
|
From: Michael L. <he...@us...> - 2011-05-26 13:53:35
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory vz-cvs-2.sog:/tmp/cvs-serv14049/src/net/sourceforge/bprocessor/model
Modified Files:
Material.java
Log Message:
Index: Material.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Material.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Material.java 27 Nov 2009 13:35:26 -0000 1.17
--- Material.java 26 May 2011 13:53:33 -0000 1.18
***************
*** 179,183 ****
*/
public float[] getColor() {
! return (float[]) diffuseColor.clone();
}
--- 179,187 ----
*/
public float[] getColor() {
! float[] color = new float[3];
! color[0] = diffuseColor[0];
! color[1] = diffuseColor[1];
! color[2] = diffuseColor[2];
! return (float[]) color;
}
|
|
From: Michael L. <he...@us...> - 2011-05-26 13:53:32
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory vz-cvs-2.sog:/tmp/cvs-serv14040/src/net/sourceforge/bprocessor/gl/view
Modified Files:
Display.java
Log Message:
Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** Display.java 5 May 2011 10:22:55 -0000 1.110
--- Display.java 26 May 2011 13:53:29 -0000 1.111
***************
*** 54,57 ****
--- 54,58 ----
private static final boolean TRUE = true;
+ private static float defaultAlpha = 0.3f;
private static boolean initialized;
private static boolean selecting;
***************
*** 553,557 ****
paint(current, color, 1.0f, false);
} else if (transparency) {
! paint(current, color, 0.3f, false);
}
}
--- 554,558 ----
paint(current, color, 1.0f, false);
} else if (transparency) {
! paint(current, color, defaultAlpha, false);
}
}
***************
*** 563,567 ****
paint(current, color, 1.0f, true);
} else if (transparency) {
! paint(current, color, 0.3f, true);
}
}
--- 564,568 ----
paint(current, color, 1.0f, true);
} else if (transparency) {
! paint(current, color, defaultAlpha, true);
}
}
|
|
From: Sebastian G. <sg...@us...> - 2011-05-26 05:59:57
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics
In directory vz-cvs-2.sog:/tmp/cvs-serv25723/src/net/sourceforge/bprocessor/packages/physics
Modified Files:
PhysicsMeshExtrusionPackage.java PhysicsPackage.java
Log Message:
small changes to mesh extrusion
Index: PhysicsPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics/PhysicsPackage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PhysicsPackage.java 23 May 2011 12:25:17 -0000 1.4
--- PhysicsPackage.java 26 May 2011 05:59:55 -0000 1.5
***************
*** 98,102 ****
//normalForce = 0.0;
//parameters.put("Normal Surface Force [N]", normalForce);
! volume = 1.0;
parameters.put("Volume [m3]", volume);
//editNet = true;
--- 98,102 ----
//normalForce = 0.0;
//parameters.put("Normal Surface Force [N]", normalForce);
! volume = 0.0;
parameters.put("Volume [m3]", volume);
//editNet = true;
Index: PhysicsMeshExtrusionPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics/PhysicsMeshExtrusionPackage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhysicsMeshExtrusionPackage.java 24 May 2011 05:53:51 -0000 1.2
--- PhysicsMeshExtrusionPackage.java 26 May 2011 05:59:55 -0000 1.3
***************
*** 229,232 ****
--- 229,233 ----
//
oS = new Surface(oEdgesUp);
+ oS.flip();
cNetShell.insertAll(oS);
saveMeshFaceParameter(oS,"Face Type", "Side 2");
***************
*** 235,238 ****
--- 236,241 ----
List<Edge> fEdges = new ArrayList<Edge>();
List<Edge> gEdges = new ArrayList<Edge>();
+ List<Vertex> vUp = new ArrayList<Vertex>();
+ List<Vertex> vDown = new ArrayList<Vertex>();
Surface oS;
Surface gS;
***************
*** 245,252 ****
--- 248,259 ----
Vertex oADown = oVerticesDown.get(eA);
Vertex oBDown = oVerticesDown.get(eB);
+ vDown.add(oADown);
+ vDown.add(oBDown);
Edge oEDown = new Edge(oADown,oBDown);
//
Vertex oAUp = oVerticesUp.get(eA);
Vertex oBUp = oVerticesUp.get(eB);
+ vUp.add(oAUp);
+ vUp.add(oBUp);
Edge oEUp = new Edge(oBUp,oAUp);
//
***************
*** 257,266 ****
fEdges.add(oES1.copy());
fEdges.add(oEUp.copy());
! fEdges.add(oES2.copy());
! //
gEdges.add(oEDown.copy());
gEdges.add(oES1.copy());
gEdges.add(oEUp.copy());
! gEdges.add(oES2.copy());
//check if lateral or internal
Collection<Surface> eSurfaces = e.getSurfaces();
--- 264,274 ----
fEdges.add(oES1.copy());
fEdges.add(oEUp.copy());
! fEdges.add(oES2.copy());
! //
gEdges.add(oEDown.copy());
gEdges.add(oES1.copy());
gEdges.add(oEUp.copy());
! gEdges.add(oES2.copy());
!
//check if lateral or internal
Collection<Surface> eSurfaces = e.getSurfaces();
***************
*** 274,284 ****
saveMeshFaceParameter(gS,"Face Type", "Lateral");
} else {
! oS = new Surface(fEdges);
! cNetGrid.insertAll(oS);
! saveMeshFaceParameter(oS,"Face Type", "Internal");
}
}
union.add(cNetShell);
union.add(cNetGrid);
}
--- 282,302 ----
saveMeshFaceParameter(gS,"Face Type", "Lateral");
} else {
! gS = new Surface(gEdges);
! cNetGrid.insertAll(gS);
! saveMeshFaceParameter(gS,"Face Type", "Internal");
}
}
union.add(cNetShell);
union.add(cNetGrid);
+ //make one side of vertices corners for grid shell
+ for (Vertex v : vDown) {
+ Collection<Vertex> gridVertices = cNetGrid.getVertices();
+ for (Vertex gV : gridVertices) {
+ if (v.coincides(gV)) {
+ System.out.println("found vertex");
+ gV.setCorner(true);
+ }
+ }
+ }
}
|
|
From: Michael L. <he...@us...> - 2011-05-25 13:46:13
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton
In directory vz-cvs-2.sog:/tmp/cvs-serv3940/src/net/sourceforge/bprocessor/packages/skeleton
Modified Files:
SkeletonPackage.java
Added Files:
SliderControl.java StringValue.java ControlValue.java
ControlDelegate.java StringControl.java Label.java
Control.java DoubleValue.java
Log Message:
New reusable control classes for creating control panels
--- NEW FILE: SliderControl.java ---
package net.sourceforge.bprocessor.packages.skeleton;
import java.awt.Dimension;
import java.awt.Insets;
import java.text.DecimalFormat;
import javax.swing.Box;
import javax.swing.JSlider;
import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import net.sourceforge.bprocessor.gui.attrview.AttributeView;
public class SliderControl extends Control implements ChangeListener, DocumentListener {
private Box row;
private JTextField valueLabel;
private JSlider slider;
private double minimum;
private double maximum;
private DoubleValue value;
private ControlDelegate delegate;
private boolean updating;
public SliderControl(double minimum, double maximum, DoubleValue value, ControlDelegate delegate) {
this.minimum = minimum;
this.maximum = maximum;
this.value = value;
this.delegate = delegate;
row = Box.createHorizontalBox();
valueLabel = new JTextField(toString(value.getValue()));
valueLabel.setFont(AttributeView.FONT_PLAIN);
valueLabel.setMargin(new Insets(1, 1, 1, 1));
Dimension size = valueLabel.getPreferredSize();
size.width = 80;
valueLabel.setPreferredSize(size);
valueLabel.setMaximumSize(size);
valueLabel.setHorizontalAlignment(JTextField.CENTER);
slider = new JSlider();
slider.setMinimum(0);
slider.setMaximum(Integer.MAX_VALUE);
slider.setValue(valueToInt(value.getValue()));
row.add(Box.createHorizontalStrut(5));
row.add(valueLabel);
row.add(slider);
slider.addChangeListener(this);
valueLabel.getDocument().addDocumentListener(this);
}
public Box row() {
return row;
}
public double value() {
return value.getValue();
}
public double intToValue(int i) {
double factor = (double) i / (double) Integer.MAX_VALUE;
return minimum + factor * (maximum - minimum);
}
public int valueToInt(double v) {
double factor = (v - minimum) / (maximum - minimum);
return (int) (factor * Integer.MAX_VALUE);
}
public static String toString(double v) {
DecimalFormat format = new DecimalFormat("#.###");
return format.format(v);
}
public void stateChanged(ChangeEvent event) {
if (!updating) {
updating = true;
int i = slider.getValue();
value.setValue(intToValue(i));
valueLabel.setText(toString(value.getValue()));
if (delegate != null) {
delegate.changed(this);
}
updating = false;
}
}
public void check() {
if (!updating) {
updating = true;
String text = valueLabel.getText();
try {
value.setValue(Double.valueOf(text));
slider.setValue(valueToInt(value.getValue()));
} catch (Throwable error){
}
updating = false;
}
}
public void changedUpdate(DocumentEvent event) {
}
public void insertUpdate(DocumentEvent event) {
check();
}
public void removeUpdate(DocumentEvent event) {
check();
}
}
--- NEW FILE: DoubleValue.java ---
package net.sourceforge.bprocessor.packages.skeleton;
public class DoubleValue implements ControlValue {
private double value;
public DoubleValue(double value) {
this.value = value;
}
public double getValue() {
return value;
}
public void setValue(double value) {
this.value = value;
}
public String format() {
return String.valueOf(value);
}
public void parse(String string) {
try {
value = Double.valueOf(string);
} catch (Throwable error) {
}
}
}
--- NEW FILE: ControlDelegate.java ---
package net.sourceforge.bprocessor.packages.skeleton;
public interface ControlDelegate {
void changed(Object source);
}
--- NEW FILE: ControlValue.java ---
package net.sourceforge.bprocessor.packages.skeleton;
public interface ControlValue {
public String format();
public void parse(String string);
}
Index: SkeletonPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton/SkeletonPackage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SkeletonPackage.java 19 May 2011 11:49:43 -0000 1.4
--- SkeletonPackage.java 25 May 2011 13:46:11 -0000 1.5
***************
*** 20,25 ****
--- 20,28 ----
import javax.swing.JPanel;
import javax.swing.JSlider;
+ import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+ import javax.swing.event.DocumentEvent;
+ import javax.swing.event.DocumentListener;
import net.sourceforge.bprocessor.gl.Editor;
***************
*** 39,60 ****
public static class SkeletonCommand extends NetCommand {
private ControlPanel panel;
! private double skeletonConstant;
public void initialize(Space net) {
super.initialize(net);
System.out.println("initialize " + net);
! skeletonConstant = 42;
panel = new ControlPanel(this);
GUI.getInstance().registerControlPanel(panel);
}
! public double getSkeletonConstant() {
return skeletonConstant;
}
! public void setSkeletonConstant(double value) {
! skeletonConstant = value;
}
public void evaluate() {
System.out.println("evaluate " + net);
! System.out.println("skeleton-constant: " + skeletonConstant);
}
--- 42,66 ----
public static class SkeletonCommand extends NetCommand {
private ControlPanel panel;
! private DoubleValue skeletonConstant;
! private StringValue skeletonName;
public void initialize(Space net) {
super.initialize(net);
System.out.println("initialize " + net);
! skeletonConstant = new DoubleValue(42);
! skeletonName = new StringValue("Mike");
panel = new ControlPanel(this);
GUI.getInstance().registerControlPanel(panel);
}
! public DoubleValue getSkeletonConstant() {
return skeletonConstant;
}
! public StringValue getSkeletonName() {
! return skeletonName;
}
public void evaluate() {
System.out.println("evaluate " + net);
! System.out.println("skeleton-constant: " + skeletonConstant.getValue());
! System.out.println("name: " + skeletonName.getValue());
}
***************
*** 116,186 ****
}
- public static interface ControlDelegate {
- void changed(Object source);
- }
- public static class SliderControl implements ChangeListener {
- private Box row;
- private JLabel valueLabel;
- private JSlider slider;
- private double minimum;
- private double maximum;
- private double value;
- private ControlDelegate delegate;
-
- public SliderControl(double minimum, double maximum, double value, ControlDelegate delegate) {
- this.minimum = minimum;
- this.maximum = maximum;
- this.value = value;
- this.delegate = delegate;
- row = Box.createHorizontalBox();
- valueLabel = new JLabel(toString(value));
- Dimension size = valueLabel.getPreferredSize();
- size.width = 60;
- valueLabel.setPreferredSize(size);
- slider = new JSlider();
- slider.setMinimum(0);
- slider.setMaximum(Integer.MAX_VALUE);
- slider.setValue(valueToInt(value));
- row.add(Box.createHorizontalStrut(5));
- row.add(valueLabel);
- row.add(slider);
- slider.addChangeListener(this);
- }
-
-
- public Box row() {
- return row;
- }
-
- public double value() {
- return value;
- }
-
- public double intToValue(int i) {
- double factor = (double) i / (double) Integer.MAX_VALUE;
- return minimum + factor * (maximum - minimum);
- }
- public int valueToInt(double v) {
- double factor = (v - minimum) / (maximum - minimum);
- return (int) (factor * Integer.MAX_VALUE);
- }
-
- public static String toString(double v) {
- DecimalFormat format = new DecimalFormat("#.###");
- return format.format(v);
- }
- public void stateChanged(ChangeEvent event) {
- int i = slider.getValue();
- value = intToValue(i);
- valueLabel.setText(toString(value));
- if (delegate != null) {
- delegate.changed(this);
- }
- }
- }
! public static class ControlPanel extends JPanel {
private SkeletonCommand skeleton;
private CommandEvaluator doit;
--- 122,129 ----
}
! public static class ControlPanel extends JPanel implements ControlDelegate {
private SkeletonCommand skeleton;
private CommandEvaluator doit;
***************
*** 255,273 ****
});
content.add(toolBtn);
{
! Box titleRow = Box.createHorizontalBox();
! titleRow.add(Box.createHorizontalStrut(5));
! titleRow.add(new JLabel("Skeleton Constant:"));
! titleRow.add(Box.createHorizontalGlue());
! SliderControl control = new SliderControl(18.0, 80.0, skeleton.getSkeletonConstant(), new ControlDelegate() {
! public void changed(Object source) {
! SliderControl cntl = (SliderControl) source;
! skeleton.setSkeletonConstant(cntl.value());
! }
! });
! content.add((Box.createVerticalStrut(7)));
! content.add(titleRow);
! content.add(control.row());
}
}
}
--- 198,215 ----
});
content.add(toolBtn);
+
+ //Sebastian look here!
{
! SliderControl control = new SliderControl(18.0, 80.0, skeleton.getSkeletonConstant(), this);
! Label labelled = new Label("Skeleton Constant:", control);
! content.add(labelled.row());
}
+ {
+ StringControl control = new StringControl(skeleton.getSkeletonName(), this);
+ Label labelled = new Label("Skeletons Name:", control);
+ content.add(labelled.row());
+ }
+ }
+ public void changed(Object source) {
}
}
--- NEW FILE: StringControl.java ---
package net.sourceforge.bprocessor.packages.skeleton;
import java.awt.Insets;
import javax.swing.Box;
import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import net.sourceforge.bprocessor.gui.attrview.AttributeView;
public class StringControl extends Control implements DocumentListener {
private Box row;
private JTextField valueLabel;
private ControlValue value;
private ControlDelegate delegate;
public StringControl(ControlValue value, ControlDelegate delegate) {
this.value = value;
this.delegate = delegate;
row = Box.createHorizontalBox();
valueLabel = new JTextField(value.format());
valueLabel.setFont(AttributeView.FONT_PLAIN);
valueLabel.setMargin(new Insets(1, 1, 1, 1));
row.add(Box.createHorizontalStrut(5));
row.add(valueLabel);
valueLabel.getDocument().addDocumentListener(this);
}
public Box row() {
return row;
}
public void check() {
try {
value.parse(valueLabel.getText());
delegate.changed(this);
} catch (Throwable error) {
}
}
public void changedUpdate(DocumentEvent e) {
}
public void insertUpdate(DocumentEvent e) {
check();
}
public void removeUpdate(DocumentEvent e) {
check();
}
}
--- NEW FILE: StringValue.java ---
package net.sourceforge.bprocessor.packages.skeleton;
public class StringValue implements ControlValue {
private String value;
public StringValue(String value) {
this.value = value;
}
public void setValue(String value) {
this.value = value;
}
public String getValue() {
return value;
}
public String format() {
return value;
}
public void parse(String string) {
value = string;
}
}
--- NEW FILE: Label.java ---
package net.sourceforge.bprocessor.packages.skeleton;
import javax.swing.Box;
import javax.swing.JLabel;
public class Label extends Control {
private Box row;
public Label(String label, Control control) {
row = Box.createVerticalBox();
Box titleRow = Box.createHorizontalBox();
titleRow.add(Box.createHorizontalStrut(5));
titleRow.add(new JLabel(label));
titleRow.add(Box.createHorizontalGlue());
row.add((Box.createVerticalStrut(7)));
row.add(titleRow);
row.add(control.row());
}
public Box row() {
return row;
}
}
--- NEW FILE: Control.java ---
package net.sourceforge.bprocessor.packages.skeleton;
import javax.swing.Box;
public abstract class Control {
public abstract Box row();
}
|
|
From: Michael L. <he...@us...> - 2011-05-24 13:57:29
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory vz-cvs-2.sog:/tmp/cvs-serv1633/src/net/sourceforge/bprocessor/model
Modified Files:
Persistence.java
Log Message:
Save edge parameters
Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** Persistence.java 5 May 2011 10:22:48 -0000 1.93
--- Persistence.java 24 May 2011 13:57:24 -0000 1.94
***************
*** 876,879 ****
--- 876,883 ----
object.setFrom((Vertex) get(xml.getFrom(), map));
object.setTo((Vertex) get(xml.getTo(), map));
+ if (!xml.getAttribute().isEmpty()) {
+ object.setParameters(internalizeParameterBlock(xml.getAttribute(), map));
+ }
+
}
***************
*** 1558,1561 ****
--- 1562,1568 ----
xml.setFrom(id(map, object.getFrom()));
xml.setTo(id(map, object.getTo()));
+ if (object.getParameters() != null) {
+ xml.getAttribute().addAll(externalizeParameterBlock(object.getParameters(), map));
+ }
}
|
|
From: Michael L. <he...@us...> - 2011-05-24 13:57:27
|
Update of /cvsroot/bprocessor/model/src/etc
In directory vz-cvs-2.sog:/tmp/cvs-serv1633/src/etc
Modified Files:
bprocessor.xsd
Log Message:
Save edge parameters
Index: bprocessor.xsd
===================================================================
RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** bprocessor.xsd 5 May 2011 10:22:48 -0000 1.50
--- bprocessor.xsd 24 May 2011 13:57:25 -0000 1.51
***************
*** 35,38 ****
--- 35,41 ----
<xsd:complexContent>
<xsd:extension base="BasicType">
+ <xsd:sequence>
+ <xsd:element name="attribute" type="MapElementType" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
<xsd:attribute name="progid" type="xsd:long" use="optional"/>
</xsd:extension>
***************
*** 89,93 ****
<xsd:element name="transforms" type="TransformType" maxOccurs="unbounded" minOccurs="0"/>
<xsd:element name="anchor" type="CoordinateSystemType" maxOccurs="1" minOccurs="0"/>
! <xsd:element name="attribute" type="MapElementType" maxOccurs="unbounded" minOccurs="0"/>
<xsd:element ref="space" maxOccurs="unbounded" minOccurs="0"/>
--- 92,96 ----
<xsd:element name="transforms" type="TransformType" maxOccurs="unbounded" minOccurs="0"/>
<xsd:element name="anchor" type="CoordinateSystemType" maxOccurs="1" minOccurs="0"/>
!
<xsd:element ref="space" maxOccurs="unbounded" minOccurs="0"/>
|
|
From: Sebastian G. <sg...@us...> - 2011-05-24 05:53:56
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory vz-cvs-2.sog:/tmp/cvs-serv8055/src/net/sourceforge/bprocessor/model
Modified Files:
ParameterBlock.java
Log Message:
PhysicsMeshExtrude Update, new bNets fixed, parameters added
Index: ParameterBlock.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ParameterBlock.java 5 May 2011 16:34:02 -0000 1.21
--- ParameterBlock.java 24 May 2011 05:53:54 -0000 1.22
***************
*** 145,148 ****
--- 145,172 ----
}
+ public void putString (String key, String value) {
+ add(new Attribute(key, value));
+ }
+
+ public String getString (String key) {
+ for (Attribute current : parameters) {
+ if (current.getName().equals(key)) {
+ return ((String)(current.getValue())).toString();
+ }
+ }
+ return "";
+ }
+
+ public boolean changeString (String key, String value) {
+ boolean successful = false;
+ for (Attribute current : parameters) {
+ if (current.getName().equals(key)) {
+ current.setValue(value);
+ successful = true;
+ }
+ }
+ return successful;
+ }
+
/**
*
|
|
From: Sebastian G. <sg...@us...> - 2011-05-24 05:53:54
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics
In directory vz-cvs-2.sog:/tmp/cvs-serv8044/src/net/sourceforge/bprocessor/packages/physics
Modified Files:
PhysicsNet.java PhysicsMeshExtrusionPackage.java
Log Message:
PhysicsMeshExtrude Update, new bNets fixed, parameters added
Index: PhysicsMeshExtrusionPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics/PhysicsMeshExtrusionPackage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PhysicsMeshExtrusionPackage.java 23 May 2011 12:25:17 -0000 1.1
--- PhysicsMeshExtrusionPackage.java 24 May 2011 05:53:51 -0000 1.2
***************
*** 97,102 ****
}
//offset
! Space cNetUp = (Space) Space.createNet(net.getName()+" - Mesh Offset 1");
! Space cNetDown = (Space) Space.createNet(net.getName()+" - Mesh Offset 2");
//loop through vertices
//get surrounding surfaces of each vertex
--- 97,103 ----
}
//offset
! Space cNetShell = (Space) Space.createNet(net.getName()+" - Mesh Offset Shell");
! Space cNetGrid = (Space) Space.createNet(net.getName()+" - Mesh Offset Grid");
!
//loop through vertices
//get surrounding surfaces of each vertex
***************
*** 184,188 ****
//averageN = averageN.scale(1/nCount);
averageN.normalize();
! System.out.println("Normal: " + averageN.toString());
//intersect line plane for all surrounding surface planes and generate average intersection point
for (PhysicsPlane p : sPlanesDown) {
--- 185,189 ----
//averageN = averageN.scale(1/nCount);
averageN.normalize();
! //System.out.println("Normal: " + averageN.toString());
//intersect line plane for all surrounding surface planes and generate average intersection point
for (PhysicsPlane p : sPlanesDown) {
***************
*** 205,231 ****
List<Edge> oEdgesDown = new ArrayList<Edge>();
List<Edge> oEdgesUp = new ArrayList<Edge>();
for (Edge e : sEdges) {
Vertex eA = e.getFrom();
Vertex eB = e.getTo();
Vertex oADown = oVerticesDown.get(eA);
Vertex oBDown = oVerticesDown.get(eB);
Edge oEDown = new Edge(oADown,oBDown);
oEdgesDown.add(oEDown);
Vertex oAUp = oVerticesUp.get(eA);
Vertex oBUp = oVerticesUp.get(eB);
! Edge oEUp = new Edge(oAUp,oBUp);
! oEdgesUp.add(oEUp);
}
! Surface oS = new Surface(oEdgesDown);
! cNetDown.insertAll(oS);
oS = new Surface(oEdgesUp);
! cNetUp.insertAll(oS);
}
! union.add(cNetDown);
! union.add(cNetUp);
}
}
public static class SkeletonTool extends AbstractTool {
--- 206,303 ----
List<Edge> oEdgesDown = new ArrayList<Edge>();
List<Edge> oEdgesUp = new ArrayList<Edge>();
+ List<Edge> fEdges = new ArrayList<Edge>();;
+ //offset surfaces up and down
for (Edge e : sEdges) {
+ fEdges = new ArrayList<Edge>();
Vertex eA = e.getFrom();
Vertex eB = e.getTo();
+ //
Vertex oADown = oVerticesDown.get(eA);
Vertex oBDown = oVerticesDown.get(eB);
Edge oEDown = new Edge(oADown,oBDown);
oEdgesDown.add(oEDown);
+ //
Vertex oAUp = oVerticesUp.get(eA);
Vertex oBUp = oVerticesUp.get(eB);
! Edge oEUp = new Edge(oBUp,oAUp);
! oEdgesUp.add(oEUp);
}
! Surface oS;
! oS = new Surface(oEdgesDown);
! cNetShell.insertAll(oS);
! saveMeshFaceParameter(oS,"Face Type", "Side 1");
! //
oS = new Surface(oEdgesUp);
! cNetShell.insertAll(oS);
! saveMeshFaceParameter(oS,"Face Type", "Side 2");
}
! //Lateral and Internal Faces
! List<Edge> fEdges = new ArrayList<Edge>();
! List<Edge> gEdges = new ArrayList<Edge>();
! Surface oS;
! Surface gS;
! for (Edge e : nEdges) {
! fEdges = new ArrayList<Edge>();
! gEdges = new ArrayList<Edge>();
! Vertex eA = e.getFrom();
! Vertex eB = e.getTo();
! //
! Vertex oADown = oVerticesDown.get(eA);
! Vertex oBDown = oVerticesDown.get(eB);
! Edge oEDown = new Edge(oADown,oBDown);
! //
! Vertex oAUp = oVerticesUp.get(eA);
! Vertex oBUp = oVerticesUp.get(eB);
! Edge oEUp = new Edge(oBUp,oAUp);
! //
! Edge oES1 = new Edge(oADown, oAUp);
! Edge oES2 = new Edge(oBUp, oBDown);
! //
! fEdges.add(oEDown.copy());
! fEdges.add(oES1.copy());
! fEdges.add(oEUp.copy());
! fEdges.add(oES2.copy());
! //
! gEdges.add(oEDown.copy());
! gEdges.add(oES1.copy());
! gEdges.add(oEUp.copy());
! gEdges.add(oES2.copy());
! //check if lateral or internal
! Collection<Surface> eSurfaces = e.getSurfaces();
! if (eSurfaces.size()==1) {
! oS = new Surface(fEdges);
! cNetShell.insertAll(oS);
! saveMeshFaceParameter(oS,"Face Type", "Lateral");
! //
! gS = new Surface(gEdges);
! cNetGrid.insertAll(gS);
! saveMeshFaceParameter(gS,"Face Type", "Lateral");
! } else {
! oS = new Surface(fEdges);
! cNetGrid.insertAll(oS);
! saveMeshFaceParameter(oS,"Face Type", "Internal");
! }
! }
! union.add(cNetShell);
! union.add(cNetGrid);
}
+
+ void saveMeshFaceParameter (Surface s, String key, String value) {
+ ParameterBlock block = s.getParameters();
+ if (block == null) {
+ block = new ParameterBlock();
+ s.setParameters(block);
+ block.putString(key,value);
+ }
+ boolean successful = block.changeString(key, value);
+ if (successful == false) {
+ block.putString(key, value);
+ }
+ }
+
}
+
public static class SkeletonTool extends AbstractTool {
Index: PhysicsNet.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics/PhysicsNet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PhysicsNet.java 16 May 2011 06:11:05 -0000 1.1
--- PhysicsNet.java 24 May 2011 05:53:51 -0000 1.2
***************
*** 46,49 ****
--- 46,52 ----
PhysicsParticle pA = particles.get(bE.getFrom());
PhysicsParticle pB = particles.get(bE.getTo());
+ if ((pA == null) || (pB == null)) {
+ System.out.println("For this edge a vertex is missing");
+ } else {
PhysicsSpring pS = new PhysicsSpring(pA,pB,pA.pos.distance(pB.pos),spring_c);
pS.restLengthFactor = restLengthFactor;
***************
*** 53,56 ****
--- 56,60 ----
counter++;;
saveSpringParameter(bE,pS);
+ }
}
//create PhysicsSurfaces
|
|
From: Sebastian G. <sg...@us...> - 2011-05-23 12:25:19
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor
In directory vz-cvs-2.sog:/tmp/cvs-serv20473/src/net/sourceforge/bprocessor
Modified Files:
Main.java
Log Message:
mesh offset plugin
Index: Main.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/Main.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Main.java 16 May 2011 06:11:05 -0000 1.5
--- Main.java 23 May 2011 12:25:17 -0000 1.6
***************
*** 8,11 ****
--- 8,12 ----
import net.sourceforge.bprocessor.packages.skeleton.SkeletonPackage;
import net.sourceforge.bprocessor.packages.physics.PhysicsPackage;
+ import net.sourceforge.bprocessor.packages.physics.PhysicsMeshExtrusionPackage;
import org.apache.log4j.PropertyConfigurator;
***************
*** 26,29 ****
--- 27,31 ----
new SkeletonPackage();
new PhysicsPackage();
+ new PhysicsMeshExtrusionPackage();
}
|
|
From: Sebastian G. <sg...@us...> - 2011-05-22 11:07:53
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics
In directory vz-cvs-2.sog:/tmp/cvs-serv9767/src/net/sourceforge/bprocessor/packages/physics
Modified Files:
PhysicsPackage.java
Log Message:
update
Index: PhysicsPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics/PhysicsPackage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhysicsPackage.java 18 May 2011 22:08:45 -0000 1.2
--- PhysicsPackage.java 22 May 2011 11:07:50 -0000 1.3
***************
*** 154,158 ****
}
});
!
AttributeView.instance().display(this);
}
--- 154,158 ----
}
});
! //Temporary Solution - diplay in parameters panel!
AttributeView.instance().display(this);
}
|
|
From: Michael L. <he...@us...> - 2011-05-19 11:49:46
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton
In directory vz-cvs-2.sog:/tmp/cvs-serv3231/src/net/sourceforge/bprocessor/packages/skeleton
Modified Files:
SkeletonPackage.java
Log Message:
Index: SkeletonPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton/SkeletonPackage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SkeletonPackage.java 19 May 2011 07:24:48 -0000 1.3
--- SkeletonPackage.java 19 May 2011 11:49:43 -0000 1.4
***************
*** 3,6 ****
--- 3,7 ----
import java.awt.BorderLayout;
import java.awt.Color;
+ import java.awt.Dimension;
import java.awt.Insets;
import java.awt.event.ActionEvent;
***************
*** 8,11 ****
--- 9,13 ----
import java.awt.event.MouseEvent;
import java.net.URL;
+ import java.text.DecimalFormat;
import javax.swing.AbstractAction;
***************
*** 18,21 ****
--- 20,25 ----
import javax.swing.JPanel;
import javax.swing.JSlider;
+ import javax.swing.event.ChangeEvent;
+ import javax.swing.event.ChangeListener;
import net.sourceforge.bprocessor.gl.Editor;
***************
*** 35,48 ****
--- 39,62 ----
public static class SkeletonCommand extends NetCommand {
private ControlPanel panel;
+ private double skeletonConstant;
public void initialize(Space net) {
super.initialize(net);
System.out.println("initialize " + net);
+ skeletonConstant = 42;
panel = new ControlPanel(this);
GUI.getInstance().registerControlPanel(panel);
}
+ public double getSkeletonConstant() {
+ return skeletonConstant;
+ }
+ public void setSkeletonConstant(double value) {
+ skeletonConstant = value;
+ }
public void evaluate() {
System.out.println("evaluate " + net);
+ System.out.println("skeleton-constant: " + skeletonConstant);
}
+
}
public static class SkeletonTool extends AbstractTool {
***************
*** 102,105 ****
--- 116,184 ----
}
+ public static interface ControlDelegate {
+ void changed(Object source);
+ }
+
+ public static class SliderControl implements ChangeListener {
+ private Box row;
+ private JLabel valueLabel;
+ private JSlider slider;
+ private double minimum;
+ private double maximum;
+ private double value;
+ private ControlDelegate delegate;
+
+ public SliderControl(double minimum, double maximum, double value, ControlDelegate delegate) {
+ this.minimum = minimum;
+ this.maximum = maximum;
+ this.value = value;
+ this.delegate = delegate;
+ row = Box.createHorizontalBox();
+ valueLabel = new JLabel(toString(value));
+ Dimension size = valueLabel.getPreferredSize();
+ size.width = 60;
+ valueLabel.setPreferredSize(size);
+ slider = new JSlider();
+ slider.setMinimum(0);
+ slider.setMaximum(Integer.MAX_VALUE);
+ slider.setValue(valueToInt(value));
+ row.add(Box.createHorizontalStrut(5));
+ row.add(valueLabel);
+ row.add(slider);
+ slider.addChangeListener(this);
+ }
+
+
+ public Box row() {
+ return row;
+ }
+
+ public double value() {
+ return value;
+ }
+
+ public double intToValue(int i) {
+ double factor = (double) i / (double) Integer.MAX_VALUE;
+ return minimum + factor * (maximum - minimum);
+ }
+ public int valueToInt(double v) {
+ double factor = (v - minimum) / (maximum - minimum);
+ return (int) (factor * Integer.MAX_VALUE);
+ }
+
+ public static String toString(double v) {
+ DecimalFormat format = new DecimalFormat("#.###");
+ return format.format(v);
+ }
+ public void stateChanged(ChangeEvent event) {
+ int i = slider.getValue();
+ value = intToValue(i);
+ valueLabel.setText(toString(value));
+ if (delegate != null) {
+ delegate.changed(this);
+ }
+ }
+ }
+
public static class ControlPanel extends JPanel {
***************
*** 109,116 ****
private Box content;
private SkeletonTool tool;
! public ControlPanel(SkeletonCommand skeleton) {
super(new BorderLayout());
! this.skeleton = skeleton;
! doit = new CommandEvaluator(skeleton);
tool = new SkeletonTool();
--- 188,195 ----
private Box content;
private SkeletonTool tool;
! public ControlPanel(SkeletonCommand command) {
super(new BorderLayout());
! this.skeleton = command;
! doit = new CommandEvaluator(command);
tool = new SkeletonTool();
***************
*** 120,124 ****
Box title = Box.createVerticalBox();
Box header = Box.createHorizontalBox();
! JLabel label = new JLabel(" - Skeleton Controls -");
label.setFont(AttributeView.FONT_HEADER);
header.add(Box.createHorizontalGlue());
--- 199,203 ----
Box title = Box.createVerticalBox();
Box header = Box.createHorizontalBox();
! JLabel label = new JLabel("- Skeleton Controls -");
label.setFont(AttributeView.FONT_HEADER);
header.add(Box.createHorizontalGlue());
***************
*** 177,208 ****
content.add(toolBtn);
{
- Box sliderRow = Box.createHorizontalBox();
Box titleRow = Box.createHorizontalBox();
titleRow.add(Box.createHorizontalStrut(5));
! titleRow.add(new JLabel("Spring Constant:"));
! titleRow.add(Box.createHorizontalGlue());
! JLabel value = new JLabel("1.500");
! JSlider slider = new JSlider();
! sliderRow.add(Box.createHorizontalStrut(5));
! sliderRow.add(value);
! sliderRow.add(slider);
! content.add((Box.createVerticalStrut(7)));
! content.add(titleRow);
! content.add(sliderRow);
! }
! {
! Box sliderRow = Box.createHorizontalBox();
! Box titleRow = Box.createHorizontalBox();
! titleRow.add(Box.createHorizontalStrut(5));
! titleRow.add(new JLabel("Default Weight:"));
titleRow.add(Box.createHorizontalGlue());
! JLabel value = new JLabel("4.700");
! JSlider slider = new JSlider();
! sliderRow.add(Box.createHorizontalStrut(5));
! sliderRow.add(value);
! sliderRow.add(slider);
content.add((Box.createVerticalStrut(7)));
content.add(titleRow);
! content.add(sliderRow);
}
}
--- 256,272 ----
content.add(toolBtn);
{
Box titleRow = Box.createHorizontalBox();
titleRow.add(Box.createHorizontalStrut(5));
! titleRow.add(new JLabel("Skeleton Constant:"));
titleRow.add(Box.createHorizontalGlue());
! SliderControl control = new SliderControl(18.0, 80.0, skeleton.getSkeletonConstant(), new ControlDelegate() {
! public void changed(Object source) {
! SliderControl cntl = (SliderControl) source;
! skeleton.setSkeletonConstant(cntl.value());
! }
! });
content.add((Box.createVerticalStrut(7)));
content.add(titleRow);
! content.add(control.row());
}
}
|
|
From: Michael L. <he...@us...> - 2011-05-19 08:27:09
|
Update of /cvsroot/bprocessor/gui/src/gfx In directory vz-cvs-2.sog:/tmp/cvs-serv32581/src/gfx Added Files: play-icon.png play-icon-active.png stop-icon.png step-icon.png Log Message: --- NEW FILE: stop-icon.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: play-icon-active.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: step-icon.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: play-icon.png --- (This appears to be a binary file; contents omitted.) |
|
From: Michael L. <he...@us...> - 2011-05-19 07:24:51
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton
In directory vz-cvs-2.sog:/tmp/cvs-serv22059/src/net/sourceforge/bprocessor/packages/skeleton
Modified Files:
SkeletonPackage.java
Log Message:
Index: SkeletonPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton/SkeletonPackage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SkeletonPackage.java 18 May 2011 22:08:44 -0000 1.2
--- SkeletonPackage.java 19 May 2011 07:24:48 -0000 1.3
***************
*** 3,13 ****
import java.awt.BorderLayout;
import java.awt.Color;
! import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.JButton;
import javax.swing.JLabel;
--- 3,17 ----
import java.awt.BorderLayout;
import java.awt.Color;
! import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
+ import java.net.URL;
+ import javax.swing.AbstractAction;
+ import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.Box;
+ import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JLabel;
***************
*** 30,51 ****
}
public static class SkeletonCommand extends NetCommand {
- private SkeletonTool tool;
private ControlPanel panel;
public void initialize(Space net) {
System.out.println("initialize " + net);
! tool = new SkeletonTool();
! parameters.put("Tool", new Operation() {
! @Override
! public void perform() {
! System.out.println("activate tool");
! Editor.instance().changeTool(tool);
! }
! });
! panel = new ControlPanel();
GUI.getInstance().registerControlPanel(panel);
}
public void evaluate() {
! System.out.println("evaluate");
}
}
--- 34,47 ----
}
public static class SkeletonCommand extends NetCommand {
private ControlPanel panel;
public void initialize(Space net) {
+ super.initialize(net);
System.out.println("initialize " + net);
! panel = new ControlPanel(this);
GUI.getInstance().registerControlPanel(panel);
}
public void evaluate() {
! System.out.println("evaluate " + net);
}
}
***************
*** 83,91 ****
}
public static class ControlPanel extends JPanel {
private Box content;
private SkeletonTool tool;
! public ControlPanel() {
super(new BorderLayout());
tool = new SkeletonTool();
setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
--- 79,117 ----
}
+ public static abstract class SkeletonAction extends AbstractAction {
+ /**
+ * Constructs option action
+ * @param iconname String
+ */
+ public SkeletonAction(String iconname) {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ URL url = cl.getResource(iconname);
+ ImageIcon im = new ImageIcon(url);
+ putValue(Action.SMALL_ICON, im);
+ };
+ }
+
+ public static class CommandEvaluator extends Operation {
+ private Command command;
+ public CommandEvaluator(Command command) {
+ this.command = command;
+ }
+ public void perform() {
+ command.evaluate();
+ }
+ }
+
+
public static class ControlPanel extends JPanel {
+ private SkeletonCommand skeleton;
+ private CommandEvaluator doit;
+
private Box content;
private SkeletonTool tool;
! public ControlPanel(SkeletonCommand skeleton) {
super(new BorderLayout());
+ this.skeleton = skeleton;
+ doit = new CommandEvaluator(skeleton);
+
tool = new SkeletonTool();
setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
***************
*** 102,105 ****
--- 128,172 ----
title.add(Box.createVerticalStrut(7));
content.add(title);
+ {
+ Box buttonRow = Box.createHorizontalBox();
+
+ {
+ buttonRow.add(Box.createHorizontalStrut(5));
+ JButton button = new JButton(new SkeletonAction("play-icon.png") {
+ public void actionPerformed(ActionEvent e) {
+ GUI.getInstance().registerOperation(doit);
+ }
+ });
+ button.setMargin(new Insets(1, 1, 1, 1));
+ button.setMaximumSize(button.getMinimumSize());
+ buttonRow.add(button);
+ }
+ {
+ buttonRow.add(Box.createHorizontalStrut(5));
+ JButton button = new JButton(new SkeletonAction("stop-icon.png") {
+ public void actionPerformed(ActionEvent e) {
+ GUI.getInstance().unregisterOperation(doit);
+ }
+ });
+ button.setMargin(new Insets(1, 1, 1, 1));
+ button.setMaximumSize(button.getMinimumSize());
+ buttonRow.add(button);
+ }
+ {
+ buttonRow.add(Box.createHorizontalStrut(5));
+ JButton button = new JButton(new SkeletonAction("step-icon.png") {
+ public void actionPerformed(ActionEvent e) {
+ doit.perform();
+ }
+ });
+ button.setMargin(new Insets(1, 1, 1, 1));
+ button.setMaximumSize(button.getMinimumSize());
+ buttonRow.add(button);
+ }
+
+
+ buttonRow.add(Box.createHorizontalGlue());
+ content.add(buttonRow);
+ }
JButton toolBtn = new JButton("Tool");
toolBtn.addActionListener(new ActionListener() {
***************
*** 139,145 ****
content.add(sliderRow);
}
- // JPanel vfiller = new JPanel();
- // vfiller.setPreferredSize(new Dimension(240, 240));
- // add(BorderLayout.CENTER, vfiller);
}
}
--- 206,209 ----
|
|
From: Michael L. <he...@us...> - 2011-05-18 22:08:47
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton
In directory vz-cvs-2.sog:/tmp/cvs-serv27666/src/net/sourceforge/bprocessor/packages/skeleton
Modified Files:
SkeletonPackage.java
Log Message:
Index: SkeletonPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/skeleton/SkeletonPackage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SkeletonPackage.java 11 May 2011 10:14:48 -0000 1.1
--- SkeletonPackage.java 18 May 2011 22:08:44 -0000 1.2
***************
*** 1,9 ****
package net.sourceforge.bprocessor.packages.skeleton;
! import java.awt.Cursor;
import java.awt.event.MouseEvent;
import net.sourceforge.bprocessor.gl.Editor;
import net.sourceforge.bprocessor.gl.tool.AbstractTool;
import net.sourceforge.bprocessor.model.Command;
import net.sourceforge.bprocessor.model.Geometric;
--- 1,22 ----
package net.sourceforge.bprocessor.packages.skeleton;
! import java.awt.BorderLayout;
! import java.awt.Color;
! import java.awt.Dimension;
! import java.awt.event.ActionEvent;
! import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
+ import javax.swing.BorderFactory;
+ import javax.swing.Box;
+ import javax.swing.JButton;
+ import javax.swing.JLabel;
+ import javax.swing.JPanel;
+ import javax.swing.JSlider;
+
import net.sourceforge.bprocessor.gl.Editor;
import net.sourceforge.bprocessor.gl.tool.AbstractTool;
+ import net.sourceforge.bprocessor.gui.GUI;
+ import net.sourceforge.bprocessor.gui.attrview.AttributeView;
import net.sourceforge.bprocessor.model.Command;
import net.sourceforge.bprocessor.model.Geometric;
***************
*** 18,21 ****
--- 31,35 ----
public static class SkeletonCommand extends NetCommand {
private SkeletonTool tool;
+ private ControlPanel panel;
public void initialize(Space net) {
***************
*** 29,33 ****
}
});
!
}
public void evaluate() {
--- 43,48 ----
}
});
! panel = new ControlPanel();
! GUI.getInstance().registerControlPanel(panel);
}
public void evaluate() {
***************
*** 67,69 ****
--- 82,146 ----
}
}
+
+ public static class ControlPanel extends JPanel {
+ private Box content;
+ private SkeletonTool tool;
+ public ControlPanel() {
+ super(new BorderLayout());
+ tool = new SkeletonTool();
+ setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
+ content = Box.createVerticalBox();
+ add(content, BorderLayout.NORTH);
+ Box title = Box.createVerticalBox();
+ Box header = Box.createHorizontalBox();
+ JLabel label = new JLabel(" - Skeleton Controls -");
+ label.setFont(AttributeView.FONT_HEADER);
+ header.add(Box.createHorizontalGlue());
+ header.add(label);
+ header.add(Box.createHorizontalGlue());
+ title.add(header);
+ title.add(Box.createVerticalStrut(7));
+ content.add(title);
+ JButton toolBtn = new JButton("Tool");
+ toolBtn.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent event) {
+ Editor.instance().changeTool(tool);
+ }
+ });
+ content.add(toolBtn);
+ {
+ Box sliderRow = Box.createHorizontalBox();
+ Box titleRow = Box.createHorizontalBox();
+ titleRow.add(Box.createHorizontalStrut(5));
+ titleRow.add(new JLabel("Spring Constant:"));
+ titleRow.add(Box.createHorizontalGlue());
+ JLabel value = new JLabel("1.500");
+ JSlider slider = new JSlider();
+ sliderRow.add(Box.createHorizontalStrut(5));
+ sliderRow.add(value);
+ sliderRow.add(slider);
+ content.add((Box.createVerticalStrut(7)));
+ content.add(titleRow);
+ content.add(sliderRow);
+ }
+ {
+ Box sliderRow = Box.createHorizontalBox();
+ Box titleRow = Box.createHorizontalBox();
+ titleRow.add(Box.createHorizontalStrut(5));
+ titleRow.add(new JLabel("Default Weight:"));
+ titleRow.add(Box.createHorizontalGlue());
+ JLabel value = new JLabel("4.700");
+ JSlider slider = new JSlider();
+ sliderRow.add(Box.createHorizontalStrut(5));
+ sliderRow.add(value);
+ sliderRow.add(slider);
+ content.add((Box.createVerticalStrut(7)));
+ content.add(titleRow);
+ content.add(sliderRow);
+ }
+ // JPanel vfiller = new JPanel();
+ // vfiller.setPreferredSize(new Dimension(240, 240));
+ // add(BorderLayout.CENTER, vfiller);
+ }
+ }
}
|
