HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/QLop Commit - r2:a262e3a4f8e7

added zoom box.

jeandet -

r2:a262e3a4f8e7 default

parent child

Context file:

r2:a262e3a4f8e7

QLop.pro +2 -2

              INCLUDEPATH += src/QCustomPlot src
-             QMAKE_CXXFLAGS += -fopenmp
-             QMAKE_LFLAGS += -fopenmp
+             QMAKE_CXXFLAGS += -O5 -fopenmp -march=corei7-avx -mtune=corei7-avx -mavx
+             QMAKE_LFLAGS += -O5 -fopenmp -march=corei7-avx -mtune=corei7-avx -mavx
              SOURCES += src/main.cpp\
                      src/mainwindow.cpp \

src/SocExplorerPlot.cpp +50 -9

              SocExplorerPlot::SocExplorerPlot(QWidget *parent) :
-               QWidget(parent)
+               QWidget(parent), mRubberBand(new QRubberBand(QRubberBand::Rectangle, this))
              {
                this->m_plot = new QCustomPlot(this);
                this->m_plot->setInteractions(QCP::iRangeDrag  | QCP::iSelectAxes |
              }
+             SocExplorerPlot::~SocExplorerPlot()
+             {
+               delete mRubberBand;
+             }
              void SocExplorerPlot::show()
              {
                QWidget::show();
                  {
                  case Qt::Key_Control:
                    this->ctrl_hold = true;
+                   setCursor(Qt::CrossCursor);
                    break;
                  case Qt::Key_Shift:
                    this->shift_hold = true;
                  case Qt::Key_Left:
                    if(!ctrl_hold)
                      {
-                      move(-0.1,Qt::Horizontal);
+                       move(-0.1,Qt::Horizontal);
                      }
                    else
                      {
                  case Qt::Key_Right:
                    if(!ctrl_hold)
                      {
-                      move(0.1,Qt::Horizontal);
+                       move(0.1,Qt::Horizontal);
                      }
                    else
                      {
                  case Qt::Key_Up:
                    if(!ctrl_hold)
                      {
-                      move(0.1,Qt::Vertical);
+                       move(0.1,Qt::Vertical);
                      }
                    else
                      {
                  case Qt::Key_Down:
                    if(!ctrl_hold)
                      {
-                      move(-0.1,Qt::Vertical);
+                       move(-0.1,Qt::Vertical);
                      }
                    else
                      {
                    QWidget::keyReleaseEvent(event);
                    break;
                  }
+               setCursor(Qt::ArrowCursor);
              }
              void SocExplorerPlot::wheelEvent(QWheelEvent * event)
                  {
                    if (event->orientation()==Qt::Vertical)//mRangeZoom.testFlag(Qt::Vertical))
                      {
+                       setCursor(Qt::SizeVerCursor);
                        factor = pow(this->m_plot->axisRect()->rangeZoomFactor(Qt::Vertical), wheelSteps);
                        zoom(factor,event->pos().y(),Qt::Vertical);
                      }
                  {
                    if (event->orientation()==Qt::Vertical)//mRangeZoom.testFlag(Qt::Vertical))
                      {
+                       setCursor(Qt::SizeHorCursor);
                        factor = pow(this->m_plot->axisRect()->rangeZoomFactor(Qt::Horizontal), wheelSteps);
                        zoom(factor,event->pos().x(),Qt::Horizontal);
                      }
              {
                if(event->button()==Qt::LeftButton)
                  {
-                   mDragStart = event->pos();
-                   this->mouse_hold = true;
-                   DragStartHorzRange = this->m_plot->axisRect()->rangeDragAxis(Qt::Horizontal)->range();
-                   DragStartVertRange = this->m_plot->axisRect()->rangeDragAxis(Qt::Vertical)->range();
+                   if(ctrl_hold)
+                     {
+                       setCursor(Qt::CrossCursor);
+                       mOrigin = event->pos();
+                       mRubberBand->setGeometry(QRect(mOrigin, QSize()));
+                       mRubberBand->show();
+                     }
+                   else
+                     {
+                       setCursor(Qt::ClosedHandCursor);
+                       mDragStart = event->pos();
+                       this->mouse_hold = true;
+                       DragStartHorzRange = this->m_plot->axisRect()->rangeDragAxis(Qt::Horizontal)->range();
+                       DragStartVertRange = this->m_plot->axisRect()->rangeDragAxis(Qt::Vertical)->range();
+                     }
                  }
                QWidget::mousePressEvent(event);
              }
                  {
                    this->mouse_hold = false;
                  }
+               if (mRubberBand->isVisible())
+                 {
+                   const QRect & zoomRect = mRubberBand->geometry();
+                   int xp1, yp1, xp2, yp2;
+                   zoomRect.getCoords(&xp1, &yp1, &xp2, &yp2);
+                   double x1 = this->m_plot->xAxis->pixelToCoord(xp1);
+                   double x2 = this->m_plot->xAxis->pixelToCoord(xp2);
+                   double y1 = this->m_plot->yAxis->pixelToCoord(yp1);
+                   double y2 = this->m_plot->yAxis->pixelToCoord(yp2);
+                   this->m_plot->xAxis->setRange(x1, x2);
+                   this->m_plot->yAxis->setRange(y1, y2);
+                   mRubberBand->hide();
+                   this->m_plot->replot();
+                 }
+               setCursor(Qt::ArrowCursor);
                QWidget::mouseReleaseEvent(event);
              }
                    Vaxis->setRange(DragStartVertRange.lower+diff, DragStartVertRange.upper+diff);
                    this->m_plot->replot();
                  }
+               if (mRubberBand->isVisible())
+                 {
+                   mRubberBand->setGeometry(QRect(mOrigin, event->pos()).normalized());
+                 }
                QWidget::mouseMoveEvent(event);
              }

src/SocExplorerPlot.h +6 0

              #include <QWidget>
              #include <QGridLayout>
              #include <qcustomplot.h>
+             #include <QRubberBand>
+             #include <QPoint>
              class SocExplorerPlot : public QWidget
              {
                  Q_OBJECT
              public:
                  explicit SocExplorerPlot(QWidget *parent = 0);
+               ~SocExplorerPlot();
                  void setTitle(QString title);
                  void setXaxisLabel(QString label);
                  void setXaxisRange(double lower, double upper);
                  QCPRange DragStartHorzRange;
                  QCPRange DragStartVertRange;
                  QPoint mDragStart;
+                 bool mZoomMode;
+                 QRubberBand * mRubberBand;
+                 QPoint mOrigin;
              };
              #endif // SOCEXPLORERPLOT_H

src/mainwindow.cpp +6 -2

                      }
                    this->progressWidget->show();
                    fileReader.parseFile(File);
+                   this->ui->Plot->setTitle(File);
                  }
              }
                  {
                    if(progressThreadIds[i]==threadId)
                      {
-                       this->progress.at(threadId)->setValue(percentProgress);
-                       updated=true;
+                       if(threadId<this->progress.count())
+                       {
+                           this->progress.at(threadId)->setValue(percentProgress);
+                           updated=true;
+                         }
                      }
                  }
                if(Q_UNLIKELY(updated==false))

src/themisdatafile.cpp +22 -37

              #include <omp.h>
              #include <QTimer>
              #include <QElapsedTimer>
-             #include <time.h>
+             #include <sys/time.h>
              ThemisDataFile::ThemisDataFile(QObject *parent) : QThread(parent)
              {
                t.tm_hour=(10*(data[ofset+11] & 0x0F)) + ((data[ofset+12] & 0x0F));
                t.tm_min=(10*(data[ofset+14] & 0x0F)) + ((data[ofset+15] & 0x0F));
                t.tm_sec=(10*(data[ofset+17] & 0x0F)) + ((data[ofset+18] & 0x0F));
-               int ms=(100*(data[ofset+20] & 0x0F)) + (10*(data[ofset+21] & 0x0F)) + ((data[ofset+22] & 0x0F));
+               double ms=(100*(data[ofset+20] & 0x0F)) + (10*(data[ofset+21] & 0x0F)) + ((data[ofset+22] & 0x0F));
                t_of_day = mktime(&t);
-               return t_of_day+(ms*0.001);
+               return (double)t_of_day+((double)ms*(double)0.001);
              }
              void ThemisDataFile::run()
              {
                    int lineCnt = FileSize/58;
                    int curLine=0;
                    int lastLineUpdate=0;
-                   int threadIndex,numThreads=omp_get_num_threads();
                    char* fileContent=(char*)malloc(FileSize);
                    if(Q_UNLIKELY(fileContent==NULL))return;
                    fseek(dataFile, 0L, SEEK_SET);
                    if(fread(fileContent,1,FileSize,dataFile))
                      {
                        line = fileContent;
-                       if(FileSize > 10000000)
+                         {
-                           lineCnt/=numThreads;
+                         }
                        QDateTime date;
                        timr.start();
-             #pragma omp parallel if ((FileSize > 10000000)) private(date,data1,data2,data3,_x,threadIndex,lastLineUpdate) shared(ch1,ch2,ch3,lineCnt)
+                       {
-                         threadIndex = omp_get_thread_num();
-             #pragma omp for
-                         for(int i=0;i<(FileSize/(58));i++)
+                           {
-                             _x=__decodeTimeFromEpoch((i*58),(unsigned char*)line);
-                             data1.key=_x;
-                             data2.key=_x;
-                             data3.key=_x;
-                             data1.value=__decodeVal(((i*58)+27),(unsigned char*)line);
-                             data2.value=__decodeVal(((i*58)+38),(unsigned char*)line);
-                             data3.value=__decodeVal(((i*58)+49),(unsigned char*)line);
-             #pragma omp critical
+                       for(int i=0;i<(FileSize/(58));i++)
+                         {
+             //              _x=  i;
+                           _x=  __decodeTimeFromEpoch((i*58),(unsigned char*)line);
+                           data1.key=_x;
+                           data2.key=_x;
+                           data3.key=_x;
+                           data1.value=__decodeVal(((i*58)+27),(unsigned char*)line);
+                           data2.value=__decodeVal(((i*58)+38),(unsigned char*)line);
+                           data3.value=__decodeVal(((i*58)+49),(unsigned char*)line);
+                           ch1->insertMulti(_x,data1);
+                           ch2->insertMulti(_x,data2);
+                           ch3->insertMulti(_x,data3);
+                           curLine++;
+                           if(lastLineUpdate++>8000)
                              {
-                               ch1->insertMulti(_x,data1);
-                               ch2->insertMulti(_x,data2);
-                               ch3->insertMulti(_x,data3);
+                               lastLineUpdate=0;
+                               int test=(curLine *100/ (lineCnt));
+                               emit updateProgress(0,test);
                              }
-                             curLine++;
-                             if(lastLineUpdate++>8000)
+                               {
-                                 lastLineUpdate=0;
-                                 int test=(curLine *100/ (lineCnt));
-                                 emit updateProgress(threadIndex,test);
+                               }
+                           }
-             #pragma omp barrier
+                       }
+                         }
                        free(fileContent);
                      }
                    qDebug()<<timr.elapsed();
                    setlocale(LC_NUMERIC,svglocale);
                    emit dataReady(ch1,ch2,ch3);

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