Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop

Browse Source
This commit is contained in:
Yorick
2015-03-16 21:29:47 +01:00
parent 99e52ebc1a 836f058c85
commit d08e226650
1 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Applicatie/PropertiesPanel.java
+53 -49
View File
@@ -69,14 +69,14 @@ public class PropertiesPanel extends JPanel {
locationXField.addKeyListener(new KeyListener() { locationXField.addKeyListener(new KeyListener() {
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e) {
try{ try{
locationXField.setBackground(Color.WHITE); locationXField.setBackground(Color.WHITE);
double xpos = Double.parseDouble(locationXField.getText()); double xpos = Double.parseDouble(locationXField.getText());
selectedObject.setPosition(new Point2D.Double(xpos, selectedObject.getPosition().getY())); selectedObject.setPosition(new Point2D.Double(xpos, selectedObject.getPosition().getY()));
p.update(); p.update();
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
locationXField.setBackground(Color.RED); locationXField.setBackground(Color.RED);
} }
} }
public void keyReleased(KeyEvent e) {} public void keyReleased(KeyEvent e) {}
public void keyPressed(KeyEvent e) {} public void keyPressed(KeyEvent e) {}
@@ -103,7 +103,7 @@ public class PropertiesPanel extends JPanel {
selectedObject.setPosition(new Point2D.Double(selectedObject.getPosition().getX(), ypos));; selectedObject.setPosition(new Point2D.Double(selectedObject.getPosition().getX(), ypos));;
p.update(); p.update();
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
locationYField.setBackground(Color.RED); locationYField.setBackground(Color.RED);
} }
} }
public void keyReleased(KeyEvent e) {} public void keyReleased(KeyEvent e) {}
@@ -135,14 +135,14 @@ public class PropertiesPanel extends JPanel {
scaleField.addKeyListener(new KeyListener() { scaleField.addKeyListener(new KeyListener() {
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e) {
try{ try{
scaleField.setBackground(Color.WHITE); scaleField.setBackground(Color.WHITE);
double scale = Double.parseDouble(scaleField.getText()); double scale = Double.parseDouble(scaleField.getText());
selectedObject.setScale(scale); selectedObject.setScale(scale);
p.update(); p.update();
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
scaleField.setBackground(Color.RED); scaleField.setBackground(Color.RED);
} }
} }
public void keyReleased(KeyEvent e) {} public void keyReleased(KeyEvent e) {}
public void keyPressed(KeyEvent e) {} public void keyPressed(KeyEvent e) {}
@@ -173,15 +173,15 @@ public class PropertiesPanel extends JPanel {
rotationField.addKeyListener(new KeyListener() { rotationField.addKeyListener(new KeyListener() {
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e) {
try{ try{
rotationField.setBackground(Color.WHITE); rotationField.setBackground(Color.WHITE);
int rotation = Integer.parseInt(rotationField.getText()) % 360; int rotation = Integer.parseInt(rotationField.getText()) % 360;
rotationField.setText(rotation +""); rotationField.setText(rotation +"");
selectedObject.setRotation(rotation); selectedObject.setRotation(rotation);
p.update(); p.update();
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
rotationField.setBackground(Color.RED); rotationField.setBackground(Color.RED);
} }
} }
public void keyReleased(KeyEvent e) {} public void keyReleased(KeyEvent e) {}
public void keyPressed(KeyEvent e) {} public void keyPressed(KeyEvent e) {}
@@ -229,33 +229,37 @@ public class PropertiesPanel extends JPanel {
} }
private void enableComponents(Container container, boolean enable) { private void enableComponents(Container container, boolean enable) {
Component[] components = container.getComponents(); Component[] components = container.getComponents();
for (Component component : components) { for (Component component : components) {
component.setEnabled(enable); component.setEnabled(enable);
if (component instanceof Container) { if (component instanceof Container) {
enableComponents((Container)component, enable); enableComponents((Container)component, enable);
} }
} }
} }
private void clearFields(Container container) { private void clearFields(Container container) {
Component[] components = container.getComponents(); Component[] components = container.getComponents();
for (Component component : components) { for (Component component : components) {
if (component instanceof JTextField) { if (component instanceof JTextField) {
((JTextField) component).setText(""); ((JTextField) component).setText("");
} }
if (component instanceof Container) { if (component instanceof Container) {
clearFields((Container)component); clearFields((Container)component);
} }
} }
} }
private void fillFields() { private void fillFields() {
locationXField.setText(Math.round(selectedObject.getPosition().getX()) + ""); if(selectedObject != null)
locationYField.setText(Math.round(selectedObject.getPosition().getY()) + ""); {
scaleField.setText((double)Math.round(selectedObject.getScale()*10)/10 + ""); locationXField.setText(Math.round(selectedObject.getPosition().getX()) + "");
rotationField.setText(Math.round(selectedObject.getRotation()%360) + ""); locationYField.setText(Math.round(selectedObject.getPosition().getY()) + "");
} scaleField.setText((double)Math.round(selectedObject.getScale()*10)/10 + "");
rotationField.setText(Math.round(selectedObject.getRotation()%360) + "");
}
}
public void setPanel(Panel p) public void setPanel(Panel p)
{ {