Commit Graph

54 Commits

Author SHA1 Message Date
Jamie Allen 7a7614d02d put in image.clear() and ofCvImage.clear() statements before allocation and after use of these
trying to solve windows (mostly) crash, which seems to stem from
"OF_WARNING: in allocate, reallocating a ofxCvImage" - hopefully this
is the one!
2012-02-27 02:41:25 +01:00
Jamie Allen 38ec4da627 ALLOCATING the saved images
* moved the synthesis saving to an abstract function called
saveImageSynthesis()
* allocating the images we're saving out in a renamed
create_dir_allocate_images()
* MAKE SURE TO PUT THE CONFIG FILE IN /data/
2012-02-26 19:12:34 +01:00
Jamie Allen 8fe367b47b RUN_NUM and analysis_time for each analysis now set in the config file 2012-02-26 18:01:30 +01:00
Jamie Allen c8de799215 added config file to the repo - this needs to go in /data/ folder 2012-02-26 17:33:59 +01:00
Jamie Allen 60e51a84f2 this code has consolidated save function in abstract analysis - un-commented the analyses so they all run - 2012-02-26 16:58:18 +01:00
dviid 44c900e060 moved save functionality to AbstractAnalysis 2012-02-26 15:28:27 +01:00
Jamie Allen 51c0098d27 windows compatibility for saving images
* the save functions for image should work on both windows and osx now
(although we might want to move the creation of these images outside
the thread later)
* params for each analysis timing in the XML config
* minor warning / bug fixes in AbstractAnalysis.cpp and
RefractiveIndex.cpp
* cleaned up the use of OF_IMAGE_COLOR/OF_IMAGE_GRAYSCALE in all
analysis classes
2012-02-23 01:22:14 +00:00
Jamie Allen 5564329916 NUM_RUN now set using XML config 2012-02-22 20:48:24 +01:00
Jamie Allen 245d67cf8f the NUM_RUN is now set using the xml config.refindx in each class 2012-02-22 19:41:16 +01:00
Jamie Allen a51a98a099 _synth_save_cnt = 0 wasn't in the acquire() loop - fixed 2012-02-22 18:35:35 +01:00
Jamie Allen fe35f843ef cvGrayDiff1 was not being generated properly in RelaxRate - fixed 2012-02-22 16:20:40 +01:00
Jamie Allen 2f0415952e _synth_save_cnt = 0; needed to be reset! 2012-02-22 16:17:24 +01:00
Jamie Allen 1117e632c6 small file saving "_" fix
basically a safety commit - the big changes were in the last one :)
2012-02-22 15:39:49 +01:00
Jamie Allen 2f2b38019e added proper looping structure - fixed up some un-initialised variables
the looping structure for RUN_NUM now occurs in AbstractAnalysis, so
that the sequencing is correct - a few related variables were not reset
- so those are fixed now too.
2012-02-22 15:36:22 +01:00
Jamie Allen 24ddd694c7 the synthesis (saving out to files) and displaying are working for all EXCEPT RelaxRateAnalysis
this code awairs:
* add (from david) of RelaxRate analysis synthesise and display
* any learning that Tom brings back from the Middlesbrough trip
tomorrow.

a pretty nice little piece of code, gents!
2012-02-22 02:09:19 +01:00
Jamie Allen 763d88b115 key presses working for all - still working on opencv imagery 2012-02-21 21:45:18 +01:00
Jamie Allen b0464c5632 added opencv images - showing but work in progress...
prior to adding david's looping and key control code
2012-02-21 21:20:58 +01:00
dviid 3c13d95bc4 key input controls 2012-02-21 21:18:25 +01:00
Jamie Allen 2903c7a969 david commit 19:31 2012-02-21 19:31:58 +01:00
Jamie Allen 117eaca232 commit for david tues 21st 17:51 2012-02-21 17:51:14 +01:00
Jamie Allen 9fd244dcc1 added openCV.h to each class 2012-02-21 17:26:16 +01:00
Jamie Allen adbe746afc removed xml shit from the main.cpp 2012-02-21 16:56:38 +01:00
Jamie Allen 5df657051d removed the xml shit in main.cpp 2012-02-21 16:48:39 +01:00
Jamie Allen 7dc3e305a8 next day still working commit 2012-02-21 12:04:49 +01:00
Jamie Allen 7bb2f2c1e1 removed a few extraneous comments 2012-02-21 02:05:47 +01:00
Jamie Allen 0cd3bca7c0 cleanups, a few comments, and cout commented out 2012-02-21 02:01:01 +01:00
Jamie Allen 78c2edc0ac couple of todos added
//TODO:  Needs to return to a black screen - not to exit...

    // i.e.: operational sequence
    //    1) starts in a black screen
    //    2) we 'start' with keypress "s" the entire set of analyses
    //    3) at any point we need to be able to restart /
stop-return-to-black / trigger each analysis individually
    //    4) should end in black screen as well
    //    5) final kill button
