[Polycasso-commit] SF.net SVN: polycasso:[125] trunk/polycasso/src/com/mebigfatguy/polycasso

[<dbr...@us...>]

Revision: 125
          http://polycasso.svn.sourceforge.net/polycasso/?rev=125&view=rev
Author:   dbrosius
Date:     2009-12-01 14:31:12 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
add NumCompetingImages

Modified Paths:
--------------
    trunk/polycasso/src/com/mebigfatguy/polycasso/PainterFrame.java
    trunk/polycasso/src/com/mebigfatguy/polycasso/PolycassoBundle.java
    trunk/polycasso/src/com/mebigfatguy/polycasso/Settings.java
    trunk/polycasso/src/com/mebigfatguy/polycasso/SettingsDialog.java
    trunk/polycasso/src/com/mebigfatguy/polycasso/resource.properties

Modified: trunk/polycasso/src/com/mebigfatguy/polycasso/PainterFrame.java
===================================================================
--- trunk/polycasso/src/com/mebigfatguy/polycasso/PainterFrame.java	2009-12-01 14:25:34 UTC (rev 124)
+++ trunk/polycasso/src/com/mebigfatguy/polycasso/PainterFrame.java	2009-12-01 14:31:12 UTC (rev 125)
@@ -174,6 +174,7 @@
 					Settings dlgSettings = dialog.getSettings();
 					settings.setMaxImageSize(dlgSettings.getMaxImageSize());
 					settings.setMaxPolygons(dlgSettings.getMaxPolygons());
+					settings.setNumCompetingImages(dlgSettings.getNumCompetingImages());
 					settings.setMaxPoints(dlgSettings.getMaxPoints());
 					settings.setMaxPtMovement(dlgSettings.getMaxPtMovement());
 				}			

Modified: trunk/polycasso/src/com/mebigfatguy/polycasso/PolycassoBundle.java
===================================================================
--- trunk/polycasso/src/com/mebigfatguy/polycasso/PolycassoBundle.java	2009-12-01 14:25:34 UTC (rev 124)
+++ trunk/polycasso/src/com/mebigfatguy/polycasso/PolycassoBundle.java	2009-12-01 14:31:12 UTC (rev 125)
@@ -45,6 +45,7 @@
 		Width("pc.width"),
 		Height("pc.height"),
 		MaximumPolygons("pc.maximumpolygons"),
+		NumberOfCompetingImages("pc.numberofcompetingimages"),
 		MaximumPolygonPoints("pc.maxpolygonpoints"),
 		MaximumPointMovement("pc.maximumpointmovement"),
 		MaximumColorChange("pc.maximumcolorchange"),

