Repository navigation
Feature/c3d various #290
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
martinfalk
wants to merge
5
commits into
master
Choose a base branch
from
feature/c3d-various
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feature/c3d various #290
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3142da4
C3D: sequence index testing
martinfalk 435bf70
C3D: C3D subset constructor
martinfalk b1d4200
C3D: optional cropping in C3DToMesh
martinfalk 5c5ef8a
C3D: processors for cropping C3D frames
martinfalk 9c8026e
C3D: sequence info processor
martinfalk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /********************************************************************************* | ||
| * | ||
| * Inviwo - Interactive Visualization Workshop | ||
| * | ||
| * Copyright (c) 2026 Inviwo Foundation | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | ||
| * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| * | ||
| *********************************************************************************/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <inviwo/c3d/c3dmoduledefine.h> | ||
| #include <inviwo/core/processors/processor.h> | ||
| #include <inviwo/core/properties/boolproperty.h> | ||
| #include <inviwo/core/properties/minmaxproperty.h> | ||
|
|
||
| #include <inviwo/c3d/ports/c3dport.h> | ||
| #include <inviwo/dataframe/datastructures/dataframe.h> | ||
| #include <inviwo/dataframe/properties/columnoptionproperty.h> | ||
|
|
||
| namespace inviwo { | ||
|
|
||
| class IVW_MODULE_C3D_API C3DCrop : public Processor { | ||
| public: | ||
| C3DCrop(); | ||
|
|
||
| virtual void process() override; | ||
|
|
||
| virtual const ProcessorInfo& getProcessorInfo() const override; | ||
| static const ProcessorInfo processorInfo_; | ||
|
|
||
| private: | ||
| C3DDataInport inport_; | ||
| DataFrameInport dataframe_; | ||
| C3DDataOutport outport_; | ||
|
|
||
| BoolProperty enabled_; | ||
| ColumnOptionProperty sequenceIndex_; | ||
| ColumnOptionProperty firstFrame_; | ||
| ColumnOptionProperty lastFrame_; | ||
|
|
||
| IntSizeTMinMaxProperty frame_; | ||
| }; | ||
|
|
||
| } // namespace inviwo |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /********************************************************************************* | ||
| * | ||
| * Inviwo - Interactive Visualization Workshop | ||
| * | ||
| * Copyright (c) 2026 Inviwo Foundation | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | ||
| * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| * | ||
| *********************************************************************************/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <inviwo/c3d/c3dmoduledefine.h> | ||
| #include <inviwo/core/processors/poolprocessor.h> | ||
| #include <inviwo/core/properties/boolproperty.h> | ||
| #include <inviwo/core/datastructures/datasequence.h> | ||
| #include <inviwo/core/ports/datainport.h> | ||
| #include <inviwo/core/ports/dataoutport.h> | ||
|
|
||
| #include <inviwo/c3d/datastructures/c3ddata.h> | ||
| #include <inviwo/c3d/datastructures/c3ddatatraits.h> | ||
| #include <inviwo/dataframe/datastructures/dataframe.h> | ||
| #include <inviwo/dataframe/properties/columnoptionproperty.h> | ||
|
|
||
| namespace inviwo { | ||
|
|
||
| class IVW_MODULE_C3D_API C3DSequenceCrop : public PoolProcessor { | ||
| public: | ||
| C3DSequenceCrop(); | ||
|
|
||
| virtual void process() override; | ||
|
|
||
| virtual const ProcessorInfo& getProcessorInfo() const override; | ||
| static const ProcessorInfo processorInfo_; | ||
|
|
||
| private: | ||
| DataInport<DataSequence<C3D>> inport_; | ||
| DataOutport<DataSequence<C3D>> outport_; | ||
| DataFrameInport dataframe_; | ||
|
|
||
| BoolProperty enabled_; | ||
| ColumnOptionProperty sequenceIndex_; | ||
| ColumnOptionProperty firstFrame_; | ||
| ColumnOptionProperty lastFrame_; | ||
| }; | ||
|
|
||
| } // namespace inviwo |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /********************************************************************************* | ||
| * | ||
| * Inviwo - Interactive Visualization Workshop | ||
| * | ||
| * Copyright (c) 2026 Inviwo Foundation | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | ||
| * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| * | ||
| *********************************************************************************/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <inviwo/c3d/c3dmoduledefine.h> | ||
| #include <inviwo/core/processors/processor.h> | ||
| #include <inviwo/core/properties/ordinalproperty.h> | ||
| #include <inviwo/core/properties/ordinaloptproperty.h> | ||
| #include <inviwo/core/datastructures/datasequence.h> | ||
| #include <inviwo/core/ports/datainport.h> | ||
| #include <inviwo/core/ports/dataoutport.h> | ||
|
|
||
| #include <inviwo/c3d/datastructures/c3ddata.h> | ||
| #include <inviwo/c3d/datastructures/c3ddatatraits.h> | ||
|
|
||
| namespace inviwo { | ||
|
|
||
| class IVW_MODULE_C3D_API C3DSequenceInfo : public Processor { | ||
| public: | ||
| C3DSequenceInfo(); | ||
|
|
||
| virtual void process() override; | ||
|
|
||
| virtual const ProcessorInfo& getProcessorInfo() const override; | ||
| static const ProcessorInfo processorInfo_; | ||
|
|
||
| private: | ||
| DataInport<DataSequence<C3D>> inport_; | ||
| DataOutport<DataSequence<C3D>> outport_; | ||
|
|
||
| IntProperty sequenceSize_; | ||
| OrdinalOptProperty<int> maxSequenceSize_; | ||
| }; | ||
|
|
||
| } // namespace inviwo |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clang-tidy diagnostic
misc/c3d/include/inviwo/c3d/datastructures/c3ddata.h:47:1: warning: [misc-multiple-inheritance]
clang-tidy diagnostic
misc/c3d/include/inviwo/c3d/datastructures/c3ddata.h:47:26: warning: [cppcoreguidelines-special-member-functions]