QuickGraphLib 0.1.0a7__tar.gz → 0.1.0a8__tar.gz

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuickGraphLib
-Version: 0.1.0a7
+Version: 0.1.0a8
 Summary: A scientific graphing library for QtQuick
 Author-Email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/QuickGraphLib/CMakeLists.txt

@@ -67,10 +67,12 @@ add_custom_target(QuickGraphLibPythonFiles ALL DEPENDS ${QGL_PYTHON_FILES})
 install(
     TARGETS QuickGraphLib
     RUNTIME DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
+    LIBRARY DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
 )
 install(
     TARGETS QuickGraphLibPlugin
     RUNTIME DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
+    LIBRARY DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
 )
 install(FILES ${QGL_QML_FILES} DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib)
 install(

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/QuickGraphLib/GraphArea.qml

@@ -65,7 +65,7 @@ QQS.Shape {
     /*!
         Convert a base transform \a baseTransform into a view transform suitable for \l viewTransform.
     */
-    function viewTransformFromBaseTransform(baseTransform: matrix4x4) {
+    function viewTransformFromBaseTransform(baseTransform: matrix4x4): matrix4x4 {
         return Qt.matrix4x4(baseTransform.m11, baseTransform.m12, baseTransform.m13, baseTransform.m14 * width, baseTransform.m21, baseTransform.m22, baseTransform.m23, baseTransform.m24 * height, baseTransform.m31, baseTransform.m32, baseTransform.m33, baseTransform.m34, baseTransform.m41, baseTransform.m42, baseTransform.m43, baseTransform.m44);
     }
 

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/QuickGraphLib/PreFabs/ImageAxes.qml

@@ -146,7 +146,7 @@ QuickGraphLib.AntialiasingContainer {
                     gradient: Gradient {
                         id: grad
 
-                        property var colors: QuickGraphLib.ColorMaps.colors(colorMesh.colormap)
+                        property var colors: QuickGraphLib.ColorMaps.colors(root.colorMesh.colormap)
 
                         stops: colors.map((color, i) => gradStop.createObject(grad, {
                                         "color": color,

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/QuickGraphLib/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.0a7'
+__version__ = version = '0.1.0a8'
 __version_tuple__ = version_tuple = (0, 1, 0)

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/QuickGraphLib/bindings/CMakeLists.txt

@@ -5,45 +5,53 @@
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CMAKE_SOURCE_DIR}/venv/Scripts")
 find_package(Python COMPONENTS Interpreter Development.SABIModule REQUIRED)
 
-# Macro to get various pyside / python include / link flags and paths.
-# Uses the not entirely supported utils/pyside_config.py file.
-macro(pyside_config option output_var)
-    if(${ARGC} GREATER 2)
-        set(is_list ${ARGV2})
-    else()
-        set(is_list "")
-    endif()
-
-    execute_process(
-        COMMAND
-            ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/pyside_config.py"
-            ${option}
-        OUTPUT_VARIABLE ${output_var}
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-
-    if("${${output_var}}" STREQUAL "")
-        message(
-            FATAL_ERROR
-            "Error: Calling pyside_config.py ${option} returned no output."
-        )
-    endif()
-    if(is_list)
-        string(REPLACE " " ";" ${output_var} "${${output_var}}")
-    endif()
-endmacro()
-
 # Query for the shiboken generator path, Python path, include paths and linker flags.
-pyside_config(--shiboken-generator-path shiboken_generator_path)
-pyside_config(--pyside-path pyside_path)
-pyside_config(--pyside-include-path pyside_include_dir 1)
-pyside_config(--shiboken-generator-include-path shiboken_include_dir 1)
-pyside_config(--shiboken-module-shared-libraries-cmake shiboken_shared_libraries 0)
-pyside_config(--pyside-shared-libraries-cmake pyside_shared_libraries 0)
-
-set(shiboken_path
-    "${shiboken_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}"
+set(CMAKE_FIND_DEBUG_MODE TRUE)
+find_program(shiboken_path NAMES shiboken6 REQUIRED)
+find_path(
+    pyside_typesystems_path
+    NAMES PySide6/typesystems
+    PATH_SUFFIXES share
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+find_path(
+    shiboken_include_dir
+    NAMES sbkpython.h
+    PATH_SUFFIXES shiboken6 shiboken6_generator/include
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+find_path(
+    pyside_include_dir
+    NAMES pyside.h
+    PATH_SUFFIXES PySide6 PySide6/include
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+find_library(
+    shiboken_shared_libraries
+    NAMES shiboken6 shiboken6.abi3 libshiboken6.abi3.so.6.5
+    PATH_SUFFIXES shiboken6
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+find_library(
+    pyside_shared_library
+    NAMES pyside6 pyside6.abi3 libpyside6.abi3.so.6.5
+    PATH_SUFFIXES PySide6
+    PATHS "${Python_SITELIB}"
+    REQUIRED
 )
+find_library(
+    pyside_qml_shared_library
+    NAMES pyside6qml pyside6qml.abi3 libpyside6qml.abi3.so.6.5
+    PATH_SUFFIXES PySide6
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+set(CMAKE_FIND_DEBUG_MODE FALSE)
+
 if(NOT EXISTS ${shiboken_path})
     message(
         FATAL_ERROR
@@ -55,29 +63,35 @@ if(EXISTS $ENV{LLVM_PATH})
     # Update shiboken's libclang to fix parsing of recent MSVC C++ headers
     configure_file(
         "$ENV{LLVM_PATH}/bin/libclang.dll"
-        "${shiboken_generator_path}/libclang.dll"
+        "${Python_SITELIB}/shiboken6_generator/libclang.dll"
         COPYONLY
     )
 endif()
 
 # Set up the options to pass to shiboken.
 set(INCLUDES "")
-get_property(
-    QT_CORE_INCLUDE_DIRS
-    TARGET Qt6::Core
-    PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-)
-foreach(INCLUDE_DIR ${QT_CORE_INCLUDE_DIRS})
-    list(APPEND INCLUDES "-I${INCLUDE_DIR}")
-endforeach()
-get_property(
-    QT_GUI_INCLUDE_DIRS
-    TARGET Qt6::Gui
-    PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-)
-foreach(INCLUDE_DIR ${QT_GUI_INCLUDE_DIRS})
-    list(APPEND INCLUDES "-I${INCLUDE_DIR}")
-endforeach()
+if(DEFINED QT_HOST_PATH)
+    list(APPEND INCLUDES "-I${QT_HOST_PATH}/include")
+    list(APPEND INCLUDES "-I${QT_HOST_PATH}/include/QtCore")
+    list(APPEND INCLUDES "-I${QT_HOST_PATH}/include/QtGui")
+else()
+    get_property(
+        QT_CORE_INCLUDE_DIRS
+        TARGET Qt6::Core
+        PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    )
+    foreach(INCLUDE_DIR ${QT_CORE_INCLUDE_DIRS})
+        list(APPEND INCLUDES "-I${INCLUDE_DIR}")
+    endforeach()
+    get_property(
+        QT_GUI_INCLUDE_DIRS
+        TARGET Qt6::Gui
+        PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    )
+    foreach(INCLUDE_DIR ${QT_GUI_INCLUDE_DIRS})
+        list(APPEND INCLUDES "-I${INCLUDE_DIR}")
+    endforeach()
+endif()
 
 # We need to include the headers for the module bindings that we use.
 set(pyside_additional_includes "")
@@ -96,7 +110,7 @@ set(shiboken_options
     ${INCLUDES}
     -I${CMAKE_SOURCE_DIR}
     -T${CMAKE_SOURCE_DIR}
-    -T${pyside_path}/typesystems
+    -T${pyside_typesystems_path}/PySide6/typesystems
     --output-directory=${CMAKE_CURRENT_BINARY_DIR}
     --compiler-path=${CMAKE_CXX_COMPILER}
 )
@@ -148,6 +162,8 @@ target_link_libraries(
     _QuickGraphLib
     PRIVATE
         ${pyside_shared_libraries}
+        ${pyside_shared_library}
+        ${pyside_qml_shared_library}
         ${shiboken_shared_libraries}
         QuickGraphLib
         Qt6::Core

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/examples/BuiltinColormaps.qml

@@ -5,8 +5,6 @@ import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts as QQL
 import QuickGraphLib as QuickGraphLib
-import QuickGraphLib.GraphItems as QGLGraphItems
-import QuickGraphLib.PreFabs as QGLPreFabs
 
 Item {
     id: root

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/examples/ColorMesh.qml

@@ -3,7 +3,6 @@
 
 import QtQuick
 import QuickGraphLib as QuickGraphLib
-import QuickGraphLib.GraphItems as QGLGraphItems
 import QuickGraphLib.PreFabs as QGLPreFabs
 
 QGLPreFabs.ImageAxes {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/examples/Complex.qml

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
+pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Shapes as QQS
 import QtQuick.Layouts as QQL

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a8}/examples/ImageAlignment.qml

@@ -1,12 +1,11 @@
 // SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd+other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
+pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts as QQL
 import QuickGraphLib as QuickGraphLib
-import QuickGraphLib.GraphItems as QGLGraphItems
-import QuickGraphLib.PreFabs as QGLPreFabs
 
 QQL.GridLayout {
     id: root

quickgraphlib-0.1.0a7/QuickGraphLib/bindings/pyside_config.py

@@ -1,416 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-# pylint: skip-file
-# type: ignore
-import glob
-import os
-import re
-import sys
-import sysconfig
-from enum import Enum
-
-PYSIDE = "pyside6"
-PYSIDE_MODULE = "PySide6"
-SHIBOKEN = "shiboken6"
-
-
-class Package(Enum):
-    SHIBOKEN_MODULE = 1
-    SHIBOKEN_GENERATOR = 2
-    PYSIDE_MODULE = 3
-
-
-generic_error = (
-    "Did you forget to activate your virtualenv? Or perhaps"
-    f" you forgot to build / install {PYSIDE_MODULE} into your currently active Python"
-    " environment?"
-)
-pyside_error = f"Unable to locate {PYSIDE_MODULE}. {generic_error}"
-shiboken_module_error = f"Unable to locate {SHIBOKEN}-module. {generic_error}"
-shiboken_generator_error = f"Unable to locate shiboken-generator. {generic_error}"
-pyside_libs_error = f"Unable to locate the PySide shared libraries.  {generic_error}"
-python_link_error = "Unable to locate the Python library for linking."
-python_include_error = "Unable to locate the Python include headers directory."
-
-options = []
-
-# option, function, error, description
-options.append(
-    (
-        "--shiboken-module-path",
-        lambda: find_shiboken_module(),
-        shiboken_module_error,
-        "Print shiboken module location",
-    )
-)
-options.append(
-    (
-        "--shiboken-generator-path",
-        lambda: find_shiboken_generator(),
-        shiboken_generator_error,
-        "Print shiboken generator location",
-    )
-)
-options.append(
-    (
-        "--pyside-path",
-        lambda: find_pyside(),
-        pyside_error,
-        f"Print {PYSIDE_MODULE} location",
-    )
-)
-
-options.append(
-    (
-        "--python-include-path",
-        lambda: get_python_include_path(),
-        python_include_error,
-        "Print Python include path",
-    )
-)
-options.append(
-    (
-        "--shiboken-generator-include-path",
-        lambda: get_package_include_path(Package.SHIBOKEN_GENERATOR),
-        pyside_error,
-        "Print shiboken generator include paths",
-    )
-)
-options.append(
-    (
-        "--pyside-include-path",
-        lambda: get_package_include_path(Package.PYSIDE_MODULE),
-        pyside_error,
-        "Print PySide6 include paths",
-    )
-)
-
-options.append(
-    (
-        "--python-link-flags-qmake",
-        lambda: python_link_flags_qmake(),
-        python_link_error,
-        "Print python link flags for qmake",
-    )
-)
-options.append(
-    (
-        "--python-link-flags-cmake",
-        lambda: python_link_flags_cmake(),
-        python_link_error,
-        "Print python link flags for cmake",
-    )
-)
-
-options.append(
-    (
-        "--shiboken-module-qmake-lflags",
-        lambda: get_package_qmake_lflags(Package.SHIBOKEN_MODULE),
-        pyside_error,
-        "Print shiboken6 shared library link flags for qmake",
-    )
-)
-options.append(
-    (
-        "--pyside-qmake-lflags",
-        lambda: get_package_qmake_lflags(Package.PYSIDE_MODULE),
-        pyside_error,
-        "Print PySide6 shared library link flags for qmake",
-    )
-)
-
-options.append(
-    (
-        "--shiboken-module-shared-libraries-qmake",
-        lambda: get_shared_libraries_qmake(Package.SHIBOKEN_MODULE),
-        pyside_libs_error,
-        "Print paths of shiboken shared libraries (.so's, .dylib's, .dll's) for qmake",
-    )
-)
-options.append(
-    (
-        "--shiboken-module-shared-libraries-cmake",
-        lambda: get_shared_libraries_cmake(Package.SHIBOKEN_MODULE),
-        pyside_libs_error,
-        "Print paths of shiboken shared libraries (.so's, .dylib's, .dll's) for cmake",
-    )
-)
-
-options.append(
-    (
-        "--pyside-shared-libraries-qmake",
-        lambda: get_shared_libraries_qmake(Package.PYSIDE_MODULE),
-        pyside_libs_error,
-        "Print paths of f{PYSIDE_MODULE} shared libraries (.so's, .dylib's, .dll's) "
-        "for qmake",
-    )
-)
-options.append(
-    (
-        "--pyside-shared-libraries-cmake",
-        lambda: get_shared_libraries_cmake(Package.PYSIDE_MODULE),
-        pyside_libs_error,
-        f"Print paths of {PYSIDE_MODULE} shared libraries (.so's, .dylib's, .dll's) "
-        "for cmake",
-    )
-)
-
-options_usage = ""
-for i, (flag, _, _, description) in enumerate(options):
-    options_usage += f"    {flag:<45} {description}"
-    if i < len(options) - 1:
-        options_usage += "\n"
-
-usage = f"""
-Utility to determine include/link options of shiboken/PySide and Python for qmake/CMake projects
-that would like to embed or build custom shiboken/PySide bindings.
-
-Usage: pyside_config.py [option]
-Options:
-{options_usage}
-    -a                                            Print all options and their values
-    --help/-h                                     Print this help
-"""
-
-option = sys.argv[1] if len(sys.argv) == 2 else "-a"
-if option == "-h" or option == "--help":
-    print(usage)
-    sys.exit(0)
-
-
-def clean_path(path):
-    return path if sys.platform != "win32" else path.replace("\\", "/")
-
-
-def shared_library_suffix():
-    if sys.platform == "win32":
-        return "lib"
-    elif sys.platform == "darwin":
-        return "dylib"
-    # Linux
-    else:
-        return "so.*"
-
-
-def import_suffixes():
-    import importlib.machinery
-
-    return importlib.machinery.EXTENSION_SUFFIXES
-
-
-def is_debug():
-    debug_suffix = "_d.pyd" if sys.platform == "win32" else "_d.so"
-    return any([s.endswith(debug_suffix) for s in import_suffixes()])
-
-
-def shared_library_glob_pattern():
-    glob = "*." + shared_library_suffix()
-    return glob if sys.platform == "win32" else "lib" + glob
-
-
-def filter_shared_libraries(libs_list):
-    def predicate(lib_name):
-        basename = os.path.basename(lib_name)
-        if "shiboken" in basename or "pyside6" in basename:
-            return True
-        return False
-
-    result = [lib for lib in libs_list if predicate(lib)]
-    return result
-
-
-# Return qmake link option for a library file name
-def link_option(lib):
-    # On Linux:
-    # Since we cannot include symlinks with wheel packages
-    # we are using an absolute path for the libpyside and libshiboken
-    # libraries when compiling the project
-    baseName = os.path.basename(lib)
-    link = " -l"
-    if sys.platform in [
-        "linux",
-        "linux2",
-    ]:  # Linux: 'libfoo.so' -> '/absolute/path/libfoo.so'
-        link = lib
-    elif sys.platform in ["darwin"]:  # Darwin: 'libfoo.so' -> '-lfoo'
-        link += os.path.splitext(baseName[3:])[0]
-    else:  # Windows: 'libfoo.dll' -> 'libfoo.dll'
-        link += os.path.splitext(baseName)[0]
-    return link
-
-
-# Locate PySide6 via sys.path package path.
-def find_pyside():
-    return find_package_path(PYSIDE_MODULE)
-
-
-def find_shiboken_module():
-    return find_package_path(SHIBOKEN)
-
-
-def find_shiboken_generator():
-    return find_package_path(f"{SHIBOKEN}_generator")
-
-
-def find_package(which_package):
-    if which_package == Package.SHIBOKEN_MODULE:
-        return find_shiboken_module()
-    if which_package == Package.SHIBOKEN_GENERATOR:
-        return find_shiboken_generator()
-    if which_package == Package.PYSIDE_MODULE:
-        return find_pyside()
-    return None
-
-
-def find_package_path(dir_name):
-    for p in sys.path:
-        if "site-" in p:
-            package = os.path.join(p, dir_name)
-            if os.path.exists(package):
-                return clean_path(os.path.realpath(package))
-    return None
-
-
-# Return version as "x.y" (e.g. 3.9, 3.12, etc)
-def python_version():
-    return str(sys.version_info[0]) + "." + str(sys.version_info[1])
-
-
-def get_python_include_path():
-    return sysconfig.get_path("include")
-
-
-def python_link_flags_qmake():
-    flags = python_link_data()
-    if sys.platform == "win32":
-        libdir = flags["libdir"]
-        # This will add the "~1" shortcut for directories that
-        # contain white spaces
-        # e.g.: "Program Files" to "Progra~1"
-        for d in libdir.split("\\"):
-            if " " in d:
-                libdir = libdir.replace(d, d.split(" ")[0][:-1] + "~1")
-        lib_flags = flags["lib"]
-        return f"-L{libdir} -l{lib_flags}"
-    elif sys.platform == "darwin":
-        libdir = flags["libdir"]
-        lib_flags = flags["lib"]
-        return f"-L{libdir} -l{lib_flags}"
-    else:
-        # Linux and anything else
-        libdir = flags["libdir"]
-        lib_flags = flags["lib"]
-        return f"-L{libdir} -l{lib_flags}"
-
-
-def python_link_flags_cmake():
-    flags = python_link_data()
-    libdir = flags["libdir"]
-    lib = re.sub(r".dll$", ".lib", flags["lib"])
-    return f"{libdir};{lib}"
-
-
-def python_link_data():
-    # @TODO Fix to work with static builds of Python
-    libdir = sysconfig.get_config_var("LIBDIR")
-    if libdir is None:
-        libdir = os.path.abspath(
-            os.path.join(sysconfig.get_config_var("LIBDEST"), "..", "libs")
-        )
-    version = python_version()
-    version_no_dots = version.replace(".", "")
-
-    flags = {}
-    flags["libdir"] = libdir
-    if sys.platform == "win32":
-        suffix = "_d" if is_debug() else ""
-        flags["lib"] = f"python{version_no_dots}{suffix}"
-
-    elif sys.platform == "darwin":
-        flags["lib"] = f"python{version}"
-
-    # Linux and anything else
-    else:
-        flags["lib"] = f"python{version}{sys.abiflags}"
-
-    return flags
-
-
-def get_package_include_path(which_package):
-    package_path = find_package(which_package)
-    if package_path is None:
-        return None
-
-    includes = f"{package_path}/include"
-
-    return includes
-
-
-def get_package_qmake_lflags(which_package):
-    package_path = find_package(which_package)
-    if package_path is None:
-        return None
-
-    link = f"-L{package_path}"
-    glob_result = glob.glob(os.path.join(package_path, shared_library_glob_pattern()))
-    for lib in filter_shared_libraries(glob_result):
-        link += " "
-        link += link_option(lib)
-    return link
-
-
-def get_shared_libraries_data(which_package):
-    package_path = find_package(which_package)
-    if package_path is None:
-        return None
-
-    glob_result = glob.glob(os.path.join(package_path, shared_library_glob_pattern()))
-    filtered_libs = filter_shared_libraries(glob_result)
-    libs = []
-    if sys.platform == "win32":
-        for lib in filtered_libs:
-            libs.append(os.path.realpath(lib))
-    else:
-        for lib in filtered_libs:
-            libs.append(lib)
-    return libs
-
-
-def get_shared_libraries_qmake(which_package):
-    libs = get_shared_libraries_data(which_package)
-    if libs is None:
-        return None
-
-    if sys.platform == "win32":
-        if not libs:
-            return ""
-        dlls = ""
-        for lib in libs:
-            dll = os.path.splitext(lib)[0] + ".dll"
-            dlls += dll + " "
-
-        return dlls
-    else:
-        libs_string = ""
-        for lib in libs:
-            libs_string += lib + " "
-        return libs_string
-
-
-def get_shared_libraries_cmake(which_package):
-    libs = get_shared_libraries_data(which_package)
-    result = ";".join(libs)
-    return result
-
-
-print_all = option == "-a"
-for argument, handler, error, _ in options:
-    if option == argument or print_all:
-        handler_result = handler()
-        if handler_result is None:
-            sys.exit(error)
-
-        line = handler_result
-        if print_all:
-            line = f"{argument:<40}: {line}"
-        print(line)