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

python: Spreadsheet: *.py: Fix python3 syntax

Browse Source
This commit is contained in:
Priit Laes 2016-03-12 15:08:38 +02:00 committed by wmayer
parent b115d794a7
commit f9cb89a9cb
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/Mod/Spreadsheet/App/Spreadsheet_legacy.py
View File

@ -232,7 +232,7 @@ class Spreadsheet:
def __setattr__(self, key, value): def __setattr__(self, key, value):
if self.isKey(key): if self.isKey(key):
key = key.lower() key = key.lower()
if DEBUG: print "Setting key ",key," to value ",value if DEBUG: print("Setting key ",key," to value ",value)
if (value == "") or (value == None): if (value == "") or (value == None):
# remove cell # remove cell
if key in self._cells.keys(): if key in self._cells.keys():
@ -261,7 +261,7 @@ class Spreadsheet:
try: try:
e = self.evaluate(key) e = self.evaluate(key)
except: except:
print "Spreadsheet: Error evaluating formula" print("Spreadsheet: Error evaluating formula")
return None return None
else: else:
return e return e
@ -432,17 +432,17 @@ class Spreadsheet:
if self.isNumeric(e): if self.isNumeric(e):
result += str(self.evaluate(e)) result += str(self.evaluate(e))
else: else:
print "Spreadsheet: Error evaluating formula" print("Spreadsheet: Error evaluating formula")
return return
elif self.isNumeric(e): elif self.isNumeric(e):
result += str(self._cells[e.lower()]) result += str(self._cells[e.lower()])
else: else:
result += e result += e
if DEBUG: print "Evaluating ",result if DEBUG: print("Evaluating ",result)
try: try:
p = MathParser(result) p = MathParser(result)
result = p.getValue() result = p.getValue()
except Exception as (ex): except Exception as ex:
raise # raise #
#msg = ex.message #msg = ex.message
#raise Exception(msg) #would discard the type #raise Exception(msg) #would discard the type
@ -605,7 +605,7 @@ class SpreadsheetController:
try: try:
setattr(spreadsheet.Proxy,obj.BaseCell,len(dataset)) setattr(spreadsheet.Proxy,obj.BaseCell,len(dataset))
except: except:
print "Spreadsheet: Error counting objects" print("Spreadsheet: Error counting objects")
elif obj.Data: elif obj.Data:
for i in range(len(dataset)): for i in range(len(dataset)):
# get the correct cell key # get the correct cell key
@ -618,13 +618,13 @@ class SpreadsheetController:
else: else:
r = int(r) + i r = int(r) + i
cell = c+str(r) cell = c+str(r)
if DEBUG: print "auto setting cell ",cell if DEBUG: print("auto setting cell ",cell)
if spreadsheet.Proxy.isKey(cell): if spreadsheet.Proxy.isKey(cell):
# get the contents # get the contents
args = obj.Data.split(".") args = obj.Data.split(".")
value = dataset[i] value = dataset[i]
for arg in args: for arg in args:
print arg print(arg)
if hasattr(value,arg): if hasattr(value,arg):
value = getattr(value,arg) value = getattr(value,arg)
try: try:
@ -634,9 +634,9 @@ class SpreadsheetController:
value = str(value) value = str(value)
value = ''.join([ c for c in value if c not in ('<','>',':')]) value = ''.join([ c for c in value if c not in ('<','>',':')])
setattr(spreadsheet.Proxy,cell,value) setattr(spreadsheet.Proxy,cell,value)
if DEBUG: print "setting cell ",cell," to value ",value if DEBUG: print("setting cell ",cell," to value ",value)
except: except:
print "Spreadsheet: Error retrieving property "+obj.Data+" from object "+dataset[i].Name print("Spreadsheet: Error retrieving property "+obj.Data+" from object "+dataset[i].Name)
class ViewProviderSpreadsheetController: class ViewProviderSpreadsheetController:
@ -671,7 +671,7 @@ class SpreadsheetPropertyController:
try: try:
value = getattr(sp.Proxy,obj.Cell) value = getattr(sp.Proxy,obj.Cell)
except: except:
if DEBUG: print "No value for cell ",obj.Cell," in spreadsheet." if DEBUG: print("No value for cell ",obj.Cell," in spreadsheet.")
return return
if obj.TargetType == "Property": if obj.TargetType == "Property":
b = obj.TargetObject b = obj.TargetObject
@ -685,9 +685,9 @@ class SpreadsheetPropertyController:
try: try:
setattr(b,p,value) setattr(b,p,value)
FreeCAD.ActiveDocument.recompute() FreeCAD.ActiveDocument.recompute()
if DEBUG: print "setting property ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value if DEBUG: print("setting property ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value)
except: except:
if DEBUG: print "unable to set property ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value if DEBUG: print("unable to set property ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value)
else: else:
if Draft.getType(obj.TargetObject) == "Sketch": if Draft.getType(obj.TargetObject) == "Sketch":
if obj.TargetProperty.isdigit(): if obj.TargetProperty.isdigit():
@ -696,17 +696,17 @@ class SpreadsheetPropertyController:
c = int(obj.TargetProperty) c = int(obj.TargetProperty)
obj.TargetObject.setDatum(c,float(value)) obj.TargetObject.setDatum(c,float(value))
FreeCAD.ActiveDocument.recompute() FreeCAD.ActiveDocument.recompute()
if DEBUG: print "setting constraint ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value if DEBUG: print("setting constraint ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value)
except: except:
if DEBUG: print "unable to set constraint ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value if DEBUG: print("unable to set constraint ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value)
else: else:
# try setting by constraint name # try setting by constraint name
try: try:
obj.TargetObject.setDatum(obj.TargetProperty,float(value)) obj.TargetObject.setDatum(obj.TargetProperty,float(value))
FreeCAD.ActiveDocument.recompute() FreeCAD.ActiveDocument.recompute()
if DEBUG: print "setting constraint ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value if DEBUG: print("setting constraint ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value)
except: except:
if DEBUG: print "unable to set constraint ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value if DEBUG: print("unable to set constraint ",obj.TargetProperty, " of object ",obj.TargetObject.Name, " to ",value)
def __getstate__(self): def __getstate__(self):
@ -785,7 +785,7 @@ class SpreadsheetView(QtGui.QWidget):
QtCore.QObject.connect(self.computeButton, QtCore.SIGNAL("clicked()"), self.recompute) QtCore.QObject.connect(self.computeButton, QtCore.SIGNAL("clicked()"), self.recompute)
def closeEvent(self, event): def closeEvent(self, event):
#if DEBUG: print "Closing spreadsheet view" #if DEBUG: print("Closing spreadsheet view")
if self.spreadsheet: if self.spreadsheet:
# before deleting this view, we remove the reference to it in the object # before deleting this view, we remove the reference to it in the object
if hasattr(self.spreadsheet,"ViewObject"): if hasattr(self.spreadsheet,"ViewObject"):
@ -811,7 +811,7 @@ class SpreadsheetView(QtGui.QWidget):
self.doNotChange = True self.doNotChange = True
if content == None: if content == None:
content = "" content = ""
if DEBUG: print "Updating ",cell," to ",content if DEBUG: print("Updating ",cell," to ",content)
if self.table.item(r,c): if self.table.item(r,c):
self.table.item(r,c).setText(str(content)) self.table.item(r,c).setText(str(content))
else: else:
@ -834,20 +834,20 @@ class SpreadsheetView(QtGui.QWidget):
def changeCell(self,r,c,value=None): def changeCell(self,r,c,value=None):
"changes the contens of a cell" "changes the contens of a cell"
if self.doNotChange: if self.doNotChange:
if DEBUG: print "DoNotChange flag is set" if DEBUG: print("DoNotChange flag is set")
self.doNotChange = False self.doNotChange = False
elif self.spreadsheet: elif self.spreadsheet:
key = "abcdefghijklmnopqrstuvwxyz"[c]+str(r+1) key = "abcdefghijklmnopqrstuvwxyz"[c]+str(r+1)
if value == None: if value == None:
value = self.table.item(r,c).text() value = self.table.item(r,c).text()
if value == "": if value == "":
if DEBUG: print "Wiping "+key if DEBUG: print("Wiping "+key)
if self.table.item(r,c): if self.table.item(r,c):
self.table.item(r,c).setText("") self.table.item(r,c).setText("")
if key in self.spreadsheet.Proxy._cells.keys(): if key in self.spreadsheet.Proxy._cells.keys():
del self.spreadsheet.Proxy._cells[key] del self.spreadsheet.Proxy._cells[key]
else: else:
if DEBUG: print "Changing "+key+" to "+value if DEBUG: print("Changing "+key+" to "+value)
# store the entry as best as possible # store the entry as best as possible
try: try:
v = int(value) v = int(value)
@ -870,7 +870,7 @@ class SpreadsheetView(QtGui.QWidget):
if self.spreadsheet: if self.spreadsheet:
c = "abcdefghijklmnopqrstuvwxyz"[c] c = "abcdefghijklmnopqrstuvwxyz"[c]
r = r+1 r = r+1
if DEBUG: print "Active cell "+c+str(r) if DEBUG: print("Active cell "+c+str(r))
from DraftTools import translate from DraftTools import translate
self.label.setText(str(translate("Spreadsheet","Cell"))+" "+c.upper()+str(r)+" :") self.label.setText(str(translate("Spreadsheet","Cell"))+" "+c.upper()+str(r)+" :")
content = self.spreadsheet.Proxy.getFunction(c+str(r)) content = self.spreadsheet.Proxy.getFunction(c+str(r))
@ -881,13 +881,13 @@ class SpreadsheetView(QtGui.QWidget):
def getEditLine(self): def getEditLine(self):
"called when something has been entered in the edit line" "called when something has been entered in the edit line"
txt = str(self.lineEdit.text()) txt = str(self.lineEdit.text())
if DEBUG: print "Text edited ",txt if DEBUG: print("Text edited ",txt)
r = self.table.currentRow() r = self.table.currentRow()
c = self.table.currentColumn() c = self.table.currentColumn()
self.changeCell(r,c,txt) self.changeCell(r,c,txt)
def wipeCell(self): def wipeCell(self):
if DEBUG: print "Wiping cell" if DEBUG: print("Wiping cell")
self.lineEdit.setText("") self.lineEdit.setText("")
self.getEditLine() self.getEditLine()
@ -1070,7 +1070,7 @@ def read(filename):
cn = 0 cn = 0
for c in row[:26]: for c in row[:26]:
cl = "abcdefghijklmnopqrstuvwxyz"[cn] cl = "abcdefghijklmnopqrstuvwxyz"[cn]
#print "setting ",cl+str(rn)," ",c #print("setting ",cl+str(rn)," ",c)
try: try:
c = int(c) c = int(c)
except ValueError: except ValueError:
@ -1081,21 +1081,21 @@ def read(filename):
setattr(sp.Proxy,cl+str(rn),c) setattr(sp.Proxy,cl+str(rn),c)
cn += 1 cn += 1
rn += 1 rn += 1
print "successfully imported ",filename print("successfully imported ",filename)
def export(exportList,filename): def export(exportList,filename):
"called when freecad exports a csv file" "called when freecad exports a csv file"
import csv, Draft import csv, Draft
if not exportList: if not exportList:
print "Spreadsheet: Nothing to export" print("Spreadsheet: Nothing to export")
return return
obj = exportList[0] obj = exportList[0]
if Draft.getType(obj) != "Spreadsheet": if Draft.getType(obj) != "Spreadsheet":
print "Spreadhseet: The selected object is not a spreadsheet" print("Spreadhseet: The selected object is not a spreadsheet")
return return
if not obj.Proxy._cells: if not obj.Proxy._cells:
print "Spreadsheet: The selected spreadsheet contains no cell" print("Spreadsheet: The selected spreadsheet contains no cell")
return return
numcols = ("abcdefghijklmnopqrstuvwxyz".index(str(obj.Proxy.cols[-1])))+1 numcols = ("abcdefghijklmnopqrstuvwxyz".index(str(obj.Proxy.cols[-1])))+1
numrows = int(obj.Proxy.rows[-1]) numrows = int(obj.Proxy.rows[-1])
@ -1110,7 +1110,7 @@ def export(exportList,filename):
else: else:
r.append("") r.append("")
csvfile.writerow(r) csvfile.writerow(r)
print "successfully exported ",filename print("successfully exported ",filename)
#FreeCADGui.addCommand('Spreadsheet_Create',_Command_Spreadsheet_Create()) #FreeCADGui.addCommand('Spreadsheet_Create',_Command_Spreadsheet_Create())