Changeset 8556 in ntrip for trunk/BNC/src

Timestamp:

Dec 12, 2018, 2:01:19 PM (6 years ago)

Author:

mervart

Message:

Analyze more than two signals

Location:

trunk/BNC/src/rinex

Files:

• graphwin.cpp (modified) (3 diffs)
• graphwin.h (modified) (1 diff)
• reqcanalyze.cpp (modified) (2 diffs)

trunk/BNC/src/rinex/graphwin.cpp

@@ -56 +56 @@
 ////////////////////////////////////////////////////////////////////////////
 t_graphWin::t_graphWin(QWidget* parent, const QString& fileName,
-                       const QVector<QWidget*>& plots,
-                       const QByteArray* scaleTitle,
-                       const QwtInterval* scaleInterval) :  QDialog(parent) {
+                       const QVector<QWidget*>& plots, const QByteArray* scaleTitle,
+                       const QwtInterval* scaleInterval, bool specialLayout) :  QDialog(parent) {
 
   _fileName = fileName;
@@ -107 +106 @@
   // ------
   _canvas = new QWidget(this);
-  if (plots.size() != 3) {
+  if (specialLayout) {
+    QHBoxLayout* plotLayout = new QHBoxLayout(_canvas);
+    plotLayout->addWidget(plots[0]);
+    QVBoxLayout* hlpLayout = new QVBoxLayout;
+    hlpLayout->addWidget(plots[1]);
+    hlpLayout->addWidget(plots[2]);
+    plotLayout->addLayout(hlpLayout);
+  }
+  else {
     QHBoxLayout* plotLayout = new QHBoxLayout(_canvas);
     for (int ip = 0; ip < plots.size(); ip++) {
@@ -115 +122 @@
       plotLayout->addWidget(_colorScale);
     }
-  }
-  else {
-    QHBoxLayout* plotLayout = new QHBoxLayout(_canvas);
-    plotLayout->addWidget(plots[0]);
-    QVBoxLayout* hlpLayout = new QVBoxLayout;
-    hlpLayout->addWidget(plots[1]);
-    hlpLayout->addWidget(plots[2]);
-    plotLayout->addLayout(hlpLayout);
   }
 

trunk/BNC/src/rinex/graphwin.h

@@ -57 +57 @@
   t_graphWin(QWidget* parent, const QString& fileName,
              const QVector<QWidget*>& plots, const QByteArray* scaleTitle,
-             const QwtInterval* scaleInterval);
+             const QwtInterval* scaleInterval, bool specialLayout);
   ~t_graphWin();
 

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -672 +672 @@
 
     t_graphWin* graphWin = new t_graphWin(0, fileName, plots,
-                                          &scaleTitle, &scaleInterval);
+                                          &scaleTitle, &scaleInterval, false);
 
     graphWin->show();
@@ -748 +748 @@
     QVector<QWidget*> plots;
     plots << plotA << plotZ << plotD;
-    t_graphWin* graphWin = new t_graphWin(0, fileName, plots, 0, 0);
+    t_graphWin* graphWin = new t_graphWin(0, fileName, plots, 0, 0, true);
 
     int ww = QFontMetrics(graphWin->font()).width('w');