aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/partio/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/partio/files')
-rw-r--r--graphics/partio/files/patch-src_py_partio.i13
-rw-r--r--graphics/partio/files/patch-src_tests_CMakeLists.txt10
-rw-r--r--graphics/partio/files/patch-src_tools_partedit.py20
3 files changed, 28 insertions, 15 deletions
diff --git a/graphics/partio/files/patch-src_py_partio.i b/graphics/partio/files/patch-src_py_partio.i
new file mode 100644
index 000000000000..d26257b1b007
--- /dev/null
+++ b/graphics/partio/files/patch-src_py_partio.i
@@ -0,0 +1,13 @@
+--- src/py/partio.i.orig 2025-01-28 22:44:08 UTC
++++ src/py/partio.i
+@@ -638,7 +638,9 @@ ParticlesDataMutable* cloneSchema(const ParticlesData&
+
+ %feature("autodoc");
+ %feature("docstring","Clone a particle set");
+-ParticlesDataMutable* clone(const ParticlesData& other, bool particles, const std::map<std::string, std::string>* attrNameMap=nullptr);
++ParticlesDataMutable* clone(const ParticlesData& other, bool particles=true, const std::map<std::string, std::string>* attrNameMap=nullptr);
++
++%typedef std::map<std::string, std::string> _dummy; /* https://github.com/wdas/partio/issues/114 */
+
+ %feature("autodoc");
+ %feature("docstring","Return string name of given attribute type");
diff --git a/graphics/partio/files/patch-src_tests_CMakeLists.txt b/graphics/partio/files/patch-src_tests_CMakeLists.txt
index 8d2bba3f4399..034508c85761 100644
--- a/graphics/partio/files/patch-src_tests_CMakeLists.txt
+++ b/graphics/partio/files/patch-src_tests_CMakeLists.txt
@@ -1,17 +1,19 @@
---- src/tests/CMakeLists.txt.orig 2021-06-07 16:43:45 UTC
+--- src/tests/CMakeLists.txt.orig 2025-01-28 22:44:08 UTC
+++ src/tests/CMakeLists.txt
-@@ -45,12 +45,12 @@ else()
+@@ -45,12 +45,14 @@ else()
${item} ${PARTIO_LIBRARIES} ${GTEST_LIB} Threads::Threads)
target_compile_definitions(${item} PRIVATE -DPARTIO_DATA_DIR="${PROJECT_SOURCE_DIR}/src/data")
target_link_directories(${item} PRIVATE ${GTEST_LINK_PATH})
- install(TARGETS ${item} DESTINATION ${CMAKE_INSTALL_PARTIO_TESTDIR})
add_test(NAME ${item} COMMAND ${item})
+ set_tests_properties(${item} PROPERTIES ENVIRONMENT
-+ "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/lib")
++ "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib")
endforeach(item)
foreach(item testpartjson testpartio)
- add_test(NAME ${item} COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${item}.py)
+ add_test(NAME ${item} COMMAND ${Python_EXECUTABLE} -B ${CMAKE_CURRENT_SOURCE_DIR}/${item}.py)
- install(PROGRAMS ${item}.py DESTINATION ${CMAKE_INSTALL_PARTIO_TESTDIR} RENAME ${item})
++ set_tests_properties(${item} PROPERTIES ENVIRONMENT
++ "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib;PYTHONPATH=${PROJECT_BINARY_DIR}/src/py:${PROJECT_SOURCE_DIR}/src/tools")
endforeach(item)
endif()
diff --git a/graphics/partio/files/patch-src_tools_partedit.py b/graphics/partio/files/patch-src_tools_partedit.py
index 2e94e5fe088f..b4839ac8f8e8 100644
--- a/graphics/partio/files/patch-src_tools_partedit.py
+++ b/graphics/partio/files/patch-src_tools_partedit.py
@@ -1,13 +1,11 @@
---- src/tools/partedit.py.orig 2021-10-18 09:08:43 UTC
+--- src/tools/partedit.py.orig 2025-01-28 22:44:08 UTC
+++ src/tools/partedit.py
-@@ -72,9 +72,7 @@ def getAttrs(numAttributesFunc, attributeInfoFunc, sor
- numAttr = numAttributesFunc()
+@@ -1080,7 +1080,7 @@ class PartEdit(QMainWindow):
+ def dataDirtiedSlot(self, dirty):
+ """ Sets the window title with or without "*" for dirty state """
- nameToIndex = {attributeInfoFunc(anum).name:anum for anum in range(numAttr)}
-- names = nameToIndex.keys()
-- if sort:
-- names.sort()
-+ names = sorted(nameToIndex) if sort else nameToIndex.keys()
-
- id_offset = 0
- for name in names:
+- title = self.data.filename
++ title = self.data.filename or ''
+ if dirty:
+ title += '*'
+ self.setWindowTitle(title)