CCAR: merge from development branch BR_Dev_For_4_0

diff --git a/salome_adm/unix/config_files/production.m4 b/salome_adm/unix/config_files/production.m4
index 1d2b1b0a57e4d9f3e72f5319c3facf1c734baaa5..b43c055a13734f6bdfd8b1949112de1d21b22c41 100644 (file)
--- a/salome_adm/unix/config_files/production.m4
+++ b/salome_adm/unix/config_files/production.m4
@@ -56,8 +56,8 @@ if test "X$enable_production" = "Xyes"; then
   AC_CXX_OPTION(-Wuninitialized,CXXFLAGS)
   CXXFLAGS="$CXXFLAGS -O "
 else
-  CFLAGS="$CFLAGS -O -g"
-  CXXFLAGS="$CXXFLAGS -O -g"
+  CFLAGS="$CFLAGS -g"
+  CXXFLAGS="$CXXFLAGS -g"
 fi
 ])
 

diff --git a/src/DF/DF_Label.cxx b/src/DF/DF_Label.cxx
index 453630a3fe0624dfbebc172cc3e11bb1e0a1cdcf..08d8ae9f870998d54d2c9a9e85264af0cd2de46d 100644 (file)
--- a/src/DF/DF_Label.cxx
+++ b/src/DF/DF_Label.cxx
@@ -145,6 +145,7 @@ bool DF_Label::AddAttribute(DF_Attribute* theAttribute) const
   if(_node->_attributes.find(theAttribute->ID()) != _node->_attributes.end()) return false;
   theAttribute->_node = _node;
   _node->_attributes[theAttribute->ID()] = theAttribute;
+  theAttribute->AfterAddition();    
 
   return true;
 }
@@ -156,6 +157,7 @@ bool DF_Label::ForgetAttribute(const std::string& theID) const
 
   if(_node->_attributes.find(theID) == _node->_attributes.end()) return false;
   DF_Attribute* attr = _node->_attributes[theID];
+  attr->BeforeForget();
   _node->_attributes.erase(theID);
   delete attr;
 
@@ -170,8 +172,10 @@ bool DF_Label::ForgetAllAttributes(bool clearChildren) const
   vector<DF_Attribute*> va = GetAttributes();
   _node->_attributes.clear();
 
-  for(int i = 0, len = va.size(); i<len; i++) 
+  for(int i = 0, len = va.size(); i<len; i++) {
+    va[i]->BeforeForget();
     delete va[i];
+  }
 
   if(clearChildren) {
     DF_ChildIterator CI(*this, true);

diff --git a/src/SALOMEDS/SALOME_DriverPy.py b/src/SALOMEDS/SALOME_DriverPy.py
index 8346a3979024a118afa4990b19e8a80e4188e646..9e8f5264ae8fc65ff3ad1c1ff6bf8c0cf5a92be3 100644 (file)
--- a/src/SALOMEDS/SALOME_DriverPy.py
+++ b/src/SALOMEDS/SALOME_DriverPy.py
@@ -38,7 +38,7 @@ class SALOME_DriverPy_i(SALOMEDS__POA.Driver):
         return self._ComponentDataType
 
     def Save(self, theComponent, theURL, isMultiFile):
-        return NULL
+        return ""
 
     def SaveASCII(self, theComponent, theURL, isMultiFile):
         return self.Save(theComponent, theURL, isMultiFile)
@@ -56,7 +56,7 @@ class SALOME_DriverPy_i(SALOMEDS__POA.Driver):
         return 1
 
     def PublishInStudy(self, theStudy, theSObject, theObject, theName):
-        return NULL
+        return None
 
     def CanCopy(self, theObject):
         return 0

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx
index a4bab5781e4703ef896b4b76645fa3d0dc3a1857..0539b5e8125c0b9b21818fb1eaaeebf824bfd9c0 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfInteger.cxx
@@ -42,7 +42,7 @@ static std::string getTitle(std::string theString)
   std::string aString(theString);
   int aPos = aString.find(SEPARATOR);
   if(aPos < 1) return aString;
-  if(aPos == 1) return std::string();
+  if(aPos == 0) return std::string();
   return aString.substr(0, aPos);
 }
 

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx
index 62dd160b17dca23cc8ba20a318f87f995e29520e..64c5f03a6bd6f124960d059749992a33b07fa662 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfReal.cxx
@@ -43,8 +43,8 @@ static std::string getTitle(std::string theString)
 {
   std::string aString(theString);
   int aPos = aString.find(SEPARATOR);
-  if(aPos < 1) return aString;
-  if(aPos == 1) return std::string();
+  if(aPos < 0) return aString;
+  if(aPos == 0) return std::string();
   return aString.substr(0, aPos);
 }
 

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx
index 23ba72c3f4b021265da155942112eaf6c3579ee7..245de358c6b933b1e3d98cee20d2705797a1b4f2 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx
@@ -45,7 +45,7 @@ static std::string getTitle(std::string theString)
   std::string aString(theString);
   int aPos = aString.find(SEPARATOR);
   if(aPos < 1) return aString;
-  if(aPos == 1) return std::string();
+  if(aPos == 0) return std::string();
   return aString.substr(0, aPos);
 }
 

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx
index dfcad3b587f7847bb6f1678a1c2234e3077c8fe2..3880fe7adcc02fd24e2c2e0086d1fc9b79513622 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx
@@ -438,7 +438,7 @@ DF_Attribute* SALOMEDSImpl_AttributeTreeNode::NewEmpty() const
 
 string SALOMEDSImpl_AttributeTreeNode::Type()
 {
-   char* aNodeName = new char[60];
+   char* aNodeName = new char[127];
    sprintf(aNodeName, "AttributeTreeNodeGUID%s", ID().c_str());
    string ret(aNodeName); 
    delete aNodeName;

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx
index b2ba71eca2cfbbf2d4966e8ce4f2afcdd0e6e91f..00c7e4038f25e2af4cacf4301fcb5af022d134da 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx
@@ -94,7 +94,7 @@ void SALOMEDSImpl_AttributeUserID::Paste (DF_Attribute* into)
 string SALOMEDSImpl_AttributeUserID::Type() 
 {
 
-  char* aUAttrName = new char[60];
+  char* aUAttrName = new char[127];
   sprintf(aUAttrName, "AttributeUserID_%s",ID().c_str());
 
   string ret(aUAttrName);