Rename examples (more simple structure)

* BasicMinimalPy to BasicPy
* BasicMinimalC++ to BasicC++
* BasicPy to IntermediatePy
* IntermediatePy to AdvancedPy

Author: AndrewSazonov

EXAMPLES.md

@@ -3,9 +3,9 @@ requires = ['hatchling']
 build-backend = 'hatchling.build'
 
 [project]
-name = 'intermediatepy'
+name = 'advancedpy'
 version = '1.0.0'
-description = 'Example of a desktop application of intermediate complexity with a Python backend and EasyApp-based GUI'
+description = 'Example of a desktop application of advanced complexity with Python backend and EasyApp-based GUI'
 authors = [
   {name = 'Andrew Sazonov', email = '[email protected]'}
 ]
@@ -29,8 +29,8 @@ ci = [
 ]
 
 [project.urls]
-homepage = 'https://github.com/EasyScience/EasyApp/tree/master/examples/IntermediatePy'
+homepage = 'https://github.com/EasyScience/EasyApp/tree/master/examples/AdvancedPy'
 
 [tool.hatch.build.targets.wheel]
-packages = ['src/IntermediatePy']
+packages = ['src/AdvancedPy']
 #artifacts = ['*.py', '*.qml', 'qmldir']

README.md

@@ -0,0 +1,2 @@
+echo "\033[0;34m:::::: Installing python wheel from 'dist/wheel'\033[0m"
+python3 -m pip install advancedpy --force-reinstall --find-links=dist/wheel

examples/IntermediatePy/LICENSE examples/AdvancedPy/LICENSE

@@ -0,0 +1,44 @@
+{
+    "files": [
+        "AdvancedPy.qmlproject",
+        "AdvancedPy/main.py",
+        "AdvancedPy/main.qml",
+        "AdvancedPy/Gui/qmldir",
+        "AdvancedPy/Gui/ApplicationWindow.qml",
+        "AdvancedPy/Gui/StatusBar.qml",
+        "AdvancedPy/Gui/Globals/qmldir",
+        "AdvancedPy/Gui/Globals/ApplicationInfo.qml",
+        "AdvancedPy/Gui/Globals/BackendWrapper.qml",
+        "AdvancedPy/Gui/Globals/References.qml",
+        "AdvancedPy/Gui/Pages/Home/Content.qml",
+        "AdvancedPy/Gui/Pages/Home/Popups/About.qml",
+        "AdvancedPy/Gui/Pages/Project/Layout.qml",
+        "AdvancedPy/Gui/Pages/Project/MainArea/Description.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Basic/Layout.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Basic/Groups/Examples.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Basic/Groups/GetStarted.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Basic/Groups/Recent.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Basic/Popups/OpenCifFile.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Basic/Popups/ProjectDescription.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Extra/Layout.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Extra/Groups/Scrolling.qml",
+        "AdvancedPy/Gui/Pages/Project/Sidebar/Text/Layout.qml",
+        "AdvancedPy/Gui/Pages/Report/Layout.qml",
+        "AdvancedPy/Gui/Pages/Report/MainArea/Summary.qml",
+        "AdvancedPy/Gui/Pages/Report/Sidebar/Basic/Layout.qml",
+        "AdvancedPy/Gui/Pages/Report/Sidebar/Basic/Groups/Export.qml",
+        "AdvancedPy/Gui/Pages/Report/Sidebar/Extra/Layout.qml",
+        "AdvancedPy/Gui/Pages/Report/Sidebar/Extra/Groups/Empty.qml",
+        "AdvancedPy/Backends/qmldir",
+        "AdvancedPy/Backends/MockBackend.qml",
+        "AdvancedPy/Backends/MockQml/Project.qml",
+        "AdvancedPy/Backends/MockQml/Report.qml",
+        "AdvancedPy/Backends/MockQml/Status.qml",
+        "AdvancedPy/Backends/MockQml/qmldir",
+        "AdvancedPy/Backends/real_backend.py",
+        "AdvancedPy/Backends/real_py/helpers.py",
+        "AdvancedPy/Backends/real_py/project.py",
+        "AdvancedPy/Backends/real_py/report.py",
+        "AdvancedPy/Backends/real_py/status.py"
+    ]
+}

examples/IntermediatePy/README.md examples/AdvancedPy/README.md

