Merge pull request #193 from davidsminor/linkedSceneFromIndexedIO

LinkedScene can now wrap writable SceneCaches

Author: johnhaddon

include/IECore/SceneCache.h

@@ -131,6 +131,9 @@ class SceneCache : public SampledSceneInterface
 		virtual SceneInterfacePtr scene( const Path &path, MissingBehaviour missingBehaviour = ThrowIfMissing );
 		virtual ConstSceneInterfacePtr scene( const Path &path, SceneInterface::MissingBehaviour missingBehaviour = ThrowIfMissing ) const;
 
+		/// tells you if this scene cache is read only or writable:
+		bool readOnly() const;
+		
 		// The attribute names used to mark animated topology and primitive variables
 		// when SceneCache objects are Primitives.
 		static const Name &animatedObjectTopologyAttribute;

src/IECore/LinkedScene.cpp

@@ -76,6 +76,11 @@ LinkedScene::LinkedScene( const std::string &fileName, IndexedIO::OpenMode mode
 
 LinkedScene::LinkedScene( ConstSceneInterfacePtr mainScene ) : m_mainScene(const_cast<SceneInterface*>(mainScene.get())), m_linkedScene(0), m_rootLinkDepth(0), m_readOnly(true), m_atLink(false), m_timeRemapped(false)
 {
+	if( SceneCachePtr scc = runTimeCast<SceneCache>( m_mainScene ) )
+	{
+		m_readOnly = scc->readOnly();
+	}
+	
 	m_sampled = (runTimeCast<const SampledSceneInterface>(mainScene.get()) != NULL);
 }
 

src/IECore/SceneCache.cpp

@@ -2027,6 +2027,7 @@ SceneCache::SceneCache( IECore::IndexedIOPtr indexedIO )
 	{
 		ObjectPtr header = HeaderGenerator::header();
 		header->save( indexedIO, headerEntry );
+		indexedIO->subdirectory( sampleTimesEntry, IndexedIO::CreateIfMissing );
 		indexedIO = indexedIO->subdirectory( rootEntry, IndexedIO::CreateIfMissing );
 		indexedIO->removeAll();
 		m_implementation = new WriterImplementation( indexedIO );
@@ -2371,3 +2372,8 @@ SceneCachePtr SceneCache::duplicate( ImplementationPtr& impl ) const
 {
 	return new SceneCache( impl );
 }
+
+bool SceneCache::readOnly() const
+{
+	return dynamic_cast< const ReaderImplementation* >( m_implementation.get() ) != NULL;
+}

test/IECore/LinkedSceneTest.py

@@ -699,7 +699,43 @@ def testLinkBoundTransformMismatch( self ) :
 		self.assertEqual( parent.readTransformAtSample( 0 ), transform )
 		self.failUnless( LinkedSceneTest.compareBBox( linked.readBoundAtSample( 0 ), IECore.Box3d( IECore.V3d( 1, 0, 0 ), IECore.V3d( 3, 1, 1 ) ) ) )
 		self.failUnless( LinkedSceneTest.compareBBox( linked.readBoundAtSample( 0 ), linked.readBoundAtSample( 1 ) ) )
-
+	
+	def testMemoryIndexedIOReadWrite( self ) :
+		
+		# create inital file structure in memory:
+		mio = IECore.MemoryIndexedIO( IECore.CharVectorData(), IECore.IndexedIO.OpenMode.Write )
+		
+		# write to the actual linkedscene:
+		scc = IECore.SceneCache( mio )
+		l = IECore.LinkedScene( scc )
+		
+		c0 = l.createChild("child0")
+		c1 = l.createChild("child1")
+		
+		c0.writeAttribute( "testAttr", IECore.StringData("test0"), 0 )
+		c1.writeAttribute( "testAttr", IECore.StringData("test1"), 0 )
+		
+		# write the "file" to memory
+		del l, scc, c0, c1
+		
+		# can we read it back again?
+		mioData = mio.buffer()
+		mio = IECore.MemoryIndexedIO( mioData, IECore.IndexedIO.OpenMode.Read )
+		
+		scc = IECore.SceneCache( mio )
+		l = IECore.LinkedScene( scc )
+		
+		self.assertEqual( set( l.childNames() ), set( ["child0", "child1"] ) )
+		
+		# no write access!
+		self.assertRaises( RuntimeError, l.createChild, "child2" )
+		
+		c0 = l.child("child0")
+		c1 = l.child("child1")
+		
+		self.assertEqual( c0.readAttribute( "testAttr", 0 ), IECore.StringData( "test0" ) )
+		self.assertEqual( c1.readAttribute( "testAttr", 0 ), IECore.StringData( "test1" ) )
+		
 if __name__ == "__main__":
 	unittest.main()
 

test/IECore/SceneCacheTest.py

@@ -661,7 +661,41 @@ def testSampleTimeOrder( self ):
 
 		m = IECore.SceneInterface.create( "/tmp/test.scc", IECore.IndexedIO.OpenMode.Read )
 		self.assertTrue( m.boundSampleTime(0) < m.boundSampleTime(1) )
-
+	
+	def testMemoryIndexedIOReadWrite( self ) :
+		
+		# create inital file structure in memory:
+		mio = IECore.MemoryIndexedIO( IECore.CharVectorData(), IECore.IndexedIO.OpenMode.Write )
+		
+		# write to the actual linkedscene:
+		scc = IECore.SceneCache( mio )
+		
+		c0 = scc.createChild("child0")
+		c1 = scc.createChild("child1")
+		
+		c0.writeAttribute( "testAttr", IECore.StringData("test0"), 0 )
+		c1.writeAttribute( "testAttr", IECore.StringData("test1"), 0 )
+		
+		# write the "file" to memory
+		del scc, c0, c1
+		
+		# can we read it back again?
+		mioData = mio.buffer()
+		mio = IECore.MemoryIndexedIO( mioData, IECore.IndexedIO.OpenMode.Read )
+		
+		scc = IECore.SceneCache( mio )
+		
+		self.assertEqual( set( scc.childNames() ), set( ["child0", "child1"] ) )
+		
+		# no write access!
+		self.assertRaises( RuntimeError, scc.createChild, "child2" )
+		
+		c0 = scc.child("child0")
+		c1 = scc.child("child1")
+		
+		self.assertEqual( c0.readAttribute( "testAttr", 0 ), IECore.StringData( "test0" ) )
+		self.assertEqual( c1.readAttribute( "testAttr", 0 ), IECore.StringData( "test1" ) )
+		
 
 if __name__ == "__main__":
 	unittest.main()