The "short" name is now used to show the parameter and property name in the model tree. The "long" name is shown in the tooltip.

SteveMaas1978 · SteveMaas1978 · commit cf04d257abb1 · 2026-03-06T09:43:40.000-07:00
diff --git a/FEBioStudio/CurveEditor.cpp b/FEBioStudio/CurveEditor.cpp
@@ -165,7 +165,7 @@ void CCurveEditor::BuildLoadCurves(QTreeWidgetItem* t1, FSModelComponent* po, co
 		if (p.GetLoadCurveID() > 0)
 		{
 			assert(p.IsVolatile());
-			string pname = oname + "." + p.GetLongName();
+			string pname = oname + "." + p.GetShortName();
 			ui->addTreeItem(t1, QString::fromStdString(pname), &p);
 		}
 	}
diff --git a/FEBioStudio/DlgFEBioInfo.cpp b/FEBioStudio/DlgFEBioInfo.cpp
@@ -223,7 +223,7 @@ void CDlgFEBioInfo::onExport()
 					}
 				}
 				paramObj["name"] = pi.name();
-				paramObj["description"] = pi.longName();
+				paramObj["description"] = (pi.longName() ? pi.longName() : "");
 				paramObj["default"] = paramVal;
 				paramObj["units"] = (pi.units() ? pi.units() : "");
 				paramArray.append(paramObj);
