@@ -822,12 +822,12 class Project(): | |||||
822 |
|
822 | |||
823 | __plotterQueue = None |
|
823 | __plotterQueue = None | |
824 |
|
824 | |||
825 |
def __init__(self, filename= |
|
825 | def __init__(self, filename=None, plotter_queue=None): | |
826 |
|
826 | |||
827 | self.id = None |
|
827 | self.id = None | |
828 | self.name = None |
|
828 | self.name = None | |
829 | self.description = None |
|
829 | self.description = None | |
830 |
|
830 | |||
831 | self.filename = filename |
|
831 | self.filename = filename | |
832 | self.__plotterQueue = plotter_queue |
|
832 | self.__plotterQueue = plotter_queue | |
833 |
|
833 | |||
@@ -957,8 +957,15 class Project(): | |||||
957 |
|
957 | |||
958 | self.projectElement = projectElement |
|
958 | self.projectElement = projectElement | |
959 |
|
959 | |||
960 | def writeXml(self, filename): |
|
960 | def writeXml(self, filename=None): | |
961 |
|
961 | |||
|
962 | if filename == None: | |||
|
963 | filename = self.filename | |||
|
964 | ||||
|
965 | if not filename: | |||
|
966 | print "filename has not been defined. Use setFilename(filename) for do it." | |||
|
967 | return 0 | |||
|
968 | ||||
962 | abs_file = os.path.abspath(filename) |
|
969 | abs_file = os.path.abspath(filename) | |
963 |
|
970 | |||
964 | if not os.access(os.path.dirname(abs_file), os.W_OK): |
|
971 | if not os.access(os.path.dirname(abs_file), os.W_OK): | |
@@ -973,12 +980,13 class Project(): | |||||
973 |
|
980 | |||
974 | ElementTree(self.projectElement).write(abs_file, method='xml') |
|
981 | ElementTree(self.projectElement).write(abs_file, method='xml') | |
975 |
|
982 | |||
976 | self.filename = abs_file |
|
|||
977 |
|
||||
978 | return 1 |
|
983 | return 1 | |
979 |
|
984 | |||
980 | def readXml(self, filename): |
|
985 | def readXml(self, filename = None): | |
981 |
|
986 | |||
|
987 | if filename == None: | |||
|
988 | filename = self.filename | |||
|
989 | ||||
982 | abs_file = os.path.abspath(filename) |
|
990 | abs_file = os.path.abspath(filename) | |
983 |
|
991 | |||
984 | if not os.path.isfile(abs_file): |
|
992 | if not os.path.isfile(abs_file): | |
@@ -1018,6 +1026,9 class Project(): | |||||
1018 |
|
1026 | |||
1019 | self.procUnitConfObjDict[procUnitConfObj.getId()] = procUnitConfObj |
|
1027 | self.procUnitConfObjDict[procUnitConfObj.getId()] = procUnitConfObj | |
1020 |
|
1028 | |||
|
1029 | if self.filename == None: | |||
|
1030 | self.filename = abs_file | |||
|
1031 | ||||
1021 | return 1 |
|
1032 | return 1 | |
1022 |
|
1033 | |||
1023 | def printattr(self): |
|
1034 | def printattr(self): | |
@@ -1188,7 +1199,7 class Project(): | |||||
1188 |
|
1199 | |||
1189 | def start(self): |
|
1200 | def start(self): | |
1190 |
|
1201 | |||
1191 |
if not self.writeXml( |
|
1202 | if not self.writeXml(): | |
1192 | return |
|
1203 | return | |
1193 |
|
1204 | |||
1194 | self.createObjects() |
|
1205 | self.createObjects() |
General Comments 0
You need to be logged in to leave comments.
Login now