Text archives Help

---

Author: brownlee
Date: Mon May 11 16:08:13 2009
New Revision: 2408

Modified:
   trunk/scenes/csafe/python/Configuration.py
   trunk/scenes/csafe/python/SceneMenus.py
   trunk/scenes/csafe/python/csafe_scene.py
Log:
fixing an issue if you saved histogram values but loaded different data with 
that configuration file

Modified: trunk/scenes/csafe/python/Configuration.py
==============================================================================
--- trunk/scenes/csafe/python/Configuration.py  (original)
+++ trunk/scenes/csafe/python/Configuration.py  Mon May 11 16:08:13 2009
@@ -63,6 +63,7 @@
         f.write(str(h.histogram.zoomDMin)+' '+str(h.histogram.zoomDMax)+'\n')
         f.write(str(h.histogram.cropDMin)+' '+str(h.histogram.cropDMax)+'\n')
         f.write(str(h.histogram.colorDMin)+' 
'+str(h.histogram.colorDMax)+'\n')
+        f.write(str(h.histogram.absoluteDMin)+' 
'+str(h.histogram.absoluteDMax)+'\n')
         f.write(str(h.transferFID)+'\n')
         f.write('\n\n')
 
@@ -111,7 +112,7 @@
         print "ERROR opening configuration file '%s': %s.  Goodbye." % 
(filename, strerror)
         print ""
         os._exit( -1 ) # We're done... force exit.
-
+    current_line = 0
     try:
 
         ### Clear old values
@@ -130,6 +131,7 @@
         currentParticleHistogramIndex = -1
         currentVolumeHistogramIndex = -1
         for i in range(len(lines)):
+            current_line = i
             ##### Transfer Function####
             if lines[i].find("[Transfer Function]") != -1:
                 i+=1
@@ -186,6 +188,9 @@
                 cropColor = lines[i].split();          i += 1
                 cropColorMin = float(cropColor[0])
                 cropColorMax = float(cropColor[1])
+                absMinMax = lines[i].split();               i += 1
+                absMin = float(absMinMax[0])
+                absMax = float(absMinMax[1])
                 transferFID = int(lines[i].strip())
                 histValues1 = []
                 for i in range(scene.histogramBuckets):
@@ -218,6 +223,10 @@
                 print "sending values: " + str(zoomIntoMin) + " " + 
str(zoomIntoMax) + " " + str(cropDisplayMin) + " " + str(cropDisplayMax) + " 
" + str(cropColorMin) + " " + str(cropColorMax)
 
                 histoGroup.SendValues(zoomIntoMin, zoomIntoMax, 
cropDisplayMin, cropDisplayMax, cropColorMin, cropColorMax)
+#                print "histo abs values: " + 
str(histoGroup.histogram.absoluteDMin)+ " " + 
str(histoGroup.histogram.absoluteDMax)
+                histoGroup.histogram.absoluteDMin = absMin
+                histoGroup.histogram.absoluteDMax = absMax
+#                print "histo abs values after: " + 
str(histoGroup.histogram.absoluteDMin)+ " " + 
str(histoGroup.histogram.absoluteDMax)
 
             ##### Eye (Camera) ####
             elif lines[i].find("[Eye]") != -1:
@@ -320,7 +329,7 @@
         print "Done reading Configuration file"
 
     except:
-        print "ERROR: unable to read Configuration file"
+        print "ERROR: unable to read Configuration file, failed at line: " + 
str(current_line)
 
 
 def ReadNRRDList(scene, filename):

Modified: trunk/scenes/csafe/python/SceneMenus.py
==============================================================================
--- trunk/scenes/csafe/python/SceneMenus.py     (original)
+++ trunk/scenes/csafe/python/SceneMenus.py     Mon May 11 16:08:13 2009
@@ -41,7 +41,7 @@
          self.removeButton2.Disable()
        hSizer2.Add(self.addVolumeButton, 0, wx.ALL, 3)
        hSizer2.Add(self.removeButton2, 0, wx.ALL, 3)
-       sizer.Add(hSizer2, 0, wx.ALL|wx.ALIGN_CENTER, 5)                
+       sizer.Add(hSizer2, 0, wx.ALL|wx.ALIGN_CENTER, 5)   
 
        self.okButton = wx.Button(panel, wx.ID_OK)
        self.cancelButton = wx.Button(panel, wx.ID_CANCEL)
@@ -77,26 +77,26 @@
         evt.Skip()
 
     def OnClickOk(self, evt):
-       items = []
-       #items = self.scene.nrrdFiles
-       for i in range(self.lb1.GetCount()):
-               print " appending to spheres: " + str(self.lb1.GetString(i))
-               items.append(str(self.lb1.GetString(i)))
+      items = []
+      #items = self.scene.nrrdFiles
+      for i in range(self.lb1.GetCount()):
+        print " appending to spheres: " + str(self.lb1.GetString(i))
+        items.append(str(self.lb1.GetString(i)))
         self.scene.nrrdFiles = items
-       items2 = []
+        items2 = []
         for i in range(self.lb2.GetCount()):
-                print " appending to vols: " + str(self.lb2.GetString(i))
-                items2.append(str(self.lb2.GetString(i)))
+          print " appending to vols: " + str(self.lb2.GetString(i))
+          items2.append(str(self.lb2.GetString(i)))
         self.scene.nrrdFiles2 = items2
         self.Close(True)
+    
+      print "self.scene.nrrdFiles2: "
+      for i in range(len(self.scene.nrrdFiles2)):
+        print str(self.scene.nrrdFiles2[i])
+      print "end nrrdFiles2."
 
-       print "self.scene.nrrdFiles2: "
-       for i in range(len(self.scene.nrrdFiles2)):
-               print str(self.scene.nrrdFiles2[i])
-       print "end nrrdFiles2."
-
-        if self.lb1.GetCount() != 0 or self.lb2.GetCount() != 0 :
-            self.parent.generateMenuItem.Enable( True );
+      if self.lb1.GetCount() != 0 or self.lb2.GetCount() != 0 :
+          self.parent.generateMenuItem.Enable( True );
 
     def OnClickCancel(self, evt):
         self.Close(True)
@@ -113,20 +113,20 @@
                 continue
     
     def OnClickRemove2(self, evt):
-       offset = 0
-        for i in self.lb2.GetSelections():
-            try:
-                self.lb2.Delete(i - offset)
-                offset+=1
-                if self.lb2.GetCount() == 0:
-                    self.removeButton2.Disable();
-            except:
-                continue
+      offset = 0
+      for i in self.lb2.GetSelections():
+          try:
+              self.lb2.Delete(i - offset)
+              offset+=1
+              if self.lb2.GetCount() == 0:
+                  self.removeButton2.Disable();
+          except:
+              continue
         
     def OnClickAddParticles(self, evt):
         wildcard = "All files (*.*)|*.*|" \
                    "Nrrd File (*.nrrd)|*.nrrd|" \
-                  "Nrrd Header (*.nrhd)|*.nhdr" 
+       "Nrrd Header (*.nrhd)|*.nhdr" 
         dlg = wx.FileDialog(self, message="Choose a Particle file(s)",
            defaultDir=os.getcwd(), defaultFile="",wildcard=wildcard,
            style=wx.OPEN | wx.MULTIPLE | wx.CHANGE_DIR)
@@ -174,7 +174,7 @@
     def OnClickAddVolume(self, evt):
         wildcard = "All files (*.*)|*.*|" \
            "Nrrd File (*.nrrd)|*.nrrd|" \
-          "Nrrd Header (*.nrhd)|*.nhdr"
+     "Nrrd Header (*.nrhd)|*.nhdr"
 
         dlg = wx.FileDialog(self, message="Choose a Volume file(s)",
            defaultDir=os.getcwd(), defaultFile="",wildcard=wildcard,
@@ -478,7 +478,7 @@
        self.durTcl = wx.TextCtrl(panel, 0, str(duration), size=(125, -1))
        hSizer3.Add(self.durText, 0, wx.ALL, 3)
        hSizer3.Add(self.durButton, 0, wx.ALL, 3)
-       hSizer3.Add(self.durTcl, 0, wx.ALL, 3)  
+       hSizer3.Add(self.durTcl, 0, wx.ALL, 3) 
        sizer.Add(hSizer3, 0 , wx.ALL|wx.ALIGN_CENTER,5 )
        
        hSizer10 = wx.BoxSizer(wx.HORIZONTAL)
@@ -488,7 +488,7 @@
        self.repeatTcl = wx.TextCtrl(panel, 0, str(repeat), size=(125, -1))
        hSizer10.Add(self.repeatText, 0, wx.ALL, 3)
        hSizer10.Add(self.repeatButton, 0, wx.ALL, 3)
-       hSizer10.Add(self.repeatTcl, 0, wx.ALL, 3)      
+       hSizer10.Add(self.repeatTcl, 0, wx.ALL, 3) 
        sizer.Add(hSizer10, 0 , wx.ALL|wx.ALIGN_CENTER,5 )
        
        self.biggifyCB = wx.CheckBox(panel, -1, "Make text bigger")
@@ -524,11 +524,14 @@
        self.ridxTcl = wx.TextCtrl(panel,-1,str(scene.ridx),size=(125,-1))
        hSizer4.Add(self.ridxText,0,wx.ALL,3)
        hSizer4.Add(self.ridxTcl,0,wx.ALL,3)
-       sizer.Add(hSizer4,0,wx.ALL|wx.ALIGN_CENTER,5)          
+       sizer.Add(hSizer4,0,wx.ALL|wx.ALIGN_CENTER,5)         
 
        hSizer5 = wx.BoxSizer(wx.HORIZONTAL)
-       self.radText = wx.StaticText(panel, -1, "Default Radius (Can't change 
when scene is loaded): ")
-       self.radText.SetForegroundColour(wx.Colour(200, 0, 0))
+       if (self.scene.loaded == True):
+          self.radText = wx.StaticText(panel, -1, "Default Radius (Can't 
change when scene is loaded): ")
+          self.radText.SetForegroundColour(wx.Colour(200, 0, 0))
+       else:
+          self.radText = wx.StaticText(panel, -1, "Default Radius: ")
        self.radTcl = wx.TextCtrl(panel,-1,str(scene.radius),size=(125,-1))
        if (self.scene.loaded == True):
           self.radTcl.Enable(False)
@@ -615,23 +618,23 @@
         evt.Skip()
 
     def OnClickBigger(self, evt):
-        self.scene.biggify = evt.IsChecked()
-       self.scene.frame.LayoutWindow()
+      self.scene.biggify = evt.IsChecked()
+      self.scene.frame.LayoutWindow()
   
     def OnClickLabels(self, evt):
         self.scene.labels = evt.IsChecked()
         self.scene.frame.LayoutWindow()
 
     def OnClickShowSpheres(self, evt):
-       self.scene.showSpheres = evt.IsChecked()
-       self.scene.test.setVisibility(self.scene.showSpheres, 
self.scene.showVolume)
+      self.scene.showSpheres = evt.IsChecked()
+      self.scene.test.setVisibility(self.scene.showSpheres, 
self.scene.showVolume)
 
     def OnClickShowVolume(self, evt):
-       self.scene.showVolume = evt.IsChecked()
-        self.scene.test.setVisibility(self.scene.showSpheres, 
self.scene.showVolume)
+      self.scene.showVolume = evt.IsChecked()
+      self.scene.test.setVisibility(self.scene.showSpheres, 
self.scene.showVolume)
 
     def OnClickAutoHisto(self, evt):
-        self.scene.autoBuildHistograms = evt.IsChecked()
+      self.scene.autoBuildHistograms = evt.IsChecked()
    
     def OnClickAO(self, evt):
         self.scene.test.useAO(evt.IsChecked())
@@ -660,35 +663,34 @@
         self.scene.test.gotoFrame(frame)
 
     def ApplySettings(self):
-       self.scene.radius = float(self.radTcl.GetValue())
-       self.scene.ridx = float(self.ridxTcl.GetValue())
-       self.scene.cidx = float(self.cidxTcl.GetValue())
-       self.scene.aoCutoff = float(self.aoCutoffTcl.GetValue())
-       self.scene.aoNum = int(float(self.aoNumTcl.GetValue()))
-       self.scene.test.setAOVars(self.scene.aoCutoff, self.scene.aoNum)
-        self.scene.forceDataMin = float(self.volMinTcl.GetValue())
-        self.scene.forceDataMax = float(self.volMaxTcl.GetValue())
-        self.scene.stepSize = float(self.stepSizeTcl.GetValue())
-        self.scene.test.setStepSize(float(self.scene.stepSize))
-        if (self.scene.forceDataMin != self.scene.forceDataMax):
+      self.scene.radius = float(self.radTcl.GetValue())
+      self.scene.ridx = float(self.ridxTcl.GetValue())
+      self.scene.cidx = float(self.cidxTcl.GetValue())
+      self.scene.aoCutoff = float(self.aoCutoffTcl.GetValue())
+      self.scene.aoNum = int(float(self.aoNumTcl.GetValue()))
+      self.scene.test.setAOVars(self.scene.aoCutoff, self.scene.aoNum)
+      self.scene.forceDataMin = float(self.volMinTcl.GetValue())
+      self.scene.forceDataMax = float(self.volMaxTcl.GetValue())
+      self.scene.stepSize = float(self.stepSizeTcl.GetValue())
+      self.scene.test.setStepSize(float(self.scene.stepSize))
+      if (self.scene.forceDataMin != self.scene.forceDataMax):
           self.scene.test.setVolColorMinMax(float(self.scene.forceDataMin), 
float(self.scene.forceDataMax))
-       print "ridx set to: " + str(self.scene.ridx)
 
     def OnClickOK(self, evt):
         self.ApplySettings()
         self.Close(True)
 
     def OnClickCancel(self, evt):
-       self.Close(True)        
+      self.Close(True)  
 
     def OnClickTime(self, evt):
-       time = float(self.frameTcl.GetValue())
-       self.scene.test.gotoTime(time)  
+      time = float(self.frameTcl.GetValue())
+      self.scene.test.gotoTime(time)  
 
     def OnClickDuration(self, evt):
-       duration = float(self.durTcl.GetValue())
-       self.scene.test.setDuration(duration)
-       self.scene.duration = duration
+      duration = float(self.durTcl.GetValue())
+      self.scene.test.setDuration(duration)
+      self.scene.duration = duration
 
     def OnCloseMe(self, evt):
         self.Close(True)
@@ -779,47 +781,47 @@
         evt.Skip()
 
     def EvtChoiceTF(self, e):
-       print "choice"
-       if e.GetString() == 'New Transfer Function...':
-               print "dlg"
-               dlg = wx.TextEntryDialog(self, 'Transfer Function name: ', 
'Choose Name', 'Untitled')
-               if dlg.ShowModal() == wx.ID_OK:
-                       name = dlg.GetValue()
-                       colors = []
-                       histValues1 = []
-                       for i in range(0,100):
-                               histValues1.append(5)
-                       
self.scene.frame.transferFunctions.append(TransferF.TransferF(self, colors, 
len(self.scene.frame.transferFunctions), name, manta_new(RGBAColorMap(1))))
-                       self.transferCH.Insert(name, 
self.transferCH.GetCount()-1)
-               dlg.Destroy()
-               self.transferFID = self.transferCH.GetCount()-2
-               self.transferCH.SetSelection(self.transferFID)
-       else:
-               self.transferFID = self.transferCH.GetCurrentSelection()
-
+      print "choice"
+      if e.GetString() == 'New Transfer Function...':
+        print "dlg"
+        dlg = wx.TextEntryDialog(self, 'Transfer Function name: ', 'Choose 
Name', 'Untitled')
+        if dlg.ShowModal() == wx.ID_OK:
+          name = dlg.GetValue()
+          colors = []
+          histValues1 = []
+          for i in range(0,100):
+            histValues1.append(5)
+          
self.scene.frame.transferFunctions.append(TransferF.TransferF(self, colors, 
len(self.scene.frame.transferFunctions), name, manta_new(RGBAColorMap(1))))
+          self.transferCH.Insert(name, self.transferCH.GetCount()-1)
+        dlg.Destroy()
+        self.transferFID = self.transferCH.GetCount()-2
+        self.transferCH.SetSelection(self.transferFID)
+      else:
+        self.transferFID = self.transferCH.GetCurrentSelection()
+    
     def OnClickOK(self, evt):
-        self.name = self.nameTC.GetValue()
-        self.index = self.indexSP.GetValue()
-       dataMin = -1.1
-       dataMax = 2.2
-       min = SWIGIFYCreateDouble(0)
-       max = SWIGIFYCreateDouble(100)
-       dataMin = SWIGIFYGetDouble(min)
-       dataMax = SWIGIFYGetDouble(max)
-       histValues1 = []
-       for i in range(0,100):
-           histValues1.append(5)
-       colors = []
-       #t = TransferF.TransferF(self, colors, self.transferFID, self.name, 
manta_new(CDColorMap(1)))
-        histoGroup = Histogram.HistogramGroup(self.scene.frame.panel, 
self.scene, self.index, self.name, self.transferFID)
-       color = wx.Colour(90,90,90)
-       histoGroup.group = self.group
-        histoGroup.SetBackgroundColour(color)
-       self.scene.frame.histoGroups.append(histoGroup)
-       #self.scene.histoVS.Add(histoGroup,0,wx.ALIGN_CENTER,1)       
-        #self.scene.frame.vs.Layout()
-       self.scene.frame.LayoutWindow()
-        self.Close(True)
+      self.name = self.nameTC.GetValue()
+      self.index = self.indexSP.GetValue()
+      dataMin = -1.1
+      dataMax = 2.2
+      min = SWIGIFYCreateDouble(0)
+      max = SWIGIFYCreateDouble(100)
+      dataMin = SWIGIFYGetDouble(min)
+      dataMax = SWIGIFYGetDouble(max)
+      histValues1 = []
+      for i in range(0,100):
+          histValues1.append(5)
+      colors = []
+      #t = TransferF.TransferF(self, colors, self.transferFID, self.name, 
manta_new(CDColorMap(1)))
+      histoGroup = Histogram.HistogramGroup(self.scene.frame.panel, 
self.scene, self.index, self.name, self.transferFID)
+      color = wx.Colour(90,90,90)
+      histoGroup.group = self.group
+      histoGroup.SetBackgroundColour(color)
+      self.scene.frame.histoGroups.append(histoGroup)
+      #self.scene.histoVS.Add(histoGroup,0,wx.ALIGN_CENTER,1)       
+            #self.scene.frame.vs.Layout()
+      self.scene.frame.LayoutWindow()
+      self.Close(True)
 
     def OnClickCancel(self, evt):
         self.Close(True)
@@ -834,7 +836,7 @@
            self.indexSP.Show(False)
          
         self.SetSizerAndFit(self.selfSizer)
-          
+     
     def OnCloseMe(self, evt):
         self.Close(True)
 

Modified: trunk/scenes/csafe/python/csafe_scene.py
==============================================================================
--- trunk/scenes/csafe/python/csafe_scene.py    (original)
+++ trunk/scenes/csafe/python/csafe_scene.py    Mon May 11 16:08:13 2009
@@ -369,7 +369,9 @@
           cropMax = hist.cropDMax
           colorMin = hist.colorDMin
           colorMax = hist.colorDMax
-          item = [zoomMin, zoomMax, cropMin, cropMax, colorMin, colorMax]
+          absMin = hist.absoluteDMin
+          absMax = hist.absoluteDMax
+          item = [zoomMin, zoomMax, cropMin, cropMax, colorMin, colorMax, 
absMin, absMax]
           info.append(item)
         self.generateMenuItem.Enable( False )
         self.addRemoveDataFilesMenu.Enable( False )
@@ -467,7 +469,9 @@
            self.slider.Enable(True)
            
         for i in range(len(info)):
-          
self.histoGroups[i].SendValues(info[i][0],info[i][1],info[i][2],info[i][3],info[i][4],info[i][5])
+          print "hist values comp: " + 
str(self.histoGroups[i].histogram.absoluteDMin) + " " + str(info[i][6]) + " " 
+ str(self.histoGroups[i].histogram.absoluteDMax) + " " + str(info[i][7])
+          if abs(float(self.histoGroups[i].histogram.absoluteDMin) - 
float(info[i][6])) < .000001 and 
abs(float(self.histoGroups[i].histogram.absoluteDMax) - float(info[i][7])) < 
.000001:
+            
self.histoGroups[i].SendValues(info[i][0],info[i][1],info[i][2],info[i][3],info[i][4],info[i][5])
         self.scene.loaded = True
         self.scene.mantaApp.frame.OnAutoView(None)
         if self.scene.currentVolumeHistogram != None:

---

• [Manta] r2408 - trunk/scenes/csafe/python, brownlee, 05/11/2009

---

Archive powered by MHonArc 2.6.16.