suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed v-scrollbar issue and added edit button.

Browse Source
This commit is contained in:
Markus Lampert 2017-01-05 18:58:43 -08:00
parent f89eea7b59
commit 706875b3cc
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>380</width> <width>399</width>
<height>539</height> <height>564</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -33,8 +33,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>362</width> <width>381</width>
<height>485</height> <height>510</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@ -107,7 +107,7 @@
<item> <item>
<widget class="QListWidget" name="lwTags"> <widget class="QListWidget" name="lwTags">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;List of current tags.&lt;/p&gt;&lt;p&gt;Edit coordinates by double click or Enter key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;List of current tags.&lt;/p&gt;&lt;p&gt;Edit coordinates by double click or Edit button.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -132,7 +132,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="pbEdit">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>

39
src/Mod/Path/PathScripts/PathDressupHoldingTags.py
View File

@ -776,7 +776,7 @@ class TaskPanel:
self.formTags = FreeCADGui.PySideUic.loadUi(":/panels/HoldingTagsEdit.ui") self.formTags = FreeCADGui.PySideUic.loadUi(":/panels/HoldingTagsEdit.ui")
self.formPoint = FreeCADGui.PySideUic.loadUi(":/panels/PointEdit.ui") self.formPoint = FreeCADGui.PySideUic.loadUi(":/panels/PointEdit.ui")
self.layout = QtGui.QVBoxLayout(self.form) self.layout = QtGui.QVBoxLayout(self.form)
self.form.setGeometry(self.formTags.geometry()) #self.form.setGeometry(self.formTags.geometry())
self.form.setWindowTitle(self.formTags.windowTitle()) self.form.setWindowTitle(self.formTags.windowTitle())
self.form.setSizePolicy(self.formTags.sizePolicy()) self.form.setSizePolicy(self.formTags.sizePolicy())
self.formTags.setParent(self.form) self.formTags.setParent(self.form)
@ -898,6 +898,7 @@ class TaskPanel:
print('whenTagSelectionChanged') print('whenTagSelectionChanged')
index = self.formTags.lwTags.currentRow() index = self.formTags.lwTags.currentRow()
self.formTags.pbDelete.setEnabled(index != -1) self.formTags.pbDelete.setEnabled(index != -1)
self.formTags.pbEdit.setEnabled(index != -1)
self.viewProvider.selectTag(index) self.viewProvider.selectTag(index)
def deleteSelectedTag(self): def deleteSelectedTag(self):
@ -922,7 +923,7 @@ class TaskPanel:
self.getPoint(self.addNewTagAt) self.getPoint(self.addNewTagAt)
def editTagAt(self, point, obj): def editTagAt(self, point, obj):
if obj == self.obj: if (obj or point != FreeCAD.Vector()) and self.obj.Proxy.pointIsOnPath(self.obj, point):
tags = [] tags = []
for i, (x, y, enabled) in enumerate(self.tags): for i, (x, y, enabled) in enumerate(self.tags):
if i == self.editItem: if i == self.editItem:
@ -935,11 +936,15 @@ class TaskPanel:
self.formTags.show() self.formTags.show()
def editTag(self, item): def editTag(self, item):
self.tags = self.getTags(True) if item:
self.editItem = item.data(self.DataID) self.tags = self.getTags(True)
x = item.data(self.DataX) self.editItem = item.data(self.DataID)
y = item.data(self.DataY) x = item.data(self.DataX)
self.getPoint(self.editTagAt, FreeCAD.Vector(x, y, 0)) y = item.data(self.DataY)
self.getPoint(self.editTagAt, FreeCAD.Vector(x, y, 0))
def editSelectedTag(self):
self.editTag(self.formTags.lwTags.currentItem())
def removeGlobalCallbacks(self): def removeGlobalCallbacks(self):
if hasattr(self, 'view') and self.view: if hasattr(self, 'view') and self.view:
@ -1037,12 +1042,13 @@ class TaskPanel:
self.formTags.lwTags.itemActivated.connect(self.editTag) self.formTags.lwTags.itemActivated.connect(self.editTag)
self.formTags.pbDelete.clicked.connect(self.deleteSelectedTag) self.formTags.pbDelete.clicked.connect(self.deleteSelectedTag)
self.formTags.pbEdit.clicked.connect(self.editSelectedTag)
self.formTags.pbAdd.clicked.connect(self.addNewTag) self.formTags.pbAdd.clicked.connect(self.addNewTag)
self.formPoint.buttonBox.accepted.connect(self.pointAccept) self.formPoint.buttonBox.accepted.connect(self.pointAccept)
QtCore.QObject.connect(self.formPoint.ifValueX, QtCore.SIGNAL("valueChanged(double)"), self.changeValueX) self.formPoint.ifValueX.editingFinished.connect(self.updatePoint)
QtCore.QObject.connect(self.formPoint.ifValueY, QtCore.SIGNAL("valueChanged(double)"), self.changeValueY) self.formPoint.ifValueY.editingFinished.connect(self.updatePoint)
QtCore.QObject.connect(self.formPoint.ifValueZ, QtCore.SIGNAL("valueChanged(double)"), self.changeValueZ) self.formPoint.ifValueZ.editingFinished.connect(self.updatePoint)
self.viewProvider.turnMarkerDisplayOn(True) self.viewProvider.turnMarkerDisplayOn(True)
@ -1056,15 +1062,14 @@ class TaskPanel:
self.pointFinish(False) self.pointFinish(False)
def pointAccept(self): def pointAccept(self):
print("pointAccept")
self.pointFinish(True) self.pointFinish(True)
def changeValueX(self, double): def updatePoint(self):
self.pt.x = double x = FreeCAD.Units.Quantity(self.formPoint.ifValueX.text()).Value
def changeValueY(self, double): y = FreeCAD.Units.Quantity(self.formPoint.ifValueY.text()).Value
self.pt.y = double z = FreeCAD.Units.Quantity(self.formPoint.ifValueZ.text()).Value
def changeValueZ(self, double): self.pt = FreeCAD.Vector(x, y, z)
self.pt.z = double
class HoldingTagMarker: class HoldingTagMarker:
def __init__(self, p): def __init__(self, p):