Text archives Help

---

Author: brownlee
Date: Wed Jan 21 23:05:34 2009
New Revision: 2367

Modified:
   trunk/scenes/csafe/python/Configuration.py
   trunk/scenes/csafe/python/Histogram.py
   trunk/scenes/csafe/src/CDTest.h
Log:
M    scenes/csafe/python/Histogram.py

removing ouput

M    scenes/csafe/python/Configuration.py

fixing configuration file writing when current histogram isn't set

M    scenes/csafe/src/CDTest.h

re-adding volume position size user adjustability




Modified: trunk/scenes/csafe/python/Configuration.py
==============================================================================
--- trunk/scenes/csafe/python/Configuration.py  (original)
+++ trunk/scenes/csafe/python/Configuration.py  Wed Jan 21 23:05:34 2009
@@ -37,11 +37,14 @@
     if (scene.currentHistogram != None):
       f.write( str( scene.frame.histoGroups.index( scene.currentHistogram ) 
) )
     else :
-      f.write(0)
+      f.write("0")
     f.write('\n\n')
 
     f.write('[currentParticleHistogram]\n')
-    f.write( str( scene.frame.histoGroups.index( 
scene.currentParticleHistogram ) ) )
+    if (scene.currentParticleHistogram != None):
+       f.write( str( scene.frame.histoGroups.index( 
scene.currentParticleHistogram ) ) )
+    else :
+       f.write("0")
     f.write('\n\n')
 
     for i in range(len(histoGroups)):
@@ -129,7 +132,6 @@
                 b = float(line[3])
                 a = float(line[4])
                 #colors.append( (pos, r, g, b, a) )
-                print pos
                 slices.push_back(ColorSlice(pos, 
RGBAColor(Color(RGBColor(r,g,b)), a)))
                 
             
scene.frame.transferFunctions.append(TransferF.TransferF(scene.frame, colors, 
id, name, manta_new(RGBAColorMap(slices))))

Modified: trunk/scenes/csafe/python/Histogram.py
==============================================================================
--- trunk/scenes/csafe/python/Histogram.py      (original)
+++ trunk/scenes/csafe/python/Histogram.py      Wed Jan 21 23:05:34 2009
@@ -724,7 +724,6 @@
         if (self.histogram.parent.group == 1):
             colorMin = cropMin
             colorMax = cropMax
-        print "min, max: " + str(cropMin) + " " + str(cropMax)
         self.histogram.zooms.append( (self.histogram.zoomDMin, 
self.histogram.zoomDMax))
         self.histogram.zoomDMin = zoomMin
         self.histogram.zoomDMax = zoomMax
@@ -756,7 +755,6 @@
         else:
                 self.scene.test.setVolColorMinMax(colorMin, colorMax)
                 
self.scene.test.setVolClipMinMax(self.histogram.absoluteDMin, 
self.histogram.absoluteDMax, cropMin, cropMax)
-                print "vals: " + str(self.histogram.dMin) + " " + 
str(self.histogram.dMax) + " " + str(cropMin) + " " + str(cropMax)
         
     def OnClickZoomIn(self, evt):
         self.histogram.ZoomIn()

Modified: trunk/scenes/csafe/src/CDTest.h
==============================================================================
--- trunk/scenes/csafe/src/CDTest.h     (original)
+++ trunk/scenes/csafe/src/CDTest.h     Wed Jan 21 23:05:34 2009
@@ -1001,7 +1001,6 @@
   */
   void setCidx(int cidx) {
 #if USE_GRIDSPHERES
-    cout << "2\n";
     for(int i =0; i < int(_sphereGrids.size()); i++)
       _sphereGrids[i]->setCidx(cidx); 
 #else
@@ -1062,13 +1061,13 @@
     }
   void setVolumePositionSizeHelper(int, int)
     {
-      /*  BBox bounds(_volPosition - _volSize/2.0, _volPosition + 
_volSize/2.0);
+      BBox bounds(_volPosition - _volSize/2.0, _volPosition + _volSize/2.0);
       for(vector<Volume<float>*>::iterator itr = _vols.begin(); itr != 
_vols.end(); itr++) {
        (*itr)->setBounds(bounds);
       }
       for(vector<Cube*>::iterator itr = _volPrims.begin(); itr != 
_volPrims.end(); itr++) {
        (*itr)->setMinMax(bounds.getMin(), bounds.getMax());
-        }*/
+      }
     }
 
   MantaInterface* _manta_interface;

---

• [Manta] r2367 - in trunk/scenes/csafe: python src, brownlee, 01/21/2009

---

Archive powered by MHonArc 2.6.16.