tauruslib-devel — taurus development mailing list

[tauruslib-devel] [PATCH] Implement feat-161: maintain sort order of sets

[cpascual <cpa...@ce...>]

When exporting data from a plot (or trend) to ascii, the sorting
order is alphabetical, which may not correspond to the order in
which the curves are ordered in the plot, and this confuses the
users. Use Z-order of the plot instead of alphabetical.

Also, fix a bug preventing the export of "all sets in one file"
feature.
---
 lib/taurus/qt/qtgui/panel/qdataexportdialog.py | 29 ++++++++++++++++----------
 lib/taurus/qt/qtgui/plot/taurusplot.py         |  3 ++-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/taurus/qt/qtgui/panel/qdataexportdialog.py b/lib/taurus/qt/qtgui/panel/qdataexportdialog.py
index 7dfaaaf..ecd2cb9 100644
--- a/lib/taurus/qt/qtgui/panel/qdataexportdialog.py
+++ b/lib/taurus/qt/qtgui/panel/qdataexportdialog.py
@@ -50,7 +50,7 @@ class QDataExportDialog(Qt.QDialog):
     allInSingleFile = "All sets in a single file (table like)"
     allInMultipleFiles = "All set in multiple files"
 
-    def __init__(self, parent=None, datadict=None):
+    def __init__(self, parent=None, datadict=None, sortedNames=None):
         super(QDataExportDialog,self).__init__(parent)
         self.loadUi()
         self._xIsTime = False
@@ -59,17 +59,21 @@ class QDataExportDialog(Qt.QDialog):
         Qt.QObject.connect(self.exportBT,Qt.SIGNAL("clicked()"),self.exportData)
         Qt.QObject.connect(self.dataSetCB,Qt.SIGNAL("currentIndexChanged(const QString&)"),self.onDataSetCBChange)
         
-        self.setDataSets(datadict)
+        self.setDataSets(datadict, sortedNames)
+        
 
 
-    def setDataSets(self, datadict):
+    def setDataSets(self, datadict, sortedNames=None):
         """Used to set the sets that are to be offered for exporting. It overwrites previous values.
         """
         if datadict is None: return
+        if sortedNames is None:
+            sortedNames = sorted(self.datadict.keys())
+        self.sortedNames = sortedNames
         self.datatime=datetime.now()
         self.datadict=datadict
         self.dataSetCB.clear()
-        self.dataSetCB.insertItems(0,sorted(self.datadict.keys()))
+        self.dataSetCB.insertItems(0, sortedNames)
         if len(self.datadict.keys()) > 1:
             self.dataSetCB.insertItems(0,[self.allInSingleFile, self.allInMultipleFiles])
 
@@ -118,7 +122,7 @@ class QDataExportDialog(Qt.QDialog):
             outputdir=Qt.QFileDialog.getExistingDirectory (self, 'Export Directory', Qt.QString())
             if not outputdir:return False
             preffix=os.path.join(str(outputdir),"set")
-        for i,k in zip(range(len(self.datadict)),sorted(self.datadict.keys())):
+        for i,k in zip(range(len(self.datadict)), self.sortedNames):
             ofile="%s%03i.dat"%(preffix,i+1)
             try:
                 self.exportCurrentData(set=k,ofile=ofile,verbose=False,AllowCloseAfter=False)
@@ -143,9 +147,12 @@ class QDataExportDialog(Qt.QDialog):
             header = "# DATASET= " 
             body = ""
             previous = None
-            for curve_name in sorted(self.datadict.keys()):
+            for curve_name in self.sortedNames:
                 xdata, ydata = self.datadict[curve_name]
