Skip to content

Commit 9307c4e

Browse files
committed
Minor tweaks to window sizes
1 parent d74881f commit 9307c4e

4 files changed

Lines changed: 12 additions & 15 deletions

File tree

SerialPortWindow.pde

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ControlFrameSimple addSerialPortControlFrame(String theName, int theWidth, int t
3131

3232
ScrollableList sl = p.cp5().addScrollableList("dropdown_serialPort")
3333
.setPosition(10, 10)
34-
.setSize(150, 100)
34+
.setSize(150, 450)
3535
.setBarHeight(20)
3636
.setItemHeight(20)
3737
.plugTo(this, "dropdown_serialPort");
@@ -53,7 +53,7 @@ ControlFrameSimple addSerialPortControlFrame(String theName, int theWidth, int t
5353
// set the value of the actual control
5454
sl.setValue(portNo);
5555

56-
sl.setOpen(false);
56+
sl.setOpen(true);
5757
return p;
5858
}
5959

controlsActionsWindows.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ String DRAW_PIXELS_WINDOW_NAME = "drawPixelsWindow";
3838
String DRAW_WRITING_WINDOW_NAME = "drawWritingWindow";
3939

4040
void button_mode_serialPortDialog() {
41-
ControlFrameSimple cf = addSerialPortControlFrame("Serial Port", 200, 200, 20, 240, color( 100 ) );
41+
ControlFrameSimple cf = addSerialPortControlFrame("Serial Port", 200, 500, 20, 240, color( 100 ) );
4242
}
4343

4444
void button_mode_machineStoreDialog() {

drawing.pde

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ void sendRequestMachineSize()
120120
void sendMachineSpec()
121121
{
122122
// ask for input to get the new machine size
123-
String command = CMD_CHANGEMACHINENAME+newMachineName+",END";
124-
addToCommandQueue(command);
125-
command = CMD_CHANGEMACHINESIZE+getDisplayMachine().inMM(getDisplayMachine().getWidth())+","+getDisplayMachine().inMM(getDisplayMachine().getHeight())+",END";
123+
String command = CMD_CHANGEMACHINESIZE+getDisplayMachine().inMM(getDisplayMachine().getWidth())+","+getDisplayMachine().inMM(getDisplayMachine().getHeight())+",END";
126124
addToCommandQueue(command);
127125
command = CMD_CHANGEMACHINEMMPERREV+int(getDisplayMachine().getMMPerRev())+",END";
128126
addToCommandQueue(command);
@@ -969,6 +967,4 @@ void sendStopSwirling()
969967
void sendDrawRandomSprite(String spriteFilename)
970968
{
971969
addToCommandQueue(CMD_DRAW_RANDOM_SPRITE+","+spriteFilename+",100,500,END");
972-
}
973-
974-
970+
}

polargraphcontroller.pde

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ import java.awt.BorderLayout;
5757
import java.lang.reflect.Method;
5858

5959
int majorVersionNo = 2;
60-
int minorVersionNo = 4;
61-
int buildNo = 2;
60+
int minorVersionNo = 5;
61+
int buildNo = 0;
6262

6363
String programTitle = "Polargraph Controller v" + majorVersionNo + "." + minorVersionNo + " build " + buildNo;
6464
ControlP5 cp5;
@@ -565,6 +565,7 @@ void setup()
565565
RG.init(this);
566566
loadFromPropertiesFile();
567567

568+
size(200, 200);
568569
size(windowWidth, windowHeight);
569570
this.cp5 = new ControlP5(this);
570571
initTabs();
@@ -651,10 +652,10 @@ void addEventListeners()
651652
public void componentResized(ComponentEvent event)
652653
{
653654
windowResized();
654-
// if (event.getSource()==frame)
655-
// {
656-
// windowResized();
657-
// }
655+
if (event.getSource()==frame)
656+
{
657+
windowResized();
658+
}
658659
}
659660
}
660661
);

0 commit comments

Comments
 (0)