From 50173e6d7e1c41dbf407cad46971d9a823eeefc1 Mon Sep 17 00:00:00 2001 From: ouv Date: Thu, 29 Jun 2006 10:34:00 +0000 Subject: [PATCH] IPAL12801 --- src/PIPELINE/VISUPipeLine.cxx | 4 ++-- src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx | 2 +- src/VISU_I/VISU_GaussPoints_i.cc | 4 ++-- src/VVTK/VVTK_PrimitiveBox.cxx | 6 +++--- src/VVTK/VVTK_SegmentationCursorDlg.cxx | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/PIPELINE/VISUPipeLine.cxx b/src/PIPELINE/VISUPipeLine.cxx index ea89fa29..2af09bb9 100644 --- a/src/PIPELINE/VISUPipeLine.cxx +++ b/src/PIPELINE/VISUPipeLine.cxx @@ -134,12 +134,12 @@ int main(int argc, char** argv){ char aMainTexture[80]; strcpy( aMainTexture, getenv( "VISU_ROOT_DIR" ) ); - strcat( aMainTexture, "/share/salome/resources/sprite_texture.vti" ); + strcat( aMainTexture, "/share/salome/resources/visu/sprite_texture.vti" ); //cout << aMainTexture << endl; char anAlphaTexture[80]; strcpy( anAlphaTexture, getenv( "VISU_ROOT_DIR" ) ); - strcat( anAlphaTexture, "/share/salome/resources/sprite_alpha.vti" ); + strcat( anAlphaTexture, "/share/salome/resources/visu/sprite_alpha.vti" ); //cout << anAlphaTexture << endl; vtkSmartPointer aTextureValue = VISU_GaussPointsPL::MakeTexture( aMainTexture, anAlphaTexture ); diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx index 481c755f..f7e33812 100755 --- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx +++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx @@ -295,7 +295,7 @@ void VISU_OpenGLPointSpriteMapper::InitShader() //cout << "Initializing vertex program" << endl; std::string fileName = std::string( getenv( "VISU_ROOT_DIR") ) + - "/share/salome/resources/Vertex_Program_ARB.txt"; + "/share/salome/resources/visu/Vertex_Program_ARB.txt"; char* shader = readFromFile( fileName ); diff --git a/src/VISU_I/VISU_GaussPoints_i.cc b/src/VISU_I/VISU_GaussPoints_i.cc index f8fb14a0..2fde203e 100644 --- a/src/VISU_I/VISU_GaussPoints_i.cc +++ b/src/VISU_I/VISU_GaussPoints_i.cc @@ -196,10 +196,10 @@ VISU::GaussPoints_i int aFaceLimit = aResourceMgr->integerValue( "VISU", "geom_sphere_face_limit", GetFaceLimit() ); SetFaceLimit( aFaceLimit ); - QString aMainTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/sprite_texture.bmp"; + QString aMainTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_texture.bmp"; aMainTexture = aResourceMgr->stringValue( "VISU", "point_sprite_main_texture", aMainTexture ); - QString anAlphaTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/sprite_alpha.bmp"; + QString anAlphaTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_alpha.bmp"; anAlphaTexture = aResourceMgr->stringValue( "VISU", "point_sprite_alpha_texture", anAlphaTexture ); SetTextures( aMainTexture, anAlphaTexture ); diff --git a/src/VVTK/VVTK_PrimitiveBox.cxx b/src/VVTK/VVTK_PrimitiveBox.cxx index 4f3f9c78..fc0aaa75 100644 --- a/src/VVTK/VVTK_PrimitiveBox.cxx +++ b/src/VVTK/VVTK_PrimitiveBox.cxx @@ -64,7 +64,7 @@ VVTK_PrimitiveBox::VVTK_PrimitiveBox( QWidget* parent ) : myPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite; - QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/"; + QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/"; myMainTexture = aRootDir + "sprite_texture.bmp"; myAlphaTexture = aRootDir + "sprite_alpha.bmp"; @@ -335,7 +335,7 @@ void VVTK_PrimitiveBox::setFaceLimit( int theFaceLimit ) void VVTK_PrimitiveBox::onBrowseMainTexture() { - QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/"; + QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/"; QString aFileName = QFileDialog::getOpenFileName( aRootDir, "Bitmap (*.bmp *.jpg *.png)", this ); if( aFileName.isNull() ) @@ -347,7 +347,7 @@ void VVTK_PrimitiveBox::onBrowseMainTexture() void VVTK_PrimitiveBox::onBrowseAlphaTexture() { - QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/"; + QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/"; QString aFileName = QFileDialog::getOpenFileName( aRootDir, "Bitmap (*.bmp *.jpg *.png)", this ); if( aFileName.isNull() ) diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.cxx b/src/VVTK/VVTK_SegmentationCursorDlg.cxx index 7784042c..0c20ac64 100644 --- a/src/VVTK/VVTK_SegmentationCursorDlg.cxx +++ b/src/VVTK/VVTK_SegmentationCursorDlg.cxx @@ -519,8 +519,8 @@ void VVTK_SegmentationCursorDlg::UpdateInsideGaussPoints() { int aPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite; vtkFloatingPointType aClamp = 200.0; - QString aMainTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/sprite_texture.bmp"; - QString anAlphaTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/sprite_alpha.bmp"; + QString aMainTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_texture.bmp"; + QString anAlphaTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_alpha.bmp"; vtkFloatingPointType anAlphaThreshold = 0.1; int aResolution = 8; int aMinSize = 3; @@ -587,8 +587,8 @@ void VVTK_SegmentationCursorDlg::UpdateOutsideGaussPoints() { vtkFloatingPointType aClamp = 256.0; int aPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite; - QString aMainTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/sprite_texture.bmp"; - QString anAlphaTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/sprite_alpha.bmp"; + QString aMainTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_texture.bmp"; + QString anAlphaTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_alpha.bmp"; vtkFloatingPointType anAlphaThreshold = 0.1; int aResolution = 8; int aSize = 25; -- 2.39.2