From 71057e9575df082992d6ce5677792f659e0a6d02 Mon Sep 17 00:00:00 2001 From: wanqing0421 Date: Sun, 16 Mar 2025 15:15:49 +0800 Subject: [PATCH] fill the multiRotatingAxis --- .../entities/multiRotatingAxis/multiRotatingAxis.cpp | 10 +++++----- .../multiRotatingAxisMotion.cpp | 10 +++++----- .../multiRotatingAxisMotion.hpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/MotionModel/entities/multiRotatingAxis/multiRotatingAxis.cpp b/src/MotionModel/entities/multiRotatingAxis/multiRotatingAxis.cpp index 12f6596b..62c9b9dc 100644 --- a/src/MotionModel/entities/multiRotatingAxis/multiRotatingAxis.cpp +++ b/src/MotionModel/entities/multiRotatingAxis/multiRotatingAxis.cpp @@ -117,12 +117,12 @@ bool pFlow::multiRotatingAxis::write dictionary& dict ) const { - if( !rotatingAxis::write(dict) ) return false; + // if( !rotatingAxis::write(dict) ) return false; - if(parentAxisIndex_ == 0) - { - dict.add("rotationAxis", "none"); - } + // if(parentAxisIndex_ == -1) + // { + // dict.add("rotationAxis", "none"); + // } // else // { // word rotAxis; diff --git a/src/MotionModel/multiRotatingAxisMotion/multiRotatingAxisMotion.cpp b/src/MotionModel/multiRotatingAxisMotion/multiRotatingAxisMotion.cpp index a14b92c5..b264f8b1 100644 --- a/src/MotionModel/multiRotatingAxisMotion/multiRotatingAxisMotion.cpp +++ b/src/MotionModel/multiRotatingAxisMotion/multiRotatingAxisMotion.cpp @@ -43,11 +43,11 @@ pFlow::multiRotatingAxisMotion::multiRotatingAxisMotion( : fileDictionary(objf, owner) { - // if(! impl_readDictionary(*this) ) - // { - // fatalErrorInFunction; - // fatalExit; - // } + if(! impl_readDictionary(*this) ) + { + fatalErrorInFunction; + fatalExit; + } } pFlow::multiRotatingAxisMotion::multiRotatingAxisMotion diff --git a/src/MotionModel/multiRotatingAxisMotion/multiRotatingAxisMotion.hpp b/src/MotionModel/multiRotatingAxisMotion/multiRotatingAxisMotion.hpp index dddc42d2..baa5d2b5 100644 --- a/src/MotionModel/multiRotatingAxisMotion/multiRotatingAxisMotion.hpp +++ b/src/MotionModel/multiRotatingAxisMotion/multiRotatingAxisMotion.hpp @@ -105,7 +105,7 @@ public: static auto noneComponent() { - return multiRotatingAxis{}; + return multiRotatingAxis(); } // TODO: make this method protected