Updated events for Model and minor other changes

[modules/shaper.git] / src / Model / Model_Iterator.cxx

diff --git a/src/Model/Model_Iterator.cxx b/src/Model/Model_Iterator.cxx
index 4e2cf09422e38ff824874185903bd65301719f17..b8a765d91a577ae16745f99f41b1a10f009794b0 100644 (file)
--- a/src/Model/Model_Iterator.cxx
+++ b/src/Model/Model_Iterator.cxx
@@ -5,7 +5,7 @@
 #include "Model_Iterator.h"
 #include "Model_Document.h"
 #include "ModelAPI_Feature.h"
-#include "Model_Object.h"
+#include "Model_Data.h"
 #include <TDataStd_Comment.hxx>
 #include <TDataStd_Name.hxx>
 
@@ -18,7 +18,7 @@ void Model_Iterator::next()
 
 bool Model_Iterator::more()
 {
-  return myIter.More();
+  return myIter.More() == Standard_True;
 }
 
 shared_ptr<ModelAPI_Feature> Model_Iterator::current()
@@ -53,11 +53,14 @@ int Model_Iterator::numIterationsLeft()
 
 bool Model_Iterator::is(std::shared_ptr<ModelAPI_Feature> theFeature)
 {
-  return myIter.Value()->Label() == 
-    dynamic_pointer_cast<Model_Object>(theFeature->data())->label();
+  return (myIter.Value()->Label() == 
+    dynamic_pointer_cast<Model_Data>(theFeature->data())->label()) == Standard_True;
 
 }
 
+Model_Iterator::Model_Iterator()
+{
+}
 
 Model_Iterator::Model_Iterator(std::shared_ptr<Model_Document> theDoc, TDF_Label theLab)
   : myDoc(theDoc), myIter(theLab, TDataStd_Comment::GetID(), Standard_False)