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

Author: SteveMaas1978

FEBioStudio/DlgAddPhysicsItem.cpp

@@ -30,6 +30,7 @@ SOFTWARE.*/
 #include <QTreeWidgetItem>
 #include <QFormLayout>
 #include <QBoxLayout>
+#include <QMessageBox>
 #include <QLabel>
 #include <QToolButton>
 #include <QHeaderView>
@@ -43,6 +44,7 @@ SOFTWARE.*/
 #include <FEBioLink/FEBioClass.h>
 #include <FEBioLink/FEBioModule.h>
 #include <FSCore/FSCore.h>
+#include "HelpFeature.h"
 
 using namespace std;
 
@@ -106,8 +108,15 @@ class UIDlgAddPhysicsItem
 		layout->addLayout(h);
 		layout->addWidget(type);
 
-		dlg->SetLeftSideLayout(layout);
+        QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help);
 
+		layout->addWidget(bb);
+
+		dlg->setLayout(layout);
+        
+        QObject::connect(bb, SIGNAL(accepted()), dlg, SLOT(accept()));
+		QObject::connect(bb, SIGNAL(rejected()), dlg, SLOT(reject()));
+		QObject::connect(bb, SIGNAL(helpRequested()), dlg, SLOT(on_help_clicked()));
 		QObject::connect(type, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), dlg, SLOT(accept()));
 		QObject::connect(flt, SIGNAL(textChanged(const QString&)), dlg, SLOT(Update()));
 		QObject::connect(tb, SIGNAL(clicked()), dlg, SLOT(Update()));
@@ -118,7 +127,7 @@ class UIDlgAddPhysicsItem
 };
 
 CDlgAddPhysicsItem::CDlgAddPhysicsItem(QString windowName, int superID, int baseClassID, FSModel* fem, bool includeModuleDependencies, bool showStepList, QWidget* parent)
-	: CHelpDialog(parent), ui(new UIDlgAddPhysicsItem)
+	: QDialog(parent), ui(new UIDlgAddPhysicsItem)
 {
 	setWindowTitle(windowName);
 	setMinimumSize(800, 600);
@@ -138,13 +147,11 @@ CDlgAddPhysicsItem::CDlgAddPhysicsItem(QString windowName, int superID, int base
 		}
 	}
 
-	m_module = FEBio::GetActiveModule();
-
 	unsigned int searchFlags = 0;
 	if (ui->m_modDepends) searchFlags |= FEBio::ClassSearchFlags::IncludeModuleDependencies;
 
 	// set the types
-	vector<FEBio::FEBioClassInfo> l = FEBio::FindAllClasses(m_module, ui->m_superID, ui->m_baseClassID, searchFlags);
+	vector<FEBio::FEBioClassInfo> l = FEBio::FindAllClasses(FEBio::GetActiveModule(), ui->m_superID, ui->m_baseClassID, searchFlags);
 	for (int i = 0; i < (int)l.size(); ++i)
 	{
 		FEBio::FEBioClassInfo& fac = l[i];
@@ -210,6 +217,20 @@ void CDlgAddPhysicsItem::Update()
 	ui->type->model()->sort(0);
 }
 
+void CDlgAddPhysicsItem::on_help_clicked()
+{
+    if(ui->type->selectedItems().size() > 0)
+    {
+        int classID = ui->type->currentItem()->data(0, Qt::UserRole).toInt();
+
+        ShowHelp(ClassIDToURL(classID));
+    }
+    else
+    {
+		QMessageBox::information(this, "Help", "Please select an item before clicking Help.");
+    }
+}
+
 std::string CDlgAddPhysicsItem::GetName()
 {
 	return ui->name->text().toStdString();
@@ -226,20 +247,6 @@ int CDlgAddPhysicsItem::GetClassID()
 	return (it ? it->data(0, Qt::UserRole).toInt() : -1);
 }
 
