Skip to content

Delayed reporting - added button to generate html/charts on the report tab #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 11, 2023
Merged

Delayed reporting - added button to generate html/charts on the report tab #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c32989e
Delayed reporting - added button to generate html/charts.
rozyczko Nov 29, 2022
fabcfe2
try without pyobjc
rozyczko Jan 6, 2023
9af154e
try with version >=9.0
rozyczko Jan 6, 2023
93a335d
test >8.5
rozyczko Jan 6, 2023
f932db4
is this a python 3.8 issue?
rozyczko Jan 6, 2023
8df607e
update the workflow for 3.9
rozyczko Jan 6, 2023
21b60e4
temporarily skip the gui test
rozyczko Jan 9, 2023
6cfadf1
python 3.8 with pyobjc=3.7
rozyczko Jan 10, 2023
d104b82
go back to 7.0.1 with universal2 binaries
rozyczko Jan 10, 2023
22428a2
try building pyobjc locally
rozyczko Jan 10, 2023
c02ed1f
explicit version for pyobjc
rozyczko Jan 10, 2023
31fd269
Use macos only and bump the versions
rozyczko Jan 10, 2023
7f694dc
switch on all platforms
rozyczko Jan 11, 2023
cbf502f
enable tutorials, clean up
rozyczko Jan 11, 2023
bb6743c
back to the original code for PR merge
rozyczko Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions easyDiffractionApp/Gui/Pages/Summary/MainContentReport.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,18 @@ Item {
saveConfirmationDialog.open()
}

// handlers for clicking the "Create Report" button in the side bar
signal reportRequested()
onReportRequested: {
ExGlobals.Constants.proxy.project.setReport(html)
webView.loadHtml(html)
}

Component.onCompleted: {
ExGlobals.Variables.reportWebView = this
// Notify the python proxies
ExGlobals.Constants.proxy.project.htmlExportingFinished.connect(htmlExportingFinished)
ExGlobals.Constants.proxy.project.reportRequested.connect(reportRequested)
}
}

Expand Down Expand Up @@ -135,14 +144,23 @@ Item {
}
}

//}

onHtmlChanged: {
//print(html)
ExGlobals.Constants.proxy.project.setReport(html)
webView.loadHtml(html)
// when the state changes, the html display is reset
const list = [
'<!DOCTYPE html>',
'<html>\n',
'<head>\n',
head+'\n',
'</head>\n',
'<body>\n',
'</body>\n',
'</html>'
]
const empty_html = list.join('\n')
ExGlobals.Constants.proxy.project.setReport(empty_html)
webView.loadHtml(empty_html)
}

/////////////
// HTML parts
/////////////
Expand Down
23 changes: 21 additions & 2 deletions easyDiffractionApp/Gui/Pages/Summary/SideBarBasic.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,29 @@ import Gui.Pages.Summary 1.0 as ExSummaryPage

EaComponents.SideBarColumn {

EaElements.GroupBox {
title: qsTr("Create report")
enabled: !ExGlobals.Constants.proxy.project.readOnly
collapsible: false
last: true

// Create button
EaElements.SideBarButton {
wide: true
fontIcon: "flask"
text: qsTr("Create")

onClicked: {
ExGlobals.Constants.proxy.project.requestReport()
}

Component.onCompleted: ExGlobals.Variables.exportReportButton = this
}
}

EaElements.GroupBox {
title: qsTr("Export report")
enabled: ExGlobals.Constants.proxy.project.projectCreated &&
!ExGlobals.Constants.proxy.project.readOnly
enabled: !ExGlobals.Constants.proxy.project.readOnly
collapsible: false
last: true

Expand Down
8 changes: 8 additions & 0 deletions easyDiffractionApp/Logic/Proxies/Project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class ProjectProxy(QObject):
stateChanged = Signal(bool)
htmlExportingFinished = Signal(bool, str)
statusInfoChanged = Signal()
reportRequested = Signal()

def __init__(self, parent=None, logic=None): # , interface=None):
super().__init__(parent)
Expand Down Expand Up @@ -131,6 +132,13 @@ def saveReport(self, filepath):
success = self.logic.saveReport(filepath)
self.htmlExportingFinished.emit(success, filepath)

@Slot()
def requestReport(self):
"""
Request a report generation
"""
self.reportRequested.emit()

# status
@Property('QVariant', notify=statusInfoChanged)
def statusModelAsObj(self):
Expand Down