diff --git a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetController.cpp b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetController.cpp index 4cdccadf87864a3ab4147b9cb867f7fac2d9ae11..b00e71361aeafcc50ac7ecda1dc490f4186f7af1 100644 --- a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetController.cpp +++ b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetController.cpp @@ -136,7 +136,7 @@ namespace armarx::skills::gui void AronTreeWidgetController::onTreeWidgetItemChanged(QTreeWidgetItem* item, int column) { - ARMARX_INFO << "Enter onTreeWidgetItemChanged"; + tree->blockSignals(true); auto* aronElem = AronTreeWidgetItem::DynamicCast(item); diff --git a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetItem.cpp b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetItem.cpp index 6f8b2f63e4f9daf3406c8f3d92420634aecd3606..0b85cc270114253f9a4567ade80f64b3a2973974 100644 --- a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetItem.cpp +++ b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetItem.cpp @@ -149,7 +149,7 @@ namespace armarx::skills::gui void AronTreeWidgetItem::onUserChange(int changedColumn) { - ARMARX_INFO << "Enter onUserChange"; + QTreeWidgetItem* qParent = QTreeWidgetItem::parent(); ARMARX_CHECK(qParent); AronTreeWidgetItem* aronParent = DynamicCast(qParent); diff --git a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/visitors/AronTreeWidgetConverter.cpp b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/visitors/AronTreeWidgetConverter.cpp index 9ab53296e103fe40246f2b1ef67aca3d96a3d8d8..e45d940d3e6e164580cbe32c511c23e7e214c6d8 100644 --- a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/visitors/AronTreeWidgetConverter.cpp +++ b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/visitors/AronTreeWidgetConverter.cpp @@ -63,7 +63,6 @@ namespace armarx::skills::gui AronTreeWidgetConverterVisitor::handleErrors(AronTreeWidgetConverterVisitor childV, bool ownFault) { - ARMARX_INFO << "Enter HandleErrors1"; ARMARX_TRACE; isDirectError |= ownFault; hasTransitiveError |= childV.isDirectError || childV.hasTransitiveError; @@ -71,13 +70,12 @@ namespace armarx::skills::gui auto* aronItem = AronTreeWidgetItem::DynamicCast(parentItem->child(index)); ARMARX_CHECK(aronItem); aronItem->setValueErrorState(isDirectError, hasTransitiveError); - ARMARX_INFO << "Exit HandleErrors1"; } void AronTreeWidgetConverterVisitor::handleErrors(bool ownFault) { - ARMARX_INFO << "Enter HandleErrors2"; + ARMARX_TRACE; isDirectError = ownFault; auto* aronItem = AronTreeWidgetItem::DynamicCast(parentItem->child(index)); @@ -89,7 +87,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::ObjectPtr& i) { - ARMARX_INFO << "Enter Object Converter"; + ARMARX_TRACE; auto createdAronDict = std::make_shared<aron::data::Dict>(i->getPath()); createdAron = createdAronDict; @@ -124,7 +122,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::DictPtr& i) { - ARMARX_INFO << "Enter Dict Converter"; + ARMARX_TRACE; auto createdAronDict = std::make_shared<aron::data::Dict>(i->getPath()); createdAron = createdAronDict; @@ -159,7 +157,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::ListPtr& i) { - ARMARX_INFO << "Enter List Converter"; + ARMARX_TRACE; auto createdAronList = std::make_shared<aron::data::List>(i->getPath()); createdAron = createdAronList; @@ -194,7 +192,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::PairPtr& i) { - ARMARX_INFO << "Enter Pair Converter"; + ARMARX_TRACE; auto createdAronPair = std::make_shared<aron::data::List>(i->getPath()); createdAron = createdAronPair; @@ -225,7 +223,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::TuplePtr& i) { - ARMARX_INFO << "Enter Tuple Converter"; + ARMARX_TRACE; auto createdAronList = std::make_shared<aron::data::List>(i->getPath()); createdAron = createdAronList; @@ -266,7 +264,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::MatrixPtr& i) { - ARMARX_INFO << "Enter Matrix Converter"; + ARMARX_TRACE; auto createdMatrix = std::make_shared<aron::data::NDArray>(i->getPath()); int dataSize = 0; @@ -380,7 +378,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::QuaternionPtr& i) { - ARMARX_INFO << "Enter Quat Converter"; + ARMARX_TRACE; auto createdQuat = std::make_shared<aron::data::NDArray>(i->getPath()); createdAron = createdQuat; @@ -437,7 +435,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::IntEnumPtr& i) { - ARMARX_INFO << "Enter IntEnum Converter"; + ARMARX_TRACE; QTreeWidgetItem* el = parentItem->child(index); @@ -468,7 +466,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::IntPtr& i) { - ARMARX_INFO << "Enter Int Converter"; + ARMARX_TRACE; auto createdAronInt = std::make_shared<aron::data::Int>(i->getPath()); createdAron = createdAronInt; @@ -509,7 +507,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::LongPtr& i) { - ARMARX_INFO << "Enter Long Converter"; + ARMARX_TRACE; auto createdAronLong = std::make_shared<aron::data::Long>(i->getPath()); createdAron = createdAronLong; @@ -549,7 +547,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::FloatPtr& i) { - ARMARX_INFO << "Enter Float Converter"; + ARMARX_TRACE; auto createdAronFloat = std::make_shared<aron::data::Float>(i->getPath()); createdAron = createdAronFloat; @@ -588,7 +586,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::DoublePtr& i) { - ARMARX_INFO << "Enter Double Converter"; + ARMARX_TRACE; auto createdAronDouble = std::make_shared<aron::data::Double>(i->getPath()); createdAron = createdAronDouble; @@ -627,7 +625,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::BoolPtr& i) { - ARMARX_INFO << "Enter Bool Converter"; + ARMARX_TRACE; auto createdAronBool = std::make_shared<aron::data::Bool>(i->getPath()); createdAron = createdAronBool; @@ -666,7 +664,7 @@ namespace armarx::skills::gui void AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::StringPtr& i) { - ARMARX_INFO << "Enter String Converter"; + ARMARX_TRACE; auto createdAronString = std::make_shared<aron::data::String>(i->getPath()); createdAron = createdAronString; diff --git a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/visitors/AronTreeWidgetSetter.cpp b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/visitors/AronTreeWidgetSetter.cpp index 26378f0ca9e24e3285233706aed7256a7d3ff390..d02372efc375cf862eac22acdd33af81e92b8a24 100644 --- a/source/RobotAPI/libraries/skills_gui/aron_tree_widget/visitors/AronTreeWidgetSetter.cpp +++ b/source/RobotAPI/libraries/skills_gui/aron_tree_widget/visitors/AronTreeWidgetSetter.cpp @@ -35,7 +35,7 @@ template <typename T> std::string usString(T number, size_t precision = 3) { - ARMARX_INFO << "Enter usString"; + std::stringstream ss; const char* locale = "C"; ss.imbue(std::locale(locale)); @@ -105,7 +105,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::DictPtr& i) { - ARMARX_INFO << "Enter DictPtr Setter Visitor"; + // either it is the root or it has a name if (i->getPath().size() == 0 || checkTreeWidgetItemForSimilarName(i->getPath().getLastElement())) @@ -136,7 +136,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::ListPtr& i) { - ARMARX_INFO << "Enter ListPtr Setter Visitor"; + if (checkTreeWidgetItemForSimilarName(i->getPath().getLastElement())) { ARMARX_INFO << "Marker 0"; @@ -181,7 +181,7 @@ namespace armarx::skills::gui const std::shared_ptr<armarx::aron::type::Matrix>& matrixType, const aron::data::NDArrayPtr& arr) { - ARMARX_INFO << "Enter Matrix Setter Visitor"; + auto elemType = matrixType->getElementType(); auto* rawData = arr->getData(); // string can convert any item @@ -264,7 +264,7 @@ namespace armarx::skills::gui std::shared_ptr<armarx::aron::type::Quaternion>& quatType, const aron::data::NDArrayPtr& arr) { - ARMARX_INFO << "Enter Quat Setter Visitor"; + auto elemType = quatType->getElementType(); auto rawData = arr->getData(); auto shape = arr->getShape(); @@ -301,7 +301,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::NDArrayPtr& arr) { - ARMARX_INFO << "Enter NDArray Setter Visitor"; + // Matrices are handled as NDArray. Raw ndarrays cannot be created currently auto* el = AronTreeWidgetItem::DynamicCast(parentItem->child(index)); ARMARX_CHECK(el); @@ -338,7 +338,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::IntPtr& i) { - ARMARX_INFO << "Enter IntPtr Setter Visitor"; + if (checkTreeWidgetItemForSimilarName(i->getPath().getLastElement())) { AronTreeWidgetItem* el = AronTreeWidgetItem::DynamicCast(parentItem->child(index)); @@ -366,7 +366,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::LongPtr& i) { - ARMARX_INFO << "Enter LongPtr Setter Visitor"; + if (checkTreeWidgetItemForSimilarName(i->getPath().getLastElement())) { AronTreeWidgetItem* el = AronTreeWidgetItem::DynamicCast(parentItem->child(index)); @@ -383,7 +383,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::FloatPtr& i) { - ARMARX_INFO << "Enter FloatPtr Setter Visitor"; + ARMARX_INFO << "path: " << i->getPath().toString(); ARMARX_INFO << "value: " << i->getValue(); ARMARX_INFO << "test: " << usString<float>(i->getValue()); @@ -410,7 +410,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::DoublePtr& i) { - ARMARX_INFO << "Enter DoublePtr Setter Visitor"; + if (checkTreeWidgetItemForSimilarName(i->getPath().getLastElement())) { AronTreeWidgetItem* el = AronTreeWidgetItem::DynamicCast(parentItem->child(index)); @@ -427,7 +427,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::BoolPtr& i) { - ARMARX_INFO << "Enter BoolPtr Setter Visitor"; + if (checkTreeWidgetItemForSimilarName(i->getPath().getLastElement())) { AronTreeWidgetItem* el = AronTreeWidgetItem::DynamicCast(parentItem->child(index)); @@ -444,7 +444,7 @@ namespace armarx::skills::gui void AronTreeWidgetSetterVisitor::visitAronVariant(const aron::data::StringPtr& i) { - ARMARX_INFO << "Enter StringPtr Setter Visitor"; + if (checkTreeWidgetItemForSimilarName(i->getPath().getLastElement())) { AronTreeWidgetItem* el = AronTreeWidgetItem::DynamicCast(parentItem->child(index));