|
@@ -2,6 +2,98 @@
|
|
|
|
|
|
#include <iostream>
|
|
#include <iostream>
|
|
|
|
|
|
|
|
+Objects_bridge::Objects_bridge(double s,double length,std::string strid,std::string strtype)
|
|
|
|
+{
|
|
|
|
+ mS = s;
|
|
|
|
+ mlength = length;
|
|
|
|
+ mstrid = strid;
|
|
|
|
+ mstrtype = strtype;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+double Objects_bridge::GetS()
|
|
|
|
+{
|
|
|
|
+ return mS;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+double Objects_bridge::Getlength()
|
|
|
|
+{
|
|
|
|
+ return mlength;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+int Objects_bridge::GetName(std::string name)
|
|
|
|
+{
|
|
|
|
+ if(mname.size() == 0)return 0;
|
|
|
|
+ name = mname[0];
|
|
|
|
+ return 1;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+std::string Objects_bridge::Getid()
|
|
|
|
+{
|
|
|
|
+ return mstrid;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+std::string Objects_bridge::Gettype()
|
|
|
|
+{
|
|
|
|
+ return mstrtype;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Objects_bridge::SetS(double s)
|
|
|
|
+{
|
|
|
|
+ mS = s;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Objects_bridge::Setlength(double length)
|
|
|
|
+{
|
|
|
|
+ mlength = length;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Objects_bridge::Setname(std::string name)
|
|
|
|
+{
|
|
|
|
+ if(mname.size() == 0)mname.clear();
|
|
|
|
+ mname.push_back(name);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Objects_bridge::Resetname()
|
|
|
|
+{
|
|
|
|
+ if(mname.size() == 0)mname.clear();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Objects_bridge::Setid(std::string id)
|
|
|
|
+{
|
|
|
|
+ mstrid = id;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Objects_bridge::Settype(std::string type)
|
|
|
|
+{
|
|
|
|
+ mstrtype = type;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+Object_laneValidity::Object_laneValidity(int fromLane,int toLane)
|
|
|
|
+{
|
|
|
|
+ mfromLane = fromLane;
|
|
|
|
+ mtoLane = toLane;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+int Object_laneValidity::GetfromLane()
|
|
|
|
+{
|
|
|
|
+ return mfromLane;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+int Object_laneValidity::GettoLane()
|
|
|
|
+{
|
|
|
|
+ return mtoLane;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Object_laneValidity::SetfromLane(int fromLane)
|
|
|
|
+{
|
|
|
|
+ mfromLane = fromLane;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Object_laneValidity::SettoLane(int toLane)
|
|
|
|
+{
|
|
|
|
+ mtoLane = toLane;
|
|
|
|
+}
|
|
|
|
+
|
|
Object_borders_border::Object_borders_border(double width,std::string borderType,int outlineid)
|
|
Object_borders_border::Object_borders_border(double width,std::string borderType,int outlineid)
|
|
{
|
|
{
|
|
mwidth = width;
|
|
mwidth = width;
|
|
@@ -81,7 +173,7 @@ Object_markings_marking_cornerReference * Object_borders_border::GetcornerRefere
|
|
|
|
|
|
unsigned int Object_borders_border::GetcornerReferenceCount()
|
|
unsigned int Object_borders_border::GetcornerReferenceCount()
|
|
{
|
|
{
|
|
- return mcornerReference.size();
|
|
|
|
|
|
+ return static_cast<unsigned int >(mcornerReference.size()) ;
|
|
}
|
|
}
|
|
|
|
|
|
Object_markings_marking_cornerReference * Object_borders_border::GetLastcornerReference()
|
|
Object_markings_marking_cornerReference * Object_borders_border::GetLastcornerReference()
|
|
@@ -92,7 +184,7 @@ Object_markings_marking_cornerReference * Object_borders_border::GetLastcornerRe
|
|
|
|
|
|
unsigned int Object_borders_border::AddcornerReference(unsigned int id)
|
|
unsigned int Object_borders_border::AddcornerReference(unsigned int id)
|
|
{
|
|
{
|
|
- unsigned int index = mcornerReference.size();
|
|
|
|
|
|
+ unsigned int index = static_cast<unsigned int>(mcornerReference.size()) ;
|
|
mcornerReference.push_back(Object_markings_marking_cornerReference(id));
|
|
mcornerReference.push_back(Object_markings_marking_cornerReference(id));
|
|
mnLastAddedcornerReference = index;
|
|
mnLastAddedcornerReference = index;
|
|
return index;
|
|
return index;
|
|
@@ -1308,6 +1400,12 @@ Object_markings * Object::Getmarkings()
|
|
return &(mObject_markings[0]);
|
|
return &(mObject_markings[0]);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+Object_borders * Object::Getborders()
|
|
|
|
+{
|
|
|
|
+ if(mObject_borders.size()<1)return NULL;
|
|
|
|
+ return &(mObject_borders[0]);
|
|
|
|
+}
|
|
|
|
+
|
|
void Object::Sett(double t)
|
|
void Object::Sett(double t)
|
|
{
|
|
{
|
|
mt = t;
|
|
mt = t;
|
|
@@ -1433,6 +1531,17 @@ void Object::Resetmarkings()
|
|
if(mObject_markings.size()>0) mObject_markings.clear();
|
|
if(mObject_markings.size()>0) mObject_markings.clear();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+void Object::Setborders(Object_borders & xObject_borders)
|
|
|
|
+{
|
|
|
|
+ if(mObject_borders.size()>0)mObject_borders.clear();
|
|
|
|
+ mObject_borders.push_back(xObject_borders);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void Object::Resetborders()
|
|
|
|
+{
|
|
|
|
+ if(mObject_borders.size()>0)mObject_borders.clear();
|
|
|
|
+}
|
|
|
|
+
|
|
vector<Object_repeat> * Object::GetObjectrepeatVector()
|
|
vector<Object_repeat> * Object::GetObjectrepeatVector()
|
|
{
|
|
{
|
|
return &mObject_repeat;
|
|
return &mObject_repeat;
|
|
@@ -1581,7 +1690,7 @@ Object_outlines_outline* Object::GetObjectoutline(unsigned int i)
|
|
}
|
|
}
|
|
unsigned int Object::GetObjectoutlineCount()
|
|
unsigned int Object::GetObjectoutlineCount()
|
|
{
|
|
{
|
|
- return mObject_outlines_outline.size();
|
|
|
|
|
|
+ return static_cast<unsigned int >(mObject_outlines_outline.size()) ;
|
|
}
|
|
}
|
|
|
|
|
|
Object_outlines_outline* Object::GetLastObjectoutline()
|
|
Object_outlines_outline* Object::GetLastObjectoutline()
|
|
@@ -1603,7 +1712,7 @@ Object_outlines_outline* Object::GetLastAddedObjectoutline()
|
|
unsigned int Object::AddObjectoutline()
|
|
unsigned int Object::AddObjectoutline()
|
|
{
|
|
{
|
|
mObject_outlines_outline.push_back(Object_outlines_outline());
|
|
mObject_outlines_outline.push_back(Object_outlines_outline());
|
|
- mLastAddedObjectoutline = mObject_outlines_outline.size()-1;
|
|
|
|
|
|
+ mLastAddedObjectoutline = static_cast<unsigned int>(mObject_outlines_outline.size()-1) ;
|
|
return mLastAddedObjectoutline;
|
|
return mLastAddedObjectoutline;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1622,6 +1731,61 @@ void Object::DeleteObjectoutline(unsigned int index)
|
|
mObject_outlines_outline.erase(mObject_outlines_outline.begin()+index);
|
|
mObject_outlines_outline.erase(mObject_outlines_outline.begin()+index);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+vector<Object_laneValidity> * Object::GetObjectlaneValidityVector()
|
|
|
|
+{
|
|
|
|
+ return &mObject_laneValidity;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+Object_laneValidity* Object::GetObjectlaneValidity(unsigned int i)
|
|
|
|
+{
|
|
|
|
+ if ((mObject_laneValidity.size()>0)&&(i<(mObject_laneValidity.size())))
|
|
|
|
+ return &(mObject_laneValidity.at(i));
|
|
|
|
+ else
|
|
|
|
+ return NULL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+unsigned int Object::GetObjectlaneValidityCount()
|
|
|
|
+{
|
|
|
|
+ return static_cast<unsigned int>(mObject_laneValidity.size());
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+Object_laneValidity* Object::GetLastObjectlaneValidity()
|
|
|
|
+{
|
|
|
|
+ if (mObject_laneValidity.size()>0)
|
|
|
|
+ return &mObject_laneValidity.at(mObject_laneValidity.size()-1);
|
|
|
|
+ else
|
|
|
|
+ return NULL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+Object_laneValidity* Object::GetLastAddedObjectlaneValidity()
|
|
|
|
+{
|
|
|
|
+ if(mLastAddedObjectlaneValidity<mObject_laneValidity.size())
|
|
|
|
+ return &mObject_laneValidity.at(mLastAddedObjectlaneValidity);
|
|
|
|
+ else
|
|
|
|
+ return NULL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+unsigned int Object::AddObjectlaneValidity(int fromLane, int toLane)
|
|
|
|
+{
|
|
|
|
+ mObject_laneValidity.push_back(Object_laneValidity(fromLane,toLane));
|
|
|
|
+ mLastAddedObjectlaneValidity = static_cast<unsigned int>(mObject_laneValidity.size()-1) ;
|
|
|
|
+ return mLastAddedObjectlaneValidity;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+unsigned int Object::CloneObjectlaneValidity(unsigned int index)
|
|
|
|
+{
|
|
|
|
+ if(index<(mObject_laneValidity.size()-1))
|
|
|
|
+ mObject_laneValidity.insert(mObject_laneValidity.begin()+index+1, mObject_laneValidity[index]);
|
|
|
|
+ else if(index==mObject_laneValidity.size()-1)
|
|
|
|
+ mObject_laneValidity.push_back(mObject_laneValidity[index]);
|
|
|
|
+ mLastAddedObjectlaneValidity=index+1;
|
|
|
|
+ return mLastAddedObjectlaneValidity;
|
|
|
|
+}
|
|
|
|
+void Object::DeleteObjectlaneValidity(unsigned int index)
|
|
|
|
+{
|
|
|
|
+ mObject_laneValidity.erase(mObject_laneValidity.begin()+index);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
|
|
signal_positionRoad::signal_positionRoad(double s, double t, double zOffset, double hOffset, double pitch, double roll)
|
|
signal_positionRoad::signal_positionRoad(double s, double t, double zOffset, double hOffset, double pitch, double roll)
|
|
{
|
|
{
|