|
@@ -326,7 +326,9 @@ void MainWindow::on_actionLoad_triggered()
|
|
|
QString str = QFileDialog::getOpenFileName(this,"Load XODR",".","*.xodr");
|
|
|
if(str.isEmpty())return;
|
|
|
|
|
|
- OpenDrive * pxodr = new OpenDrive(); //because add to xodr,so don't delete
|
|
|
+
|
|
|
+
|
|
|
+ OpenDrive * pxodr = &mxodr;//new OpenDrive(); //because add to xodr,so don't delete
|
|
|
OpenDriveXmlParser x(pxodr);
|
|
|
if(!x.ReadFile(str.toStdString()))
|
|
|
{
|
|
@@ -335,6 +337,7 @@ void MainWindow::on_actionLoad_triggered()
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
unsigned short int revMajor,revMinor;
|
|
|
std::string name,date;
|
|
|
float version;
|
|
@@ -349,12 +352,18 @@ void MainWindow::on_actionLoad_triggered()
|
|
|
lon0 = 119.0;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
glat0 = lat0;
|
|
|
glon0 = lon0;
|
|
|
|
|
|
mpsimmodel->SetLon0Lat0(glon0,glat0);
|
|
|
|
|
|
- mxodr = *pxodr;
|
|
|
+
|
|
|
+
|
|
|
+// mxodr = *pxodr;
|
|
|
+
|
|
|
|
|
|
UpdateScene();
|
|
|
}
|