From ca29eb1d0300c08778fc8d00298923e54742c1f2 Mon Sep 17 00:00:00 2001
From: joern274 <joern274@gmail.com>
Date: Sat, 22 Jun 2024 17:33:45 +0200
Subject: [PATCH] Minor bugfixes in simulation wizard

---
 .../netlist_simulator_controller/src/wave_data.cpp          | 5 +++++
 .../simulator/waveform_viewer/src/wavedata_table_editor.cpp | 6 +++---
 plugins/simulator/waveform_viewer/src/wizard.cpp            | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/simulator/netlist_simulator_controller/src/wave_data.cpp b/plugins/simulator/netlist_simulator_controller/src/wave_data.cpp
index 4ef4a602f1b..ee0080abbc1 100644
--- a/plugins/simulator/netlist_simulator_controller/src/wave_data.cpp
+++ b/plugins/simulator/netlist_simulator_controller/src/wave_data.cpp
@@ -1620,6 +1620,11 @@ namespace hal {
             add(it.value(),false);
         }
         setMaxTime(mSaleaeDirectory.get_max_time());
+
+        for (auto it = mDataGroups.begin(); it != mDataGroups.end(); ++it)
+        {
+            (*it)->recalcData();
+        }
     }
 
     void WaveDataList::addOrReplace(WaveData* wd)
diff --git a/plugins/simulator/waveform_viewer/src/wavedata_table_editor.cpp b/plugins/simulator/waveform_viewer/src/wavedata_table_editor.cpp
index 2cc9dc568a7..47ca60d4d25 100644
--- a/plugins/simulator/waveform_viewer/src/wavedata_table_editor.cpp
+++ b/plugins/simulator/waveform_viewer/src/wavedata_table_editor.cpp
@@ -13,9 +13,6 @@ namespace hal {
 
     void WavedataTableEditor::setup(const std::vector<NetlistSimulatorController::InputColumnHeader> &inpColHeads, bool omitClock)
     {
-        int n = inpColHeads.size()+1;
-        setColumnCount(n);
-        setRowCount(2);
         QStringList headerLabel;
         for (NetlistSimulatorController::InputColumnHeader ich : inpColHeads)
         {
@@ -25,6 +22,9 @@ namespace hal {
             mInputColumnHeader.append(ich);
             headerLabel << colName;
         }
+        int n = mInputColumnHeader.size()+1;
+        setColumnCount(n);
+        setRowCount(2);
         headerLabel.prepend("Time");
         setHorizontalHeaderLabels(headerLabel);
         for (int i=0; i<n; i++)
diff --git a/plugins/simulator/waveform_viewer/src/wizard.cpp b/plugins/simulator/waveform_viewer/src/wizard.cpp
index 0d27439cc0e..813002bd898 100644
--- a/plugins/simulator/waveform_viewer/src/wizard.cpp
+++ b/plugins/simulator/waveform_viewer/src/wizard.cpp
@@ -493,7 +493,8 @@ namespace hal {
 
     void PageInputData::initializePage()
     {
-        mTableEditor->setup(mController->get_input_column_headers(), mController->is_no_clock_used());
+        // enter clock data must be omitted if clock is autogenerated
+        mTableEditor->setup(mController->get_input_column_headers(), !mController->is_no_clock_used());
         handleRadioToggled(true);
     }
 
@@ -748,7 +749,7 @@ namespace hal {
 
          QGridLayout* layout = new QGridLayout(this);
 
-         mButAll = new QPushButton("All gates", this);
+         mButAll = new QPushButton("Wave data for all nets", this);
          layout->addWidget(mButAll,0,0);
          mButNone = new QPushButton("Clear selection", this);
          layout->addWidget(mButNone,0,2);