Commit 8feac32d authored by Gerrit Erichsen's avatar Gerrit Erichsen
Browse files

Resolve some conflicats arisen from merging

parents abf68df6 72b9d2cc
#ifndef CSP_H
#define CSP_H
#include<string>
#include<vector>
#include<tuple>
#include<numeric>
#include<math.h>
#include<algorithm>
#include<iostream> // debugging cout
using namespace std;
///////////////////////////////////////////////////////////////////////////////////////////////////
///
......
......@@ -70,6 +70,7 @@ void NodesTableItem::setMapPolygon(QPolygonF mapPolygon)
m_polygonObject->setGeoPoly(mapPolygon);
}
}
void NodesTableItem::setPolygonObject(PolygonObject *polygonObject)
{
m_polygonObject = polygonObject;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment