Skip to content

Commit

Permalink
Core,Base,BaseGL,DataFrame,PlottingGL: minor visualizer adjustment
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinfalk
martinfalk committed Jul 11, 2024
1 parent c219d61 commit 6d89109
Show file tree
Hide file tree
Showing 29 changed files with 130 additions and 139 deletions.
8 changes: 4 additions & 4 deletions include/inviwo/core/rendering/datavisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ class IVW_CORE_API DataVisualizer {
* @param filename The file to load in the source processor. The extension of the filename
* should be in the list of extensions returned by getSupportedFileExtensions.
* @param network The network to add the processor to.
* @param initialPos the initial position for the processor
* @param origin the initial position for the processor
* @return The added source processor and the outport in the source processor
* containing data from the given file.
*/
virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const = 0;
const ivec2& origin) const = 0;
/**
* Adds a set of processors visualizing the data in the given outport.
* Nothing will be added to the network if outport is not supported (isOutportSupported returns
Expand All @@ -124,12 +124,12 @@ class IVW_CORE_API DataVisualizer {
* @param filename The file to load in the source processor. The extension of the filename
* should be in the list of extensions returned by getSupportedFileExtensions.
* @param network The network to add the processor to.
* @param initialPos the initial position for the visualizer network
* @param origin the initial position for the visualizer network
* @return A list of added processors.
*/
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const = 0;
const ivec2& origin) const = 0;
};

} // namespace inviwo
4 changes: 2 additions & 2 deletions modules/base/include/modules/base/datavisualizer/imageinformationvisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ class IVW_MODULE_BASE_API ImageInformationVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
4 changes: 2 additions & 2 deletions modules/base/include/modules/base/datavisualizer/imagetolayervisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ class IVW_MODULE_BASE_API ImageToLayerVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
};

} // namespace inviwo
4 changes: 2 additions & 2 deletions modules/base/include/modules/base/datavisualizer/layerinformationvisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ class IVW_MODULE_BASE_API LayerInformationVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
4 changes: 2 additions & 2 deletions modules/base/include/modules/base/datavisualizer/layertoimagevisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ class IVW_MODULE_BASE_API LayerToImageVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
};

} // namespace inviwo
4 changes: 2 additions & 2 deletions modules/base/include/modules/base/datavisualizer/meshinformationvisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ class IVW_MODULE_BASE_API MeshInformationVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
4 changes: 2 additions & 2 deletions modules/base/include/modules/base/datavisualizer/volumeinformationvisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ class IVW_MODULE_BASE_API VolumeInformationVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
12 changes: 6 additions & 6 deletions modules/base/src/datavisualizer/imageinformationvisualizer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,28 +76,28 @@ bool ImageInformationVisualizer::hasSourceProcessor() const { return true; }
bool ImageInformationVisualizer::hasVisualizerNetwork() const { return true; }

std::pair<Processor*, Outport*> ImageInformationVisualizer::addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& initialPos) const {
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& origin) const {

auto* source =
net->addProcessor(util::makeProcessor<ImageSource>(GP{0, 0} + initialPos, app_, filename));
net->addProcessor(util::makeProcessor<ImageSource>(GP{0, 0} + origin, app_, filename));
auto* outport = source->getOutports().front();
return {source, outport};
}

std::vector<Processor*> ImageInformationVisualizer::addVisualizerNetwork(
Outport* outport, ProcessorNetwork* net) const {
const ivec2 initialPos = util::getPosition(outport->getProcessor());
const ivec2 origin = util::getPosition(outport->getProcessor());

auto* info = net->addProcessor(util::makeProcessor<ImageInformation>(GP{0, 3} + initialPos));
auto* info = net->addProcessor(util::makeProcessor<ImageInformation>(GP{0, 3} + origin));
net->addConnection(outport, info->getInports()[0]);

return {info};
}

std::vector<Processor*> ImageInformationVisualizer::addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& initialPos) const {
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& origin) const {

auto sourceAndOutport = addSourceProcessor(filename, net, initialPos);
auto sourceAndOutport = addSourceProcessor(filename, net, origin);
auto processors = addVisualizerNetwork(sourceAndOutport.second, net);

processors.push_back(sourceAndOutport.first);
Expand Down
12 changes: 6 additions & 6 deletions modules/base/src/datavisualizer/layerinformationvisualizer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,28 +72,28 @@ bool LayerInformationVisualizer::hasSourceProcessor() const { return true; }
bool LayerInformationVisualizer::hasVisualizerNetwork() const { return true; }

std::pair<Processor*, Outport*> LayerInformationVisualizer::addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& initialPos) const {
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& origin) const {

auto* source =
net->addProcessor(util::makeProcessor<LayerSource>(GP{0, 0} + initialPos, app_, filename));
net->addProcessor(util::makeProcessor<LayerSource>(GP{0, 0} + origin, app_, filename));
auto* outport = source->getOutports().front();
return {source, outport};
}

std::vector<Processor*> LayerInformationVisualizer::addVisualizerNetwork(
Outport* outport, ProcessorNetwork* net) const {
const ivec2 initialPos = util::getPosition(outport->getProcessor());
const ivec2 origin = util::getPosition(outport->getProcessor());

auto* info = net->addProcessor(util::makeProcessor<LayerInformation>(GP{0, 3} + initialPos));
auto* info = net->addProcessor(util::makeProcessor<LayerInformation>(GP{0, 3} + origin));
net->addConnection(outport, info->getInports()[0]);

return {info};
}

