#include <ModelAPI_ResultBody.h>
#include <Events_Loop.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
#include <TDataStd_Integer.hxx>
#include <TDataStd_Comment.hxx>
#include <TNaming_SameShapeIterator.hxx>
#include <TNaming_Iterator.hxx>
#include <TNaming_NamedShape.hxx>
+#include <TNaming_Tool.hxx>
#include <TopExp_Explorer.hxx>
#include <climits>
aStatus = anApp->Open(aPath, aLoaded);
} catch (Standard_Failure) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- Events_Error::send(
- std::string("Exception in opening of document: ") + aFail->GetMessageString());
+ Events_InfoMessage("Model_Document",
+ "Exception in opening of document: %1").arg(aFail->GetMessageString()).send();
return false;
}
bool isError = aStatus != PCDM_RS_OK;
if (isError) {
switch (aStatus) {
case PCDM_RS_UnknownDocument:
- Events_Error::send(std::string("Can not open document"));
+ Events_InfoMessage("Model_Document", "Can not open document").send();
break;
case PCDM_RS_AlreadyRetrieved:
- Events_Error::send(std::string("Can not open document: already opened"));
+ Events_InfoMessage("Model_Document", "Can not open document: already opened").send();
break;
case PCDM_RS_AlreadyRetrievedAndModified:
- Events_Error::send(
- std::string("Can not open document: already opened and modified"));
+ Events_InfoMessage("Model_Document",
+ "Can not open document: already opened and modified").send();
break;
case PCDM_RS_NoDriver:
- Events_Error::send(std::string("Can not open document: driver library is not found"));
+ Events_InfoMessage("Model_Document", "Can not open document: driver library is not found").send();
break;
case PCDM_RS_UnknownFileDriver:
- Events_Error::send(std::string("Can not open document: unknown driver for opening"));
+ Events_InfoMessage("Model_Document", "Can not open document: unknown driver for opening").send();
break;
case PCDM_RS_OpenError:
- Events_Error::send(std::string("Can not open document: file open error"));
+ Events_InfoMessage("Model_Document", "Can not open document: file open error").send();
break;
case PCDM_RS_NoVersion:
- Events_Error::send(std::string("Can not open document: invalid version"));
+ Events_InfoMessage("Model_Document", "Can not open document: invalid version").send();
break;
case PCDM_RS_NoModel:
- Events_Error::send(std::string("Can not open document: no data model"));
+ Events_InfoMessage("Model_Document", "Can not open document: no data model").send();
break;
case PCDM_RS_NoDocument:
- Events_Error::send(std::string("Can not open document: no document inside"));
+ Events_InfoMessage("Model_Document", "Can not open document: no document inside").send();
break;
case PCDM_RS_FormatFailure:
- Events_Error::send(std::string("Can not open document: format failure"));
+ Events_InfoMessage("Model_Document", "Can not open document: format failure").send();
break;
case PCDM_RS_TypeNotFoundInSchema:
- Events_Error::send(std::string("Can not open document: invalid object"));
+ Events_InfoMessage("Model_Document", "Can not open document: invalid object").send();
break;
case PCDM_RS_UnrecognizedFileFormat:
- Events_Error::send(std::string("Can not open document: unrecognized file format"));
+ Events_InfoMessage("Model_Document", "Can not open document: unrecognized file format").send();
break;
case PCDM_RS_MakeFailure:
- Events_Error::send(std::string("Can not open document: make failure"));
+ Events_InfoMessage("Model_Document", "Can not open document: make failure").send();
break;
case PCDM_RS_PermissionDenied:
- Events_Error::send(std::string("Can not open document: permission denied"));
+ Events_InfoMessage("Model_Document", "Can not open document: permission denied").send();
break;
case PCDM_RS_DriverFailure:
- Events_Error::send(std::string("Can not open document: driver failure"));
+ Events_InfoMessage("Model_Document", "Can not open document: driver failure").send();
break;
default:
- Events_Error::send(std::string("Can not open document: unknown error"));
+ Events_InfoMessage("Model_Document", "Can not open document: unknown error").send();
break;
}
}
aStatus = anApp->SaveAs(myDoc, aPath);
} catch (Standard_Failure) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- Events_Error::send(
- std::string("Exception in saving of document: ") + aFail->GetMessageString());
+ Events_InfoMessage("Model_Document",
+ "Exception in saving of document: %1").arg(aFail->GetMessageString()).send();
return false;
}
bool isDone = aStatus == PCDM_SS_OK || aStatus == PCDM_SS_No_Obj;
if (!isDone) {
switch (aStatus) {
case PCDM_SS_DriverFailure:
- Events_Error::send(std::string("Can not save document: save driver-library failure"));
+ Events_InfoMessage("Model_Document", "Can not save document: save driver-library failure").send();
break;
case PCDM_SS_WriteFailure:
- Events_Error::send(std::string("Can not save document: file writing failure"));
+ Events_InfoMessage("Model_Document", "Can not save document: file writing failure").send();
break;
case PCDM_SS_Failure:
default:
- Events_Error::send(std::string("Can not save document"));
+ Events_InfoMessage("Model_Document", "Can not save document").send();
break;
}
}
aFile.Copy(aDestination);
theResults.push_back(aDestinationDir.ToCString());
} else {
- Events_Error::send(
- std::string("Can not open file ") + aSubPath.ToCString() + " for saving");
+ Events_InfoMessage("Model_Document",
+ "Can not open file %1 for saving").arg(aSubPath.ToCString()).send();
}
}
} else { // simply save opened document
myObjs->removeFeature(theFeature);
}
+// recursive function to check if theSub is a child of theMain composite feature
+// through all the hierarchy of parents
+static bool isSub(const CompositeFeaturePtr theMain, const FeaturePtr theSub) {
+ CompositeFeaturePtr aParent = ModelAPI_Tools::compositeOwner(theSub);
+ if (!aParent.get())
+ return false;
+ if (aParent == theMain)
+ return true;
+ return isSub(theMain, aParent);
+}
+
+
void Model_Document::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis)
{
bool aCurrentUp = theMoved == currentFeature(false);
if (aCurrentUp) {
setCurrentFeatureUp();
}
+ // if user adds after high-level feature with nested, add it after all nested (otherwise the nested will be disabled)
+ CompositeFeaturePtr aCompositeAfter = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theAfterThis);
+ if (aCompositeAfter.get()) {
+ FeaturePtr aSub = aCompositeAfter;
+ do {
+ FeaturePtr aNext = myObjs->nextFeature(aSub);
+ if (!isSub(aCompositeAfter, aNext)) {
+ theAfterThis = aSub;
+ break;
+ }
+ aSub = aNext;
+ } while (aSub.get());
+ }
myObjs->moveFeature(theMoved, theAfterThis);
if (aCurrentUp) { // make the moved feature enabled or disabled due to the real status
return std::shared_ptr<ModelAPI_Feature>(); // null feature means the higher than first
}
-// recursive function to check if theSub is a child of theMain composite feature
-// through all the hierarchy of parents
-static bool isSub(const CompositeFeaturePtr theMain, const FeaturePtr theSub) {
- CompositeFeaturePtr aParent = ModelAPI_Tools::compositeOwner(theSub);
- if (!aParent.get())
- return false;
- if (aParent == theMain)
- return true;
- return isSub(theMain, aParent);
-}
-
void Model_Document::setCurrentFeature(
std::shared_ptr<ModelAPI_Feature> theCurrent, const bool theVisible)
{
FeaturePtr aPrev = myObjs->nextFeature(aCurrent, true);
// make the higher level composite as current (sketch becomes disabled if line is enabled)
if (aPrev.get()) {
- for(FeaturePtr aComp = ModelAPI_Tools::compositeOwner(aPrev); aComp.get();
- aComp = ModelAPI_Tools::compositeOwner(aPrev))
+ FeaturePtr aComp = ModelAPI_Tools::compositeOwner(aPrev);
+ // without cycle (issue 1555): otherwise extrusion fuse will be enabled and displayed whaen inside sketch
+ if (aComp.get())
aPrev = aComp;
}
// do not flush: it is called only on remove, it will be flushed in the end of transaction
while(!theShape.IsNull()) { // searching for the very initial shape that produces this one
TopoDS_Shape aShape = theShape;
theShape.Nullify();
+ if (!TNaming_Tool::HasLabel(aMain, aShape)) // to avoid crash of TNaming_SameShapeIterator if pure shape does not exists
+ break;
for(TNaming_SameShapeIterator anIter(aShape, aMain); anIter.More(); anIter.Next()) {
TDF_Label aNSLab = anIter.Label();
Handle(TNaming_NamedShape) aNS;
