// fixed compilation problem

diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Orient.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Orient.cxx
index 9375fa9236b64e12048ed519849980c8affb238d..b9efcd4f4ed298f59430ac7c64666ad742cc044e 100644 (file)
--- a/src/XCAFAnimObjects/XCAFAnimObjects_Orient.cxx
+++ b/src/XCAFAnimObjects/XCAFAnimObjects_Orient.cxx
@@ -43,7 +43,7 @@ XCAFAnimObjects_Orient::XCAFAnimObjects_Orient(const NCollection_Array1<gp_Quate
 //=======================================================================
 XCAFAnimObjects_Orient::XCAFAnimObjects_Orient(const NCollection_Array2<double>& theGeneralPresentation,
                                                const NCollection_Array1<double>& theTimeStamps) :
-  XCAFAnimObjects_Operation(false),
+  XCAFAnimObjects_Operation(theTimeStamps),
   myOrientPresentation(1, theGeneralPresentation.RowLength())
 {
   if (theGeneralPresentation.ColLength() != 4)
@@ -86,4 +86,5 @@ NCollection_Array2<double> XCAFAnimObjects_Orient::GeneralPresentation() const
     aRes.SetValue(aRowInd, 3, aQuat.Z());
     aRes.SetValue(aRowInd, 4, aQuat.W());
   }
+  return aRes;
 }
\ No newline at end of file

diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Rotate.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Rotate.cxx
index f6c2d89737cb76c45c20334d8868ea4021997ae4..b9a78f25455c7852b9fb643aff4b925f5a33faeb 100644 (file)
--- a/src/XCAFAnimObjects/XCAFAnimObjects_Rotate.cxx
+++ b/src/XCAFAnimObjects/XCAFAnimObjects_Rotate.cxx
@@ -22,7 +22,7 @@
 XCAFAnimObjects_Rotate::XCAFAnimObjects_Rotate(const NCollection_Array1<double>& theRotate,
                                                const NCollection_Array1<double>& theTimeStamps,
                                                const XCAFAnimObjects_Rotate_Type theRotateType) :
