From ec54c092d5acdf0616c53ba79a293db28e38947f Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 8 May 2016 14:50:50 +0200 Subject: [PATCH] + restore old behaviour of PropertyLinkSubList::getPyObject to fix failure in ccxInpWriter.py --- src/App/PropertyLinks.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 79aa219f7..b8be1f24b 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -684,7 +684,16 @@ std::vector PropertyLinkSubList::getSubListValues() PyObject *PropertyLinkSubList::getPyObject(void) { -#if 1 + // FIXME: The current implementation returns a list of tuples with two items + // of the form: [(object, sub-element1), (object, sub-element2),...] + // If for an object several sub-elements are stored then it appears several + // times. However, to keep the output more compact the string for the + // sub-element should be replaced by a tuple to be of the form: + // [(object, (sub-element1, sub-element2)),...] + // When doing so the Python function 'get_femelement_sets' in the Python + // module cxxInpWriter.py gives an error because it passes a tuple instead + // of a string. +#if 0 std::vector subLists = getSubListValues(); std::size_t count = subLists.size(); #if 0//FIXME: Should switch to tuple