Commit 42903863 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[MERGE]

parents f35b646c c710c61d
......@@ -14,6 +14,8 @@ eichelbaum@informatik.uni-leipzig.de Sebastian_Eichelbaum
Sebastian Eichelbaum = Sebastian_Eichelbaum
cornimueller Cornelius_Mueller
mam04cvr@studserv.uni-leipzig.de Cornelius_Mueller
hlawit Mario_Hlawitschka
hlawit@informatik.uni-leipzig.de Mario_Hlawitschka
hlawitschka@ucdavis.edu Mario_Hlawitschka
mai02igw@informatik.uni-leipzig.de Robin_Ledig
mai02ifw@informatik.uni-leipzig.de Robin_Ledig
......
......@@ -158,7 +158,8 @@ void WReaderVTK::readStructuredPoints()
new WGridRegular3D( dimensions[ 0 ], dimensions[ 1 ], dimensions[ 2 ], transform ) );
}
void WReaderVTK::readScalars( size_t nbPoints, const std::string& name )
// we currently do not handle the name flag but should set the name of the data set somewhere
void WReaderVTK::readScalars( size_t nbPoints, const std::string& /*name*/ )
{
int pos = m_ifs->tellg(); // remember where we are for binary files
......@@ -211,7 +212,7 @@ void WReaderVTK::readScalars( size_t nbPoints, const std::string& name )
// WAssert( std::string( "" ) == line, "Found characters in file where nothing was expected." );
}
void WReaderVTK::readVectors( size_t nbPoints, const std::string& name )
void WReaderVTK::readVectors( size_t nbPoints, const std::string& /*name*/ )
{
int pos = m_ifs->tellg(); // remember where we are for binary files
......@@ -269,7 +270,7 @@ void WReaderVTK::readVectors( size_t nbPoints, const std::string& name )
// WAssert( std::string( "" ) == line, "Found characters in file where nothing was expected." );
}
void WReaderVTK::readTensors( size_t nbPoints, const std::string& name )
void WReaderVTK::readTensors( size_t nbPoints, const std::string& /*name*/ )
{
int pos = m_ifs->tellg(); // remember where we are for binary files
......
......@@ -398,11 +398,11 @@
unsigned char* data = new unsigned char[ tfsize ];
std::copy( orig, &orig[ tfsize ], data );
for ( int i = 0; i< 30 && i < tfsize/4; ++i )
{
debugLog() << i << ":" << ( int )data[ 4*i ] << ' ' << ( int )data[ 4*i+1 ] << ' '<< ( int )data[ 4*i+2 ]
<< ' '<< ( int ) data[ 4*i+3 ];
}
// for ( size_t i = 0; i< 30 && i < tfsize/4; ++i )
// {
// debugLog() << i << ":" << ( int )data[ 4*i ] << ' ' << ( int )data[ 4*i+1 ] << ' '<< ( int )data[ 4*i+2 ]
// << ' '<< ( int ) data[ 4*i+3 ];
// }
osg::ref_ptr< osg::Image > tfImg( new osg::Image() );
//debugLog() << "set image";
......
......@@ -31,7 +31,7 @@
#include "WTransferFunctionBackground.h"
#include "WTransferFunctionWidget.h"
WTransferFunctionBackground::WTransferFunctionBackground( WTransferFunctionWidget *parent ) : BaseClass()
WTransferFunctionBackground::WTransferFunctionBackground( WTransferFunctionWidget * /*parent*/ ) : BaseClass()
{
//this->setFlag( ItemIsMovable );
setOpacity( 1.0 );
......
......@@ -242,7 +242,7 @@ WTransferFunctionWidget::~WTransferFunctionWidget()
void WTransferFunctionWidget::setMyBackground()
{
const int transferFunctionSize = 32;
const int transferFunctionSize = 100;
static unsigned char texturearray[ 4*transferFunctionSize ];
if ( background )
......
#!/bin/sh
# get the current directory
PWD=`pwd`
# get path of this script
BINDIR=`dirname "$0"`
......@@ -12,6 +15,7 @@ echo run $@ > $PARAM_FILENAME
cd "$BINDIR"
# run walnut
gdb ./openwalnut-qt4 -command=$PARAM_FILENAME
gdb ./openwalnut-qt4 -cd=$PWD -command=$PARAM_FILENAME
rm $PARAM_FILENAME
cd $PWD
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