Port of WizardShaft to PySide

FreeCAD · Jan 6, 2014 · 2954d9a · 2954d9a
1 parent 1d709ad
commit 2954d9a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/Mod/PartDesign/WizardShaft/Shaft.py b/src/Mod/PartDesign/WizardShaft/Shaft.py
@@ -172,7 +172,7 @@ def updateEdge(self, column, start):
             row = rowEndEdgeType
             idx = 1
 
-        edgeType = self.tableWidget.item(row, column).text().toAscii()[0].upper()
+        edgeType = self.tableWidget.item(row, column).text()[0].upper()
         if not ((edgeType == "C") or (edgeType == "F")):
             return # neither chamfer nor fillet defined
 

diff --git a/src/Mod/PartDesign/WizardShaft/ShaftDiagram.py b/src/Mod/PartDesign/WizardShaft/ShaftDiagram.py
@@ -20,7 +20,7 @@
 # *                                                                            *
 # ******************************************************************************/
 
-from PyQt4 import QtCore, QtGui
+from PySide import QtCore, QtGui
 import FreeCAD, FreeCADGui
 
 class Diagram:

diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.py b/src/Mod/PartDesign/WizardShaft/WizardShaft.py
@@ -21,7 +21,7 @@
 # ******************************************************************************/
 
 import FreeCAD, FreeCADGui
-from PyQt4 import QtCore, QtGui
+from PySide import QtCore, QtGui
 from WizardShaftTable import WizardShaftTable
 from Shaft import Shaft
 
@@ -32,7 +32,8 @@ class TaskWizardShaft:
 
     def __init__(self, doc):
         mw = QtGui.qApp.activeWindow()
-        cw = mw.centralWidget() # This is a qmdiarea widget
+        #cw = mw.centralWidget() # This is a qmdiarea widget
+        cw = mw.findChild(QtGui.QMdiArea)
         self.doc = doc
 
         # Get active document or create a new one

diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py
@@ -20,7 +20,7 @@
 # *                                                                            *
 # ******************************************************************************/
 
-from PyQt4 import QtCore, QtGui
+from PySide import QtCore, QtGui
 import FreeCAD # Just for debug printing...
 
 class WizardShaftTable:
@@ -88,7 +88,7 @@ def __init__(self, w, s):
         self.setDiameter(1, 60.0)
         self.setConstraintType(1, "Force")
 
-    def slotInsertColumn(self, point):
+    def slotInsertColumn(self):
         # FIXME: Allow inserting columns, not just adding at the end
         # Note: need to re-name all the following column headers then
         # if (column == self.tableWidget.columnCount()):
@@ -248,7 +248,7 @@ def setInnerDiameter(self, column, d):
     def getInnerDiameter(self, column):
         return self.getDoubleValue("InnerDiameter", column)
 
-    @QtCore.pyqtSlot('QString')
+    @QtCore.Slot('QString')
     def slotConstraintType(self, text):
         self.shaft.updateConstraint(self.getFocusedColumn(), text)
 
@@ -312,7 +312,7 @@ def setListValue(self, row, column, v):
     def getListValue(self, row, column):
         widget = self.widget.cellWidget(self.rowDict[row], column)
         if widget is not None:
-            return widget.currentText().toAscii() #[0].upper()
+            return widget.currentText() #[0].upper()
         else:
             return None