kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Draft_Split fix unhandled exception (#14059)

Browse Source 
Fixes #13951.

Regression introduced by #12261.
This commit is contained in:
Roy-043
2024-05-16 22:02:56 +02:00
committed by GitHub
parent 33486369a5
commit fa79c9d987
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/Draft/draftguitools/gui_split.py
View File

@@ -33,17 +33,12 @@ from PySide.QtCore import QT_TRANSLATE_NOOP
import FreeCAD as App
import FreeCADGui as Gui
import Draft_rc
import DraftVecUtils
import draftguitools.gui_base_original as gui_base_original
import draftguitools.gui_tool_utils as gui_tool_utils
from draftguitools import gui_base_original
from draftguitools import gui_tool_utils
from draftutils.messages import _toolmsg
from draftutils.translate import translate
# The module is used to prevent complaints from code checkers (flake8)
True if Draft_rc.__name__ else False
class Split(gui_base_original.Modifier):
"""Gui Command for the Split tool."""
@@ -51,14 +46,14 @@ class Split(gui_base_original.Modifier):
def GetResources(self):
"""Set icon, menu and tooltip."""
return {'Pixmap': 'Draft_Split',
'Accel': "S, P",
'MenuText': QT_TRANSLATE_NOOP("Draft_Split", "Split"),
'ToolTip': QT_TRANSLATE_NOOP("Draft_Split", "Splits the selected line or polyline into two independent lines\nor polylines by clicking anywhere along the original object.\nIt works best when choosing a point on a straight segment and not a corner vertex.")}
return {"Pixmap": "Draft_Split",
"Accel": "S, P",
"MenuText": QT_TRANSLATE_NOOP("Draft_Split", "Split"),
"ToolTip": QT_TRANSLATE_NOOP("Draft_Split", "Splits the selected line or polyline into two independent lines\nor polylines by clicking anywhere along the original object.\nIt works best when choosing a point on a straight segment and not a corner vertex.")}
def Activated(self):
"""Execute when the command is called."""
super(Split, self).Activated(name="Split")
super().Activated(name="Split")
if not self.ui:
return
_toolmsg(translate("draft", "Click anywhere on a line to split it."))
@@ -85,7 +80,7 @@ class Split(gui_base_original.Modifier):
and arg["Button"] == "BUTTON1"
and arg["State"] == "DOWN"):
self.point, ctrlPoint, info = gui_tool_utils.getPoint(self, arg)
if "Edge" in info["Component"]:
if info is not None and "Edge" in info["Component"]:
return self.proceed(info)
def proceed(self, info):
@@ -109,6 +104,11 @@ class Split(gui_base_original.Modifier):
self.finish()
def finish(self, cont=False):
"""Terminate the operation."""
self.end_callbacks(self.call)
super().finish()
Gui.addCommand('Draft_Split', Split())