From 3418dd0859106791d5534c53b901c2be4ea6b4c4 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Fri, 15 Dec 2017 09:24:22 +0000 Subject: better paths --- gui/src/chainImageSet.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'gui/src/chainImageSet.cpp') diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp index 8f73013..65ea5f9 100644 --- a/gui/src/chainImageSet.cpp +++ b/gui/src/chainImageSet.cpp @@ -194,17 +194,24 @@ void chainImageSet::drawGui(int x,int y,bool is_selected){ glPopMatrix(); } + + //DRAW PATH PREVIEW glPushMatrix(); - ofSetColor(255,0,255); + if (((*ii)->linked)->link==(*currentImage)->link){ //seems like cheating + ofSetColor(0,255,0); + } + else { + ofSetColor(255,255,255); + } glTranslatef(t_xoffs+borderwidth+thumbx,borderwidth+thumby,0); //this gets us to the middle of the image - ofDrawRectangle(-5,-5,10,10); + //ofDrawRectangle(-2,-2,4,4); - ofSetLineWidth(5); + ofSetLineWidth(2); float pathscale=thumbscale/(((*ii)->linked)->linkScale); @@ -218,9 +225,18 @@ void chainImageSet::drawGui(int x,int y,bool is_selected){ glTranslatef(-start.x,-start.y,0); ((*ii)->linked)->path.draw(); + if (((*ii)->linked)->link==(*currentImage)->link){ //seems like cheating + ofPoint currentpos=((*ii)->linked)->getPathPoint(); + glTranslatef(currentpos.x,currentpos.y,0); + ofSetColor(255,255,255); + ofDrawRectangle(-2,-2,4,4); + } + ofSetLineWidth(1); glPopMatrix(); + + //jump to next image t_xoffs+=(*ii)->thumbnail.getWidth()+(borderwidth*2); -- cgit v1.2.3