-                if (previous is not None) and (previous != xdata):
+                if previous is None:
+                    previous = xdata
+                    header +=' "abscissa"'
+                elif previous != xdata:
                     if (key==self.allInSingleFile):
                         self.dataTE.clear()
                         Qt.QMessageBox.critical(self,\
@@ -158,17 +165,17 @@ class QDataExportDialog(Qt.QDialog):
                         self.dataTE.insertPlainText("Unable to display because abscissas are different.\n"\
                                                     "Curves will be saved each one in its own file")
                         return
-                else:
-                    previous = xdata
-                    header +=' "abscissa", "%s"' % curve_name
+                header +=' , "%s"' % curve_name
+            
             header+="\n# SNAPSHOT_TIME= %s\n"%self.datatime.isoformat('_')
             #if we reached this point x axes are equal, so fill the editor with the data
             for i, x in enumerate(previous):
                 if self.xIsTime():
+                    t=datetime.fromtimestamp(x)
                     body += "%s" % t.isoformat('_')
                 else:
                     body += "%g" % x
-                for curve_name in sorted(self.datadict.keys()):
+                for curve_name in self.sortedNames:
                     xdata, ydata = self.datadict[curve_name]
                     body += ("\t%g" % ydata[i])
                 body+="\n"
diff --git a/lib/taurus/qt/qtgui/plot/taurusplot.py b/lib/taurus/qt/qtgui/plot/taurusplot.py
index d67f826..f841615 100644
--- a/lib/taurus/qt/qtgui/plot/taurusplot.py
+++ b/lib/taurus/qt/qtgui/plot/taurusplot.py
@@ -2535,7 +2535,8 @@ class TaurusPlot(Qwt5.QwtPlot, TaurusBaseWidget):
         if klass is None:
             from taurus.qt.qtgui.panel import QDataExportDialog
             klass = QDataExportDialog
-        dialog = klass(parent=self, datadict=frozendata)
+        dialog = klass(parent=self, datadict=frozendata, 
+                       sortedNames=self.getCurveNamesSorted())
         dialog.setXIsTime(self.getXIsTime())
         return dialog.exec_()
 
-- 
2.1.4

[tauruslib-devel] TEP8 passing to CANDIDATE

[Carlos M. F. T. <cf...@ce...>]

Hi all,

TEP8 wiki has not been changed for more than a year and nobody has done 
any commented  about the goals and proposal done during the DRAFT step . 
I consider that TEP8 can be passed to CANDIDATE.

Most of the development have been done and can be tested using the TEP8 
branch of the ctgensoft-taurus fork.

Please feel free to give a look at the current proposal and comment it
(during the CANDIDATE phase we can still alter the document if the
implementation requires it)

Cheers,

Carlos Falcón

[tauruslib-devel] Updates in SEPs & TEPs

[Carlos P. <cpa...@ce...>]

Hi,

I've been checking the SEPs and TEPs wiki pages and found some of them 
being outdated (changes in state of the SEP not being up-to-date, wrong 
dates, etc).

I made edits in the following in SEP5, SEP10, SEP11, TEP0, TEP7 (I left 
entries in the change list of each of them). 

Note regarding SEP10: I marked SEP10 as ACCEPTED, but I haven't been 
able to find the acceptance vote in the mailing list. I am pretty sure 
that there was such a vote in 2014 (maybe it took place by phone?). 
Anyway, the SEP10 was approved but we decided to postpone the marking as 
ACCEPTED till the moment that the final split could take place. 
Since the split finally took place on the 30th of march 2015, I updated 
the state of SEP10 to ACCEPTED.


Cheers,


-- 
+----------------------------------------------------+
 Carlos Pascual Izarra
 Scientific Software Coordinator
 Computing Division
 ALBA Synchrotron  [http://www.albasynchrotron.es]
 Carretera BP 1413 de Cerdanyola-Sant Cugat, Km. 3.3
 E-08290 Cerdanyola del Valles (Barcelona), Spain
 E-mail: cpa...@ce...
 Phone: +34 93 592 4428
+----------------------------------------------------+

Re: [tauruslib-devel] TEP3 - Voting for CANDIDATE-->ACCEPTED

[Maria-Teresa, Nunez-Pardo-de-Vera <mar...@de...>]

Hi Carlos,
            Desy also votes 'yes' for acceptance.
Many thanks for the work.

               Regards,
                          Teresa

On 05/08/15 11:17, Carlos Pascual wrote:
> Hi all,
>
> The implementation of TEP3 [1] (which, among other things, makes
> taurus.core independent of Tango) has finally reached the point in which
> we can consider it complete.
>
> Therefore we ask the community to evaluate it **and for each institute
> to vote whether TEP3 should be passed to ACCEPTED**.
>
> Also, Tiago kindly offered to do the integration work in case it is
> accepted.
>
> In order to test, you just need to check out the tep3 branch from the
> official taurus git repo [2].
>
> Please note that if/when TEP3 is integrated into develop, the taurus
> major version number should be changed to 4.0.0 to reflect the fact that
> some TEP3 changes in the model name syntax  are not 100% backwards-
> compatible[3].
>
> We hope you find TEP3 as interesting as we do.
>
> Cheers,
>
> Carlos (Falcon) & Carlos (Pascual)
>
> ps: Naturally, ALBA's vote is "yes" for acceptance.
>
>
> Notes:
> [1] http://sf.net/p/tauruslib/wiki/TEP3/
> [2] git://git.code.sf.net/p/tauruslib/taurus.git
> [3] Do not worry: pre-tep3 model naming is supported via a backwards-
> compatibility layer which handles all but a tiny fraction of pre-tep3
> names. The ones not supported are those which would be ambiguous, but
> they can be manually adapted very easily.
>
>

[tauruslib-devel] TEP3 - Voting for CANDIDATE-->ACCEPTED

[Carlos P. <cpa...@ce...>]

Hi all,

The implementation of TEP3 [1] (which, among other things, makes 
taurus.core independent of Tango) has finally reached the point in which 
we can consider it complete.

Therefore we ask the community to evaluate it **and for each institute 
to vote whether TEP3 should be passed to ACCEPTED**.

Also, Tiago kindly offered to do the integration work in case it is 
accepted.

In order to test, you just need to check out the tep3 branch from the 
official taurus git repo [2].

Please note that if/when TEP3 is integrated into develop, the taurus 
major version number should be changed to 4.0.0 to reflect the fact that 
some TEP3 changes in the model name syntax  are not 100% backwards-
compatible[3].

We hope you find TEP3 as interesting as we do.

Cheers, 

Carlos (Falcon) & Carlos (Pascual)

ps: Naturally, ALBA's vote is "yes" for acceptance.


Notes:
[1] http://sf.net/p/tauruslib/wiki/TEP3/
[2] git://git.code.sf.net/p/tauruslib/taurus.git
[3] Do not worry: pre-tep3 model naming is supported via a backwards-
compatibility layer which handles all but a tiny fraction of pre-tep3 
names. The ones not supported are those which would be ambiguous, but 
they can be manually adapted very easily.


-- 
+----------------------------------------------------+
 Carlos Pascual Izarra
 Scientific Software Coordinator
 Computing Division
 ALBA Synchrotron  [http://www.albasynchrotron.es]
 Carretera BP 1413 de Cerdanyola-Sant Cugat, Km. 3.3
 E-08290 Cerdanyola del Valles (Barcelona), Spain
 E-mail: cpa...@ce...
 Phone: +34 93 592 4428
+----------------------------------------------------+

[tauruslib-devel] TEP3 passing to CANDIDATE

[Carlos P. <cpa...@ce...>]

Hi all,

We (C Falcon, Tiago and me) have been recently working a lot in the TEP3 
(tango core independence) draft and its proposed implementation.

We consider that there is enough consensus to pass the TEP3 to 
CANDIDATE.

The main changes from the previous versions of the TEP are:

a) we reflected the split of SEP3 into TEP3 and SEP3.
b) we moved the quantities support to another TEP (it is being drafted 
right now as TEP14)
c) we documented the proposed refactoring of the model name validator  
API

