Text archives Help

---

Author: brownlee
Date: Wed Apr  8 04:00:14 2009
New Revision: 2396

Modified:
   trunk/scenes/csafe/python/Configuration.py
   trunk/scenes/csafe/python/Histogram.py
   trunk/scenes/csafe/python/SceneInfo.py
   trunk/scenes/csafe/python/TransferF.py
   trunk/scenes/csafe/python/csafe_scene.py
Log:
adding histogram highlighting to csafe scene

Modified: trunk/scenes/csafe/python/Configuration.py
==============================================================================
--- trunk/scenes/csafe/python/Configuration.py  (original)
+++ trunk/scenes/csafe/python/Configuration.py  Wed Apr  8 04:00:14 2009
@@ -37,14 +37,14 @@
     if (scene.currentHistogram != None):
       f.write( str( scene.frame.histoGroups.index( scene.currentHistogram ) 
) )
     else :
-      f.write("0")
+      f.write("None")
     f.write('\n\n')
 
     f.write('[currentParticleHistogram]\n')
     if (scene.currentParticleHistogram != None):
        f.write( str( scene.frame.histoGroups.index( 
scene.currentParticleHistogram ) ) )
     else :
-       f.write("0")
+       f.write("None")
     f.write('\n\n')
 
     for i in range(len(histoGroups)):
@@ -115,8 +115,8 @@
 
         ### Read in new values
         lines = f.readlines()
-        currentHistogramIndex = 0
-        currentParticleHistogramIndex = 0
+        currentHistogramIndex = -1
+        currentParticleHistogramIndex = -1
         for i in range(len(lines)):
             ##### Transfer Function####
             if lines[i].find("[Transfer Function]") != -1:
@@ -141,12 +141,16 @@
             #### Current Histogram ####
             elif lines[i].find("[currentHistogram]") != -1:
                 i +=1
-                currentHistogramIndex = int( lines[i].strip() )
+                line = lines[i].strip()
+                if line != "None":
+                  currentHistogramIndex = int( line)
 
             #### Current Histogram ####
             elif lines[i].find("[currentParticleHistogram]") != -1:
                 i +=1
-                currentParticleHistogramIndex = int( lines[i].strip() )
+                line = lines[i].strip()
+                if line != "None":
+                  currentParticleHistogramIndex = int( line )
 
             #### Histogram ####
             elif lines[i].find("[Histogram]") != -1:

Modified: trunk/scenes/csafe/python/Histogram.py
==============================================================================
--- trunk/scenes/csafe/python/Histogram.py      (original)
+++ trunk/scenes/csafe/python/Histogram.py      Wed Apr  8 04:00:14 2009
@@ -522,6 +522,15 @@
 #        self.CreateElements()
 #        self.SetBackgroundColour(self.scene.bgColor)
 
+
+    def Select(self):
+        self.box1_title.SetBackgroundColour(self.scene.selectedBGColor)
+        self.histogram.SetBackgroundColour(self.scene.selectedBGColor)
+        
+    def Deselect(self):
+        self.box1_title.SetBackgroundColour(self.scene.bgColor)
+        self.histogram.SetBackgroundColour(self.scene.bgColor)
+
     def SetHistoWidth(self, width):
         None
        # self.width = width
@@ -571,6 +580,7 @@
         box1_title = wx.StaticBox( self, -1, self.title + " (" + str( 
self.varIndex ) + ")" )
 
         box1_title.SetForegroundColour( wx.WHITE ) # Make label readable!
