|
@@ -121,15 +121,15 @@ void DialogAddRoadFromRTK::on_pushButton_LoadData_clicked()
|
|
|
QList<QByteArray> strlinedata= ba.split('\n');
|
|
|
int i;
|
|
|
int nsize = strlinedata.size();
|
|
|
- for(i=2;i<nsize;i++)
|
|
|
+ for(i=1;i<nsize;i++)
|
|
|
{
|
|
|
double flat,flon,fheight,frelx,frely;
|
|
|
QList<QByteArray> strlistvalue = strlinedata.at(i).split(',');
|
|
|
int ncount = strlistvalue.size();
|
|
|
if(ncount>=4)
|
|
|
{
|
|
|
- flon = getvaluefromdegreestring(strlistvalue.at(1));
|
|
|
- flat = getvaluefromdegreestring(strlistvalue.at(2));
|
|
|
+ flon = getvaluefromdegreestring(strlistvalue.at(2));
|
|
|
+ flat = getvaluefromdegreestring(strlistvalue.at(1));
|
|
|
QString strheight = strlistvalue.at(3);
|
|
|
strheight = strheight.left(strheight.size() -2);
|
|
|
fheight = strheight.toDouble();
|
|
@@ -144,7 +144,7 @@ void DialogAddRoadFromRTK::on_pushButton_LoadData_clicked()
|
|
|
xdata.mheight = fheight;
|
|
|
mvectorrtkdata.push_back(xdata);
|
|
|
|
|
|
- if(i==2)
|
|
|
+ if(i==1)
|
|
|
{
|
|
|
if(mpxodr->GetRoadCount()<1)
|
|
|
{
|