QuickGraphLib 0.1.0a15__tar.gz → 0.1.0a16__tar.gz

{quickgraphlib-0.1.0a15 → quickgraphlib-0.1.0a16}/CMakeLists.txt

@@ -15,6 +15,11 @@ else()
     add_compile_options(-Wextra -Wpedantic -fno-visibility-inlines-hidden)
 endif()
 
+option(
+    ENABLE_PYTHON
+    "Enable python binding. C++ only if disabled. (default is on)"
+    ON
+)
 option(ENABLE_STUB_GENERATION "Enable .pyi stub generation (defaults to on)" ON)
 option(
     ENABLE_MANYLINUX_BUILD

{quickgraphlib-0.1.0a15 → quickgraphlib-0.1.0a16}/PKG-INFO

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

{quickgraphlib-0.1.0a15 → quickgraphlib-0.1.0a16}/QuickGraphLib/CMakeLists.txt

@@ -11,6 +11,28 @@ set(QGL_QML_FILES
     ShapeRepeater.qml
 )
 
+set(QGL_SOURCES
+    helpers/Helpers.cpp
+    helpers/Helpers.hpp
+    helpers/AxisHelper.hpp
+    helpers/AxisHelper.cpp
+    helpers/Foreign.hpp
+    helpers/ShapeRepeaterHelper.hpp
+    helpers/ShapeRepeaterHelper.cpp
+    ImageView.hpp
+    ImageView.cpp
+    ColorMaps.hpp
+    ColorMaps.cpp
+    DataTypes.hpp
+    DataTypes.cpp
+    QuickGraphLib.hpp
+    Global.hpp
+)
+
+if(ENABLE_PYTHON)
+    list(APPEND QGL_SOURCES bindings/Bindings.hpp)
+endif()
+
 add_library(QuickGraphLibPlugin SHARED Plugin.cpp)
 target_link_libraries(QuickGraphLibPlugin PRIVATE Qt6::Gui)
 qt_add_qml_module(QuickGraphLib
@@ -22,11 +44,7 @@ qt_add_qml_module(QuickGraphLib
     NO_GENERATE_PLUGIN_SOURCE
     NO_PLUGIN_OPTIONAL
     DEPENDENCIES QtQuick
-    SOURCES
-        helpers/Helpers.cpp helpers/Helpers.hpp helpers/AxisHelper.hpp helpers/AxisHelper.cpp helpers/Foreign.hpp
-        helpers/ShapeRepeaterHelper.hpp helpers/ShapeRepeaterHelper.cpp
-        ImageView.hpp ImageView.cpp ColorMaps.hpp ColorMaps.cpp DataTypes.hpp DataTypes.cpp bindings/Bindings.hpp QuickGraphLib.hpp
-        Global.hpp
+    SOURCES ${QGL_SOURCES}
 )
 set_property(
     TARGET QuickGraphLib
@@ -48,25 +66,6 @@ target_include_directories(
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/helpers
 )
 
-set(QGL_PYTHON_FILES
-    __init__.py
-    consts.py
-    contours.py
-    py.typed
-    _version.py
-)
-foreach(PYTHON_FILE ${QGL_PYTHON_FILES})
-    add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_FILE}
-        COMMAND
-            ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${PYTHON_FILE}
-            ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_FILE}
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PYTHON_FILE}
-    )
-endforeach()
-list(TRANSFORM QGL_PYTHON_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
-add_custom_target(QuickGraphLibPythonFiles ALL DEPENDS ${QGL_PYTHON_FILES})
-
 install(
     TARGETS QuickGraphLib
     RUNTIME DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
@@ -84,8 +83,35 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/QuickGraphLib.qmltypes
     DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
 )
-install(FILES ${QGL_PYTHON_FILES} DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib)
 
 add_subdirectory(PreFabs)
 add_subdirectory(GraphItems)
-add_subdirectory(bindings)
+
+if(ENABLE_PYTHON)
+    set(QGL_PYTHON_FILES
+        __init__.py
+        consts.py
+        contours.py
+        py.typed
+        _version.py
+    )
+    foreach(PYTHON_FILE ${QGL_PYTHON_FILES})
+        add_custom_command(
+            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_FILE}
+            COMMAND
+                ${CMAKE_COMMAND} -E copy
+                ${CMAKE_CURRENT_SOURCE_DIR}/${PYTHON_FILE}
+                ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_FILE}
+            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PYTHON_FILE}
+        )
+    endforeach()
+    list(TRANSFORM QGL_PYTHON_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/")
+    add_custom_target(QuickGraphLibPythonFiles ALL DEPENDS ${QGL_PYTHON_FILES})
+
+    install(
+        FILES ${QGL_PYTHON_FILES}
+        DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
+    )
+
+    add_subdirectory(bindings)
+endif()

{quickgraphlib-0.1.0a15 → quickgraphlib-0.1.0a16}/QuickGraphLib/ImageView.cpp

@@ -482,7 +482,7 @@ void ImageView::updatePolish() {
     }
 
     setImplicitSize(_coloredImage.width(), _coloredImage.height());
-    if (_sourceSize != _coloredImage.size()) {
+    if (!_coloredImage.isNull() && _sourceSize != _coloredImage.size()) {
         _sourceSize = _coloredImage.size();
         emit sourceSizeChanged();
     }

{quickgraphlib-0.1.0a15 → quickgraphlib-0.1.0a16}/QuickGraphLib/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.0a15'
-__version_tuple__ = version_tuple = (0, 1, 0, 'a15')
+__version__ = version = '0.1.0a16'
+__version_tuple__ = version_tuple = (0, 1, 0, 'a16')
 
-__commit_id__ = commit_id = 'g26c4cf9a2'
+__commit_id__ = commit_id = 'g44df4fafd'

{quickgraphlib-0.1.0a15 → quickgraphlib-0.1.0a16}/requirements.txt

@@ -4,7 +4,7 @@ colorama==0.4.6
 contourpy==1.3.3
 coverage==7.12.0
 distlib==0.4.0
-filelock==3.20.1
+filelock==3.20.3
 gersemi==0.23.1
 identify==2.6.15
 iniconfig==2.3.0
@@ -33,4 +33,4 @@ setuptools-scm==9.2.2
 shiboken6==6.10.0
 shiboken6_generator==6.10.0
 typing_extensions==4.15.0
-virtualenv==20.35.4
+virtualenv==20.36.1