Changeset 1031 for SHX/trunk

Timestamp:

08/19/2015 08:38:41 PM (5 years ago)

Author:

klaus

Message:

remove exceptions and stay_on_top flag

File:

• SHX/trunk/SeismicHandler/modules/wx_.py (modified) (3 diffs)

SHX/trunk/SeismicHandler/modules/wx_.py

@@ -598 +598 @@
         _picks = []
         for t in self.traces:
-            try:
+            if 'picks' not in t.shx.keys():
+                #continue
+                picks = []
+            else:
                 picks = t.shx.picks
-            except KeyError:
-                continue
+            #try:
+            #    picks = t.shx.picks
+            #except KeyError:
+            #    continue
 
             for mode in picks:
@@ -975 +980 @@
                 data = t.data
             else:
-                data = t.get_datawindow(*timewindow)
+                data = t.get_datawindow(*self._timewindow)  #? KS 13-Aug-15
             t_ampl = abs(data.max())
             if t_ampl > amplitude:
@@ -1013 +1018 @@
         wx.Frame.__init__(self, parent, title=title, size=size,
               style=wx.DEFAULT_FRAME_STYLE | wx.FULL_REPAINT_ON_RESIZE |
-                    wx.STAY_ON_TOP | wx.FRAME_FLOAT_ON_PARENT)
+                    wx.FRAME_FLOAT_ON_PARENT)
 
         self.SetPosition(position)