Changeset 1109

Timestamp:

Aug 11, 2008, 8:59:06 PM (16 years ago)

Author:

dkearney

Message:

removing tabs

Location:

trunk

Files:

• lang/matlab/rpLibResult.cc (modified) (1 diff)
• packages/vizservers/nanovis/RpDX.cpp (modified) (12 diffs)
• src/core/RpDXWriter.h (modified) (1 diff)

trunk/lang/matlab/rpLibResult.cc

@@ -3 +3 @@
  *  INTERFACE: Matlab Rappture Library Source
  *
- *    [err] = rpLibResult(lib)
+ *    [err] = rpLibResult(lib,status)
  *
  * ======================================================================

trunk/packages/vizservers/nanovis/RpDX.cpp

@@ -47 +47 @@
 
     if (filename == NULL) {
-        resultPtr->AddError("filename is NULL");
-        return;
+        resultPtr->AddError("filename is NULL");
+        return;
     }
     // open the file with libdx
@@ -56 +56 @@
     _dxobj = DXImportDX((char*)filename,NULL,NULL,NULL,NULL);
     if (_dxobj == NULL) {
-        resultPtr->AddError("can't import DX file \"%s\"", filename);
-        return;
+        resultPtr->AddError("can't import DX file \"%s\"", filename);
+        return;
     }
 
@@ -66 +66 @@
 
     // FIXME: nanowire will need a different way to parse out the positions
-    //        array since it uses a productarray to store its positions.  
-    //        Possibly use DXGetProductArray().
+    //        array since it uses a productarray to store its positions.
+    //        Possibly use DXGetProductArray().
     dxpos = (Array) DXGetComponentValue((Field) _dxobj, (char *)"positions");
     if (dxpos == NULL) {
-        resultPtr->AddError("can't get component value of \"positions\"");
-        return;
+        resultPtr->AddError("can't get component value of \"positions\"");
+        return;
     }
     DXGetArrayInfo(dxpos, &_n, &type, &category, &_rank, &_shape);
@@ -86 +86 @@
     pos = (float*) DXGetArrayData(dxpos);
     if (pos == NULL) {
-        resultPtr->AddError("DXGetArrayData failed to return positions array");
-        return;
+        resultPtr->AddError("DXGetArrayData failed to return positions array");
+        return;
     }
 
@@ -95 +95 @@
         // raise error, data is not a regular grid and we cannot handle it
         resultPtr->AddError("DX says our grid is not regular, we cannot handle this data");
-        return;
+        return;
     }
 
@@ -101 +101 @@
     if (_positions == NULL) {
         // malloc failed, raise error
-        resultPtr->AddError("malloc of _positions array failed");
-        return;
+        resultPtr->AddError("malloc of _positions array failed");
+        return;
     }
     memcpy(_positions,pos,sizeof(float)*_n*_numAxis);
@@ -110 +110 @@
         // malloc failed, raise error
         resultPtr->AddError("malloc of _axisLen array failed");
-        return;
+        return;
     }
     memset(_axisLen, 0, _numAxis);
@@ -117 +117 @@
     if (_delta == NULL) {
         resultPtr->AddError("malloc of _delta array failed");
-        return;
+        return;
     }
     memset(_delta, 0, _numAxis*_numAxis);
@@ -124 +124 @@
     if (_origin == NULL) {
         resultPtr->AddError("malloc of _origin array failed");
-        return;
+        return;
     }
     memset(_origin, 0, _numAxis);
@@ -131 +131 @@
     if (_max == NULL) {
         resultPtr->AddError("malloc of _max array failed");
-        return;
+        return;
     }
     memset(_max, 0, _numAxis);
@@ -155 +155 @@
     if (_data == NULL) {
         resultPtr->AddError("malloc of _data array failed");
-        return;
+        return;
     }
 
@@ -173 +173 @@
     default:
         resultPtr->AddError("don't know how to handle data of type %d\n", type);
-        return;
+        return;
     }
 

trunk/src/core/RpDXWriter.h

@@ -55 +55 @@
 
     size_t* _positions;    // array holding the number of x,y,z points
-    double* _delta;      // array holding deltas of the uniform mesh
-    double* _origin;     // array holding coord of origin
+    double* _delta;        // array holding deltas of the uniform mesh
+    double* _origin;       // array holding coord of origin
 
     DXWriter& _writeDxToBuffer(SimpleCharBuffer *dxfile);