Under construction.

	modified:   hostdepend/X86MAC64/src/Tools/rec3d/marker2Dto3DEstimator/src/X86MAC64/marker2Dto3DEstimator
	modified:   src/Tools/rec3d/marker2Dto3DEstimator/Config/OptionControlFile
	modified:   src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c

diff --git a/hostdepend/X86MAC64/src/Tools/rec3d/marker2Dto3DEstimator/src/X86MAC64/marker2Dto3DEstimator b/hostdepend/X86MAC64/src/Tools/rec3d/marker2Dto3DEstimator/src/X86MAC64/marker2Dto3DEstimator
index b89303b..41e8c62 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/rec3d/marker2Dto3DEstimator/src/X86MAC64/marker2Dto3DEstimator and b/hostdepend/X86MAC64/src/Tools/rec3d/marker2Dto3DEstimator/src/X86MAC64/marker2Dto3DEstimator differ

diff --git a/src/Tools/rec3d/marker2Dto3DEstimator/Config/OptionControlFile b/src/Tools/rec3d/marker2Dto3DEstimator/Config/OptionControlFile
index c6865ae..431e9bb 100755 (executable)
--- a/src/Tools/rec3d/marker2Dto3DEstimator/Config/OptionControlFile
+++ b/src/Tools/rec3d/marker2Dto3DEstimator/Config/OptionControlFile
@@ -5,5 +5,6 @@
 "-o","-o[utput]","Output: ","Essential","1","1","Out","outFileList::ASCII","NULL"
 "-ot","-o[utput]t[ype]","Input: ","Optional","1","1","OutType","Integer","2"
 "-oEA","-o[utput]EA","Output: ","Essential","1","1","OutEA","outFileList::ASCII","NULL"
+"-zero","-zero","Zero Plane","Optional","1","1","ZeroPlane","Integer","0"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"

diff --git a/src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c b/src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
index e2eebd9..421b395 100755 (executable)
--- a/src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
+++ b/src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.c
@@ -28,7 +28,7 @@ typedef struct lmarker2Dto3DEstimatorInfo {
        EulerAngleInfo* EAListInit;
        Matrix3D*       matListInit; 
        int                             flagSigmaIn;
-
+       int                             zeroPlane;
        // Control
 
        // Output
@@ -46,6 +46,8 @@ typedef enum lmarker2Dto3DEstimatorMode {
 } lmarker2Dto3DEstimatorMode;
 */
 
+extern void lmarker2Dto3DEstimator(lmarker2Dto3DEstimatorInfo* linfo, int mode);
+
 int
 main(int argc, char* argv[]) 
 {
@@ -83,12 +85,11 @@ main(int argc, char* argv[])
                        linfo.EAListInit[i].Rot3, MATRIX_3D_MODE_INITIALIZE);
        }
 
-
-
+       lmarker2Dto3DEstimator(&linfo, info.mode);
 
        // Write final parameters
        if(info.flagOut) {
-               for(i=0; i<info.flagOutList; i++) {
+               for(i=0; i<info.flagOut; i++) {
                        eosPointWrite(info.fptOut[i], &(linfo.pList3D[i]), info.OutType);
                }
        }
@@ -101,3 +102,12 @@ additionalUsage()
 {
        fprintf(stderr, "----- Additional Usage -----\n");
 }
+
+
+void
+lmarker2Dto3DEstimator(lmarker2Dto3DEstimatorInfo* linfo, int mode)
+{
+
+       
+
+}