Skip to content

Commit

Permalink
fixed timelineevent graphics display
Browse files Browse the repository at this point in the history
  • Loading branch information
jaysonh committed Jun 29, 2021
1 parent 622d42a commit f8edabb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/com/jaysonh/dmx4artists/DMXParamOsc.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public void update()
}
}


value = map( getMovement(t), 0.0f, 1.0f, min, max ); // get the value from specific movement type
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/com/jaysonh/dmx4artists/TimelineDisplay.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public PGraphics update( Timeline timeline, int width, int height )
float xPosEnd = PApplet.map( end, 0, timeline.getDuration(), 0, this.width );

canvas.fill( 255 );
canvas.text( "addr:" + event.getFixture().getAddress(), xPosStart, (float)numEvents * eventHeight + 10 );
canvas.text( "type:" + event.getParam().getType(), xPosStart, (float)numEvents * eventHeight + 20 );

canvas.text( "fix addr:" + event.getFixture().getAddress(), xPosStart, (float)numEvents * eventHeight + 10 );
canvas.text( "type:" + event.getParam().getType() + ":" + (int)event.getParam().getValue(), xPosStart, (float)numEvents * eventHeight + 20 );
canvas.text( "channel: " + event.getParamChannel(), xPosStart, (float)numEvents * eventHeight + 30 );
canvas.fill( appRef.random( 0.0f, 255.0f ), 125.0f );
canvas.rect( xPosStart,(float)numEvents * eventHeight, xPosEnd-xPosStart, eventHeight );

Expand Down
7 changes: 7 additions & 0 deletions src/com/jaysonh/dmx4artists/TimelineEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ public void update( float parentTime )
*/
public DMXParam getParam() { return param; }

/**
* get the param channel
*
* @return The param channel of this timeline event
*/
public int getParamChannel() { return paramChannel; }

/**
* Set status to continue from previous value
* if true then the timeline event will continue,
Expand Down

0 comments on commit f8edabb

Please sign in to comment.