diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/src/chainImageSet.cpp | 23 | ||||
| -rw-r--r-- | gui/src/chainImageSet.h | 2 |
2 files changed, 22 insertions, 3 deletions
diff --git a/gui/src/chainImageSet.cpp b/gui/src/chainImageSet.cpp index f27cd73..65d2ed4 100644 --- a/gui/src/chainImageSet.cpp +++ b/gui/src/chainImageSet.cpp @@ -339,6 +339,12 @@ void chainImageSet::keyPressed(ofKeyEventArgs &keyargs){ } case 'l':{ //load_chain(); + //doesn't seem to an easy way to draw a system dialog from the background thread + //loadDialog.load("Select a json preset",std::bind(&chainImageSet::loadJson, this, std::placeholders::_1)); //&chainImageSet::loadJson); + + //2017-10-29 14:07:45.615 gui[18960:9070901] -[NSView _registerWithBackdropView] should not be called off of the main thread. Invocation was here: + + ofFileDialogResult openFileResult= ofSystemLoadDialog("Select a json preset"); //Check if the user opened a file @@ -355,6 +361,7 @@ void chainImageSet::keyPressed(ofKeyEventArgs &keyargs){ }else { ofLogVerbose("User hit cancel"); } + break; } @@ -512,9 +519,19 @@ void chainImageSet::updateOutput(){ (*images.begin())->linked=&(*(*images.rbegin())); (*images.rbegin())->setUseTexture(true); - (*images.rbegin())->linkRot=(*images.rbegin())->linked->linkRot; - (*images.rbegin())->linkScale=(*images.rbegin())->linked->linkScale; - + //probably not what we want + /* + if ((*images.rbegin())->linkPos==ofPoint(0,0)){ + (*images.rbegin())->linkPos=(*images.rbegin())->linked->linkPos; + } + if ((*images.rbegin())->linkRot==0.0f){ + (*images.rbegin())->linkRot=(*images.rbegin())->linked->linkRot; + } + if ((*images.rbegin())->linkScale==ofPoint(0,0)){ + (*images.rbegin())->linkScale=(*images.rbegin())->linked->linkScale; + } + */ + printf("Linked: %s -> %s <- %s\n", (*images.rbegin())->filename.c_str(), (*images.rbegin())->link->filename.c_str(), diff --git a/gui/src/chainImageSet.h b/gui/src/chainImageSet.h index 91ac531..1cc44cd 100644 --- a/gui/src/chainImageSet.h +++ b/gui/src/chainImageSet.h @@ -2,6 +2,7 @@ #include "ofxJSON.h" #include "chainImage.h" #include "threadedChainImageLoader.h" +#include "threadedSystemDialogs.h" class chainImageSet{ @@ -72,4 +73,5 @@ class chainImageSet{ std::vector <int> loadingIndexes; threadedChainImageLoader loader; + //threadedSystemLoadDialog loadDialog; };
\ No newline at end of file |