OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0028946: Exception on Undo.

Browse Source 
//Added additional command ForgetAtt and test case E1 to test issue 28946.
This commit is contained in:
szy 2017-08-01 18:31:33 +03:00 committed by bugmaster
parent 82af2baefa
commit e16302cee1
2 changed files with 100 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/DDF/DDF_BasicCommands.cxx
View File

@ -13,11 +13,11 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
// --------------------- // ---------------------
// Version: 0.0 // Version: 0.0
//Version Date Purpose // Version Date Purpose
// 0.0 Feb 10 1997 Creation // 0.0 Feb 10 1997 Creation
#include <DDF.hxx> #include <DDF.hxx>
@ -64,11 +64,11 @@
//======================================================================= //=======================================================================
static Standard_Integer DDF_Children (Draw_Interpretor& di, static Standard_Integer DDF_Children (Draw_Interpretor& di,
Standard_Integer n, Standard_Integer n,
const char** a) const char** a)
{ {
if (n < 2) return 1; if (n < 2) return 1;
Handle(TDF_Data) DF; Handle(TDF_Data) DF;
TCollection_AsciiString entry; TCollection_AsciiString entry;
@ -97,11 +97,11 @@ static Standard_Integer DDF_Children (Draw_Interpretor& di,
//======================================================================= //=======================================================================
static Standard_Integer DDF_Attributes (Draw_Interpretor& di, static Standard_Integer DDF_Attributes (Draw_Interpretor& di,
Standard_Integer n, Standard_Integer n,
const char** a) const char** a)
{ {
if (n != 3) return 1; if (n != 3) return 1;
Handle(TDF_Data) DF; Handle(TDF_Data) DF;
if (!DDF::GetDF (a[1], DF)) return 1; if (!DDF::GetDF (a[1], DF)) return 1;
@ -124,11 +124,11 @@ static Standard_Integer DDF_Attributes (Draw_Interpretor& di,
//======================================================================= //=======================================================================
static Standard_Integer DDF_ForgetAll(Draw_Interpretor& /*di*/, static Standard_Integer DDF_ForgetAll(Draw_Interpretor& /*di*/,
Standard_Integer n, Standard_Integer n,
const char** a) const char** a)
{ {
if (n != 3) return 1; if (n != 3) return 1;
Handle(TDF_Data) DF; Handle(TDF_Data) DF;
if (!DDF::GetDF (a[1], DF)) return 1; if (!DDF::GetDF (a[1], DF)) return 1;
@ -137,11 +137,35 @@ static Standard_Integer DDF_ForgetAll(Draw_Interpretor& /*di*/,
TDF_Tool::Label(DF,a[2],label); TDF_Tool::Label(DF,a[2],label);
if (label.IsNull()) return 1; if (label.IsNull()) return 1;
label.ForgetAllAttributes(); label.ForgetAllAttributes();
//POP pour NT //POP pour NT
return 0; return 0;
} }
//=======================================================================
//function : ForgetAttribute
//purpose : "ForgetAtt dfname Label guid"
//=======================================================================
static Standard_Integer DDF_ForgetAttribute(Draw_Interpretor& di,
Standard_Integer n,
const char** a)
{
if (n != 4) return 1;
Handle(TDF_Data) DF;
if (!DDF::GetDF (a[1], DF)) return 1;
TDF_Label aLabel;
TDF_Tool::Label(DF,a[2],aLabel);
if (aLabel.IsNull()) return 1;
if (!Standard_GUID::CheckGUIDFormat(a[3]))
{
di<<"DDF: The format of GUID is invalid\n";
return 1;
}
Standard_GUID guid(a[3]);
aLabel.ForgetAttribute(guid);
return 0;
}
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// save/restore & Store/Retrieve commands // save/restore & Store/Retrieve commands
@ -209,8 +233,8 @@ void ErrorMessage (const Storage_Error n)
//======================================================================= //=======================================================================
static Standard_Integer DDF_SetTagger (Draw_Interpretor& di, static Standard_Integer DDF_SetTagger (Draw_Interpretor& di,
Standard_Integer nb, Standard_Integer nb,
const char** arg) const char** arg)
{ {
if (nb == 3) { if (nb == 3) {
Handle(TDF_Data) DF; Handle(TDF_Data) DF;
@ -232,8 +256,8 @@ static Standard_Integer DDF_SetTagger (Draw_Interpretor& di,
//======================================================================= //=======================================================================
static Standard_Integer DDF_NewTag (Draw_Interpretor& di, static Standard_Integer DDF_NewTag (Draw_Interpretor& di,
Standard_Integer nb, Standard_Integer nb,
const char** arg) const char** arg)
{ {
if (nb == 3) { if (nb == 3) {
Handle(TDF_Data) DF; Handle(TDF_Data) DF;
@ -254,8 +278,8 @@ static Standard_Integer DDF_NewTag (Draw_Interpretor& di,
//======================================================================= //=======================================================================
static Standard_Integer DDF_NewChild (Draw_Interpretor& di, static Standard_Integer DDF_NewChild (Draw_Interpretor& di,
Standard_Integer nb, Standard_Integer nb,
const char** arg) const char** arg)
{ {
Handle(TDF_Data) DF; Handle(TDF_Data) DF;
if (nb>=2){ if (nb>=2){
@ -314,35 +338,38 @@ void DDF::BasicCommands (Draw_Interpretor& theCommands)
const char* g = "DF basic commands"; const char* g = "DF basic commands";
// Label : // Label :
theCommands.Add ("SetTagger", theCommands.Add ("SetTagger",
"SetTagger (DF, entry)", "SetTagger (DF, entry)",
__FILE__, DDF_SetTagger, g); __FILE__, DDF_SetTagger, g);
theCommands.Add ("NewTag", theCommands.Add ("NewTag",
"NewTag (DF, tagger)", "NewTag (DF, tagger)",
__FILE__, DDF_NewTag, g); __FILE__, DDF_NewTag, g);
theCommands.Add ("NewChild", theCommands.Add ("NewChild",
"NewChild (DF, [tagger])", "NewChild (DF, [tagger])",
__FILE__, DDF_NewChild, g); __FILE__, DDF_NewChild, g);
theCommands.Add ("Children", theCommands.Add ("Children",
" Returns the list of label children: Children DF label", " Returns the list of label children: Children DF label",
__FILE__, DDF_Children, g); __FILE__, DDF_Children, g);
theCommands.Add ("Attributes", theCommands.Add ("Attributes",
" Returns the list of label attributes: Attributes DF label", " Returns the list of label attributes: Attributes DF label",
__FILE__, DDF_Attributes, g); __FILE__, DDF_Attributes, g);
theCommands.Add ("ForgetAll", theCommands.Add ("ForgetAll",
"Forgets all attributes from the label: ForgetAll DF Label", "Forgets all attributes from the label: ForgetAll DF Label",
__FILE__, DDF_ForgetAll, g); __FILE__, DDF_ForgetAll, g);
theCommands.Add ("ForgetAtt",
"Forgets the specified by guid attribute from the label: ForgetAtt DF Label guid",
__FILE__, DDF_ForgetAttribute, g);
theCommands.Add ("Label", theCommands.Add ("Label",
"Label DF entry", "Label DF entry",
__FILE__, DDF_Label, g); __FILE__, DDF_Label, g);
} }

40
tests/caf/bugs/E1 Normal file
View File

@ -0,0 +1,40 @@
puts "================"
puts "bug0028946"
puts "================"
puts ""
######################################################
# Checks bug of Undo mechanism
######################################################
set aLab [Label D 0:1]
#1. Add to Main label two numeric attributes
SetInteger D $aLab 1
SetReal D $aLab 1.5
#2. Forget Integer attribute
NewCommand D
ForgetAtt D $aLab 2a96b606-ec8b-11d0-bee7-080009dc3333
#3. Set new Integer attribute
SetInteger D $aLab 3
NewCommand D
#4. make Undo
set IsGood 1
if [catch {Undo D}] {
puts "Error during Document Undo"
set IsGood 0
}
#5. Check result
if {$IsGood == 1} {
puts "bug0028946: OK"
} else {
puts "bug0028946: ERROR"
}
#6. Close document
Close D