+        self.box1_title = box1_title
 
         self.histogram = HistogramPanel( self, self.datavalues, 
self.dataMin, self.dataMax, self.width, self.height,
                                          self.transferF, self.scene, 
self.varIndex )
@@ -610,6 +620,7 @@
         self.colorB = colorB
         self.rulerB = wx.BitmapButton(self, -1, self.bmpRuler, (0,0), 
style=wx.NO_BORDER)
         self.rulerB.SetToolTip( wx.ToolTip( "Press to set clipping range 
explicitly." ) )
+        self.rulerB.SetBackgroundColour(self.scene.bgColor)
 
         self.zoomInB = wx.BitmapButton(self, -1, self.bmpZoomIn, (0,0), 
style=wx.NO_BORDER)
         self.zoomInB.SetToolTip( wx.ToolTip( "Zoom In" ) )
@@ -791,11 +802,6 @@
     def OnClickColor(self, evt):
         # self.transferFPanel.SetLabel(self.transferF.GetLabel())
 
-        if( evt != None ) : #  evt == None if called in csafe_scene for 
initialization.
-            self.scene.currentHistogram = self
-            if (self.group == 0 ): # group 0 == Particles.
-                self.scene.currentParticleHistogram = self
-
         self.transferFPanel.transferFPanel.SetHistogramGroup(self)
         self.transferFPanel.SetTransferF(self.transferF)
         self.transferFPanel.SetUpdateFunction(self.Update())
@@ -804,6 +810,11 @@
             if (self.transferF != None):
                 self.scene.test.setSphereCMap(self.transferF.cmap)
                 self.scene.test.setSphereColorMinMax(self.varIndex,  
self.histogram.colorDMin,  self.histogram.colorDMax)
+                
+        if( evt != None ) : #  evt == None if called in csafe_scene for 
initialization.
+            self.scene.currentHistogram = self
+            if (self.group == 0 ): # group 0 == Particles.
+                self.scene.currentParticleHistogram = self
 
     def OnClickVisible(self, evt):
         if self.visible:

Modified: trunk/scenes/csafe/python/SceneInfo.py
==============================================================================
--- trunk/scenes/csafe/python/SceneInfo.py      (original)
+++ trunk/scenes/csafe/python/SceneInfo.py      Wed Apr  8 04:00:14 2009
@@ -1,47 +1,49 @@
 import wx
 
 class Scene(wx.Object):
-       def __init__(self):
-               self.volVar = 8  #index used to denote volume
-               self.nrrdFiles = []
-               self.test = None
-               self.ridx = -1
-               self.radius = 0.001
-               self.cidx = -1
-               self.nrrdFiles2 = []
-                self.numFrames = 0
-               self.engine = None
-               self.duration = 10.0
-               self.numThreads = 1
-               self.sceneName = "Untitled"
-               self.sceneWD = "/"
-               self.histogramBMPLoaded = False
-               self.bgColor = wx.Colour(90,90,90)
-               self.startFrame = self.endFrame = 0
-               self.clipFrames = False  #true if start/end are set
-               self.lockFrames = False
-               self.loop = True
-               self.repeatLastFrame = 0.0
-               self.mantaFrame = None
-               self.useAO = False
-               self.aoCutoff = 0.01
-               self.aoNum = 10
-               self.showSpheres = True
-               self.showVolume = True
-               self.biggify = False # make text bigger
-               self.minX = -1.0
-               self.minY = -1.0
-               self.minZ = -1.0
-               self.maxX = 1.0
-               self.maxY = 1.0
-               self.maxZ = 1.0
-               self.histogramBuckets = 300
-               self.volumeMinBound = [-0.001, -0.101, -0.001]
-               self.volumeMaxBound = [0.101, 0.201, 0.101]
-                self.forceDataMin = float(0) #manually set volume data range
-                self.forceDataMax = float(0)
-                self.stepSize = float(0.0016)
-                self.currentHistogram = None
-                self.autoBuildHistograms = True
-                self.readConfiguration = False
-                self.measurementsFrame = None
+  def __init__(self):
+    self.volVar = 8  #index used to denote volume
+    self.nrrdFiles = []
+    self.test = None
+    self.ridx = -1
+    self.radius = 0.001
+    self.cidx = -1
+    self.nrrdFiles2 = []
+    self.numFrames = 0
+    self.engine = None
+    self.duration = 10.0
+    self.numThreads = 1
+    self.sceneName = "Untitled"
+    self.sceneWD = "/"
+    self.histogramBMPLoaded = False
+    self.bgColor = wx.Colour(90,90,90)
+    self.startFrame = self.endFrame = 0
+    self.clipFrames = False  #true if start/end are set
+    self.lockFrames = False
+    self.loop = True
+    self.repeatLastFrame = 0.0
+    self.mantaFrame = None
+    self.useAO = False
+    self.aoCutoff = 0.01
+    self.aoNum = 10
+    self.showSpheres = True
+    self.showVolume = True
+    self.biggify = False # make text bigger
+    self.minX = -1.0
+    self.minY = -1.0
+    self.minZ = -1.0
+    self.maxX = 1.0
+    self.maxY = 1.0
+    self.maxZ = 1.0
+    self.histogramBuckets = 300
+    self.volumeMinBound = [-0.001, -0.101, -0.001]
+    self.volumeMaxBound = [0.101, 0.201, 0.101]
+    self.forceDataMin = float(0) #manually set volume data range
+    self.forceDataMax = float(0)
+    self.stepSize = float(0.0016)
+    self.currentHistogram = None
+    self.autoBuildHistograms = True
+    self.readConfiguration = False
+    self.measurementsFrame = None
+    self.selectedBGColor = wx.Color(70,70,70)
+                

Modified: trunk/scenes/csafe/python/TransferF.py
==============================================================================
--- trunk/scenes/csafe/python/TransferF.py      (original)
+++ trunk/scenes/csafe/python/TransferF.py      Wed Apr  8 04:00:14 2009
@@ -264,12 +264,16 @@
             
     
     def SetHistogramGroup(self, histo):
+        if (histo.group == 0): # group 0 == Particles.
+          if self.scene.currentParticleHistogram != None:
+            self.scene.currentParticleHistogram.Deselect()
+          histo.Select()
         self.histogramGroup = histo
         
     def UpdateHistogram(self):
         if self.histogramGroup != None:
             self.histogramGroup.Update()
-       self.transferF.UpdateColorMap()
+        self.transferF.UpdateColorMap()
     
     def OnClick(self, evt):
         zoomRange = self.zoomMax-self.zoomMin
@@ -617,12 +621,12 @@
     def SetTransferF(self, transferF):
         self.transferF = transferF
         self.transferFPanel.SetTransferF(transferF)
-       label = transferF.label
-       if self.transferFPanel.histogramGroup != None:
-               label  = str(label) + str(" : ") + 
str(self.transferFPanel.histogramGroup.title)
-        self.SetLabel(label)
+        label = transferF.label
         if self.transferFPanel.histogramGroup != None:
-            self.transferFPanel.histogramGroup.SetTransferF(transferF)
+          label  = str(label) + str(" : ") + 
str(self.transferFPanel.histogramGroup.title)
+          self.SetLabel(label)
+          if self.transferFPanel.histogramGroup != None:
+              self.transferFPanel.histogramGroup.SetTransferF(transferF)
         
     def SetUpdateFunction(self, function):
         None

Modified: trunk/scenes/csafe/python/csafe_scene.py
==============================================================================
--- trunk/scenes/csafe/python/csafe_scene.py    (original)
+++ trunk/scenes/csafe/python/csafe_scene.py    Wed Apr  8 04:00:14 2009
@@ -386,6 +386,22 @@
         self.slider.SetRange(1, self.scene.numFrames)
         self.slider.SetValue(1)
         self.numFramesTxt.SetLabel(" / " + str(self.scene.numFrames))
+        
+        
+        if self.scene.currentParticleHistogram == None:
+          histo = None
+          for j in range(len(self.histoGroups)):
+            if self.histoGroups[j].group == 0:
+              histo = self.histoGroups[j]
+              break
+          self.scene.currentParticleHistogram = histo
+          if (self.scene.currentHistogram == None):
+            self.scene.currentHistogram = histo
+        else:
+          print "found one " + 
str(self.scene.currentParticleHistogram.title) 
+        if self.scene.currentParticleHistogram != None:
+          print "seeting histo to selected"
+          self.scene.currentParticleHistogram.OnClickColor(None)
 
         self.scene.mantaApp.frame.StartEngine( self )
         

---

• [Manta] r2396 - trunk/scenes/csafe/python, brownlee, 04/08/2009

---

Archive powered by MHonArc 2.6.16.