diff --git a/src/main/java/gui/configdialog/elements/CDialogCircle.java b/src/main/java/gui/configdialog/elements/CDialogCircle.java index 74ff58b..e57e221 100644 --- a/src/main/java/gui/configdialog/elements/CDialogCircle.java +++ b/src/main/java/gui/configdialog/elements/CDialogCircle.java @@ -64,6 +64,9 @@ public class CDialogCircle extends ConfigDialogElement // add the circles to canvas private JButton addToChartButton; + + // delete the circles from canvas + private JButton deleteFromChartButton; private JComboBox cb; @@ -94,6 +97,8 @@ public void buildPanel() Messages.getString("EditIndividualAttributeTypeDialog.19")); //$NON-NLS-1$ addToChartButton = new JButton( Messages.getString("ConfigDialog.50")); + deleteFromChartButton = new JButton( + Messages.getString("ConfigDialog.51")); if (circleAttrib == null) circleAttrib = net.getHintergrund().getCircleAttribute(); @@ -173,6 +178,13 @@ public void actionPerformed(ActionEvent e) { getFinalSetting().set(); } }); + deleteFromChartButton.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + ((SettingCircle)getFinalSetting()).delete(); + } + }); JLabel attLabel = new JLabel( Messages.getString("CDialogActorPie.Col0")); @@ -238,11 +250,21 @@ public void actionPerformed(ActionEvent e) { gbc.fill = GridBagConstraints.HORIZONTAL; gbc.gridx = 4; gbc.gridy = 0; - gbc.weightx = 0.2; + gbc.weightx = 0.1; gbc.gridwidth = 1; gbc.insets = new Insets(10, 0, 0, 5); layout.setConstraints(addToChartButton, gbc); dialogPanel.add(addToChartButton); + + gbc = new GridBagConstraints(); + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.gridx = 5; + gbc.gridy = 0; + gbc.weightx = 0.1; + gbc.gridwidth = 1; + gbc.insets = new Insets(10, 0, 0, 5); + layout.setConstraints(deleteFromChartButton, gbc); + dialogPanel.add(deleteFromChartButton); /* Previewwindow to display current circles */ gbc = new GridBagConstraints(); @@ -250,7 +272,7 @@ public void actionPerformed(ActionEvent e) { gbc.fill = GridBagConstraints.BOTH; gbc.gridx = 0; gbc.gridy = 1; - gbc.gridwidth = 5; + gbc.gridwidth = 6; gbc.weightx = 5.0; gbc.weighty = 5.0; gbc.insets = new Insets(10, 10, 10, 10); @@ -263,7 +285,7 @@ public void actionPerformed(ActionEvent e) { gbc.fill = GridBagConstraints.BOTH; gbc.gridx = 0; gbc.gridy = 2; - gbc.gridwidth = 5; + gbc.gridwidth = 6; gbc.weightx = 5.0; gbc.weighty = 2.5; gbc.insets = new Insets(10, 10, 10, 10); diff --git a/src/main/java/gui/configdialog/elements/CDialogSector.java b/src/main/java/gui/configdialog/elements/CDialogSector.java index 1cbc7b7..ee13300 100644 --- a/src/main/java/gui/configdialog/elements/CDialogSector.java +++ b/src/main/java/gui/configdialog/elements/CDialogSector.java @@ -242,7 +242,7 @@ public void actionPerformed(ActionEvent e) @Override public void actionPerformed(ActionEvent e) { - getFinalSetting().delete(); + ((SettingSector)getFinalSetting()).delete(); } }); diff --git a/src/main/java/gui/configdialog/settings/ConfigDialogSetting.java b/src/main/java/gui/configdialog/settings/ConfigDialogSetting.java index 067b215..7ef07f2 100644 --- a/src/main/java/gui/configdialog/settings/ConfigDialogSetting.java +++ b/src/main/java/gui/configdialog/settings/ConfigDialogSetting.java @@ -13,5 +13,4 @@ public interface ConfigDialogSetting { public void set(); - public void delete(); } diff --git a/src/main/java/gui/configdialog/settings/SettingCircle.java b/src/main/java/gui/configdialog/settings/SettingCircle.java index d70759d..ee18ba8 100644 --- a/src/main/java/gui/configdialog/settings/SettingCircle.java +++ b/src/main/java/gui/configdialog/settings/SettingCircle.java @@ -74,4 +74,22 @@ public void set() // } // } } + + /** + * delete circles from map + * + */ + public void delete() + { + BackgroundInfo bgConfig = net.getHintergrund(); + bgConfig.setNumCircles(0); +// bgConfig.setCirclesLabel(label); + VennMakerView v = VennMaker.getInstance().getViewOfNetwork(net); + if(v != null) + { + v.updateView(); + v.updateSectorAndCircleAttributes(); + } + bgConfig.setCircleAttribute(circleAttr); + } } diff --git a/src/main/java/gui/configdialog/settings/SettingSector.java b/src/main/java/gui/configdialog/settings/SettingSector.java index 7474735..84d9528 100644 --- a/src/main/java/gui/configdialog/settings/SettingSector.java +++ b/src/main/java/gui/configdialog/settings/SettingSector.java @@ -73,7 +73,6 @@ public void set() * delete sectors from map * */ - @Override public void delete() { net.getHintergrund().setNumSectors(0);