threading not finished

1 files changed, 2 insertions, 56 deletions

diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h
index 66b2dbf..30a1cd2 100644
--- a/gui/src/chainImage.h
+++ b/gui/src/chainImage.h
@@ -2,7 +2,6 @@
 
 #include "ofMain.h"
 #include "ofxJSON.h"
-#include "ofxThreadedImageLoader.h"
 
 #define THUMB_BORDER_RATIO 0.8
 #define THUMB_SIZE 160
@@ -24,7 +23,7 @@ class chainImage : public ofImage{
 		}
 		void init(ofPoint _linkPos,float _linkScale,float _linkRot);
 
-		void start(bool reverse);
+		void start(bool reverse=false);
 		bool load(std::string _filename){
 			filename=_filename;
 			if (ofImage::load(filename)){
@@ -39,7 +38,7 @@ class chainImage : public ofImage{
 			return false;
 		}
 
-		int update(float decayRatio);
+		int updateOutput(float decayRatio);
 		ofVec3f getTransform();
 		float getScale();
 		float getRotation();
@@ -71,56 +70,3 @@ class chainImage : public ofImage{
 
 };
 
-class chainImageSet{
-	public:
-		chainImageSet(){
-			currentDefaultImageRatio=0.3;
-			filename="";
-			outputSize=ofPoint(1024,576);
-			decayFactor=.999;
-			additive=false;
-			intensity=1.0f;
-			fitFactor=0.9f;
-			dragScale=0.0f;
-			dragRotate=0.0f;
-			dragPoint=ofPoint(0,0);
-		}
-		chainImageSet(const chainImageSet& mom){
-			chainImageSet();
-		}
-		void drawGui(int x,int y,bool is_selected);
-		void drawOutput();
-		void update();
-		bool add(std::string filename,glm::vec2 pos);
-		void keyPressed(ofKeyEventArgs &keyargs);
-		void mouseDragged(int x, int y, int button);
-		void mousePressed(int x, int y, int button);
-		void mouseReleased(int x, int y, int button);
-
-		bool saveJson(std::string filename);
-		bool loadJson(std::string filename);
-
-		ofPoint outputSize;
-
-		std::list <chainImage> images;
-
-		float currentDefaultImageRatio;
-
-		std::list<chainImage>::iterator selected;
-		ofPoint clickPoint;
-		ofPoint dragPoint;
-		float dragScale;
-		float dragRotate;
-		float fitFactor;
-
-		std::string filename;
-
-		chainImage *currentImage;
-
-		float decayFactor;
-
-		bool additive;
-		float intensity;
-
-		ofxThreadedImageLoader loader;
-};
\ No newline at end of file