Changeset 2814

Timestamp:

Mar 6, 2012 12:58:23 PM (12 years ago)

Author:

ldelgass

Message:

Fix warnings

Location:

trunk/packages/vizservers/nanovis

Files:

• ParticleSystem.cpp (modified) (5 diffs)
• ParticleSystemFactory.cpp (modified) (1 diff)
• PointSet.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/ParticleSystem.cpp

@@ -79 +79 @@
 void *ParticleSystem::dataLoadMain(void *data)
 {
-    ParticleSystem* particleSystem = (ParticleSystem*) data;
+    ParticleSystem *particleSystem = (ParticleSystem *)data;
     CircularFifo<float*, 10>& queue = particleSystem->_queue;
 
@@ -90 +90 @@
 
     int curIndex = startIndex;
-    float flowWidth = particleSystem->_flowWidth;
-    float flowHeight = particleSystem->_flowHeight;
-    float flowDepth = particleSystem->_flowDepth;
+    int flowWidth = particleSystem->_flowWidth;
+    int flowHeight = particleSystem->_flowHeight;
+    int flowDepth = particleSystem->_flowDepth;
 
     const char* fileNameFormat = particleSystem->_fileNameFormat.c_str();
@@ -108 +108 @@
                 sprintf(buff, fileNameFormat, curIndex);
                 //std::string path = vrFilePath::getInstance()->getPath(buff);
+#ifdef WANT_TRACE
                 float t = clock() /(float) CLOCKS_PER_SEC;
+#endif
                 LoadProcessedFlowRaw(buff, flowWidth, flowHeight, flowDepth, queue.array[tail]);
+#ifdef WANT_TRACE
                 float ti = clock() / (float) CLOCKS_PER_SEC;
-                printf("%f\n",ti - t);
+                TRACE("LoadProcessedFlowRaw time: %f\n", ti - t);
+#endif
                 queue.push();
                 TRACE("%d loaded\n", curIndex);
@@ -1073 +1077 @@
 #ifdef WANT_TRACE
                     float t = clock() /(float) CLOCKS_PER_SEC;
+#endif
                     _vectorFields[0]->updatePixels(data);
+#ifdef WANT_TRACE
                     float ti = clock() / (float) CLOCKS_PER_SEC;
-                    TRACE("pixels %f\n",ti - t);
+                    TRACE("updatePixels time: %f\n", ti - t);
 #endif
                     _queue.pop();
@@ -1174 +1180 @@
         for (unsigned int i = 0; i < _emitters.size(); ++i) {
             // TBD..
-            unsigned int numOfNewParticles = randomRange(_emitters[i]->_minNumOfNewParticles, _emitters[i]->_maxNumOfNewParticles) * deltaT;
+            unsigned int numOfNewParticles = (unsigned int)(randomRange(_emitters[i]->_minNumOfNewParticles, _emitters[i]->_maxNumOfNewParticles) * deltaT);
             for (unsigned int k = 0; k < numOfNewParticles; ++k) {
                 float3 position = _emitters[i]->_position;

trunk/packages/vizservers/nanovis/ParticleSystemFactory.cpp

@@ -114 +114 @@
             pointSize = (float) atof(attrs[i + 1]);
         } else if (!strcmp(attrs[i], "vector-field-x")) {
-            fieldWidth = (float) atof(attrs[i + 1]);
+            fieldWidth = atoi(attrs[i + 1]);
         } else if (!strcmp(attrs[i], "vector-field-y")) {
-            fieldHeight = (float) atof(attrs[i + 1]);
+            fieldHeight = atoi(attrs[i + 1]);
         } else if (!strcmp(attrs[i], "vector-field-z")) {
-            fieldDepth = (float) atof(attrs[i + 1]);
+            fieldDepth = atoi(attrs[i + 1]);
         } else if (!strcmp(attrs[i], "sort-enabled")) {
             if (!strcmp(attrs[i + 1], "true"))

trunk/packages/vizservers/nanovis/PointSet.cpp

@@ -52 +52 @@
     int index;
     float d = _max - _min;
-    for (/*empty*/; c <= end; c = (PCA::Cluster*)((char *)c+sizeof(PCA::Cluster))){
+    for (; c <= end; c = (PCA::Cluster*)((char *)c+sizeof(PCA::Cluster))){
         points = c->points;
         numOfPoints = c->numOfPoints;
-        
+
         for (int i = 0; i < numOfPoints; ++i) {
-            index = (points[i].value - _min) / d  * (colorCount - 1);
+            index = (int)((points[i].value - _min) / d  * (colorCount - 1));
             if (index >= colorCount) {
                 index = colorCount - 1;