2012-02-21 01:50:47 +01:00
Jamie Allen 680e22ccf9 tuesday 2 AM commit -
big priorities -
* figure out why its writing so many black images
* fix the double-run that occurs when the first anlysis runs
* do something pretty with the incoming image
2012-02-21 01:39:27 +01:00
Jamie Allen 3eef15a14b added image playout for all classes 2012-02-21 01:34:24 +01:00
Jamie Allen e17a3a0d91 now able to show images in the analysis classes!!
wooo hooo!!!
2012-02-21 01:01:49 +01:00
Jamie Allen 51c71bdc15 added vid grab to IResponse 2012-02-20 20:28:12 +01:00
Jamie Allen 2bd7704f38 put the RefractiveIndex::_vidGrabber.grabFrame(); // in each class
david's solution for the black frames...
2012-02-20 20:24:25 +01:00
Jamie Allen e1e4e15529 safety commit 2012-02-20 20:10:32 +01:00
Jamie Allen b514c12a53 fixed timings so everything is on the second-basis, fixed David's flags so that each section in the classes terminates on RUN_DONE 2012-02-20 19:48:43 +01:00
Jamie Allen 12d210327b added STATE_SYNTHESISING - animation loop - for each analysis - comments needs cleaning up but they all seem to work...
NOT SURE I'M USING THE STATES CORRECTLY!?
2012-02-20 03:40:38 +01:00
Jamie Allen b045f44bf1 fixed fades and added the animation for ShadowScapesAnalysis (which will be the same for all analyses - just havne't copied it over yet)
also tried to add a key-press trigger for each analysis but wasn't able to turn off prior analyses without hanging the whole programme
2012-02-20 01:47:46 +01:00
Jamie Allen f2593aed49 tried to add a keypress function - got almost there... need to figure out how to turn off the Analyses from RefractiveIndex.cpp... without blocking 2012-02-19 23:34:48 +01:00
Jamie Allen d536774cc8 REDO of the cleanup of the save callbacks so i can put the fucking latency code in...
(git hub did something weird)
2012-02-19 23:00:34 +01:00
Jamie Allen 6395b1c0a0 Revert 85ce9c2e6729fc1cee394b46ac868e4086d476f9^..HEAD 2012-02-19 22:47:55 +01:00
Tom Schofield 7bb5734eed added image loading and display results stuff- changes all commented in code 2012-02-19 22:47:44 +01:00
Jamie Allen 85ce9c2e67 cleaned up the save_cb on all analyses 2012-02-19 21:45:28 +01:00
Jamie Allen 88fa037593 removed the saving maximum condition from each analysis class
if(_save_cnt >= NUM_SAVE_PER_RUN)  _RUN_DONE = true;
and using max_frame_cnt as the end condition for the run being finished...
not sure if this is working the way it should... need to think through the math of the frameRate/timing calculations in the setup for each class
2012-02-19 16:13:09 +01:00
Jamie Allen 2e7888f071 test commit for re-newed jamie branch on sunday 19th of feb 2012-02-19 12:55:51 +01:00
Jamie Allen aaf6ebfeb4 moved the graphics code into David's new structure
* removed unused and unneeded classes and added the ones that were
missing
* put the most recent graphics code into David's great structural org!

current issues:
* the config file is still not loading at the start of the code (only
in RefractiveIndex.cpp does it work - not in main.cpp - where the 'full
screen', etc. are set
* the analyses being called in RefractiveIndex.cpp always run the first
listed one twice - weird!
* the saving (NUM_SAVE_PER_RUN) and frame (_frame_cnt_max) conditions
are competing - can we relate them?
2012-02-18 20:45:20 +01:00
Jamie Allen 8d0dfc3626 moved the graphics code into David's new structure
* removed unused and unneeded classes and added the ones that were
missing
* put the most recent graphics code into David's great structural org!

current issues:
* the config file is still not loading at the start of the code (only
in RefractiveIndex.cpp does it work - not in main.cpp - where the 'full
screen', etc. are set
* the analyses being called in RefractiveIndex.cpp always run the first
listed one twice - weird!
* the saving (NUM_SAVE_PER_RUN) and frame (_frame_cnt_max) conditions
are competing - can we relate them?
2012-02-18 20:37:22 +01:00
dviid 7109c65d63 new arch
> sequence: acquire -> synthesise -> display results
2012-02-15 08:43:43 +01:00
dviid 65c625ad1e Revert 060dee771a9a8c7f5d6257d054e6717fa729182d^..HEAD 2012-02-15 07:58:30 +01:00
dviid dc99776508 mid-commit wrong architecture...
AAArrrgghh...
NOTE - code not work
2012-02-15 07:58:10 +01:00
dviid 060dee771a config added 2012-02-12 09:41:58 +01:00
dviid 29e4a00e08 State Machine APP with exit
> fixed #defines
> fixed ::exit(1);
2012-02-12 09:39:36 +01:00