diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp index 1bbc9fba4c7090123697534fd2673ceae3564179..352e1c7acb5cd564b06bf8a4c7e5e3f304557781 100644 --- a/src/GraphicView.cpp +++ b/src/GraphicView.cpp @@ -814,7 +814,7 @@ void jpsGraphicsView::drawLine() //Undo RecordUndoLineAction("LineAdded",lineItem->GetType(),lineItem->get_line()->line()); - drawLine(); + //drawLine(); diff --git a/src/datamanager.cpp b/src/datamanager.cpp index ab537bbe98e2efc665d9db59571b7bbe511e3ab8..3b699f9d4e9e3ac0903ece5f9dada96e6010f18f 100644 --- a/src/datamanager.cpp +++ b/src/datamanager.cpp @@ -358,9 +358,11 @@ void jpsDatamanager::writeRoutingHeader(QXmlStreamWriter *stream) void jpsDatamanager::writeHLines(QXmlStreamWriter *stream, QList<jpsLineItem *> &hLines) { + int id=1000; for (jpsLineItem *lineItem:hLines) { stream->writeStartElement("Hline"); + stream->writeAttribute("id",QString::number(id)); stream->writeAttribute("room_id","0"); QString rid = RoomIDHLine(lineItem); if (rid.contains("Warning")) @@ -384,6 +386,7 @@ void jpsDatamanager::writeHLines(QXmlStreamWriter *stream, QList<jpsLineItem *> stream->writeEndElement(); //vertex stream->writeEndElement(); //Hline + id++; } } diff --git a/src/rooms.cpp b/src/rooms.cpp index 8500dba2171114b35201eea8df2d908786475b65..146555edcd3223e658a6619e550c8e71da355454 100644 --- a/src/rooms.cpp +++ b/src/rooms.cpp @@ -257,12 +257,12 @@ QPolygonF jpsRoom::RoomAsSortedPolygon() const } -// for (QPointF point:points) -// { -// std::cout << point.x() << " " << point.y() << std::endl; + for (QPointF point:points) + { + std::cout << point.x() << " " << point.y() << std::endl; -// } -// std::cout << "----------------------------" << std::endl; + } + std::cout << "----------------------------" << std::endl; return QPolygonF(points); }