diff --git a/doku/jens.jpg b/doku/jens.jpg new file mode 100644 index 0000000..7de168a Binary files /dev/null and b/doku/jens.jpg differ diff --git a/doku/tesMd.md b/doku/tesMd.md new file mode 100644 index 0000000..46340d5 --- /dev/null +++ b/doku/tesMd.md @@ -0,0 +1,8 @@ +### Erster Test +1. lets go +2. oder was +3. naja + +___ + +![](jens.jpg) \ No newline at end of file diff --git a/doku/tesMd.md.backup b/doku/tesMd.md.backup new file mode 100644 index 0000000..6060cda --- /dev/null +++ b/doku/tesMd.md.backup @@ -0,0 +1,7 @@ +### Erster Test +1. lets go +2. oder was +3. naja + +___ + diff --git a/doku/testMd.html b/doku/testMd.html new file mode 100644 index 0000000..479202e --- /dev/null +++ b/doku/testMd.html @@ -0,0 +1,9 @@ +

Erster Test

+
    +
  1. lets go
    2. +
  2. oder was
    3. +
  3. naja
    4. +
+
+

+ \ No newline at end of file diff --git a/poseidon_controller_gui2.py b/gui2.py similarity index 98% rename from poseidon_controller_gui2.py rename to gui2.py index eae78b5..4c32bc5 100644 --- a/poseidon_controller_gui2.py +++ b/gui2.py @@ -2,7 +2,7 @@ # 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 # 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.gridLayout_4.addLayout(self.horizontalLayout_19, 2, 0, 1, 1) 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) MainWindow.setCentralWidget(self.centralwidget) self.status_bar_DISP = QtWidgets.QStatusBar(MainWindow) @@ -860,7 +873,7 @@ class Ui_MainWindow(object): self.menuBar.addAction(self.menuFile.menuAction()) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(3) + self.tabWidget.setCurrentIndex(4) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): @@ -924,7 +937,7 @@ class Ui_MainWindow(object): self.openRheo_btn.setText(_translate("MainWindow", "open port")) self.closeRheo_btn.setText(_translate("MainWindow", "close port")) 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(1, _translate("MainWindow", "5")) 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_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")) self.menuFile.setTitle(_translate("MainWindow", "File")) self.load_settings_INPUT.setText(_translate("MainWindow", "Load settings")) self.save_settings_INPUT.setText(_translate("MainWindow", "Save settings")) self.load_settings_BTN.setText(_translate("MainWindow", "Load settings")) self.save_settings_BTN.setText(_translate("MainWindow", "Save settings")) +from PyQt5 import QtWebEngineWidgets if __name__ == "__main__": diff --git a/poseidon_controller_gui2.ui b/gui2.ui similarity index 98% rename from poseidon_controller_gui2.ui rename to gui2.ui index 8e0bad3..28e7086 100644 --- a/poseidon_controller_gui2.ui +++ b/gui2.ui @@ -30,7 +30,7 @@ QTabWidget::Triangular - 3 + 4 @@ -1353,7 +1353,7 @@ - 50 + 1 @@ -1557,6 +1557,32 @@ + + + Doku + + + + + 19 + 19 + 1011 + 741 + + + + + + + + file:///C:/Users/jens/ownCloud/www/jfs/git2022/jfsPoseidon/test.html + + + + + + + @@ -1604,6 +1630,13 @@ + + + QWebEngineView + QWidget +
QtWebEngineWidgets/QWebEngineView
+ + diff --git a/jfs_info.txt b/jfs_info.txt index 8e9b707..9fc09f5 100644 --- a/jfs_info.txt +++ b/jfs_info.txt @@ -11,4 +11,7 @@ pip install pyinstaller pyqt5 pip install PyQtWebEngine ... -conda deactivate \ No newline at end of file +conda deactivate + + +pyuic5 -x {your ui file.ui} -o {output py file.py} \ No newline at end of file diff --git a/jfs_main01.py b/jfs_main01.py index 828d013..46c4170 100644 --- a/jfs_main01.py +++ b/jfs_main01.py @@ -1,6 +1,6 @@ from poseidon_main import MainWindow, Thread -import sys, time +import sys, time, os import serial from PyQt5 import QtCore, QtWidgets import pyqtgraph as pg @@ -50,6 +50,13 @@ class MainWindow2( MainWindow): self.ui.pushButton_4.clicked.connect(self.sendRheoInject) 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 def setFrequency(self): s = self.ui.lineEdit.text() diff --git a/poseidon_main.py b/poseidon_main.py index b0de345..17811bf 100644 --- a/poseidon_main.py +++ b/poseidon_main.py @@ -21,7 +21,7 @@ import cv2 import numpy as np from decimal import Decimal # This is our window from QtCreator -import poseidon_controller_gui2 +import gui2 import pdb import traceback, sys @@ -96,7 +96,7 @@ class CannotConnectException(Exception): # ####################### # 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 @@ -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 super(MainWindow, self).__init__() - self.ui = poseidon_controller_gui2.Ui_MainWindow() + self.ui = gui2.Ui_MainWindow() self.ui.setupUi(self) #====================================== Jfs Display try diff --git a/show_html.py b/scrap/show_html.py similarity index 100% rename from show_html.py rename to scrap/show_html.py diff --git a/systemHtml.py b/scrap/systemHtml.py similarity index 100% rename from systemHtml.py rename to scrap/systemHtml.py diff --git a/test.html b/scrap/test.html similarity index 100% rename from test.html rename to scrap/test.html