-void CDlgAddPhysicsItem::UpdateHelpURL()
-{
-    if(ui->type->selectedItems().size() > 0)
-    {
-        int classID = ui->type->currentItem()->data(0, Qt::UserRole).toInt();
-
-        SetURL(ClassIDToURL(classID));
-    }
-    else
-    {
-		SetURL(QString());
-    }
-}
-
 class UIDlgCopyPhysicsItem
 {
 private:

FEBioStudio/DlgAddPhysicsItem.h

@@ -25,14 +25,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.*/
 
 #pragma once
-#include "HelpDialog.h"
+#include <QDialog>
 
 class UIDlgAddPhysicsItem;
 class UIDlgCopyPhysicsItem;
 class FSModel;
 class FSModelComponent;
 
-class CDlgAddPhysicsItem : public CHelpDialog
+class CDlgAddPhysicsItem : public QDialog
 {
 	Q_OBJECT
 
@@ -45,11 +45,9 @@ class CDlgAddPhysicsItem : public CHelpDialog
 
 	void ShowNameAndCategoryFields(bool b);
 
-protected:
-	void UpdateHelpURL();
-
 public slots:
 	void Update();
+    void on_help_clicked();
 
 private:
 	UIDlgAddPhysicsItem*	ui;

FEBioStudio/DlgPluginRepo.cpp

@@ -308,6 +308,7 @@ class Ui::CDlgPluginRepo
 
     QPushButton* loadLocalButton;
     QPushButton* submitPluginButton;
+    QPushButton* writeConfigButton;
     QPushButton* closeButton;
 
     void setupUI(::CDlgPluginRepo* dlg, CPluginManager* manager)
@@ -524,6 +525,12 @@ class Ui::CDlgPluginRepo
         buttonBar->addWidget(submitPluginButton = new QPushButton("Sumbit a Plugin to the Repository"));
         submitPluginButton->setFocusPolicy(Qt::NoFocus);
 
+        buttonBar->addWidget(writeConfigButton = new QPushButton("Save FEBio Config File"));
+        writeConfigButton->setFocusPolicy(Qt::NoFocus);
+        writeConfigButton->setToolTip("Writes the current plugin configuration to an FEBio config file. "
+            "This allows you to easily load these plugins into FEBio when launched from the command line by "
+            "referencing the config file.");
+
         QWidget* spacer = new QWidget();
         spacer->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
         buttonBar->addWidget(spacer);
@@ -549,6 +556,7 @@ class Ui::CDlgPluginRepo
 
         QObject::connect(loadLocalButton, &QPushButton::clicked, dlg, &::CDlgPluginRepo::on_loadLocalButton_clicked);
         QObject::connect(submitPluginButton, &QPushButton::clicked, dlg, &::CDlgPluginRepo::on_submitPluginButton_clicked);
+        QObject::connect(writeConfigButton, &QPushButton::clicked, dlg, &::CDlgPluginRepo::on_writeConfigButton_clicked);
         QObject::connect(closeButton, &QPushButton::clicked, dlg, &::CDlgPluginRepo::reject);
     }
 
@@ -885,6 +893,8 @@ void CDlgPluginRepo::on_PluginsReady()
 
     for (auto& [id, plugin] : plugins)
     {
+        if(plugin.status == PLUGIN_UNAVAILABLE) continue;
+
         ui->pluginListWidget->AddPlugin(plugin);
     }
 
@@ -1032,4 +1042,13 @@ void CDlgPluginRepo::on_submitPluginButton_clicked()
 {
     DlgSubmitPlugin dlg(ui->m_manager);
     dlg.exec();
-}
+}
+
+void CDlgPluginRepo::on_writeConfigButton_clicked()
+{
+    QString fileName = QFileDialog::getSaveFileName(this, "Save FEBio Config File", "febio.xml", "XML Files (*.xml)");
+
+    if(fileName.isEmpty()) return;
+
+    ui->m_manager->WriteConfigFile(fileName.toStdString());
+}

FEBioStudio/DlgPluginRepo.h

@@ -113,6 +113,7 @@ private slots:
     // void on_bbButton_clicked(QAbstractButton *button);
     void on_loadLocalButton_clicked();
     void on_submitPluginButton_clicked();
+    void on_writeConfigButton_clicked();
 
 private:
     friend class Ui::CDlgPluginRepo;