Modified: trunk/polycasso/src/com/mebigfatguy/polycasso/Settings.java
===================================================================
--- trunk/polycasso/src/com/mebigfatguy/polycasso/Settings.java	2009-12-01 14:25:34 UTC (rev 124)
+++ trunk/polycasso/src/com/mebigfatguy/polycasso/Settings.java	2009-12-01 14:31:12 UTC (rev 125)
@@ -39,6 +39,7 @@
 	public Settings() {
 		maxImageSize = new Dimension(800, 600);
 		maxPolygons = 50;
+		numCompetingImages = 100;
 		maxPoints = 8;
 		maxPtMovement = 20;
 		maxColorChange = 40;

Modified: trunk/polycasso/src/com/mebigfatguy/polycasso/SettingsDialog.java
===================================================================
--- trunk/polycasso/src/com/mebigfatguy/polycasso/SettingsDialog.java	2009-12-01 14:25:34 UTC (rev 124)
+++ trunk/polycasso/src/com/mebigfatguy/polycasso/SettingsDialog.java	2009-12-01 14:31:12 UTC (rev 125)
@@ -54,6 +54,7 @@
 	private JTextField widthField;
 	private JTextField heightField;
 	private JTextField maxPolygonField;
+	private JTextField numCompetingImagesField;
 	private JTextField maxPolygonPointsField;
 	private JTextField maxPtMoveField;
 	private JTextField maxColorChangeField;
@@ -112,7 +113,7 @@
 		SelectAllFocuser focuser = new SelectAllFocuser();
 		JPanel optPanel = new JPanel();
 		optPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-		optPanel.setLayout(new FormLayout("pref, 3dlu, 100px, 5dlu, pref, 3dlu, 100px", "pref, 1dlu, pref, 15dlu, pref, 1dlu, pref, 1dlu, pref, 1dlu, pref"));
+		optPanel.setLayout(new FormLayout("pref, 3dlu, 100px, 5dlu, pref, 3dlu, 100px", "pref, 1dlu, pref, 15dlu, pref, 1dlu, pref, 1dlu, pref, 1dlu, pref, 1dlu, pref"));
 		CellConstraints cc = new CellConstraints();
 		
 		JLabel maxSizeLabel = new JLabel(PolycassoBundle.getString(PolycassoBundle.Key.MaxImageSize));
@@ -145,31 +146,40 @@
 		optPanel.add(maxPolygonField, cc.xy(7, 5));
 		maxPolygonField.addFocusListener(focuser);
 		
+		JLabel numCompetingImagesLabel = new JLabel(PolycassoBundle.getString(PolycassoBundle.Key.NumberOfCompetingImages));
+		optPanel.add(numCompetingImagesLabel, cc.xyw(1, 7, 5));
+		numCompetingImagesField = new JTextField(4);
+		numCompetingImagesField.setDocument(new IntegerDocument());
+		numCompetingImagesLabel.setLabelFor(numCompetingImagesField);
+		numCompetingImagesField.setText(String.valueOf(dlgSettings.getNumCompetingImages()));
+		optPanel.add(numCompetingImagesField, cc.xy(7, 7));
+		numCompetingImagesField.addFocusListener(focuser);
+		
 		JLabel maxPolyPointLabel = new JLabel(PolycassoBundle.getString(PolycassoBundle.Key.MaximumPolygonPoints));
-		optPanel.add(maxPolyPointLabel, cc.xyw(1, 7, 7));
+		optPanel.add(maxPolyPointLabel, cc.xyw(1, 9, 7));
 		maxPolygonPointsField = new JTextField(4);
 		maxPolygonPointsField.setDocument(new IntegerDocument());
 		maxPolyPointLabel.setLabelFor(maxPolygonPointsField);
 		maxPolygonPointsField.setText(String.valueOf(dlgSettings.getMaxPoints()));
-		optPanel.add(maxPolygonPointsField, cc.xy(7, 7));
+		optPanel.add(maxPolygonPointsField, cc.xy(7, 9));
 		maxPolygonPointsField.addFocusListener(focuser);
 		
 		JLabel maxPtMoveLabel = new JLabel(PolycassoBundle.getString(PolycassoBundle.Key.MaximumPointMovement));
-		optPanel.add(maxPtMoveLabel, cc.xyw(1, 9, 5));
+		optPanel.add(maxPtMoveLabel, cc.xyw(1, 11, 5));
 		maxPtMoveField = new JTextField(4);
 		maxPtMoveField.setDocument(new IntegerDocument());
 		maxPtMoveLabel.setLabelFor(maxPtMoveField);
 		maxPtMoveField.setText(String.valueOf(dlgSettings.getMaxPtMovement()));
-		optPanel.add(maxPtMoveField, cc.xy(7, 9));
+		optPanel.add(maxPtMoveField, cc.xy(7, 11));
 		maxPtMoveField.addFocusListener(focuser);
 		
 		JLabel maxColorChangeLabel = new JLabel(PolycassoBundle.getString(PolycassoBundle.Key.MaximumColorChange));
-		optPanel.add(maxColorChangeLabel, cc.xyw(1, 11, 5));
+		optPanel.add(maxColorChangeLabel, cc.xyw(1, 13, 5));
 		maxColorChangeField = new JTextField(4);
 		maxColorChangeField.setDocument(new IntegerDocument());
 		maxColorChangeLabel.setLabelFor(maxColorChangeField);
 		maxColorChangeField.setText(String.valueOf(dlgSettings.getMaxColorChange()));
-		optPanel.add(maxColorChangeField, cc.xy(7, 11));
+		optPanel.add(maxColorChangeField, cc.xy(7, 13));
 		maxColorChangeField.addFocusListener(focuser);
 		
 		return optPanel;

Modified: trunk/polycasso/src/com/mebigfatguy/polycasso/resource.properties
===================================================================
--- trunk/polycasso/src/com/mebigfatguy/polycasso/resource.properties	2009-12-01 14:25:34 UTC (rev 124)
+++ trunk/polycasso/src/com/mebigfatguy/polycasso/resource.properties	2009-12-01 14:31:12 UTC (rev 125)
@@ -32,6 +32,7 @@
 pc.width = Width
 pc.height = Height
 pc.maximumpolygons = Maximum Polygons
+pc.numberofcompetingimages = Number of Competing Images
 pc.maxpolygonpoints = Maximum Points per Polygon
 pc.maximumpointmovement = Maximum Point Movement
 pc.maximumcolorchange = Maximum Color Change


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.