From c3682e9873a4e9a5518f2734373b12e3b6d11e45 Mon Sep 17 00:00:00 2001
From: tim <tim@eclectronics.org>
Date: Wed, 22 Mar 2017 01:10:57 +0000
Subject: text progress

---
 menuApp/src/ofApp.cpp | 19 +++++++++++++++++--
 menuApp/src/ofApp.h   |  9 +--------
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'menuApp/src')

diff --git a/menuApp/src/ofApp.cpp b/menuApp/src/ofApp.cpp
index 1617251..b1da2ff 100644
--- a/menuApp/src/ofApp.cpp
+++ b/menuApp/src/ofApp.cpp
@@ -35,7 +35,7 @@ void ofApp::loadimages(){
 void ofApp::setup(){
 
 	
-	ofTrueTypeFont::setGlobalDpi(72);
+	ofTrueTypeFont::setGlobalDpi(180);
 
 	type14.load("American Typewriter Regular.ttf", 14*FACTOR, true, true);
 	type14.setLineHeight(18.0f*FACTOR);
@@ -125,7 +125,22 @@ ofPopMatrix(); //Restore the coordinate system
             	int imgx=(colinitialoffset+(col*coloffset))*FACTOR;
             	int imgy=(rowinitialoffset+(row*rowoffset))*FACTOR;
                 images[i].draw(imgx,imgy,imgsize*FACTOR,imgsize*FACTOR);
-                type14.drawString(instagram.getImageCaption()[i],imgx+(textrowinset*FACTOR), imgy+(textcolinset*FACTOR));
+                std::string caption=instagram.getImageCaption()[i];
+                int captionend = caption.find("#");
+                if (captionend == std::string::npos){
+                	captionend=caption.size();
+                }
+                float width=type14.stringWidth(caption.substr(0,captionend));
+                ofLog(OF_LOG_NOTICE) << caption.substr(0,captionend) << " <<<<:width: " << width;
+
+                vector<std::string> captions = ofSplitString(caption.substr(0,captionend), " ");
+
+                if (width<imgsize){
+                	captions.push_back(caption.substr(0,captionend));
+                }
+
+
+                type14.drawString(caption.substr(0,captionend),imgx+(textrowinset*FACTOR), imgy+((imgsize+textcolinset)*FACTOR));
             }
             col++;
             if (col==cols){
diff --git a/menuApp/src/ofApp.h b/menuApp/src/ofApp.h
index 6f44db5..ceafb00 100644
--- a/menuApp/src/ofApp.h
+++ b/menuApp/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofxThreadedImageLoader.h"
 
 #define IMAGE_SLOTS 5
-#define FACTOR 1.0
+#define FACTOR 0.9
 
 class ofApp : public ofBaseApp{
 	
@@ -28,13 +28,6 @@ class ofApp : public ofBaseApp{
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
 		void exit();
-		
-		ofImage bikers;
-		ofImage gears;
-		ofImage tdf;
-		ofImage tdfSmall;
-		ofImage transparency;
-		ofImage bikeIcon;
 
 		ofImage background;
 		ofImage overlay;
-- 
cgit v1.2.3