Jamie Allen
e43b78cc5a
Revert 884e55abd48d4efa0c6bfe06469e7b1abea51c14^..HEAD
2012-03-02 01:01:53 +00:00
dviid
884e55abd4
MAXBLOBS RelaxRate
2012-03-01 08:52:32 +01:00
dviid
46d02b4166
running app for edinburgh
...
Tom please test :-)
2012-03-01 07:31:59 +01:00
Jamie Allen
a0483636ac
Revert "Revert ebe29d2c8a6544abf5acd8d94be130ec02748f34^..HEAD"
...
This reverts commit b39f191936473ddc46ca9aa1cc596ea112e22dd8.
2012-03-01 00:30:40 +01:00
Jamie Allen
b39f191936
Revert ebe29d2c8a6544abf5acd8d94be130ec02748f34^..HEAD
2012-03-01 00:21:14 +01:00
dviid
7d4f7ec18c
fixed the zoom problem
2012-02-29 11:11:28 +01: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
dviid
0d62dbd135
readme fixes
2012-02-27 19:43:19 +01:00
dviid
c653d96c77
new readme with proper deps
2012-02-27 19:42:37 +01:00
dviid
5693046ad9
fix exit procedure
2012-02-27 19:39:57 +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
dviid
ff7d3b6476
relaxrate new contour synthesis
...
added a rficv folder where we can change ofxcv as needed
2012-02-27 19:26:21 +01:00
Jamie Allen
7b8dcd0940
commit prior to trying to revert to david's branches
2012-02-27 19:26:11 +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
dviid
3b9bdde619
relaxrate new contour synthesis
...
added a rficv folder where we can change ofxcv as needed
2012-02-27 18:14:36 +01:00
dviid
25a423f4ea
working on RelaxRate
2012-02-27 16:06:37 +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
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
