More direct file type transmission

Issues with state map call in constructor...

Author: dcwhite

src/Dataflow/Network/ModuleStateInterface.h

@@ -29,7 +29,7 @@
 /// @todo Documentation Dataflow/Network/ModuleStateInterface.h
 
 #ifndef DATAFLOW_NETWORK_MODULE_STATE_INTERFACE_H
-#define DATAFLOW_NETWORK_MODULE_STATE_INTERFACE_H 
+#define DATAFLOW_NETWORK_MODULE_STATE_INTERFACE_H
 
 #include <string>
 #include <iostream>
@@ -50,7 +50,7 @@ namespace Networks {
   {
   public:
     virtual ~ModuleStateInterface();
-    
+
     typedef std::vector<SCIRun::Core::Algorithms::AlgorithmParameterName> Keys;
     typedef SCIRun::Core::Algorithms::AlgorithmParameterName Name;
     typedef SCIRun::Core::Algorithms::AlgorithmParameter Value;
@@ -105,7 +105,7 @@ namespace Networks {
   {
     return x ? any_cast_or_default_<T>(*x) : T();
   }
-  
+
   class SCISHARE StateChangeObserver
   {
   public:

src/Dataflow/Serialization/Network/StateSerialization.cc

@@ -39,6 +39,7 @@ SimpleMapModuleStateXML::SimpleMapModuleStateXML()
 
 SimpleMapModuleStateXML::SimpleMapModuleStateXML(const SimpleMapModuleState& state) : SimpleMapModuleState(state)
 {
+  //std::cout << "SMMSxml copy" << std::endl;
 }
 
 boost::shared_ptr<SimpleMapModuleStateXML> SCIRun::Dataflow::State::make_state_xml(SCIRun::Dataflow::Networks::ModuleStateHandle state)
@@ -47,4 +48,4 @@ boost::shared_ptr<SimpleMapModuleStateXML> SCIRun::Dataflow::State::make_state_x
   if (mapState)
     return boost::shared_ptr<SimpleMapModuleStateXML>(new SimpleMapModuleStateXML(*mapState));
   return boost::shared_ptr<SimpleMapModuleStateXML>();
-}
+}

src/Dataflow/State/SimpleMapModuleState.cc

@@ -38,21 +38,26 @@ using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Core::Logging;
 
-SimpleMapModuleState::SimpleMapModuleState() 
+SimpleMapModuleState::SimpleMapModuleState(const std::string& name) : name_(name)
 {
+  //std::cout << "SMMS ctor " << name_ << std::endl;
 }
 
 SimpleMapModuleState::SimpleMapModuleState(SimpleMapModuleState&& rhs)
-  : stateMap_(std::move(rhs.stateMap_)), 
-  transientStateMap_(std::move(rhs.transientStateMap_))
+  : stateMap_(std::move(rhs.stateMap_)),
+  transientStateMap_(std::move(rhs.transientStateMap_)),
+  name_(std::move(rhs.name_))
 {
+  //std::cout << "SMMS move ctor " << name_ << std::endl;
   stateChangedSignal_.swap(rhs.stateChangedSignal_);
 }
 
 SimpleMapModuleState::SimpleMapModuleState(const SimpleMapModuleState& rhs)
-  : stateMap_(rhs.stateMap_), 
-  transientStateMap_(rhs.transientStateMap_) /// @todo: I think this is wrong, transient shouldn't be copied
+  : stateMap_(rhs.stateMap_),
+  transientStateMap_(rhs.transientStateMap_), /// @todo: I think this is wrong, transient shouldn't be copied
+  name_(rhs.name_)
 {
+  //std::cout << "SMMS copy ctor " << name_ << std::endl;
 }
 
 SimpleMapModuleState& SimpleMapModuleState::operator=(const SimpleMapModuleState& rhs)
@@ -61,6 +66,8 @@ SimpleMapModuleState& SimpleMapModuleState::operator=(const SimpleMapModuleState
   {
     stateMap_ = rhs.stateMap_;
     transientStateMap_ = rhs.transientStateMap_;  /// @todo: I think this is wrong, transient shouldn't be copied
+    name_ = rhs.name_;
+    //std::cout << "SMMS copy assign " << name_<< std::endl;
     /// @todo??
     //stateChangedSignal_.disconnect_all_slots();
   }
@@ -69,6 +76,7 @@ SimpleMapModuleState& SimpleMapModuleState::operator=(const SimpleMapModuleState
 
 ModuleStateHandle SimpleMapModuleState::clone() const
 {
+  //std::cout << "SMMS clone " << name_ << std::endl;
   return boost::make_shared<SimpleMapModuleState>(*this);
 }
 
@@ -89,7 +97,7 @@ void SimpleMapModuleState::setValue(const Name& parameterName, const SCIRun::Cor
   bool newValue = oldLocation == stateMap_.end() || !(oldLocation->second.value() == value);
 
   stateMap_[parameterName] = AlgorithmParameter(parameterName, value);
-  
+
   if (newValue)
   {
     LOG_DEBUG("----signaling from state map: (" << parameterName.name_ << ", " << SCIRun::Core::to_string(value) << "), num_slots = " << stateChangedSignal_.num_slots() << std::endl);
@@ -112,15 +120,27 @@ ModuleStateInterface::Keys SimpleMapModuleState::getKeys() const
   return keys;
 }
 
+void SimpleMapModuleState::print() const
+{
+  std::cout << "Printing transient map: " << this << " name: " << name_ << std::endl;
+  for (auto q = transientStateMap_.begin(); q != transientStateMap_.end(); ++q)
+  {
+    std::cout << "\t" << q->first << " : " << "any"  << std::endl;
+  }
+  std::cout << "Done" << std::endl;
+}
+
 SimpleMapModuleState::TransientValueOption SimpleMapModuleState::getTransientValue(const Name& name) const
 {
-  TransientStateMap::const_iterator i = transientStateMap_.find(name.name());
+  //print();
+  auto i = transientStateMap_.find(name.name());
   return i != transientStateMap_.end() ? boost::make_optional(i->second) : TransientValueOption();
 }
 
 void SimpleMapModuleState::setTransientValue(const Name& name, const TransientValue& value, bool fireSignal)
 {
   transientStateMap_[name.name()] = value;
+  //print();
 
   if (fireSignal)
     fireTransientStateChangeSignal();
@@ -133,5 +153,5 @@ void SimpleMapModuleState::fireTransientStateChangeSignal()
 
 ModuleStateInterface* SimpleMapModuleStateFactory::make_state(const std::string& name) const
 {
-  return new SimpleMapModuleState;
+  return new SimpleMapModuleState(name);
 }

src/Dataflow/State/SimpleMapModuleState.h

@@ -36,11 +36,11 @@
 namespace SCIRun {
 namespace Dataflow {
 namespace State {
-  
+
   class SCISHARE SimpleMapModuleState : public SCIRun::Dataflow::Networks::ModuleStateInterface
   {
   public:
-    SimpleMapModuleState();
+    explicit SimpleMapModuleState(const std::string& name = "<dflt>");
     SimpleMapModuleState(SimpleMapModuleState&& rhs);
     SimpleMapModuleState(const SimpleMapModuleState& rhs);
     SimpleMapModuleState& operator=(const SimpleMapModuleState& rhs);
@@ -61,6 +61,9 @@ namespace State {
     typedef std::map<std::string, TransientValue> TransientStateMap;
     TransientStateMap transientStateMap_;
     state_changed_sig_t stateChangedSignal_;
+    std::string name_;
+  private:
+    void print() const;
   };
 
   class SCISHARE SimpleMapModuleStateFactory : public SCIRun::Dataflow::Networks::ModuleStateInterfaceFactory

src/ExampleNets/regression/readNrrdField.srn5

@@ -38,7 +38,7 @@
 									<name>FileTypeName</name>
 									<value>
 										<which>2</which>
-										<value>NrrdFile</value>
+										<value>NrrdFile[DataOnElements]</value>
 									</value>
 								</second>
 							</item>

src/Interface/Modules/DataIO/ReadFieldDialog.cc

@@ -27,6 +27,7 @@
 */
 
 #include <Interface/Modules/DataIO/ReadFieldDialog.h>
+#include <Modules/DataIO/ReadField.h>
 #include <Core/Algorithms/Base/AlgorithmVariableNames.h>
 #include <Dataflow/Network/ModuleStateInterface.h>  //TODO: extract into intermediate
 #include <Core/ImportExport/GenericIEPlugin.h>
@@ -45,7 +46,7 @@ ReadFieldDialog::ReadFieldDialog(const std::string& name, ModuleStateHandle stat
   setupUi(this);
   setWindowTitle(QString::fromStdString(name));
   fixSize();
-  
+
   connect(openFileButton_, SIGNAL(clicked()), this, SLOT(openFile()));
   connect(fileNameLineEdit_, SIGNAL(editingFinished()), this, SLOT(pushFileNameToState()));
   connect(fileNameLineEdit_, SIGNAL(returnPressed()), this, SLOT(pushFileNameToState()));
@@ -57,15 +58,15 @@ void ReadFieldDialog::pull()
   fileNameLineEdit_->setText(QString::fromStdString(state_->getValue(Variables::Filename).toString()));
 }
 
-void ReadFieldDialog::pushFileNameToState() 
+void ReadFieldDialog::pushFileNameToState()
 {
   auto file = fileNameLineEdit_->text().trimmed().toStdString();
   state_->setValue(Variables::Filename, file);
 }
 
 void ReadFieldDialog::openFile()
 {
-  auto types = state_->getValue(Variables::FileTypeList).toString();
+  auto types = Modules::DataIO::ReadFieldModule::fileTypeList();
   QString selectedFilter;
   auto file = QFileDialog::getOpenFileName(this, "Open Field File", dialogDirectory(), QString::fromStdString(types), &selectedFilter);
   if (file.length() > 0)

src/Modules/DataIO/ReadField.cc

@@ -6,7 +6,7 @@
    Copyright (c) 2011 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -28,7 +28,7 @@
 
 
 ///
-///@file  ReadField.cc 
+///@file  ReadField.cc
 ///@brief Read a persistent field from a file
 ///
 ///@author
@@ -56,19 +56,21 @@ class ReadField : public GenericReader<FieldHandle> {
 #endif
 
 ReadFieldModule::ReadFieldModule()
-  : my_base("ReadField", "DataIO", "SCIRun", "Field")    
+  : my_base("ReadField", "DataIO", "SCIRun", "Field")
     //gui_filename_base_(get_ctx()->subVar("filename_base"), ""),
     //gui_number_in_series_(get_ctx()->subVar("number_in_series"), 0),
     //gui_delay_(get_ctx()->subVar("delay"), 0)
 {
   INITIALIZE_PORT(Field);
+}
 
+std::string ReadFieldModule::fileTypeList()
+{
   FieldIEPluginManager mgr;
-  auto types = makeGuiTypesListForImport(mgr);
-  get_state()->setValue(Variables::FileTypeList, types);
+  return makeGuiTypesListForImport(mgr);
 }
 
-bool ReadFieldModule::call_importer(const std::string& filename, FieldHandle& fHandle) 
+bool ReadFieldModule::call_importer(const std::string& filename, FieldHandle& fHandle)
 {
   ///@todo: how will this work via python? need more code to set the filetype based on the extension...
   FieldIEPluginManager mgr;
@@ -83,14 +85,14 @@ bool ReadFieldModule::call_importer(const std::string& filename, FieldHandle& fH
 
 void
 ReadFieldModule::execute()
-{     
+{
 #ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
-  if (gui_types_.changed() || gui_filetype_.changed()) inputs_changed_ = true; 
+  if (gui_types_.changed() || gui_filetype_.changed()) inputs_changed_ = true;
 #endif
   my_base::execute();
 }
 
-bool ReadFieldModule::useCustomImporter(const std::string& filename) const 
+bool ReadFieldModule::useCustomImporter(const std::string& filename) const
 {
   return boost::filesystem::extension(filename) != ".fld";
-}
+}

src/Modules/DataIO/ReadField.h

@@ -39,7 +39,7 @@
 namespace SCIRun {
 namespace Modules {
 namespace DataIO {
-  
+
   class SCISHARE ReadFieldModule : public GenericReader<FieldHandle, FieldPortTag>
   {
   public:
@@ -49,8 +49,10 @@ namespace DataIO {
     virtual void setStateDefaults() {}
     virtual bool useCustomImporter(const std::string& filename) const override;
     virtual bool call_importer(const std::string& filename, FieldHandle& handle) override;
-    
+
     OUTPUT_PORT(0, Field, LegacyField);
+
+    static std::string fileTypeList();
   };
 
 }}}