StelSphereGeometry.cpp   StelSphereGeometry.cpp 
skipping to change at line 1304 skipping to change at line 1304
SphericalRegionP reg1 = loadFromQVariant(l.at(1).toList()); SphericalRegionP reg1 = loadFromQVariant(l.at(1).toList());
SphericalRegionP reg2 = loadFromQVariant(l.at(2).toList()); SphericalRegionP reg2 = loadFromQVariant(l.at(2).toList());
SphericalRegionP regIntersection = reg1->getIntersection(reg 2.data()); SphericalRegionP regIntersection = reg1->getIntersection(reg 2.data());
reg1 = reg1->getSubtraction(regIntersection.data()); reg1 = reg1->getSubtraction(regIntersection.data());
return reg1; return reg1;
} }
else if (code=="PATH") else if (code=="PATH")
{ {
return SphericalRegionP(new SphericalPolygon(pathFromQVarian tList(l))); return SphericalRegionP(new SphericalPolygon(pathFromQVarian tList(l)));
} }
else if (code=="CONVEX_POLYGON")
{
return SphericalRegionP(new SphericalConvexPolygon(singleCon
tourFromQVariantList(l.at(1).toList())));
}
Q_ASSERT(0); Q_ASSERT(0);
return EmptySphericalRegion::staticInstance; return EmptySphericalRegion::staticInstance;
} }
SphericalRegionP SphericalRegionP::loadFromQVariant(const QVariantMap& map) SphericalRegionP SphericalRegionP::loadFromQVariant(const QVariantMap& map)
{ {
QVariantList contoursList = map.value("skyConvexPolygons").toList(); QVariantList contoursList = map.value("skyConvexPolygons").toList();
if (contoursList.empty()) if (contoursList.empty())
contoursList = map.value("worldCoords").toList(); contoursList = map.value("worldCoords").toList();
else else
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/