apps/radar/Lucid - working on VlevelManager

NCAR · Jan 27, 2025 · 1d5f8e1 · 1d5f8e1
1 parent 8f87159
commit 1d5f8e1
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 6 deletions.
diff --git a/codebase/apps/radar/src/Lucid/GuiManager.cc b/codebase/apps/radar/src/Lucid/GuiManager.cc
@@ -151,7 +151,8 @@ GuiManager::GuiManager() :
   _vlevelVBoxLayout = NULL;
   _vlevelFrame = NULL;
   _vlevelPanel = NULL;
-
+  _vlevelHasChanged = false;
+
   _fieldMenu = NULL;
   _fieldTable = NULL;
   _fieldMenuPlaced = false;
@@ -313,6 +314,13 @@ void GuiManager::timerEvent(QTimerEvent *event)
     needNewData = true;
   }
 
+  // vlevel change?
+
+  if (_vlevelHasChanged) {
+    needNewData = true;
+    _vlevelHasChanged = false;
+  }
+
   // get new data if needed - this is done in a thread
 
   if (needNewData) {
@@ -323,7 +331,8 @@ void GuiManager::timerEvent(QTimerEvent *event)
     MetRecord *mr = gd.mrec[_fieldNum];
     if (mr->requestHorizPlane(gd.movie.frame[index].time_start,
                               gd.movie.frame[index].time_end,
-                              gd.h_win.page)) {
+                              gd.h_win.page,
+                              _vlevelManager.getLevel())) {
       cerr << "ERROR - GuiManager::timerEvent" << endl;
       cerr << "  mr->requestHorizPlane" << endl;
       cerr << "  time_start: " << DateTime::strm(gd.movie.frame[index].time_start) << endl;
@@ -341,11 +350,19 @@ void GuiManager::timerEvent(QTimerEvent *event)
       index = gd.movie.num_frames - 1;
     }
     _horiz->setFrameForRendering(gd.h_win.page, index);
-    cerr << endl << endl << endl;
-    cerr << endl << endl << endl;
+    cerr << "+++++++++++++++++++++++++++++++++++" << endl;
+    cerr << "+++++++++++++++++++++++++++++++++++" << endl;
+    cerr << "+++++++++++++++++++++++++++++++++++" << endl;
+    cerr << "+++++++++++++++++++++++++++++++++++" << endl;
+    cerr << "+++++++++++++++++++++++++++++++++++" << endl;
+    cerr << "+++++++++++++++++++++++++++++++++++" << endl;
+    cerr << "+++++++++++++++++++++++++++++++++++" << endl;
+    cerr << "+++++++++++++++++++++++++++++++++++" << endl;
     cerr << "+++++++++++++++++++++++++++++++++++" << endl;
     _horiz->update();
     gd.redraw_horiz = false;
+    _vlevelManager.setFromMdvx();
+    _createVlevelRadioButtons();
   }
 
   // handle legacy cidd timer event
@@ -1217,6 +1234,7 @@ void GuiManager::_changeVlevel(bool value) {
       // _vert->setStartOfVlevel(true);
       _moveUpDown();
 
+      _vlevelHasChanged = true;
       gd.redraw_horiz = true;
 
       // reloadBoundaries();

diff --git a/codebase/apps/radar/src/Lucid/GuiManager.hh b/codebase/apps/radar/src/Lucid/GuiManager.hh
@@ -234,6 +234,7 @@ private:
   QFrame *_vlevelFrame;
   QGroupBox *_vlevelPanel;
   vector<QRadioButton *> *_vlevelRButtons;
+  bool _vlevelHasChanged;
 
   // zooms
 

diff --git a/codebase/apps/radar/src/Lucid/HorizWidget.cc b/codebase/apps/radar/src/Lucid/HorizWidget.cc
@@ -2241,7 +2241,9 @@ void HorizWidget::resizeEvent(QResizeEvent * e)
   _resetWorld(width(), height());
   _pixmap = _pixmap.scaled(width(), height());
   adjustPixelScales();
+  cerr << "RRRRRRRRRRRRRRRRRR width, height: " << width() << ", " << height() << endl;
   _refreshImages();
+  cerr << "RRRRRRRRRRRRRRRRRR width, height: " << width() << ", " << height() << endl;
   update();
 }
 

diff --git a/codebase/apps/radar/src/Lucid/MetRecord.cc b/codebase/apps/radar/src/Lucid/MetRecord.cc
@@ -157,16 +157,20 @@ MetRecord::MetRecord(QObject* parent) :
 
 int MetRecord::requestHorizPlane(time_t start_time,
                                  time_t end_time,
-                                 int page)
+                                 int page,
+                                 double vlevel)
 {
 
   cerr << "HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH MetRecord::requestHorizPlane()" << endl;
+  cerr << "HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH page, vlevel: " << page << ", " << vlevel << endl;
 
   // apply offset the request time
 
   _startTime.set(start_time + time_offset * 60);
   _endTime.set(end_time + time_offset * 60);
   _page = page;
+  _vLevelMinReq = vlevel;
+  _vLevelMaxReq = vlevel;
 
   // check for change in request details
 

diff --git a/codebase/apps/radar/src/Lucid/MetRecord.hh b/codebase/apps/radar/src/Lucid/MetRecord.hh
@@ -85,7 +85,8 @@ public:
 
   int requestHorizPlane(time_t start_time,
                         time_t end_time,
-                        int page);
+                        int page,
+                        double vlevel);
 
   int getHorizPlane();
 

diff --git a/codebase/apps/radar/src/Lucid/VlevelManager.cc b/codebase/apps/radar/src/Lucid/VlevelManager.cc
@@ -279,6 +279,8 @@ double VlevelManager::getLevel(ssize_t vlevelIndex /* = -1*/) const
   if (vlevelIndex < 0) {
     if (_guiIndex < 0) {
       return 0.0;
+    } else if (_guiIndex > (int) _vlevels.size() - 1) {
+      return 0.0;
     } else {
       return _vlevels[_guiIndex].level;
     }