FEBioStudio/HelpDialog.cpp FEBioStudio/HelpFeature.cppFEBioStudio/HelpDialog.cpp renamed to FEBioStudio/HelpFeature.cpp

@@ -24,88 +24,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.*/
 
-#include <QCoreApplication>
-#include <QBoxLayout>
-#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QTextBrowser>
 #include <QDesktopServices>
-#include <QMessageBox>
-#include <FEMLib/FSProject.h>
-#include "HelpDialog.h"
-#include "FEBioStudio.h"
-#include "MainWindow.h"
-#include <FEBioLink/FEBioModule.h>
-#include <FEBioLib/version.h>
+#include <QUrl>
+#include "HelpFeature.h"
 #include <FEBioLink/FEBioClass.h>
 
 #define MANUAL_PATH "https://febiosoftware.github.io/febio-feature-manual/features/"
 
-class Ui::CHelpDialog
-{
-public:
-	QPushButton* helpButton;
-	QHBoxLayout* helpLayout;
-
-public:
-	void setupUi(QWidget* parent)
-	{
-		QVBoxLayout* mainLayout = new QVBoxLayout;
-		helpLayout = new QHBoxLayout;
-
-		mainLayout->addLayout(helpLayout);
-
-		QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
-        helpButton = new QPushButton("Help");
-        helpButton->setCheckable(true);
-
-        bb->addButton(helpButton, QDialogButtonBox::HelpRole);
-
-		mainLayout->addWidget(bb);
-
-		QObject::connect(bb, SIGNAL(accepted()), parent, SLOT(accept()));
-		QObject::connect(bb, SIGNAL(rejected()), parent, SLOT(reject()));
-		QObject::connect(bb, SIGNAL(helpRequested()), parent, SLOT(on_help_clicked()));
-
-		parent->setLayout(mainLayout);
-	}
-};
-
-
-CHelpDialog::CHelpDialog(QWidget* parent) : QDialog(parent), ui(new Ui::CHelpDialog)
-{
-	ui->setupUi(this);
-
-	m_module = FEBio::GetActiveModule();
-}
-
-CHelpDialog::~CHelpDialog() { delete ui; }
-
-void ShowHelp(const QString& url)
-{
-	QDesktopServices::openUrl(QUrl(QString(MANUAL_PATH) + url));
-}
-
-void CHelpDialog::on_help_clicked()
-{
-    UpdateHelpURL();
-
-    if(m_url.isEmpty())
-    {
-        QMessageBox::information(this, "Help", "Please select an item before clicking Help.");
-    }
-    else
-    {
-		ShowHelp(m_url);
-    }
-}
-
-void CHelpDialog::SetLeftSideLayout(QLayout* layout)
-{
-	ui->helpLayout->insertLayout(0, layout);
-}
-
 QString ClassIDToURL(int classID)
 {
 	QString url;
@@ -122,7 +47,7 @@ QString ClassIDToURL(int classID)
 	return url;
 }
 
-void CHelpDialog::SetURL(const QString& url)
+void ShowHelp(const QString& url)
 {
-	m_url = url;
+	QDesktopServices::openUrl(QUrl(QString(MANUAL_PATH) + url));
 }

FEBioStudio/HelpDialog.h FEBioStudio/HelpFeature.hFEBioStudio/HelpDialog.h renamed to FEBioStudio/HelpFeature.h

@@ -25,40 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.*/
 
 #pragma once
-#include <QDialog>
-
-class QLayout;
-
-namespace Ui {
-	class CHelpDialog;
-};
-
-class CHelpDialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	CHelpDialog(QWidget* parent);
-	virtual ~CHelpDialog();
-
-protected slots:
-	void on_help_clicked();
-
-public:
-	void SetLeftSideLayout(QLayout* layout);
-
-	virtual void UpdateHelpURL() = 0;
-
-protected:
-    void SetURL(const QString& url);
-
-protected:
-	int		m_module;
-	QString m_url;
-	QString m_unselectedHelp;
-private:
-	Ui::CHelpDialog* ui;
-};
+#include <QString>
 
 QString ClassIDToURL(int classID);
 void ShowHelp(const QString& url);