BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-11 01:32:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

added text editor next to slider

Browse Source
This commit is contained in:
bancika
2016-12-21 15:23:22 +01:00
parent d27b049110
commit ef07d109cf
9 changed files with 92 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/core/annotations/PercentEditor.java
+10
View File
@@ -0,0 +1,10 @@
package org.diylc.core.annotations;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME)
public @interface PercentEditor {
public byte _100PercentValue();
}
diylc/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-library/src/org/diylc/components/misc/Image.java
+3 -1
View File
@@ -19,6 +19,7 @@ import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.BomPolicy;
import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PercentEditor;
import com.thoughtworks.xstream.annotations.XStreamConverter;
@@ -43,7 +44,7 @@ public class Image extends AbstractTransparentComponent<Void> {
private Point point = new Point(0, 0);
@XStreamConverter(IconImageConverter.class)
private ImageIcon image = ICON;
private byte scale = 50;
private byte scale = DEFAULT_SCALE;
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
@@ -108,6 +109,7 @@ public class Image extends AbstractTransparentComponent<Void> {
this.image = image;
}
@PercentEditor(_100PercentValue = 50)
@EditableProperty(defaultable = false)
public byte getScale() {
return scale;
diylc/diylc-library/src/org/diylc/components/smd/PassiveSMDComponent.java
+11 -11
View File
@@ -24,6 +24,8 @@ import org.diylc.core.Project;
import org.diylc.core.Theme;
import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
@@ -165,26 +167,26 @@ public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponen
case DEFAULT:
width = smdWidth;
height = smdLength;
x -= smdWidth / 2;
y -= pinSize / 2;
x = controlPoints[0].x - smdWidth / 2;
y = controlPoints[0].y - pinSize / 2;
break;
case _90:
width = smdLength;
height = smdWidth;
x -= width - pinSize / 2;
y -= smdWidth / 2;
x = controlPoints[1].x - pinSize / 2;
y = controlPoints[1].y - smdWidth / 2;
break;
case _180:
width = smdWidth;
height = smdLength;
x -= smdWidth / 2;
y -= height - pinSize / 2;
x = controlPoints[1].x - smdWidth / 2;
y = controlPoints[1].y - pinSize / 2;
break;
case _270:
width = smdLength;
height = smdWidth;
x -= pinSize / 2;
y -= smdWidth / 2;
x = controlPoints[0].x - pinSize / 2;
y = controlPoints[0].y - smdWidth / 2;
break;
default:
throw new RuntimeException("Unexpected orientation: " + orientation);
@@ -302,13 +304,11 @@ public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponen
int textWidth = (int) (rect.getWidth());
do {
System.out.println("trying font size: " + g2d.getFont().getSize2D());
g2d.setFont(g2d.getFont().deriveFont(g2d.getFont().getSize2D() - 1));
fontMetrics = g2d.getFontMetrics(g2d.getFont());
rect = fontMetrics.getStringBounds(label, g2d);
textHeight = (int) (rect.getHeight());
textWidth = (int) (rect.getWidth());
System.out.println("width: " + rect.getWidth());
} while (textWidth > length && g2d.getFont().getSize2D() > 2);
double centerX = textTarget.getX() + textTarget.getWidth() / 2;
@@ -391,7 +391,7 @@ public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponen
public static enum SMDSize {
_0805(new Size(1.25d, SizeUnit.mm), new Size(2.0d, SizeUnit.mm)), _1206(new Size(1.6d, SizeUnit.mm), new Size(3.2d,
_0805(new Size(0.05d, SizeUnit.in), new Size(0.08d, SizeUnit.in)), _1206(new Size(1.6d, SizeUnit.mm), new Size(3.2d,
SizeUnit.mm)), _1210(new Size(2.5d, SizeUnit.mm), new Size(3.2d, SizeUnit.mm)), _1806(new Size(1.6d,
SizeUnit.mm), new Size(4.5d, SizeUnit.mm)), _1812(new Size(3.2d, SizeUnit.mm), new Size(4.5d, SizeUnit.mm));
diylc/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/src/org/diylc/swing/gui/editor/ByteEditor.java
+61 -6
View File
@@ -1,36 +1,91 @@
package org.diylc.swing.gui.editor;
import java.awt.Color;
import java.awt.FlowLayout;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.diylc.common.PropertyWrapper;
import org.diylc.core.annotations.PercentEditor;
import org.diylc.swingframework.DoubleTextField;
import org.diylc.utils.Constants;
public class ByteEditor extends JSlider {
public class ByteEditor extends JPanel {
private static final long serialVersionUID = 1L;
private Color oldBg = getBackground();
private static final byte default100Percent = 127;
private byte _100PercentValue;
public ByteEditor(final PropertyWrapper property) {
super();
setMinimum(0);
setMaximum(127);
setValue((Byte) property.getValue());
addChangeListener(new ChangeListener() {
setLayout(new FlowLayout());
try {
PercentEditor percentEditor = property.getGetter().getAnnotation(PercentEditor.class);
if (percentEditor == null)
_100PercentValue = default100Percent;
else
_100PercentValue = percentEditor._100PercentValue();
} catch (Exception e) {
_100PercentValue = default100Percent;
}
final JSlider slider = new JSlider();
final DoubleTextField valueField = new DoubleTextField();
final double percentFactor = (double) default100Percent / _100PercentValue;
slider.setMinimum(0);
slider.setMaximum(default100Percent * 100);
slider.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
property.setChanged(true);
setBackground(oldBg);
property.setValue(new Integer(getValue()).byteValue());
slider.setBackground(oldBg);
property.setValue(new Integer(slider.getValue() / 100).byteValue());
valueField.setText(Integer.toString((int) Math.round(percentFactor * (double) slider.getValue()
/ default100Percent)));
}
});
slider.setValue((Byte) property.getValue() * 100);
valueField
.setText(Integer.toString((int) Math.round(percentFactor * (double) slider.getValue() / default100Percent)));
valueField.setColumns(3);
valueField.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
try {
int newPosition = (int) (Double.parseDouble(valueField.getText()) * default100Percent / percentFactor);
System.out.println("keyReleased, pos: " + newPosition);
slider.setValue(newPosition);
} catch (Exception ex) {
}
}
});
if (!property.isUnique()) {
setBackground(Constants.MULTI_VALUE_COLOR);
slider.setBackground(Constants.MULTI_VALUE_COLOR);
}
add(slider);
add(valueField);
add(new JLabel("%"));
}
}
diylc/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java
+1
View File
@@ -85,6 +85,7 @@ public class PropertyEditorDialog extends ButtonDialog {
gbc.fill = GridBagConstraints.NONE;
gbc.weightx = 0;
gbc.insets = new Insets(4, 2, 2, 2);
gbc.anchor = GridBagConstraints.WEST;
editorPanel.add(new JLabel(property.getName() + ": "), gbc);
gbc.gridx = 1;
diylc/diylc-swing/update.xml
+5 -1
View File
@@ -1420,7 +1420,11 @@
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Better line representation when zoomed in</description>
<description>Added percent text box next to the slider for editors like Alpha or Scale</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Better object line representation when zoomed in</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>