Merge branch 'master' into issues_Y

Author: dcwhite

src/Interface/Modules/Math/CollectMatricesDialog.cc

@@ -27,7 +27,6 @@
 */
 
 #include <Interface/Modules/Math/CollectMatricesDialog.h>
-#include <Dataflow/Network/ModuleStateInterface.h>  //TODO: extract into intermediate
 #include <Core/Algorithms/Math/CollectMatrices/CollectMatricesAlgorithm.h>
 
 using namespace SCIRun::Gui;
@@ -41,7 +40,7 @@ CollectMatricesDialog::CollectMatricesDialog(const std::string& name, ModuleStat
   setupUi(this);
   setWindowTitle(QString::fromStdString(name));
   fixSize();
-  addRadioButtonGroupManager({ rowRadioButton_, columnRadioButton_ }, Parameters::CollectAppendIndicator);
-  addRadioButtonGroupManager({ appendRadioButton_, replaceRadioButton_ }, Parameters::CollectRowIndicator);
+  addRadioButtonGroupManager({ rowRadioButton_, columnRadioButton_ }, Parameters::CollectRowIndicator);
+  addRadioButtonGroupManager({ appendRadioButton_, replaceRadioButton_ }, Parameters::CollectAppendIndicator);
   addRadioButtonGroupManager({ prependRadioButton_, postpendRadioButton_ }, Parameters::CollectPrependIndicator);
 }

src/Modules/Factory/HardCodedModuleFactory.cc

@@ -36,9 +36,10 @@
 #include <Dataflow/Network/SimpleSourceSink.h>
 #include <Modules/Factory/ModuleDescriptionLookup.h>
 
+using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Modules;
-using namespace SCIRun::Modules::Factory;
+using namespace Factory;
 //
 using namespace boost::assign;
 
@@ -97,18 +98,18 @@ HardCodedModuleFactory::HardCodedModuleFactory() : impl_(new HardCodedModuleFact
   Module::Builder::use_source_type(boost::factory<SimpleSource*>());
 }
 
-void HardCodedModuleFactory::setStateFactory(SCIRun::Dataflow::Networks::ModuleStateFactoryHandle stateFactory)
+void HardCodedModuleFactory::setStateFactory(ModuleStateFactoryHandle stateFactory)
 {
   stateFactory_ = stateFactory;
   Module::defaultStateFactory_ = stateFactory_;
 }
 
-void HardCodedModuleFactory::setAlgorithmFactory(SCIRun::Core::Algorithms::AlgorithmFactoryHandle algoFactory)
+void HardCodedModuleFactory::setAlgorithmFactory(AlgorithmFactoryHandle algoFactory)
 {
   Module::defaultAlgoFactory_ = algoFactory;
 }
 
-void HardCodedModuleFactory::setReexecutionFactory(SCIRun::Dataflow::Networks::ReexecuteStrategyFactoryHandle reexFactory)
+void HardCodedModuleFactory::setReexecutionFactory(ReexecuteStrategyFactoryHandle reexFactory)
 {
   Module::defaultReexFactory_ = reexFactory;
 }

src/Modules/Factory/HardCodedModuleFactory.h

@@ -39,19 +39,19 @@ namespace SCIRun {
   namespace Modules {
     namespace Factory {
 
-      class SCISHARE HardCodedModuleFactory : public SCIRun::Dataflow::Networks::ModuleFactory
+      class SCISHARE HardCodedModuleFactory : public Dataflow::Networks::ModuleFactory
       {
       public:
         HardCodedModuleFactory();
-        virtual SCIRun::Dataflow::Networks::ModuleDescription lookupDescription(const SCIRun::Dataflow::Networks::ModuleLookupInfo& info);
-        virtual SCIRun::Dataflow::Networks::ModuleHandle create(const SCIRun::Dataflow::Networks::ModuleDescription& info);
-        virtual void setStateFactory(SCIRun::Dataflow::Networks::ModuleStateFactoryHandle stateFactory);
-        virtual void setAlgorithmFactory(SCIRun::Core::Algorithms::AlgorithmFactoryHandle algoFactory);
-        virtual void setReexecutionFactory(SCIRun::Dataflow::Networks::ReexecuteStrategyFactoryHandle reexFactory);
-        virtual const Dataflow::Networks::ModuleDescriptionMap& getAllAvailableModuleDescriptions() const;
-        virtual const Dataflow::Networks::DirectModuleDescriptionLookupMap& getDirectModuleDescriptionLookupMap() const;
+        virtual Dataflow::Networks::ModuleDescription lookupDescription(const Dataflow::Networks::ModuleLookupInfo& info) override;
+        virtual Dataflow::Networks::ModuleHandle create(const Dataflow::Networks::ModuleDescription& info) override;
+        virtual void setStateFactory(Dataflow::Networks::ModuleStateFactoryHandle stateFactory) override;
+        virtual void setAlgorithmFactory(Core::Algorithms::AlgorithmFactoryHandle algoFactory) override;
+        virtual void setReexecutionFactory(Dataflow::Networks::ReexecuteStrategyFactoryHandle reexFactory) override;
+        virtual const Dataflow::Networks::ModuleDescriptionMap& getAllAvailableModuleDescriptions() const override;
+        virtual const Dataflow::Networks::DirectModuleDescriptionLookupMap& getDirectModuleDescriptionLookupMap() const override;
       private:
-        SCIRun::Dataflow::Networks::ModuleStateFactoryHandle stateFactory_;
+        Dataflow::Networks::ModuleStateFactoryHandle stateFactory_;
         boost::shared_ptr<class HardCodedModuleFactoryImpl> impl_;
       };
     }

src/Modules/Legacy/Math/CollectMatrices.cc

@@ -116,15 +116,14 @@ CollectMatrices::execute()
 {
   update_state(NeedData);
 
-  //MatrixHandle aH, bH;
   auto aHOpt = getOptionalInput(Optional_BaseMatrix);
   auto bH = getRequiredInput(SubMatrix);
 
   auto state = get_state();
-  bool append = state->getValue(Parameters::CollectAppendIndicator).toInt() != 0;
-  bool row = state->getValue(Parameters::CollectRowIndicator).toInt() != 0;
-  bool front = state->getValue(Parameters::CollectPrependIndicator).toInt() != 0;
-
+  bool append = state->getValue(Parameters::CollectAppendIndicator).toInt() == 0;
+  bool row = state->getValue(Parameters::CollectRowIndicator).toInt() == 0;
+  bool front = state->getValue(Parameters::CollectPrependIndicator).toInt() == 0;
+  
   MatrixHandle omatrix;
 
   if (!append)               // Replace -- just send B matrix