FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted osg::notify to OSG_INFO etc.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-28 17:08:10 +00:00
parent f90ca548ee
commit 72c9b2543e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/shp/ESRIShapeParser.cpp
View File

@@ -217,7 +217,7 @@ void ESRIShapeParser::_combinePointToMultipoint()
{
if( !_valid ) return;
osg::notify(osg::NOTICE)<<"_combinePointToMultipoint()"<<std::endl;
OSG_NOTICE<<"_combinePointToMultipoint()"<<std::endl;
ArrayHelper coords(_useDouble);
@@ -587,7 +587,7 @@ void ESRIShapeParser::_process( const std::vector<ESRIShape::MultiPatch> &mpatch
p->partTypes[i] == InnerRing ||
p->partTypes[i] == FirstRing || p->partTypes[i] == Ring )
{
osg::notify(osg::WARN) << "ESRIShapeParser - MultiPatch type " <<
OSG_WARN << "ESRIShapeParser - MultiPatch type " <<
(p->partTypes[i] == TriangleStrip ? "TriangleStrip":
p->partTypes[i] == TriangleFan ? "TriangleFan":
p->partTypes[i] == OuterRing ? "OuterRing":

2
src/osgPlugins/shp/ESRIShapeReaderWriter.cpp
View File

@@ -59,7 +59,7 @@ class ESRIShapeReaderWriter : public osgDB::ReaderWriter
{
if (sp.getGeode()->getNumDrawables() != xbp.getAttributeList().size())
{
osg::notify(osg::WARN) << "ESRIShape loader : .dbf file containe different record number that .shp file." << std::endl
OSG_WARN << "ESRIShape loader : .dbf file containe different record number that .shp file." << std::endl
<< " .dbf record skipped." << std::endl;
}
else

6
src/osgPlugins/shp/XBaseParser.cpp
View File

@@ -21,7 +21,7 @@ namespace ESRIShape
void XBaseHeader::print()
{
osg::notify(osg::INFO) << "VersionNumber = " << (int) _versionNumber << std::endl
OSG_INFO << "VersionNumber = " << (int) _versionNumber << std::endl
<< "LastUpdate = " << 1900 + (int) _lastUpdate[0] << "/" << (int) _lastUpdate[1] << "/" << (int) _lastUpdate[2] << std::endl
<< "NumRecord = " << _numRecord << std::endl
<< "HeaderLength = " << _headerLength << std::endl
@@ -51,7 +51,7 @@ bool XBaseHeader::read(int fd)
void XBaseFieldDescriptor::print()
{
osg::notify(osg::INFO) << "name = " << _name << std::endl
OSG_INFO << "name = " << _name << std::endl
<< "type = " << _fieldType << std::endl
<< "length = " << (int) _fieldLength << std::endl
<< "decimalCount = " << (int) _decimalCount << std::endl
@@ -191,7 +191,7 @@ bool XBaseParser::parse(int fd)
}
default:
{
osg::notify(osg::WARN) << "ESRIShape::XBaseParser : record type "
OSG_WARN << "ESRIShape::XBaseParser : record type "
<< it->_fieldType << "not supported, skipped" << std::endl;
shapeAttributeList->push_back(osgSim::ShapeAttribute((const char *) it->_name, (double) 0));
break;