-  XCAFAnimObjects_Operation(false),
+  XCAFAnimObjects_Operation(theTimeStamps),
   myRotateType(theRotateType),
   myRotatePresentation(1, 1, theRotate.Lower(), theRotate.Upper())
 {
@@ -54,7 +54,7 @@ XCAFAnimObjects_Rotate::XCAFAnimObjects_Rotate(const NCollection_Array1<double>&
 XCAFAnimObjects_Rotate::XCAFAnimObjects_Rotate(const NCollection_Array2<double>& theGeneralPresentation,
                                                const NCollection_Array1<double>& theTimeStamps,
                                                const XCAFAnimObjects_Rotate_Type theRotateType) :
-  XCAFAnimObjects_Operation(false),
+  XCAFAnimObjects_Operation(theTimeStamps),
   myRotateType(theRotateType),
   myRotatePresentation(theGeneralPresentation)
 {

diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Scale.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Scale.cxx
index 56903d97ac6182c53e2232833f1869097d6039b6..5204fe7ae6d9b79fcc59764cd15abfa777feb464 100644 (file)
--- a/src/XCAFAnimObjects/XCAFAnimObjects_Scale.cxx
+++ b/src/XCAFAnimObjects/XCAFAnimObjects_Scale.cxx
@@ -42,7 +42,7 @@ XCAFAnimObjects_Scale::XCAFAnimObjects_Scale(const NCollection_Array1<gp_XYZ>& t
 //=======================================================================
 XCAFAnimObjects_Scale::XCAFAnimObjects_Scale(const NCollection_Array2<double>& theGeneralPresentation,
                                              const NCollection_Array1<double>& theTimeStamps) :
-  XCAFAnimObjects_Operation(false),
+  XCAFAnimObjects_Operation(theTimeStamps),
   myScalePresentation(1, theGeneralPresentation.RowLength())
 {
   if (theGeneralPresentation.ColLength() != 3)
@@ -83,4 +83,5 @@ NCollection_Array2<double> XCAFAnimObjects_Scale::GeneralPresentation() const
     aRes.SetValue(aRowInd, 2, aXYZ.Y());
     aRes.SetValue(aRowInd, 3, aXYZ.Z());
   }
+  return aRes;
 }

diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Skew.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Skew.cxx
index 694927f92ca919eae26a1fe6f65bfaeecb79a30d..19e562c61014d42e37c7c37cf17ac6bd5e6b9851 100644 (file)
--- a/src/XCAFAnimObjects/XCAFAnimObjects_Skew.cxx
+++ b/src/XCAFAnimObjects/XCAFAnimObjects_Skew.cxx
@@ -42,7 +42,7 @@ XCAFAnimObjects_Skew::XCAFAnimObjects_Skew(const NCollection_Array1<Skew>& theSk
 //=======================================================================
 XCAFAnimObjects_Skew::XCAFAnimObjects_Skew(const NCollection_Array2<double>& theGeneralPresentation,
                                            const NCollection_Array1<double>& theTimeStamps) :
-  XCAFAnimObjects_Operation(false),
+  XCAFAnimObjects_Operation(theTimeStamps),
   mySkewPresentation(1, theGeneralPresentation.RowLength())
 {
   if (theGeneralPresentation.ColLength() != 7)
@@ -91,4 +91,5 @@ NCollection_Array2<double> XCAFAnimObjects_Skew::GeneralPresentation() const
     aRes.SetValue(aRowInd, 6, aSkew.Axis2.Y());
     aRes.SetValue(aRowInd, 7, aSkew.Axis2.Z());
   }
+  return aRes;
 }
\ No newline at end of file

diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Transform.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Transform.cxx
index e14ae4f02d225823b21193a81c513e7b7e21ec9b..00ebfee6e87e52a143913f1c77bb68b94055f07e 100644 (file)
--- a/src/XCAFAnimObjects/XCAFAnimObjects_Transform.cxx
+++ b/src/XCAFAnimObjects/XCAFAnimObjects_Transform.cxx
@@ -42,7 +42,7 @@ XCAFAnimObjects_Transform::XCAFAnimObjects_Transform(const NCollection_Array1<NC
 //=======================================================================
 XCAFAnimObjects_Transform::XCAFAnimObjects_Transform(const NCollection_Array2<double>& theGeneralPresentation,
                                                      const NCollection_Array1<double>& theTimeStamps) :
-  XCAFAnimObjects_Operation(false),
+  XCAFAnimObjects_Operation(theTimeStamps),
   myTransformPresentation(1, theGeneralPresentation.RowLength())
 {
   if (theGeneralPresentation.ColLength() != 16)
@@ -111,4 +111,5 @@ NCollection_Array2<double> XCAFAnimObjects_Transform::GeneralPresentation() cons
     aRes.SetValue(aRowInd, 15, aTransform.GetValue(4, 3));
     aRes.SetValue(aRowInd, 16, aTransform.GetValue(4, 4));
   }
+  return aRes;
 }
\ No newline at end of file

diff --git a/src/XCAFAnimObjects/XCAFAnimObjects_Translate.cxx b/src/XCAFAnimObjects/XCAFAnimObjects_Translate.cxx
index 8a001f38dec3b2d0e7cabd58ebe8ca77f5818fa4..6eaefac25e5f7bd49ff7bc5de8b5424b77b20424 100644 (file)
--- a/src/XCAFAnimObjects/XCAFAnimObjects_Translate.cxx
+++ b/src/XCAFAnimObjects/XCAFAnimObjects_Translate.cxx
@@ -43,7 +43,7 @@ XCAFAnimObjects_Translate::XCAFAnimObjects_Translate(const NCollection_Array1<gp
 //=======================================================================
 XCAFAnimObjects_Translate::XCAFAnimObjects_Translate(const NCollection_Array2<double>& theGeneralPresentation,
                                                      const NCollection_Array1<double>& theTimeStamps) :
-  XCAFAnimObjects_Operation(false),
+  XCAFAnimObjects_Operation(theTimeStamps),
   myTranslatePresentation(1, theGeneralPresentation.RowLength())
 {
   if (theGeneralPresentation.ColLength() != 3)
@@ -84,4 +84,5 @@ NCollection_Array2<double> XCAFAnimObjects_Translate::GeneralPresentation() cons
     aRes.SetValue(aRowInd, 2, aXYZ.Y());
     aRes.SetValue(aRowInd, 3, aXYZ.Z());
   }
+  return aRes;
 }
\ No newline at end of file

diff --git a/src/XCAFDoc/XCAFDoc_Animation.cxx b/src/XCAFDoc/XCAFDoc_Animation.cxx
index 42bc08e70996880bce155256aa1988d9a969d690..92510103f1ffbd1c1113a71fe82bd93b735a528b 100644 (file)
--- a/src/XCAFDoc/XCAFDoc_Animation.cxx
+++ b/src/XCAFDoc/XCAFDoc_Animation.cxx
@@ -423,6 +423,7 @@ Handle(XCAFAnimObjects_AnimObject) XCAFDoc_Animation::GetObject()  const
     {
       continue;
     }
+    aNewOperObj->SetInverse(anIsInvert);
     anOrderedOperations.Append(aNewOperObj);
   }
   return anObj;

diff --git a/src/XCAFDoc/XCAFDoc_AnimationTool.cxx b/src/XCAFDoc/XCAFDoc_AnimationTool.cxx
index bb8036086f37bceec0019a0c4e9bc1fb3f71dca8..10eeea7350df53764a64622b5c1230e7271cba56 100644 (file)
--- a/src/XCAFDoc/XCAFDoc_AnimationTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_AnimationTool.cxx
@@ -20,7 +20,7 @@
 #include <TDataStd_UAttribute.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <XCAFDoc.hxx>
-#include <XCAFDoc_Animation.hxx>>
+#include <XCAFDoc_Animation.hxx>
 #include <XCAFDoc_GraphNode.hxx>
 
 IMPLEMENT_DERIVED_ATTRIBUTE_WITH_TYPE(XCAFDoc_AnimationTool, TDataStd_GenericEmpty, "xcaf", "AnimationTool")
@@ -249,8 +249,8 @@ void XCAFDoc_AnimationTool::Unlock(const TDF_Label& theAnimLabel) const
 Standard_OStream& XCAFDoc_AnimationTool::Dump(Standard_OStream& theOStream,
                                               const bool theDepth) const
 {
-  (void)theOStream;
   (void)theDepth;
+  return theOStream;
 }
 
 //=======================================================================