Commit f656a1e9 authored by schultezub's avatar schultezub
Browse files

using DevilImageReader in IxpvDemo

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@385 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent aa1bc121
......@@ -28,6 +28,7 @@
// ================================================================================================
#include "application/campvisapplication.h"
#include "modules/vis/pipelines/ixpvdemo.h"
#include "modules/vis/pipelines/dvrvis.h"
#include "modules/vis/pipelines/slicevis.h"
#include "modules/opencl/pipelines/openclpipeline.h"
......@@ -43,8 +44,9 @@ using namespace campvis;
**/
int main(int argc, char** argv) {
CampVisApplication app(argc, argv);
app.addVisualizationPipeline("IXPV", new IxpvDemo());
//app.addVisualizationPipeline("SliceVis", new SliceVis());
app.addVisualizationPipeline("DVRVis", new DVRVis());
//app.addVisualizationPipeline("DVRVis", new DVRVis());
//app.addVisualizationPipeline("DVR with OpenCL", new OpenCLPipeline());
app.init();
......
// ================================================================================================
//
// This file is part of the CAMPVis Software Framework.
//
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge <christian.szb@in.tum.de>
// Chair for Computer Aided Medical Procedures
// Technische Universität München
// Boltzmannstr. 3, 85748 Garching b. München, Germany
// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
//
// The licensing of this softare is not yet resolved. Until then, redistribution in source or
// binary forms outside the CAMP chair is not permitted, unless explicitly stated in legal form.
// However, the names of the original authors and the above copyright notice must retain in its
// original state in any case.
//
// Legal disclaimer provided by the BSD license:
// 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 HOLDER 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.
//
// ================================================================================================
#include "algorithmicgeometry.h"
namespace campvis {
}
......@@ -27,10 +27,8 @@
//
// ================================================================================================
#ifndef GEOMETRYTOOLS_H__
#define GEOMETRYTOOLS_H__
#ifndef ALGORITHMICGEOMETRY_H__
#define ALGORITHMICGEOMETRY_H__
#include "tgt/vector.h"
......@@ -92,4 +90,4 @@ namespace campvis {
}
#endif // GEOMETRYTOOLS_H__
#endif // ALGORITHMICGEOMETRY_H__
......@@ -59,7 +59,7 @@ namespace campvis {
void IxpvDemo::init() {
VisualizationPipeline::init();
_xrayReader.p_url.setValue("D:\\Medical Data\\Dentalscan\\dental.mhd");
_xrayReader.p_url.setValue("D:\\Medical Data\\XrayDepthPerception\\DataCowLeg\\Cowleg_CarmXrayImages\\APView_1.jpg");
_xrayReader.p_targetImageID.setValue("xray");
_usSliceExtractor.p_sliceNumber.setValue(0);
......@@ -80,10 +80,10 @@ namespace campvis {
// TODO: think whether we want to lock all processors already here.
}
if (! _xrayReader.getInvalidationLevel().isValid()) {
executeProcessor(&_xrayReader);
lockGLContextAndExecuteProcessor(&_xrayReader);
// convert data
DataContainer::ScopedTypedData<ImageData> img(_data, "reader.output");
DataContainer::ScopedTypedData<ImageData> img(_data, _xrayReader.p_targetImageID.getValue());
ImageDataLocal* local = ImageDataConverter::tryConvert<ImageDataLocal>(img);
if (local != 0) {
DataHandle dh = _data.addData("se.input", local);
......
......@@ -35,6 +35,7 @@
#include "core/eventhandlers/transfuncwindowingeventhandler.h"
#include "core/pipeline/visualizationpipeline.h"
#include "modules/io/processors/mhdimagereader.h"
#include "modules/devil/processors/devilimagereader.h"
#include "modules/vis/processors/sliceextractor.h"
namespace campvis {
......@@ -64,7 +65,7 @@ namespace campvis {
virtual void keyEvent(tgt::KeyEvent* e);
protected:
MhdImageReader _xrayReader;
DevilImageReader _xrayReader;
MhdImageReader _ctReader;
MhdImageReader _usReader;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment