From f547cc9a30702f73054cd587a4f027865e6ca5c3 Mon Sep 17 00:00:00 2001 From: luukkainen Date: Tue, 2 Jul 2013 14:09:07 +0000 Subject: [PATCH] refs #4373 git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27674 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../properties/bar/BarGeneralPropertiesTab.java | 16 ++++++++-------- .../properties/pie/PieGeneralPropertiesTab.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/bar/BarGeneralPropertiesTab.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/bar/BarGeneralPropertiesTab.java index 8221f819..e75989ba 100644 --- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/bar/BarGeneralPropertiesTab.java +++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/bar/BarGeneralPropertiesTab.java @@ -199,13 +199,6 @@ public class BarGeneralPropertiesTab extends LabelPropertyTabContributor { hlegend.setSelectionFactory(new BooleanPropertyFactory(null, JFreeChartResource.URIs.Chart_visibleLegend, true)); hlegend.addSelectionListener(new BooleanSelectionListener(context, null, JFreeChartResource.URIs.Chart_visibleLegend)); - - - // Resize scrolled composite - sc.setContent(composite); - Point size = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT); - sc.setMinSize(size); - Group filteringGroup = new Group(composite, SWT.NONE); GridDataFactory.fillDefaults().applyTo(filteringGroup); GridLayoutFactory.fillDefaults().margins(3, 3).numColumns(2).applyTo(filteringGroup); @@ -218,13 +211,20 @@ public class BarGeneralPropertiesTab extends LabelPropertyTabContributor { useFilter.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Filter_used)); label = new Label(filteringGroup, SWT.NONE); GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label); - label.setText("Fraction:"); + label.setText("Percent:"); TrackedText fraction = new TrackedText(filteringGroup, support, SWT.BORDER); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(fraction.getWidget()); fraction.setTextFactory(new DoublePropertyFactory2(JFreeChartResource.URIs.Plot,JFreeChartResource.URIs.Filter_fraction)); fraction.addModifyListener(new DoublePropertyModifier2(context, JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Filter_fraction)); fraction.setInputValidator(new DoubleValidator(true)); fraction.setColorProvider(new JFreeChartPropertyColorProvider(fraction.getResourceManager())); + + // Resize scrolled composite + sc.setContent(composite); + Point size = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT); + sc.setMinSize(size); + + } /** diff --git a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/pie/PieGeneralPropertiesTab.java b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/pie/PieGeneralPropertiesTab.java index 9f72dc2b..c2c54ab8 100644 --- a/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/pie/PieGeneralPropertiesTab.java +++ b/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/properties/pie/PieGeneralPropertiesTab.java @@ -166,7 +166,7 @@ public class PieGeneralPropertiesTab extends LabelPropertyTabContributor { useFilter.addSelectionListener(new BooleanSelectionListener(context, JFreeChartResource.URIs.Plot, JFreeChartResource.URIs.Filter_used)); label = new Label(filteringGroup, SWT.NONE); GridDataFactory.fillDefaults().grab(false, true).align(SWT.END, SWT.CENTER).applyTo(label); - label.setText("Fraction:"); + label.setText("Percent:"); TrackedText fraction = new TrackedText(filteringGroup, support, SWT.BORDER); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(fraction.getWidget()); fraction.setTextFactory(new DoublePropertyFactory2(JFreeChartResource.URIs.Plot,JFreeChartResource.URIs.Filter_fraction)); -- 2.47.1