diff --git a/CEP/Calibration/BBSControl/scripts/plotwindow.py b/CEP/Calibration/BBSControl/scripts/plotwindow.py
index 8749503af9a8cbd36e2e3b4d96f7f751c4fb5bdf..cf8be2525dd968065ba571187b3287d558babe90 100755
--- a/CEP/Calibration/BBSControl/scripts/plotwindow.py
+++ b/CEP/Calibration/BBSControl/scripts/plotwindow.py
@@ -228,13 +228,13 @@ class PlotWindow(QFrame):
self.show() # show the plotWindow widget
self.parent.setXLabel()
self.parent.setYLabel()
-
+ s
# Matplotlib event connections
#if self.showMarker==True:
# cid = self.fig.canvas.mpl_connect('motion_notify_event', self.update_marker)
# cid = self.fig.canvas.mpl_connect('button_press_event', onclick)
- cid = self.fig.canvas.mpl_connect('motion_notify_event', self.on_solverMessage)
+ cid = self.fig.canvas.mpl_connect('motion_notify_event', self.on_solverMessage) # TODO: this doesn work
self.cursorId = self.fig.canvas.mpl_connect('button_press_event', self.on_click)
self.plot()
@@ -400,10 +400,14 @@ class PlotWindow(QFrame):
#self.solverMessageText.setText(self.messages[resultType][index])
self.solverMessageText.setReadOnly(False) # make it writable
+
+ print "resultType =", resultType # DEBUG
if resultType=="last":
- self.solverMessageText.setText(self.messages[resultType][index])
+ #self.solverMessageText.setText(self.messages[resultType][index])
+ self.solverMessageText.setText(self.messages[index])
elif resultType=="all":
- self.solverMessageText.setText(self.messages[resultType][index])
+ #self.solverMessageText.setText(self.messages[resultType][index])
+ self.solverMessageText.setText(self.messages[index])
elif resultType==None:
print "on_solverMessage() None messages"
return
diff --git a/CEP/Calibration/BBSControl/scripts/solverdialog.py b/CEP/Calibration/BBSControl/scripts/solverdialog.py
index 1a9396b556d4fbbd802453258d824dd5edf8bc29..04cfc76ffe33674b63da793b0d29f20ee3b4957c 100755
--- a/CEP/Calibration/BBSControl/scripts/solverdialog.py
+++ b/CEP/Calibration/BBSControl/scripts/solverdialog.py
@@ -5,14 +5,16 @@
# File: solverdialog.py
# Author: Sven Duscha (duscha@astron.nl)
# Date: 2010-08-05
-# Last change; 2011-12-11
+# Last change; 2012-09-27
#
#
# Import
import sys, os, random
-import lofar.bbs.solverquery as sq
+#import lofar.bbs.solverquery as sq
import lofar.bbs.plotwindow
+import solverquery as sq # DEBUG!!!
+#import plotwindow # DEBUG!!!
import lofar.parmdb as parmdb
@@ -870,7 +872,8 @@ class SolverAppForm(QMainWindow):
self.getMessages() # get dictionary with solver messages
# TODO: get current PlotWindow
- self.plots.append(lofar.bbs.plotwindow.PlotWindow(self)) # call PlotWindow class with this class as parent
+ self.plots.append(lofar.bbs.plotwindow.PlotWindow(self)) # call PlotWindow class with this class as parent
+ #self.plots.append(plotwindow.PlotWindow(self)) # DEBUG
print "on_plot() finished drawing"
@@ -1127,7 +1130,6 @@ class SolverAppForm(QMainWindow):
# This solverQuery functions fetches the parameter along with the corresponding time stamps
y, x=self.solverQuery.readParameter(parameter, start_time, end_time, start_freq, end_freq)
-
return x, y["last"]
# If we plot a single solution per iteration
@@ -1152,9 +1154,6 @@ class SolverAppForm(QMainWindow):
print "getSolutions() start_time = ", start_time, " end_time = ", end_time # DEBUG
y, x=self.solverQuery.getSolution(start_time, end_time, start_freq, end_freq)
-
- # This then calls Joris' plot function
- #self.plot(self.fig, y["last"], x, sub=parsub, scatter=scatter, clf=self.clf)
return y, x
elif parameter == "CORRMATRIX":
@@ -1171,7 +1170,9 @@ class SolverAppForm(QMainWindow):
#y=self.solverQuery.readParameter(parameter, start_time, end_time, start_freq, end_freq)
#x=self.solverQuery.getMidTimes(start_time, end_time)
- #self.plot(self.fig, y['last'], x, sub=111, scatter=scatter, clf=self.clf) # OLD
+ print "x=",x # DEBUG
+ print "y=",y # DEBUG
+
return x, y['last']
else:
diff --git a/CEP/Calibration/BBSControl/scripts/solverquery.py b/CEP/Calibration/BBSControl/scripts/solverquery.py
index 9405499dba5cabb81a5fd33eaa58d38c043e9fed..d23430a5be02417e287bbd4cc90822fe52f9426a 100644
--- a/CEP/Calibration/BBSControl/scripts/solverquery.py
+++ b/CEP/Calibration/BBSControl/scripts/solverquery.py
@@ -140,7 +140,7 @@ class SolverQuery:
if iteration is "last":
#print "readParameter(): last" # DEBUG
# Fetch requested parameter for time and freq where LASTITER=TRUE
- taqlcmd = "SELECT * FROM " + self.tablename + " WHERE STARTTIME >= "+ str(start_time) + " AND ENDTIME <= " + str(end_time) + " AND STARTFREQ >= "+ str(start_freq) + " AND ENDFREQ <= " + str(end_freq) + " AND LASTITER=TRUE"
+ taqlcmd = "SELECT * FROM " + self.tablename + " WHERE STARTTIME >= "+ str(start_time) + " AND ENDTIME <= " + str(end_time) + " AND STARTFREQ >= "+ str(start_freq) + " AND ENDFREQ <= " + str(end_freq) + " AND LASTITER=TRUE ORDER BY STARTTIME"
result=pt.taql(taqlcmd)
parameter=result.getcol(parameter_name)
@@ -151,6 +151,9 @@ class SolverQuery:
else:
starttimes = result.getcol('STARTTIME')
+ print "sq::starttimes =", starttimes # DEBUG
+ print "sq::starttimes.sort() =", starttimes.sort() # DEBUG
+
#print "readParameter(): len(parameter): ", len(parameter) # DEBUG
#print "readParameter() result.nrows() = ", result.nrows()
@@ -168,7 +171,7 @@ class SolverQuery:
parameter=result.getcol(parameter_name)
if self.convertTime == True:
- taqlcmd= "SELECT STARTTIME FROM " + self.tablename + " WHERE STARTTIME >= "+ str(start_time) + " AND ENDTIME <= " + str(end_time) + " AND STARTFREQ >= "+ str(start_freq) + " AND ENDFREQ <= " + str(end_freq) + " AND LASTITER=TRUE"
+ taqlcmd= "SELECT STARTTIME FROM " + self.tablename + " WHERE STARTTIME >= "+ str(start_time) + " AND ENDTIME <= " + str(end_time) + " AND STARTFREQ >= "+ str(start_freq) + " AND ENDFREQ <= " + str(end_freq) + " AND LASTITER=TRUE ORDER BY STARTTIME"
resultTime=pt.taql(taqlcmd)
starttimes = resultTime.getcol('STARTTIME')
else:
@@ -190,7 +193,7 @@ class SolverQuery:
if self.convertTime == False:
starttimes = result.getcol('STARTTIME')
else:
- taqlcmd="SELECT CTOD(STARTTIME s) FROM " + self.tablename
+ taqlcmd="SELECT CTOD(STARTTIME s) FROM " + self.tablename + " ORDER BY STARTTIME"
resultTime=pt.taql(timecmd)
starttimes = resultTime.getcol('STARTTIME')
@@ -985,7 +988,7 @@ class SolverQuery:
# Measurementset
#
def getStartTimes(self):
- taqlcmd="SELECT UNIQUE STARTTIME FROM " + self.tablename
+ taqlcmd="SELECT UNIQUE STARTTIME FROM " + self.tablename + " ORDER BY STARTTIME"
self.startTimes=pt.taql(taqlcmd)
@@ -1073,7 +1076,7 @@ class SolverQuery:
# Measurementset
#
def setStartFreqs(self):
- taqlcmd="SELECT UNIQUE STARTFREQ FROM " + self.tablename
+ taqlcmd="SELECT UNIQUE STARTFREQ FROM " + self.tablename + " ORDER BY STARTTIME"
self.startFreqs=pt.taql(taqlcmd)