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

Timestamp:

09/15/08 21:59:12 (5 years ago)

Author:

robert

Message:

Added optional usage of DCMTK in the dicom plugin

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -438 +438 @@
         GLenum pixelFormat = image->getPixelFormat();
         if (pixelFormat==GL_ALPHA || 
+            pixelFormat==GL_INTENSITY || 
             pixelFormat==GL_LUMINANCE || 
             pixelFormat==GL_LUMINANCE_ALPHA || 
@@ -520 +521 @@
         if (pixelFormat==GL_ALPHA || 
             pixelFormat==GL_LUMINANCE || 
+            pixelFormat==GL_INTENSITY || 
             pixelFormat==GL_LUMINANCE_ALPHA || 
             pixelFormat==GL_RGB || 
@@ -1850 +1852 @@
         {
             std::string filename = arguments[pos];
-            
-            osgDB::FileType fileType = osgDB::fileType(filename);
-            if (fileType == osgDB::FILE_NOT_FOUND)
+            if (osgDB::getLowerCaseFileExtension(filename)=="dicom")
             {
-                filename = osgDB::findDataFile(filename);
-                fileType = osgDB::fileType(filename);
-            }
-            
-            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)
-                {
-                    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;
-                image_3d = createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo);
-
-            }
-            else if (fileType == osgDB::REGULAR_FILE)
-            {
-                // not an option so assume string is a filename.
                 image_3d = osgDB::readImageFile( filename );
             }
             else
             {
-                osg::notify(osg::NOTICE)<<"Error: could not find file: "<<filename<<std::endl;
-                return 1;
-            }
-            
+                osgDB::FileType fileType = osgDB::fileType(filename);
+                if (fileType == osgDB::FILE_NOT_FOUND)
+                {
+                    filename = osgDB::findDataFile(filename);
+                    fileType = osgDB::fileType(filename);
+                }
+
+                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)
+                    {
+                        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;
+                    image_3d = createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo);
+
+                }
+                else if (fileType == osgDB::REGULAR_FILE)
+                {
+                    // not an option so assume string is a filename.
+                    image_3d = osgDB::readImageFile( filename );
+                }
+                else
+                {
+                    osg::notify(osg::NOTICE)<<"Error: could not find file: "<<filename<<std::endl;
+                    return 1;
+                }
+            }            
         }
     }