- converted from Python2 code to Python3 code
- in camlib.py, CNCJob class -> generate_from_excellon_by_tool() was failing in the line to sort the tools due of been unable to compare between dict's. I replaced that section.
This commit is contained in:
@@ -81,7 +81,7 @@ class LengthEntry(QtGui.QLineEdit):
|
||||
def returnPressed(self, *args, **kwargs):
|
||||
val = self.get_value()
|
||||
if val is not None:
|
||||
self.set_text(QtCore.QString(str(val)))
|
||||
self.set_text(str(val))
|
||||
else:
|
||||
log.warning("Could not interpret entry: %s" % self.get_text())
|
||||
|
||||
@@ -105,7 +105,7 @@ class LengthEntry(QtGui.QLineEdit):
|
||||
return None
|
||||
|
||||
def set_value(self, val):
|
||||
self.setText(QtCore.QString(str(val)))
|
||||
self.setText(str(val))
|
||||
|
||||
|
||||
class FloatEntry(QtGui.QLineEdit):
|
||||
@@ -115,7 +115,7 @@ class FloatEntry(QtGui.QLineEdit):
|
||||
def returnPressed(self, *args, **kwargs):
|
||||
val = self.get_value()
|
||||
if val is not None:
|
||||
self.set_text(QtCore.QString(str(val)))
|
||||
self.set_text(str(val))
|
||||
else:
|
||||
log.warning("Could not interpret entry: %s" % self.text())
|
||||
|
||||
@@ -151,10 +151,10 @@ class IntEntry(QtGui.QLineEdit):
|
||||
def set_value(self, val):
|
||||
|
||||
if val == self.empty_val and self.allow_empty:
|
||||
self.setText(QtCore.QString(""))
|
||||
self.setText("")
|
||||
return
|
||||
|
||||
self.setText(QtCore.QString(str(val)))
|
||||
self.setText(str(val))
|
||||
|
||||
|
||||
class FCEntry(QtGui.QLineEdit):
|
||||
@@ -165,7 +165,7 @@ class FCEntry(QtGui.QLineEdit):
|
||||
return str(self.text())
|
||||
|
||||
def set_value(self, val):
|
||||
self.setText(QtCore.QString(str(val)))
|
||||
self.setText(str(val))
|
||||
|
||||
|
||||
class EvalEntry(QtGui.QLineEdit):
|
||||
@@ -175,7 +175,7 @@ class EvalEntry(QtGui.QLineEdit):
|
||||
def returnPressed(self, *args, **kwargs):
|
||||
val = self.get_value()
|
||||
if val is not None:
|
||||
self.setText(QtCore.QString(str(val)))
|
||||
self.setText(str(val))
|
||||
else:
|
||||
log.warning("Could not interpret entry: %s" % self.get_text())
|
||||
|
||||
@@ -188,12 +188,12 @@ class EvalEntry(QtGui.QLineEdit):
|
||||
return None
|
||||
|
||||
def set_value(self, val):
|
||||
self.setText(QtCore.QString(str(val)))
|
||||
self.setText(str(val))
|
||||
|
||||
|
||||
class FCCheckBox(QtGui.QCheckBox):
|
||||
def __init__(self, label='', parent=None):
|
||||
super(FCCheckBox, self).__init__(QtCore.QString(label), parent)
|
||||
super(FCCheckBox, self).__init__(str(label), parent)
|
||||
|
||||
def get_value(self):
|
||||
return self.isChecked()
|
||||
|
||||
Reference in New Issue
Block a user