From 3a7942dfb71bdc0d648ca495e6b86d4775e3eda6 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 23 Jul 2014 16:36:17 +0000
Subject: [PATCH] Added VolumeSettings::Filename property.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14383 16af8721-9629-0410-8352-f15c8da7e697
---
 include/osgVolume/VolumeSettings                         | 5 +++++
 src/osgPlugins/p3d/ReaderWriterP3D.cpp                   | 4 ++--
 src/osgVolume/VolumeSettings.cpp                         | 1 +
 src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/osgVolume/VolumeSettings b/include/osgVolume/VolumeSettings
index 9e3e8a5a8..e39d6d9de 100644
--- a/include/osgVolume/VolumeSettings
+++ b/include/osgVolume/VolumeSettings
@@ -33,6 +33,9 @@ class OSGVOLUME_EXPORT VolumeSettings : public Property
         virtual void accept(PropertyVisitor& pv);
         virtual void traverse(PropertyVisitor& pv);
 
+        void setFilename(const std::string& str) { _filename = str; }
+        const std::string& getFilename() const { return _filename; }
+
         enum Technique
         {
             FixedFunction,
@@ -74,6 +77,8 @@ class OSGVOLUME_EXPORT VolumeSettings : public Property
 
         virtual ~VolumeSettings() {}
 
+        std::string     _filename;
+
         Technique       _technique;
         ShadingModel    _shadingModel;
 
diff --git a/src/osgPlugins/p3d/ReaderWriterP3D.cpp b/src/osgPlugins/p3d/ReaderWriterP3D.cpp
index 2775ccaa2..4a07188bf 100644
--- a/src/osgPlugins/p3d/ReaderWriterP3D.cpp
+++ b/src/osgPlugins/p3d/ReaderWriterP3D.cpp
@@ -1435,8 +1435,8 @@ void ReaderWriterP3DXML::parseVolume(osgPresentation::SlideShowConstructor& cons
         if (volumeData.volumeSettings.valid())
         {
             OSG_NOTICE<<"VolumeSetting read "<<vs<<" "<<volumeData.volumeSettings.get()<<std::endl;
-            volumeData.volumeSettings->setName(vs);
-            OSG_NOTICE<<" assigned name to VS "<<volumeData.volumeSettings->getName()<<std::endl;
+            volumeData.volumeSettings->setFilename(vs);
+            OSG_NOTICE<<" assigned name to VS "<<volumeData.volumeSettings->getFilename()<<std::endl;
         }
     }
 
diff --git a/src/osgVolume/VolumeSettings.cpp b/src/osgVolume/VolumeSettings.cpp
index 22137c6ee..11e1fe973 100644
--- a/src/osgVolume/VolumeSettings.cpp
+++ b/src/osgVolume/VolumeSettings.cpp
@@ -27,6 +27,7 @@ VolumeSettings::VolumeSettings():
 
 VolumeSettings::VolumeSettings(const VolumeSettings& vs,const osg::CopyOp& copyop):
     Property(vs, copyop),
+    _filename(vs._filename),
     _technique(vs._technique),
     _shadingModel(vs._shadingModel),
     _sampleRatioProperty(osg::clone(vs._sampleRatioProperty.get(), copyop)),
diff --git a/src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp b/src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp
index 86535ccac..58deec0c5 100644
--- a/src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp
+++ b/src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp
@@ -9,6 +9,8 @@ REGISTER_OBJECT_WRAPPER( osgVolume_VolumeSettings,
                          osgVolume::VolumeSettings,
                          "osg::Object osgVolume::VolumeSettings" )
 {
+    ADD_STRING_SERIALIZER( Filename, "" );
+
     BEGIN_ENUM_SERIALIZER( Technique, MultiPass );
         ADD_ENUM_VALUE( FixedFunction );
         ADD_ENUM_VALUE( RayTraced );