Merge pull request #392 from pklampros/master

pklampros · web-flow · commit 1d4e867ad3d7 · 2020-11-08T18:10:01.000Z
Make sure the shape refs are used when linking/unlinking
diff --git a/depthmapX/views/glview/glview.cpp b/depthmapX/views/glview/glview.cpp
@@ -425,7 +425,7 @@ void GLView::mouseReleaseEvent(QMouseEvent *event)
                         int axRef2 = *it;
                         // axial is only joined one-by-one
                         m_pDoc.modifiedFlag = true;
-                        m_pDoc.m_meta_graph->getDisplayedShapeGraph().linkShapes(axRef1, axRef2, true);
+                        m_pDoc.m_meta_graph->getDisplayedShapeGraph().linkShapesFromRefs(axRef1, axRef2, true);
                         m_pDoc.m_meta_graph->clearSel();
                     }
                 }
@@ -468,7 +468,7 @@ void GLView::mouseReleaseEvent(QMouseEvent *event)
                         int axRef2 = *it;
                         // axial is only joined one-by-one
                         m_pDoc.modifiedFlag = true;
-                        m_pDoc.m_meta_graph->getDisplayedShapeGraph().unlinkShapes(axRef1, axRef2, true);
+                        m_pDoc.m_meta_graph->getDisplayedShapeGraph().unlinkShapesFromRefs(axRef1, axRef2, true);
                         m_pDoc.m_meta_graph->clearSel();
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ void GLView::mouseReleaseEvent(QMouseEvent *event)`
`425`	`425`	`int axRef2 = *it;`
`426`	`426`	`// axial is only joined one-by-one`
`427`	`427`	`m_pDoc.modifiedFlag = true;`
`428`		`- m_pDoc.m_meta_graph->getDisplayedShapeGraph().linkShapes(axRef1, axRef2, true);`
	`428`	`+ m_pDoc.m_meta_graph->getDisplayedShapeGraph().linkShapesFromRefs(axRef1, axRef2, true);`
`429`	`429`	`m_pDoc.m_meta_graph->clearSel();`
`430`	`430`	`}`
`431`	`431`	`}`
`@@ -468,7 +468,7 @@ void GLView::mouseReleaseEvent(QMouseEvent *event)`
`468`	`468`	`int axRef2 = *it;`
`469`	`469`	`// axial is only joined one-by-one`
`470`	`470`	`m_pDoc.modifiedFlag = true;`
`471`		`- m_pDoc.m_meta_graph->getDisplayedShapeGraph().unlinkShapes(axRef1, axRef2, true);`
	`471`	`+ m_pDoc.m_meta_graph->getDisplayedShapeGraph().unlinkShapesFromRefs(axRef1, axRef2, true);`
`472`	`472`	`m_pDoc.m_meta_graph->clearSel();`
`473`	`473`	`}`
`474`	`474`	`}`