Commit 31612628 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Merge branch 'DataInspector_Jenkins_Fix' into 'development'

Data Inspector Jenkins Fix

I have fixed all of the Jenkin's errors but there was another thing in source/modules/randomwalk/processors/confidencemapgenerator.cpp which should be fixed but I think the variable in Line 207 may not be used anywhere but it is added to some object in create function. The only thing which I can do is to omit the confidenceMap pointer definition.
parents ab883817 0562b9e8
......@@ -137,7 +137,7 @@ namespace campvis {
/// Clear the trackball navigation event listener array
/// - First delete the data that it contains
std::vector<TrackballNavigationEventListener*>::iterator trackballNavEHIterator = _trackballEHs.begin();
for(; trackballNavEHIterator != _trackballEHs.end(); trackballNavEHIterator++) {
for(; trackballNavEHIterator != _trackballEHs.end(); ++trackballNavEHIterator) {
delete (*trackballNavEHIterator);
}
_trackballEHs.clear();
......@@ -145,13 +145,13 @@ namespace campvis {
/// Clear the Camera properties related to the trackballs array
/// - First delete the data that it contains
std::vector<campvis::CameraProperty*>::iterator camPropertyIterator = _trackballCameraProperties.begin();
for(; camPropertyIterator != _trackballCameraProperties.end(); camPropertyIterator++) {
for(; camPropertyIterator != _trackballCameraProperties.end(); ++camPropertyIterator) {
delete (*camPropertyIterator);
}
_trackballCameraProperties.clear();
std::vector<GeometryTextureInfo>::iterator geomTexInfoIter = _geomTextureInfos.begin();
for(; geomTexInfoIter != _geomTextureInfos.end(); geomTexInfoIter++) {
for(; geomTexInfoIter != _geomTextureInfos.end(); ++geomTexInfoIter) {
(*geomTexInfoIter).destroy();
}
_geomTextureInfos.clear();
......@@ -437,7 +437,6 @@ namespace campvis {
int cursorPosX = static_cast<int>(static_cast<float>(e->x() % _quadSize.x) / _quadSize.x * texWidth);
int cursorPosY = static_cast<int>(static_cast<float>(e->y() % _quadSize.y) / _quadSize.y * texHeight);
float f = 0.0;
if(_textures[texIndx]->isDepthTexture()) {
_depth = _textures[texIndx]->depthAsFloat(cursorPosX, texHeight - cursorPosY - 1);
_widget->updateDepth();
......@@ -485,7 +484,7 @@ namespace campvis {
case tgt::MouseEvent::MOUSE_BUTTON_LEFT:
_selectedTexture = (selectedIndex.y * _numTiles.x) + selectedIndex.x;
for(; geomTexInfoIter != _geomTextureInfos.end(); geomTexInfoIter++) {
for(; geomTexInfoIter != _geomTextureInfos.end(); ++geomTexInfoIter) {
if(static_cast<size_t> ((*geomTexInfoIter)._trackballIndx) == _selectedTexture) {
_selectedTrackball = (*geomTexInfoIter)._trackballIndx;
break;
......@@ -638,7 +637,7 @@ namespace campvis {
void DataContainerInspectorCanvas::updateMeshGeomRenderedTextures() {
std::vector<GeometryTextureInfo>::iterator geomTexInfosIter = _geomTextureInfos.begin();
for(;geomTexInfosIter != _geomTextureInfos.end(); geomTexInfosIter++) {
for(;geomTexInfosIter != _geomTextureInfos.end(); ++geomTexInfosIter) {
drawGeomteryData(dynamic_cast<const campvis::GeometryData*>((*geomTexInfosIter)._geomData.getData()), (*geomTexInfosIter)._texture, (*geomTexInfosIter)._trackballIndx);
}
......
......@@ -204,7 +204,7 @@ namespace campvis {
CMGenerator(input, outputValues, this));
ImageData* output = new ImageData(input->getDimensionality(), tgt::svec3(input->getSize().x, input->getSize().y, 1), 1);
GenericImageRepresentationLocal<float, 1>* confidenceMap = GenericImageRepresentationLocal<float, 1>::create(output, outputValues);
GenericImageRepresentationLocal<float, 1>::create(output, outputValues);
data.addData(p_targetImageID.getValue(), output);
validate(INVALID_RESULT);
......
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