Skip to content
Snippets Groups Projects
Commit 0d6958ca authored by Benjamin Jakimow's avatar Benjamin Jakimow
Browse files

pulled qps udpates on crosshair


Signed-off-by: Benjamin Jakimow's avatarbenjamin.jakimow <benjamin.jakimow@geo.hu-berlin.de>
parent 053c4df4
No related branches found
No related tags found
No related merge requests found
......@@ -199,7 +199,7 @@ class CrosshairMapCanvasItem(QgsMapCanvasItem):
:param QWidget_widget:
:return:
"""
if isinstance(self.mPosition, SpatialPoint) and self.mShow and self.mCrosshairStyle.mShow:
if isinstance(self.mPosition, QgsPointXY) and self.mShow and self.mCrosshairStyle.mShow:
#paint the crosshair
size = self.mCanvas.size()
m2p = self.mCanvas.mapSettings().mapToPixel()
......@@ -407,6 +407,8 @@ class CrosshairWidget(QWidget, loadUI('crosshairwidget.ui')):
self.mapCanvasItem = CrosshairMapCanvasItem(self.mapCanvas)
self.mapCanvasItem.setVisibility(True)
self.mapCanvasItem.setPosition(self.mapCanvas.center())
self.btnCrosshairColor.colorChanged.connect(self.refreshCrosshairPreview)
self.spinBoxCrosshairAlpha.valueChanged.connect(self.refreshCrosshairPreview)
self.spinBoxCrosshairThickness.valueChanged.connect(self.refreshCrosshairPreview)
......@@ -435,7 +437,7 @@ class CrosshairWidget(QWidget, loadUI('crosshairwidget.ui')):
canvas.setExtent(mapCanvas.extent())
canvas.setCenter(mapCanvas.center())
canvas.setCanvasColor(mapCanvas.canvasColor())
self.mapCanvasItem.setPosition(SpatialPoint.fromMapCanvasCenter(canvas))
self.mapCanvasItem.setPosition(canvas.center())
self.refreshCrosshairPreview()
......@@ -455,6 +457,7 @@ class CrosshairWidget(QWidget, loadUI('crosshairwidget.ui')):
style = self.crosshairStyle()
self.mapCanvasItem.setVisibility(True)
self.mapCanvasItem.setCrosshairStyle(style)
self.mapCanvasItem.updateCanvas()
self.sigCrosshairStyleChanged.emit(style)
def setCrosshairStyle(self, style):
......@@ -497,8 +500,7 @@ class CrosshairDialog(QgsDialog):
:return: specified CrosshairStyle if accepted, else None
"""
d = CrosshairDialog(*args, **kwds)
d.exec_()
d.exec()
if d.result() == QDialog.Accepted:
return d.crosshairStyle()
else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment