diff options
| -rw-r--r-- | fly-tools/FlyObject.cpp | 12 | ||||
| -rw-r--r-- | fly-tools/FlyTrackingMain.cpp | 10 | ||||
| -rw-r--r-- | fly-tools/FrameInfo.cpp | 1 |
3 files changed, 2 insertions, 21 deletions
diff --git a/fly-tools/FlyObject.cpp b/fly-tools/FlyObject.cpp index d6cbee3..fa9d30e 100644 --- a/fly-tools/FlyObject.cpp +++ b/fly-tools/FlyObject.cpp @@ -10,7 +10,6 @@ #include "FlyObject.h" FlyObject::FlyObject(int area, pair<int, int> centroid, pair<double,double> majorAxisEV, pair<double,double> velocityV,bool headIsInDirectionMAEV, pair<double,double> head, double speed) { -//FlyObject::FlyObject(int area, pair<int, int> centroid, pair<double,double> majorAxisEV, pair<double,double> velocityV, vector<pair<int , int> > areaCoord) { this->area = area; this->centroid = centroid; this->majorAxisEV = majorAxisEV; @@ -18,7 +17,6 @@ FlyObject::FlyObject(int area, pair<int, int> centroid, pair<double,double> majo this->headIsInDirectionMAEV = headIsInDirectionMAEV; this->head = head; this->speed = speed; -// this->areaCoord = areaCoord; } FlyObject::FlyObject(const FlyObject &f){ @@ -26,7 +24,6 @@ FlyObject::FlyObject(const FlyObject &f){ this->centroid=f.getCentroid(); this->majorAxisEV =f.getMajorAxisEV(); this->velocityV = f.getVelocityV(); -// this->areaCoord = f.getAreaCoord(); this->headIsInDirectionMAEV = f.getHeadIsInDirectionMAEV(); this->head = f.getHead(); this->speed = f.getSpeed(); @@ -53,9 +50,6 @@ bool FlyObject::getHeadIsInDirectionMAEV() const { pair<double,double> FlyObject::getHead() const { return this->head; } -//vector<pair<int , int> > FlyObject::getAreaCoord() const { -// return this->areaCoord; -//} double FlyObject::getSpeed() const { return this->speed; } @@ -73,16 +67,12 @@ void FlyObject::setMajorAxisEV(pair<double,double> majorAxisEV) { void FlyObject::setVelocityV(pair<double,double> velocityV) { this->velocityV = velocityV; -// cout << "velocityV is set to "<<this->velocityV.first<<","<<this->velocityV.second<<endl; } void FlyObject::setHead(pair<double, double> head) { this->head = head; cout << "new head is set"<<endl; } -//void FlyObject::setAreaCoord(vector<pair<int, int> > areaCoord){ -// this->areaCoord = areaCoord; -//} void FlyObject::setSpeed(double speed) { this->speed = speed; } @@ -115,4 +105,4 @@ void FlyObject::output(ostream &out) { out<<"HeadIsInDir : "<<this->headIsInDirectionMAEV<<endl; out<<"Head : ("<<this->head.first<<","<<head.second<<endl; out<<"Speed : "<<speed<<endl; -}
\ No newline at end of file +} diff --git a/fly-tools/FlyTrackingMain.cpp b/fly-tools/FlyTrackingMain.cpp index 7f7e77e..ce8980b 100644 --- a/fly-tools/FlyTrackingMain.cpp +++ b/fly-tools/FlyTrackingMain.cpp @@ -62,6 +62,7 @@ vector<string> fnVector; string inputFileName; bool writeFinalImages = false; + // GLOBAL PATHS string maskImagePath; string origImagePath; @@ -90,7 +91,6 @@ map<unsigned int, unsigned int> centroidDistanceMap; map<unsigned int, unsigned int> headDirAngleMap; map<unsigned int, unsigned int> speedMap; -int barrier = 1000; void initSequence(){ startOfATrackSequence = -1; @@ -2815,10 +2815,6 @@ void fourConnObj(Image* img, int x, int y, vector<pair<int, int> > & obj, bool c p.second = y; obj.push_back(p); - // if (obj.size() > barrier) { - // //*output<<obj.size()<<endl; - // barrier = barrier + 1000; - // } // setting the residual image at pixel(x,y) to white. residual->pixelColor(x,y, ColorMono(true)); @@ -2860,10 +2856,6 @@ void eightConnObj(Image* img, int x, int y, vector<pair<int, int> > & obj, bool p.second = y; obj.push_back(p); - // if (obj.size() > barrier) { - // //*output<<obj.size()<<endl; - // barrier = barrier + 1000; - // } // setting the residual image at pixel(x,y) to white. residual->pixelColor(x,y, ColorMono(true)); diff --git a/fly-tools/FrameInfo.cpp b/fly-tools/FrameInfo.cpp index 4328611..c97b651 100644 --- a/fly-tools/FrameInfo.cpp +++ b/fly-tools/FrameInfo.cpp @@ -1,7 +1,6 @@ /* * FrameInfo.cpp * - * * Created by Md. Alimoor Reza on 6/26/10. * Copyright 2010 Drexel University. All rights reserved. * |