@@ -239,7 +239,7 @@ void CDlgFEBioInfo::onExport()
 					{
 						QJsonObject paramObj;
 						paramObj["name"] = szname;
-						paramObj["description"] = "";
+						paramObj["description"] = (prop->GetLongName() ? prop->GetLongName() : "");
 						paramObj["default"] = "";
 						paramObj["units"] = "";
 						paramArray.append(paramObj);
diff --git a/FEBioStudio/FEClassPropsView.cpp b/FEBioStudio/FEClassPropsView.cpp
@@ -89,7 +89,7 @@ void CPropertySelector::onSelectionChanged(int n)
 // also opening a custom dialog, and that works without any issues (with this object's destructor running
 // after this function exits as expected). 
 #ifndef __APPLE__
-		QString title = QString("Remove %1").arg(QString::fromStdString(m_pp->GetLongName()));
+		QString title = QString("Remove %1").arg(QString::fromStdString(m_pp->GetName()));
 		if (QMessageBox::question(this, title, "Are you sure you want to remove this property?", QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
 		{
 			emit currentDataChanged(n);
@@ -103,7 +103,7 @@ void CPropertySelector::onSelectionChanged(int n)
 	{
 		int superID = m_pp->GetSuperClassID();
 		int baseID = m_pp->GetPropertyType();
-		QString title = QString("Add %1").arg(QString::fromStdString(m_pp->GetLongName()));
+		QString title = QString("Add %1").arg(QString::fromStdString(m_pp->GetName()));
 		CDlgAddPhysicsItem dlg(title, superID, baseID, nullptr, true, false, this);
 		dlg.ShowNameAndCategoryFields(false);
 		if (dlg.exec())
@@ -120,7 +120,7 @@ void CPropertySelector::onSelectionChanged(int n)
 	{
 		int superID = m_pp->GetSuperClassID();
 		int baseID = m_pp->GetPropertyType();
-		QString title = QString("Copy %1").arg(QString::fromStdString(m_pp->GetLongName()));
+		QString title = QString("Copy %1").arg(QString::fromStdString(m_pp->GetName()));
 		FSModelComponent* src = dynamic_cast<FSModelComponent*>(m_pp->GetParent());
 		CDlgCopyPhysicsItem dlg(title, superID, baseID, src, m_fem, this);
 		if (dlg.exec())
@@ -231,8 +231,8 @@ class FEClassPropsModel : public QAbstractItemModel
 						QString name;
 						if (m_index == -1)
 						{
-							string sname = p.GetLongName();
-//							string sname = FSCore::beautify_string(p.GetLongName());
+							string sname = p.GetShortName();
+//							string sname = FSCore::beautify_string(p.GetShortName());
 							name = QString::fromStdString(sname);
 						}
 						else
@@ -253,7 +253,10 @@ class FEClassPropsModel : public QAbstractItemModel
 					{
 						if (m_index == -1)
 						{
-							QString toolTip = QString("<p><b>parameter:</b> <code>%1</code></p>").arg(p.GetShortName());
+							QString toolTip;
+							if (p.GetLongName())
+								toolTip = QString("<p><b>%1: </b>%2</p>").arg(p.GetShortName()).arg(p.GetLongName());
+
 							if (p.IsVolatile())
 							{
 								if (p.GetLoadCurveID() > 0)
@@ -534,14 +537,14 @@ class FEClassPropsModel : public QAbstractItemModel
 					{
 						if ((p.maxSize()==1) || (m_index < 0))
 						{
-							QString s = QString("<b>property:</b> <code>%1</code>").arg(QString::fromStdString(p.GetName()));
+							QString s = QString("<b>%1: </b>%2").arg(QString::fromStdString(p.GetName())).arg(QString::fromStdString(p.GetLongName()));
 							return s;
 						}
 					}
 					else
 					{
-//						string sname = FSCore::beautify_string(p.GetLongName().c_str());
-                        string sname = p.GetLongName().c_str();
+//						string sname = FSCore::beautify_string(p.GetName().c_str());
+                        string sname = p.GetName().c_str();
 						QString s = QString::fromStdString(sname);
 						if (p.maxSize() != 1)
 						{
@@ -1047,7 +1050,7 @@ class FEClassPropsModel : public QAbstractItemModel
 			if (paramId >= 0)
 			{
 				Param& p = pc->GetParam(paramId);
-				QString name = p.GetLongName();
+				QString name = p.GetShortName();
 
 				if (name.contains(m_filter, Qt::CaseInsensitive) == false)
 				{
diff --git a/FEBioStudio/MaterialPropsView.cpp b/FEBioStudio/MaterialPropsView.cpp
@@ -197,7 +197,7 @@ class CMaterialPropsModel : public QAbstractItemModel
 				Param& p = m_pm->GetParam(m_paramId);
 				if (column == 0)
 				{
-					QString name(p.GetLongName());
+					QString name(p.GetShortName());
 					if (m_flag & Item_Indented)
 					{
 						name = "  " + name;
diff --git a/FEBioStudio/ModelViewer.cpp b/FEBioStudio/ModelViewer.cpp
@@ -659,8 +659,8 @@ void CModelViewer::on_props_paramChanged(FSCoreBase* pc, Param* p)
 	}
 
 	QString sp;
-	if (po) sp = QString("\"%1.%2\"").arg(QString::fromStdString(po->GetName())).arg(p->GetLongName());
-	else sp = QString("\"%1\"").arg(p->GetLongName());
+	if (po) sp = QString("\"%1.%2\"").arg(QString::fromStdString(po->GetName())).arg(p->GetShortName());
+	else sp = QString("\"%1\"").arg(p->GetShortName());
 
 	QString sv;
 	switch (p->GetParamType())
diff --git a/FEBioStudio/ObjectProps.cpp b/FEBioStudio/ObjectProps.cpp
@@ -41,7 +41,7 @@ void CObjectProps::AddParameter(Param& p)
 {
 	CProperty* prop = nullptr;
 
-	const char* szname = p.GetLongName();
+	const char* szname = p.GetShortName();
 	std::string sname = (m_beautify ? FSCore::beautify_string(szname) : szname);
 	QString paramName = QString::fromStdString(sname);
 
diff --git a/FEMLib/FEUserMaterial.cpp b/FEMLib/FEUserMaterial.cpp
@@ -74,7 +74,7 @@ void FSUserMaterial::Save(OArchive &ar)
 			{
 				Param& p = PB[i];
 				int ntype = p.GetParamType();
-				ar.WriteChunk(PARAMNAME, (char*) p.GetLongName());
+				ar.WriteChunk(PARAMNAME, (char*) p.GetShortName());
 				ar.WriteChunk(PARAMTYPE, ntype);
 				ar.BeginChunk(PARAMVALUE);
 				{

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ void CCurveEditor::BuildLoadCurves(QTreeWidgetItem* t1, FSModelComponent* po, co`
`165`	`165`	`if (p.GetLoadCurveID() > 0)`
`166`	`166`	`{`
`167`	`167`	`assert(p.IsVolatile());`
`168`		`- string pname = oname + "." + p.GetLongName();`
	`168`	`+ string pname = oname + "." + p.GetShortName();`
`169`	`169`	`ui->addTreeItem(t1, QString::fromStdString(pname), &p);`
`170`	`170`	`}`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ void CDlgFEBioInfo::onExport()`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`	`paramObj["name"] = pi.name();`
`226`		`- paramObj["description"] = pi.longName();`
	`226`	`+ paramObj["description"] = (pi.longName() ? pi.longName() : "");`
`227`	`227`	`paramObj["default"] = paramVal;`
`228`	`228`	`paramObj["units"] = (pi.units() ? pi.units() : "");`
`229`	`229`	`paramArray.append(paramObj);`
`@@ -239,7 +239,7 @@ void CDlgFEBioInfo::onExport()`
`239`	`239`	`{`
`240`	`240`	`QJsonObject paramObj;`
`241`	`241`	`paramObj["name"] = szname;`
`242`		`- paramObj["description"] = "";`
	`242`	`+ paramObj["description"] = (prop->GetLongName() ? prop->GetLongName() : "");`
`243`	`243`	`paramObj["default"] = "";`
`244`	`244`	`paramObj["units"] = "";`
`245`	`245`	`paramArray.append(paramObj);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ void CPropertySelector::onSelectionChanged(int n)`
`89`	`89`	`// also opening a custom dialog, and that works without any issues (with this object's destructor running`
`90`	`90`	`// after this function exits as expected).`
`91`	`91`	`#ifndef __APPLE__`
`92`		`- QString title = QString("Remove %1").arg(QString::fromStdString(m_pp->GetLongName()));`
	`92`	`+ QString title = QString("Remove %1").arg(QString::fromStdString(m_pp->GetName()));`
`93`	`93`	`if (QMessageBox::question(this, title, "Are you sure you want to remove this property?", QMessageBox::Yes \| QMessageBox::No) == QMessageBox::Yes)`
`94`	`94`	`{`
`95`	`95`	`emit currentDataChanged(n);`
`@@ -103,7 +103,7 @@ void CPropertySelector::onSelectionChanged(int n)`
`103`	`103`	`{`
`104`	`104`	`int superID = m_pp->GetSuperClassID();`
`105`	`105`	`int baseID = m_pp->GetPropertyType();`
`106`		`- QString title = QString("Add %1").arg(QString::fromStdString(m_pp->GetLongName()));`
	`106`	`+ QString title = QString("Add %1").arg(QString::fromStdString(m_pp->GetName()));`
`107`	`107`	`CDlgAddPhysicsItem dlg(title, superID, baseID, nullptr, true, false, this);`
`108`	`108`	`dlg.ShowNameAndCategoryFields(false);`
`109`	`109`	`if (dlg.exec())`
`@@ -120,7 +120,7 @@ void CPropertySelector::onSelectionChanged(int n)`
`120`	`120`	`{`
`121`	`121`	`int superID = m_pp->GetSuperClassID();`
`122`	`122`	`int baseID = m_pp->GetPropertyType();`
`123`		`- QString title = QString("Copy %1").arg(QString::fromStdString(m_pp->GetLongName()));`
	`123`	`+ QString title = QString("Copy %1").arg(QString::fromStdString(m_pp->GetName()));`
`124`	`124`	`FSModelComponent* src = dynamic_cast<FSModelComponent*>(m_pp->GetParent());`
`125`	`125`	`CDlgCopyPhysicsItem dlg(title, superID, baseID, src, m_fem, this);`
`126`	`126`	`if (dlg.exec())`
`@@ -231,8 +231,8 @@ class FEClassPropsModel : public QAbstractItemModel`
`231`	`231`	`QString name;`
`232`	`232`	`if (m_index == -1)`
`233`	`233`	`{`
`234`		`- string sname = p.GetLongName();`
`235`		`-// string sname = FSCore::beautify_string(p.GetLongName());`
	`234`	`+ string sname = p.GetShortName();`
	`235`	`+// string sname = FSCore::beautify_string(p.GetShortName());`
`236`	`236`	`name = QString::fromStdString(sname);`
`237`	`237`	`}`
`238`	`238`	`else`
`@@ -253,7 +253,10 @@ class FEClassPropsModel : public QAbstractItemModel`
`253`	`253`	`{`
`254`	`254`	`if (m_index == -1)`
`255`	`255`	`{`
`256`		`- QString toolTip = QString("<p><b>parameter:</b> <code>%1</code></p>").arg(p.GetShortName());`
	`256`	`+ QString toolTip;`
	`257`	`+ if (p.GetLongName())`
	`258`	`+ toolTip = QString("<p><b>%1: </b>%2</p>").arg(p.GetShortName()).arg(p.GetLongName());`
	`259`	`+`
`257`	`260`	`if (p.IsVolatile())`
`258`	`261`	`{`
`259`	`262`	`if (p.GetLoadCurveID() > 0)`
`@@ -534,14 +537,14 @@ class FEClassPropsModel : public QAbstractItemModel`
`534`	`537`	`{`
`535`	`538`	`if ((p.maxSize()==1) \|\| (m_index < 0))`
`536`	`539`	`{`
`537`		`- QString s = QString("<b>property:</b> <code>%1</code>").arg(QString::fromStdString(p.GetName()));`
	`540`	`+ QString s = QString("<b>%1: </b>%2").arg(QString::fromStdString(p.GetName())).arg(QString::fromStdString(p.GetLongName()));`
`538`	`541`	`return s;`
`539`	`542`	`}`
`540`	`543`	`}`
`541`	`544`	`else`
`542`	`545`	`{`
`543`		`-// string sname = FSCore::beautify_string(p.GetLongName().c_str());`
`544`		`- string sname = p.GetLongName().c_str();`
	`546`	`+// string sname = FSCore::beautify_string(p.GetName().c_str());`
	`547`	`+ string sname = p.GetName().c_str();`
`545`	`548`	`QString s = QString::fromStdString(sname);`
`546`	`549`	`if (p.maxSize() != 1)`
`547`	`550`	`{`
`@@ -1047,7 +1050,7 @@ class FEClassPropsModel : public QAbstractItemModel`
`1047`	`1050`	`if (paramId >= 0)`
`1048`	`1051`	`{`
`1049`	`1052`	`Param& p = pc->GetParam(paramId);`
`1050`		`- QString name = p.GetLongName();`
	`1053`	`+ QString name = p.GetShortName();`
`1051`	`1054`
`1052`	`1055`	`if (name.contains(m_filter, Qt::CaseInsensitive) == false)`
`1053`	`1056`	`{`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ class CMaterialPropsModel : public QAbstractItemModel`
`197`	`197`	`Param& p = m_pm->GetParam(m_paramId);`
`198`	`198`	`if (column == 0)`
`199`	`199`	`{`
`200`		`- QString name(p.GetLongName());`
	`200`	`+ QString name(p.GetShortName());`
`201`	`201`	`if (m_flag & Item_Indented)`
`202`	`202`	`{`
`203`	`203`	`name = " " + name;`
Original file line number	Diff line number	Diff line change
`@@ -659,8 +659,8 @@ void CModelViewer::on_props_paramChanged(FSCoreBase* pc, Param* p)`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`QString sp;`
`662`		`- if (po) sp = QString("\"%1.%2\"").arg(QString::fromStdString(po->GetName())).arg(p->GetLongName());`
`663`		`- else sp = QString("\"%1\"").arg(p->GetLongName());`
	`662`	`+ if (po) sp = QString("\"%1.%2\"").arg(QString::fromStdString(po->GetName())).arg(p->GetShortName());`
	`663`	`+ else sp = QString("\"%1\"").arg(p->GetShortName());`
`664`	`664`
`665`	`665`	`QString sv;`
`666`	`666`	`switch (p->GetParamType())`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void CObjectProps::AddParameter(Param& p)`
`41`	`41`	`{`
`42`	`42`	`CProperty* prop = nullptr;`
`43`	`43`
`44`		`- const char* szname = p.GetLongName();`
	`44`	`+ const char* szname = p.GetShortName();`
`45`	`45`	`std::string sname = (m_beautify ? FSCore::beautify_string(szname) : szname);`
`46`	`46`	`QString paramName = QString::fromStdString(sname);`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void FSUserMaterial::Save(OArchive &ar)`
`74`	`74`	`{`
`75`	`75`	`Param& p = PB[i];`
`76`	`76`	`int ntype = p.GetParamType();`
`77`		`- ar.WriteChunk(PARAMNAME, (char*) p.GetLongName());`
	`77`	`+ ar.WriteChunk(PARAMNAME, (char*) p.GetShortName());`
`78`	`78`	`ar.WriteChunk(PARAMTYPE, ntype);`
`79`	`79`	`ar.BeginChunk(PARAMVALUE);`
`80`	`80`	`{`