Changeset 317

Timestamp:

12/12/11 10:00:56 (9 years ago)

Author:

sc

Message:

Interface:

• support for declaring filename when saving or exporting session data

File:

• trunk/Puzzlebox/Synapse/Interface.py (modified) (4 diffs)

trunk/Puzzlebox/Synapse/Interface.py

@@ -1001 +1001 @@
         ##################################################################
         
-        def saveData(self, source=None, target=None):
+        def saveData(self, source=None, target=None, output_file=None):
                 
                 if source == None:
@@ -1024 +1024 @@
                 default_filename = os.path.join(self.homepath, default_filename)
                 
-                output_file = QtGui.QFileDialog.getSaveFileName(parent=target, \
-                                 caption="Save Session Data to File", \
-                                 dir=default_filename, \
-                                 filter="Puzzlebox Synapse Data File (*.synapse)")
-                
-                try:
-                        output_file = output_file[0]
-                except:
-                        output_file = ''
+                if output_file == None:
+                        output_file = QtGui.QFileDialog.getSaveFileName(parent=target, \
+                                         caption="Save Session Data to File", \
+                                         dir=default_filename, \
+                                         filter="Puzzlebox Synapse Data File (*.synapse)")
+                        
+                        try:
+                                output_file = output_file[0]
+                        except:
+                                output_file = ''
+                
                 
                 if output_file == '':
@@ -1044 +1046 @@
         ##################################################################
         
-        def exportData(self, parent=None, source=None, target=None):
+        def exportData(self, parent=None, source=None, target=None, output_file=None):
                 
                 if parent == None:
@@ -1071 +1073 @@
                 default_filename = os.path.join(target.homepath, default_filename)
                 
-                output_file = QtGui.QFileDialog.getSaveFileName(parent=target, \
-                                 caption="Export Session Data to File", \
-                                 dir=default_filename, \
-                                 filter="CSV File (*.csv);;Text File (*.txt)")
-                
-                try:
-                        output_file = output_file[0]
-                except:
-                        output_file = ''
+                
+                if output_file == None:
+                        output_file = QtGui.QFileDialog.getSaveFileName(parent=target, \
+                                         caption="Export Session Data to File", \
+                                         dir=default_filename, \
+                                         filter="CSV File (*.csv);;Text File (*.txt)")
+                
+                        try:
+                                output_file = output_file[0]
+                        except:
+                                output_file = ''
+                
                 
                 if output_file == '':
                         return
+                
                 
                 if str(output_file).endswith('.csv'):