Changeset 6084 for geovis

Timestamp:

Mar 1, 2016 1:55:42 PM (8 years ago)

Author:

ldelgass

Message:

Quiet log output from info to trace, now that frame tracing has a separate
define.

Location:

geovis/trunk

Files:

• Picker.cpp (modified) (7 diffs)
• Placard.cpp (modified) (4 diffs)
• Renderer.cpp (modified) (15 diffs)
• RendererCmd.cpp (modified) (15 diffs)

geovis/trunk/Picker.cpp

@@ -94 +94 @@
     osgEarth::Features::FeatureIndex *index = osgEarth::Registry::objectIndex()->get<osgEarth::Features::FeatureIndex>(id);
     osgEarth::Features::Feature *feature = index ? index->getFeature(id) : 0L;
-    INFO("Hover hit");
+    TRACE("Hover hit");
     if (feature) {
-        INFO("Hit feature ID: %lu (of %d), oid: %lu", feature->getFID(), index->size(), id);
+        TRACE("Hit feature ID: %lu (of %d), oid: %lu", feature->getFID(), index->size(), id);
         const osgEarth::Features::AttributeTable &attrs = feature->getAttrs();
         for (osgEarth::Features::AttributeTable::const_iterator itr = attrs.begin(); itr != attrs.end(); ++itr) {
-            INFO(" attr: %s", itr->first.c_str());
+            TRACE(" attr: %s", itr->first.c_str());
             switch (itr->second.first) {
             case osgEarth::Features::ATTRTYPE_STRING:
-                INFO(" value: %s", itr->second.getString().c_str());
+                TRACE(" value: %s", itr->second.getString().c_str());
                 break;
             case osgEarth::Features::ATTRTYPE_INT:
-                INFO(" value: %d", itr->second.getInt());
+                TRACE(" value: %d", itr->second.getInt());
                 break;
             case osgEarth::Features::ATTRTYPE_DOUBLE:
-                INFO(" value: %g", itr->second.getDouble());
+                TRACE(" value: %g", itr->second.getDouble());
                 break;
             case osgEarth::Features::ATTRTYPE_BOOL:
-                INFO(" value: %s", itr->second.getBool() ? "true" : "false");
+                TRACE(" value: %s", itr->second.getBool() ? "true" : "false");
                 break;
             default:
-                INFO(" value: unknown type");
+                TRACE(" value: unknown type");
             }
         }
-        //INFO("Feature name: %s", feature->getString("name").c_str());
+        //TRACE("Feature name: %s", feature->getString("name").c_str());
     } else {
         osgEarth::Annotation::AnnotationNode* anno =
@@ -129 +129 @@
         }
         if (anno != NULL && anno->getDecoration().empty()) {
-            INFO("Hit AnnotationNode: %p", anno);
+            TRACE("Hit AnnotationNode: %p", anno);
 #if 0
             if (hovered.find(anno) == hovered.end()) {
@@ -153 +153 @@
 void HoverCallback::onMiss()
 {
-    INFO("Hover miss");
+    TRACE("Hover miss");
     std::set<osgEarth::Annotation::AnnotationNode*> toUnHover;
     std::set<osgEarth::Annotation::AnnotationNode*>& hovered = _renderer->getHovered();
@@ -189 +189 @@
     osgEarth::Features::FeatureIndex *index = osgEarth::Registry::objectIndex()->get<osgEarth::Features::FeatureIndex>(id);
     osgEarth::Features::Feature *feature = index ? index->getFeature(id) : 0L;
-    INFO("Select hit oid: %lu at %g,%g", id, _pickPoint.x(), _pickPoint.y());
+    TRACE("Select hit oid: %lu at %g,%g", id, _pickPoint.x(), _pickPoint.y());
     if (feature) {
         osgEarth::Features::FeatureSourceIndex *fsi = dynamic_cast<osgEarth::Features::FeatureSourceIndex *>(index);
@@ -199 +199 @@
             }
         }
-        INFO("Hit feature ID: %lu (of %d) layer: %s", feature->getFID(), index->size(), layerName.c_str());
+        TRACE("Hit feature ID: %lu (of %d) layer: %s", feature->getFID(), index->size(), layerName.c_str());
 
         _renderer->clearSelection();
@@ -213 +213 @@
             osgEarth::Registry::objectIndex()->get<osgEarth::Annotation::AnnotationNode>(id);
         if (anno != NULL) {
-            INFO("Hit AnnotationNode: %p, \"%s\"", anno, anno->getName().c_str());
+            TRACE("Hit AnnotationNode: %p, \"%s\"", anno, anno->getName().c_str());
             char mesg[256];
             snprintf(mesg, sizeof(mesg), "nv>select annotation %u {%s}\n", id, anno->getName().c_str());
@@ -227 +227 @@
 void SelectCallback::onMiss()
 {
-    INFO("Select miss");
+    TRACE("Select miss");
     _renderer->clearSelection();
 

geovis/trunk/Placard.cpp

@@ -64 +64 @@
         placardConf.getEntry(i, name, label);
         oss << label << ": ";
-        INFO(" attr: %s '%s'", name.c_str(), label.c_str());
+        TRACE(" attr: %s '%s'", name.c_str(), label.c_str());
         osgEarth::Features::AttributeTable::const_iterator itr = _attrs.find(name);
         if (itr == _attrs.end())
@@ -70 +70 @@
         switch (itr->second.first) {
         case osgEarth::Features::ATTRTYPE_STRING:
-            INFO(" value: %s", itr->second.getString().c_str());
+            TRACE(" value: %s", itr->second.getString().c_str());
             oss << itr->second.getString() << std::endl;
             break;
         case osgEarth::Features::ATTRTYPE_INT:
-            INFO(" value: %d", itr->second.getInt());
+            TRACE(" value: %d", itr->second.getInt());
             oss << itr->second.getInt() << std::endl;
             break;
         case osgEarth::Features::ATTRTYPE_DOUBLE:
-            INFO(" value: %g", itr->second.getDouble());
+            TRACE(" value: %g", itr->second.getDouble());
             oss << itr->second.getDouble() << std::endl;
             break;
         case osgEarth::Features::ATTRTYPE_BOOL:
-            INFO(" value: %s", itr->second.getBool() ? "true" : "false");
+            TRACE(" value: %s", itr->second.getBool() ? "true" : "false");
             oss << (itr->second.getBool() ? "true" : "false") << std::endl;
             break;
@@ -113 +113 @@
         placardConf.getEntry(i, name, label);
         oss << label << ": ";
-        INFO(" attr: %s '%s'", name.c_str(), label.c_str());
+        TRACE(" attr: %s '%s'", name.c_str(), label.c_str());
         osgEarth::Features::AttributeTable::const_iterator itr = _attrs.find(name);
         if (itr == _attrs.end())
@@ -119 +119 @@
         switch (itr->second.first) {
         case osgEarth::Features::ATTRTYPE_STRING:
-            INFO(" value: %s", itr->second.getString().c_str());
+            TRACE(" value: %s", itr->second.getString().c_str());
             oss << itr->second.getString() << std::endl;
             break;
         case osgEarth::Features::ATTRTYPE_INT:
-            INFO(" value: %d", itr->second.getInt());
+            TRACE(" value: %d", itr->second.getInt());
             oss << itr->second.getInt() << std::endl;
             break;
         case osgEarth::Features::ATTRTYPE_DOUBLE:
-            INFO(" value: %g", itr->second.getDouble());
+            TRACE(" value: %g", itr->second.getDouble());
             oss << itr->second.getDouble() << std::endl;
             break;
         case osgEarth::Features::ATTRTYPE_BOOL:
-            INFO(" value: %s", itr->second.getBool() ? "true" : "false");
+            TRACE(" value: %s", itr->second.getBool() ? "true" : "false");
             oss << (itr->second.getBool() ? "true" : "false") << std::endl;
             break;

geovis/trunk/Renderer.cpp

@@ -1748 +1748 @@
             pt.y() >= _latMin && pt.y() <= _latMax) {
             if (_renderer->select(placeNode)) {
-                INFO("Select PlaceNode: %g %g n:'%s' t:'%s'",
+                TRACE("Select PlaceNode: %g %g n:'%s' t:'%s'",
                      pt.x(), pt.y(), placeNode->getName().c_str(),
                      placeNode->getText().c_str());
@@ -1924 +1924 @@
     }
     if (_picker->pick(_viewer.get(), mouseX, mouseY)) {
-        INFO("Hover pick queued: %g %g", mouseX, mouseY);
-    } else {
-        INFO("Failed to queue pick: %g %g", mouseX, mouseY);
+        TRACE("Hover pick queued: %g %g", mouseX, mouseY);
+    } else {
+        TRACE("Failed to queue pick: %g %g", mouseX, mouseY);
     }
 }
@@ -2344 +2344 @@
                 ext = ts->getProfile()->getExtent();
             }
-            INFO("Image layer %s srs: %s extent: %g %g %g %g",
+            TRACE("Image layer %s srs: %s extent: %g %g %g %g",
                  name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
                  ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
@@ -2369 +2369 @@
                 ext = ts->getProfile()->getExtent();
             }
-            INFO("Elevation Layer %s srs: %s extent: %g %g %g %g",
+            TRACE("Elevation Layer %s srs: %s extent: %g %g %g %g",
                  name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
                  ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
@@ -2401 +2401 @@
                 return false;
             }
-            INFO("Model Layer %s srs: %s extent: %g %g %g %g",
+            TRACE("Model Layer %s srs: %s extent: %g %g %g %g",
                  name, ext.getSRS() ? ext.getSRS()->getName().c_str() : "nil",
                  ext.xMin(), ext.yMin(), ext.xMax(), ext.yMax());
@@ -2453 +2453 @@
     osgEarth::Units distanceUnits = getMapSRS()->getUnits();
     if (getMapSRS()->isProjected() && !getMapSRS()->isPlateCarre()) {
-        INFO("Projected");
+        TRACE("Projected");
         osg::ref_ptr<const osgEarth::SpatialReference> fromSRS = 
             srs ? srs : osgEarth::SpatialReference::create("wgs84");
@@ -2461 +2461 @@
         _viewer->getCamera()->getProjectionMatrixAsPerspective(fovy, aspect, near, far);
         distance = height / (2. * tan(osg::DegreesToRadians(fovy)/2.));
-        INFO("fov: %g a: %g n: %g f: %g (%g, %g, %g, %g)", fovy, aspect, near, far, x1, y1, x2, y2);
+        TRACE("fov: %g a: %g n: %g f: %g (%g, %g, %g, %g)", fovy, aspect, near, far, x1, y1, x2, y2);
         x = x1 + (x2 - x1)/2.0;
         y = y1 + (y2 - y1)/2.0;
-        INFO("x: %g y: %g, dist: %g", x, y, distance);
+        TRACE("x: %g y: %g, dist: %g", x, y, distance);
     } else if (getMapSRS()->isGeographic() && !getMapSRS()->isPlateCarre()) {
         // World coords are ECEF
-        INFO("Geocentric");
+        TRACE("Geocentric");
         osg::ref_ptr<const osgEarth::SpatialReference> fromSRS =
             srs ? srs : osgEarth::SpatialReference::create("wgs84");
         fromSRS->transformExtentToMBR(getMapSRS(), x1, y1, x2, y2);
-        INFO("(%g, %g, %g, %g)", x1, y1, x2, y2);
+        TRACE("(%g, %g, %g, %g)", x1, y1, x2, y2);
         // These are angular units
         x = x1 + (x2 - x1)/2.0;
@@ -2485 +2485 @@
         // point on line between top and bottom points
         world4 = world1 + (world2 - world1)/2.0;
-        INFO("world1: %g,%g,%g world2: %g,%g,%g",
+        TRACE("world1: %g,%g,%g world2: %g,%g,%g",
              world1.x(), world1.y(), world1.z(),
              world2.x(), world2.y(), world2.z());
-        INFO("world3: %g,%g,%g world4: %g,%g,%g",
+        TRACE("world3: %g,%g,%g world4: %g,%g,%g",
              world3.x(), world3.y(), world3.z(),
              world4.x(), world4.y(), world4.z());
@@ -2498 +2498 @@
         if (distance < 0.0) distance = 0.0;
         distanceUnits = osgEarth::Units::METERS;
-        INFO("fov: %g a: %g n: %g f: %g (%g, %g, %g, %g)", fovy, aspect, near, far, x1, y1, x2, y2);
-        INFO("x: %g y: %g, dist: %g", x, y, distance);
+        TRACE("fov: %g a: %g n: %g f: %g (%g, %g, %g, %g)", fovy, aspect, near, far, x1, y1, x2, y2);
+        TRACE("x: %g y: %g, dist: %g", x, y, distance);
     } else {
         assert(getMapSRS()->isPlateCarre());
@@ -2505 +2505 @@
         return;
     }
-    INFO("Map units: %d", getMapSRS()->getUnits().getType());
+    TRACE("Map units: %d", getMapSRS()->getUnits().getType());
     osgEarth::Viewpoint vpt;
     vpt.focalPoint()->set(getMapSRS(), x, y, 0.0, osgEarth::ALTMODE_ABSOLUTE);
@@ -2525 +2525 @@
     osgEarth::Units distanceUnits = extent.getSRS()->getUnits();
     if (extent.getSRS()->isProjected() && !extent.getSRS()->isPlateCarre()) {
-        INFO("Projected");
+        TRACE("Projected");
         double height = y2 - y1;
         double fovy, aspect, near, far;
         _viewer->getCamera()->getProjectionMatrixAsPerspective(fovy, aspect, near, far);
         distance = height / (2. * tan(osg::DegreesToRadians(fovy)/2.));
-        INFO("fov: %g a: %g n: %g f: %g (%g, %g, %g, %g)", fovy, aspect, near, far, x1, y1, x2, y2);
+        TRACE("fov: %g a: %g n: %g f: %g (%g, %g, %g, %g)", fovy, aspect, near, far, x1, y1, x2, y2);
         x = x1 + (x2 - x1)/2.0;
         y = y1 + (y2 - y1)/2.0;
-        INFO("x: %g y: %g, dist: %g", x, y, distance);
+        TRACE("x: %g y: %g, dist: %g", x, y, distance);
     } else if (extent.getSRS()->isGeographic() && !extent.getSRS()->isPlateCarre()) {
         // World coords are ECEF
-        INFO("Geocentric");
-        INFO("(%g, %g, %g, %g)", x1, y1, x2, y2);
+        TRACE("Geocentric");
+        TRACE("(%g, %g, %g, %g)", x1, y1, x2, y2);
         // These are angular units
         x = x1 + (x2 - x1)/2.0;
@@ -2558 +2558 @@
         if (distance < 0.0) distance = 0.0;
         distanceUnits = osgEarth::Units::METERS;
-        INFO("fov: %g a: %g n: %g f: %g (%g, %g, %g, %g)", fovy, aspect, near, far, x1, y1, x2, y2);
-        INFO("x: %g y: %g, dist: %g", x, y, distance);
+        TRACE("fov: %g a: %g n: %g f: %g (%g, %g, %g, %g)", fovy, aspect, near, far, x1, y1, x2, y2);
+        TRACE("x: %g y: %g, dist: %g", x, y, distance);
     } else {
         assert(extent.getSRS()->isPlateCarre());
@@ -3041 +3041 @@
         }
     } else if (proto == "local") {
-        INFO("Local protocol: '%s'", getLocalFilePath(url).c_str());
+        TRACE("Local protocol: '%s'", getLocalFilePath(url).c_str());
         std::ostringstream oss;
         oss << getCacheDirectory() << "/" << getLocalFilePath(url);
         retStr = oss.str();
     } else if (proto == "file") {
-        INFO("File: '/%s'", osgDB::getServerFileName(url).c_str());
+        TRACE("File: '/%s'", osgDB::getServerFileName(url).c_str());
         std::ostringstream oss;
         oss << "/" <<  osgDB::getServerFileName(url);
@@ -3052 +3052 @@
     } else if (proto == "idata") {
         std::string fileName = osgDB::getServerFileName(url);
-        INFO("IData protocol: coll: '%s', '%s'", osgDB::getServerAddress(url).c_str(), fileName.c_str());
+        TRACE("IData protocol: coll: '%s', '%s'", osgDB::getServerAddress(url).c_str(), fileName.c_str());
         int collection = atoi(osgDB::getServerAddress(url).c_str());
         {
@@ -3071 +3071 @@
         }
     } else {
-        INFO("Protocol: '%s' url: '%s'", proto.c_str(), url.c_str());
+        TRACE("Protocol: '%s' url: '%s'", proto.c_str(), url.c_str());
         retStr = url;
     }

geovis/trunk/RendererCmd.cpp

@@ -973 +973 @@
     fullPath << g_renderer->getCacheDirectory() << "/" << dirPath;
     if (!dirPath.empty()) {
-        INFO("Make dir: %s", fullPath.str().c_str());
+        TRACE("Make dir: %s", fullPath.str().c_str());
         osgDB::makeDirectory(fullPath.str());
         fullPath << "/";
@@ -986 +986 @@
     fclose(fp);
     free(data);
-    INFO("Wrote %d bytes to %s", bytesWritten, fullPath.str().c_str());
+    TRACE("Wrote %d bytes to %s", bytesWritten, fullPath.str().c_str());
     return (bytesWritten == size) ? TCL_OK : TCL_ERROR;
 }
@@ -1388 +1388 @@
             osgEarth::Config styleConf("style", Tcl_GetString(objv[12]));
             styleConf.add("type", "text/css");
-            INFO("style CSS: %s", styleConf.value().c_str());
+            TRACE("style CSS: %s", styleConf.value().c_str());
             osgEarth::Config stylesheetConf;
             stylesheetConf.add(styleConf);
@@ -1399 +1399 @@
                 std::string scripts(Tcl_GetString(objv[13]));
                 if (!scripts.empty()) {
-                    INFO("script: %s", scripts.c_str());
+                    TRACE("script: %s", scripts.c_str());
                     osg::ref_ptr<osgEarth::Symbology::StyleSheet::ScriptDef> scriptDef = 
                         new osgEarth::Symbology::StyleSheet::ScriptDef(scripts);
                     aggOpts.styles()->setScript(scriptDef.get());
                 } else {
-                    INFO("no script");
+                    TRACE("no script");
                 }
             }
@@ -1426 +1426 @@
                         char *value = Tcl_GetString(fields[f+1]);
                         fieldMap[name] = value;
-                        INFO("selector[%s] = %s", name, value);
+                        TRACE("selector[%s] = %s", name, value);
                     }
                     osgEarth::Symbology::StyleSelector ss;
@@ -1439 +1439 @@
                     itr = fieldMap.find("styleExpression");
                     if (itr != fieldMap.end()) {
-                        INFO("selector: %s", itr->second.c_str());
+                        TRACE("selector: %s", itr->second.c_str());
                         ss.styleExpression() = osgEarth::Symbology::StringExpression(itr->second);
                     }
@@ -1456 +1456 @@
                                 return TCL_ERROR;
                             }
-                            INFO("query bounds: %g %g %g %g", xmin, ymin, xmax, ymax);
+                            TRACE("query bounds: %g %g %g %g", xmin, ymin, xmax, ymax);
                             query.bounds() = osgEarth::Bounds(xmin, ymin, xmax, ymax);
                         }
@@ -1680 +1680 @@
         osgEarth::Config styleConf("style", Tcl_GetString(objv[10]));
         styleConf.add("type", "text/css");
-        INFO("style CSS: %s", styleConf.value().c_str());
+        TRACE("style CSS: %s", styleConf.value().c_str());
 #if 1
         geomOpts.styles() = new osgEarth::Symbology::StyleSheet();
@@ -1694 +1694 @@
             osgEarth::Symbology::Style style(blockConf);
 
-            INFO("Style: %s", style.getName().c_str());
-            INFO("%s", itr->c_str());
+            TRACE("Style: %s", style.getName().c_str());
+            TRACE("%s", itr->c_str());
 
             if (style.has<osgEarth::Symbology::IconSymbol>()) {
-                INFO("Found icon symbol");
+                TRACE("Found icon symbol");
                 osgEarth::Symbology::IconSymbol *is =
                     style.get<osgEarth::Symbology::IconSymbol>();
                 if (is->url().isSet()) {
-                    INFO("Icon url before: expr: '%s' eval: '%s'",
+                    TRACE("Icon url before: expr: '%s' eval: '%s'",
                          is->url()->expr().c_str(), is->url()->eval().c_str());
                     // eval() will try to evaluate the expr()
@@ -1708 +1708 @@
                     //setInfix() to set the expr() string, setLiteral() will quote
                     is->url()->setLiteral(path);
-                    INFO("Icon url after: %s", path.c_str());
+                    TRACE("Icon url after: %s", path.c_str());
                 }
             }
@@ -1734 +1734 @@
             std::string scripts(Tcl_GetString(objv[11]));
             if (!scripts.empty()) {
-                INFO("script: %s", scripts.c_str());
+                TRACE("script: %s", scripts.c_str());
                 osg::ref_ptr<osgEarth::Symbology::StyleSheet::ScriptDef> scriptDef = 
                     new osgEarth::Symbology::StyleSheet::ScriptDef(scripts);
                 geomOpts.styles()->setScript(scriptDef.get());
             } else {
-                INFO("no script");
+                TRACE("no script");
             }
         }
@@ -1748 +1748 @@
                 return TCL_ERROR;
             }
-            INFO("Num Selectors: %d", numSelectors);
+            TRACE("Num Selectors: %d", numSelectors);
             for (int i = 0; i < numSelectors; i++) {
                 int numFields;
@@ -1762 +1762 @@
                     char *value = Tcl_GetString(fields[f+1]);
                     fieldMap[name] = value;
-                    INFO("selector[%s] = %s", name, value);
+                    TRACE("selector[%s] = %s", name, value);
                 }
                 osgEarth::Symbology::StyleSelector ss;
@@ -1775 +1775 @@
                 itr = fieldMap.find("styleExpression");
                 if (itr != fieldMap.end()) {
-                    INFO("selector: %s", itr->second.c_str());
+                    TRACE("selector: %s", itr->second.c_str());
                     ss.styleExpression() = osgEarth::Symbology::StringExpression(itr->second);
                 }
@@ -1792 +1792 @@
                             return TCL_ERROR;
                         }
-                        INFO("query bounds: %g %g %g %g", xmin, ymin, xmax, ymax);
+                        TRACE("query bounds: %g %g %g %g", xmin, ymin, xmax, ymax);
                         query.bounds() = osgEarth::Bounds(xmin, ymin, xmax, ymax);
                     }