scaling in gui

1 files changed, 13 insertions, 14 deletions

diff --git a/gui/src/chainImage.cpp b/gui/src/chainImage.cpp
index 9a759eb..915071a 100644
--- a/gui/src/chainImage.cpp
+++ b/gui/src/chainImage.cpp
@@ -2,7 +2,6 @@
 
 #define min(a,b) ((a) < (b) ? (a) : (b))
 #define max(a,b) ((a) > (b) ? (a) : (b))
-#define distance(a,b) 
 
 float distance(ofPoint p1,ofPoint p2){
 	return pow(pow(p1.x-p2.x,2)+pow(p1.y-p2.y,2),0.5);
@@ -76,7 +75,7 @@ void chainImage::drawChain(float fadeIn){
 
 	glTranslatef(linkPos.x,linkPos.y,0);
 
-	glScalef(linkScale,linkScale,_linkScale);
+	glScalef(linkScale,linkScale,linkScale);
 
 	ofEnableAlphaBlending(); 
 	 
@@ -148,28 +147,28 @@ void chainImageSet::drawGui(){
 
 			float thescale=ii->linkScale;
 			if (ii==selected){
-				thescale*=dragScale;
+				thescale*=(1.0f+dragScale);
 			}
 
 			ii->link->thumbnail.draw(
 				subpictx,
 				subpicty,
-				ii->link->thumbnail.getWidth()*ii->linkScale,
-				ii->link->thumbnail.getHeight()*ii->linkScale
+				ii->link->thumbnail.getWidth()*thescale,
+				ii->link->thumbnail.getHeight()*thescale
 			);
 
 			ofPoint p1=ofPoint(
-				subpictx-(ii->link->thumbnail.getWidth()*ii->linkScale*0.5),
-				subpicty-(ii->link->thumbnail.getHeight()*ii->linkScale*0.5));
+				subpictx-(ii->link->thumbnail.getWidth()*thescale*0.5),
+				subpicty-(ii->link->thumbnail.getHeight()*thescale*0.5));
 			ofPoint p2=ofPoint(
-				subpictx+(ii->link->thumbnail.getWidth()*ii->linkScale*0.5),
-				subpicty-(ii->link->thumbnail.getHeight()*ii->linkScale*0.5));
+				subpictx+(ii->link->thumbnail.getWidth()*thescale*0.5),
+				subpicty-(ii->link->thumbnail.getHeight()*thescale*0.5));
 			ofPoint p3=ofPoint(
-				subpictx+(ii->link->thumbnail.getWidth()*ii->linkScale*0.5),
-				subpicty+(ii->link->thumbnail.getHeight()*ii->linkScale*0.5));
+				subpictx+(ii->link->thumbnail.getWidth()*thescale*0.5),
+				subpicty+(ii->link->thumbnail.getHeight()*thescale*0.5));
 			ofPoint p4=ofPoint(
-				subpictx-(ii->link->thumbnail.getWidth()*ii->linkScale*0.5),
-				subpicty+(ii->link->thumbnail.getHeight()*ii->linkScale*0.5));
+				subpictx-(ii->link->thumbnail.getWidth()*thescale*0.5),
+				subpicty+(ii->link->thumbnail.getHeight()*thescale*0.5));
 
 			ofDrawLine(p1,p2);
 			ofDrawLine(p2,p3);
@@ -273,7 +272,7 @@ void chainImageSet::mouseDragged(int x, int y, int button){
 			break;
 		case OF_MOUSE_BUTTON_3:
 			//control-click
-			dragScale=distance(clickPoint,ofPoint(x,y))/selected->getHeight();
+			dragScale=(y-clickPoint.y)/(selected->thumbnail.getHeight());
 			break;
 	}
 	}