Closes #1434

Author: dcwhite

src/Core/ImportExport/GenericIEPlugin.h

@@ -6,7 +6,7 @@
    Copyright (c) 2015 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
@@ -106,7 +106,7 @@ class IEPluginLegacyAdapter : public GenericIEPluginInterface<Data>
 
 template <class Data>
 class PluginMap
-{ 
+{
 public:
   PluginMap() : lock_("IE plugin map"), pluginTable_(nullptr) {}
   Core::Thread::Mutex& getLock();
@@ -174,7 +174,7 @@ size_t PluginMap<Data>::numPlugins() const
 template <class Data>
 void GenericIEPluginManager<Data>::get_importer_list(std::vector<std::string>& results) const
 {
-  if (0 == map_.numPlugins()) 
+  if (0 == map_.numPlugins())
   {
     return;
   }
@@ -190,7 +190,7 @@ void GenericIEPluginManager<Data>::get_importer_list(std::vector<std::string>& r
 template <class Data>
 void GenericIEPluginManager<Data>::get_exporter_list(std::vector<std::string>& results) const
 {
-  if (0 == map_.numPlugins()) 
+  if (0 == map_.numPlugins())
   {
     return;
   }
@@ -338,24 +338,28 @@ SCISHARE std::string defaultImportTypeForFile(const GenericIEPluginManager<NrrdD
 
 SCISHARE std::string fileTypeDescriptionFromDialogBoxFilter(const std::string& fileFilter);
 
+template <class Data>
+std::string dialogBoxFilterFromFileTypeDescription(const GenericIEPluginManager<Data>& mgr, const std::string& name)
+{
+  if (name.find("*") != std::string::npos) // user has set state variable with full filter string
+    return name;
+  std::ostringstream filter;
+  auto pl = mgr.get_plugin(name);
+  auto ext = pl ? pl->fileExtension() : std::string();
+  filter << name << " (" << (!ext.empty() ? ext : "*.*") << ")";
+  return filter.str();
+}
+
 template <class Data>
 std::string printPluginDescriptionsForFilter(const GenericIEPluginManager<Data>& mgr, const std::string& defaultType, const std::vector<std::string>& pluginNames)
 {
   std::ostringstream types;
   types << defaultType;
 
+  // Qt dialog-specific formatting
   for (const auto& name : pluginNames)
   {
-    auto pl = mgr.get_plugin(name);
-    types << ";;" << name;
-    if (!pl->fileExtension().empty())
-    {
-      types << " (" << pl->fileExtension() << ")";
-    }
-    else
-    {
-      types << " (*.*)";
-    }
+    types << ";;" << dialogBoxFilterFromFileTypeDescription(mgr, name);
   }
   return types.str();
 }
@@ -370,7 +374,7 @@ std::string makeGuiTypesListForImport(const GenericIEPluginManager<Data>& mgr)
 }
 
 template <class Data>
-std::string defaultExportTypeForFile(const GenericIEPluginManager<Data>* mgr = 0)
+std::string defaultExportTypeForFile(const GenericIEPluginManager<Data>* mgr = nullptr)
 {
   return "";
 }

src/Core/ImportExport/Nrrd/NrrdIEPlugin.cc

@@ -6,7 +6,7 @@
   Copyright (c) 2015 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
@@ -85,7 +85,7 @@ std::string SCIRun::defaultExportTypeForFile(const GenericIEPluginManager<Matrix
   return "SCIRun Matrix Binary (*.mat);;SCIRun Matrix ASCII (*.mat)";
 }
 
-#ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER 
+#ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
 
 #include <Core/Thread/Mutex.h>
 #include <Core/Utils/Legacy/StringUtil.h>
@@ -168,7 +168,7 @@ NrrdIEPlugin::~NrrdIEPlugin()
   std::map<std::string, NrrdIEPlugin *>::iterator iter = matrix_plugin_table->find(pluginname);
   if (iter == matrix_plugin_table->end())
   {
-    std::cerr << "WARNING: NrrdIEPlugin " << pluginname << 
+    std::cerr << "WARNING: NrrdIEPlugin " << pluginname <<
       " not found in database for removal.\n";
   }
   else
@@ -235,7 +235,7 @@ NrrdIEPluginManager::get_exporter_list(std::vector<std::string> &results)
   nrrdIEPluginMutex.unlock();
 }
 
- 
+
 NrrdIEPlugin *
 NrrdIEPluginManager::get_plugin(const std::string &name)
 {
@@ -257,4 +257,4 @@ NrrdIEPluginManager::get_plugin(const std::string &name)
 } // End namespace SCIRun
 
 
-#endif
+#endif

src/Interface/Modules/DataIO/ReadFieldDialog.cc

@@ -31,9 +31,11 @@
 #include <Core/Algorithms/Base/AlgorithmVariableNames.h>
 #include <Dataflow/Network/ModuleStateInterface.h>  //TODO: extract into intermediate
 #include <Core/ImportExport/GenericIEPlugin.h>
+#include <Core/ImportExport/Field/FieldIEPlugin.h>
 #include <iostream>
 #include <QFileDialog>
 
+using namespace SCIRun;
 using namespace SCIRun::Gui;
 using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Core::Algorithms;
@@ -59,6 +61,8 @@ ReadFieldDialog::ReadFieldDialog(const std::string& name, ModuleStateHandle stat
 void ReadFieldDialog::pullSpecial()
 {
   fileNameLineEdit_->setText(QString::fromStdString(state_->getValue(Variables::Filename).toString()));
+  static FieldIEPluginManager mgr;
+  selectedFilter_ = QString::fromStdString(dialogBoxFilterFromFileTypeDescription(mgr, state_->getValue(Variables::FileTypeName).toString()));
 }
 
 void ReadFieldDialog::pushFileNameToState()
@@ -74,7 +78,7 @@ void ReadFieldDialog::openFile()
   auto file = QFileDialog::getOpenFileName(this, "Open Field File", dialogDirectory(), typesQ, &selectedFilter_);
   if (file.length() > 0)
   {
-    auto typeName = SCIRun::fileTypeDescriptionFromDialogBoxFilter(selectedFilter_.toStdString());
+    auto typeName = fileTypeDescriptionFromDialogBoxFilter(selectedFilter_.toStdString());
     state_->setValue(Variables::FileTypeName, typeName);
     fileNameLineEdit_->setText(file);
     updateRecentFile(file);

src/Interface/Modules/DataIO/ReadMatrixClassicDialog.cc

@@ -31,9 +31,11 @@
 #include <Modules/DataIO/ReadMatrixClassic.h>
 #include <Dataflow/Network/ModuleStateInterface.h>  //TODO: extract into intermediate
 #include <Core/ImportExport/GenericIEPlugin.h>
+#include <Core/ImportExport/Matrix/MatrixIEPlugin.h>
 #include <iostream>
 #include <QFileDialog>
 
+using namespace SCIRun;
 using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Gui;
 using namespace SCIRun::Dataflow::Networks;
@@ -60,7 +62,8 @@ ReadMatrixClassicDialog::ReadMatrixClassicDialog(const std::string& name, Module
 void ReadMatrixClassicDialog::pullSpecial()
 {
   fileNameLineEdit_->setText(QString::fromStdString(state_->getValue(Variables::Filename).toString()));
-  selectedFilter_ = QString::fromStdString(state_->getValue(Variables::FileTypeName).toString());
+  static MatrixIEPluginManager mgr;
+  selectedFilter_ = QString::fromStdString(dialogBoxFilterFromFileTypeDescription(mgr, state_->getValue(Variables::FileTypeName).toString()));
 }
 
 void ReadMatrixClassicDialog::pushFileNameToState()
@@ -75,7 +78,7 @@ void ReadMatrixClassicDialog::openFile()
   auto file = QFileDialog::getOpenFileName(this, "Open Matrix File", dialogDirectory(), typesQ, &selectedFilter_);
   if (file.length() > 0)
   {
-    auto typeName = SCIRun::fileTypeDescriptionFromDialogBoxFilter(selectedFilter_.toStdString());
+    auto typeName = fileTypeDescriptionFromDialogBoxFilter(selectedFilter_.toStdString());
     state_->setValue(Variables::FileTypeName, typeName);
     fileNameLineEdit_->setText(file);
     updateRecentFile(file);