Merge pull request #140 from ModiaSim/an_issue139

changed functions according to issue #139
ModiaSim · Jan 31, 2024 · d7c935b · d7c935b
2 parents 33856e3 + 372565f
commit d7c935b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/Composition/handler.jl b/src/Composition/handler.jl
@@ -171,7 +171,7 @@ function revertJointInfo!(oldChild::Object3D{F}, newChild::Object3D{F}) where F
     newChild.joint = oldChild.joint
 
     # joint specific treatment
-    jointSpecificTreatment!(newChild, oldChild)
+    jointSpecificTreatment!(oldChild, newChild)
 
     oldChild.hasChildJoint = oldChild.hasChildJoint || newChild.hasChildJoint
 

diff --git a/src/Composition/joints/Revolute.jl b/src/Composition/joints/Revolute.jl
@@ -79,8 +79,8 @@ end
 Revolute(; kwargs...) = Revolute{Float64}(; kwargs...)
 
 
-function revertRevoluteKind!(oldChild::Object3D{F}, newChild::Object3D{F}) where F <: Modia3D.VarFloatType
-    newChild.joint.obj1, newChild.joint.obj2 = newChild.joint.obj2, newChild.joint.obj1
-    newChild.joint.eAxis = -newChild.joint.eAxis
+function revertRevoluteKind!(joint::Revolute{F}) where F <: Modia3D.VarFloatType
+    joint.obj1, joint.obj2 = joint.obj2, joint.obj1
+    joint.eAxis = -joint.eAxis
     return nothing
 end
diff --git a/src/Composition/joints/joints.jl b/src/Composition/joints/joints.jl
@@ -863,7 +863,8 @@ end
 
 function jointSpecificTreatment!(oldChild::Object3D{F}, newChild::Object3D{F})::Nothing where F <: Modia3D.VarFloatType
     if newChild.jointKind == Modia3D.Composition.RevoluteKind
-        revertRevoluteKind!(oldChild, newChild)
+        joint::Revolute{F} = newChild.joint
+        revertRevoluteKind!(joint)
         return nothing
     elseif newChild.jointKind == Modia3D.Composition.FixKind
         # nothing needs to be done here