Merge branch 'master' into python-VS-restrictions

Author: dcwhite

src/Core/Algorithms/Math/AddKnownsToLinearSystem.cc

@@ -65,13 +65,6 @@ bool AddKnownsToLinearSystemAlgo::run(SparseRowMatrixHandle stiff,
 
   SparseRowMatrixFromMap::Values additionalData;
 
-  // Making sure the stiff matrix (left hand side) is symmetric
-  if (!isSymmetricMatrix(*stiff,bound_for_equality))
-  {
-    std::ostringstream ostr1;
-    ostr1 << "matrix A is not symmetrical due to a difference of " << bound_for_equality << std::endl;
-    THROW_ALGORITHM_INPUT_ERROR(ostr1.str());    
-  }
 
   // Storing the number of columns in m and rows in n from the stiff matrix, m == n
   const unsigned int numCols = static_cast<unsigned int>(stiff->ncols());

src/Interface/Modules/Base/ModuleDialogGeneric.cc

@@ -436,6 +436,45 @@ void ModuleDialogGeneric::addLineEditManager(QLineEdit* lineEdit, const Algorith
   addWidgetSlotManager(boost::make_shared<LineEditSlotManager>(state_, *this, stateKey, lineEdit));
 }
 
+class TabSlotManager : public WidgetSlotManager
+{
+public:
+  TabSlotManager(ModuleStateHandle state, ModuleDialogGeneric& dialog, const AlgorithmParameterName& stateKey, QTabWidget* tabWidget) :
+    WidgetSlotManager(state, dialog, tabWidget, stateKey), stateKey_(stateKey), tabWidget_(tabWidget)
+  {
+    connect(tabWidget_, SIGNAL(currentChanged(int)), this, SLOT(push()));
+  }
+  virtual void pull() override
+  {
+    auto newValue = QString::fromStdString(state_->getValue(stateKey_).toString());
+    if (newValue != tabWidget_->tabText(tabWidget_->currentIndex()))
+    {
+      for (int i = 0; i < tabWidget_->count(); ++i)
+      {
+        if (tabWidget_->tabText(i) == newValue)
+        {
+          tabWidget_->setCurrentIndex(i);
+          LOG_DEBUG("In new version of pull code for LineEdit: " << newValue.toStdString());
+          return;
+        }
+      }
+    }
+  }
+  virtual void pushImpl() override
+  {
+    LOG_DEBUG("In new version of push code for QTabWidget: " << tabWidget_->tabText(tabWidget_->currentIndex()).toStdString());
+    state_->setValue(stateKey_, tabWidget_->tabText(tabWidget_->currentIndex()).toStdString());
+  }
+private:
+  AlgorithmParameterName stateKey_;
+  QTabWidget* tabWidget_;
+};
+
+void ModuleDialogGeneric::addTabManager(QTabWidget* tab, const AlgorithmParameterName& stateKey)
+{
+  addWidgetSlotManager(boost::make_shared<TabSlotManager>(state_, *this, stateKey, tab));
+}
+
 class DoubleLineEditSlotManager : public WidgetSlotManager
 {
 public:

src/Interface/Modules/Base/ModuleDialogGeneric.h

@@ -141,6 +141,7 @@ namespace Gui {
     void addDynamicLabelManager(QLabel* label, const Core::Algorithms::AlgorithmParameterName& stateKey);
     void addRadioButtonGroupManager(std::initializer_list<QRadioButton*> radioButtons, const Core::Algorithms::AlgorithmParameterName& stateKey);
     void addSliderManager(QSlider* slider, const Core::Algorithms::AlgorithmParameterName& stateKey);
+    void addTabManager(QTabWidget* tab, const Core::Algorithms::AlgorithmParameterName& stateKey);
     void removeManager(const Core::Algorithms::AlgorithmParameterName& stateKey);
 
     using TableWidgetMaker = std::function<QTableWidgetItem*()>;

src/Interface/Modules/Fields/ExtractSimpleIsosurfaceDialog.cc

@@ -29,7 +29,6 @@
 #include <Interface/Modules/Fields/ExtractSimpleIsosurfaceDialog.h>
 #include <Core/Algorithms/Legacy/Fields/MeshDerivatives/ExtractSimpleIsosurfaceAlgo.h>
 #include <Dataflow/Network/ModuleStateInterface.h>
-#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
 
 using namespace SCIRun::Gui;
 using namespace SCIRun::Dataflow::Networks;
@@ -47,35 +46,5 @@ ExtractSimpleIsosurfaceDialog::ExtractSimpleIsosurfaceDialog(const std::string&
   addSpinBoxManager(quantitySpinBox_, Parameters::QuantityOfIsovalues);
   addTextEditManager(isovalListFromQuantityTextEdit_, Parameters::IsovalueListString);
   WidgetStyleMixin::tabStyle(tabWidget);
-  connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateIsoMethod(int)));
-}
-
-void ExtractSimpleIsosurfaceDialog::pullSpecial()
-{
-  auto method = state_->getValue(Parameters::IsovalueChoice).toString();
-  if (method == "Single")
-    tabWidget->setCurrentIndex(0);
-  else if (method == "List")
-    tabWidget->setCurrentIndex(1);
-  else if (method == "Quantity")
-    tabWidget->setCurrentIndex(2);
-}
-
-void ExtractSimpleIsosurfaceDialog::updateIsoMethod(int tab)
-{
-  if (!pulling_)
-  {
-    switch (tab)
-    {
-    case 0:
-      state_->setValue(Parameters::IsovalueChoice, std::string("Single"));
-      break;
-    case 1:
-      state_->setValue(Parameters::IsovalueChoice, std::string("List"));
-      break;
-    case 2:
-      state_->setValue(Parameters::IsovalueChoice, std::string("Quantity"));
-      break;
-    }
-  }
+  addTabManager(tabWidget, Parameters::IsovalueChoice);
 }

src/Interface/Modules/Fields/ExtractSimpleIsosurfaceDialog.h

@@ -43,11 +43,8 @@ class SCISHARE ExtractSimpleIsosurfaceDialog : public ModuleDialogGeneric,
 
 public:
   ExtractSimpleIsosurfaceDialog(const std::string& name,
-    SCIRun::Dataflow::Networks::ModuleStateHandle state,
-    QWidget* parent = 0);
-  virtual void pullSpecial() override;
-private Q_SLOTS:
-  void updateIsoMethod(int tab);
+    Dataflow::Networks::ModuleStateHandle state,
+    QWidget* parent = nullptr);
 };
 
 }

src/LATEST_TAG.txt

@@ -1 +1 @@
-v5.0-beta.A
+v5.0-beta.B