Fixed help feature for discrete materials. Also added help links for plotfile and logfile items in model tree.

Author: SteveMaas1978

FEBioStudio/HelpFeature.cpp

@@ -29,7 +29,17 @@ SOFTWARE.*/
 #include "HelpFeature.h"
 #include <FEBioLink/FEBioClass.h>
 
-#define MANUAL_PATH "https://febiosoftware.github.io/febio-feature-manual/features/"
+#define MANUAL_PATH "https://febiosoftware.github.io/febio-feature-manual/"
+
+QString GetPlotHelpURL()
+{
+	return "plotvars";
+}
+
+QString GetLogHelpURL()
+{
+	return "logvars";
+}
 
 QString ClassIDToURL(int classID)
 {
@@ -43,6 +53,7 @@ QString ClassIDToURL(int classID)
 
 		QString tmp = QString(classInfo.szmod) + "_" + superClass + "_" + QString(classInfo.sztype);
 		url = tmp.replace(" ", "_").toLower();
+		url = "features/" + url;
 	}
 	return url;
 }

FEBioStudio/HelpFeature.h

@@ -28,4 +28,6 @@ SOFTWARE.*/
 #include <QString>
 
 QString ClassIDToURL(int classID);
+QString GetPlotHelpURL();
+QString GetLogHelpURL();
 void ShowHelp(const QString& url);

FEBioStudio/ModelTree.cpp

@@ -1220,8 +1220,14 @@ void CModelTree::UpdateDiscrete(QTreeWidgetItem* t1, FSModel& fem)
 		{
 			GDiscreteSpringSet* pg = dynamic_cast<GDiscreteSpringSet*>(po);
 
+			QString name = QString::fromStdString(pg->GetName());
+			if (auto dm = pg->GetMaterial())
+			{
+				name += QString(" [") + QString::fromStdString(dm->GetTypeString()) + "]";
+			}
+
 			QTreeWidgetItem* t2 = nullptr;
-			t2 = AddTreeItem(t1, QString::fromStdString(pg->GetName()), MT_DISCRETE_SET, pg->size(), pg);
+			t2 = AddTreeItem(t1, name, MT_DISCRETE_SET, pg->size(), pg);
 
 			if (t2 && !pg->IsActive())
 			{

FEBioStudio/ModelViewer.cpp

@@ -406,6 +406,27 @@ void CModelViewer::on_refreshButton_clicked()
 
 void CModelViewer::on_helpButton_clicked()
 {
+	// firs check for plotfile
+	QTreeWidgetItem* it = ui->tree->currentItem();
+	if (it)
+	{
+		QString url;
+		if (it->text(0) == "plotfile")
+		{
+			url = GetPlotHelpURL();
+		}
+		else if (it->text(0) == "logfile")
+		{
+			url = GetLogHelpURL();
+		}
+
+		if (!url.isEmpty())
+		{
+			ShowHelp(url);
+			return;
+		}
+	}
+
 	// make sure we have something selected
 	if (m_currentObject == nullptr)
 	{
@@ -1980,10 +2001,12 @@ void CModelViewer::ShowContextMenu(CModelTreeItem* data, QPoint pt)
 		break;
 	case MT_PROJECT_OUTPUT:
 	case MT_PROJECT_OUTPUT_PLT:
-		menu.addAction("Edit output...", this, SLOT(OnEditOutput()));
+		menu.addAction("Edit Output...", this, SLOT(OnEditOutput()));
+		menu.addAction("View Help ...", this, SLOT(on_helpButton_clicked()));
 		break;
 	case MT_PROJECT_OUTPUT_LOG:
-		menu.addAction("Edit output...", this, SLOT(OnEditOutputLog()));
+		menu.addAction("Edit Output...", this, SLOT(OnEditOutputLog()));
+		menu.addAction("View Help ...", this, SLOT(on_helpButton_clicked()));
 		break;
 	case MT_NAMED_SELECTION:
 		menu.addAction("Remove empty", this, SLOT(OnRemoveEmptySelections()));
@@ -2188,7 +2211,7 @@ void CModelViewer::ShowContextMenu(CModelTreeItem* data, QPoint pt)
     if (!url.isEmpty())
     {
         menu.addSeparator();
-        menu.addAction("View Help", [=](){ ShowHelp(url); });
+        menu.addAction("View Help ...", [=](){ ShowHelp(url); });
     }
 
 	if (del) 
@@ -2737,6 +2760,13 @@ QString CModelViewer::HelpURLFromObject(FSObject* po)
 			classID = FEBio::GetClassId(pm->GetSuperClassID(), pm->GetTypeString());
 		}
 	}
+	if (auto ds = dynamic_cast<GDiscreteSpringSet*>(po))
+	{
+		if (auto dm = ds->GetMaterial())
+		{
+			classID = FEBio::GetClassId(dm->GetSuperClassID(), dm->GetTypeString());
+		}
+	}
 	FSModelComponent* pmc = dynamic_cast<FSModelComponent*>(po);
 	if (pmc)
 	{