瀏覽代碼

Merge branch 'master' into 1+x

lijinliang 3 年之前
父節點
當前提交
0dfa5754e0
共有 1 個文件被更改,包括 9 次插入5 次删除
  1. 9 5
      src/tool/tool_xodrobj/mainwindow.cpp

+ 9 - 5
src/tool/tool_xodrobj/mainwindow.cpp

@@ -109,11 +109,15 @@ static int getmnfac(OpenDrive & mxodr,double & fmovex,double & fmovey)
         }
 
         double x,y,hdg;
-        pRoad->GetGeometryCoords(pRoad->GetRoadLength()-0.1,x,y,hdg);
-        if(x>fxmax)fxmax = x;
-        if(x<fxmin)fxmin = x;
-        if(y>fymax)fymax = y;
-        if(y<fymin)fymin = y;
+
+        int nco = pRoad->GetGeometryCoords(pRoad->GetRoadLength()-0.1,x,y,hdg);
+        if(nco >= 0)
+        {
+            if(x>fxmax)fxmax = x;
+            if(x<fxmin)fxmin = x;
+            if(y>fymax)fymax = y;
+            if(y<fymin)fymin = y;
+        }
     }
 
     if(bHaveRealRoad == false)