Commit 604bb4b7 authored by schultezub's avatar schultezub
Browse files

various small fixes

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@472 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent f704deb8
......@@ -204,7 +204,7 @@ namespace campvis {
// create texture
GLenum dataType = GL_UNSIGNED_BYTE;
_texture = new tgt::Texture(_size, GL_RGBA, dataType, tgt::Texture::LINEAR);
_texture->setWrapping(tgt::Texture::CLAMP);
_texture->setWrapping(tgt::Texture::CLAMP_TO_EDGE);
_texture->uploadTexture();
LGL_ERROR;
......
......@@ -66,7 +66,7 @@ namespace campvis {
GLenum dataType = GL_UNSIGNED_BYTE;
_texture = new tgt::Texture(_size, GL_RGBA, dataType, tgt::Texture::LINEAR);
_texture->setWrapping(tgt::Texture::CLAMP);
_texture->setWrapping(tgt::Texture::CLAMP_TO_EDGE);
tgt::col4 diff = _rightColor - _leftColor;
for (size_t i = 0; i < _size.x; ++i) {
......
......@@ -117,7 +117,7 @@ namespace campvis {
void ImageRepresentationGL::createTexture(const WeaklyTypedPointer& wtp) {
tgtAssert(wtp._pointer != 0, "Pointer to image data must not be 0!");
_texture = new tgt::Texture(reinterpret_cast<GLubyte*>(wtp._pointer), getSize(), wtp.getGlFormat(), wtp.getGlInternalFormat(), wtp.getGlDataType(), tgt::Texture::MIPMAP);
_texture = new tgt::Texture(reinterpret_cast<GLubyte*>(wtp._pointer), getSize(), wtp.getGlFormat(), wtp.getGlInternalFormat(), wtp.getGlDataType(), tgt::Texture::LINEAR);
setupAndUploadTexture(_texture, wtp.isInteger(), wtp.isSigned());
}
......
......@@ -63,7 +63,7 @@ namespace campvis {
addProcessor(&_usReader);
addProcessor(&_confidenceReader);
//addProcessor(&_confidenceGenerator);
addProcessor(&_gvg);
//addProcessor(&_gvg);
//addProcessor(&_lhh);
addProcessor(&_usBlurFilter);
addProcessor(&_usFusion1);
......@@ -95,9 +95,9 @@ namespace campvis {
_camera.addSharedProperty(&_usEEP.p_camera);
_camera.addSharedProperty(&_usDVR.p_camera);
_usReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\CurefabCS\\Stent_Patient_ B-Mode_2013-02-11T14.56.46z\\01_us.mhd");
//_usReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\CurefabCS\\Stent_Patient_ B-Mode_2013-02-11T14.56.46z\\01_us.mhd");
//_usReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\01\\BMode_01.mhd");
//_usReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\UltrasoundBoneData\\SynthesEvaluationUnterschenkel\\Athanasios\\US.csvd");
_usReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\UltrasoundBoneData\\SynthesEvaluationUnterschenkel");
//_usReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\transcranial\\us.png");
_usReader.p_targetImageID.setValue("us.image");
_usReader.p_targetImageID.connect(&_confidenceGenerator.p_sourceImageID);
......@@ -110,9 +110,9 @@ namespace campvis {
_usReader.p_targetImageID.connect(&_usBlurFilter.p_sourceImageID);
_usReader.p_targetImageID.connect(&_usDenoiseilter.p_sourceImageID);
_confidenceReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\CurefabCS\\Stent_Patient_ B-Mode_2013-02-11T14.56.46z\\01_cm.mhd");
//_confidenceReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\CurefabCS\\Stent_Patient_ B-Mode_2013-02-11T14.56.46z\\01_cm.mhd");
//_confidenceReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\01\\Confidence_01.mhd");
//_confidenceReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\UltrasoundBoneData\\SynthesEvaluationUnterschenkel\\Athanasios\\Map.csvd");
_confidenceReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\UltrasoundBoneData\\SynthesEvaluationUnterschenkel");
//_confidenceReader.p_url.setValue("D:\\Medical Data\\US Confidence Vis\\transcranial\\cm.png");
_confidenceReader.p_targetImageID.setValue("confidence.image.read");
_confidenceReader.p_targetImageID.connect(&_usFusion1.p_confidenceImageID);
......
......@@ -89,8 +89,8 @@ namespace campvis {
CameraProperty _camera;
MhdImageReader _usReader;
MhdImageReader _confidenceReader;
CsvdImageReader _usReader;
CsvdImageReader _confidenceReader;
ConfidenceMapGenerator _confidenceGenerator;
GradientVolumeGenerator _gvg;
......
......@@ -81,6 +81,7 @@ namespace campvis {
}
else {
LERROR("Error while parsing CSVD header: No Size specified.");
validate(INVALID_RESULT);
return;
}
......@@ -102,6 +103,7 @@ namespace campvis {
pt = WeaklyTypedPointer::FLOAT;
else {
LERROR("Error while parsing MHD header: Unsupported element type: " << et);
validate(INVALID_RESULT);
return;
}
......@@ -118,6 +120,7 @@ namespace campvis {
#define DISPATCH_PARSING(WTP_TYPE, C_TYPE, TMP_TYPE) \
if (pt == WTP_TYPE) {\
C_TYPE* dataArray = new C_TYPE[tgt::hmul(size)]; \
memset(dataArray, 0, sizeof(C_TYPE) * tgt::hmul(size)); \
for (size_t slice = 0; slice < size.z; ++slice) { \
std::stringstream ss; \
ss << url << slice << ".csv"; \
......@@ -128,13 +131,15 @@ namespace campvis {
throw tgt::FileException("Could not open file " + ss.str() + " for reading.", p_url.getValue()); \
\
TMP_TYPE tmp; \
for (size_t column = 0; column < size.y; ++column) { \
for (size_t column = 0; column < size.y && file.good(); ++column) { \
for (size_t row = 0; row < size.x && file.good(); ++row) { \
file >> tmp; \
dataArray[index++] = static_cast<C_TYPE>(tmp); \
file.get(); /* TODO: simple hack to advance to next character - but there might be more than one... */ \
} \
} \
\
file.close(); \
} \
rep = GenericImageRepresentationLocal<C_TYPE, 1>::create(image, dataArray); \
}
......@@ -159,15 +164,18 @@ namespace campvis {
}
else {
LERROR("Error while parsing CSVD header: No file names specified.");
validate(INVALID_RESULT);
return;
}
}
catch (tgt::Exception& e) {
LERROR("Error while parsing MHD header: " << e.what());
validate(INVALID_RESULT);
return;
}
catch (std::exception& e) {
LERROR("Error while parsing MHD header: " << e.what());
validate(INVALID_RESULT);
return;
}
......
......@@ -82,8 +82,10 @@ namespace campvis {
ImageRepresentationRenderTarget::ScopedRepresentation inputImage3(data, p_inputImage3.getValue());
ImageRepresentationRenderTarget::ScopedRepresentation inputImage4(data, p_inputImage4.getValue());
if (inputImage1 == 0 && inputImage2 == 0 && inputImage3 == 0 && inputImage4 == 0)
if (inputImage1 == 0 && inputImage2 == 0 && inputImage3 == 0 && inputImage4 == 0) {
validate(INVALID_RESULT);
return;
}
std::pair<ImageData*, ImageRepresentationRenderTarget*> outputTarget = ImageRepresentationRenderTarget::createWithImageData(_renderTargetSize.getValue());
tgt::TextureUnit colorUnit, depthUnit;
......
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