Changeset 975 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

05/22/06 18:32:12 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• GzBinFileInputStream.cpp (modified) (5 diffs)
• GzBinFileInputStream.h (modified) (2 diffs)
• GzFileInputSource.cpp (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (7 diffs)
• ViewCellsParser.cpp (modified) (13 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Environment.cpp

@@ -804 +804 @@
 bool
 Environment::ReadEnvFile(const char *envFilename)
-{Debug << "here222 " << envFilename << endl;
+{
   char buff[MaxStringLength], name[MaxStringLength];
   char *s, *t;

GTP/trunk/Lib/Vis/Preprocessing/src/GzBinFileInputStream.cpp

@@ -66 +66 @@
 
 #include "GzBinFileInputStream.h"
+#include "common.h"
 
 XERCES_CPP_NAMESPACE_BEGIN
@@ -74 +75 @@
 GzBinFileInputStream::GzBinFileInputStream(const XMLCh* const fileName
                                        , MemoryManager* const manager) :
-
-    //fSource(0) , 
-fMemoryManager(manager)
+//fSource(0) ,
+fMemoryManager(manager),
+mCurrentPos(0)
 {
         // Try to open the file
-    //fSource = XMLPlatformUtils::openFile((unsignedfileName, manager);
+    //fSource = XMLPlatformUtils::openFile(fileName, manager);
+        // todo: delete xmlstring
         char *myFileName = XMLString::transcode(fileName);
+        //mStream.open(myFileName, ios::binary);
         mStream.open(myFileName);
 }
@@ -86 +89 @@
 GzBinFileInputStream::GzBinFileInputStream(const char* const fileName,
                                                                                    MemoryManager* const manager) :
-fMemoryManager(manager)
+fMemoryManager(manager),
+mCurrentPos(0)
 {
     // Try to open the file
+        //mStream.open(fileName, ios::binary);
         mStream.open(fileName);
 }
@@ -123 +128 @@
 unsigned int GzBinFileInputStream::curPos() const
 {
-    return XMLPlatformUtils::curFilePos(fSource, fMemoryManager);
+    //return XMLPlatformUtils::curFilePos(fSource, fMemoryManager);
+        return mCurrentPos;
 }
 
-unsigned int
-GzBinFileInputStream::readBytes(          XMLByte* const  toFill
-                                , const unsigned int    maxToRead)
+unsigned int GzBinFileInputStream::readBytes(XMLByte* const  toFill, 
+                                                                                         const unsigned int maxToRead)
 {
     //
@@ -134 +139 @@
     //  actually read.
     //
-    //return XMLPlatformUtils::readFileBuffer(fSource, maxToRead, toFill, fMemoryManager);
-        mStream.getline((char *)toFill, maxToRead);
-        return mStream.gcount();
+    //unsigned int result = XMLPlatformUtils::readFileBuffer(fSource, maxToRead, toFill, fMemoryManager);
+        mStream.read((char *)toFill, maxToRead);
+        
+        unsigned int result = mStream.gcount();
+        mCurrentPos = mStream.tellg();
+        //GtpVisibilityPreprocessor::Debug << "here1001 " << maxToRead << " haha " << toFill << " " << result << endl;
+
+        return result;
 }
 

GTP/trunk/Lib/Vis/Preprocessing/src/GzBinFileInputStream.h

@@ -61 +61 @@
 
 XERCES_CPP_NAMESPACE_BEGIN
-//0699/15227486
+
 class /*XMLUTIL_EXPORT*/ GzBinFileInputStream : public BinInputStream
 {
@@ -105 +105 @@
         igzstream mStream;
 
+        unsigned int mCurrentPos;
 private :
     // -----------------------------------------------------------------------

GTP/trunk/Lib/Vis/Preprocessing/src/GzFileInputSource.cpp

@@ -83 +83 @@
 //  LocalFileInputSource: Constructors and Destructor
 // ---------------------------------------------------------------------------
-GzFileInputSource::GzFileInputSource( const XMLCh* const basePath
-                             , const XMLCh* const relativePath
-                             , MemoryManager* const manager)
-    : LocalFileInputSource(basePath, relativePath, manager)
+GzFileInputSource::GzFileInputSource(const XMLCh* const basePath, 
+                                                                         const XMLCh* const relativePath, 
+                                                                         MemoryManager* const manager)
+: LocalFileInputSource(basePath, relativePath, manager)
 {
 }
@@ -92 +92 @@
 GzFileInputSource::GzFileInputSource(const XMLCh* const filePath,
                                                                          MemoryManager* const manager)
-    : LocalFileInputSource(filePath, manager)
+: LocalFileInputSource(filePath, manager)
 {
 }
@@ -108 +108 @@
 {
         GzBinFileInputStream* retStrm = new (getMemoryManager()) GzBinFileInputStream(getSystemId(), getMemoryManager());
+
         if (!retStrm->getIsOpen())
     {

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -2759 +2759 @@
         stream.open(filename.c_str());
         stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"<<endl;
-        stream << "<Visibility_Solution>" << endl;
+        stream << "<VisibilitySolution>" << endl;
 
         //-- the view space bounding box
@@ -2767 +2767 @@
 
         //-- the type of the view cells hierarchy
-        //stream << "<Hierarchy name=\"bspTree\" />" << endl;
+        
         // NOTE: load in vsp bsp here because bsp and vsp bsp can use same tree and vsp bsp is bug free
-        stream << "<Hierarchy name=\"vspBspTree\" />" << endl; 
+        stream << "<Hierarchy name=\"vspBspTree\" >" << endl; 
         
         //-- load the view cells itself, i.e., the ids and the pvs
@@ -2783 +2783 @@
         stream << endl << "</Hierarchy>" << endl;
 
-        stream << "</Visibility_Solution>" << endl;
+        stream << "</VisibilitySolution>" << endl;
         stream.close();
 
@@ -4715 +4715 @@
 
         ViewCellsManager *vm = NULL;
-Debug << "here98 " << filename << endl;
+
         if (parser.ParseFile(filename, &vm, objects, bconverter, env))
         {
@@ -4763 +4763 @@
 
         stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"<<endl;
-        stream << "<Visibility_Solution>" << endl;
+        stream << "<VisibilitySolution>" << endl;
 
         //-- the view space bounding box
@@ -4791 +4791 @@
 
         //-- export the view cells and the pvs
+        stream << "<HierarchyType name=\"vspBspTree\" />" << endl;
+
         const int numViewCells = mCurrentViewCellsStats.viewCells;
 
@@ -4803 +4805 @@
         
         // the type of the view cells hierarchy
-        stream << "<Hierarchy name=\"vspBspTree\" />" << endl;
+        stream << "<Hierarchy>" << endl;
         mVspBspTree->Export(stream);
         stream << endl << "</Hierarchy>" << endl;
 
-
-
-        stream << "</Visibility_Solution>" << endl;
+        stream << "</VisibilitySolution>" << endl;
 
 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp

@@ -83 +83 @@
   , mBoundingBoxConverter(bconverter)
   , mEnvironment(env)
-{Debug << "here22" << endl;
-        // mObjects = objects;
+{
 }
 
@@ -117 +116 @@
   else
   {
-        if (element == "Interior")
+          if (element == "Interior")
                   EndBspInterior();
   }
@@ -127 +126 @@
         // go one up in the tree
         if (mCurrentBspNode->GetParent())
-        {       Debug << "öaaaaaaaaaaaa]";
+        {       Debug << "]";
                 mCurrentBspNode = mCurrentBspNode->GetParent();
         }
@@ -153 +152 @@
         // sort view cells to help associating view cells according to their id
         stable_sort(mViewCells.begin(), mViewCells.end(), vlt);
+        mParseViewCells = false;
 }
 
@@ -165 +165 @@
                 mBoundingBoxConverter->IdentifyObjects(mIBoundingBoxes, *mObjects);
 
-        Debug << "\nconverted bounding boxes to objects in"
+        Debug << "\nconverted bounding boxes to objects in "
                   << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 }
@@ -210 +210 @@
 void ViewCellsParseHandlers::startElement(const XMLCh* const name,
                                                                                   AttributeList& attributes)
-{       Debug << "here722" << endl;
+{
         StrX lname(name);
         string element(lname.LocalForm());
 
-        // decides the used view cell hierarchy
+
         if (element == "ViewCells")
         {
@@ -221 +221 @@
         }
 
-        if (element == "Hierarchy")
-        {
-                Debug << "parsing spatial hierarchy" << endl;
-                mParseViewCells = false;
+        // decides about the view cell hierarchy
+        if (element == "HierarchyType")
+        //if (element == "Hierarchy")
+        {
+                //Debug << "parsing spatial hierarchy" << endl;
+                //mParseViewCells = false;
                 StartHierarchy(attributes);
         }
@@ -242 +244 @@
         }
 
-        // use different methods for the given view cell hierarchy types
+        
         if (!mParseViewCells)
         {
+                //-- use different methods for the given view cell hierarchy types
                 if (mViewCellsManager)
                 {
@@ -262 +265 @@
         else
         {
+                // interiors + leaves interpreted view cells else
                 if (element == "Interior") 
                 {
@@ -620 +624 @@
                 mViewCellsManager = new BspViewCellsManager(mBspTree, mEnvironment);
         }
-        else if (strcmp(name, "vspBspTree") == 0)
-        {
-                Debug << "view cell type: VspBsp" << endl;
-
-                mVspBspTree = new VspBspTree();
-                //mCurrentBspNode = mVspBspTree->GetRoot();
-                mViewCellsManager = new VspBspViewCellsManager(mVspBspTree, mEnvironment);
-
-                mVspBspTree->mBox = mViewSpaceBox;
-        }
+        
         else if (strcmp(name, "vspKdTree") == 0)
         {
@@ -637 +632 @@
                 mViewCellsManager = new VspKdViewCellsManager(mVspKdTree, mEnvironment);
         }
-        else
-        {
-                cerr << "Wrong view cells type: " << name << endl;
-                exit(1);
+        else // vspBspTree
+        {
+                Debug << "view cell type: VspBsp" << endl;
+
+                mVspBspTree = new VspBspTree();
+                //mCurrentBspNode = mVspBspTree->GetRoot();
+                mViewCellsManager = new VspBspViewCellsManager(mVspBspTree, mEnvironment);
+
+                mVspBspTree->mBox = mViewSpaceBox;
         }
 
@@ -720 +720 @@
     }
   
-  Debug << "here2" << endl;
   //
   //  Create a SAX parser object. Then, according to what we were told on
@@ -759 +758 @@
         
         GzFileInputSource isource(myFilePath);
-        Debug << "here4" << endl;
         parser->parse(isource);