##// END OF EJS Templates
Bug fixed in controller_api.py: reading xml file but not writing
Miguel Valdez -
r695:33996c3ce4a6
parent child
Show More
@@ -57,7 +57,9 class ControllerThread(threading.Thread, Project):
57 57 self.control['stop'] = False
58 58 self.control['pause'] = False
59 59
60 self.readXml(self.filename)
60 if not self.writeXml(self.filename):
61 return
62
61 63 self.createObjects()
62 64 self.connectObjects()
63 65 Project.run(self)
@@ -2,19 +2,21
2 2 """
3 3 Module implementing MainWindow.
4 4 #+++++++++++++GUI V1++++++++++++++#
5 @author: AlexanderValdezPortocarrero Γ±_Γ±
5 @author: AlexanderValdezPortocarrero
6
7 #+++++++++++++GUI V2++++++++++++++#
8 @author Miguel Urco
6 9 """
7 import os, sys, time
10 import os, sys
8 11 import datetime
9 12 import numpy
10 import Queue
13 import ast
14
15 from Queue import Queue
11 16
12 17 from collections import OrderedDict
13 18 from os.path import expanduser
14 19 from time import sleep
15 # from gevent import sleep
16
17 import ast
18 20
19 21 from PyQt4.QtGui import QMainWindow
20 22 from PyQt4.QtCore import pyqtSignature
@@ -2405,7 +2407,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
2405 2407 freq = False
2406 2408 height = False
2407 2409 db = False
2408 time = False
2410 timerange = False
2409 2411 magnitud = False
2410 2412 phase = False
2411 2413 channelList = False
@@ -2426,12 +2428,12 class BasicWindow(QMainWindow, Ui_BasicWindow):
2426 2428 if self.specGraphCebRTIplot.checkState():
2427 2429 height = True
2428 2430 db = True
2429 time = True
2431 timerange = True
2430 2432 channelList = True
2431 2433
2432 2434 if self.specGraphCebCoherencmap.checkState():
2433 2435 height = True
2434 time = True
2436 timerange = True
2435 2437 magnitud = True
2436 2438 phase = True
2437 2439
@@ -2442,14 +2444,14 class BasicWindow(QMainWindow, Ui_BasicWindow):
2442 2444
2443 2445 if self.specGraphCebRTInoise.checkState():
2444 2446 db = True
2445 time = True
2447 timerange = True
2446 2448 channelList = True
2447 2449
2448 2450
2449 2451 self.specGgraphFreq.setEnabled(freq)
2450 2452 self.specGgraphHeight.setEnabled(height)
2451 2453 self.specGgraphDbsrange.setEnabled(db)
2452 self.specGgraphTminTmax.setEnabled(time)
2454 self.specGgraphTminTmax.setEnabled(timerange)
2453 2455
2454 2456 self.specGgraphmagnitud.setEnabled(magnitud)
2455 2457 self.specGgraphPhase.setEnabled(phase)
@@ -4703,20 +4705,20 class BasicWindow(QMainWindow, Ui_BasicWindow):
4703 4705 filename = TEMPORAL_FILE
4704 4706 projectObj.writeXml( os.path.join(self.pathWorkSpace,filename) )
4705 4707
4706 self.console.append("Please Wait...")
4708 self.console.clear()
4709 self.console.append("Please wait...")
4707 4710
4708 4711 self.controllerThread = ControllerThread(filename)
4709
4710 # QObject.connect( self.controllerThread, SIGNAL( "jobFinished( PyQt_PyObject )" ), self.jobFinishedFromThread )
4711 # QObject.connect( self.controllerThread, SIGNAL( "jobStarted( PyQt_PyObject )" ), self.jobStartedFromThread )
4712 self.console.clear()
4713 4712 self.controllerThread.start()
4713
4714 4714 sleep(0.5)
4715
4715 4716 self.threadStarted = True
4716 4717
4717 4718 self._disable_play_button()
4718 4719 self._disable_save_button()
4719 4720 self._enable_stop_button()
4721 self.console.clear()
4720 4722
4721 4723 def stopProject(self):
4722 4724
General Comments 0
You need to be logged in to leave comments. Login now