@@ -1,25 +1,25 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "BasicMinimalPy/main.qml"
+    mainFile: "AdvancedPy/main.qml"
 
     // List of module and plugin directories passed to QML runtime
     importPaths: [
-        "BasicMinimalPy",
+        "AdvancedPy",
         "../../../src",  // EasyApp
     ]
 
     // Include .qml files from specified directory and its subdirectories
     QmlFiles {
-        directory: "BasicMinimalPy"
+        directory: "AdvancedPy"
     }
     QmlFiles {
         directory: "../../../src/EasyApp"
     }
 
     // Include .js files from specified directory and its subdirectories
     JavaScriptFiles {
-        directory: "BasicMinimalPy"
+        directory: "AdvancedPy"
     }
     JavaScriptFiles {
         directory: "../../../src/EasyApp"
@@ -28,7 +28,7 @@ Project {
     // Include Module Definition Files (qmldir), as well as .ts and .qrc
     // from specified directory and its subdirectories
     Files {
-        directory: "BasicMinimalPy"
+        directory: "AdvancedPy"
         filter: "qmldir;*.ts;*.qrc;*.html"
         recursive: true
     }

examples/IntermediatePy/pyproject.toml examples/AdvancedPy/pyproject.toml

@@ -9,10 +9,10 @@ import QtQuick
 QtObject {
 
     readonly property var about: {
-        'name': 'BasicMinimalPy',
-        'namePrefix': 'BasicMinimal',
+        'name': 'AdvancedPy',
+        'namePrefix': 'Advanced',
         'nameSuffix': 'Py',
-        'namePrefixForLogo': 'basicminimal',
+        'namePrefixForLogo': 'advanced',
         'nameSuffixForLogo': 'py',
         'homePageUrl': 'https://github.com/EasyScience/EasyExample',
         'issuesUrl': 'https://github.com/EasyScience/EasyExample/issues',
@@ -23,7 +23,7 @@ QtObject {
         'date': new Date().toISOString().slice(0,10),
         'developerYearsFrom': '2019',
         'developerYearsTo': '2024',
-        'description': 'An example of how to build the basic application using EasyApp module.',
+        'description': 'Example of a desktop application of advanced complexity with Python backend and EasyApp-based GUI',
         'developerIcons': [
             {
                 'url': 'https://ess.eu',

examples/IntermediatePy/scripts/create_python_wheel.sh examples/AdvancedPy/scripts/create_python_wheel.sh

@@ -6,7 +6,8 @@
 import sys
 
 from PySide6.QtGui import QGuiApplication
-from PySide6.QtQml import QQmlApplicationEngine
+from PySide6.QtQml import QQmlApplicationEngine, qmlRegisterSingletonType
+from PySide6.QtCore import qInstallMessageHandler
 
 # It is usually assumed that the EasyApp package is already installed in the desired python environment.
 # If this is not the case, and if the example is run from the EasyApp repository, one need to add the path to the
@@ -15,18 +16,32 @@
 EASYAPP_DIR = CURRENT_DIR / '..' / '..' / '..' / '..' / 'src'  # path to qml components of the easyapp module
 sys.path.append(str(EASYAPP_DIR))
 
+from EasyApp.Logic.Logging import console
+
+from Backends.real_backend import Backend
+
 
 if __name__ == '__main__':
-    # Create application
+    qInstallMessageHandler(console.qmlMessageHandler)
+    console.debug('Custom Qt message handler defined')
+
     app = QGuiApplication(sys.argv)
+    console.debug(f'Qt Application created {app}')
 
-    # Create QML application engine
     engine = QQmlApplicationEngine()
+    console.debug(f'QML application engine created {engine}')
+
+    qmlRegisterSingletonType(Backend, 'Backends', 1, 0, 'PyBackend')
+    console.debug('Backend class is registered to be accessible from QML via the name PyBackend')
+
     engine.addImportPath(EASYAPP_DIR)
     engine.addImportPath(CURRENT_DIR)
+    console.debug('Paths added where QML searches for components')
+
     engine.load(CURRENT_DIR / 'main.qml')
+    console.debug('Main QML component loaded')
 
-    # Event loop
+    console.debug('Application event loop is about to start')
     if not engine.rootObjects():
         sys.exit(-1)
     sys.exit(app.exec())

examples/AdvancedPy/scripts/install_from_wheel.sh

@@ -10,6 +10,6 @@ import Gui as Gui
 
 Gui.ApplicationWindow {
 
-    id: applicationWindow  // Global access
+    id: applicationWindow  // applicationWindow is globally accessible
 
 }

examples/IntermediatePy/scripts/unpack_wheel.sh examples/AdvancedPy/scripts/unpack_wheel.sh

@@ -1,6 +1,6 @@
 import re
 
-filename = 'src/BasicMinimalC++/resources.qrc'
+filename = 'src/BasicC++/resources.qrc'
 with open(filename, 'r') as f:
     content = f.read()
 

examples/AdvancedPy/src/AdvancedPy.pyproject

@@ -1,7 +1,7 @@
 TEMPLATE = app
 
 # Application name
-TARGET = BasicMinimalC++
+TARGET = BasicC++
 
 CONFIG += c++17
 
@@ -11,16 +11,16 @@ DEFINES += QT_DEPRECATED_WARNINGS
 QT += core quick qml
 
 SOURCES += \
-    BasicMinimalC++/main.cpp
+    BasicC++/main.cpp
 
-RESOURCES += BasicMinimalC++/resources.qrc
+RESOURCES += BasicC++/resources.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH += \
-    BasicMinimalC++ \
+    BasicC++ \
     ../../../src/EasyApp
 
 # Additional import path used to resolve QML modules just for Qt Quick Designer
 QML_DESIGNER_IMPORT_PATH += \
-    BasicMinimalC++ \
+    BasicC++ \
     ../../../src/EasyApp

examples/BasicMinimalPy/src/BasicMinimalPy.qmlproject examples/AdvancedPy/src/AdvancedPy.qmlproject

@@ -1,25 +1,25 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "BasicMinimalC++/main.qml"
+    mainFile: "BasicC++/main.qml"
 
     // List of module and plugin directories passed to QML runtime
     importPaths: [
-        "BasicMinimalC++",
+        "BasicC++",
         "../../../src",  // EasyApp
     ]
 
     // Include .qml files from specified directory and its subdirectories
     QmlFiles {
-        directory: "BasicMinimalC++"
+        directory: "BasicC++"
     }
     QmlFiles {
         directory: "../../../src/EasyApp"
     }
 
     // Include .js files from specified directory and its subdirectories
     JavaScriptFiles {
-        directory: "BasicMinimalC++"
+        directory: "BasicC++"
     }
     JavaScriptFiles {
         directory: "../../../src/EasyApp"
@@ -28,7 +28,7 @@ Project {
     // Include Module Definition Files (qmldir), as well as .ts and .qrc
     // from specified directory and its subdirectories
     Files {
-        directory: "BasicMinimalC++"
+        directory: "BasicC++"
         filter: "qmldir;*.ts;*.qrc;*.html"
         recursive: true
     }

examples/BasicMinimalC++/src/BasicMinimalC++/Backends/MockBackend.qml examples/AdvancedPy/src/AdvancedPy/Backends/MockBackend.qml

@@ -9,10 +9,10 @@ import QtQuick
 QtObject {
 
     readonly property var about: {
-        'name': 'BasicMinimalC++',
-        'namePrefix': 'BasicMinimal',
+        'name': 'BasicC++',
+        'namePrefix': 'Basic',
         'nameSuffix': 'C++',
-        'namePrefixForLogo': 'basicminimal',
+        'namePrefixForLogo': 'basic',
         'nameSuffixForLogo': 'c++',
         'homePageUrl': 'https://github.com/EasyScience/EasyExample',
         'issuesUrl': 'https://github.com/EasyScience/EasyExample/issues',
@@ -23,7 +23,7 @@ QtObject {
         'date': new Date().toISOString().slice(0,10),
         'developerYearsFrom': '2019',
         'developerYearsTo': '2024',
-        'description': 'An example of how to build the basic application using EasyApp module.',
+        'description': 'Example of a desktop application of basic complexity with Python backend and EasyApp-based GUI',
         'developerIcons': [
             {
                 'url': 'https://ess.eu',

examples/BasicMinimalC++/src/BasicMinimalC++/Backends/MockQml/Project.qml examples/AdvancedPy/src/AdvancedPy/Backends/MockQml/Project.qml

@@ -10,6 +10,6 @@ import Gui as Gui
 
 Gui.ApplicationWindow {
 
-    id: applicationWindow  // Global access
+    id: applicationWindow  // applicationWindow is globally accessible
 
 }