diff --git a/jfs_info.txt b/doku/jfs_info.txt similarity index 100% rename from jfs_info.txt rename to doku/jfs_info.txt diff --git a/doku/tesMd.md b/doku/tesMd.md index 46340d5..3861b0e 100644 --- a/doku/tesMd.md +++ b/doku/tesMd.md @@ -5,4 +5,47 @@ ___ -![](jens.jpg) \ No newline at end of file + +
+ +--- +> Aufbau +> +> - Syringe +>> +> - Photomultiplyer +> +> **Abbau** + + + This is a python THing + lets do it now + + + +`ok in an imperial way` then + +I Love My **[science](https://science.jefro.de)** + +#### Entwicklung + +``` +- [ ] Juni 2022 +- [ ] This creates an Environment for the Software based on +- [ ] poseidon https://github.com/pachterlab/poseidon +- [ ] PyQtGraph https://www.pyqtgraph.org/ + +conda create --name piPyGra +conda activate piPyGra +conda install -c conda-forge pyqtgraph +conda install pyserial +pip install pyinstaller pyqt5 +pip install PyQtWebEngine +.... work ... +conda deactivate + +conda activate PiPyGra +Ananconda prompt designer +pyuic5 -x gui2.ui -o gui2.py + +``` diff --git a/doku/tesMd.md.backup b/doku/tesMd.md.backup index 6060cda..3861b0e 100644 --- a/doku/tesMd.md.backup +++ b/doku/tesMd.md.backup @@ -5,3 +5,47 @@ ___ + +
+ +--- +> Aufbau +> +> - Syringe +>> +> - Photomultiplyer +> +> **Abbau** + + + This is a python THing + lets do it now + + + +`ok in an imperial way` then + +I Love My **[science](https://science.jefro.de)** + +#### Entwicklung + +``` +- [ ] Juni 2022 +- [ ] This creates an Environment for the Software based on +- [ ] poseidon https://github.com/pachterlab/poseidon +- [ ] PyQtGraph https://www.pyqtgraph.org/ + +conda create --name piPyGra +conda activate piPyGra +conda install -c conda-forge pyqtgraph +conda install pyserial +pip install pyinstaller pyqt5 +pip install PyQtWebEngine +.... work ... +conda deactivate + +conda activate PiPyGra +Ananconda prompt designer +pyuic5 -x gui2.ui -o gui2.py + +``` diff --git a/doku/testMd.html b/doku/testMd.html index 479202e..f5bbf17 100644 --- a/doku/testMd.html +++ b/doku/testMd.html @@ -5,5 +5,44 @@
  • naja

  • -

    + +
    +
    +
    +

    Aufbau

    + +
    +
    + +

    Abbau

    +
    +
    This is a python THing
    +lets do it now
    +
    +

    ok in an imperial way then

    +

    I Love My science

    +

    Entwicklung

    +
    - [ ] Juni 2022
    +- [ ] This creates an Environment for the Software based on 
    +- [ ] poseidon https://github.com/pachterlab/poseidon
    +- [ ] PyQtGraph https://www.pyqtgraph.org/
    +
    +conda create --name piPyGra
    +conda activate piPyGra
    +conda install -c conda-forge pyqtgraph
    +conda install pyserial
    +pip install pyinstaller pyqt5
    +pip install PyQtWebEngine
    +.... work ... 
    +conda deactivate
    +
    +conda activate PiPyGra
    +Ananconda prompt designer
    +pyuic5 -x gui2.ui -o gui2.py
    +
    +
    \ No newline at end of file diff --git a/gui2.py b/gui2.py index 4c32bc5..e9a6981 100644 --- a/gui2.py +++ b/gui2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'poseidon_controller_gui2.ui' +# Form implementation generated from reading ui file 'gui2.ui' # # Created by: PyQt5 UI code generator 5.15.7 # @@ -824,6 +824,9 @@ class Ui_MainWindow(object): self.pushButton_3 = QtWidgets.QPushButton(self.rheo) self.pushButton_3.setObjectName("pushButton_3") self.horizontalLayout_19.addWidget(self.pushButton_3) + self.label_26 = QtWidgets.QLabel(self.rheo) + self.label_26.setObjectName("label_26") + self.horizontalLayout_19.addWidget(self.label_26) self.pushButton_4 = QtWidgets.QPushButton(self.rheo) self.pushButton_4.setObjectName("pushButton_4") self.horizontalLayout_19.addWidget(self.pushButton_4) @@ -873,7 +876,7 @@ class Ui_MainWindow(object): self.menuBar.addAction(self.menuFile.menuAction()) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(4) + self.tabWidget.setCurrentIndex(3) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): @@ -957,6 +960,7 @@ class Ui_MainWindow(object): self.pushButton_2.setText(_translate("MainWindow", "close port")) self.checkBox_3.setText(_translate("MainWindow", "load")) self.pushButton_3.setText(_translate("MainWindow", "Home")) + self.label_26.setText(_translate("MainWindow", "left")) self.pushButton_4.setText(_translate("MainWindow", "inject..")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.rheo), _translate("MainWindow", "Counter")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Doku")) diff --git a/gui2.ui b/gui2.ui index 28e7086..93b306e 100644 --- a/gui2.ui +++ b/gui2.ui @@ -30,7 +30,7 @@ QTabWidget::Triangular - 4 + 3 @@ -1526,6 +1526,13 @@ + + + + left + + + diff --git a/jfs_main01.py b/jfs_main01.py index 46c4170..40fcc86 100644 --- a/jfs_main01.py +++ b/jfs_main01.py @@ -153,10 +153,12 @@ class MainWindow2( MainWindow): if (xx > 7) or (xx<0): cmd=str(xx)+'\r\n' self.sendToRheo(cmd) + self.getFromRheo() def sendRheoHome(self): cmd=str(3)+'\r\n' self.sendToRheo(cmd) + self.getFromRheo() def sendRheoLoad(self): cmd=str(1)+'\r\n' @@ -172,15 +174,37 @@ class MainWindow2( MainWindow): thread.start() def setwhatsleft(self,xx): - print (f'that left {xx} ') + #print (f'that left {xx} ') + self.ui.label_26.setText(f'left {xx}') def sendRheo(self, sendStr): self.rheo_serial.flushInput() self.rheo_serial.write(sendStr.encode('utf-8')) - cmd=str(5)+'\r\n' - self.rheo_serial.write(sendStr.encode('utf-8')) - inp = self.rheo_serial.readline().decode('utf') + + #cmd=str(5)+'\r\n' + #time.sleep(1) + #self.rheo_serial.write(cmd.encode('utf-8')) + #time.sleep(1) + #inp = self.rheo_serial.readline().decode('utf-8') + #print(inp) + #self.leftsignal.emit(float(inp)) + + def getFromRheo(self): + thread = Thread(self.getRheoVolume) + thread.finished.connect(lambda:self.thread_finished(thread)) + thread.start() + + def getRheoVolume(self): + time.sleep(1) + self.rheo_serial.flushInput() + cmd = str(5)+'\r\n' + self.rheo_serial.write(cmd.encode('utf-8')) + time.sleep(1) + inp = self.rheo_serial.readline().decode('utf-8') + print(inp) self.leftsignal.emit(float(inp)) + + def connectESP32(self):