Changeset 8566 in ntrip for trunk/BNC/src/rinex/graphwin.cpp

Timestamp:

Dec 13, 2018, 2:36:28 PM (5 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/rinex/graphwin.cpp (modified) (3 diffs)

trunk/BNC/src/rinex/graphwin.cpp

@@ -55 +55 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_graphWin::t_graphWin(QWidget* parent, const QString& fileName,
-                       const QVector<QWidget*>& plots, const QByteArray* scaleTitle,
-                       const QwtInterval* scaleInterval, bool specialLayout) :  QDialog(parent) {
+t_graphWin::t_graphWin(QWidget* parent, const QString& fileName, const QVector<QWidget*>& plots,
+                       bool specialLayout, const QByteArray* scaleTitle,
+                       const QwtInterval* scaleInterval,
+                       const QVector<int>* rows) : QDialog(parent) {
 
   _fileName = fileName;
@@ -66 +67 @@
 
   int ww = QFontMetrics(font()).width('w');
-  setMinimumSize(plots.size()*40*ww, 40*ww);
 
   // Buttons
@@ -115 +115 @@
   }
   else {
-    QHBoxLayout* plotLayout = new QHBoxLayout(_canvas);
+    int iRow = -1;
+    QVBoxLayout* plotLayout = new QVBoxLayout(_canvas);
+    QHBoxLayout* rowLayout  = new QHBoxLayout();
     for (int ip = 0; ip < plots.size(); ip++) {
-      plotLayout->addWidget(plots[ip]);
+      if (rows) {
+        if (iRow != -1 && iRow != rows->at(ip)) {
+          plotLayout->addLayout(rowLayout);
+          rowLayout = new QHBoxLayout();
+        }
+        iRow = rows->at(ip);
+      }
+      plots[ip]->setMinimumSize(30*ww, 30*ww);
+      rowLayout->addWidget(plots[ip]);
     }
     if (_colorScale) {
-      plotLayout->addWidget(_colorScale);
+      rowLayout->addWidget(_colorScale);
     }
+    plotLayout->addLayout(rowLayout);
   }