Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						050b9fb0c4
					
				
							
								
								
									
										4
									
								
								PyLoT.py
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								PyLoT.py
									
									
									
									
									
								
							| @ -716,14 +716,14 @@ class MainWindow(QMainWindow): | ||||
|         self.tabs.addTab(wf_tab, 'Waveform Plot') | ||||
|         self.tabs.addTab(array_tab, 'Array Map') | ||||
|         self.tabs.addTab(events_tab, 'Eventlist') | ||||
|         self.tabs.addTab(spectro_tab, 'Spectro') | ||||
|         #self.tabs.addTab(spectro_tab, 'Spectro') | ||||
| 
 | ||||
|         self.wf_layout.addWidget(self.no_data_label) | ||||
|         self.wf_layout.addWidget(self.wf_scroll_area) | ||||
|         self.wf_scroll_area.setWidgetResizable(True) | ||||
|         self.init_array_tab() | ||||
|         self.init_event_table() | ||||
|         self.init_spectro_tab() | ||||
|         #self.init_spectro_tab() | ||||
|         self.tabs.setCurrentIndex(0) | ||||
| 
 | ||||
|         self.eventLabel = QLabel() | ||||
|  | ||||
| @ -59,6 +59,8 @@ class Metadata(object): | ||||
|         :type path_to_inventory: str | ||||
|         :return: None | ||||
|         """ | ||||
|         path_to_inventory = path_to_inventory.replace('\\', '/') | ||||
|         path_to_inventory = os.path.abspath(path_to_inventory) | ||||
|         assert (os.path.isdir(path_to_inventory)), '{} is no directory'.format(path_to_inventory) | ||||
|         if path_to_inventory not in self.inventories: | ||||
|             self.inventories.append(path_to_inventory) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user