Changeset 99

Timestamp:

Jun 6, 2005, 10:34:42 AM (19 years ago)

Author:

darran

Message:

• global attribute now "texture" rather that "bedslope_image"

Location:

Swollen

Files:

• swollen/version.cpp (modified) (1 diff)
• swwreader/swwreader.cpp (modified) (1 diff)

Swollen/swollen/version.cpp

@@ -1 @@
-const char* version() { const char* s = "Revision: 87:88M"; return s; }
+const char* version() { const char* s = "Revision: 98M"; return s; }

Swollen/swwreader/swwreader.cpp

@@ -74 +74 @@
 
 
-        // sww file can optionally contain bedslope texture image filename
-        size_t attlen; // length of text attribute (if it exists)
-        if( nc_inq_attlen(_ncid, NC_GLOBAL, "bedslope_image", &attlen) != NC_ENOTATT )
-        {
-        char* filename;
-        if( (filename = (char*) malloc(attlen+1)) != NULL){
-            int status;
-                status = nc_get_att_text(_ncid, NC_GLOBAL, "bedslope_image", filename);
-            if( status == NC_NOERR )
-            {
-                filename[attlen] = '\0';  // ensure string is terminated, not a requirement for netcdf attributes
-                osg::notify(osg::INFO) << "[SWWReader] embedded image filename: " << filename <<  std::endl;
-                        setBedslopeTexture( std::string(filename) );
-            }
-        free( filename );
-        }
-        }
+    // sww file can optionally contain bedslope texture image filename
+    size_t attlen; // length of text attribute (if it exists)
+    if( nc_inq_attlen(_ncid, NC_GLOBAL, "texture", &attlen) != NC_ENOTATT )
+    {
+       char* filename;
+       if( (filename = (char*) malloc(attlen+1)) != NULL){
+          int status;
+          status = nc_get_att_text(_ncid, NC_GLOBAL, "texture", filename);
+          if( status == NC_NOERR )
+          {
+             filename[attlen] = '\0';  // ensure string is terminated, not a requirement for netcdf attributes
+             osg::notify(osg::INFO) << "[SWWReader] embedded image filename: " << filename <<  std::endl;
+             setBedslopeTexture( std::string(filename) );
+          }
+          free( filename );
+       }
+    }
 
     // loop index