vmario
/
polargraphcontroller
mirror of https://github.com/euphy/polargraphcontroller
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Quite a few things working. The window focus is still a bit weird.

This commit is contained in:
Sandy Noble 2015-08-16 12:19:19 +01:00
parent 1abe63bba6
commit cbb2678aef
5 changed files with 113 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ControlFrame.pde
View File

@ -5,12 +5,12 @@ public class ControlFrame extends PApplet {
public int w, h;
int abc = 100;
public ControlP5 cp5;
protected Object parent;
protected PApplet parent;
private ControlFrame() {
}
public ControlFrame(Object theParent, int theWidth, int theHeight) {
public ControlFrame(PApplet theParent, int theWidth, int theHeight) {
this.parent = theParent;
this.w = theWidth;
this.h = theHeight;
@ -23,6 +23,10 @@ public class ControlFrame extends PApplet {
return this.cp5;
}
public PApplet getParent() {
return this.parent;
}
public void setup() {
size(w, h);
frameRate(5);

23
DisplayMachine.pde
View File

@ -767,8 +767,6 @@ class DisplayMachine extends Machine
void previewNativePixel(PVector pos, float size, float brightness)
{
float half = size / 2.0;
fill(0,0,0, 255-brightness);
beginShape();
// arcs from the left-hand corner
float distFromPointA = getOutline().getTopLeft().dist(pos);
@ -776,14 +774,19 @@ class DisplayMachine extends Machine
List<PVector> int1 = findIntersections(getOutline().getLeft(), distFromPointA-half, getOutline().getRight(), distFromPointB-half, size);
List<PVector> int2 = findIntersections(getOutline().getLeft(), distFromPointA+half, getOutline().getRight(), distFromPointB-half, size);
// plot out the vertexes
vertex(int1.get(0).x, int1.get(0).y);
vertex(int2.get(0).x, int2.get(0).y);
vertex(int2.get(1).x, int2.get(1).y);
vertex(int1.get(1).x, int1.get(1).y);
vertex(int1.get(0).x, int1.get(0).y);
endShape();
if (!int1.isEmpty() && !int2.isEmpty()) {
fill(0,0,0, 255-brightness);
beginShape();
// plot out the vertexes
vertex(int1.get(0).x, int1.get(0).y);
vertex(int2.get(0).x, int2.get(0).y);
vertex(int2.get(1).x, int2.get(1).y);
vertex(int1.get(1).x, int1.get(1).y);
vertex(int1.get(0).x, int1.get(0).y);
endShape();
}
}
void previewNativeArcPixel(PVector pos, float size, float brightness)

6
SerialPortWindow.pde
View File

@ -15,7 +15,7 @@ class SerialPortWindow extends ControlFrame {
f.setTitle(CHANGE_SERIAL_PORT_WINDOW_NAME);
f.setSize(super.w, super.h);
f.setLocation(xPos, yPos);
f.setResizable(false);
f.setResizable(true);
f.setVisible(true);
f.addWindowListener( new WindowAdapter() {
@ -31,6 +31,8 @@ class SerialPortWindow extends ControlFrame {
.setSpacingRow(5)
.plugTo(parentPapplet, "radio_serialPort");
r.addItem("No serial connection", -1);
String[] ports = Serial.list();
for (int i = 0; i < ports.length; i++) {
@ -108,4 +110,4 @@ void radio_serialPort(int newSerialPort)
{
println("no serial port change.");
}
}
}

97
controlsActionsWindows.pde
View File

@ -63,7 +63,7 @@ void button_mode_drawWritingDialog() {
String textToWrite = "";
String spriteFilePrefix = "sprite/let";
String spriteFileSuffix = ".txt";
class DrawWritingWindow extends ControlFrame {
public class DrawWritingWindow extends ControlFrame {
public DrawWritingWindow() {
super(parentPapplet, 450, 250);
int xPos = 100;
@ -110,66 +110,71 @@ class DrawWritingWindow extends ControlFrame {
.setLabel("Generate commands")
.plugTo("submitWritingWindow");
}
void spriteFilePrefixField(String value)
{
spriteFilePrefix = value;
void spriteFilePrefixField(String value) {
spriteFilePrefix = value;
}
void textToWriteField(String value)
{
textToWrite = value;
void textToWriteField(String value) {
textToWrite = value;
}
String getTextToWrite()
{
return textToWrite;
String getTextToWrite() {
return textToWrite;
}
String getSpriteFilePrefix()
{
return spriteFilePrefix;
String getSpriteFilePrefix() {
return spriteFilePrefix;
}
String getSpriteFileSuffix()
{
return spriteFileSuffix;
String getSpriteFileSuffix() {
return spriteFileSuffix;
}
void importTextButton()
{
void importTextButton() {
println("Text!");
textToWrite = importTextToWriteFromFile();
println(textToWrite);
Textfield tf = cp5().get(Textfield.class, "textToWriteField");
tf.setText(getTextToWrite());
tf.submit();
selectInput("Select the text file to load the text from:", "importTextToWriteFromFile", null, this);
}
public void importTextToWriteFromFile(File selection) {
if (selection != null) {
String fp = selection.getAbsolutePath();
println("Input file: " + fp);
List<String> rows = java.util.Arrays.asList(loadStrings(fp));
StringBuilder sb = new StringBuilder(200);
for (String row : rows) {
sb.append(row);
}
textToWriteField(sb.toString());
println("Completed text import, " + getTextToWrite().length() + " characters found.");
println("Text: " + getTextToWrite());
Textfield tf = cp5().get(Textfield.class, "textToWriteField");
tf.setText(getTextToWrite());
tf.submit();
}
}
void submitWritingWindow(int theValue)
{
println("Write.");
Textfield tf = cp5().get(Textfield.class, "spriteFilePrefixField");
tf.submit();
tf.setText(getSpriteFilePrefix());
Textfield wf = cp5.get(Textfield.class, "textToWriteField");
wf.submit();
wf.setText(getTextToWrite());
println("Start dir: " + renderStartDirection);
println("Sprite file prefix: " + spriteFilePrefix);
println("Text: " + textToWrite);
println("Write.");
Textfield tf = cp5().get(Textfield.class, "spriteFilePrefixField");
tf.submit();
tf.setText(getSpriteFilePrefix());
Textfield wf = cp5.get(Textfield.class, "textToWriteField");
wf.submit();
wf.setText(getTextToWrite());
println("Start dir: " + renderStartDirection);
println("Sprite file prefix: " + spriteFilePrefix);
println("Text: " + textToWrite);
for (int i=0; i<getTextToWrite().length(); i++)
{
String filename = getSpriteFilePrefix() + (int) getTextToWrite().charAt(i) + getSpriteFileSuffix();
addToCommandQueue(CMD_DRAW_SPRITE + int(gridSize * pixelScalingOverGridSize) + "," + filename+",END");
println(filename);
}
for (int i=0; i<getTextToWrite().length(); i++) {
String filename = getSpriteFilePrefix() + (int) getTextToWrite().charAt(i) + getSpriteFileSuffix();
addToCommandQueue(CMD_DRAW_SPRITE + int(gridSize * pixelScalingOverGridSize) + "," + filename+",END");
println(filename);
}
}
}
//
//void button_mode_drawWritingDialog()

118
polargraphcontroller.pde
View File

@ -1815,15 +1815,8 @@ boolean isHiddenPixel(PVector p)
else
return false;
}
void sizeImageToFitBox()
{
// PVector mmBoxSize = getDisplayMachine().inSteps(getBoxSize());
// PVector mmBoxPos = getDisplayMachine().inSteps(getBoxVector1());
// println("mm box: " + mmBoxSize);
void sizeImageToFitBox() {
PVector boxSize = getDisplayMachine().inSteps(getBoxSize());
PVector boxPos = getDisplayMachine().inSteps(getBoxVector1());
println("image: " + boxSize);
@ -1832,84 +1825,51 @@ void sizeImageToFitBox()
getDisplayMachine().setImageFrame(r);
}
void exportQueueToFile()
{
if (!commandQueue.isEmpty() || !realtimeCommandQueue.isEmpty())
{
selectOutput("Enter a filename to save to:", "fileSelected"); // Opens file chooser
if (filePath == null)
{
// If a file was not selected
println("No output file was selected...");
}
else
{
// If a file was selected, print path to folder
println("Output file: " + filePath);
List<String> allCommands = new ArrayList<String>(realtimeCommandQueue);
allCommands.addAll(commandQueue);
String[] list = (String[]) allCommands.toArray(new String[0]);
saveStrings(filePath, list);
println("Completed queue export, " + list.length + " commands exported.");
}
}
void exportQueueToFile() {
if (!commandQueue.isEmpty() || !realtimeCommandQueue.isEmpty()) {
selectOutput("Enter a filename to save to:", "exportQueueToFile"); // Opens file chooser
}
}
void exportQueueToFile(File selection) {
if (selection != null) {
filePath = selection.getAbsolutePath();
println("User selected " + filePath);
// If a file was selected, print path to folder
println("Output file: " + filePath);
List<String> allCommands = new ArrayList<String>(realtimeCommandQueue);
allCommands.addAll(commandQueue);
String[] list = (String[]) allCommands.toArray(new String[0]);
saveStrings(filePath, list);
println("Completed queue export, " + list.length + " commands exported.");
}
}
void fileSelected(File selection) {
if (selection == null) {
println("Window was closed or the user hit cancel.");
filePath = null;
} else {
filePath = selection.getAbsolutePath();
println("User selected " + filePath);
}
if (selection == null) {
println("Window was closed or the user hit cancel.");
filePath = null;
} else {
filePath = selection.getAbsolutePath();
println("User selected " + filePath);
}
}
void importQueueFromFile()
{
commandQueue.clear();
selectInput("Select file to import queue from", "fileSelected");
if (filePath == null)
{
// nothing selected
println("No input file was selected.");
}
else
{
println("Input file: " + filePath);
String commands[] = loadStrings(filePath);
// List<String> list = Arrays
commandQueue.addAll(Arrays.asList(commands));
println("Completed queue import, " + commandQueue.size() + " commands found.");
}
void importQueueFromFile() {
commandQueue.clear();
selectInput("Select file to import queue from", "fileSelected");
if (filePath == null) {
// nothing selected
println("No input file was selected.");
} else {
println("Input file: " + filePath);
String commands[] = loadStrings(filePath);
commandQueue.addAll(Arrays.asList(commands));
println("Completed queue import, " + commandQueue.size() + " commands found.");
}
}
String importTextToWriteFromFile()
{
selectInput("Select the text file to load the text from:", "fileSelected");
String result = "";
if (filePath == null)
{
// nothing selected
println("No input file was selected.");
}
else
{
println("Input file: " + filePath);
List<String> rows = java.util.Arrays.asList(loadStrings(filePath));
StringBuilder sb = new StringBuilder(200);
for (String row : rows)
{
sb.append(row);
}
result = sb.toString();
println("Completed text import, " + result.length() + " characters found.");
}
return result;
}