HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/QLop Commit - r10:63067c6877ba

added quick fileName generation for data export, and fixed wrong date reading...

jeandet -

r10:63067c6877ba default

parent child

Context file:

r10:63067c6877ba

src/Cassini/cassinidatafile.cpp +7 -3

              {
                  struct tm t;
                  time_t t_of_day;
-                 t.tm_year=(1000*(data[ofset] & 0x0F)) + (100*(data[ofset+1] & 0x0F)) + (10*(data[ofset+2] & 0x0F)) + ((data[ofset+3] & 0x0F)) -1900;
+             //    t.tm_year=(1000*(data[ofset] & 0x0F)) + (100*(data[ofset+1] & 0x0F)) + (10*(data[ofset+2] & 0x0F)) + ((data[ofset+3] & 0x0F)) -1900;
+                 t.tm_year=(1000*(data[ofset] & 0x0F)) + (100*(data[ofset+1] & 0x0F)) + (10*(data[ofset+2] & 0x0F)) + ((data[ofset+3] & 0x0F));
                  t.tm_mon=(10*(data[ofset+5] & 0x0F)) + ((data[ofset+6] & 0x0F));
                  t.tm_mday=(10*(data[ofset+8] & 0x0F)) + ((data[ofset+9] & 0x0F));
                  t.tm_hour=0;
                  t.tm_min=0;
                  t.tm_sec=0;
-                 t_of_day = mktime(&t);
-                 return (double)t_of_day;
+             //    t_of_day = mktime(&t);
+             //    return (double)t_of_day;
+                 QDateTime date(QDate(t.tm_year,t.tm_mon,1),QTime(0,0));
+             //    date.setDate();
+                 return (double)((date.toMSecsSinceEpoch()/1000.0)-(24*3600));
              }
              void CassiniDataFile::run()

src/Cassini/cassinitools.cpp +30 -1

              CassiniDataFile* CassiniTools::m_dataFile=NULL;
              int CassiniTools::m_defaultPlot=-1;
              int CassiniTools::m_fftPlot=-1;
+             SocExplorerPlotActions* CassiniTools::ExportAction=NULL;
              Qt::GlobalColor QLopColours[]= {Qt::black,
                                              Qt::red,
                      SocExplorerPlotActions* action=new SocExplorerPlotActions("export view",plot->PID(),_self);
                      plot->addAction(action);
                      QObject::connect(action,SIGNAL(triggered(int)),_self,SLOT(export_view(int)));
+                     ExportAction=new SocExplorerPlotActions("export view to "+QString(plot->title()).replace(".TAB","-part.TAB"),plot->PID(),_self);
+                     plot->addAction(ExportAction);
+                     QObject::connect(ExportAction,SIGNAL(triggered(int)),_self,SLOT(export_view_Predefined_FileName(int)));
                      action=new SocExplorerPlotActions("FFT of the current view",plot->PID(),_self);
                      plot->addAction(action);
                      QObject::connect(action,SIGNAL(triggered(int)),_self,SLOT(compute_fft_on_view(int)));
                          plot = QLopPlots::getPlot(m_defaultPlot);
                      }
                      if(plot)
+                     {
                          plot->setTitle(File);
+                         ExportAction->setText("export view to "+QString(File).replace(".TAB","-part.TAB"));
+                     }
                  }
              }
                  if(plot==NULL)
                      return;
                  {
-                     QString fileName = QFileDialog::getSaveFileName();
+                     QString fileName = plot->title();
+                     fileName = QFileDialog::getSaveFileName(0,tr("Set filename"),fileName.replace(".TAB","-part.TAB"));
+                     if(fileName!="")
+                     {
+                         QLopDataList vectors;
+                         for(int i=0;i<plot->graphCount();i++)
+                         {
+                             QLopData* vect = new QLopData();
+                             vect->data = plot->getVisibleData(i);
+                             vectors.append(vect);
+                         }
+                         m_dataFile->saveFile(fileName,vectors);
+                     }
+                 }
+             }
+             void CassiniTools::export_view_Predefined_FileName(int PID)
+             {
+                 SocExplorerPlot* plot = QLopPlots::getPlot(PID);
+                 if(plot==NULL)
+                     return;
+                 {
+                     QString fileName = QString(plot->title()).replace(".TAB","-part.TAB");
                      if(fileName!="")
                      {
                          QLopDataList vectors;

src/Cassini/cassinitools.h +2 0

                  static CassiniToolsGUI* m_CassiniToolsGUI;
                  static CassiniDataFile* m_dataFile;
                  static int m_defaultPlot,m_fftPlot;
+                 static SocExplorerPlotActions* ExportAction;
                  CassiniTools(bool noGUI=false, QObject *parent=0);
                  ~CassiniTools();
                  static void makePlot();
              public slots:
                  void plot_TAB_File(const QString& fileName);
                  void export_view(int PID);
+                 void export_view_Predefined_FileName(int PID);
                  void compute_fft_on_view(int PID);
              private slots:
                  void dataReady(QLopDataList data);

src/SocExplorerPlot.cpp +15 0

                /*!
                @todo Function borcken fixe this!
              */
+                 this->m_Title = title;
                  emit titleChanged(title);
                  this->repaint();
              }
+             const QString &SocExplorerPlot::title()
+             {
+                 return m_Title;
+             }
              void SocExplorerPlot::setXaxisLabel(QString label)
              {
                this->m_plot->xAxis->setLabel(label);
-                 }
              }
+             const QString &SocExplorerPlot::graphName(int graphIndex)
+             {
+                 if(graphIndex<this->m_plot->graphCount())
+                 {
+                     return this->m_plot->graph(graphIndex)->name();
+                 }
+                 return "";
+             }
              void SocExplorerPlot::setGraphData(int graphIndex, QList<QVariant> x, QList<QVariant> y)
              {

src/SocExplorerPlot.h +3 0

                  explicit SocExplorerPlot(QWidget *parent = 0);
                ~SocExplorerPlot();
                  void setTitle(QString title);
+                 const QString& title();
                  void setXaxisLabel(QString label);
                  void setXaxisLog();
                  void setXaxisRange(double lower, double upper);
                  int graphCount();
                  void removeAllGraphs();
                  void setGraphName(int graphIndex,QString name);
+                 const QString& graphName(int graphIndex);
                  void setGraphData(int graphIndex, QList<QVariant> x, QList<QVariant> y);
                  void setGraphData(int graphIndex, QCPDataMap* data,bool copy = true,bool replot=true);
                  void setGraphData(int graphIndex, QVector<QCPData> *data, bool replot);
                  QRubberBand * mRubberBand;
                  QPoint mOrigin;
                  QList<SocExplorerPlotActions*> m_actions;
+                 QString m_Title;
                  int m_PID;
              };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages