Merge pull request cryos#146 from ghutchis/add-workflow-scripts

Add workflow scripts and refactor InputGenerator
psavery · Dec 28, 2016 · a9c4411 · a9c4411
2 parents 3023af7 + b9b789b
commit a9c4411
Show file tree

Hide file tree

Showing 14 changed files with 3,132 additions and 1 deletion.
diff --git a/avogadro/molequeue/inputgeneratorwidget.cpp b/avogadro/molequeue/inputgeneratorwidget.cpp
@@ -33,6 +33,7 @@
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QSpinBox>
+#include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/QTextEdit>
 
 #include <QtCore/QJsonDocument>
@@ -835,6 +836,8 @@ QWidget *InputGeneratorWidget::createOptionWidget(const QJsonValue &option)
     return createFilePathWidget(obj);
   else if (type == "integer")
     return createIntegerWidget(obj);
+  else if (type == "float")
+    return createFloatWidget(obj);
   else if (type == "boolean")
     return createBooleanWidget(obj);
 
@@ -906,6 +909,33 @@ QWidget *InputGeneratorWidget::createIntegerWidget(const QJsonObject &obj)
   return spin;
 }
 
+QWidget *InputGeneratorWidget::createFloatWidget(const QJsonObject &obj)
+{
+  QDoubleSpinBox *spin = new QDoubleSpinBox(this);
+  if (obj.contains("minimum") &&
+      obj.value("minimum").isDouble()) {
+    spin->setMinimum(obj["minimum"].toDouble());
+  }
+  if (obj.contains("maximum") &&
+      obj.value("maximum").isDouble()) {
+    spin->setMaximum(obj["maximum"].toDouble());
+  }
+  if (obj.contains("precision") &&
+      obj.value("precision").isDouble()) {
+    spin->setDecimals(static_cast<int>(obj["precision"].toDouble()));
+  }
+  if (obj.contains("prefix") &&
+      obj.value("prefix").isString()) {
+    spin->setPrefix(obj["prefix"].toString());
+  }
+  if (obj.contains("suffix") &&
+      obj.value("suffix").isString()) {
+    spin->setSuffix(obj["suffix"].toString());
+  }
+  connect(spin, SIGNAL(valueChanged(double)), SLOT(updatePreviewText()));
+  return spin;
+}
+
 QWidget *InputGeneratorWidget::createBooleanWidget(const QJsonObject &obj)
 {
   Q_UNUSED(obj);

diff --git a/avogadro/molequeue/inputgeneratorwidget.h b/avogadro/molequeue/inputgeneratorwidget.h
@@ -242,6 +242,7 @@ private slots:
   QWidget* createStringWidget(const QJsonObject &obj);
   QWidget* createFilePathWidget(const QJsonObject &obj);
   QWidget* createIntegerWidget(const QJsonObject &obj);
+  QWidget* createFloatWidget(const QJsonObject &obj);
   QWidget* createBooleanWidget(const QJsonObject &obj);
   /**@}*/
 

diff --git a/avogadro/qtgui/CMakeLists.txt b/avogadro/qtgui/CMakeLists.txt
@@ -36,6 +36,8 @@ set(HEADERS
   fileformatdialog.h
   generichighlighter.h
   hydrogentools.h
+  interfacescript.h
+  interfacewidget.h
   meshgenerator.h
   molecule.h
   moleculemodel.h
@@ -63,6 +65,8 @@ set(SOURCES
   fileformatdialog.cpp
   generichighlighter.cpp
   hydrogentools.cpp
+  interfacescript.cpp
+  interfacewidget.cpp
   meshgenerator.cpp
   molecule.cpp
   moleculemodel.cpp

diff --git a/avogadro/qtgui/hydrogentools.h b/avogadro/qtgui/hydrogentools.h
@@ -29,7 +29,7 @@ namespace QtGui {
 class RWAtom;
 class RWMolecule;
 
-class AVOGADROCORE_EXPORT HydrogenTools
+class AVOGADROQTGUI_EXPORT HydrogenTools
 {
 public: