Skip to content

Commit 74f4eb9

Browse files
committed
Added EmptyImage block
+removed unneed cache(MSD only)
1 parent 7a380cf commit 74f4eb9

File tree

4 files changed

+102
-2
lines changed

4 files changed

+102
-2
lines changed

cache/thumbnails/DELETEME

Whitespace-only changes.

src/com/inverseinnovations/VisualMALSignatureDesigner/BlockWindow.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ public void actionPerformed(ActionEvent e){
6363
JScrollPane textscrollPane = new JScrollPane(textArea);
6464
textArea.setEditable(false);
6565
textArea.setText(blocks.getRootNode().createScript(null));
66+
//save button
67+
68+
6669
d.getContentPane().add(textscrollPane, BorderLayout.CENTER);
6770

6871
d.pack();
@@ -178,7 +181,8 @@ public JDialog createBlockSelectionDialog(){
178181
new AddEpisodes(Main),
179182
new AddTime(Main),
180183
new AddImage(Main),
181-
new AddThumbnail(Main)
184+
new AddThumbnail(Main),
185+
new AddEmptyImage(Main)
182186
};
183187
final JList<BuildingBlock> blockList = new JList<BuildingBlock>(blockTypes); //data has type Object[]
184188
blockList.setPrototypeCellValue(longestBlock);
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
package com.inverseinnovations.VisualMALSignatureDesigner.BuildingBlock;
2+
3+
import java.awt.Dimension;
4+
import java.awt.image.BufferedImage;
5+
6+
import javax.swing.BorderFactory;
7+
import javax.swing.Box;
8+
import javax.swing.BoxLayout;
9+
import javax.swing.JDialog;
10+
import javax.swing.JLabel;
11+
import javax.swing.JPanel;
12+
import javax.swing.JSpinner;
13+
import javax.swing.SpinnerNumberModel;
14+
import javax.swing.event.ChangeEvent;
15+
import javax.swing.event.ChangeListener;
16+
17+
import com.inverseinnovations.VisualMALSignatureDesigner.Main;
18+
19+
public class AddEmptyImage extends AddImage {
20+
private static final long serialVersionUID = 1L;
21+
private int sizeX = 100;
22+
private int sizeY = 100;
23+
24+
public AddEmptyImage(Main Main){
25+
super("Empty Image", Main);
26+
}
27+
/**
28+
* @return the sizeX
29+
*/
30+
public int getSizeX() {
31+
return sizeX;
32+
}
33+
/**
34+
* @return the sizeY
35+
*/
36+
public int getSizeY() {
37+
return sizeY;
38+
}
39+
/**
40+
* @param sizeX the sizeX to set
41+
*/
42+
public void setSizeX(int sizeX) {
43+
this.sizeX = sizeX;
44+
}
45+
/**
46+
* @param sizeY the sizeY to set
47+
*/
48+
public void setSizeY(int sizeY) {
49+
this.sizeY = sizeY;
50+
}
51+
@Override
52+
protected JPanel settingsImage(final JDialog owner){
53+
54+
//locations
55+
JLabel sizeLab = new JLabel("Size: ");
56+
final JSpinner xSpinner = new JSpinner();
57+
xSpinner.setModel(new SpinnerNumberModel(getSizeX(),1,9999,1));
58+
xSpinner.addChangeListener(new ChangeListener(){
59+
public void stateChanged(ChangeEvent e){
60+
setSizeX((int)xSpinner.getValue());
61+
saveObject();
62+
Main.ImageWindow.update();
63+
}
64+
});
65+
final JSpinner ySpinner = new JSpinner();
66+
ySpinner.setModel(new SpinnerNumberModel(getSizeY(),1,9999,1));
67+
ySpinner.addChangeListener(new ChangeListener(){
68+
public void stateChanged(ChangeEvent e){
69+
setSizeY((int)ySpinner.getValue());
70+
saveObject();
71+
Main.ImageWindow.update();
72+
}
73+
});
74+
75+
JPanel totalPane = new JPanel();
76+
totalPane.setLayout(new BoxLayout(totalPane, BoxLayout.LINE_AXIS));
77+
totalPane.setBorder(BorderFactory.createEmptyBorder(15, 25, 3, 25));
78+
totalPane.add(Box.createHorizontalGlue());
79+
totalPane.add(sizeLab);
80+
totalPane.add(Box.createRigidArea(new Dimension(10, 0)));
81+
totalPane.add(xSpinner);
82+
totalPane.add(Box.createRigidArea(new Dimension(10, 0)));
83+
totalPane.add(ySpinner);
84+
totalPane.add(Box.createHorizontalGlue());
85+
86+
87+
return totalPane;
88+
}
89+
@Override
90+
protected BufferedImage generateImage(){
91+
return Main.sig.makeImage(getSizeX(), getSizeY());
92+
}
93+
@Override
94+
public String generateScript(){
95+
return "sig.makeImage("+getSizeX()+", "+getSizeY()+")";
96+
}
97+
}

src/com/inverseinnovations/VisualMALSignatureDesigner/ImageWindow.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public void update(){
6262
catch(java.lang.NullPointerException e){
6363
System.out.println("Signature is null");
6464
}
65-
//System.out.println("image updated\n");//FIXME remove later
6665
}
6766

6867
public Point getLocation(){

0 commit comments

Comments
 (0)