31 Commits

Author SHA1 Message Date
dviid
e29accb9ce fixed file ordering 2012-04-09 13:35:16 +02:00
dviid
7d7ec3606e mode <drawing, analysing> + drawing mode file chooser
make sure you add the config.refindx to your environment
2012-04-06 18:46:38 +02:00
Jamie Allen
e43b78cc5a Revert 884e55abd48d4efa0c6bfe06469e7b1abea51c14^..HEAD 2012-03-02 01:01:53 +00:00
dviid
d31fd93932 merge tom's grayscale saving code 2012-02-29 10:58:59 +01:00
Jamie Allen
ebe29d2c8a sorry - this is the actual possible windows fix... get this one TOM! 2012-02-27 20:28:33 +01:00
Jamie Allen
86769bfc5f possible Windows saving greyscale fix (convert to COLOR before saving) 2012-02-27 20:23:08 +01:00
Jamie Allen
1f23d167c2 converting cv images properly (thanks Tom) and possible fix for Windows saving of greyscale images
cvColorImage1.convertToGrayscalePlanarImage(cvGrayImage1, 1);

cvColorImage2.convertToGrayscalePlanarImage(cvGrayImage2, 1);
2012-02-27 20:08:54 +01:00
Jamie Allen
81f37f8274 just added some comments to our windows save-out issue... this has david's new RelaxRate code 2012-02-27 19:34:07 +01:00
Jamie Allen
476ab8cfd9 Revert "Revert "Revert 7da4b4b47a01c19f5059bea111c2edb7c2ddefd8^..HEAD""
This reverts commit f10aeefaef714547fd6baab1b67321187853df3c.
2012-02-27 19:17:18 +01:00
Jamie Allen
f10aeefaef Revert "Revert 7da4b4b47a01c19f5059bea111c2edb7c2ddefd8^..HEAD"
This reverts commit cd49615cfc50e554847ffb8a31269fd5a82c7171.
2012-02-27 18:50:12 +01:00
Jamie Allen
cd49615cfc Revert 7da4b4b47a01c19f5059bea111c2edb7c2ddefd8^..HEAD 2012-02-27 18:47:40 +01:00
Jamie Allen
7da4b4b47a #ifdef back in 2012-02-27 03:11:26 +01:00
Jamie Allen
7cd4da7341 cleaned up the windows code there were some mistakes
had to comment out the #ifdef TARGET_OSX   for a bit to see that there
were some windows errors - think i got all of them... have a look Tom
2012-02-27 03:06:40 +01:00
Jamie Allen
5d48d6ef6a small fix - analysis and synthesis were writing to the same folder - better now 2012-02-27 02:46:18 +01:00
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
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
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
dviid
3c13d95bc4 key input controls 2012-02-21 21:18:25 +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
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
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
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
b5a713dcf9 Chained analysis 2012-02-11 18:54:46 +01:00
dviid
7123b1b386 haha commit! 2012-01-24 15:13:07 +01:00