diff --git a/examples/controllers/ControlP5ButtonBar/ControlP5ButtonBar.pde b/examples/controllers/ControlP5ButtonBar/ControlP5ButtonBar.pde index c4b6d08..f0a7582 100644 --- a/examples/controllers/ControlP5ButtonBar/ControlP5ButtonBar.pde +++ b/examples/controllers/ControlP5ButtonBar/ControlP5ButtonBar.pde @@ -200,7 +200,7 @@ controlP5.Controller : void setView(ControllerView, int) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:24 +created: 2014/09/08 01:18:39 */ diff --git a/examples/controllers/ControlP5ColorWheel/ControlP5ColorWheel.pde b/examples/controllers/ControlP5ColorWheel/ControlP5ColorWheel.pde index b79d8ec..0e2f01a 100644 --- a/examples/controllers/ControlP5ColorWheel/ControlP5ColorWheel.pde +++ b/examples/controllers/ControlP5ColorWheel/ControlP5ColorWheel.pde @@ -1,6 +1,13 @@ /** - * ColorWheel is working but still under development as of 22.April 2014. - * for API see source code of controlP5/ColorWheel.java +* ControlP5 ColorWheel +* +* +* find a list of public methods available for the Group Controller +* at the bottom of this sketch. +* +* by Andreas Schlegel, 2014 +* www.sojamo.de/libraries/controlp5 +* */ import controlP5.*; @@ -8,9 +15,8 @@ import controlP5.*; ControlP5 cp5; void setup() { - size(500, 500); + size(800, 400); cp5 = new ControlP5( this ); - cp5.printPublicMethodsFor(ColorWheel.class); cp5.addColorWheel("c" , 250 , 10 , 200 ).setRGB(color(128,0,255)); noStroke(); } @@ -203,7 +209,7 @@ controlP5.Controller : void setView(ControllerView, int) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:25 +created: 2014/09/08 01:18:40 */ diff --git a/examples/controllers/ControlP5accordion/ControlP5accordion.pde b/examples/controllers/ControlP5accordion/ControlP5accordion.pde index 4e9eb54..98323c4 100644 --- a/examples/controllers/ControlP5accordion/ControlP5accordion.pde +++ b/examples/controllers/ControlP5accordion/ControlP5accordion.pde @@ -279,7 +279,7 @@ controlP5.ControllerGroup : void remove() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:39:14 +created: 2014/09/08 01:18:42 */ diff --git a/examples/controllers/ControlP5background/ControlP5background.pde b/examples/controllers/ControlP5background/ControlP5background.pde new file mode 100644 index 0000000..57a2724 --- /dev/null +++ b/examples/controllers/ControlP5background/ControlP5background.pde @@ -0,0 +1,188 @@ +/** +* ControlP5 Background +* +* +* find a list of public methods available for the Group Controller +* at the bottom of this sketch. +* +* by Andreas Schlegel, 2014 +* www.sojamo.de/libraries/controlp5 +* +*/ + +import controlP5.*; + +ControlP5 cp5; +int v1; +boolean lines = true; + +void setup() { + size(800, 400); + noStroke(); + cp5 = new ControlP5(this); + + cp5.begin(cp5.addBackground("abc")); + + cp5.addSlider("v1") + .setPosition(10, 20) + .setSize(200, 20) + .setRange(100, 300) + .setValue(250) + ; + + cp5.addToggle("lines") + .setPosition(10,50) + .setSize(80,20) + .setMode(Toggle.SWITCH) + ; + + cp5.end(); + +} + +void draw() { + background(200, 200, 200); + + pushMatrix(); + + pushMatrix(); + fill(255, 255, 0); + rect(v1, 100, 60, 200); + fill(0, 255, 110); + rect(40, v1, 320, 40); + translate(200, 200); + rotate(map(v1, 100, 300, -PI, PI)); + fill(255, 0, 128); + rect(0, 0, 100, 100); + popMatrix(); + + if(lines) { + translate(600, 100); + for (int i=0; i<20; i++) { + pushMatrix(); + fill(255); + translate(0, i*10); + rotate(map(v1+i, 0, 300, -PI, PI)); + rect(-150, 0, 300, 4); + popMatrix(); + } + } + + popMatrix(); +} + +/* +a list of all methods available for the Background Controller +use ControlP5.printPublicMethodsFor(Background.class); +to print the following list into the console. + +You can find further details about class Background in the javadoc. + +Format: +ClassName : returnType methodName(parameter type) + + +controlP5.ControlGroup : Background activateEvent(boolean) +controlP5.ControlGroup : Background addListener(ControlListener) +controlP5.ControlGroup : Background removeListener(ControlListener) +controlP5.ControlGroup : Background setBackgroundColor(int) +controlP5.ControlGroup : Background setBackgroundHeight(int) +controlP5.ControlGroup : Background setBarHeight(int) +controlP5.ControlGroup : Background setSize(int, int) +controlP5.ControlGroup : Background updateInternalEvents(PApplet) +controlP5.ControlGroup : String getInfo() +controlP5.ControlGroup : String toString() +controlP5.ControlGroup : int getBackgroundHeight() +controlP5.ControlGroup : int getBarHeight() +controlP5.ControlGroup : int listenerSize() +controlP5.ControllerGroup : Background add(ControllerInterface) +controlP5.ControllerGroup : Background addListener(ControlListener) +controlP5.ControllerGroup : Background bringToFront() +controlP5.ControllerGroup : Background bringToFront(ControllerInterface) +controlP5.ControllerGroup : Background close() +controlP5.ControllerGroup : Background disableCollapse() +controlP5.ControllerGroup : Background enableCollapse() +controlP5.ControllerGroup : Background hide() +controlP5.ControllerGroup : Background hideArrow() +controlP5.ControllerGroup : Background hideBar() +controlP5.ControllerGroup : Background moveTo(ControlWindow) +controlP5.ControllerGroup : Background moveTo(PApplet) +controlP5.ControllerGroup : Background open() +controlP5.ControllerGroup : Background registerProperty(String) +controlP5.ControllerGroup : Background registerProperty(String, String) +controlP5.ControllerGroup : Background remove(CDrawable) +controlP5.ControllerGroup : Background remove(ControllerInterface) +controlP5.ControllerGroup : Background removeCanvas(Canvas) +controlP5.ControllerGroup : Background removeListener(ControlListener) +controlP5.ControllerGroup : Background removeProperty(String) +controlP5.ControllerGroup : Background removeProperty(String, String) +controlP5.ControllerGroup : Background setAddress(String) +controlP5.ControllerGroup : Background setArrayValue(float[]) +controlP5.ControllerGroup : Background setArrayValue(int, float) +controlP5.ControllerGroup : Background setCaptionLabel(String) +controlP5.ControllerGroup : Background setColor(CColor) +controlP5.ControllerGroup : Background setColorActive(int) +controlP5.ControllerGroup : Background setColorBackground(int) +controlP5.ControllerGroup : Background setColorForeground(int) +controlP5.ControllerGroup : Background setColorLabel(int) +controlP5.ControllerGroup : Background setColorValue(int) +controlP5.ControllerGroup : Background setHeight(int) +controlP5.ControllerGroup : Background setId(int) +controlP5.ControllerGroup : Background setLabel(String) +controlP5.ControllerGroup : Background setMouseOver(boolean) +controlP5.ControllerGroup : Background setMoveable(boolean) +controlP5.ControllerGroup : Background setOpen(boolean) +controlP5.ControllerGroup : Background setPosition(float, float) +controlP5.ControllerGroup : Background setPosition(float[]) +controlP5.ControllerGroup : Background setSize(int, int) +controlP5.ControllerGroup : Background setStringValue(String) +controlP5.ControllerGroup : Background setTitle(String) +controlP5.ControllerGroup : Background setUpdate(boolean) +controlP5.ControllerGroup : Background setValue(float) +controlP5.ControllerGroup : Background setVisible(boolean) +controlP5.ControllerGroup : Background setWidth(int) +controlP5.ControllerGroup : Background show() +controlP5.ControllerGroup : Background showArrow() +controlP5.ControllerGroup : Background showBar() +controlP5.ControllerGroup : Background update() +controlP5.ControllerGroup : Background updateAbsolutePosition() +controlP5.ControllerGroup : CColor getColor() +controlP5.ControllerGroup : Canvas addCanvas(Canvas) +controlP5.ControllerGroup : ControlWindow getWindow() +controlP5.ControllerGroup : Controller getController(String) +controlP5.ControllerGroup : ControllerProperty getProperty(String) +controlP5.ControllerGroup : ControllerProperty getProperty(String, String) +controlP5.ControllerGroup : Label getCaptionLabel() +controlP5.ControllerGroup : Label getValueLabel() +controlP5.ControllerGroup : String getAddress() +controlP5.ControllerGroup : String getInfo() +controlP5.ControllerGroup : String getName() +controlP5.ControllerGroup : String getStringValue() +controlP5.ControllerGroup : String toString() +controlP5.ControllerGroup : Tab getTab() +controlP5.ControllerGroup : boolean isBarVisible() +controlP5.ControllerGroup : boolean isCollapse() +controlP5.ControllerGroup : boolean isMouseOver() +controlP5.ControllerGroup : boolean isMoveable() +controlP5.ControllerGroup : boolean isOpen() +controlP5.ControllerGroup : boolean isUpdate() +controlP5.ControllerGroup : boolean isVisible() +controlP5.ControllerGroup : boolean setMousePressed(boolean) +controlP5.ControllerGroup : float getArrayValue(int) +controlP5.ControllerGroup : float getValue() +controlP5.ControllerGroup : float[] getArrayValue() +controlP5.ControllerGroup : float[] getPosition() +controlP5.ControllerGroup : int getHeight() +controlP5.ControllerGroup : int getId() +controlP5.ControllerGroup : int getWidth() +controlP5.ControllerGroup : int listenerSize() +controlP5.ControllerGroup : void controlEvent(ControlEvent) +controlP5.ControllerGroup : void remove() +java.lang.Object : String toString() +java.lang.Object : boolean equals(Object) + +created: 2014/09/08 01:18:44 + +*/ + + diff --git a/examples/controllers/ControlP5background/sketch.properties b/examples/controllers/ControlP5background/sketch.properties new file mode 100644 index 0000000..8630fa2 --- /dev/null +++ b/examples/controllers/ControlP5background/sketch.properties @@ -0,0 +1,2 @@ +mode.id=processing.mode.java.JavaMode +mode=Java diff --git a/examples/controllers/ControlP5bang/ControlP5bang.pde b/examples/controllers/ControlP5bang/ControlP5bang.pde index 445060a..3f7c728 100644 --- a/examples/controllers/ControlP5bang/ControlP5bang.pde +++ b/examples/controllers/ControlP5bang/ControlP5bang.pde @@ -224,7 +224,7 @@ controlP5.Controller : void setView(ControllerView, int) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:29 +created: 2014/09/08 01:18:45 */ diff --git a/examples/controllers/ControlP5button/ControlP5button.pde b/examples/controllers/ControlP5button/ControlP5button.pde index 270f980..dab3c45 100644 --- a/examples/controllers/ControlP5button/ControlP5button.pde +++ b/examples/controllers/ControlP5button/ControlP5button.pde @@ -127,6 +127,7 @@ controlP5.Button : String toString() controlP5.Button : boolean getBooleanValue() controlP5.Button : boolean isOn() controlP5.Button : boolean isPressed() +controlP5.Button : boolean isSwitch() controlP5.Controller : Button addCallback(CallbackListener) controlP5.Controller : Button addListener(ControlListener) controlP5.Controller : Button addListenerFor(int, CallbackListener) @@ -259,7 +260,7 @@ controlP5.Controller : void setView(ControllerView, int) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:30 +created: 2014/09/08 01:18:47 */ diff --git a/examples/controllers/ControlP5canvas/ControlP5canvas.pde b/examples/controllers/ControlP5canvas/ControlP5canvas.pde index 50fc094..23e2814 100644 --- a/examples/controllers/ControlP5canvas/ControlP5canvas.pde +++ b/examples/controllers/ControlP5canvas/ControlP5canvas.pde @@ -82,7 +82,7 @@ controlP5.Canvas : void update(PApplet) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:32 +created: 2014/09/08 01:18:48 */ diff --git a/examples/controllers/ControlP5chart/ControlP5chart.pde b/examples/controllers/ControlP5chart/ControlP5chart.pde index 2b4dbe1..964aa70 100644 --- a/examples/controllers/ControlP5chart/ControlP5chart.pde +++ b/examples/controllers/ControlP5chart/ControlP5chart.pde @@ -1,10 +1,10 @@ /** * ControlP5 Chart -* +* * find a list of public methods available for the Chart Controller * at the bottom of this sketch. -* -* by Andreas Schlegel, 2012 +* +* by Andreas Schlegel, 2014 * www.sojamo.de/libraries/controlp5 * */ @@ -17,40 +17,31 @@ ControlP5 cp5; Chart myChart; void setup() { - size(400, 700); - smooth(); + size(800, 400); cp5 = new ControlP5(this); - cp5.printPublicMethodsFor(Chart.class); - myChart = cp5.addChart("hello") + myChart = cp5.addChart("dataflow") .setPosition(50, 50) - .setSize(200, 200) + .setSize(200, 100) .setRange(-20, 20) - .setView(Chart.BAR) // use Chart.LINE, Chart.PIE, Chart.AREA, Chart.BAR_CENTERED + .setView(Chart.LINE) // use Chart.LINE, Chart.PIE, Chart.AREA, Chart.BAR_CENTERED + .setStrokeWeight(1.5) + .setColorCaptionLabel(color(40)) ; - myChart.getColor().setBackground(color(255, 100)); - - - myChart.addDataSet("world"); - myChart.setColors("world", color(255,0,255),color(255,0,0)); - myChart.setData("world", new float[4]); - - myChart.setStrokeWeight(1.5); - - myChart.addDataSet("earth"); - myChart.setColors("earth", color(255), color(0, 255, 0)); - myChart.updateData("earth", 1, 2, 10, 3); + myChart.addDataSet("incoming"); + myChart.setData("incoming", new float[100]); + } void draw() { - background(0); + background(200); // unshift: add data from left to right (first in) - myChart.unshift("world", (sin(frameCount*0.01)*10)); + //myChart.unshift("incoming", (sin(frameCount*0.1)*20)); // push: add data from right to left (last in) - myChart.push("earth", (sin(frameCount*0.1)*10)); + myChart.push("incoming", (sin(frameCount*0.1)*10)); } @@ -245,7 +236,7 @@ controlP5.Controller : void setView(ControllerView, int) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:34 +created: 2014/09/08 01:18:50 */ diff --git a/examples/controllers/ControlP5checkBox/ControlP5checkBox.pde b/examples/controllers/ControlP5checkBox/ControlP5checkBox.pde index dd73643..b63a346 100644 --- a/examples/controllers/ControlP5checkBox/ControlP5checkBox.pde +++ b/examples/controllers/ControlP5checkBox/ControlP5checkBox.pde @@ -23,7 +23,7 @@ CheckBox checkbox; int myColorBackground; void setup() { - size(700, 400); + size(800, 400); smooth(); cp5 = new ControlP5(this); checkbox = cp5.addCheckBox("checkBox") @@ -235,7 +235,7 @@ controlP5.ControllerGroup : void remove() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:35 +created: 2014/09/08 01:18:51 */ diff --git a/examples/controllers/ControlP5colorPicker/ControlP5colorPicker.pde b/examples/controllers/ControlP5colorPicker/ControlP5colorPicker.pde index 5999219..b51524d 100644 --- a/examples/controllers/ControlP5colorPicker/ControlP5colorPicker.pde +++ b/examples/controllers/ControlP5colorPicker/ControlP5colorPicker.pde @@ -18,7 +18,7 @@ ControlP5 cp5; ColorPicker cp; void setup() { - size(400, 600); + size(800, 400); noStroke(); cp5 = new ControlP5(this); cp = cp5.addColorPicker("picker") @@ -181,7 +181,7 @@ controlP5.ControllerGroup : void remove() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:37 +created: 2014/09/08 01:18:53 */ diff --git a/examples/controllers/ControlP5controlTimer/ControlP5controlTimer.pde b/examples/controllers/ControlP5controlTimer/ControlP5controlTimer.pde index 9560110..e0a9dba 100644 --- a/examples/controllers/ControlP5controlTimer/ControlP5controlTimer.pde +++ b/examples/controllers/ControlP5controlTimer/ControlP5controlTimer.pde @@ -56,7 +56,7 @@ controlP5.ControlTimer : void update() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:38 +created: 2014/09/08 01:18:55 */ diff --git a/examples/controllers/ControlP5controllerProperties/ControlP5controllerProperties.pde b/examples/controllers/ControlP5controllerProperties/ControlP5controllerProperties.pde index 0ff721c..c92c3d8 100644 --- a/examples/controllers/ControlP5controllerProperties/ControlP5controllerProperties.pde +++ b/examples/controllers/ControlP5controllerProperties/ControlP5controllerProperties.pde @@ -158,7 +158,7 @@ controlP5.ControllerProperties : void setFormat(String) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:40 +created: 2014/09/08 01:18:56 */ diff --git a/examples/controllers/ControlP5controllerProperties/hello.properties.json b/examples/controllers/ControlP5controllerProperties/hello.properties.json index 7e9611f..8dd337b 100644 --- a/examples/controllers/ControlP5controllerProperties/hello.properties.json +++ b/examples/controllers/ControlP5controllerProperties/hello.properties.json @@ -12,7 +12,7 @@ "/sliderTicks1": { "min": 0, "max": 255, - "value": 127.5 + "value": 0 }, "/sliderTicks2": { "min": 0, diff --git a/examples/controllers/ControlP5dropdownList/ControlP5dropdownList.pde b/examples/controllers/ControlP5dropdownList/ControlP5dropdownList.pde index 4f73801..19cd7e5 100644 --- a/examples/controllers/ControlP5dropdownList/ControlP5dropdownList.pde +++ b/examples/controllers/ControlP5dropdownList/ControlP5dropdownList.pde @@ -1,4 +1,7 @@ /** + * + * DEPRECATED, use ScrollableList instead. + * * Control5 DropdownList * A dropdownList controller, extends the ListBox controller. * the most recently selected dropdownlist item is displayed inside @@ -7,7 +10,6 @@ * find a list of public methods available for the DropdownList Controller * at the bottom of this sketch's source code * - * DEPRECATED, use ScrollableList instead. * * by andreas schlegel, 2012 * www.sojamo.de/libraries/controlp5 @@ -302,7 +304,7 @@ controlP5.DropdownList : void updateItemIndexOffset() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:42 +created: 2014/09/08 01:18:58 */ diff --git a/examples/controllers/ControlP5group/ControlP5group.pde b/examples/controllers/ControlP5group/ControlP5group.pde index 90d18a0..915d0be 100644 --- a/examples/controllers/ControlP5group/ControlP5group.pde +++ b/examples/controllers/ControlP5group/ControlP5group.pde @@ -228,7 +228,7 @@ controlP5.ControllerGroup : void remove() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:43 +created: 2014/09/08 01:19:00 */ diff --git a/examples/controllers/ControlP5icon/ControlP5icon.pde b/examples/controllers/ControlP5icon/ControlP5icon.pde new file mode 100644 index 0000000..5edf628 --- /dev/null +++ b/examples/controllers/ControlP5icon/ControlP5icon.pde @@ -0,0 +1,218 @@ +/** +* ControlP5 Icon +* +* +* find a list of public methods available for the Group Controller +* at the bottom of this sketch. +* +* by Andreas Schlegel, 2014 +* www.sojamo.de/libraries/controlp5 +* +*/ + + +import controlP5.*; + +ControlP5 cp5; + +void setup() { + size(800,400); + cp5 = new ControlP5(this); + cp5.addIcon("icon",10) + .setPosition(100,100) + .setSize(70,50) + .setRoundedCorners(20) + .setFont(createFont("fontawesome-webfont.ttf", 40)) + .setFontIcons(#00f205,#00f204) + //.setScale(0.9,1) + //.setSwitch(true) + .setColorBackground(color(255,100)) + .hideBackground() + ; +} + +void draw() { + background(220); +} + +void icon(boolean theValue) { + println("got an event for icon", theValue); +} + +/* +a list of all methods available for the Icon Controller +use ControlP5.printPublicMethodsFor(Icon.class); +to print the following list into the console. + +You can find further details about class Icon in the javadoc. + +Format: +ClassName : returnType methodName(parameter type) + + +controlP5.Controller : CColor getColor() +controlP5.Controller : ControlBehavior getBehavior() +controlP5.Controller : ControlWindow getControlWindow() +controlP5.Controller : ControlWindow getWindow() +controlP5.Controller : ControllerProperty getProperty(String) +controlP5.Controller : ControllerProperty getProperty(String, String) +controlP5.Controller : ControllerView getView() +controlP5.Controller : Icon addCallback(CallbackListener) +controlP5.Controller : Icon addListener(ControlListener) +controlP5.Controller : Icon addListenerFor(int, CallbackListener) +controlP5.Controller : Icon align(int, int, int, int) +controlP5.Controller : Icon bringToFront() +controlP5.Controller : Icon bringToFront(ControllerInterface) +controlP5.Controller : Icon hide() +controlP5.Controller : Icon linebreak() +controlP5.Controller : Icon listen(boolean) +controlP5.Controller : Icon lock() +controlP5.Controller : Icon onChange(CallbackListener) +controlP5.Controller : Icon onClick(CallbackListener) +controlP5.Controller : Icon onDoublePress(CallbackListener) +controlP5.Controller : Icon onDrag(CallbackListener) +controlP5.Controller : Icon onDraw(ControllerView) +controlP5.Controller : Icon onEndDrag(CallbackListener) +controlP5.Controller : Icon onEnter(CallbackListener) +controlP5.Controller : Icon onLeave(CallbackListener) +controlP5.Controller : Icon onMove(CallbackListener) +controlP5.Controller : Icon onPress(CallbackListener) +controlP5.Controller : Icon onRelease(CallbackListener) +controlP5.Controller : Icon onReleaseOutside(CallbackListener) +controlP5.Controller : Icon onStartDrag(CallbackListener) +controlP5.Controller : Icon onWheel(CallbackListener) +controlP5.Controller : Icon plugTo(Object) +controlP5.Controller : Icon plugTo(Object, String) +controlP5.Controller : Icon plugTo(Object[]) +controlP5.Controller : Icon plugTo(Object[], String) +controlP5.Controller : Icon registerProperty(String) +controlP5.Controller : Icon registerProperty(String, String) +controlP5.Controller : Icon registerTooltip(String) +controlP5.Controller : Icon removeBehavior() +controlP5.Controller : Icon removeCallback() +controlP5.Controller : Icon removeCallback(CallbackListener) +controlP5.Controller : Icon removeListener(ControlListener) +controlP5.Controller : Icon removeListenerFor(int, CallbackListener) +controlP5.Controller : Icon removeListenersFor(int) +controlP5.Controller : Icon removeProperty(String) +controlP5.Controller : Icon removeProperty(String, String) +controlP5.Controller : Icon setArrayValue(float[]) +controlP5.Controller : Icon setArrayValue(int, float) +controlP5.Controller : Icon setBehavior(ControlBehavior) +controlP5.Controller : Icon setBroadcast(boolean) +controlP5.Controller : Icon setCaptionLabel(String) +controlP5.Controller : Icon setColor(CColor) +controlP5.Controller : Icon setColorActive(int) +controlP5.Controller : Icon setColorBackground(int) +controlP5.Controller : Icon setColorCaptionLabel(int) +controlP5.Controller : Icon setColorForeground(int) +controlP5.Controller : Icon setColorLabel(int) +controlP5.Controller : Icon setColorValue(int) +controlP5.Controller : Icon setColorValueLabel(int) +controlP5.Controller : Icon setDecimalPrecision(int) +controlP5.Controller : Icon setDefaultValue(float) +controlP5.Controller : Icon setHeight(int) +controlP5.Controller : Icon setId(int) +controlP5.Controller : Icon setImage(PImage) +controlP5.Controller : Icon setImage(PImage, int) +controlP5.Controller : Icon setImages(PImage, PImage, PImage) +controlP5.Controller : Icon setImages(PImage, PImage, PImage, PImage) +controlP5.Controller : Icon setLabel(String) +controlP5.Controller : Icon setLabelVisible(boolean) +controlP5.Controller : Icon setLock(boolean) +controlP5.Controller : Icon setMax(float) +controlP5.Controller : Icon setMin(float) +controlP5.Controller : Icon setMouseOver(boolean) +controlP5.Controller : Icon setMoveable(boolean) +controlP5.Controller : Icon setPosition(float, float) +controlP5.Controller : Icon setPosition(float[]) +controlP5.Controller : Icon setSize(PImage) +controlP5.Controller : Icon setSize(int, int) +controlP5.Controller : Icon setStringValue(String) +controlP5.Controller : Icon setUpdate(boolean) +controlP5.Controller : Icon setValue(float) +controlP5.Controller : Icon setValueLabel(String) +controlP5.Controller : Icon setValueSelf(float) +controlP5.Controller : Icon setView(ControllerView) +controlP5.Controller : Icon setVisible(boolean) +controlP5.Controller : Icon setWidth(int) +controlP5.Controller : Icon show() +controlP5.Controller : Icon unlock() +controlP5.Controller : Icon unplugFrom(Object) +controlP5.Controller : Icon unplugFrom(Object[]) +controlP5.Controller : Icon unregisterTooltip() +controlP5.Controller : Icon update() +controlP5.Controller : Icon updateSize() +controlP5.Controller : Label getCaptionLabel() +controlP5.Controller : Label getValueLabel() +controlP5.Controller : List getControllerPlugList() +controlP5.Controller : Pointer getPointer() +controlP5.Controller : String getAddress() +controlP5.Controller : String getInfo() +controlP5.Controller : String getName() +controlP5.Controller : String getStringValue() +controlP5.Controller : String toString() +controlP5.Controller : Tab getTab() +controlP5.Controller : boolean isActive() +controlP5.Controller : boolean isBroadcast() +controlP5.Controller : boolean isInside() +controlP5.Controller : boolean isLabelVisible() +controlP5.Controller : boolean isListening() +controlP5.Controller : boolean isLock() +controlP5.Controller : boolean isMouseOver() +controlP5.Controller : boolean isMousePressed() +controlP5.Controller : boolean isMoveable() +controlP5.Controller : boolean isUpdate() +controlP5.Controller : boolean isVisible() +controlP5.Controller : float getArrayValue(int) +controlP5.Controller : float getDefaultValue() +controlP5.Controller : float getMax() +controlP5.Controller : float getMin() +controlP5.Controller : float getValue() +controlP5.Controller : float[] getAbsolutePosition() +controlP5.Controller : float[] getArrayValue() +controlP5.Controller : float[] getPosition() +controlP5.Controller : int getDecimalPrecision() +controlP5.Controller : int getHeight() +controlP5.Controller : int getId() +controlP5.Controller : int getWidth() +controlP5.Controller : int listenerSize() +controlP5.Controller : void remove() +controlP5.Controller : void setView(ControllerView, int) +controlP5.Icon : Icon activateBy(int) +controlP5.Icon : Icon hideBackground() +controlP5.Icon : Icon setFill(boolean) +controlP5.Icon : Icon setFont(PFont) +controlP5.Icon : Icon setFont(PFont, int) +controlP5.Icon : Icon setFontIcon(int) +controlP5.Icon : Icon setFontIcon(int, int) +controlP5.Icon : Icon setFontIconOff(int) +controlP5.Icon : Icon setFontIconOn(int) +controlP5.Icon : Icon setFontIconSize(int) +controlP5.Icon : Icon setFontIcons(int, int) +controlP5.Icon : Icon setFontIndex(int) +controlP5.Icon : Icon setOff() +controlP5.Icon : Icon setOn() +controlP5.Icon : Icon setRoundedCorners(int) +controlP5.Icon : Icon setScale(float, float) +controlP5.Icon : Icon setStroke(boolean) +controlP5.Icon : Icon setStrokeWeight(float) +controlP5.Icon : Icon setSwitch(boolean) +controlP5.Icon : Icon setValue(float) +controlP5.Icon : Icon showBackground() +controlP5.Icon : Icon update() +controlP5.Icon : String getInfo() +controlP5.Icon : String toString() +controlP5.Icon : boolean getBooleanValue() +controlP5.Icon : boolean isOn() +controlP5.Icon : boolean isPressed() +controlP5.Icon : boolean isSwitch() +controlP5.Icon : int getFontIcon(int) +java.lang.Object : String toString() +java.lang.Object : boolean equals(Object) + +created: 2014/09/08 01:19:01 + +*/ + + diff --git a/examples/controllers/ControlP5icon/fontawesome-webfont.ttf b/examples/controllers/ControlP5icon/fontawesome-webfont.ttf new file mode 100644 index 0000000..96a3639 Binary files /dev/null and b/examples/controllers/ControlP5icon/fontawesome-webfont.ttf differ diff --git a/examples/controllers/ControlP5knob/ControlP5knob.pde b/examples/controllers/ControlP5knob/ControlP5knob.pde index 8d759cc..700a635 100644 --- a/examples/controllers/ControlP5knob/ControlP5knob.pde +++ b/examples/controllers/ControlP5knob/ControlP5knob.pde @@ -253,7 +253,7 @@ controlP5.Knob : int getViewStyle() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:45 +created: 2014/09/08 01:19:02 */ diff --git a/examples/controllers/ControlP5listBox/ControlP5listBox.pde b/examples/controllers/ControlP5listBox/ControlP5listBox.pde index 0ff5110..1d5388f 100644 --- a/examples/controllers/ControlP5listBox/ControlP5listBox.pde +++ b/examples/controllers/ControlP5listBox/ControlP5listBox.pde @@ -1,4 +1,7 @@ /** +* +* DEPRECATED, use ScrollableList instead. +* * ControlP5 ListBox * * find a list of public methods available for the ListBox Controller @@ -6,8 +9,6 @@ * use the scrollwheel, up or down cursors to scroll through * a listbox when hovering with the mouse. * -* DEPRECATED, use ScrollableList instead. -* * by Andreas Schlegel, 2012 * www.sojamo.de/libraries/controlp5 * @@ -311,7 +312,7 @@ controlP5.ListBox : void updateItemIndexOffset() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:47 +created: 2014/09/08 01:19:04 */ diff --git a/examples/controllers/ControlP5matrix/ControlP5matrix.pde b/examples/controllers/ControlP5matrix/ControlP5matrix.pde index 61008ea..1f2c2e8 100644 --- a/examples/controllers/ControlP5matrix/ControlP5matrix.pde +++ b/examples/controllers/ControlP5matrix/ControlP5matrix.pde @@ -289,7 +289,7 @@ controlP5.Matrix : void remove() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:48 +created: 2014/09/08 01:19:06 */ diff --git a/examples/controllers/ControlP5numberbox/ControlP5numberbox.pde b/examples/controllers/ControlP5numberbox/ControlP5numberbox.pde index 8383b59..4ebe7c4 100644 --- a/examples/controllers/ControlP5numberbox/ControlP5numberbox.pde +++ b/examples/controllers/ControlP5numberbox/ControlP5numberbox.pde @@ -25,15 +25,15 @@ void setup() { cp5.addNumberbox("numberbox") .setPosition(100,160) - .setSize(100,14) + .setSize(100,20) .setScrollSensitivity(1.1) .setValue(50) ; cp5.addNumberbox("numberboxValue") - .setPosition(100,200) - .setSize(100,14) + .setPosition(100,220) + .setSize(100,20) .setRange(0,200) .setMultiplier(0.1) // set the sensitifity of the numberbox .setDirection(Controller.HORIZONTAL) // change the control direction to left/right @@ -207,7 +207,7 @@ controlP5.Numberbox : float getMultiplier() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:52 +created: 2014/09/08 01:19:09 */ diff --git a/examples/controllers/ControlP5radioButton/ControlP5radioButton.pde b/examples/controllers/ControlP5radioButton/ControlP5radioButton.pde index 848554d..dd8a23b 100644 --- a/examples/controllers/ControlP5radioButton/ControlP5radioButton.pde +++ b/examples/controllers/ControlP5radioButton/ControlP5radioButton.pde @@ -231,7 +231,7 @@ controlP5.RadioButton : void updateLayout() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:53 +created: 2014/09/08 01:19:11 */ diff --git a/examples/controllers/ControlP5range/ControlP5range.pde b/examples/controllers/ControlP5range/ControlP5range.pde index 841e556..e2be638 100644 --- a/examples/controllers/ControlP5range/ControlP5range.pde +++ b/examples/controllers/ControlP5range/ControlP5range.pde @@ -237,7 +237,7 @@ controlP5.Range : float[] getArrayValue() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:55 +created: 2014/09/08 01:19:12 */ diff --git a/examples/controllers/ControlP5scrollableList/ControlP5scrollableList.pde b/examples/controllers/ControlP5scrollableList/ControlP5scrollableList.pde index 44d66ca..2c5282f 100644 --- a/examples/controllers/ControlP5scrollableList/ControlP5scrollableList.pde +++ b/examples/controllers/ControlP5scrollableList/ControlP5scrollableList.pde @@ -254,7 +254,7 @@ controlP5.ScrollableList : void updateItemIndexOffset() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:57 +created: 2014/09/08 01:19:14 */ diff --git a/examples/controllers/ControlP5slider/ControlP5slider.pde b/examples/controllers/ControlP5slider/ControlP5slider.pde index 7a83644..275e17e 100644 --- a/examples/controllers/ControlP5slider/ControlP5slider.pde +++ b/examples/controllers/ControlP5slider/ControlP5slider.pde @@ -290,7 +290,7 @@ controlP5.Slider : int getTriggerEvent() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:11:58 +created: 2014/09/08 01:19:16 */ diff --git a/examples/controllers/ControlP5slider2D/ControlP5slider2D.pde b/examples/controllers/ControlP5slider2D/ControlP5slider2D.pde index 5dbc574..da9d113 100644 --- a/examples/controllers/ControlP5slider2D/ControlP5slider2D.pde +++ b/examples/controllers/ControlP5slider2D/ControlP5slider2D.pde @@ -22,7 +22,8 @@ void setup() { s = cp5.addSlider2D("wave") .setPosition(30,40) .setSize(100,100) - .setArrayValue(new float[] {50, 50}) + .setMinMax(20,10,100,100) + .setValue(50,50) //.disableCrosshair() ; @@ -211,9 +212,11 @@ controlP5.Slider2D : Slider2D setCursorX(float) controlP5.Slider2D : Slider2D setCursorY(float) controlP5.Slider2D : Slider2D setMaxX(float) controlP5.Slider2D : Slider2D setMaxY(float) +controlP5.Slider2D : Slider2D setMinMax(float, float, float, float) controlP5.Slider2D : Slider2D setMinX(float) controlP5.Slider2D : Slider2D setMinY(float) controlP5.Slider2D : Slider2D setValue(float) +controlP5.Slider2D : Slider2D setValue(float, float) controlP5.Slider2D : Slider2D shuffle() controlP5.Slider2D : float getCursorHeight() controlP5.Slider2D : float getCursorWidth() @@ -228,7 +231,7 @@ controlP5.Slider2D : void setValueLabelSeparator(String) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:12:00 +created: 2014/09/08 01:19:18 */ diff --git a/examples/controllers/ControlP5tab/ControlP5tab.pde b/examples/controllers/ControlP5tab/ControlP5tab.pde index 72508da..a17f582 100644 --- a/examples/controllers/ControlP5tab/ControlP5tab.pde +++ b/examples/controllers/ControlP5tab/ControlP5tab.pde @@ -229,7 +229,7 @@ controlP5.Tab : float getValue() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:12:02 +created: 2014/09/08 01:19:19 */ diff --git a/examples/controllers/ControlP5textarea/ControlP5textarea.pde b/examples/controllers/ControlP5textarea/ControlP5textarea.pde index b2c9da8..eb349af 100644 --- a/examples/controllers/ControlP5textarea/ControlP5textarea.pde +++ b/examples/controllers/ControlP5textarea/ControlP5textarea.pde @@ -222,7 +222,7 @@ controlP5.Textarea : void controlEvent(ControlEvent) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:12:04 +created: 2014/09/08 01:19:21 */ diff --git a/examples/controllers/ControlP5textfield/ControlP5textfield.pde b/examples/controllers/ControlP5textfield/ControlP5textfield.pde index 75ac4ef..86e37f9 100644 --- a/examples/controllers/ControlP5textfield/ControlP5textfield.pde +++ b/examples/controllers/ControlP5textfield/ControlP5textfield.pde @@ -250,7 +250,7 @@ controlP5.Textfield : void keyEvent(KeyEvent) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:12:05 +created: 2014/09/08 01:19:23 */ diff --git a/examples/controllers/ControlP5textlabel/ControlP5Textlabel.pde b/examples/controllers/ControlP5textlabel/ControlP5Textlabel.pde index 65db9fc..c4e61ac 100644 --- a/examples/controllers/ControlP5textlabel/ControlP5Textlabel.pde +++ b/examples/controllers/ControlP5textlabel/ControlP5Textlabel.pde @@ -204,7 +204,7 @@ controlP5.Textlabel : void draw(int, int) java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:12:07 +created: 2014/09/08 01:19:24 */ diff --git a/examples/controllers/ControlP5toggle/ControlP5toggle.pde b/examples/controllers/ControlP5toggle/ControlP5toggle.pde index 5b55c38..630acac 100644 --- a/examples/controllers/ControlP5toggle/ControlP5toggle.pde +++ b/examples/controllers/ControlP5toggle/ControlP5toggle.pde @@ -226,11 +226,12 @@ controlP5.Toggle : Toggle setValue(boolean) controlP5.Toggle : Toggle setValue(float) controlP5.Toggle : Toggle toggle() controlP5.Toggle : Toggle update() +controlP5.Toggle : boolean getBooleanValue() controlP5.Toggle : boolean getState() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:12:08 +created: 2014/09/08 01:19:26 */ diff --git a/examples/controllers/ControlP5tooltip/ControlP5tooltip.pde b/examples/controllers/ControlP5tooltip/ControlP5tooltip.pde index fecb295..74ca904 100644 --- a/examples/controllers/ControlP5tooltip/ControlP5tooltip.pde +++ b/examples/controllers/ControlP5tooltip/ControlP5tooltip.pde @@ -1,6 +1,8 @@ /** * ControlP5 Tooltip * +* Broken with version 2.2.1+ +* * add a tooltip to a controller. * hover your mouse on top of a slider in the example and wait * for 1 second for the tooltip to appear. @@ -107,7 +109,7 @@ controlP5.Tooltip : int getWidth() java.lang.Object : String toString() java.lang.Object : boolean equals(Object) -created: 2014/08/16 19:12:10 +created: 2014/09/08 01:19:27 */ diff --git a/examples/experimental/ControlP5SliderList/ControlP5SliderList.pde b/examples/experimental/ControlP5SliderList/ControlP5SliderList.pde index 5413cfb..88b7536 100644 --- a/examples/experimental/ControlP5SliderList/ControlP5SliderList.pde +++ b/examples/experimental/ControlP5SliderList/ControlP5SliderList.pde @@ -26,7 +26,7 @@ float[] rotation = new float[NUM]; void setup() { - size(800, 500 ,P3D); + size(800, 400 ,P3D); f1 = createFont("Helvetica", 12); cp5 = new ControlP5( this ); @@ -37,7 +37,7 @@ void setup() { SilderList m = new SilderList( cp5, "menu", 250, 350 ); - m.setPosition(40, 40); + m.setPosition(40, 20); // add some items to our SilderList for (int i=0;i