15 Commits

Author SHA1 Message Date
Tom Schofield
bc19757de2 merge local master 2012-02-20 12:37:44 +00:00
Tom Schofield
71e3a9a1db added image loading and display results stuff- changes all commented in code 2012-02-19 16:42:55 +00: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
dviid
b5a713dcf9 Chained analysis 2012-02-11 18:54:46 +01:00
dviid
aba336b04d readme 2012-01-24 16:58:28 +01:00
dviid
b3e8415fcd merge Tom files 2012-01-24 16:52:22 +01:00
dviid
7123b1b386 haha commit! 2012-01-24 15:13:07 +01:00