jens/jfsposeidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dokuordner und Markdown

Browse Source
This commit is contained in:
jens 2022-07-28 14:08:48 +02:00
parent f98949b798
commit dc144acdb1
12 changed files with 92 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doku/jens.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 92 KiB

8
doku/tesMd.md Normal file
View File

@ -0,0 +1,8 @@
### Erster Test
1. lets go
2. oder was
3. naja
___
![](jens.jpg)

7
doku/tesMd.md.backup Normal file
View File

@ -0,0 +1,7 @@
### Erster Test
1. lets go
2. oder was
3. naja
___

9
doku/testMd.html Normal file
View File

@ -0,0 +1,9 @@
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title></title></head><body><h3>Erster Test</h3>
<ol>
<li>lets go</li>
<li>oder was</li>
<li>naja</li>
</ol>
<hr />
<p><img src="jens.jpg" alt="" /></p>
</body></html>

21
poseidon_controller_gui2.py → gui2.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'poseidon_controller_gui2.ui' # Form implementation generated from reading ui file 'poseidon_controller_gui2.ui'
# #
# Created by: PyQt5 UI code generator 5.15.4 # Created by: PyQt5 UI code generator 5.15.7
# #
# WARNING: Any manual changes made to this file will be lost when pyuic5 is # WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing. # run again. Do not edit this file unless you know what you are doing.
@ -835,6 +835,19 @@ class Ui_MainWindow(object):
self.horizontalLayout_19.addItem(spacerItem4) self.horizontalLayout_19.addItem(spacerItem4)
self.gridLayout_4.addLayout(self.horizontalLayout_19, 2, 0, 1, 1) self.gridLayout_4.addLayout(self.horizontalLayout_19, 2, 0, 1, 1)
self.tabWidget.addTab(self.rheo, "") self.tabWidget.addTab(self.rheo, "")
self.tab = QtWidgets.QWidget()
self.tab.setObjectName("tab")
self.verticalLayoutWidget = QtWidgets.QWidget(self.tab)
self.verticalLayoutWidget.setGeometry(QtCore.QRect(19, 19, 1011, 741))
self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
self.verticalLayout_4.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_4.setObjectName("verticalLayout_4")
self.webEngineView = QtWebEngineWidgets.QWebEngineView(self.verticalLayoutWidget)
self.webEngineView.setUrl(QtCore.QUrl("file:///C:/Users/jens/ownCloud/www/jfs/git2022/jfsPoseidon/test.html"))
self.webEngineView.setObjectName("webEngineView")
self.verticalLayout_4.addWidget(self.webEngineView)
self.tabWidget.addTab(self.tab, "")
self.verticalLayout.addWidget(self.tabWidget) self.verticalLayout.addWidget(self.tabWidget)
MainWindow.setCentralWidget(self.centralwidget) MainWindow.setCentralWidget(self.centralwidget)
self.status_bar_DISP = QtWidgets.QStatusBar(MainWindow) self.status_bar_DISP = QtWidgets.QStatusBar(MainWindow)
@ -860,7 +873,7 @@ class Ui_MainWindow(object):
self.menuBar.addAction(self.menuFile.menuAction()) self.menuBar.addAction(self.menuFile.menuAction())
self.retranslateUi(MainWindow) self.retranslateUi(MainWindow)
self.tabWidget.setCurrentIndex(3) self.tabWidget.setCurrentIndex(4)
QtCore.QMetaObject.connectSlotsByName(MainWindow) QtCore.QMetaObject.connectSlotsByName(MainWindow)
def retranslateUi(self, MainWindow): def retranslateUi(self, MainWindow):
@ -924,7 +937,7 @@ class Ui_MainWindow(object):
self.openRheo_btn.setText(_translate("MainWindow", "open port")) self.openRheo_btn.setText(_translate("MainWindow", "open port"))
self.closeRheo_btn.setText(_translate("MainWindow", "close port")) self.closeRheo_btn.setText(_translate("MainWindow", "close port"))
self.label_11.setText(_translate("MainWindow", "Timebase [ms]")) self.label_11.setText(_translate("MainWindow", "Timebase [ms]"))
self.comboBox_tb.setCurrentText(_translate("MainWindow", "50")) self.comboBox_tb.setCurrentText(_translate("MainWindow", "1"))
self.comboBox_tb.setItemText(0, _translate("MainWindow", "1")) self.comboBox_tb.setItemText(0, _translate("MainWindow", "1"))
self.comboBox_tb.setItemText(1, _translate("MainWindow", "5")) self.comboBox_tb.setItemText(1, _translate("MainWindow", "5"))
self.comboBox_tb.setItemText(2, _translate("MainWindow", "10")) self.comboBox_tb.setItemText(2, _translate("MainWindow", "10"))
@ -946,11 +959,13 @@ class Ui_MainWindow(object):
self.pushButton_3.setText(_translate("MainWindow", "Home")) self.pushButton_3.setText(_translate("MainWindow", "Home"))
self.pushButton_4.setText(_translate("MainWindow", "inject..")) 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.rheo), _translate("MainWindow", "Counter"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Doku"))
self.menuFile.setTitle(_translate("MainWindow", "File")) self.menuFile.setTitle(_translate("MainWindow", "File"))
self.load_settings_INPUT.setText(_translate("MainWindow", "Load settings")) self.load_settings_INPUT.setText(_translate("MainWindow", "Load settings"))
self.save_settings_INPUT.setText(_translate("MainWindow", "Save settings")) self.save_settings_INPUT.setText(_translate("MainWindow", "Save settings"))
self.load_settings_BTN.setText(_translate("MainWindow", "Load settings")) self.load_settings_BTN.setText(_translate("MainWindow", "Load settings"))
self.save_settings_BTN.setText(_translate("MainWindow", "Save settings")) self.save_settings_BTN.setText(_translate("MainWindow", "Save settings"))
from PyQt5 import QtWebEngineWidgets
if __name__ == "__main__": if __name__ == "__main__":

37
poseidon_controller_gui2.ui → gui2.ui
View File

@ -30,7 +30,7 @@
<enum>QTabWidget::Triangular</enum> <enum>QTabWidget::Triangular</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>3</number> <number>4</number>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -1353,7 +1353,7 @@
<item> <item>
<widget class="QComboBox" name="comboBox_tb"> <widget class="QComboBox" name="comboBox_tb">
<property name="currentText"> <property name="currentText">
<string>50</string> <string>1</string>
</property> </property>
<item> <item>
<property name="text"> <property name="text">
@ -1557,6 +1557,32 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Doku</string>
</attribute>
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>19</x>
<y>19</y>
<width>1011</width>
<height>741</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QWebEngineView" name="webEngineView">
<property name="url">
<url>
<string>file:///C:/Users/jens/ownCloud/www/jfs/git2022/jfsPoseidon/test.html</string>
</url>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -1604,6 +1630,13 @@
</property> </property>
</action> </action>
</widget> </widget>
<customwidgets>
<customwidget>
<class>QWebEngineView</class>
<extends>QWidget</extends>
<header location="global">QtWebEngineWidgets/QWebEngineView</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

3
jfs_info.txt
View File

@ -12,3 +12,6 @@ pip install PyQtWebEngine
... ...
conda deactivate conda deactivate
pyuic5 -x {your ui file.ui} -o {output py file.py}

9
jfs_main01.py
View File

@ -1,6 +1,6 @@
from poseidon_main import MainWindow, Thread from poseidon_main import MainWindow, Thread
import sys, time import sys, time, os
import serial import serial
from PyQt5 import QtCore, QtWidgets from PyQt5 import QtCore, QtWidgets
import pyqtgraph as pg import pyqtgraph as pg
@ -50,6 +50,13 @@ class MainWindow2( MainWindow):
self.ui.pushButton_4.clicked.connect(self.sendRheoInject) self.ui.pushButton_4.clicked.connect(self.sendRheoInject)
self.leftsignal.connect(self.setwhatsleft) self.leftsignal.connect(self.setwhatsleft)
### Link zur Doku
#self.webEngineView.setUrl(QtCore.QUrl("file:///C:/Users/jens/ownCloud/www/jfs/git2022/jfsPoseidon/test.html"))
file_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "doku\\testMd.html"))
file_path = file_path.replace("\\",'/')
file_path = 'file:///'+file_path
self.ui.webEngineView.setUrl(QtCore.QUrl(file_path))
### ESP32 ### ESP32
def setFrequency(self): def setFrequency(self):
s = self.ui.lineEdit.text() s = self.ui.lineEdit.text()

