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

Timestamp:

08/20/06 22:48:01 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -30 +30 @@
 #include "ViewCellsManager.h"
 #include "GzFileInputSource.h"
-#include "VspOspTree.h"
+#include "OspTree.h"
+#include "VspTree.h"
 #include "KdTree.h"
 
@@ -260 +261 @@
 }
 
-void ViewCellsParseHandlers::StartViewSpacePartitionElement(const std::string &element,
+void ViewCellsParseHandlers::StartViewSpaceHierarchyElement(const std::string &element,
                                                                                                                         AttributeList& attributes)
 {
@@ -283 +284 @@
 
 
-void ViewCellsParseHandlers::StartObjectSpacePartitionElement(const std::string &element,
+void ViewCellsParseHandlers::StartObjectSpaceHierarchyElement(const std::string &element,
                                                                                                                           AttributeList& attributes)
 {
@@ -340 +341 @@
 
         // decides about the view cell hierarchy
-        if (element == "ViewSpacePartition")
-        {
-                //StartViewSpacePartition(attributes);
+        if (element == "ViewSpaceHierarchy")
+        {
+                //StartViewSpaceHierarchy(attributes);
                 cout << "parsing view space partition" << endl;
                 mCurrentTask = PARSE_VSP;
@@ -348 +349 @@
 
         // decides about the view cell hierarchy
-        if (element == "ObjectSpacePartition")
-        {
-                //StartObjectSpacePartition(attributes);
+        if (element == "ObjectSpaceHierarchy")
+        {
+                //StartObjectSpaceHierarchy(attributes);
                 cout << "parsing object space partition" << endl;
                 mCurrentTask = PARSE_OSP;
@@ -373 +374 @@
         {
         case PARSE_VSP:
-                StartViewSpacePartitionElement(element, attributes);
+                StartViewSpaceHierarchyElement(element, attributes);
                 break;
         case PARSE_OSP:
-                StartObjectSpacePartitionElement(element, attributes);
+                StartObjectSpaceHierarchyElement(element, attributes);
                 break;
         case PARSE_VIEWCELLS: