Expose renames

Author: dcwhite

src/Dataflow/Network/Module.cc

@@ -968,6 +968,6 @@ void Module::sendFeedbackUpstreamAlongIncomingConnections(const ModuleFeedback&
 std::string Module::helpPageUrl() const
 {
   auto url = "http://scirundocwiki.sci.utah.edu/SCIRunDocs/index.php/CIBC:Documentation:SCIRun:Reference:"
-    + legacyPackageName() + ":" + get_module_name();
+    + legacyPackageName() + ":" + legacyModuleName();
   return url;
 }

src/Dataflow/Network/Module.h

@@ -82,6 +82,11 @@ namespace Networks {
     virtual size_t num_input_ports() const override final;
     virtual size_t num_output_ports() const override final;
 
+    // override this for modules that changed packages, to point to correct wiki page
+    virtual std::string legacyPackageName() const { return get_packagename(); }
+    // override this for modules that changed names, to point to correct wiki page
+    virtual std::string legacyModuleName() const { return get_module_name(); }
+
     virtual bool hasInputPort(const PortId& id) const override final;
     virtual bool hasOutputPort(const PortId& id) const override final;
     virtual InputPortHandle getInputPort(const PortId& id) override final;
@@ -113,9 +118,6 @@ namespace Networks {
   protected:
     virtual void send_output_handle(const PortId& id, Core::Datatypes::DatatypeHandle data) override final;
 
-    // override this for modules that changed packages, to point to correct wiki page
-    virtual std::string legacyPackageName() const { return get_packagename(); }
-
   public:
     virtual void setLogger(Core::Logging::LoggerHandle log) override final;
     virtual Core::Logging::LoggerHandle getLogger() const override final;
@@ -1017,7 +1019,10 @@ namespace Modules
     }
   };
 
-  #define LEGACY_BIOPSE_MODULE protected: virtual std::string legacyPackageName() const override { return "BioPSE"; }
+#define LEGACY_BIOPSE_MODULE public: virtual std::string legacyPackageName() const override { return "BioPSE"; }
+#define LEGACY_MATLAB_MODULE public: virtual std::string legacyPackageName() const override { return "MatlabInterface"; }
+#define CONVERTED_VERSION_OF_MODULE(modName) public: virtual std::string legacyModuleName() const override { return #modName; }
+
 }
 }
 

src/Dataflow/Network/ModuleInterface.h

@@ -80,6 +80,8 @@ namespace Networks {
     virtual bool hasDynamicPorts() const = 0;
 
     virtual std::string helpPageUrl() const = 0;
+    virtual std::string legacyPackageName() const = 0;
+    virtual std::string legacyModuleName() const = 0;
   };
 
   class SCISHARE ModuleDisplayInterface

src/Dataflow/Network/Tests/MockModule.h

@@ -91,6 +91,8 @@ namespace SCIRun {
           MOCK_METHOD1(connectExecuteSelfRequest, boost::signals2::connection(const ExecutionSelfRequestSignalType::slot_type&));
           MOCK_METHOD1(setExecutionDisabled, void(bool));
           MOCK_CONST_METHOD0(executionDisabled, bool(void));
+          MOCK_CONST_METHOD0(legacyPackageName, std::string());
+          MOCK_CONST_METHOD0(legacyModuleName, std::string());
         };
 
         typedef boost::shared_ptr<MockModule> MockModulePtr;

src/Interface/Application/ModuleWidget.cc

@@ -329,6 +329,10 @@ ModuleWidget::ModuleWidget(NetworkEditor* ed, const QString& name, ModuleHandle
   connect(this, SIGNAL(executeEnds()), this, SLOT(changeExecuteButtonToPlay()));
   connect(this, SIGNAL(signalExecuteButtonIconChangeToStop()), this, SLOT(changeExecuteButtonToStop()));
   //qDebug() << width() << height() << currentWidget()->size();
+
+  auto oldName = theModule->legacyModuleName();
+  if (theModule->get_module_name() != oldName)
+    setToolTip("Converted version of module " + QString::fromStdString(oldName));
 }
 
 int ModuleWidget::buildDisplay(ModuleWidgetDisplayBase* display, const QString& name)

src/Modules/Legacy/Converters/ConvertMatrixToString.cc

@@ -30,8 +30,8 @@
 #include <Core/Algorithms/Legacy/Converter/ConvertMatrixToString.h>
 
 #include <Core/Datatypes/Matrix.h>
-#include <Core/Datatypes/MatrixFwd.h>
 #include <Core/Datatypes/DenseMatrix.h>
+// ReSharper disable once CppUnusedIncludeDirective
 #include <Core/Datatypes/String.h>
 #include <Core/Datatypes/DatatypeFwd.h>
 #include <Core/Datatypes/MatrixTypeConversions.h>
@@ -45,7 +45,7 @@ using namespace SCIRun::Core::Datatypes;
 using namespace SCIRun::Modules::Converters;
 
 
-ConvertMatrixToString::ConvertMatrixToString() : Module(ModuleLookupInfo("ConvertMatrixToString","Converters","BioPSE"),false)
+ConvertMatrixToString::ConvertMatrixToString() : Module(ModuleLookupInfo("ConvertMatrixToString","Converters","SCIRun"),false)
 {
 	INITIALIZE_PORT(InputMatrix);
 	INITIALIZE_PORT(ResultString);

src/Modules/Legacy/Matlab/DataIO/ExportFieldsToMatlab.h

@@ -62,6 +62,8 @@ namespace Matlab {
     virtual bool hasDynamicPorts() const override { return true; }
 
     static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
+
+    LEGACY_MATLAB_MODULE
   };
 }}}
 

src/Modules/Legacy/Matlab/DataIO/ImportFieldsFromMatlab.h

@@ -67,6 +67,9 @@ namespace Matlab {
     enum { NUMPORTS = 6 };
 
     static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
+    
+    LEGACY_MATLAB_MODULE
+
   protected:
     virtual void postStateChangeInternalSignalHookup() override;
   private:

src/Modules/Math/GetMatrixSlice.h

@@ -40,6 +40,8 @@ namespace Math {
     public Has2InputPorts<MatrixPortTag, ScalarPortTag>,
     public Has2OutputPorts<MatrixPortTag, ScalarPortTag>
   {
+    CONVERTED_VERSION_OF_MODULE(GetColumnOrRowFromMatrix)
+
   public:
     GetMatrixSlice();
     virtual void execute();
@@ -50,6 +52,7 @@ namespace Math {
     OUTPUT_PORT(1, Selected_Index, Int32);
 
     static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
+
   private:
     bool playing_;
     void playAgain(int nextIndex);