Please feel free to give a look at the current proposal and comment it 
(during the CANDIDATE phase we can still alter the document if the 
implementation requires it)

Our aim is to complete the proposed implementation in the following 
weeks and then submit the TEP3 for approval.

Note (**important** if you checked out the origin/tep3 branch since 
during last week) : because the change b) was an afterthought, we need 
to "rewrite the history" of the tep3 branch in the canonical repo 
(basically, we are rolling back the tep3 branch to commit  e112f1e013 (a 
week ago) and we are putting the work that was done since then on a new 
branch called tep14. 
So, if you checked out the origin/tep3 branch since during last week, 
you should remove your local copies and check it out again to avoid 
inconsistencies.

Cheers

Carlos

 

-- 
+----------------------------------------------------+
 Carlos Pascual Izarra
 Scientific Software Coordinator
 Computing Division
 ALBA Synchrotron  [http://www.albasynchrotron.es]
 Carretera BP 1413 de Cerdanyola-Sant Cugat, Km. 3.3
 E-08290 Cerdanyola del Valles (Barcelona), Spain
 E-mail: cpa...@ce...
 Phone: +34 93 592 4428
+----------------------------------------------------+

Re: [tauruslib-devel] [Sardana-devel] Taurus 3.5.0 released (git-only!)

[Carlos P. <cpa...@ce...>]

On Tue 14 April 2015 11:21:32 Carlos Pascual wrote:
> Hi all,
> (...)
> This release is, for the moment, only in git (i.e., not on pypi) and
> does not introduce many differences from the latest code officially
> released in pypi (v 3.4.0).
> (...)

Since some people expressed curiosity about the changes, Here is a quick 
summary:

>From a user point of view, the most relevant changes between 3.4.0 
(Jan15) and 3.5.0 are related to fixing the following taurus bugs:

#146 Polling continues for unlistened attribute
#150 TangoAttribute does not encode properly the DataType.DevEncoded
#151 Inheriting from UILoadable widget in another file fails 

The rest of the changes are either minor, or affect only to the setup.py, 
docs or tests (and therefore they have no effect on the taurus module 
from a user point of view)

For a more complete view of the changes, check the git log, or run:

$ git diff taurus_3_4_0:taurus taurus_3_5_0


I hope this helps,

Carlos



-- 
+----------------------------------------------------+
 Carlos Pascual Izarra
 Scientific Software Coordinator
 Computing Division
 ALBA Synchrotron  [http://www.albasynchrotron.es]
 Carretera BP 1413 de Cerdanyola-Sant Cugat, Km. 3.3
 E-08290 Cerdanyola del Valles (Barcelona), Spain
 E-mail: cpa...@ce...
 Phone: +34 93 592 4428
+----------------------------------------------------+

[tauruslib-devel] Taurus 3.5.0 released (git-only!)

[Carlos P. <cpa...@ce...>]

Hi all,

As one of the final steps of the SEP10 split of taurus from sardana, 
we have created the master branch on the taurus git repo. For that, we 
made a new release branch (release-3.5.0) from the current develop and 
pushed it as master.

This release is, for the moment, only in git (i.e., not on pypi) and 
does not introduce many differences from the latest code officially 
released in pypi (v 3.4.0). We may eventually release it on pypi if it 
is considered necessary (after a more exhaustive test phase).

Cheers,

Carlos






-- 
+----------------------------------------------------+
 Carlos Pascual Izarra
 Scientific Software Coordinator
 Computing Division
 ALBA Synchrotron  [http://www.albasynchrotron.es]
 Carretera BP 1413 de Cerdanyola-Sant Cugat, Km. 3.3
 E-08290 Cerdanyola del Valles (Barcelona), Spain
 E-mail: cpa...@ce...
 Phone: +34 93 592 4428
+----------------------------------------------------+

[tauruslib-devel] subscribe

[jmoldes <jm...@ce...>]