Changeset 975 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp (modified) (13 diffs)

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);