Skip to content

Commit b78bba7

Browse files
c-morleyc-morley
committed
qtdragon_hd -add a PDF page rather then use system PDF viewer
1 parent 2fd174f commit b78bba7

2 files changed

Lines changed: 67 additions & 10 deletions

File tree

‎share/qtvcp/screens/qtdragon_hd/qtdragon_hd.ui‎

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,6 +3944,57 @@ TO FILE</string>
39443944
<property name="spacing">
39453945
<number>4</number>
39463946
</property>
3947+
<item>
3948+
<widget class="QTabWidget" name="tabWidget_setup">
3949+
<property name="sizePolicy">
3950+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
3951+
<horstretch>0</horstretch>
3952+
<verstretch>0</verstretch>
3953+
</sizepolicy>
3954+
</property>
3955+
<property name="currentIndex">
3956+
<number>1</number>
3957+
</property>
3958+
<widget class="QWidget" name="tabHTML">
3959+
<attribute name="title">
3960+
<string>HTML</string>
3961+
</attribute>
3962+
<layout class="QVBoxLayout" name="layout_HTML">
3963+
<property name="leftMargin">
3964+
<number>0</number>
3965+
</property>
3966+
<property name="topMargin">
3967+
<number>0</number>
3968+
</property>
3969+
<property name="rightMargin">
3970+
<number>0</number>
3971+
</property>
3972+
<property name="bottomMargin">
3973+
<number>0</number>
3974+
</property>
3975+
</layout>
3976+
</widget>
3977+
<widget class="QWidget" name="tabPDF">
3978+
<attribute name="title">
3979+
<string>PDF</string>
3980+
</attribute>
3981+
<layout class="QHBoxLayout" name="layout_PDF">
3982+
<property name="leftMargin">
3983+
<number>0</number>
3984+
</property>
3985+
<property name="topMargin">
3986+
<number>0</number>
3987+
</property>
3988+
<property name="rightMargin">
3989+
<number>0</number>
3990+
</property>
3991+
<property name="bottomMargin">
3992+
<number>0</number>
3993+
</property>
3994+
</layout>
3995+
</widget>
3996+
</widget>
3997+
</item>
39473998
</layout>
39483999
</item>
39494000
</layout>
@@ -14235,7 +14286,7 @@ ANGULAR</string>
1423514286
<number>2</number>
1423614287
</property>
1423714288
<property name="text">
14238-
<string>08:14:12 PM</string>
14289+
<string>09:01:22 PM</string>
1423914290
</property>
1424014291
<property name="alignment">
1424114292
<set>Qt::AlignCenter</set>
@@ -15234,7 +15285,7 @@ ANGULAR</string>
1523415285
<slot>tab_utilities_changed()</slot>
1523515286
</slots>
1523615287
<buttongroups>
15237-
<buttongroup name="mode_buttonGroup"/>
1523815288
<buttongroup name="page_buttonGroup"/>
15289+
<buttongroup name="mode_buttonGroup"/>
1523915290
</buttongroups>
1524015291
</ui>

‎share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from qtvcp.lib.writer import writer
1010
from qtvcp.lib.keybindings import Keylookup
1111
from qtvcp.lib.gcodes import GCodes
12+
from qtvcp.lib.qt_pdf import PDFViewer
1213
from qtvcp.core import Status, Action, Info, Path, Qhal
1314
from qtvcp import logger
1415
from shutil import copyfile
@@ -289,7 +290,7 @@ def init_widgets(self):
289290
# web view widget for SETUP page
290291
if self.w.web_view:
291292
self.toolBar = QtWidgets.QToolBar(self.w)
292-
self.w.layout_setup.addWidget(self.toolBar)
293+
self.w.tabWidget_setup.setCornerWidget(self.toolBar)
293294

294295
self.backBtn = QtWidgets.QPushButton(self.w)
295296
self.backBtn.setEnabled(True)
@@ -311,13 +312,19 @@ def init_widgets(self):
311312
self.writeBtn.clicked.connect(self.writer)
312313
self.toolBar.addWidget(self.writeBtn)
313314

314-
self.w.layout_setup.addWidget(self.w.web_view)
315+
self.w.layout_HTML.addWidget(self.w.web_view)
315316
if os.path.exists(self.default_setup):
316317
self.w.web_view.load(QtCore.QUrl.fromLocalFile(self.default_setup))
317318
else:
318319
self.w.web_view.setHtml(self.html)
319320
except Exception as e:
320321
print("No default setup file found - {}".format(e))
322+
323+
# PDF setup page
324+
self.PDFView = PDFViewer.PDFView()
325+
self.w.layout_PDF.addWidget(self.PDFView)
326+
self.PDFView.loadSample('setup_tab')
327+
321328
# set up spindle gauge
322329
self.w.gauge_spindle.set_max_value(self.max_spindle_rpm)
323330
self.w.gauge_spindle.set_max_reading(self.max_spindle_rpm / 1000)
@@ -903,12 +910,12 @@ def load_code(self, fname):
903910
self.w.web_view.setHtml(self.html)
904911

905912
# look for PDF setup files
906-
# load it with system program
907913
fname = filename+'.pdf'
908914
if os.path.exists(fname):
909-
url = QtCore.QUrl.fromLocalFile(fname)
910-
QtGui.QDesktopServices.openUrl(url)
915+
self.PDFView.loadView(fname)
911916
self.add_status("Loaded PDF file : {}".format(fname))
917+
else:
918+
self.PDFView.loadSample('setup_tab')
912919
return
913920

914921
if file_extension == ".html":
@@ -921,10 +928,9 @@ def load_code(self, fname):
921928
except Exception as e:
922929
print("Error loading HTML file : {}".format(e))
923930
else:
924-
# load PDF with system program
931+
# load PDF into setup page
925932
if os.path.exists(fname):
926-
url = QtCore.QUrl.fromLocalFile(fname)
927-
QtGui.QDesktopServices.openUrl(url)
933+
self.PDFView.loadView(fname)
928934
self.add_status("Loaded PDF file : {}".format(fname))
929935

930936
def disable_spindle_pause(self):

0 commit comments

Comments
 (0)