Skip to content
GitLab
Commit 08feaf67 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Merge branch 'fix-warnings' of... 

Merge branch 'fix-warnings' of /mnt/bigone/git/repositories/sebastian.poelsterl/campvis into development
parents e299864b 33deac01
Hide whitespace changes
Inline Side-by-side
application/gui/datacontainerfileloaderwidget.cpp
View file @ 08feaf67
......@@ -33,8 +33,8 @@ namespace campvis {
, _dataContainer(0)
, _layout(0)
, _pipelinePropertiesScrollArea(0)
, _propCollectionWidget(0)
, _fileName("fileName", "Image URL", "")
, _propCollectionWidget(0)
{
this->_parent = parentDataInspector;
this->_dataContainer = this->_parent->getDataContainer();
......@@ -110,4 +110,4 @@ namespace campvis {
this->close();
}
}
\ No newline at end of file
}
application/gui/datacontainerinspectorcanvas.cpp
View file @ 08feaf67
......@@ -54,16 +54,16 @@ namespace campvis {
, p_renderGChannel("RenderGChannel", "Render Green Channel", true)
, p_renderBChannel("RenderBChannel", "Render Blue Channel", true)
, p_renderAChannel("RenderAChannel", "Render Alpha Channel", true)
, _meshGeomTexturesDirty(false)
, _dataContainer(0)
, _paintShader(0)
, _quad(0)
, _color(0.0f, 0.0f, 0.0f, 0.0f)
, _numTiles(0, 0)
, _quadSize(0, 0)
, _selectedTexture(0)
, _renderFullscreen(false)
, _currentSlice(-1)
, _color(0.0f, 0.0f, 0.0f, 0.0f)
, _meshGeomTexturesDirty(false)
{
static_cast<Geometry1DTransferFunction*>(p_transferFunction.getTF())->addGeometry(TFGeometry1D::createQuad(tgt::vec2(0.f, 1.f), tgt::col4(0, 0, 0, 255), tgt::col4(255, 255, 255, 255)));
......@@ -486,7 +486,7 @@ namespace campvis {
_selectedTexture = (selectedIndex.y * _numTiles.x) + selectedIndex.x;
for(; geomTexInfoIter != _geomTextureInfos.end(); geomTexInfoIter++) {
if((*geomTexInfoIter)._trackballIndx == _selectedTexture) {
if(static_cast<size_t> ((*geomTexInfoIter)._trackballIndx) == _selectedTexture) {
_selectedTrackball = (*geomTexInfoIter)._trackballIndx;
break;
}
......@@ -655,4 +655,4 @@ namespace campvis {
invalidateMeshGeomTextures();
}
}
}
\ No newline at end of file
}
modules/advancedusvis/pipelines/advancedusvis.cpp
View file @ 08feaf67
......@@ -223,6 +223,8 @@ namespace campvis {
case tgt::KeyEvent::K_DOWN:
_usFusion1.p_sliceNumber.decrement();
break;
default:
break;
}
}
}
......@@ -237,4 +239,4 @@ namespace campvis {
}
}
}
\ No newline at end of file
}
modules/advancedusvis/processors/advancedusfusion.cpp
View file @ 08feaf67
......@@ -67,8 +67,8 @@ namespace campvis {
, p_transferFunction("transferFunction", "Transfer Function", new SimpleTransferFunction(256))
, p_confidenceTF("ConfidenceTF", "Confidence to Uncertainty TF", new Geometry1DTransferFunction(256))
, p_view("View", "Image to Render", viewOptions, 12)
, p_confidenceScaling("ConfidenceScaling", "Confidence Scaling", 1.f, .001f, 1000.f, 0.1f)
, p_blurredScaling("BlurredScaling", "Blurred Scaling", 1.f, .001f, 1000.f, 0.1f)
, p_confidenceScaling("ConfidenceScaling", "Confidence Scaling", 1.f, .001f, 1000.f, 0.1f)
, p_hue("Hue", "Hue for Uncertainty Mapping", .15f, 0.f, 1.f)
, p_use3DTexture("Use3DTexture", "Use 3D Texture", false)
, _shader(0)
......@@ -160,7 +160,7 @@ namespace campvis {
p_transferFunction.setImageHandle(img.getDataHandle());
const tgt::svec3& imgSize = img->getSize();
if (p_sliceNumber.getMaxValue() != imgSize.z - 1){
if (static_cast<tgt::svec3::ElemType> (p_sliceNumber.getMaxValue()) != imgSize.z - 1){
p_sliceNumber.setMaxValue(static_cast<int>(imgSize.z) - 1);
}
p_use3DTexture.setValue(img->getDimensionality() == 3);
......
modules/columbia/pipelines/columbia1.cpp
View file @ 08feaf67
......@@ -40,8 +40,8 @@ namespace campvis {
, _flowReader()
, _vtkReader()
, _vr(&_canvasSize)
, _sr(&_canvasSize)
, _src(&_canvasSize)
, _sr(&_canvasSize)
, _gr(&_canvasSize)
, _sft()
, _sfr(&_canvasSize)
......@@ -154,4 +154,4 @@ namespace campvis {
}
}
}
\ No newline at end of file
}
modules/columbia/processors/strainfiberrenderer.cpp
View file @ 08feaf67
......@@ -49,8 +49,8 @@ namespace campvis {
, p_strainId("StrainDataId", "Input Strain Data ID", "gr.strain", DataNameProperty::READ)
, p_renderTargetID("p_renderTargetID", "Output Image", "gr.output", DataNameProperty::WRITE)
, p_camera("Camera", "Camera ID")//, "camera", DataNameProperty::READ, AbstractProcessor::INVALID_RESULT, DataNameProperty::CameraData)
, p_lineWidth("LineWidth", "Line width", 3.f, .5f, 10.f, 0.1f)
, p_renderMode("RenderMode", "Render Mode", renderModeOptions, 2, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_SHADER)
, p_lineWidth("LineWidth", "Line width", 3.f, .5f, 10.f, 0.1f)
, p_color("color", "Rendering Color", tgt::vec4(1.f), tgt::vec4(0.f), tgt::vec4(1.f))
, _shader(0)
{
......
modules/preprocessing/processors/glgradientvolumegenerator.cpp
View file @ 08feaf67
......@@ -95,7 +95,7 @@ namespace campvis {
glViewport(0, 0, static_cast<GLsizei>(size.x), static_cast<GLsizei>(size.y));
// render quad to compute difference measure by shader
for (int z = 0; z < size.z; ++z) {
for (tgt::svec3::ElemType z = 0; z < size.z; ++z) {
float zTexCoord = static_cast<float>(z)/static_cast<float>(size.z) + .5f/static_cast<float>(size.z);
_shader->setUniform("_zTexCoord", zTexCoord);
_fbo->attachTexture(resultTexture, GL_COLOR_ATTACHMENT0, 0, z);
......
modules/registration/processors/similaritymeasure.cpp
View file @ 08feaf67
......@@ -60,11 +60,11 @@ namespace campvis {
, p_applyMask("ApplyMask", "Apply Mask", true)
, p_translation("Translation", "Moving Image Translation", tgt::vec3(0.f), tgt::vec3(-100.f), tgt::vec3(100.f), tgt::vec3(1.f), tgt::vec3(5.f))
, p_rotation("Rotation", "Moving Image Rotation", tgt::vec3(0.f), tgt::vec3(-tgt::PIf), tgt::vec3(tgt::PIf), tgt::vec3(.01f), tgt::vec3(7.f))
, p_viewportSize("ViewportSize", "Viewport Size", tgt::ivec2(1), tgt::ivec2(1), tgt::ivec2(1000), tgt::ivec2(1), AbstractProcessor::VALID)
, p_metric("Metric", "Similarity Metric", metrics, 5)
, p_computeSimilarity("ComputeSimilarity", "Compute Similarity")
, p_differenceImageId("DifferenceImageId", "Difference Image", "difference", DataNameProperty::WRITE, AbstractProcessor::VALID)
, p_computeDifferenceImage("ComputeDifferenceImage", "Compute Difference Image", AbstractProcessor::INVALID_RESULT | COMPUTE_DIFFERENCE_IMAGE)
, p_viewportSize("ViewportSize", "Viewport Size", tgt::ivec2(1), tgt::ivec2(1), tgt::ivec2(1000), tgt::ivec2(1), AbstractProcessor::VALID)
, _sadssdCostFunctionShader(0)
, _nccsnrCostFunctionShader(0)
, _differenceShader(0)
......@@ -320,7 +320,7 @@ namespace campvis {
glViewport(0, 0, static_cast<GLsizei>(viewportSize.x), static_cast<GLsizei>(viewportSize.y));
// render quad to compute difference measure by shader
for (int z = 0; z < size.z; ++z) {
for (tgt::svec3::ElemType z = 0; z < size.z; ++z) {
float texZ = static_cast<float>(z)/static_cast<float>(size.z) + .5f/static_cast<float>(size.z);
_differenceShader->setUniform("_zTex", texZ);
_fbo->attachTexture(differenceImage, GL_COLOR_ATTACHMENT0, 0, z);
......
modules/vis/processors/geometryrenderer.cpp
View file @ 08feaf67
......@@ -52,9 +52,9 @@ namespace campvis {
, p_geometryID("geometryID", "Input Geometry ID", "gr.input", DataNameProperty::READ)
, p_renderTargetID("p_renderTargetID", "Output Image", "gr.output", DataNameProperty::WRITE)
, p_camera("camera", "Camera")
, p_renderMode("RenderMode", "Render Mode", renderOptions, 7, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_PROPERTIES)
, p_useSolidColor("UseSolidColor", "Use Solid Color", true, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_PROPERTIES)
, p_solidColor("SolidColor", "Solid Color", tgt::vec4(1.f, .5f, 0.f, 1.f), tgt::vec4(0.f), tgt::vec4(1.f))
, p_renderMode("RenderMode", "Render Mode", renderOptions, 7, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_PROPERTIES)
, p_pointSize("PointSize", "Point Size", 3.f, .1f, 10.f)
, p_lineWidth("LineWidth", "Line Width", 1.f, .1f, 10.f)
, p_showWireframe("ShowWireframe", "Show Wireframe", true, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_SHADER | AbstractProcessor::INVALID_PROPERTIES)
......
Supports Markdown
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

LRZ Homepage | Datenschutz | Dokumentation und Betriebsbedingungen | Impressum