diff --git a/PyLoT.py b/PyLoT.py index 0c07a316..739b7100 100755 --- a/PyLoT.py +++ b/PyLoT.py @@ -493,7 +493,6 @@ class MainWindow(QMainWindow): icon=eventlist_xml_icon, tip='Create an Eventlist from a XML File') self.eventlist_xml_action.setEnabled(False) - printAction = self.createAction(self, "&Print event ...", self.show_event_information, QKeySequence.Print, print_icon, @@ -1404,6 +1403,8 @@ class MainWindow(QMainWindow): for id, event in enumerate(self.project.eventlist): event_path = event.path + #phaseErrors = {'P': self._inputs['timeerrorsP'], + # 'S': self._inputs['timeerrorsS']} man_au_picks = {'manual': event.pylot_picks, 'auto': event.pylot_autopicks} @@ -1472,6 +1473,7 @@ class MainWindow(QMainWindow): for picktype, item_np in [('manual', item_nmp), ('auto', item_nap)]: npicks_str = f"{npicks[picktype]['P']}|{npicks[picktype]['S']}" + #npicks_str += f"({npicks_total[picktype]['P']}/{npicks_total[picktype]['S']})" item_np.setText(npicks_str) item_ref = QStandardItem() # str(event_ref)) @@ -1716,6 +1718,8 @@ class MainWindow(QMainWindow): for tr in self.get_data().wfdata.select(component=ch).traces: traces[tr.stats.station][ch] = tr + names.sort() + a = self.get_current_event() print (self.get_data().wfdata.traces[0]) @@ -1725,6 +1729,14 @@ class MainWindow(QMainWindow): self.tabs.setCurrentIndex(3) figCanvas = test.makeSpecFig(direction=self.dispComponent, height = height, width = width, parent = self.tabs.widget) return figCanvas + #self.spectro_layout.addWidget() + # self.get_data().wfdata.spectrogram() + # self.tabs.addTab(figCanvas, 'Spectrogram') + # self.tabs[3] = figCanvas + # self.refreshTabs() + # test.show() + + def compareMulti(self): if not self.compareoptions: @@ -1884,6 +1896,7 @@ class MainWindow(QMainWindow): # which will read in data input twice. Therefore current tab is changed to 0 # in loadProject before calling this function. self.fill_eventbox() + #print(f'{self.get_current_event()=}') plotted = False if self.tabs.currentIndex() == 2: self.init_event_table() @@ -1977,8 +1990,8 @@ class MainWindow(QMainWindow): if len(curr_event.origins) > 0: origin_time = curr_event.origins[0].time - tstart = settings.value('tstart') if get_None(settings.value('tstart')) else 0 - tstop = settings.value('tstop') if get_None(settings.value('tstop')) else 0 + tstart = settings.value('tstart') if get_none(settings.value('tstart')) else 0 + tstop = settings.value('tstop') if get_none(settings.value('tstop')) else 0 tstart = origin_time + float(tstart) tstop = origin_time + float(tstop) else: @@ -2293,7 +2306,7 @@ class MainWindow(QMainWindow): # wfst += self.get_data().getWFData().select(component=alter_comp) plotWidget = self.getPlotWidget() self.adjustPlotHeight() - if get_bool(settings.value('large_dataset')): + if get_bool(settings.value('large_dataset')) == True: self.plot_method = 'fast' else: self.plot_method = 'normal' diff --git a/pylot/core/util/utils.py b/pylot/core/util/utils.py index ffd9a077..ff85a0ef 100644 --- a/pylot/core/util/utils.py +++ b/pylot/core/util/utils.py @@ -1084,7 +1084,7 @@ def check4rotated(data, metadata=None, verbosity=1): # check if any traces in this station need to be rotated trace_ids = [trace.id for trace in wfs_in] if not rotation_required(trace_ids): - print(f"Stream does not need any rotation: Traces are {trace_ids=}") + logging.debug(f"Stream does not need any rotation: Traces are {trace_ids=}") return wfs_in # check metadata quality @@ -1096,7 +1096,7 @@ def check4rotated(data, metadata=None, verbosity=1): azimuths.append(metadata.get_coordinates(tr_id, t_start)['azimuth']) dips.append(metadata.get_coordinates(tr_id, t_start)['dip']) except (KeyError, TypeError) as err: - print(f"{type(err)=} occurred: {err=} Rotating not possible, not all azimuth and dip information " + logging.error(f"{type(err)=} occurred: {err=} Rotating not possible, not all azimuth and dip information " f"available in metadata. Stream remains unchanged.") return wfs_in except Exception as err: