Skip to content

Commit 16d3b45

Browse files
committed
Move for later.
1 parent 2daf6a3 commit 16d3b45

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

src/Modules/Basic/ChooseInput.cc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,18 @@
2626
DEALINGS IN THE SOFTWARE.
2727
*/
2828

29-
#include <iostream>
3029
#include <Modules/Basic/ChooseInput.h>
3130
#include <Core/Datatypes/Datatype.h>
32-
#include <Core/Datatypes/Scalar.h>
33-
#include <Core/Datatypes/String.h>
31+
#include <Core/Algorithms/Base/AlgorithmPreconditions.h>
3432

3533
using namespace SCIRun::Modules::Basic;
3634
using namespace SCIRun::Dataflow::Networks;
3735
using namespace SCIRun::Core::Datatypes;
38-
using namespace SCIRun::Core::Algorithms;
3936

4037
const ModuleLookupInfo ChooseInput::staticInfo_("ChooseInput", "Flow Control", "SCIRun");
4138

39+
const SCIRun::Core::Algorithms::AlgorithmParameterName ChooseInput::InputIndex("InputIndex");
40+
4241
ChooseInput::ChooseInput()
4342
: Module(staticInfo_)
4443
{
@@ -48,7 +47,7 @@ ChooseInput::ChooseInput()
4847

4948
void ChooseInput::setStateDefaults()
5049
{
51-
50+
get_state()->setValue(InputIndex, 0);
5251
}
5352

5453
void ChooseInput::execute()

src/Modules/Basic/ChooseInput.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,17 @@ namespace SCIRun {
4242
{
4343
public:
4444
ChooseInput();
45-
virtual void execute();
46-
virtual void setStateDefaults();
45+
virtual void execute() override;
46+
virtual void setStateDefaults() override;
4747
virtual bool hasDynamicPorts() const override { return true; }
48+
//virtual void portAddedSlot(const Dataflow::Networks::ModuleId& mid, const Dataflow::Networks::PortId& pid) override;
49+
//virtual void portRemovedSlot(const Dataflow::Networks::ModuleId& mid, const Dataflow::Networks::PortId& pid) override;
4850

4951
INPUT_PORT_DYNAMIC(0, Input, Datatype);
5052
OUTPUT_PORT(0, Output, Datatype);
5153

54+
static const Core::Algorithms::AlgorithmParameterName InputIndex;
55+
5256
static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
5357
};
5458
}}}
File renamed without changes.
File renamed without changes.

src/Modules/Factory/Config/ConvertFieldDataType.module renamed to src/Modules/Factory/Config/TODO/ConvertFieldDataType.module

File renamed without changes.

src/Modules/Factory/Config/ScaleFieldMeshAndData.module renamed to src/Modules/Factory/Config/TODO/ScaleFieldMeshAndData.module

File renamed without changes.

0 commit comments

Comments
 (0)