Added edit support for geometry with X and M.

Author: sweco-sedahd

src/COM classes/ShapeEditor.cpp

@@ -173,13 +173,23 @@ STDMETHODIMP CShapeEditor::get_ValidatedShape(IShape** retVal)
 // *******************************************************
 void CShapeEditor::CopyData(int firstIndex, int lastIndex, IShape* target )
 {
+	ShpfileType shpType;
+	target->get_ShapeType(&shpType);
+	bool haveZ = ShapeUtility::IsZ(shpType);
+	bool haveM = ShapeUtility::HaveM(shpType);
 	long index, partCount = 0;
 	VARIANT_BOOL vb;
 	for(int i = firstIndex; i < lastIndex; i++)
 	{
 		MeasurePoint* pnt = _activeShape->GetPoint(i);
 		if (pnt) {
 			target->AddPoint(pnt->Proj.x, pnt->Proj.y, &index);
+			IPoint* pt;
+			target->get_Point(index, &pt);
+			if (haveZ)
+				pt->put_Z(pnt->z);
+			if (haveM)
+				pt->put_M(pnt->m);
 			if (pnt->Part == PartBegin) {
 				target->InsertPart(i, &partCount, &vb);
 				partCount++;
@@ -345,11 +355,13 @@ STDMETHODIMP CShapeEditor::StartEdit(LONG LayerHandle, LONG ShapeIndex, VARIANT_
 	if (list) {
 		list->get_UndoCount(&_startingUndoCount);
 	}
-	
+
+	_startedEditOnInvalidShape = false;
 	CComPtr<IShape> shp = NULL;
 	sf->get_Shape(ShapeIndex, &shp);
 	if (shp)
 	{
+		_startedEditOnInvalidShape = !Validate(&shp);
 		put_EditorState(esEdit);
 		SetShape(shp);
 		_layerHandle = LayerHandle;
@@ -391,17 +403,28 @@ STDMETHODIMP CShapeEditor::SetShape( IShape* shp )
 	}
 
 	VARIANT_BOOL vb;
-	double x, y;
+	double x, y, z, m;
 	shp->get_NumPoints(&numPoints);
 
+	bool haveZ = ShapeUtility::IsZ(shpType);
+	bool haveM = ShapeUtility::HaveM(shpType);
+
 	for(long i = 0; i < numPoints; i++) 
 	{
 		PointPart part = PartNone;
 		if (parts.find(i) != parts.end()) part = PartBegin;
 		if (endParts.find(i) != endParts.end()) part = PartEnd;
 
 		shp->get_XY(i, &x, &y, &vb);
-		_activeShape->AddPoint(x, y, -1, -1, part);
+		if(haveZ)
+			shp->get_Z(i, &z, &vb);
+		else
+			z = 0.0;
+		if(haveM)
+			shp->get_M(i, &m, &vb);
+		else
+			m = 0.0;
+		_activeShape->AddPoint(x, y, z, m, -1, -1, part);
 	}
 	return S_OK;
 }
@@ -717,11 +740,13 @@ STDMETHODIMP CShapeEditor::AddPoint(IPoint *newPoint, VARIANT_BOOL* retVal)
 		get_IsDigitizing(&digitizing);
 		tkCursorMode cursor = _mapCallback->_GetCursorMode();
 		if (digitizing) {
-			double x, y;
+			double x, y, z, m;
 			newPoint->get_X(&x);
 			newPoint->get_Y(&y);
+			newPoint->get_Z(&z);
+			newPoint->get_Z(&m);
 			newPoint->Release();
-			_activeShape->AddPoint(x, y, -1, -1, PartBegin);
+			_activeShape->AddPoint(x, y, z, m, -1, -1, PartBegin);
 			*retVal = VARIANT_TRUE;
 			return S_OK;
 		}
@@ -1167,6 +1192,8 @@ bool CShapeEditor::TryStop()
 
 	CComPtr<IShape> shp = NULL;
 	get_ValidatedShape(&shp);
+	if (!shp  && _startedEditOnInvalidShape ) // Invalid so get the invalid raw shape if we started with invalid shape (IK-379)
+		get_RawData(&shp);
 
 	switch (_state)
 	{
@@ -1183,8 +1210,9 @@ bool CShapeEditor::TryStop()
 			VARIANT_BOOL isEmpty;
 			get_IsEmpty(&isEmpty);
 			if (isEmpty) return true;
-			if (!shp) return false;
-			bool result = TrySaveShape(shp);
+			if (!shp && !_activeShape->AllowSaveInvalidGeometry) return false;
+			if( shp ) // Only try to save if we have a shape (IK-379)
+				bool result = TrySaveShape(shp);
 			SetRedrawNeeded(rtVolatileLayer);
 			break;
 	}
@@ -1277,8 +1305,9 @@ void CShapeEditor::HandleProjPointAdd(double projX, double projY)
 {
 	double pixelX, pixelY;
 	_mapCallback->_ProjectionToPixel(projX, projY, &pixelX, &pixelY);
-	_activeShape->AddPoint(projX, projY, pixelX, pixelY);
+	_activeShape->AddPoint(projX, projY, 0.0, 0.0, pixelX, pixelY);
 	_activeShape->ClearSnapPoint();
+	_mapCallback->_FireVertexAdded(&projX, &projY);
 }
 
 // ***************************************************************
@@ -1783,3 +1812,37 @@ STDMETHODIMP CShapeEditor::Deserialize(BSTR state, VARIANT_BOOL* retVal)
 
 	return S_OK;
 }
+
+// ***************************************************************
+//		EnableInsertVertex()
+// ***************************************************************
+STDMETHODIMP CShapeEditor::get_EnableInsertVertex(VARIANT_BOOL* pVal)
+{
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	*pVal = _activeShape->EnableInsertVertex;
+	return S_OK;
+}
+
+STDMETHODIMP CShapeEditor::put_EnableInsertVertex(VARIANT_BOOL newVal)
+{
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	_activeShape->EnableInsertVertex = newVal ? true : false;
+	return S_OK;
+}
+
+// ***************************************************************
+//		AllowSaveInvalidGeometry()
+// ***************************************************************
+STDMETHODIMP CShapeEditor::get_AllowSaveInvalidGeometry(VARIANT_BOOL* pVal)
+{
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	*pVal = _activeShape->AllowSaveInvalidGeometry;
+	return S_OK;
+}
+
+STDMETHODIMP CShapeEditor::put_AllowSaveInvalidGeometry(VARIANT_BOOL newVal)
+{
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	_activeShape->AllowSaveInvalidGeometry = newVal ? true : false;
+	return S_OK;
+}

src/COM classes/ShapeEditor.h

@@ -162,6 +162,7 @@ class ATL_NO_VTABLE CShapeEditor :
 	double _snapTolerance;
 	tkLayerSelection _snapBehavior;
 	EditorBase* _activeShape;
+	bool _startedEditOnInvalidShape;
 	long _layerHandle;
 	long _shapeIndex;
 	long _lastErrorCode;
@@ -256,5 +257,10 @@ class ATL_NO_VTABLE CShapeEditor :
 	STDMETHOD(put_ShowLength)(VARIANT_BOOL newVal);
 	STDMETHOD(Serialize)(BSTR* retVal);
 	STDMETHOD(Deserialize)(BSTR state, VARIANT_BOOL* retVal);
+	STDMETHOD(get_EnableInsertVertex)(VARIANT_BOOL* pVal);
+	STDMETHOD(put_EnableInsertVertex)(VARIANT_BOOL newVal);
+	STDMETHOD(get_AllowSaveInvalidGeometry)(VARIANT_BOOL* pVal);
+	STDMETHOD(put_AllowSaveInvalidGeometry)(VARIANT_BOOL newVal);
+
 };
 OBJECT_ENTRY_AUTO(__uuidof(ShapeEditor), CShapeEditor)

src/Editor/ActiveShape.cpp

@@ -677,7 +677,7 @@ bool ActiveShape::HandlePointAdd(const double screenX, const double screenY, con
 		PixelToProj(screenX, screenY, projX, projY);
 	}
 
-	AddPoint(projX, projY, screenX, screenY);
+	AddPoint(projX, projY, 0.0, 0.0, screenX, screenY);
 
 	UpdatePolyCloseState(true, closePointIndex);
 
@@ -687,7 +687,7 @@ bool ActiveShape::HandlePointAdd(const double screenX, const double screenY, con
 // *******************************************************
 //		AddPoint()
 // *******************************************************
-void ActiveShape::AddPoint(const double xProj, const double yProj, const double xScreen, const double yScreen, const PointPart part)
+void ActiveShape::AddPoint(const double xProj, const double yProj, const double z, const double m, const double xScreen, const double yScreen, const PointPart part)
 {
 	ClearIfStopped();
 
@@ -697,6 +697,8 @@ void ActiveShape::AddPoint(const double xProj, const double yProj, const double
 	MeasurePoint* pnt = new MeasurePoint();  // TODO: Fix compile warning
 	pnt->Proj.x = xProj;
 	pnt->Proj.y = yProj;
+	pnt->z = z;
+	pnt->m = m;
 	pnt->Part = part;
 	_points.push_back(pnt);
 
@@ -712,7 +714,7 @@ void ActiveShape::AddPoint(const double xProj, const double yProj)
 {
 	double xScreen, yScreen;
 	ProjToPixel(xProj, yProj, xScreen, yScreen);
-	AddPoint(xProj, yProj, xScreen, yScreen);
+	AddPoint(xProj, yProj, 0.0, 0.0, xScreen, yScreen);
 }
 
 // **************************************************************

src/Editor/ActiveShape.h

@@ -53,6 +53,7 @@ class ActiveShape : public GeoShape
 		ShowLength = true;
 		ShowTotalLength = true;
 		ShowArea = true;
+		EnableInsertVertex = true;
 	};
 
 	virtual ~ActiveShape() {
@@ -117,6 +118,8 @@ class ActiveShape : public GeoShape
 	tkAreaDisplayMode AreaDisplayMode;
 	tkBearingType BearingType;
 	tkAngleFormat AngleFormat;
+	bool EnableInsertVertex;
+	bool AllowSaveInvalidGeometry;
 
 	OLE_COLOR FillColor;
 	OLE_COLOR LineColor;
@@ -155,7 +158,7 @@ class ActiveShape : public GeoShape
 	virtual bool UndoPoint();
 	virtual bool GetPartStartAndEnd(int partIndex, MixedShapePart whichPoints, int& startIndex, int& endIndex);
 	ShapeInputMode GetInputMode() const { return _inputMode; }
-	void AddPoint(double xProj, double yProj, double xScreen, double yScreen, PointPart part = PartNone);
+	void AddPoint(double xProj, double yProj, const double z, const double m, double xScreen, double yScreen, PointPart part = PartNone);
 	void AddPoint(double xProj, double yProj);
 	bool HandlePointAdd(double screenX, double screenY, bool ctrl);
 	int GetPointCount() const { return gsl::narrow_cast<int>(_points.size()); }

src/Editor/MeasuringBase.cpp

@@ -77,7 +77,7 @@ void MeasuringBase::HandleProjPointAdd(double projX, double projY)
 {
 	double pixelX, pixelY;
 	_mapCallback->_ProjectionToPixel(projX, projY, &pixelX, &pixelY);
-	AddPoint(projX, projY, pixelX, pixelY);
+	AddPoint(projX, projY, 0.0, 0.0, pixelX, pixelY);
 }
 
 // *******************************************************

src/MapControl/Map_Edit.cpp

@@ -32,15 +32,21 @@ bool CMapView::HandleLButtonUpDragVertexOrShape(UINT nFlags)
 		bool shift = (nFlags & MK_SHIFT) != 0;
 		bool alt = GetKeyState(VK_MENU) < 0 ? true : false;
 
+		// dhe
+		alt = true;
+
 		if (SnappingIsOn(shift))
 		{
 			VARIANT_BOOL result = this->FindSnapPointCore(_dragging.Move.x, _dragging.Move.y, &x2, &y2);
 			if ((result == VARIANT_FALSE) && shift)
 				return true;		// can't proceed without snapping in this mode
 		}
 
+		int selectedVertex;
+		auto ret = _shapeEditor->get_SelectedVertex(&selectedVertex);
+
 		if (alt) { // user wants to intercept coordinates and possibly modify them
-			this->FireBeforeVertexDigitized(&x2, &y2);
+			this->FireBeforeVertexDigitized(&x2, &y2, selectedVertex);
 		}
 
 		GetEditorBase()->MoveVertex(x2, y2);		// don't save state; it's already saved at the beginning of operation
@@ -88,8 +94,18 @@ bool CMapView::HandleOnMouseMoveShapeEditor(int x, int y, long nFlags)
 	// get Snap setting
 	_shapeEditor->get_SnapBehavior(&snapBehavior);
 
+#if DEBUG_ALLOCATED_OBJECTS
+	ComHelper::SetBreak(false);
+	auto preCount = gReferenceCounter.GetReferenceCount();
+#endif
 	double projX, projY;
 	VARIANT_BOOL snapped = FindSnapPointCore(x, y, &projX, &projY);
+#if DEBUG_ALLOCATED_OBJECTS
+	auto postCount = gReferenceCounter.GetReferenceCount();
+	if (preCount < postCount)
+		::OutputDebugStringA("Increased!");
+	ComHelper::SetBreak(false);
+#endif
 	if (!snapped) {
 		PixelToProjection(x, y, projX, projY);
 		GetEditorBase()->ClearSnapPoint();