pixelle-commit Mailing List for pixelle (Page 4)
Brought to you by:
dbrosius
Menu
▾
▴
pixelle-commit — Svn commit mailing list
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(129) |
Jul
(39) |
Aug
|
Sep
|
Oct
|
Nov
(63) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(1) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(41) |
Aug
(1) |
Sep
(7) |
Oct
|
Nov
|
Dec
(5) |
| 2010 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <dbr...@us...> - 2009-02-18 06:43:46
|
Revision: 247
http://pixelle.svn.sourceforge.net/pixelle/?rev=247&view=rev
Author: dbrosius
Date: 2009-02-18 06:43:44 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
get ready for 1.0.0 release
Modified Paths:
--------------
trunk/pixelle/build.xml
trunk/pixelle/pixelle.store
Modified: trunk/pixelle/build.xml
===================================================================
--- trunk/pixelle/build.xml 2009-02-18 06:42:15 UTC (rev 246)
+++ trunk/pixelle/build.xml 2009-02-18 06:43:44 UTC (rev 247)
@@ -36,7 +36,7 @@
<property name="javac.deprecation" value="on"/>
<property name="javac.debug" value="on"/>
- <property name="pixelle.version" value="0.1.0"/>
+ <property name="pixelle.version" value="1.0.0"/>
<target name="clean" description="removes all generated collateral">
<delete dir="${classes.dir}"/>
Modified: trunk/pixelle/pixelle.store
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-18 06:42:22
|
Revision: 246
http://pixelle.svn.sourceforge.net/pixelle/?rev=246&view=rev
Author: dbrosius
Date: 2009-02-18 06:42:15 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
fix javadoc
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-02-18 06:36:09 UTC (rev 245)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-02-18 06:42:15 UTC (rev 246)
@@ -49,7 +49,7 @@
/**
* constructions a transformer given a source bitmap and algorithms
- * @param image the source image
+ * @param images the source images
* @param algos the algorithms for the color components
* @param newDimension the desired dimension of the output image
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-18 06:36:11
|
Revision: 245
http://pixelle.svn.sourceforge.net/pixelle/?rev=245&view=rev
Author: dbrosius
Date: 2009-02-18 06:36:09 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
implement multiple source image transformations
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java 2009-02-18 06:35:20 UTC (rev 244)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java 2009-02-18 06:36:09 UTC (rev 245)
@@ -52,7 +52,8 @@
d.setVisible(true);
if (d.isOK()) {
ImageType imageType = d.getImageType();
- PixelleTransformer transformer = new PixelleTransformer(new PixelleImage[] {frame.getImage()}, d.getAlgorithms(imageType), imageType, d.getOutputSize());
+ PixelleImage[] srcImages = d.getSourceImages();
+ PixelleTransformer transformer = new PixelleTransformer(srcImages, d.getAlgorithms(imageType), imageType, d.getOutputSize());
PixelleImage dstImage = transformer.transform();
if (dstImage != null) {
if (frame.createNewWindow()) {
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-18 06:35:20 UTC (rev 244)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-18 06:36:09 UTC (rev 245)
@@ -60,6 +60,7 @@
import com.mebigfatguy.pixelle.PixelleBundle;
import com.mebigfatguy.pixelle.PixelleComponent;
import com.mebigfatguy.pixelle.PixelleFrame;
+import com.mebigfatguy.pixelle.PixelleImage;
import com.mebigfatguy.pixelle.utils.GuiUtils;
import com.mebigfatguy.pixelle.utils.IntegerDocument;
import com.mebigfatguy.pixelle.utils.GuiUtils.Sizing;
@@ -115,6 +116,7 @@
JButton ok;
JButton cancel;
JButton reset;
+ SourcePanel sourcePanel;
JTextField selectedRGBAlgorithm;
JPopupMenu savedRGBAlgorithms;
JTextField selectedGSAlgorithm;
@@ -154,6 +156,10 @@
return new Point(Integer.parseInt(widthField.getText()), Integer.parseInt(heightField.getText()));
}
+ public PixelleImage[] getSourceImages() {
+ return sourcePanel.getSourceImages();
+ }
+
private void initComponents() {
Container cp = getContentPane();
@@ -166,7 +172,7 @@
cp.setLayout(new BorderLayout(4, 4));
- JPanel sourcePanel = new SourcePanel();
+ sourcePanel = new SourcePanel();
cp.add(sourcePanel, BorderLayout.NORTH);
JPanel centerPanel = new JPanel();
@@ -461,13 +467,23 @@
initListeners();
}
+ public PixelleImage[] getSourceImages() {
+ int imageCount = sourceModel.getColumnCount();
+ PixelleImage[] selectedImages = new PixelleImage[imageCount];
+ for (int i = 0; i < imageCount; i++) {
+ selectedImages[i] = ((PixelleFrame)sourceModel.getValueAt(i, 1)).getImage();
+ }
+
+ return selectedImages;
+ }
+
public void initComponents() {
setLayout(new BorderLayout(4, 4));
sourceModel = new DefaultTableModel();
sourceModel.addColumn(PixelleBundle.getString(PixelleBundle.SOURCES_NUMBER));
sourceModel.addColumn(PixelleBundle.getString(PixelleBundle.SOURCES_NAME));
- sourceModel.addRow(new Object[] { Integer.valueOf(0), frame.getTitle() });
+ sourceModel.addRow(new Object[] { Integer.valueOf(0), frame });
sourceTable = new JTable(sourceModel) {
@Override
public boolean isCellEditable(int row, int column) {
@@ -513,7 +529,7 @@
PixelleFrame frame = (PixelleFrame)JOptionPane.showInputDialog(SourcePanel.this, PixelleBundle.getString(PixelleBundle.PICK_SOURCE_LABEL), PixelleBundle.getString(PixelleBundle.TITLE), JOptionPane.QUESTION_MESSAGE, null, frames.toArray(new JFrame[frames.size()]), null);
if (frame != null) {
int id = sourceTable.getRowCount();
- sourceModel.addRow(new Object[] { Integer.valueOf(id), frame.getTitle() });
+ sourceModel.addRow(new Object[] { Integer.valueOf(id), frame });
}
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-18 06:35:22
|
Revision: 244
http://pixelle.svn.sourceforge.net/pixelle/?rev=244&view=rev
Author: dbrosius
Date: 2009-02-18 06:35:20 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
use LinkedHashSet for framemgr
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java 2009-02-18 06:23:15 UTC (rev 243)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java 2009-02-18 06:35:20 UTC (rev 244)
@@ -19,6 +19,7 @@
package com.mebigfatguy.pixelle;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Set;
import javax.swing.JFrame;
@@ -29,7 +30,7 @@
public class FrameMgr {
private static FrameMgr mgr = new FrameMgr();
- public Set<JFrame> frames = new HashSet<JFrame>();
+ public Set<JFrame> frames = new LinkedHashSet<JFrame>();
private FrameMgr() {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-18 06:23:17
|
Revision: 243
http://pixelle.svn.sourceforge.net/pixelle/?rev=243&view=rev
Author: dbrosius
Date: 2009-02-18 06:23:15 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Open file should open a new window
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java 2009-02-18 06:19:46 UTC (rev 242)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java 2009-02-18 06:23:15 UTC (rev 243)
@@ -25,11 +25,15 @@
import javax.imageio.ImageIO;
import javax.swing.AbstractAction;
import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
import javax.swing.KeyStroke;
import javax.swing.filechooser.FileFilter;
+import com.mebigfatguy.pixelle.FrameMgr;
import com.mebigfatguy.pixelle.PixelleBundle;
import com.mebigfatguy.pixelle.PixelleFrame;
+import com.mebigfatguy.pixelle.PixelleTransformException;
+import com.mebigfatguy.pixelle.utils.GuiUtils;
public class OpenFileAction extends AbstractAction {
@@ -71,8 +75,17 @@
jf.showOpenDialog(frame);
File f = jf.getSelectedFile();
if (f != null) {
- frame.openFile(f);
- lastDir = f.getParentFile();
+ try {
+ lastDir = f.getParentFile();
+ PixelleFrame pf = new PixelleFrame();
+ pf.openFile(f);
+ pf.setBounds(GuiUtils.getScreenBounds());
+ pf.setVisible(true);
+ FrameMgr.getInstance().add(pf);
+ } catch (PixelleTransformException pte) {
+ JOptionPane.showMessageDialog(frame, pte.getMessage());
+ pte.printStackTrace();
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-18 06:19:49
|
Revision: 242
http://pixelle.svn.sourceforge.net/pixelle/?rev=242&view=rev
Author: dbrosius
Date: 2009-02-18 06:19:46 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
guard against cancel/null
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-18 06:17:27 UTC (rev 241)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-18 06:19:46 UTC (rev 242)
@@ -511,8 +511,10 @@
public void actionPerformed(ActionEvent ae) {
Set<JFrame> frames = FrameMgr.getInstance().getFrames();
PixelleFrame frame = (PixelleFrame)JOptionPane.showInputDialog(SourcePanel.this, PixelleBundle.getString(PixelleBundle.PICK_SOURCE_LABEL), PixelleBundle.getString(PixelleBundle.TITLE), JOptionPane.QUESTION_MESSAGE, null, frames.toArray(new JFrame[frames.size()]), null);
- int id = sourceTable.getRowCount();
- sourceModel.addRow(new Object[] { Integer.valueOf(id), frame.getTitle() });
+ if (frame != null) {
+ int id = sourceTable.getRowCount();
+ sourceModel.addRow(new Object[] { Integer.valueOf(id), frame.getTitle() });
+ }
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-18 06:17:37
|
Revision: 241
http://pixelle.svn.sourceforge.net/pixelle/?rev=241&view=rev
Author: dbrosius
Date: 2009-02-18 06:17:27 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
no autoboxing
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-18 06:16:56 UTC (rev 240)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-18 06:17:27 UTC (rev 241)
@@ -512,7 +512,7 @@
Set<JFrame> frames = FrameMgr.getInstance().getFrames();
PixelleFrame frame = (PixelleFrame)JOptionPane.showInputDialog(SourcePanel.this, PixelleBundle.getString(PixelleBundle.PICK_SOURCE_LABEL), PixelleBundle.getString(PixelleBundle.TITLE), JOptionPane.QUESTION_MESSAGE, null, frames.toArray(new JFrame[frames.size()]), null);
int id = sourceTable.getRowCount();
- sourceModel.addRow(new Object[] { id, frame.getTitle() });
+ sourceModel.addRow(new Object[] { Integer.valueOf(id), frame.getTitle() });
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-18 06:16:59
|
Revision: 240
http://pixelle.svn.sourceforge.net/pixelle/?rev=240&view=rev
Author: dbrosius
Date: 2009-02-18 06:16:56 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Hook up add remove controls
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java 2009-02-17 06:14:27 UTC (rev 239)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java 2009-02-18 06:16:56 UTC (rev 240)
@@ -94,7 +94,8 @@
public static final String SOURCES_LABEL = "label.sources";
public static final String SOURCES_NUMBER = "label.inputnumber";
public static final String SOURCES_NAME = "label.inputname";
- public static final String OUTPUT_PROPERTIES = "label.outputproperties";
+ public static final String OUTPUT_PROPERTIES = "label.output_properties";
+ public static final String PICK_SOURCE_LABEL = "label.pick_source";
private static ResourceBundle rb = ResourceBundle.getBundle("com/mebigfatguy/pixelle/resources/pixelle");
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-02-17 06:14:27 UTC (rev 239)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-02-18 06:16:56 UTC (rev 240)
@@ -310,6 +310,11 @@
return title + " [" + pixelleFrameId + "]";
}
+ @Override
+ public String toString() {
+ return getTitle();
+ }
+
public class ImagePanel extends JPanel {
private static final long serialVersionUID = 1004811680136095184L;
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-17 06:14:27 UTC (rev 239)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-18 06:16:56 UTC (rev 240)
@@ -42,6 +42,7 @@
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
@@ -54,6 +55,7 @@
import javax.swing.table.TableColumnModel;
import com.mebigfatguy.pixelle.AlgorithmArchiver;
+import com.mebigfatguy.pixelle.FrameMgr;
import com.mebigfatguy.pixelle.ImageType;
import com.mebigfatguy.pixelle.PixelleBundle;
import com.mebigfatguy.pixelle.PixelleComponent;
@@ -505,7 +507,27 @@
}
public void initListeners() {
+ addButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent ae) {
+ Set<JFrame> frames = FrameMgr.getInstance().getFrames();
+ PixelleFrame frame = (PixelleFrame)JOptionPane.showInputDialog(SourcePanel.this, PixelleBundle.getString(PixelleBundle.PICK_SOURCE_LABEL), PixelleBundle.getString(PixelleBundle.TITLE), JOptionPane.QUESTION_MESSAGE, null, frames.toArray(new JFrame[frames.size()]), null);
+ int id = sourceTable.getRowCount();
+ sourceModel.addRow(new Object[] { id, frame.getTitle() });
+ }
+ });
+ removeButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent ae) {
+ int[] selRows = sourceTable.getSelectedRows();
+ for (int i = selRows.length - 1; i >= 0; i--) {
+ sourceModel.removeRow(selRows[i]);
+ }
+ int numRows = sourceTable.getRowCount();
+ for (int i = 0; i < numRows; i++) {
+ sourceModel.setValueAt(String.valueOf(i), i, 0);
+ }
+ }
+ });
}
}
}
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties 2009-02-17 06:14:27 UTC (rev 239)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties 2009-02-18 06:16:56 UTC (rev 240)
@@ -101,4 +101,5 @@
label.inputnumber = Index
label.inputname = Input Source Name
-label.outputproperties = Output Properties
\ No newline at end of file
+label.output_properties = Output Properties
+label.pick_source = Select the input source window to use in the transformation
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-17 06:14:31
|
Revision: 239
http://pixelle.svn.sourceforge.net/pixelle/?rev=239&view=rev
Author: dbrosius
Date: 2009-02-17 06:14:27 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
number the windows that are created for uniqueness
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-02-17 06:10:05 UTC (rev 238)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-02-17 06:14:27 UTC (rev 239)
@@ -66,6 +66,7 @@
public class PixelleFrame extends JFrame {
private static final long serialVersionUID = -2993532609001467136L;
+ private static int pixelleFrameCount = 1;
JMenu fileMenu;
JMenuItem newItem;
@@ -101,6 +102,7 @@
transient PixelleImage image;
PixelInspector inspector;
boolean doNewWindow;
+ int pixelleFrameId;
public PixelleFrame() throws PixelleTransformException {
this(new PixelleTransformer(new PixelleImage[] {new PixelleImage()}, PixelleTransformer.getSampleTransform(), ImageType.RGB, new Point(400, 400)).transform(), false);
@@ -111,6 +113,7 @@
}
private PixelleFrame(PixelleImage srcImage, boolean transformInNewWindow) {
+ pixelleFrameId = pixelleFrameCount++;
imageFile = null;
image = srcImage;
doNewWindow = transformInNewWindow;
@@ -304,7 +307,7 @@
else
title = imageFile.getName();
- return title;
+ return title + " [" + pixelleFrameId + "]";
}
public class ImagePanel extends JPanel {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-17 06:10:08
|
Revision: 238
http://pixelle.svn.sourceforge.net/pixelle/?rev=238&view=rev
Author: dbrosius
Date: 2009-02-17 06:10:05 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
start stubbing in picking multiple input sources for the transformation dialog
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java 2009-02-17 06:03:24 UTC (rev 237)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java 2009-02-17 06:10:05 UTC (rev 238)
@@ -91,6 +91,10 @@
public static final String GRAYSCALE = "label.grayscale";
public static final String WIDTH ="label.width";
public static final String HEIGHT = "label.height";
+ public static final String SOURCES_LABEL = "label.sources";
+ public static final String SOURCES_NUMBER = "label.inputnumber";
+ public static final String SOURCES_NAME = "label.inputname";
+ public static final String OUTPUT_PROPERTIES = "label.outputproperties";
private static ResourceBundle rb = ResourceBundle.getBundle("com/mebigfatguy/pixelle/resources/pixelle");
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-02-17 06:03:24 UTC (rev 237)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-02-17 06:10:05 UTC (rev 238)
@@ -296,6 +296,17 @@
}
}
+ @Override
+ public String getTitle() {
+ String title;
+ if (imageFile == null)
+ title = PixelleBundle.getString(PixelleBundle.UNTITLED);
+ else
+ title = imageFile.getName();
+
+ return title;
+ }
+
public class ImagePanel extends JPanel {
private static final long serialVersionUID = 1004811680136095184L;
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-17 06:03:24 UTC (rev 237)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-02-17 06:10:05 UTC (rev 238)
@@ -20,6 +20,7 @@
import java.awt.BorderLayout;
import java.awt.Container;
+import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.Point;
import java.awt.event.ActionEvent;
@@ -33,6 +34,8 @@
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
@@ -41,9 +44,14 @@
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
+import javax.swing.JTable;
import javax.swing.JTextField;
-import javax.swing.border.EtchedBorder;
+import javax.swing.ListSelectionModel;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
import com.mebigfatguy.pixelle.AlgorithmArchiver;
import com.mebigfatguy.pixelle.ImageType;
@@ -156,10 +164,15 @@
cp.setLayout(new BorderLayout(4, 4));
+ JPanel sourcePanel = new SourcePanel();
+ cp.add(sourcePanel, BorderLayout.NORTH);
+
JPanel centerPanel = new JPanel();
centerPanel.setLayout(new BorderLayout(4, 4));
cp.add(centerPanel, BorderLayout.CENTER);
+ centerPanel.setBorder(BorderFactory.createTitledBorder(PixelleBundle.getString(PixelleBundle.PIXEL_ALGORITHMS)));
+
tabbedPane = new JTabbedPane();
centerPanel.add(tabbedPane, BorderLayout.CENTER);
@@ -176,6 +189,7 @@
private JPanel buildSizingPanel() {
JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
+ panel.setBorder(BorderFactory.createTitledBorder(PixelleBundle.getString(PixelleBundle.OUTPUT_PROPERTIES)));
JLabel wl = new JLabel(PixelleBundle.getString(PixelleBundle.WIDTH));
JLabel hl = new JLabel(PixelleBundle.getString(PixelleBundle.HEIGHT));
@@ -201,9 +215,6 @@
panel.add(heightField);
panel.add(Box.createHorizontalGlue());
- panel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED),
- BorderFactory.createEmptyBorder(5, 2, 5, 2)));
-
return panel;
}
@@ -433,4 +444,68 @@
});
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
}
+
+ class SourcePanel extends JPanel
+ {
+ private static final String PLUS_ICON = "/com/mebigfatguy/pixelle/resources/plus.png";
+ private static final String MINUS_ICON = "/com/mebigfatguy/pixelle/resources/minus.png";
+ JTable sourceTable;
+ DefaultTableModel sourceModel;
+ JButton addButton;
+ JButton removeButton;
+
+ public SourcePanel() {
+ initComponents();
+ initListeners();
+ }
+
+ public void initComponents() {
+ setLayout(new BorderLayout(4, 4));
+
+ sourceModel = new DefaultTableModel();
+ sourceModel.addColumn(PixelleBundle.getString(PixelleBundle.SOURCES_NUMBER));
+ sourceModel.addColumn(PixelleBundle.getString(PixelleBundle.SOURCES_NAME));
+ sourceModel.addRow(new Object[] { Integer.valueOf(0), frame.getTitle() });
+ sourceTable = new JTable(sourceModel) {
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ return false;
+ }
+ };
+ ListSelectionModel selectionModel = sourceTable.getSelectionModel();
+ selectionModel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+
+ TableColumnModel columnModel = sourceTable.getColumnModel();
+ TableColumn column = columnModel.getColumn(0);
+ column.setMaxWidth(50);
+ JScrollPane scroller = new JScrollPane(sourceTable);
+ Dimension d = scroller.getPreferredSize();
+ d.setSize(d.width, sourceTable.getRowHeight() * 5);
+ scroller.setMaximumSize(d);
+ scroller.setPreferredSize(d);
+ add(scroller, BorderLayout.CENTER);
+
+ JPanel ctlPanel = new JPanel();
+ ctlPanel.setLayout(new BoxLayout(ctlPanel, BoxLayout.Y_AXIS));
+ Icon plus = new ImageIcon(SourcePanel.class.getResource(PLUS_ICON));
+ Icon minus = new ImageIcon(SourcePanel.class.getResource(MINUS_ICON));
+ addButton = new JButton(plus);
+ removeButton = new JButton(minus);
+ d = new Dimension(plus.getIconWidth(), plus.getIconHeight());
+ addButton.setPreferredSize(d);
+ removeButton.setPreferredSize(d);
+ ctlPanel.add(Box.createVerticalGlue());
+ ctlPanel.add(addButton);
+ ctlPanel.add(Box.createVerticalStrut(10));
+ ctlPanel.add(removeButton);
+ ctlPanel.add(Box.createVerticalGlue());
+ add(ctlPanel, BorderLayout.EAST);
+
+ setBorder(BorderFactory.createTitledBorder(PixelleBundle.getString(PixelleBundle.SOURCES_LABEL)));
+ }
+
+ public void initListeners() {
+
+ }
+ }
}
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties 2009-02-17 06:03:24 UTC (rev 237)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties 2009-02-17 06:10:05 UTC (rev 238)
@@ -1,5 +1,5 @@
# * pixelle - Graphics algorithmic editor
-# * Copyright (C) 2008 Dave Brosius
+# * Copyright (C) 2008-2009 Dave Brosius
# *
# * This library is free software; you can redistribute it and/or
# * modify it under the terms of the GNU Lesser General Public
@@ -95,4 +95,10 @@
label.grayscale = Gray scale
label.width = Width
-label.height = Height
\ No newline at end of file
+label.height = Height
+
+label.sources = Transformation Input Sources
+label.inputnumber = Index
+label.inputname = Input Source Name
+
+label.outputproperties = Output Properties
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-17 06:05:43
|
Revision: 237
http://pixelle.svn.sourceforge.net/pixelle/?rev=237&view=rev
Author: dbrosius
Date: 2009-02-17 06:03:24 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
add button icons for add/remove
Added Paths:
-----------
trunk/pixelle/src/com/mebigfatguy/pixelle/resources/minus.png
trunk/pixelle/src/com/mebigfatguy/pixelle/resources/plus.png
Added: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/minus.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/minus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/plus.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/plus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-16 08:57:22
|
Revision: 236
http://pixelle.svn.sourceforge.net/pixelle/?rev=236&view=rev
Author: dbrosius
Date: 2009-02-16 08:57:19 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
push PixelleImage[] src down to the transform action
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-02-16 08:55:57 UTC (rev 235)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-02-16 08:57:19 UTC (rev 236)
@@ -103,7 +103,7 @@
boolean doNewWindow;
public PixelleFrame() throws PixelleTransformException {
- this(new PixelleTransformer(new PixelleImage(), PixelleTransformer.getSampleTransform(), ImageType.RGB, new Point(400, 400)).transform(), false);
+ this(new PixelleTransformer(new PixelleImage[] {new PixelleImage()}, PixelleTransformer.getSampleTransform(), ImageType.RGB, new Point(400, 400)).transform(), false);
}
public PixelleFrame(PixelleImage srcImage) {
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-02-16 08:55:57 UTC (rev 235)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-02-16 08:57:19 UTC (rev 236)
@@ -42,7 +42,7 @@
*/
public class PixelleTransformer {
- private final PixelleImage srcImage;
+ private final PixelleImage[] srcImages;
private Map<PixelleComponent, String> algorithms = null;
private final ImageType outputImageType;
private final Point dimension;
@@ -53,8 +53,8 @@
* @param algos the algorithms for the color components
* @param newDimension the desired dimension of the output image
*/
- public PixelleTransformer(PixelleImage image, Map<PixelleComponent, String> algos, ImageType imageType, Point newDimension) {
- srcImage = image;
+ public PixelleTransformer(PixelleImage[] images, Map<PixelleComponent, String> algos, ImageType imageType, Point newDimension) {
+ srcImages = images;
algorithms = algos;
outputImageType = imageType;
dimension = newDimension;
@@ -99,10 +99,12 @@
destImage = new PixelleImage(new BufferedImage(dimension.x, dimension.y, BufferedImage.TYPE_BYTE_GRAY));
destPE = new PixelleEvalByteGray(destImage, PixelleEvalFactory.getIndexOutOfBoundsOption(), PixelleEvalFactory.getColorOutOfBoundsOption());
}
- PixelleEval srcPE = PixelleEvalFactory.create(srcImage);
- PixelleEval[] sources = new PixelleEval[1];
- sources[0] = srcPE;
+ PixelleEval[] sourceEvals = new PixelleEval[srcImages.length];
+ for (int i = 0; i < srcImages.length; i++) {
+ PixelleEval srcPE = PixelleEvalFactory.create(srcImages[i]);
+ sourceEvals[i] = srcPE;
+ }
PixelleClassLoader pcl = AccessController.doPrivileged(new PrivilegedAction<PixelleClassLoader>() {
public PixelleClassLoader run() {
@@ -138,7 +140,7 @@
char pixelSpec = entry.getKey().getPixelSpec();
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
- double value = expr.eval(sources, x, y);
+ double value = expr.eval(sourceEvals, x, y);
destPE.setValue(x, y, pixelSpec, value);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-16 08:56:03
|
Revision: 235
http://pixelle.svn.sourceforge.net/pixelle/?rev=235&view=rev
Author: dbrosius
Date: 2009-02-16 08:55:57 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
push PixelleImage[] src down to the src of the transform
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java 2009-02-16 08:47:49 UTC (rev 234)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java 2009-02-16 08:55:57 UTC (rev 235)
@@ -52,7 +52,7 @@
d.setVisible(true);
if (d.isOK()) {
ImageType imageType = d.getImageType();
- PixelleTransformer transformer = new PixelleTransformer(frame.getImage(), d.getAlgorithms(imageType), imageType, d.getOutputSize());
+ PixelleTransformer transformer = new PixelleTransformer(new PixelleImage[] {frame.getImage()}, d.getAlgorithms(imageType), imageType, d.getOutputSize());
PixelleImage dstImage = transformer.transform();
if (dstImage != null) {
if (frame.createNewWindow()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-16 08:47:52
|
Revision: 234
http://pixelle.svn.sourceforge.net/pixelle/?rev=234&view=rev
Author: dbrosius
Date: 2009-02-16 08:47:49 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
allow p(s)[x,y] where s is the input selector
Modified Paths:
--------------
trunk/pixelle/etc/Pixelle.g
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
Modified: trunk/pixelle/etc/Pixelle.g
===================================================================
--- trunk/pixelle/etc/Pixelle.g 2009-02-16 08:09:42 UTC (rev 233)
+++ trunk/pixelle/etc/Pixelle.g 2009-02-16 08:47:49 UTC (rev 234)
@@ -296,10 +296,6 @@
| factor ;
factor
- @init
- {
- int sourceSelector = 0;
- }
: NUMBER
{
mv.visitLdcInsn(Double.valueOf($NUMBER.text));
@@ -309,9 +305,13 @@
{
mv.visitVarInsn(Opcodes.ALOAD, 1);
}
- // Put in source selector code, for now use 0
+ ( '(' selector=expr ')' )?
{
- mv.visitLdcInsn(Integer.valueOf(sourceSelector));
+ if ($selector.text == null)
+ mv.visitInsn(Opcodes.ICONST_0);
+ else
+ mv.visitInsn(Opcodes.D2I);
+
mv.visitVarInsn(Opcodes.ILOAD, 4);
mv.visitInsn(Opcodes.IREM);
mv.visitInsn(Opcodes.AALOAD);
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-02-16 08:09:42 UTC (rev 233)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-02-16 08:47:49 UTC (rev 234)
@@ -125,7 +125,7 @@
pp.pixelle();
byte[] bytes = pp.getClassBytes();
- dump(bytes, clsName.substring(clsName.lastIndexOf('.') + 1) + ".class");
+ //dump(bytes, clsName.substring(clsName.lastIndexOf('.') + 1) + ".class");
pcl.addClass(clsName, bytes);
Class<?> cl = pcl.loadClass(clsName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-02-16 08:09:51
|
Revision: 233
http://pixelle.svn.sourceforge.net/pixelle/?rev=233&view=rev
Author: dbrosius
Date: 2009-02-16 08:09:42 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
start changing over to use multiple input sources - not working yet
Modified Paths:
--------------
trunk/pixelle/etc/Pixelle.g
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
Modified: trunk/pixelle/etc/Pixelle.g
===================================================================
--- trunk/pixelle/etc/Pixelle.g 2009-01-02 02:05:36 UTC (rev 232)
+++ trunk/pixelle/etc/Pixelle.g 2009-02-16 08:09:42 UTC (rev 233)
@@ -33,19 +33,38 @@
@members {
ClassWriter cw;
MethodVisitor mv;
+ String clz;
public PixelleParser(CommonTokenStream tokens, String clsName) {
super(tokens, new RecognizerSharedState());
- clsName = clsName.replace('.', '/');
+ clz = clsName.replace('.', '/');
cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
- cw.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC, clsName, null, "java/lang/Object", new String[] {"com/mebigfatguy/pixelle/PixelleExpr"});
+ cw.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC, clz, null, "java/lang/Object", new String[] {"com/mebigfatguy/pixelle/PixelleExpr"});
+
+ cw.visitField(Opcodes.ACC_PRIVATE, "width", "I", null, Integer.valueOf(0));
+ cw.visitField(Opcodes.ACC_PRIVATE, "height", "I", null, Integer.valueOf(0));
+
mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, new String[0]);
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
mv.visitInsn(Opcodes.RETURN);
mv.visitMaxs(0,0);
- mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "eval", "(Lcom/mebigfatguy/pixelle/PixelleEval;II)D", null, new String[0]);
+
+ mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "setOutputSize", "(II)V", null, new String[0]);
+ mv.visitVarInsn(Opcodes.ALOAD, 0);
+ mv.visitInsn(Opcodes.DUP);
+ mv.visitVarInsn(Opcodes.ILOAD, 1);
+ mv.visitFieldInsn(Opcodes.PUTFIELD, clz, "width", "I");
+ mv.visitVarInsn(Opcodes.ILOAD, 2);
+ mv.visitFieldInsn(Opcodes.PUTFIELD, clz, "height", "I");
+ mv.visitInsn(Opcodes.RETURN);
+ mv.visitMaxs(0,0);
+
+ mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "eval", "([Lcom/mebigfatguy/pixelle/PixelleEval;II)D", null, new String[0]);
+ mv.visitVarInsn(Opcodes.ALOAD, 1);
+ mv.visitInsn(Opcodes.ARRAYLENGTH);
+ mv.visitVarInsn(Opcodes.ISTORE, 4);
}
public byte[] getClassBytes() {
@@ -277,6 +296,10 @@
| factor ;
factor
+ @init
+ {
+ int sourceSelector = 0;
+ }
: NUMBER
{
mv.visitLdcInsn(Double.valueOf($NUMBER.text));
@@ -285,6 +308,13 @@
| 'p'
{
mv.visitVarInsn(Opcodes.ALOAD, 1);
+ }
+ // Put in source selector code, for now use 0
+ {
+ mv.visitLdcInsn(Integer.valueOf(sourceSelector));
+ mv.visitVarInsn(Opcodes.ILOAD, 4);
+ mv.visitInsn(Opcodes.IREM);
+ mv.visitInsn(Opcodes.AALOAD);
}
'[' expr
{
@@ -312,14 +342,14 @@
}
| 'width'
{
- mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getWidth", "()I" );
+ mv.visitVarInsn(Opcodes.ALOAD, 0);
+ mv.visitFieldInsn(Opcodes.GETFIELD, clz, "width", "I");
mv.visitInsn(Opcodes.I2D);
}
| 'height'
{
- mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getHeight", "()I" );
+ mv.visitVarInsn(Opcodes.ALOAD, 0);
+ mv.visitFieldInsn(Opcodes.GETFIELD, clz, "height", "I");
mv.visitInsn(Opcodes.I2D);
}
| 'abs' '(' expr ')'
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java 2009-01-02 02:05:36 UTC (rev 232)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java 2009-02-16 08:09:42 UTC (rev 233)
@@ -23,5 +23,6 @@
* pixel component values.
*/
public interface PixelleExpr {
- double eval(PixelleEval e, int x, int y);
+ void setOutputSize(int width, int height);
+ double eval(PixelleEval[] exprs, int x, int y);
}
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-01-02 02:05:36 UTC (rev 232)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-02-16 08:09:42 UTC (rev 233)
@@ -101,6 +101,9 @@
}
PixelleEval srcPE = PixelleEvalFactory.create(srcImage);
+ PixelleEval[] sources = new PixelleEval[1];
+ sources[0] = srcPE;
+
PixelleClassLoader pcl = AccessController.doPrivileged(new PrivilegedAction<PixelleClassLoader>() {
public PixelleClassLoader run() {
return new PixelleClassLoader(Thread.currentThread().getContextClassLoader());
@@ -122,19 +125,20 @@
pp.pixelle();
byte[] bytes = pp.getClassBytes();
- //dump(bytes, clsName.substring(clsName.lastIndexOf('.') + 1) + ".class");
+ dump(bytes, clsName.substring(clsName.lastIndexOf('.') + 1) + ".class");
pcl.addClass(clsName, bytes);
Class<?> cl = pcl.loadClass(clsName);
PixelleExpr expr = (PixelleExpr)cl.newInstance();
-
int width = destImage.getWidth();
int height = destImage.getHeight();
+ expr.setOutputSize(width, height);
+
char pixelSpec = entry.getKey().getPixelSpec();
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
- double value = expr.eval(srcPE, x, y);
+ double value = expr.eval(sources, x, y);
destPE.setValue(x, y, pixelSpec, value);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2009-01-02 02:05:41
|
Revision: 232
http://pixelle.svn.sourceforge.net/pixelle/?rev=232&view=rev
Author: dbrosius
Date: 2009-01-02 02:05:36 +0000 (Fri, 02 Jan 2009)
Log Message:
-----------
update copyright to 2009
Modified Paths:
--------------
trunk/pixelle/build.xml
trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java
trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java
trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java
trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java
trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java
trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java
trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java
trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java
trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java
trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java
trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java
trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java
trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java
trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java
trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java
trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java
Modified: trunk/pixelle/build.xml
===================================================================
--- trunk/pixelle/build.xml 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/build.xml 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,7 +1,7 @@
<!--
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java 2008-11-25 04:31:24 UTC (rev 231)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java 2009-01-02 02:05:36 UTC (rev 232)
@@ -1,6 +1,6 @@
/*
* pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2009 Dave Brosius
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-25 04:31:26
|
Revision: 231
http://pixelle.svn.sourceforge.net/pixelle/?rev=231&view=rev
Author: dbrosius
Date: 2008-11-25 04:31:24 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
fix saving of algorithms to escape xml entities
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-11-25 04:30:58 UTC (rev 230)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-11-25 04:31:24 UTC (rev 231)
@@ -48,6 +48,7 @@
import org.xml.sax.helpers.XMLReaderFactory;
import com.mebigfatguy.pixelle.utils.Closer;
+import com.mebigfatguy.pixelle.utils.XMLEncoder;
public class AlgorithmArchiver {
@@ -240,7 +241,7 @@
for (Map.Entry<PixelleComponent, String> component : algorithm.getValue().entrySet()) {
pw.println(" <component name='" + component.getKey().name().toLowerCase() + "'>");
- pw.println(" " + component.getValue());
+ pw.println(" " + XMLEncoder.xmlEncode(component.getValue()));
pw.println(" </component>");
}
pw.println(" </algorithm>");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-25 04:31:08
|
Revision: 230
http://pixelle.svn.sourceforge.net/pixelle/?rev=230&view=rev
Author: dbrosius
Date: 2008-11-25 04:30:58 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
helper class to escape entities
Added Paths:
-----------
trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
Added: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java (rev 0)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java 2008-11-25 04:30:58 UTC (rev 230)
@@ -0,0 +1,31 @@
+/*
+ * pixelle - Graphics algorithmic editor
+ * Copyright (C) 2008 Dave Brosius
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package com.mebigfatguy.pixelle.utils;
+
+public final class XMLEncoder {
+ private XMLEncoder() {
+ }
+
+ public static String xmlEncode(String input) {
+ input = input.replaceAll("&", "&");
+ input = input.replaceAll("<", "<");
+ input = input.replaceAll(">", ">");
+ return input;
+ }
+}
Property changes on: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-25 04:18:06
|
Revision: 229
http://pixelle.svn.sourceforge.net/pixelle/?rev=229&view=rev
Author: dbrosius
Date: 2008-11-25 04:18:02 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
remove current_ from save dialog
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-11-25 04:09:42 UTC (rev 228)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-11-25 04:18:02 UTC (rev 229)
@@ -32,6 +32,8 @@
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
@@ -134,7 +136,9 @@
}
public String[] getUserGroups(ImageType imageType) {
- return userAlgorithms.get(imageType).keySet().toArray(new String[userAlgorithms.size()]);
+ Set<String> groups = new TreeSet<String>(userAlgorithms.get(imageType).keySet());
+ groups.remove(CURRENT);
+ return groups.toArray(new String[groups.size()]);
}
public void addAlgorithm(ImageType imageType, String groupName, String algorithmName, Map<PixelleComponent, String> algorithm) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-25 04:09:46
|
Revision: 228
http://pixelle.svn.sourceforge.net/pixelle/?rev=228&view=rev
Author: dbrosius
Date: 2008-11-25 04:09:42 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
fix save algorithm
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-11-23 05:09:47 UTC (rev 227)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java 2008-11-25 04:09:42 UTC (rev 228)
@@ -133,8 +133,8 @@
}
- public String[] getUserGroups() {
- return userAlgorithms.keySet().toArray(new String[userAlgorithms.size()]);
+ public String[] getUserGroups(ImageType imageType) {
+ return userAlgorithms.get(imageType).keySet().toArray(new String[userAlgorithms.size()]);
}
public void addAlgorithm(ImageType imageType, String groupName, String algorithmName, Map<PixelleComponent, String> algorithm) {
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-11-23 05:09:47 UTC (rev 227)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-11-25 04:09:42 UTC (rev 228)
@@ -388,12 +388,12 @@
save.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
- SaveAlgorithmDialog dialog = new SaveAlgorithmDialog(frame);
+ ImageType imageType = getImageType();
+ SaveAlgorithmDialog dialog = new SaveAlgorithmDialog(frame, imageType);
dialog.setLocationRelativeTo(frame);
dialog.setModal(true);
dialog.setVisible(true);
if (dialog.isOK()) {
- ImageType imageType = getImageType();
String group = dialog.getGroup();
String name = dialog.getName();
Map<PixelleComponent, String> algorithm = getAlgorithms(imageType);
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java 2008-11-23 05:09:47 UTC (rev 227)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java 2008-11-25 04:09:42 UTC (rev 228)
@@ -37,6 +37,7 @@
import javax.swing.JTextField;
import com.mebigfatguy.pixelle.AlgorithmArchiver;
+import com.mebigfatguy.pixelle.ImageType;
import com.mebigfatguy.pixelle.PixelleBundle;
import com.mebigfatguy.pixelle.PixelleFrame;
import com.mebigfatguy.pixelle.utils.GuiUtils;
@@ -49,14 +50,16 @@
new JLabel(PixelleBundle.getString(PixelleBundle.PIXEL_ALGORITHM))
};
+ private final ImageType imageType;
private JComboBox groupBox;
private JTextField nameField;
private JButton ok;
private JButton cancel;
private boolean okClicked = false;
- public SaveAlgorithmDialog(PixelleFrame owner) {
+ public SaveAlgorithmDialog(PixelleFrame owner, ImageType imageOutputType) {
super(owner, PixelleBundle.getString(PixelleBundle.SAVE_ALGORITHM));
+ imageType = imageOutputType;
initComponents();
initListeners();
}
@@ -78,7 +81,7 @@
Container cp = getContentPane();
cp.setLayout(new BoxLayout(cp, BoxLayout.Y_AXIS));
- String[] groups = AlgorithmArchiver.getArchiver().getUserGroups();
+ String[] groups = AlgorithmArchiver.getArchiver().getUserGroups(imageType);
groupBox = new JComboBox(new DefaultComboBoxModel(groups));
groupBox.setEditable(true);
nameField = new JTextField(10);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-23 05:09:48
|
Revision: 227
http://pixelle.svn.sourceforge.net/pixelle/?rev=227&view=rev
Author: dbrosius
Date: 2008-11-23 05:09:47 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
new dialog
Modified Paths:
--------------
trunk/pixelle/htdocs/algodlg.png
Modified: trunk/pixelle/htdocs/algodlg.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-23 05:07:57
|
Revision: 226
http://pixelle.svn.sourceforge.net/pixelle/?rev=226&view=rev
Author: dbrosius
Date: 2008-11-23 05:07:54 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
fix javadoc
Modified Paths:
--------------
trunk/pixelle/htdocs/index.html
Modified: trunk/pixelle/htdocs/index.html
===================================================================
--- trunk/pixelle/htdocs/index.html 2008-11-23 05:06:19 UTC (rev 225)
+++ trunk/pixelle/htdocs/index.html 2008-11-23 05:07:54 UTC (rev 226)
@@ -123,7 +123,7 @@
The output size can be specified in the transform dialog</p>
<p>Still to be done is recognition of more image types, working with multiple
- input sources, creating non ABGR images, more options handling such as fractional pixels,
+ input sources, more options handling such as fractional pixels,
a bunch of bugs, and a bunch of stuff I have yet to think about.</p>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-23 05:06:40
|
Revision: 225
http://pixelle.svn.sourceforge.net/pixelle/?rev=225&view=rev
Author: dbrosius
Date: 2008-11-23 05:06:19 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
javadoc
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2008-11-22 06:09:49 UTC (rev 224)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java 2008-11-23 05:06:19 UTC (rev 225)
@@ -51,7 +51,7 @@
* constructions a transformer given a source bitmap and algorithms
* @param image the source image
* @param algos the algorithms for the color components
- * @param newDimension TODO
+ * @param newDimension the desired dimension of the output image
*/
public PixelleTransformer(PixelleImage image, Map<PixelleComponent, String> algos, ImageType imageType, Point newDimension) {
srcImage = image;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-22 06:09:51
|
Revision: 224
http://pixelle.svn.sourceforge.net/pixelle/?rev=224&view=rev
Author: dbrosius
Date: 2008-11-22 06:09:49 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
marginally prettier
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-11-22 06:08:36 UTC (rev 223)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-11-22 06:09:49 UTC (rev 224)
@@ -28,6 +28,7 @@
import java.awt.event.MouseEvent;
import java.util.EnumMap;
import java.util.Map;
+import java.util.Set;
import javax.swing.BorderFactory;
import javax.swing.Box;
@@ -424,7 +425,8 @@
reset.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
- for (PixelleComponent comp : (getImageType() == ImageType.RGB) ? PixelleComponent.rgbValues() : PixelleComponent.gsValues()) {
+ Set<PixelleComponent> comps = (getImageType() == ImageType.RGB) ? PixelleComponent.rgbValues() : PixelleComponent.gsValues();
+ for (PixelleComponent comp : comps) {
rgbEditor.get(comp).setText(PixelleBundle.getString("formula." + comp.name().toLowerCase()));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dbr...@us...> - 2008-11-22 06:08:41
|
Revision: 223
http://pixelle.svn.sourceforge.net/pixelle/?rev=223&view=rev
Author: dbrosius
Date: 2008-11-22 06:08:36 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
fix reset
Modified Paths:
--------------
trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-11-22 06:00:59 UTC (rev 222)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java 2008-11-22 06:08:36 UTC (rev 223)
@@ -424,7 +424,7 @@
reset.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
- for (PixelleComponent comp : PixelleComponent.gsValues()) {
+ for (PixelleComponent comp : (getImageType() == ImageType.RGB) ? PixelleComponent.rgbValues() : PixelleComponent.gsValues()) {
rgbEditor.get(comp).setText(PixelleBundle.getString("formula." + comp.name().toLowerCase()));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
