Merge pull request #3461 from GNS3/fix/3441

Fix nodes are not snapped to the grid at the moment of creation
GNS3 · May 8, 2023 · ab6e0ce · ab6e0ce
2 parents ea4a7f2 + 8042c9e
commit ab6e0ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/gns3/items/drawing_item.py b/gns3/items/drawing_item.py
@@ -213,7 +213,7 @@ def delete(self, skip_controller=False):
 
  def itemChange(self, change, value):
 
- if change == QtWidgets.QGraphicsItem.ItemPositionChange and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
+ if change == QtWidgets.QGraphicsItem.ItemPositionChange and self._main_window.uiSnapToGridAction.isChecked():
  grid_size = self._graphics_view.drawingGridSize()
  mid_x = self.boundingRect().width() / 2
  value.setX((grid_size * round((value.x() + mid_x) / grid_size)) - mid_x)

diff --git a/gns3/items/node_item.py b/gns3/items/node_item.py
@@ -108,6 +108,9 @@ def __init__(self, node):
  if node.initialized():
  self.createdSlot(node.id())
 
+ if self._main_window.uiSnapToGridAction.isChecked():
+ self.setPos(QtCore.QPointF(self._node.x() + 0.1, self._node.y()))
+
  def updateNode(self):
  """
  Sync change to the node
@@ -466,7 +469,7 @@ def itemChange(self, change, value):
  :param value: value of the change
  """
 
- if change == QtWidgets.QGraphicsItem.ItemPositionChange and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
+ if change == QtWidgets.QGraphicsItem.ItemPositionChange and self._main_window.uiSnapToGridAction.isChecked():
  grid_size = self._main_window.uiGraphicsView.nodeGridSize()
  mid_x = self.boundingRect().width() / 2
  value.setX((grid_size * round((value.x() + mid_x) / grid_size)) - mid_x)

diff --git a/tests/items/test_line_item.py b/tests/items/test_line_item.py
@@ -61,6 +61,7 @@ def test_toSvg_negative_y(project, controller):
 
 def test_fromSvg(project, controller):
  line = LineItem(project=project)
+ line._main_window.uiSnapToGridAction.isChecked = lambda: False
  line.setPos(50, 84)
  line.fromSvg('<svg height="150" width="250"><line x1="0" y1="0" x2="250" y2="150" stroke-width="5" stroke="#0000ff" stroke-dasharray="5, 25, 25" /></svg>')
  assert line.line().x1() == 0
@@ -75,6 +76,7 @@ def test_fromSvg(project, controller):
 
 def test_fromSvg_top_direction(project, controller):
  line = LineItem(project=project)
+ line._main_window.uiSnapToGridAction.isChecked = lambda: False
  line.setPos(50, 84)
  line.fromSvg('<svg height="150" width="250"><line x1="0" y1="150" x2="250" y2="0" stroke-width="5" stroke="#0000ff" stroke-dasharray="5, 25, 25" /></svg>')
  assert line.line().x1() == 0