Merge branch 'develop' of https://github.com/febiosoftware/FEBioStudio into develop

Author: SteveMaas1978

.github/workflows/linux-push.yml

@@ -15,7 +15,6 @@ jobs:
     with:
       package-name: febio-studio
       requires-sdk: true
-      python-module: true
       publish: true
       aws-ami-id: ${{ vars.LINUX_AMI }}
     secrets: inherit

.github/workflows/linux-python-module.yml

@@ -0,0 +1,20 @@
+name: CI - Linux Python Module
+
+on:
+  workflow_dispatch:
+  repository_dispatch:
+    types: [release-published, python-module]
+
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents: read  # This is required for actions/checkout
+jobs:
+  call_workflow:
+    uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable.yml@develop
+    with:
+      package-name: python-module
+      python-module: true
+      publish: true
+      aws-ami-id: ${{ vars.LINUX_AMI }}
+      build-script: buildPython.sh
+    secrets: inherit

.github/workflows/macos-push.yml

@@ -17,6 +17,5 @@ jobs:
       package-name: febio-studio
       requires-sdk: true
       post-build: true
-      python-module: true
       publish: true
     secrets: inherit

.github/workflows/macos-python-module.yml

@@ -0,0 +1,20 @@
+name: CI - macOS Python Module
+
+on:
+  workflow_dispatch:
+  repository_dispatch:
+    types: [release-published, python-module]
+
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents: read  # This is required for actions/checkout
+
+jobs:
+  call_workflow:
+    uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable.yml@develop
+    with:
+      package-name: python-module
+      python-module: true
+      publish: true
+      build-script: buildPython.sh
+    secrets: inherit

.github/workflows/python-module.yml

@@ -0,0 +1,17 @@
+name: CI - Python Module
+
+on:
+  workflow_dispatch:
+
+jobs:
+  dispatch-python-workflow:
+    name: "Repository dispatch Python workflow"
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Dispatch repository with python-module"
+        uses: febiosoftware/febio-workflows/.github/actions/repository-dispatch@develop
+        with:
+          github-pat-token: ${{ secrets.GITHUB_TOKEN }}
+          repository: "febiosoftware/FEBioStudio"
+          client-payload: "client_payload[ref_name]=${{ github.ref_name }}"
+          event-type: python-module

.github/workflows/windows-push.yml

@@ -15,7 +15,6 @@ jobs:
     with:
       package-name: febio-studio
       requires-sdk: true
-      python-module: true
       publish: true
       aws-ami-id: ${{ vars.WINDOWS_AMI }}
     secrets: inherit

.github/workflows/windows-python-module.yml

@@ -0,0 +1,20 @@
+name: CI - Windows Python Module
+
+on:
+  workflow_dispatch:
+  repository_dispatch:
+    types: [release-published, python-module]
+
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents: read  # This is required for actions/checkout
+jobs:
+  call_workflow:
+    uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable.yml@develop
+    with:
+      package-name: python-module
+      python-module: true
+      publish: true
+      aws-ami-id: ${{ vars.WINDOWS_AMI }}
+      build-script: buildPython.bat
+    secrets: inherit

FEBioLink/FEBioClass.cpp

@@ -366,7 +366,8 @@ FEBioClassInfo FEBio::GetClassInfo(int classId)
 	ci.classId = classId;
 	ci.baseClassId = baseClassIndex(fac->GetBaseClassName());
 	ci.sztype = fac->GetTypeStr();
-	ci.szmod = fecore.GetModuleName(modId);
+	ci.szmod = fecore.GetModuleName(modId - 1);
+    ci.superClassName = FECoreKernel::SuperClassString(fac->GetSuperClassID());
 	ci.spec = fac->GetSpecID();
     ci.allocId = fac->GetAllocatorID();
 
@@ -438,6 +439,7 @@ std::vector<FEBio::FEBioClassInfo> FEBio::FindAllClasses(int mod, int superId, i
 				fac->GetTypeStr(),
 				fac->GetClassName(),
 				szmod,
+                FECoreKernel::SuperClassString(fac->GetSuperClassID()),
 				fac->GetSpecID() };
 			facs.push_back(febc);
 		}
@@ -481,6 +483,7 @@ std::vector<FEBio::FEBioClassInfo> FEBio::FindAllClasses(int mod, int superId, i
 						fac->GetTypeStr(),
 						fac->GetClassName(),
 						szmod,
+                        FECoreKernel::SuperClassString(fac->GetSuperClassID()),
 						fac->GetSpecID() };
 					facs.push_back(febc);
 				}
@@ -508,6 +511,7 @@ std::vector<FEBio::FEBioClassInfo> FEBio::FindAllPluginClasses(int allocId)
 				fac->GetTypeStr(),
 				fac->GetClassName(),
 				szmod,
+                FECoreKernel::SuperClassString(fac->GetSuperClassID()),
 				fac->GetSpecID()
 			};
 			facs.push_back(febc);

FEBioLink/FEBioClass.h

@@ -108,6 +108,7 @@ namespace FEBio {
 		int				baseClassId;	// base class index
 		const char*		sztype;			// the type string
 		const char*		szclass;		// the (C++) class name
+        const char*     superClassName; // the super class name
 		const char*		szmod;			// the module name
 		int				spec;			// spec ID (i.e. FEBio file version)
         int             allocId;		// allocator ID 

FEBioStudio/DlgAddPhysicsItem.cpp

@@ -43,9 +43,6 @@ SOFTWARE.*/
 #include <FEBioLink/FEBioClass.h>
 #include <FEBioLink/FEBioModule.h>
 #include <FSCore/FSCore.h>
-#include "HelpUrl.h"
-
-#include <iostream>
 
 using namespace std;
 
@@ -229,25 +226,18 @@ int CDlgAddPhysicsItem::GetClassID()
 	return (it ? it->data(0, Qt::UserRole).toInt() : -1);
 }
 
-void CDlgAddPhysicsItem::SetURL()
+void CDlgAddPhysicsItem::UpdateHelpURL()
 {
     if(ui->type->selectedItems().size() > 0)
     {
-
         int classID = ui->type->currentItem()->data(0, Qt::UserRole).toInt();
 
-        const char* typeString = FEBio::GetClassInfo(classID).sztype;
-
-        m_url = GetHelpURL(ui->m_superID, typeString);
+        SetURL(classID);
     }
     else
     {
-        m_url = UNSELECTED_HELP;
+        SetURL(-1);
     }
-
-    // cout << "SUPERID " << ui->m_superID << endl;
-
-    // FECoreKernel::GetInstance().List((SUPER_CLASS_ID) ui->m_superID);
 }
 
 class UIDlgCopyPhysicsItem