std::vector<Processor*> LayerInformationVisualizer::addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& initialPos) const {
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& origin) const {

auto sourceAndOutport = addSourceProcessor(filename, net, initialPos);
auto sourceAndOutport = addSourceProcessor(filename, net, origin);
auto processors = addVisualizerNetwork(sourceAndOutport.second, net);

processors.push_back(sourceAndOutport.first);
Expand Down
12 changes: 6 additions & 6 deletions modules/base/src/datavisualizer/meshinformationvisualizer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,29 +76,29 @@ bool MeshInformationVisualizer::hasSourceProcessor() const { return true; }
bool MeshInformationVisualizer::hasVisualizerNetwork() const { return true; }

std::pair<Processor*, Outport*> MeshInformationVisualizer::addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& initialPos) const {
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& origin) const {

auto* source =
net->addProcessor(util::makeProcessor<MeshSource>(GP{0, 0} + initialPos, app_, filename));
net->addProcessor(util::makeProcessor<MeshSource>(GP{0, 0} + origin, app_, filename));
auto* outport = source->getOutports().front();
return {source, outport};
}

std::vector<Processor*> MeshInformationVisualizer::addVisualizerNetwork(
Outport* outport, ProcessorNetwork* net) const {
const ivec2 initialPos = util::getPosition(outport->getProcessor());
const ivec2 origin = util::getPosition(outport->getProcessor());

auto* info = net->addProcessor(util::makeProcessor<MeshInformation>(GP{0, 3} + initialPos));
auto* info = net->addProcessor(util::makeProcessor<MeshInformation>(GP{0, 3} + origin));

net->addConnection(outport, info->getInports()[0]);

return {info};
}

std::vector<Processor*> MeshInformationVisualizer::addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& initialPos) const {
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& origin) const {

auto sourceAndOutport = addSourceProcessor(filename, net, initialPos);
auto sourceAndOutport = addSourceProcessor(filename, net, origin);
auto processors = addVisualizerNetwork(sourceAndOutport.second, net);

processors.push_back(sourceAndOutport.first);
Expand Down
12 changes: 6 additions & 6 deletions modules/base/src/datavisualizer/volumeinformationvisualizer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,29 +78,29 @@ bool VolumeInformationVisualizer::hasSourceProcessor() const { return true; }
bool VolumeInformationVisualizer::hasVisualizerNetwork() const { return true; }

std::pair<Processor*, Outport*> VolumeInformationVisualizer::addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& initialPos) const {
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& origin) const {

auto* source =
net->addProcessor(util::makeProcessor<VolumeSource>(GP{0, 0} + initialPos, app_, filename));
net->addProcessor(util::makeProcessor<VolumeSource>(GP{0, 0} + origin, app_, filename));
auto* outport = source->getOutports().front();
return {source, outport};
}

std::vector<Processor*> VolumeInformationVisualizer::addVisualizerNetwork(
Outport* outport, ProcessorNetwork* net) const {
const ivec2 initialPos = util::getPosition(outport->getProcessor());
const ivec2 origin = util::getPosition(outport->getProcessor());

auto* info = net->addProcessor(util::makeProcessor<VolumeInformation>(GP{0, 3} + initialPos));
auto* info = net->addProcessor(util::makeProcessor<VolumeInformation>(GP{0, 3} + origin));

net->addConnection(outport, info->getInports()[0]);

return {info};
}

std::vector<Processor*> VolumeInformationVisualizer::addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& initialPos) const {
const std::filesystem::path& filename, ProcessorNetwork* net, const ivec2& origin) const {

auto sourceAndOutport = addSourceProcessor(filename, net, initialPos);
auto sourceAndOutport = addSourceProcessor(filename, net, origin);
auto processors = addVisualizerNetwork(sourceAndOutport.second, net);

processors.push_back(sourceAndOutport.first);
Expand Down
4 changes: 2 additions & 2 deletions modules/basegl/include/modules/basegl/datavisualizer/imagebackgroundvisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ class IVW_MODULE_BASEGL_API ImageBackgroundVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
4 changes: 2 additions & 2 deletions modules/basegl/include/modules/basegl/datavisualizer/imagevisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ class IVW_MODULE_BASEGL_API ImageVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
4 changes: 2 additions & 2 deletions modules/basegl/include/modules/basegl/datavisualizer/layervisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ class IVW_MODULE_BASEGL_API LayerVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
4 changes: 2 additions & 2 deletions modules/basegl/include/modules/basegl/datavisualizer/meshvisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ class IVW_MODULE_BASEGL_API MeshVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
4 changes: 2 additions & 2 deletions modules/basegl/include/modules/basegl/datavisualizer/volumeraycastvisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ class IVW_MODULE_BASEGL_API VolumeRaycastVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
4 changes: 2 additions & 2 deletions modules/basegl/include/modules/basegl/datavisualizer/volumeslicevisualizer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ class IVW_MODULE_BASEGL_API VolumeSliceVisualizer : public DataVisualizer {

virtual std::pair<Processor*, Outport*> addSourceProcessor(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;
virtual std::vector<Processor*> addVisualizerNetwork(Outport* outport,
ProcessorNetwork* network) const override;
virtual std::vector<Processor*> addSourceAndVisualizerNetwork(
const std::filesystem::path& filename, ProcessorNetwork* network,
const ivec2& initialPos) const override;
const ivec2& origin) const override;

private:
InviwoApplication* app_;
Expand Down
Loading

0 comments on commit 6d89109

Please sign in to comment.