Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
38c5abd3
Commit
38c5abd3
authored
Jul 09, 2015
by
Christian Schulte zu Berge
Browse files
Moved QtJobProcessor to application/tools, added RaycastingProcessor registrations in vis module.
parent
42cbc355
Changes
6
Hide whitespace changes
Inline
Side-by-side
application/campvisapplication.cpp
View file @
38c5abd3
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
#include "core/datastructures/imagerepresentationconverter.h"
#include "core/datastructures/imagerepresentationconverter.h"
#include "core/pipeline/visualizationprocessor.h"
#include "core/pipeline/visualizationprocessor.h"
#include "qtjobprocessor.h"
#include "
application/tools/
qtjobprocessor.h"
#include <QApplication>
#include <QApplication>
...
...
application/gui/workflowcontrollerwidget.cpp
View file @
38c5abd3
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#include "cgt/assert.h"
#include "cgt/assert.h"
#include "application/campvisapplication.h"
#include "application/campvisapplication.h"
#include "application/qtjobprocessor.h"
#include "application/
tools/
qtjobprocessor.h"
#include <QLabel>
#include <QLabel>
#include <QGridLayout>
#include <QGridLayout>
...
...
application/qtjobprocessor.cpp
→
application/
tools/
qtjobprocessor.cpp
View file @
38c5abd3
File moved
application/qtjobprocessor.h
→
application/
tools/
qtjobprocessor.h
View file @
38c5abd3
File moved
modules/vis/vis.cpp
View file @
38c5abd3
...
@@ -33,7 +33,10 @@
...
@@ -33,7 +33,10 @@
#include "modules/vis/pipelines/volumeexplorerdemo.h"
#include "modules/vis/pipelines/volumeexplorerdemo.h"
#include "modules/vis/pipelines/volumerendererdemo.h"
#include "modules/vis/pipelines/volumerendererdemo.h"
#include "modules/vis/processors/advoptimizedraycaster.h"
#include "modules/vis/processors/contextpreservingraycaster.h"
#include "modules/vis/processors/depthdarkening.h"
#include "modules/vis/processors/depthdarkening.h"
#include "modules/vis/processors/drrraycaster.h"
#include "modules/vis/processors/eepgenerator.h"
#include "modules/vis/processors/eepgenerator.h"
#include "modules/vis/processors/geometryrenderer.h"
#include "modules/vis/processors/geometryrenderer.h"
#include "modules/vis/processors/mprrenderer.h"
#include "modules/vis/processors/mprrenderer.h"
...
@@ -41,6 +44,7 @@
...
@@ -41,6 +44,7 @@
#include "modules/vis/processors/proxygeometrygenerator.h"
#include "modules/vis/processors/proxygeometrygenerator.h"
#include "modules/vis/processors/quadview.h"
#include "modules/vis/processors/quadview.h"
#include "modules/vis/processors/rendertargetcompositor.h"
#include "modules/vis/processors/rendertargetcompositor.h"
#include "modules/vis/processors/simpleraycaster.h"
#include "modules/vis/processors/sliceextractor.h"
#include "modules/vis/processors/sliceextractor.h"
#include "modules/vis/processors/slicerenderer2d.h"
#include "modules/vis/processors/slicerenderer2d.h"
#include "modules/vis/processors/slicerenderer3d.h"
#include "modules/vis/processors/slicerenderer3d.h"
...
@@ -60,7 +64,10 @@ namespace campvis {
...
@@ -60,7 +64,10 @@ namespace campvis {
template
class
PipelineRegistrar
<
VolumeRendererDemo
>;
template
class
PipelineRegistrar
<
VolumeRendererDemo
>;
template
class
PipelineRegistrar
<
VolumeExplorerDemo
>;
template
class
PipelineRegistrar
<
VolumeExplorerDemo
>;
template
class
SmartProcessorRegistrar
<
AdvOptimizedRaycaster
>;
template
class
SmartProcessorRegistrar
<
ContextPreservingRaycaster
>;
template
class
SmartProcessorRegistrar
<
DepthDarkening
>;
template
class
SmartProcessorRegistrar
<
DepthDarkening
>;
template
class
SmartProcessorRegistrar
<
DRRRaycaster
>;
template
class
SmartProcessorRegistrar
<
EEPGenerator
>;
template
class
SmartProcessorRegistrar
<
EEPGenerator
>;
template
class
SmartProcessorRegistrar
<
GeometryRenderer
>;
template
class
SmartProcessorRegistrar
<
GeometryRenderer
>;
template
class
SmartProcessorRegistrar
<
MprRenderer
>;
template
class
SmartProcessorRegistrar
<
MprRenderer
>;
...
@@ -68,6 +75,7 @@ namespace campvis {
...
@@ -68,6 +75,7 @@ namespace campvis {
template
class
SmartProcessorRegistrar
<
ProxyGeometryGenerator
>;
template
class
SmartProcessorRegistrar
<
ProxyGeometryGenerator
>;
template
class
SmartProcessorRegistrar
<
QuadView
>;
template
class
SmartProcessorRegistrar
<
QuadView
>;
template
class
SmartProcessorRegistrar
<
RenderTargetCompositor
>;
template
class
SmartProcessorRegistrar
<
RenderTargetCompositor
>;
template
class
SmartProcessorRegistrar
<
SimpleRaycaster
>;
template
class
SmartProcessorRegistrar
<
SliceExtractor
>;
template
class
SmartProcessorRegistrar
<
SliceExtractor
>;
template
class
SmartProcessorRegistrar
<
SliceRenderer2D
>;
template
class
SmartProcessorRegistrar
<
SliceRenderer2D
>;
template
class
SmartProcessorRegistrar
<
SliceRenderer3D
>;
template
class
SmartProcessorRegistrar
<
SliceRenderer3D
>;
...
...
scripting/scriptedpipelineregistrar.h
View file @
38c5abd3
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#define SCRIPTEDPIPELINEREGISTRAR_H__
#define SCRIPTEDPIPELINEREGISTRAR_H__
#include "luapipeline.h"
#include "luapipeline.h"
#include "co
d
e/pipeline/pipelinefactory.h"
#include "co
r
e/pipeline/pipelinefactory.h"
namespace
campvis
{
namespace
campvis
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment