Changeset 8964 for OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

Timestamp:

10/02/08 17:45:08 (5 years ago)

Author:

robert

Message:

Various improvements to the dicom loader to be able to handle a broader range of dicom files

Files:

• OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -38 +38 @@
 #include <osg/BlendEquation>
 #include <osg/TransferFunction>
+#include <osg/MatrixTransform>
 
 #include <osgDB/Registry>
@@ -2020 +2021 @@
             if (osgDB::getLowerCaseFileExtension(filename)=="dicom")
             {
-                images.push_back(osgDB::readImageFile( filename ));
+                // not an option so assume string is a filename.
+                osg::Image *image = osgDB::readImageFile(filename);
+                if(image)
+                {
+                    images.push_back(image);
+                }
             }
             else
@@ -2033 +2039 @@
                 if (fileType == osgDB::DIRECTORY)
                 {
-                    osgDB::DirectoryContents contents = osgDB::getDirectoryContents(filename);
-
-                    std::sort(contents.begin(), contents.end());
-
-                    ImageList imageList;
-                    for(osgDB::DirectoryContents::iterator itr = contents.begin();
-                        itr != contents.end();
-                        ++itr)
+                   osg::Image *image = osgDB::readImageFile(filename+".dicom");
+                    if(image)
                     {
-                        std::string localFile = filename + "/" + *itr;
-                        std::cout<<"contents = "<<localFile<<std::endl;
-                        if (osgDB::fileType(localFile) == osgDB::REGULAR_FILE)
-                        {
-                            // not an option so assume string is a filename.
-                            osg::Image *image = osgDB::readImageFile(localFile);
-                            if(image)
-                            {
-                                imageList.push_back(image);
-                            }
-                        }
-                    }
-
-                    // pack the textures into a single texture.
-                    ProcessRow processRow;
-                    images.push_back(createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo));
-
+                        images.push_back(image);
+                    } 
                 }
                 else if (fileType == osgDB::REGULAR_FILE)
@@ -2099 +2084 @@
 
 
-#if 1
     osg::RefMatrix* matrix = dynamic_cast<osg::RefMatrix*>(images.front()->getUserData());
+#if 0
     if (matrix)
     {
@@ -2110 +2095 @@
 #endif
 
-    osg::Vec4 minValue, maxValue;
+    osg::Vec4 minValue(FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX);
+    osg::Vec4 maxValue(-FLT_MAX, -FLT_MAX, -FLT_MAX, -FLT_MAX);
     bool computeMinMax = false;
     for(Images::iterator itr = images.begin();
@@ -2116 +2102 @@
         ++itr)
     {
-#if 0    
-        osg::RefMatrix* matrix = dynamic_cast<osg::RefMatrix*>((*itr)->getUserData());
-        if (matrix)
-        {
-            std::cout<<"matrix = "<<*matrix<<std::endl;
-        }
-#endif
-        if (osgVolume::computeMinMax(itr->get(), minValue, maxValue)) computeMinMax = true;
-    }
-    
+        osg::Vec4 localMinValue, localMaxValue;
+        if (osgVolume::computeMinMax(itr->get(), localMinValue, localMaxValue))
+        {
+            if (localMinValue.r()<minValue.r()) minValue.r() = localMinValue.r();
+            if (localMinValue.g()<minValue.g()) minValue.g() = localMinValue.g();
+            if (localMinValue.b()<minValue.b()) minValue.b() = localMinValue.b();
+            if (localMinValue.a()<minValue.a()) minValue.a() = localMinValue.a();
+
+            if (localMaxValue.r()>maxValue.r()) maxValue.r() = localMaxValue.r();
+            if (localMaxValue.g()>maxValue.g()) maxValue.g() = localMaxValue.g();
+            if (localMaxValue.b()>maxValue.b()) maxValue.b() = localMaxValue.b();
+            if (localMaxValue.a()>maxValue.a()) maxValue.a() = localMaxValue.a();
+
+            osg::notify(osg::NOTICE)<<"  ("<<localMinValue<<") ("<<localMaxValue<<") "<<(*itr)->getFileName()<<std::endl;
+
+            computeMinMax = true;
+        }
+    }
     
     if (computeMinMax)
@@ -2189 +2183 @@
     
         osg::ref_ptr<osg::ImageSequence> imageSequence = new osg::ImageSequence;
+        imageSequence->setLength(10.0);
         image_3d = imageSequence.get();
         for(Images::iterator itr = images.begin();
@@ -2243 +2238 @@
     }
     
+    if (matrix && rootNode)
+    {
+        osg::MatrixTransform* mt = new osg::MatrixTransform;
+        mt->setMatrix(*matrix);
+        mt->addChild(rootNode);
+        
+        rootNode = mt;
+    }
+    
     if (!outputFile.empty())
     {