Text archives Help

---

Author: brownlee
Date: Thu Jan  8 04:19:41 2009
New Revision: 2365

Modified:
   trunk/scenes/csafe/python/Histogram.py
   trunk/scenes/csafe/python/SceneMenus.py
   trunk/scenes/csafe/python/TransferF.py
   trunk/scenes/csafe/python/csafe_scene.py
Log:
added esc-quit to dialog menus

Modified: trunk/scenes/csafe/python/Histogram.py
==============================================================================
--- trunk/scenes/csafe/python/Histogram.py      (original)
+++ trunk/scenes/csafe/python/Histogram.py      Thu Jan  8 04:19:41 2009
@@ -176,7 +176,7 @@
         #self.scene.test.setClipMinMax(self.varIndex, self.cropDMin, 
self.cropDMax)
     
     def OnRightClick(self, evt):
-        print "right"        
+        None        
         
     def OnMotion(self, evt):
         #pdc = wx.PaintDC(self)
@@ -229,7 +229,6 @@
         self.height = heightn
 
     def SetHistoWidth(self, width):
-        print "setting size to: " + str(width)
         self.width = width
         self.SetSize( (width + self.paddingW, self.height+self.paddingH))
         self.Update()
@@ -276,13 +275,10 @@
         
         
     def Update(self):
-        print "updating"
         self.lines = []
         width = self.width
         height = self.height
-        print "0.1"
         self.UpdateDisplayedValues()
-        print "1"
         data = self.data
         
         numBuckets = self.numBuckets
@@ -304,12 +300,10 @@
         else:
            step = 0.0
         end = start + step
-        print step
         if (numBuckets > 0):
            barWidth = self.barWidth = float(width)/float(numBuckets)
         else:
            barWidth = self.barWidth = float(width)
-        #print barWidth
         
         blx = 0.0 + barWidth/2.0 + self.paddingW/2.0 # bottom left x
         bly = 0.0 + height - barWidth/2.0
@@ -336,7 +330,6 @@
         if (colorWidth == 0.0):
             colorWidth = 1.0;
         croppedHeightValues = int(width)*[0]
-        print "colors"
         for i in range(0,int(width)):
             # frequency = len( [x for x in data if (x >= start and x <= 
end)] )
             start2 = int(start)
@@ -369,7 +362,6 @@
                 color = self.transferF.GetColor(colorPos)
                 self.lines.append( (color, ( blx + i, bly, blx + i, (bly - 
barHeightNorm*height) ) ) )
         self.Refresh()
-        print "done updating"
        
     def OnPaint(self, evt=None):
         pdc = wx.PaintDC(self)
@@ -552,7 +544,7 @@
         self.SendValues(zoomMin, zoomMax, cropMin, cropMax, float(min), 
float(max))
     
     def OnClick(self, evt):
-        print "clicked histogro"
+        None
         
     def CreateElements(self):
         path = setup.csafe_scene_path
@@ -853,7 +845,7 @@
             self.vs.Fit(self)
             self.parent.GetSizer().Layout()
             self.parent.Refresh()
-            self.transferFPanel.transferFPanel.SetHistogram(self.histogram)
+            
self.transferFPanel.transferFPanel.SetHistogramGroup(self.histogram)
             
             
 class MeasurementsFrame(wx.Frame):
@@ -864,25 +856,25 @@
         vs = wx.BoxSizer( wx.VERTICAL )
         gbs = wx.GridBagSizer(5,5)
         self.group = group
-        self.zoomText = wx.StaticText(self, -1, "Zoom into data values: ", 
(20, 10))
-        spin = self.zoomMinFS = self.addSpinner(self,zoomMin);
+        self.zoomText = wx.StaticText(panel, -1, "Zoom into data values: ", 
(20, 10))
+        spin = self.zoomMinFS = self.addSpinner(panel,zoomMin);
         self.Bind(FS.EVT_FLOATSPIN, self.OnZoomMinFS, self.zoomMinFS )
-        spin = self.zoomMaxFS = self.addSpinner(self,zoomMax);
+        spin = self.zoomMaxFS = self.addSpinner(panel,zoomMax);
         self.Bind(FS.EVT_FLOATSPIN, self.OnZoomMaxFS, self.zoomMaxFS )
