]> SALOME platform Git repositories - modules/visu.git/commitdiff
Salome HOME
IPAL20317 It's impossible to Delete either a reference or an object through reference... V4_1_0_maintainance_20080915 V4_1_0_maintainance_20080916 V4_1_0_maintainance_20080918 V4_1_0_maintainance_20080919 V4_1_0_maintainance_20080925 V4_1_0_maintainance_20080926 V4_1_0_maintainance_20080929 V4_1_0_maintainance_20080930 V4_1_0_maintainance_20081002 V4_1_4a1
authordmv <dmv@opencascade.com>
Thu, 4 Sep 2008 14:31:55 +0000 (14:31 +0000)
committerdmv <dmv@opencascade.com>
Thu, 4 Sep 2008 14:31:55 +0000 (14:31 +0000)
src/VISUGUI/VisuGUI.cxx
src/VISUGUI/VisuGUI_Tools.cxx

index cc52fc60fd6b0241fbf26c76359da7e6b82f0149..b8cdfba0106a522ff2b715597171c4148e653ad6 100644 (file)
@@ -1352,6 +1352,7 @@ VisuGUI
                            QObject::tr("WRN_VISU"),
                            QObject::tr("WRN_NO_APPROPRIATE_SELECTION"),
                            QObject::tr("BUT_OK"));
+    return;
   }
 
   if ( SUIT_MessageBox::warn2( GetDesktop(this),
index a349bb95e9d503fbb6b341d94cf3bb50df894d65..35b0ad375437390486a456d72dc44c84518272df 100644 (file)
@@ -409,6 +409,15 @@ namespace VISU
         _PTR(GenericAttribute) anAttr;
         _PTR(AttributeString) aComment;
 
+       _PTR(SObject) aRefSObject;
+       if (aSObject->ReferencedObject(aRefSObject)) {
+         // It can be a reference on curve, published under a container. IPAL 20317
+         VISU::TObjectInfo aRefObjectInfo = GetObjectByEntry(GetAppStudy(theModule), aRefSObject->GetID());
+         VISU::Base_i* aRefBase = aRefObjectInfo.myBase;
+         if(aRefBase && aRefBase->GetType() == VISU::TCURVE)
+           return true;
+       }
+
         bool isUnderVISU = false;
         _PTR(SObject) aFatherSObject = aSObject->GetFather();
         if (aFatherSObject->FindAttribute(anAttr, "AttributeName")) {