6
poseidon_main.py
View File

@ -21,7 +21,7 @@ import cv2
import numpy as np import numpy as np
from decimal import Decimal from decimal import Decimal
# This is our window from QtCreator # This is our window from QtCreator
import poseidon_controller_gui2 import gui2
import pdb import pdb
import traceback, sys import traceback, sys
@ -96,7 +96,7 @@ class CannotConnectException(Exception):
# ####################### # #######################
# GUI : MAIN WINDOW CLASS # GUI : MAIN WINDOW CLASS
# ####################### # #######################
class MainWindow(QtWidgets.QMainWindow, poseidon_controller_gui2.Ui_MainWindow): class MainWindow(QtWidgets.QMainWindow, gui2.Ui_MainWindow):
# ======================================================= # =======================================================
# INITIALIZING : The UI and setting some needed variables # INITIALIZING : The UI and setting some needed variables
@ -105,7 +105,7 @@ class MainWindow(QtWidgets.QMainWindow, poseidon_controller_gui2.Ui_MainWindow):
# Setting the UI to a class variable and connecting all GUI Components # Setting the UI to a class variable and connecting all GUI Components
super(MainWindow, self).__init__() super(MainWindow, self).__init__()
self.ui = poseidon_controller_gui2.Ui_MainWindow() self.ui = gui2.Ui_MainWindow()
self.ui.setupUi(self) self.ui.setupUi(self)
#====================================== Jfs Display try #====================================== Jfs Display try

0
show_html.py → scrap/show_html.py
View File

0
systemHtml.py → scrap/systemHtml.py
View File

0
test.html → scrap/test.html
View File