-        self.cropText = wx.StaticText(self, -1, "Crop displayed data values: 
", (20, 10))
-        spin = self.cropMinFS = self.addSpinner(self,cropMin);
+        self.cropText = wx.StaticText(panel, -1, "Crop displayed data 
values: ", (20, 10))
+        spin = self.cropMinFS = self.addSpinner(panel,cropMin);
         self.Bind(FS.EVT_FLOATSPIN, self.OnCropMinFS, self.cropMinFS )
-        spin = self.cropMaxFS = self.addSpinner(self,cropMax);
+        spin = self.cropMaxFS = self.addSpinner(panel,cropMax);
         self.Bind(FS.EVT_FLOATSPIN, self.OnCropMaxFS, self.cropMaxFS )
         
         if (group == 0): # Particles
-            self.colorText = wx.StaticText(self, -1, "Crop color values: ", 
(20, 10))
-            spin = self.colorMinFS =self. addSpinner(self,colorMin);
+            self.colorText = wx.StaticText(panel, -1, "Crop color values: ", 
(20, 10))
+            spin = self.colorMinFS =self. addSpinner(panel,colorMin);
             self.Bind(FS.EVT_FLOATSPIN, self.OnColorMinFS, self.colorMinFS )
-            spin = self.colorMaxFS = self.addSpinner(self,colorMax);
+            spin = self.colorMaxFS = self.addSpinner(panel,colorMax);
             self.Bind(FS.EVT_FLOATSPIN, self.OnColorMaxFS, self.colorMaxFS )
-        self.button = wx.Button(self, -1, "OK")
-        self.cancelB = wx.Button(self, -1, "Cancel")
+        self.button = wx.Button(panel, -1, "OK")
+        self.cancelB = wx.Button(panel, -1, "Cancel")
         
         gbs.Add(self.zoomText, (1,0))
         gbs.Add(self.zoomMinFS, (1,1))
@@ -903,18 +895,30 @@
         vs2.Add(self.cancelB)
         vs2.Layout()
         
-        vs.Add(gbs, -1, wx.ALIGN_CENTRE, 1 )
-        vs.Add(vs2, -1, wx.ALIGN_CENTRE|wx.ALIGN_BOTTOM, 1 )
-
+        vs.Add(gbs, 0, wx.ALIGN_CENTRE, 1 )
+        vs.Add(vs2, 0, wx.ALIGN_CENTRE|wx.ALIGN_BOTTOM, 1 )
+        
         vs.Layout()
         
-        self.SetSizer(vs)
-        vs.Fit(self)
+        panel.SetSizerAndFit(vs)
+
+        vs3 = wx.BoxSizer(wx.VERTICAL)
+        vs3.Add(panel,0, wx.EXPAND)
+        self.SetSizerAndFit(vs3)
         self.SetAutoLayout(True)
+        
 
         self.Bind(wx.EVT_BUTTON, self.OnOK, self.button)
         self.Bind(wx.EVT_BUTTON, self.OnCancel, self.cancelB)
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
+        panel.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+        panel.SetFocus()
+
+    def OnKeyDown(self, evt):
+        keycode = evt.GetKeyCode()
+        if (keycode == wx.WXK_ESCAPE):
+           self.Close()
+        evt.Skip()
 
     def addSpinner(self, where, value, id=wx.ID_ANY):
         floatspin = FS.FloatSpin(where, id,
@@ -925,7 +929,6 @@
         return floatspin
 
     def OnZoomMinFS(self, evt):
-        print "OnZoomMin"
         val = self.zoomMinFS.GetValue()
         val2 = self.zoomMaxFS.GetValue()
         if (val > val2):
@@ -989,7 +992,6 @@
         else:
             colorMin = cropMin
             colorMax = cropMax
-        #print "zomMin: " + str(zoomMin)
         self.parent.SendValues(float(zoomMin), float(zoomMax), 
float(cropMin), float(cropMax), float(colorMin), float(colorMax))
         
     def OnOK(self, event):

Modified: trunk/scenes/csafe/python/SceneMenus.py
==============================================================================
--- trunk/scenes/csafe/python/SceneMenus.py     (original)
+++ trunk/scenes/csafe/python/SceneMenus.py     Thu Jan  8 04:19:41 2009
@@ -64,13 +64,15 @@
 
        self.lb1.AppendItems(self.scene.nrrdFiles)
        self.lb2.AppendItems(self.scene.nrrdFiles2)
-       
-#    def OnKeyDown(self, evt):
-#        keycode = evt.GetKeyCode()
-#        print "here"
-#        print keycode
-#        if keycode == wx.WXK_ESCAPE:
-#            self.Close(True)
+
+       panel.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+       panel.SetFocus()
+
+    def OnKeyDown(self, evt):
+        keycode = evt.GetKeyCode()
+        if (keycode == wx.WXK_ESCAPE):
+           self.Close()
+        evt.Skip()
 
     def OnClickOk(self, evt):
        items = []
@@ -221,6 +223,14 @@
        sizer.Add(hSizer2,0, wx.ALL|wx.ALIGN_LEFT, 10)
 
        panel.SetSizer(sizer)
+       panel.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+       panel.SetFocus()
+
+    def OnKeyDown(self, evt):
+        keycode = evt.GetKeyCode()
+        if (keycode == wx.WXK_ESCAPE):
+           self.Close()
+        evt.Skip()
        
 
     def addSpinner(self, where, value, id=wx.ID_ANY):
@@ -315,6 +325,14 @@
        self.Refresh()
 
        self.Bind( wx.EVT_CLOSE, self.OnCloseWindow )
+       panel.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+       panel.SetFocus()
+
+    def OnKeyDown(self, evt):
+        keycode = evt.GetKeyCode()
+        if (keycode == wx.WXK_ESCAPE):
+           self.Close()
+        evt.Skip()
 
 
     def OnCloseWindow( self, evt ):
@@ -553,6 +571,14 @@
        self.Bind(wx.EVT_CHECKBOX, self.OnClickLockFrames, self.checkBox)
        self.Bind(wx.EVT_CHECKBOX, self.OnClickLoop, self.checkBox2)
        self.Bind(wx.EVT_CHECKBOX, self.OnClickAO, self.aoCB)
+       panel.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+       panel.SetFocus()
+
+    def OnKeyDown(self, evt):
+        keycode = evt.GetKeyCode()
+        if (keycode == wx.WXK_ESCAPE):
+           self.Close()
+        evt.Skip()
 
     def OnClickBigger(self, evt):
         self.scene.biggify = evt.IsChecked()
@@ -702,6 +728,14 @@
 
        self.Bind(wx.EVT_BUTTON, self.OnClickOK, self.okButton)
        self.Bind(wx.EVT_BUTTON, self.OnClickCancel, self.cancelButton)
+       panel.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+       panel.SetFocus()
+
+    def OnKeyDown(self, evt):
+        keycode = evt.GetKeyCode()
+        if (keycode == wx.WXK_ESCAPE):
+           self.Close()
+        evt.Skip()
 
     def EvtChoiceTF(self, e):
        print "choice"

Modified: trunk/scenes/csafe/python/TransferF.py
==============================================================================
--- trunk/scenes/csafe/python/TransferF.py      (original)
+++ trunk/scenes/csafe/python/TransferF.py      Thu Jan  8 04:19:41 2009
@@ -54,7 +54,6 @@
     def MoveColor(self, index, pos):
         c = (  pos, self.colors[index][1],self.colors[index][2], 
self.colors[index][3], self.colors[index][4] ) 
         # c = ( 0.5 , 1, 0, 0, 1)
-        # print index
         self.colors[index] = c
         # self.colors.sort()
             
@@ -99,10 +98,6 @@
         if (colors[len(colors) - 1][0] < pos):
             index2 = len(colors) - 1
         
-        
-        # print index1
-        # print index2
-        
         pos1 = colors[index1][0]
         pos2 = colors[index2][0]
         amt1 = amt2 = 0.5
@@ -171,7 +166,6 @@
         
         
     def OnKeyDown(self, evt):
-        print "keyyed"
         if evt.GetKeyCode() == wx.WXK_DELETE and self.dSelected != None:
             self.transferF.RemoveColor(self.dSelected)
             self.Update()
@@ -183,7 +177,6 @@
         # did they click on a color picker?
         clicked = False
         index = -1
-        # print evt.GetPosition().x
         for i in range(len(self.transferF.colors)):
             if abs(x - self.transferF.colors[i][0]*self.width) < 
self.colorSelectorWidth/2.0:
                 clicked = True 
@@ -199,9 +192,6 @@
             if dlg.ShowModal() == wx.ID_OK:
                originalC = self.transferF.GetColorAtIndex(index)
                 data = dlg.GetColourData()
-                print "selected color:"
-                print data.GetColour().Get()
-                print index
                 c = data.GetColour().Get()
                 color = []
                 color.append(c[0])
@@ -211,8 +201,6 @@
                 color[0] /= 255.0
                 color[1] /= 255.0
                 color[2] /= 255.0
-                # print color[0]
-                # print color[1]
                 self.transferF.SetColor(index, color)
                 self.Update()
                 self.Refresh()
@@ -226,9 +214,6 @@
             
             if dlg.ShowModal() == wx.ID_OK:
                 data = dlg.GetColourData()
-                print "selected color:"
-                print data.GetColour().Get()
-                print index
                 c = data.GetColour().Get()
                 color = []
                 color.append(c[0])
@@ -239,8 +224,6 @@
                 color[1] /= 255.0
                 color[2] /= 255.0
                 pos = float(x)/float(self.width)
-                # print color[0]
-                # print color[1]
                 self.transferF.AddColor( color, pos)
                 self.Update()
                 
@@ -260,7 +243,6 @@
         x = evt.GetPosition().x - self.paddingW/2.0
         if self.selected == None:
             index = -1
-            # print evt.GetPosition().x
             for i in range(len(self.transferF.colors)):
                 if abs(x - self.transferF.colors[i][0]*self.width) < 
self.colorSelectorWidth/2.0:
                     clicked = True 
@@ -371,8 +353,6 @@
                 color[0] /= 255.0
                 color[1] /= 255.0
                 color[2] /= 255.0
-                # print color[0]
-                # print color[1]
                 self.transferF.SetColor(self.dSelected, color)
                 self.Update()
                 self.Refresh()
@@ -550,4 +530,4 @@
             self.transferFPanel.histogramGroup.SetTransferF(transferF)
         
     def SetUpdateFunction(self, function):
-        print ""
+        None

Modified: trunk/scenes/csafe/python/csafe_scene.py
==============================================================================
--- trunk/scenes/csafe/python/csafe_scene.py    (original)
+++ trunk/scenes/csafe/python/csafe_scene.py    Thu Jan  8 04:19:41 2009
@@ -79,7 +79,7 @@
         self.panel = scrolled.ScrolledPanel(self,-1, style= wx.TAB_TRAVERSAL)
         self.scene = SceneInfo.Scene()
         self.volPosSizeFrame = None
-        self.addRemoveFilesFrame = None
+        self.BBoxFrameMenuItem = None
 
         # CurrentHistogram is the histogram being edited.  
currentParticleHistogram may also
         # be the currentHistogram, but always denotes the histogram 
currently chosen
@@ -167,12 +167,12 @@
         wx.ToolTip.Enable( setup.tooltipsOn )
 
     def Menu205(self, evt):
-        if( self.addRemoveDataFilesMenu == None ) :
-            self.addRemoveDataFilesMenu = SceneMenus.BBoxFrame(self, -1, 
"Bounding Box", self.scene)
+        #if( self.BBoxFrameMenuItem == None ) :
+        self.BBoxFrameMenuItem = SceneMenus.BBoxFrame(self, -1, "Bounding 
Box", self.scene)
 
-        moveToMouse( self.addRemoveDataFilesMenu )
-        self.addRemoveDataFilesMenu.Raise()
-        self.addRemoveDataFilesMenu.Show(True)
+        moveToMouse( self.BBoxFrameMenuItem )
+        self.BBoxFrameMenuItem.Raise()
+        self.BBoxFrameMenuItem.Show(True)
 
     def MenuVolPositionSize(self, evt):
         if( self.volPosSizeFrame == None ) :
@@ -395,9 +395,9 @@
         self.scene.test.updateSphereCMap()
 
     def OnClick(self, evt):
-        print "clicked main"
+        None
     def OnKeyDown(self, event):
-        print "key down"
+        None
     def OnClickColor(self, evt):
         dlg = wx.ColourDialog(self)
         dlg.GetColourData().SetChooseFull(True)
@@ -628,7 +628,6 @@
         self.Refresh()
 
     def OnSlider(self, e):
-        print str("on slider:") + str(self.slider.GetValue())
         if (int(self.slider.GetValue()) > 0):
             self.test.gotoFrame(int(self.slider.GetValue()) - 1)
 
@@ -674,7 +673,7 @@
 setup  = Setup()
 
 def initialize_scene( frame, engine ):
-    print "setup"
+    None
 
 
 def usage( badArgs=[] ):

---

• [Manta] r2365 - trunk/scenes/csafe/python, brownlee, 01/08/2009

---

Archive powered by MHonArc 2.6.16.