Skip to content

Commit d91db73

Browse files
dcwhitedcwhite
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into eigenUpgrade
2 parents 113235f + eae7f2a commit d91db73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2224
-363
lines changed

‎src/Dataflow/Engine/Controller/NetworkEditorController.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,11 +487,12 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)
487487
}
488488
if (serializationManager_)
489489
{
490-
serializationManager_->updateModulePositions(xml->modulePositions, false);
491490
serializationManager_->updateModuleNotes(xml->moduleNotes);
492491
serializationManager_->updateConnectionNotes(xml->connectionNotes);
493492
serializationManager_->updateModuleTags(xml->moduleTags);
494493
serializationManager_->updateDisabledComponents(xml->disabledComponents);
494+
serializationManager_->updateSubnetworks(xml->subnetworks);
495+
serializationManager_->updateModulePositions(xml->modulePositions, false);
495496
}
496497
else
497498
{

‎src/Dataflow/Network/Connection.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#ifndef DATAFLOW_NETWORK_CONNECTION_H
3131
#define DATAFLOW_NETWORK_CONNECTION_H
3232

33-
#include <string>
3433
#include <Dataflow/Network/NetworkFwd.h>
3534
#include <Dataflow/Network/ConnectionId.h>
3635
#include <Dataflow/Network/share.h>

‎src/Dataflow/Network/ExecutableObject.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ namespace SCIRun {
3838
namespace Dataflow {
3939
namespace Networks {
4040

41-
typedef boost::signals2::signal<void (const ModuleId&)> ExecuteBeginsSignalType;
42-
typedef boost::signals2::signal<void (double, const ModuleId&)> ExecuteEndsSignalType; // 1st parameter is execution time
43-
typedef boost::signals2::signal<void (const ModuleId&)> ErrorSignalType;
41+
using ExecuteBeginsSignalType = boost::signals2::signal<void (const ModuleId&)>;
42+
using ExecuteEndsSignalType = boost::signals2::signal<void (double, const ModuleId&)>; // 1st parameter is execution time
43+
using ErrorSignalType = boost::signals2::signal<void (const ModuleId&)>;
4444

4545
class SCISHARE ExecutableObject
4646
{

‎src/Dataflow/Network/GeometryGeneratingModule.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ namespace Networks {
5454
{
5555
public:
5656
explicit GeometryGeneratingModule(const ModuleLookupInfo& info);
57-
virtual std::string generateGeometryID(const std::string& tag) const override;
57+
std::string generateGeometryID(const std::string& tag) const override;
5858
};
5959

6060
}}}

‎src/Dataflow/Network/Module.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -679,12 +679,12 @@ ModuleBuilder& ModuleBuilder::add_input_port(const Port::ConstructionParams& par
679679
{
680680
if (module_)
681681
{
682-
addInputPortImpl(*module_, params);
682+
addInputPortImpl(params);
683683
}
684684
return *this;
685685
}
686686

687-
void ModuleBuilder::addInputPortImpl(Module& module, const Port::ConstructionParams& params)
687+
void ModuleBuilder::addInputPortImpl(const Port::ConstructionParams& params) const
688688
{
689689
DatatypeSinkInterfaceHandle sink(sink_maker_ ? sink_maker_() : nullptr);
690690
auto port(boost::make_shared<InputPort>(module_.get(), params, sink));
@@ -702,7 +702,7 @@ ModuleBuilder& ModuleBuilder::add_output_port(const Port::ConstructionParams& pa
702702
return *this;
703703
}
704704

705-
PortId ModuleBuilder::cloneInputPort(ModuleHandle module, const PortId& id)
705+
PortId ModuleBuilder::cloneInputPort(ModuleHandle module, const PortId& id) const
706706
{
707707
auto m = dynamic_cast<Module*>(module.get());
708708
if (m)
@@ -714,7 +714,7 @@ PortId ModuleBuilder::cloneInputPort(ModuleHandle module, const PortId& id)
714714
THROW_INVALID_ARGUMENT("Don't know how to clone ports on other Module types");
715715
}
716716

717-
void ModuleBuilder::removeInputPort(ModuleHandle module, const PortId& id)
717+
void ModuleBuilder::removeInputPort(ModuleHandle module, const PortId& id) const
718718
{
719719
auto m = dynamic_cast<Module*>(module.get());
720720
if (m)
@@ -723,7 +723,7 @@ void ModuleBuilder::removeInputPort(ModuleHandle module, const PortId& id)
723723
}
724724
}
725725

726-
ModuleHandle ModuleBuilder::build()
726+
ModuleHandle ModuleBuilder::build() const
727727
{
728728
return module_;
729729
}

‎src/Dataflow/Network/Module.h‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include <boost/noncopyable.hpp>
3333
#include <boost/static_assert.hpp>
3434
#include <boost/lexical_cast.hpp>
35-
#include <boost/atomic.hpp>
3635
#include <atomic>
3736
#include <vector>
3837
#include <Core/Logging/LoggerInterface.h>
@@ -64,7 +63,7 @@ namespace Networks {
6463
Core::Algorithms::AlgorithmFactoryHandle algoFactory = DefaultModuleFactories::defaultAlgoFactory_,
6564
ModuleStateFactoryHandle stateFactory = DefaultModuleFactories::defaultStateFactory_,
6665
ReexecuteStrategyFactoryHandle reexFactory = DefaultModuleFactories::defaultReexFactory_);
67-
virtual ~Module() override;
66+
~Module() override;
6867

6968
/*** User-interface ****/
7069
ModuleStateHandle get_state() override final;
@@ -84,7 +83,7 @@ namespace Networks {
8483
void set_state(ModuleStateHandle state) override final;
8584
ModuleExecutionState& executionState() override final;
8685

87-
virtual std::string helpPageUrl() const override;
86+
std::string helpPageUrl() const override;
8887
std::string newHelpPageUrl() const; // location in flux, but new v5 modules only have one of these
8988
//for serialization
9089
const ModuleLookupInfo& get_info() const override final;
@@ -95,9 +94,9 @@ namespace Networks {
9594
size_t num_input_ports() const override final;
9695
size_t num_output_ports() const override final;
9796
// override this for modules that changed packages, to point to correct wiki page
98-
virtual std::string legacyPackageName() const override { return get_packagename(); }
97+
std::string legacyPackageName() const override { return get_packagename(); }
9998
// override this for modules that changed names, to point to correct wiki page
100-
virtual std::string legacyModuleName() const override { return get_module_name(); }
99+
std::string legacyModuleName() const override { return get_module_name(); }
101100
bool hasInputPort(const PortId& id) const override final;
102101
bool hasOutputPort(const PortId& id) const override final;
103102
InputPortHandle getInputPort(const PortId& id) override final;
@@ -176,8 +175,8 @@ namespace Networks {
176175
friend class ModuleBuilder;
177176

178177
private:
179-
virtual Core::Datatypes::DatatypeHandleOption get_input_handle(const PortId& id) override final;
180-
virtual std::vector<Core::Datatypes::DatatypeHandleOption> get_dynamic_input_handles(const PortId& id) override final;
178+
Core::Datatypes::DatatypeHandleOption get_input_handle(const PortId& id) override final;
179+
std::vector<Core::Datatypes::DatatypeHandleOption> get_dynamic_input_handles(const PortId& id) override final;
181180
template <class T>
182181
boost::shared_ptr<T> getRequiredInputAtIndex(const PortId& id);
183182
template <class T>
@@ -189,11 +188,14 @@ namespace Networks {
189188
boost::shared_ptr<class ModuleImpl> impl_;
190189
};
191190

191+
// ReSharper disable once CppUnusedIncludeDirective
192192
#include <Dataflow/Network/ModuleTemplateImpl.h>
193193

194194
}}}
195195

196+
// ReSharper disable once CppUnusedIncludeDirective
196197
#include <Dataflow/Network/ModulePortDescriptionTags.h>
198+
// ReSharper disable once CppUnusedIncludeDirective
197199
#include <Dataflow/Network/ModuleTraits.h>
198200

199201
#endif

‎src/Dataflow/Network/ModuleBuilder.h‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,11 @@
3030
#define DATAFLOW_NETWORK_MODULEBUILDER_H
3131

3232
#include <boost/noncopyable.hpp>
33-
#include <boost/static_assert.hpp>
3433
#include <boost/lexical_cast.hpp>
35-
#include <boost/atomic.hpp>
36-
#include <atomic>
37-
#include <vector>
38-
#include <Core/Logging/LoggerInterface.h>
39-
#include <Core/Datatypes/DatatypeFwd.h>
4034
// ReSharper disable once CppUnusedIncludeDirective
41-
#include <Core/Datatypes/Mesh/FieldFwd.h>
42-
#include <Core/Algorithms/Base/AlgorithmFwd.h>
4335
#include <Dataflow/Network/NetworkFwd.h>
44-
#include <Dataflow/Network/ModuleInterface.h>
45-
#include <Dataflow/Network/ModuleStateInterface.h>
4636
#include <Dataflow/Network/ModuleDescription.h>
4737
#include <Dataflow/Network/PortManager.h>
48-
#include <Dataflow/Network/DefaultModuleFactories.h>
4938
#include <Dataflow/Network/share.h>
5039

5140
namespace SCIRun {
@@ -61,19 +50,19 @@ namespace Networks {
6150
ModuleBuilder& add_input_port(const Port::ConstructionParams& params);
6251
ModuleBuilder& add_output_port(const Port::ConstructionParams& params);
6352
ModuleBuilder& setStateDefaults();
64-
ModuleHandle build();
53+
ModuleHandle build() const;
6554

6655
/// @todo: these don't quite belong here, think about extracting
67-
PortId cloneInputPort(ModuleHandle module, const PortId& id);
68-
void removeInputPort(ModuleHandle module, const PortId& id);
56+
PortId cloneInputPort(ModuleHandle module, const PortId& id) const;
57+
void removeInputPort(ModuleHandle module, const PortId& id) const;
6958

70-
typedef boost::function<DatatypeSinkInterface*()> SinkMaker;
71-
typedef boost::function<DatatypeSourceInterface*()> SourceMaker;
59+
using SinkMaker = boost::function<DatatypeSinkInterface*()>;
60+
using SourceMaker = boost::function<DatatypeSourceInterface*()>;
7261
static void use_sink_type(SinkMaker func);
7362
static void use_source_type(SourceMaker func);
7463
private:
75-
void addInputPortImpl(Module& module, const Port::ConstructionParams& params);
76-
boost::shared_ptr<Module> module_;
64+
void addInputPortImpl(const Port::ConstructionParams& params) const;
65+
SharedPointer<Module> module_;
7766
static SinkMaker sink_maker_;
7867
static SourceMaker source_maker_;
7968
};

‎src/Dataflow/Network/ModuleDescription.h‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#ifndef DATAFLOW_NETWORK_MODULE_DESCRIPTION_H
3131
#define DATAFLOW_NETWORK_MODULE_DESCRIPTION_H
3232

33-
#include <string>
3433
#include <vector>
3534
#include <iosfwd>
3635
#include <boost/function.hpp>
@@ -44,9 +43,7 @@ namespace Networks {
4443
struct SCISHARE PortId
4544
{
4645
explicit PortId(size_t num = 0, const std::string& n = "[undefined]") : name(n), id(num)
47-
{
48-
//std::cout << "PortId(" << num << "," << n << "," << dyn << ")" << std::endl;
49-
}
46+
{}
5047
std::string name;
5148
size_t id; /// @todo: need smart way to set
5249
std::string toString() const;
@@ -70,10 +67,10 @@ namespace Networks {
7067
static void init();
7168
};
7269

73-
typedef PortDescription InputPortDescription;
74-
typedef PortDescription OutputPortDescription;
75-
typedef std::vector<InputPortDescription> InputPortDescriptionList;
76-
typedef std::vector<OutputPortDescription> OutputPortDescriptionList;
70+
using InputPortDescription = PortDescription;
71+
using OutputPortDescription = PortDescription;
72+
using InputPortDescriptionList = std::vector<InputPortDescription>;
73+
using OutputPortDescriptionList = std::vector<OutputPortDescription>;
7774

7875
struct SCISHARE ModuleId
7976
{
@@ -114,7 +111,7 @@ namespace Networks {
114111
SCISHARE bool operator==(const ModuleLookupInfo& lhs, const ModuleLookupInfo& rhs);
115112
SCISHARE bool operator!=(const ModuleLookupInfo& lhs, const ModuleLookupInfo& rhs);
116113

117-
typedef boost::function<class Module*()> ModuleMaker;
114+
using ModuleMaker = boost::function<class Module*()>;
118115

119116
struct SCISHARE ModuleDescription
120117
{
@@ -137,7 +134,7 @@ namespace Networks {
137134
bool operator()(const ModuleLookupInfo& lhs, const ModuleLookupInfo& rhs) const;
138135
};
139136

140-
typedef std::map<ModuleLookupInfo, ModuleDescription, ModuleLookupInfoLess> DirectModuleDescriptionLookupMap;
137+
using DirectModuleDescriptionLookupMap = std::map<ModuleLookupInfo, ModuleDescription, ModuleLookupInfoLess>;
141138

142139
}}}
143140

‎src/Dataflow/Network/ModuleExecutionInterfaces.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@
3030
#define DATAFLOW_NETWORK_MODULEEXECUTIONINTERFACES_H
3131

3232
#include <Dataflow/Network/NetworkFwd.h>
33-
#include <Core/Datatypes/Datatype.h>
34-
#include <Core/Algorithms/Base/AlgorithmBase.h>
35-
#include <Core/Algorithms/Base/AlgorithmFactory.h>
3633
#include <Dataflow/Network/ExecutableObject.h>
37-
#include <Dataflow/Network/ModuleInfoProvider.h>
38-
#include <Core/Logging/LoggerFwd.h>
3934
#include <Dataflow/Network/share.h>
4035

4136
namespace SCIRun {

‎src/Dataflow/Network/ModuleFactory.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@ namespace Networks {
4646
public:
4747
virtual ~ModuleFactory();
4848
virtual ModuleDescription lookupDescription(const ModuleLookupInfo& info) const = 0;
49-
virtual ModuleHandle create(const ModuleDescription& desc) = 0;
49+
virtual ModuleHandle create(const ModuleDescription& desc) const = 0;
5050
virtual void setStateFactory(ModuleStateFactoryHandle stateFactory) = 0;
5151
virtual void setAlgorithmFactory(Core::Algorithms::AlgorithmFactoryHandle algoFactory) = 0;
5252
virtual void setReexecutionFactory(ReexecuteStrategyFactoryHandle reexFactory) = 0;
5353
virtual const ModuleDescriptionMap& getAllAvailableModuleDescriptions() const = 0;
5454
virtual const DirectModuleDescriptionLookupMap& getDirectModuleDescriptionLookupMap() const = 0;
5555
};
5656

57-
SCISHARE SCIRun::Dataflow::Networks::ModuleHandle CreateModuleFromUniqueName(ModuleFactory& factory, const std::string& moduleName);
57+
SCISHARE ModuleHandle CreateModuleFromUniqueName(ModuleFactory& factory, const std::string& moduleName);
5858

5959
namespace ReplacementImpl
6060
{
6161
//loose replace interpretation: order of ports doesn't matter, only number. could use multiset here, but not as easy to deal with.
62-
typedef std::map<std::string, int> ConnectedPortTypesWithCount;
62+
using ConnectedPortTypesWithCount = std::map<std::string, int>;
6363
struct SCISHARE ConnectedPortInfo
6464
{
6565
ConnectedPortTypesWithCount input, output;
@@ -69,18 +69,18 @@ namespace Networks {
6969
SCISHARE bool operator!=(const ConnectedPortInfo& lhs, const ConnectedPortInfo& rhs);
7070
SCISHARE bool operator<(const ConnectedPortInfo& lhs, const ConnectedPortInfo& rhs);
7171
SCISHARE std::ostream& operator<<(std::ostream& o, const ConnectedPortInfo& cpi);
72-
SCISHARE ConnectedPortInfo makeConnectedPortInfo(Dataflow::Networks::ModuleHandle module);
72+
SCISHARE ConnectedPortInfo makeConnectedPortInfo(ModuleHandle module);
7373

7474
SCISHARE std::vector<ConnectedPortInfo> allPossibleConnectedPortConfigs(
75-
const Dataflow::Networks::InputPortDescriptionList& inputPorts,
76-
const Dataflow::Networks::OutputPortDescriptionList& outputPorts);
75+
const InputPortDescriptionList& inputPorts,
76+
const OutputPortDescriptionList& outputPorts);
7777

78-
typedef std::set<Dataflow::Networks::ModuleLookupInfo, Dataflow::Networks::ModuleLookupInfoLess> ModuleLookupInfoSet;
78+
using ModuleLookupInfoSet = std::set<ModuleLookupInfo, ModuleLookupInfoLess>;
7979

8080
class SCISHARE ModuleReplacementFilter
8181
{
8282
public:
83-
typedef std::map<ConnectedPortInfo, ModuleLookupInfoSet> ReplaceMap;
83+
using ReplaceMap = std::map<ConnectedPortInfo, ModuleLookupInfoSet>;
8484
explicit ModuleReplacementFilter(ReplaceMap&& map) : replaceMap_(map) {}
8585
const ModuleLookupInfoSet& findReplacements(const ConnectedPortInfo& ports) const;
8686
private:
@@ -90,13 +90,13 @@ namespace Networks {
9090
class SCISHARE ModuleReplacementFilterBuilder
9191
{
9292
public:
93-
explicit ModuleReplacementFilterBuilder(const Dataflow::Networks::DirectModuleDescriptionLookupMap& map) : descMap_(map) {}
93+
explicit ModuleReplacementFilterBuilder(const DirectModuleDescriptionLookupMap& map) : descMap_(map) {}
9494
boost::shared_ptr<ModuleReplacementFilter> build();
9595
private:
96-
void registerModule(ModuleReplacementFilter::ReplaceMap& replaceMap, const Dataflow::Networks::ModuleLookupInfo& info,
97-
const Dataflow::Networks::InputPortDescriptionList& inputPorts,
98-
const Dataflow::Networks::OutputPortDescriptionList& outputPorts);
99-
const Dataflow::Networks::DirectModuleDescriptionLookupMap& descMap_;
96+
void registerModule(ModuleReplacementFilter::ReplaceMap& replaceMap, const ModuleLookupInfo& info,
97+
const InputPortDescriptionList& inputPorts,
98+
const OutputPortDescriptionList& outputPorts);
99+
const DirectModuleDescriptionLookupMap& descMap_;
100100
};
101101
}
102102

0 commit comments

Comments
 (0)