Merge remote-tracking branch 'origin/develop' into develop

PyLoT.py

@@ -254,7 +254,7 @@ class MainWindow(QMainWindow):
             self._inputs.export2File(infile)
         self.infile = infile
 
-    def setupUi(self, use_logwidget=True):
+    def setupUi(self, use_logwidget=False):
         try:
             self.startTime = min(
                 [tr.stats.starttime for tr in self.data.wfdata])
@@ -734,11 +734,9 @@ class MainWindow(QMainWindow):
         if use_logwidget:
             self.logwidget = LogWidget(parent=None)
             self.logwidget.show()
-            self.stdout = self.logwidget.stdout
-            self.stderr = self.logwidget.stderr
 
-            sys.stdout = self.stdout
-            sys.stderr = self.stderr
+            sys.stdout = self.logwidget.stdout
+            sys.stderr = self.logwidget.stderr
 
         self.setCentralWidget(_widget)
 

README.md

@@ -24,10 +24,10 @@ It is highly recommended to use Anaconda for a simple creation of a Python insta
 
 Afterwards run (from the PyLoT main directory where the files *requirements.txt* and *pylot.yml* are located)
 
-    conda create --name pylot_38 --file requirements.txt
+    conda env create -f pylot.yml
 or
     
-    conda env create -f pylot.yml
+    conda create --name pylot_38 --file requirements.txt
 
 to create a new Anaconda environment called "pylot_38".
 

pylot/core/util/widgets.py

@@ -120,7 +120,7 @@ class LogWidget(QtWidgets.QWidget):
         self.layout.addWidget(self.tabs)
 
     def active_error(self):
-        if self.current_active_error == False:
+        if not self.current_active_error:
             self.current_active_error = True
             self.show()
             self.activateWindow()