Reload waves seems to be working

Author: pieter3d

README.md

@@ -61,7 +61,6 @@ A list of features that have not yet been implemented.
 * Expose local variables in always blocks?
 * Time multiplier for waves (e.g. wave 1 unit is really X us/ns/ps/)
 * Wave + source should be able to figure out enums in waves.
-* Reload waves, and possibly live updates.
 * Search for value in wave.
 * Analog signals.
 * Detect unrolled arrays in waves, make them expandable in the waveforms

src/source_panel.cc

@@ -792,6 +792,7 @@ void SourcePanel::SetItem(const slang::ast::Symbol *item, bool save_state) {
 
   SetLineAndScroll(line_idx);
   BuildHeader();
+  // TODO: This is overkill, reading all wave data on every item set.
   UpdateWaveData();
 }
 

src/ui.cc

@@ -70,6 +70,7 @@ void UI::UpdateTooltips() {
         {.hotkeys = "C-p",
          .description =
              std::string(layout_.show_wave_picker ? "SHOW/hide" : "show/HIDE") + " picker"});
+    tooltips_.push_back({.hotkeys = "C-r", .description = "Reload waves"});
   }
   if (panels_[focused_panel_idx_]->Searchable()) {
     tooltips_.push_back({"/nN", "search"});
@@ -152,6 +153,21 @@ UI::~UI() {
   endwin();
 }
 
+void UI::ReloadWaves() {
+  for (Panel *p : panels_) {
+    p->PrepareForWaveDataReload();
+  }
+  Workspace::Get().Waves()->Reload();
+  Workspace::Get().TryMatchDesignWithWaves();
+  for (Panel *p : panels_) {
+    p->HandleReloadedWaves();
+  }
+  //  Force a refresh on the signals in the refreshed wave data tree.
+  if (const auto scope = wave_tree_panel_->ScopeForSignals()) {
+    wave_signals_panel_->SetScope(*scope);
+  }
+}
+
 void UI::EventLoop() {
   while (int ch = getch()) {
     bool quit = false;
@@ -265,6 +281,13 @@ void UI::EventLoop() {
             LayoutPanels();
           }
           break;
+        case 0x12: // ctrl-R
+          if (layout_.has_waves && (panels_[focused_panel_idx_] == waves_panel_.get() ||
+                                    panels_[focused_panel_idx_] == wave_tree_panel_.get() ||
+                                    panels_[focused_panel_idx_] == wave_signals_panel_.get())) {
+            ReloadWaves();
+          }
+          break;
         case 0x9:     // tab
         case 0x161: { // shift-tab
           const bool fwd = ch == 0x9;

src/ui.h

@@ -30,6 +30,7 @@ class UI {
   void UpdateTooltips();
   void Draw() const;
   void DrawHelp(int panel_idx) const;
+  void ReloadWaves();
 
   std::unique_ptr<DesignTreePanel> design_tree_panel_;
   std::unique_ptr<SourcePanel> source_panel_;

src/wavedata_tree_panel.cc

@@ -21,6 +21,7 @@ void WaveDataTreePanel::BuildInitialTree() {
 WaveDataTreePanel::WaveDataTreePanel() { BuildInitialTree(); }
 
 void WaveDataTreePanel::HandleReloadedWaves() {
+  data_.Clear();
   BuildInitialTree();
   scope_for_signals_ = dynamic_cast<WaveDataTreeItem *>(data_[line_idx_])->SignalScope();
 }

src/workspace.cc

@@ -48,6 +48,7 @@ bool Workspace::ParseDesign(int argc, char *argv[]) {
               << "\n";
     return 0;
   }
+  bool design_ok = false;
   if (try_read_design && slang_driver_->processOptions()) {
     std::cout << "Parsing files...\n";
     if (!slang_driver_->parseAllSources()) return false;
@@ -65,11 +66,14 @@ bool Workspace::ParseDesign(int argc, char *argv[]) {
       std::cin.get();
     }
     design_root_ = &slang_compilation_->getRoot();
+    design_ok = true;
   }
 
+  bool waves_ok = false;
   if (waves_file) {
     try {
       wave_data_ = WaveData::ReadWaveFile(*waves_file, *keep_glitches);
+      waves_ok = true;
     } catch (std::runtime_error &e) {
       std::cout << "Problem reading waves: " << e.what() << "\n";
       return false;
@@ -78,7 +82,7 @@ bool Workspace::ParseDesign(int argc, char *argv[]) {
     sv::Workspace::Get().TryMatchDesignWithWaves();
   }
 
-  return true;
+  return design_ok || waves_ok;
 }
 
 void Workspace::TryMatchDesignWithWaves() {