comparison presetManager.h @ 12:af71bf84660f

icon stuff. not working/tested.

 #include "ofxiPhone.h"
 #include "ofxiPhoneExtras.h"
 #include "eventLogger.h"
 #include "json.h"
 #include <ctime>
-
+#include "PresetView.h"
 
 //---------------------------------------------------------------------------
 class Preset{
 public:
     // important details - these saved to file (uploaded?)

     unsigned int    creatorDeviceID; // unique user device ID
     string          name; // name of preset
     unsigned long long       creationTime; // datetime that preset was created milliseconds
     string imageFileName;
     vector<int> CCValues; // the actual data
-    ofImage presetImage;
     bool isFilled;
-    
+    PresetIconView* iconView;
     // from save button press
-    Preset(vector<int> aCCValues, string aname, int aID, string un, unsigned int uid, string imageFile = ""){
+    Preset(vector<int> aCCValues,
+           string aname,
+           int aID,
+           string un,
+           unsigned int uid,
+           string imageFile = ""){
         CCValues = aCCValues;
         if (CCValues.size()){
             isFilled = true;
             
         }else{

 
         cout << "Create preset sys time: " << creationTime << "\n";
         
         //TODO color / texture?
         imageFileName = imageFile;
-        if (imageFile != ""){
-            presetImage.loadImage("Images/" + imageFile);
+        if (imageFileName != ""){
+            iconView = new PresetIconView(name, imageFileName);
         }
 
     };
     // contruct from json value
     Preset(Json::Value jval){

         {
             CCValues.push_back(JArray[i].asInt());
         }
         
         if (imageFileName != ""){
-            presetImage.loadImage(imageFileName);
+            iconView = new PresetIconView(name, imageFileName);
         }
 
+
     }
-    
-    void draw();
+
+    ofImage* getImage(){
+        return iconView->getImage();
+    }
     Json::Value presetToJson();
  
     string displayTextDescription(){ // eg: for grid hover
         // objC to C to C++ bleurgh
         NSDate *ocdate = [NSDate dateWithTimeIntervalSinceReferenceDate:(NSTimeInterval)(creationTime/1000.0)];