Fix issues with CollectMatrices

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/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