Added option to delete a watch variable from the FEBio monitor's mode…

…l panel.
febiosoftware · Mar 8, 2025 · e4314e2 · e4314e2
1 parent 4489897
commit e4314e2
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/FEBioMonitor/FEBioModelPanel.cpp b/FEBioMonitor/FEBioModelPanel.cpp
@@ -141,9 +141,13 @@ class CFEBioDataModel : public QAbstractItemModel
 			}
 			else if (row == N)
 			{
-				beginInsertRows(QModelIndex(), row, row + 1);
-				m_doc->AddWatchVariable(value.toString());
-				endInsertRows();
+				QString v = value.toString();
+				if (!v.isEmpty())
+				{
+					beginInsertRows(QModelIndex(), row, row + 1);
+					m_doc->AddWatchVariable(value.toString());
+					endInsertRows();
+				}
 			}
 		}
 		return false;
@@ -165,6 +169,8 @@ class CFEBioDataModel : public QAbstractItemModel
 		endResetModel();
 	}
 
+	FEBioMonitorDoc* GetDocument() { return m_doc; }
+
 private:
 	FEBioMonitorDoc* m_doc;
 };
@@ -223,6 +229,20 @@ class Ui::CFEBioModelPanel
 			m_tree->setModel(nullptr);
 		}
 	}
+
+	void deleteSelection()
+	{
+		if (m_data == nullptr) return;
+		FEBioMonitorDoc* doc = m_data->GetDocument(); assert(doc);
+		if (doc == nullptr) return;
+		QModelIndexList indices = m_tree->selectionModel()->selectedIndexes();
+		if (indices.size() == 2) // size==2 because we have two columns.
+		{
+			QModelIndex i = indices[0];
+			doc->DeleteWatchVariable(i.row());
+			m_data->update();
+		}
+	}
 };
 
 CFEBioModelPanel::CFEBioModelPanel(CMainWindow* wnd, QWidget* parent) : CWindowPanel(wnd, parent), ui(new Ui::CFEBioModelPanel)
@@ -235,6 +255,14 @@ FEBioMonitorDoc* CFEBioModelPanel::GetCurrentDocument()
 	return dynamic_cast<FEBioMonitorDoc*>(GetMainWindow()->GetDocument());
 }
 
+void CFEBioModelPanel::keyPressEvent(QKeyEvent* e)
+{
+	if (e->key() == Qt::Key_Delete)
+	{
+		ui->deleteSelection();
+	}
+}
+
 void CFEBioModelPanel::Clear()
 {
 	ui->reset();

diff --git a/FEBioMonitor/FEBioModelPanel.h b/FEBioMonitor/FEBioModelPanel.h
@@ -46,6 +46,8 @@ class CFEBioModelPanel : public CWindowPanel
 
 	FEBioMonitorDoc* GetCurrentDocument();
 
+	void keyPressEvent(QKeyEvent* e) override;
+
 public slots:
 	void launchMatrixInspector();
 

diff --git a/FEBioMonitor/FEBioMonitorDoc.cpp b/FEBioMonitor/FEBioMonitorDoc.cpp
@@ -622,7 +622,7 @@ bool FEBioMonitorDoc::processFEBioEvent(FEModel* fem, int nevent)
 
 	if (nevent == CB_INIT) InitDefaultWatchVariables();
 	UpdateAllWatchVariables();
-	emit updateViews(false, updateGL);
+	emit updateViews(nevent == CB_INIT, updateGL);
 	m->mutex.lock();
 
 	constexpr double eps = std::numeric_limits<double>::epsilon();
@@ -631,7 +631,7 @@ bool FEBioMonitorDoc::processFEBioEvent(FEModel* fem, int nevent)
 	{
 		m->outputBuffer += "\n[paused on " + eventToString(nevent) + "]\n";
 		emit outputReady();
-		emit updateViews(true, true);
+		emit updateViews(false, true);
 		m->isPaused = true;
 		jobIsPaused.wait(&m->mutex);
 		m->isPaused = false;
@@ -695,6 +695,11 @@ void FEBioMonitorDoc::SetWatchVariable(int n, const QString& name)
 	UpdateWatchVariable(*var);
 }
 
+void FEBioMonitorDoc::DeleteWatchVariable(int n)
+{
+	m->watches.removeAt(n);
+}
+
 void FEBioMonitorDoc::InitDefaultWatchVariables()
 {
 	m->watches.clear();

diff --git a/FEBioMonitor/FEBioMonitorDoc.h b/FEBioMonitor/FEBioMonitorDoc.h
@@ -174,6 +174,8 @@ class FEBioMonitorDoc : public CGLModelDocument
 	int GetWatchVariables() const;
 	void SetWatchVariable(int n, const QString& name);
 
+	void DeleteWatchVariable(int n);
+
 public:
 	FEGlobalMatrix* GetStiffnessMatrix();