Text archives Help

---

Author: brownlee
Date: Wed May 13 12:56:24 2009
New Revision: 2410

Modified:
   trunk/scenes/csafe/python/Histogram.py
   trunk/scenes/csafe/python/TransferF.py
   trunk/scenes/csafe/python/csafe_scene.py
Log:
setting default colormap to rainbow instead of invrainbow.  All histograms 
now update according to a change in transferF instead of just one.  Also when 
selecting a new preset the histogram updates accordingly

Modified: trunk/scenes/csafe/python/Histogram.py
==============================================================================
--- trunk/scenes/csafe/python/Histogram.py      (original)
+++ trunk/scenes/csafe/python/Histogram.py      Wed May 13 12:56:24 2009
@@ -626,6 +626,7 @@
                 self.scene.test.setSphereCMap(transferF.cmap)
             else:
                 self.scene.test.setVolCMap(transferF.cmap)
+            self.histogram.transferF = transferF
     
     def SetValues(self, histValues, dataMin, dataMax):  
         self.dataMin = dataMin
@@ -1002,14 +1003,14 @@
         vs2.Add(self.button)
         #vs2.AddSpacer(15)
         #vs2.Add(self.cancelB)
-        vs2.AddSpacer(15)
+        vs2.AddSpacer((0,15))
         vs2.Add(self.resetB)
         vs2.Layout()
         
         vs.Add(gbs, 0, wx.ALIGN_CENTRE, border=15 )
-        vs.AddSpacer(15)
+        vs.AddSpacer((0,15))
         vs.Add(vs2, 0, wx.ALIGN_CENTRE|wx.ALIGN_BOTTOM, 1 )
-        vs.AddSpacer(15)
+        vs.AddSpacer((0,15))
         
         vs.Layout()
         

Modified: trunk/scenes/csafe/python/TransferF.py
==============================================================================
--- trunk/scenes/csafe/python/TransferF.py      (original)
+++ trunk/scenes/csafe/python/TransferF.py      Wed May 13 12:56:24 2009
@@ -274,9 +274,11 @@
         self.histogramGroup = histo
         
     def UpdateHistogram(self):
-        if self.histogramGroup != None:
-            self.histogramGroup.Update()
         self.transferF.UpdateColorMap()
+        for i in range(len(self.scene.frame.histoGroups)):
+            histoGroup = self.scene.frame.histoGroups[i]
+            if histoGroup.transferF == self.transferF:
+              histoGroup.Update()
     
     def OnClick(self, evt):
         zoomRange = self.zoomMax-self.zoomMin
@@ -627,6 +629,8 @@
             for i in range(len(self.ids)):
                 if evt.GetId() == self.ids[i]:
                     self.SetTransferF(self.scene.frame.transferFunctions[i])
+        self.transferFPanel.histogramGroup.SetTransferF(self.transferF)
+        self.transferFPanel.UpdateHistogram()
         
     def OnClickNew(self, evt):
         self.transferFPanel.AddNewColor()

Modified: trunk/scenes/csafe/python/csafe_scene.py
==============================================================================
--- trunk/scenes/csafe/python/csafe_scene.py    (original)
+++ trunk/scenes/csafe/python/csafe_scene.py    Wed May 13 12:56:24 2009
@@ -41,7 +41,7 @@
 import sys, os
 
 
##############################################################################
-# Validate that we have a new enoug python:
+# Validate that we have a new enough python:
 
 if float(sys.version[0:3]) < 2.4:
   print
@@ -597,24 +597,7 @@
         scene.setObject(world)
 
         self.colorMap1 = colorMap1 = manta_new(RGBAColorMap())
-
-#        slices = manta_new(vector_ColorSlice());
-#        div = 1.0/255.0;
-#        a = 1.0;
-#        slices.push_back(ColorSlice(0.0, RGBAColor(Color(RGBColor(0.0, 0.0, 
0.0)), 0*a)));
-#        slices.push_back(ColorSlice(0.109804, 
RGBAColor(Color(RGBColor(52*div, 0*div, 0*div)), 0*a)));
-#        slices.push_back(ColorSlice(0.2, RGBAColor(Color(RGBColor(102*div, 
2*div, 0)), 0.1*a)));
-#        slices.push_back(ColorSlice(0.328571, 
RGBAColor(Color(RGBColor(153*div, 18*div, 0)), 0.216667*a)));
-#        slices.push_back(ColorSlice(0.4, RGBAColor(Color(RGBColor(200*div, 
41*div, 0)), 0.23*a)));
-#        slices.push_back(ColorSlice(0.5, RGBAColor(Color(RGBColor(230*div, 
71*div, 0)), 0.27*a)));
-#        slices.push_back(ColorSlice(0.618367, 
RGBAColor(Color(RGBColor(255*div, 120*div, 0)) , 0.3375*a)));
-#        slices.push_back(ColorSlice(0.68, RGBAColor(Color(RGBColor(255*div, 
163*div, 20*div)) , 0.35*a)));
-#        slices.push_back(ColorSlice(0.72, RGBAColor(Color(RGBColor(255*div, 
204*div, 55*div)) , 0.37*a)));
-#        slices.push_back(ColorSlice(0.79, RGBAColor(Color(RGBColor(255*div, 
228*div, 80*div)) , 0.39*a)));
-#        slices.push_back(ColorSlice(0.85, RGBAColor(Color(RGBColor(255*div, 
247*div, 120*div)), 0.43*a)));
-#        slices.push_back(ColorSlice(0.92, RGBAColor(Color(RGBColor(255*div, 
255*div, 180*div)), 0.47*a)));
-#        slices.push_back(ColorSlice(1.0, RGBAColor(Color(RGBColor(255*div, 
255*div, 255*div)) , 0.5*a)));
-        self.volCMap = manta_new(RGBAColorMap(1));
+        self.volCMap = manta_new(RGBAColorMap(2));
 
 
         minBound = Vector(self.scene.volumeMinBound[0], 
self.scene.volumeMinBound[1], self.scene.volumeMinBound[2])
@@ -642,12 +625,12 @@
         ################
         self.sphereVolCMaps = []
         for j in range(8):
-            self.sphereVolCMaps.append(manta_new(RGBAColorMap(1)))
+            self.sphereVolCMaps.append(manta_new(RGBAColorMap(2)))
         self.defaultTransferF = TransferF.TransferF(self, [], 1, "empty", 
manta_new(RGBAColorMap(2)))
         self.transferFunctions = []
         if self.scene.readConfiguration == False:
             id = 0
-            self.t0 = TransferF.TransferF(self, [], id, "volume", 
manta_new(RGBAColorMap(1)))
+            self.t0 = TransferF.TransferF(self, [], id, "volume", 
manta_new(RGBAColorMap(2)))
             self.transferFunctions.append(self.t0)
             self.transferFunctions.append(TransferF.TransferF(self, [], 
id+1,   "InvRainbowIso", manta_new(RGBAColorMap(0))))
             self.transferFunctions.append(TransferF.TransferF(self, [], 
id+2, "InvRainbow",    manta_new(RGBAColorMap(1))))

---

• [Manta] r2410 - trunk/scenes/csafe/python, brownlee, 05/13/2009

---

Archive powered by MHonArc 2.6.16.