OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-16 10:08:36 +03:00
Code

Merge OCC22357, OCC22315 and OCC22199

Browse Source
This commit is contained in:
bugmaster 2011-04-28 16:38:49 +00:00 committed by bugmaster
parent 4bf18dff31
commit 31160f806e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ViewerTest/ViewerTest.cxx
View File

@ -1659,17 +1659,17 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
if(myAISContext.IsNull()) if(myAISContext.IsNull())
{ {
di << "use 'vinit' command before " << argv[0] << "\n"; di << "use 'vinit' command before " << argv[0] << "\n";
return 0; return 1;
} }
Handle(AIS_InteractiveObject) TheAisIO; Handle(AIS_InteractiveObject) TheAisIO;
Handle(AIS_TexturedShape) myShape; Handle(AIS_TexturedShape) myShape;
Standard_Integer myPreviousMode = 0; Standard_Integer myPreviousMode = 0;
if (!argv[1]) if (argc<2 || !argv[1])
{ {
di << argv[0] <<" syntax error - Type 'help vtex'"<<"\n"; di << argv[0] <<" syntax error - Type 'help vtex'"<<"\n";
return 0; return 1;
} }
TCollection_AsciiString name = argv[1]; TCollection_AsciiString name = argv[1];
@ -1681,7 +1681,7 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
if (TheAisIO.IsNull()) if (TheAisIO.IsNull())
{ {
di <<"shape "<<name.ToCString()<<" doesn\'t exist"<<"\n"; di <<"shape "<<name.ToCString()<<" doesn\'t exist"<<"\n";
return 0; return 1;
} }
if (TheAisIO->IsKind(STANDARD_TYPE(AIS_TexturedShape)) && !TheAisIO.IsNull()) if (TheAisIO->IsKind(STANDARD_TYPE(AIS_TexturedShape)) && !TheAisIO.IsNull())
@ -1691,7 +1691,7 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
} }
else else
{ {
myAISContext->Erase(TheAisIO,Standard_False); myAISContext->Clear(TheAisIO,Standard_False);
myShape = new AIS_TexturedShape (DBRep::Get(argv[1])); myShape = new AIS_TexturedShape (DBRep::Get(argv[1]));
GetMapOfAIS().UnBind1(TheAisIO); GetMapOfAIS().UnBind1(TheAisIO);
GetMapOfAIS().UnBind2(name); GetMapOfAIS().UnBind2(name);
@ -1703,9 +1703,9 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
if(argc<=1) if(argc<=1)
{ {
di << argv[0] <<" syntax error - Type 'help vtex'" << "\n"; di << argv[0] <<" syntax error - Type 'help vtex'" << "\n";
return 0; return 1;
} }
if (argv[2]) if (argc>2 && argv[2])
{ {
if(strcasecmp(argv[2],"?")==0) if(strcasecmp(argv[2],"?")==0)
{ {
@ -1744,7 +1744,7 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
if(argc<2) if(argc<2)
{ {
di << argv[0] <<" syntax error - Type 'help vtex'" << "\n"; di << argv[0] <<" syntax error - Type 'help vtex'" << "\n";
return 0; return 1;
} }
myShape->SetTextureScale (( argv[2] ? Standard_True : Standard_False ), myShape->SetTextureScale (( argv[2] ? Standard_True : Standard_False ),
@ -1756,7 +1756,7 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
if(argc<2) if(argc<2)
{ {
di << argv[0] <<" syntax error - Type 'help vtex'" << "\n"; di << argv[0] <<" syntax error - Type 'help vtex'" << "\n";
return 0; return 1;
} }
myShape->SetTextureOrigin (( argv[2] ? Standard_True : Standard_False ), myShape->SetTextureOrigin (( argv[2] ? Standard_True : Standard_False ),
( argv[2] ? atof(argv[2]) : 0.0 ), ( argv[2] ? atof(argv[2]) : 0.0 ),
@ -1767,9 +1767,9 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
if(argc<2) if(argc<2)
{ {
di << argv[0] <<" syntax error - Type 'help vtex'" << "\n"; di << argv[0] <<" syntax error - Type 'help vtex'" << "\n";
return 0; return 1;
} }
if (argv[2]) if (argc>2 && argv[2])
{ {
di <<"Texture repeat enabled"<<"\n"; di <<"Texture repeat enabled"<<"\n";
myShape->SetTextureRepeat(Standard_True, atof(argv[2]), atof(argv[argc-1]) ); myShape->SetTextureRepeat(Standard_True, atof(argv[2]), atof(argv[argc-1]) );
@ -1789,7 +1789,7 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
if(argc<2) if(argc<2)
{ {
di << argv[0] <<" syntax error - Type 'help vtex'" << "\n"; di << argv[0] <<" syntax error - Type 'help vtex'" << "\n";
return 0; return 1;
} }
myShape->SetTextureRepeat(Standard_False); myShape->SetTextureRepeat(Standard_False);
myShape->SetTextureOrigin(Standard_False); myShape->SetTextureOrigin(Standard_False);
@ -1805,7 +1805,7 @@ Standard_Integer VTexture (Draw_Interpretor& di,Standard_Integer argc, const cha
myAISContext->Display(myShape, Standard_True); myAISContext->Display(myShape, Standard_True);
myAISContext->Update(myShape,Standard_True); myAISContext->Update(myShape,Standard_True);
} }
return 1; return 0;
} }
//============================================================================== //==============================================================================
@ -2066,7 +2066,7 @@ static int VPerf(Draw_Interpretor& di, Standard_Integer , const char** argv) {
// Function : VAnimation // Function : VAnimation
//================================================================================== //==================================================================================
static int VAnimation (Draw_Interpretor& di, Standard_Integer argc, const char** argv) { static int VAnimation (Draw_Interpretor& di, Standard_Integer argc, const char** argv) {
if (argc =! 5) { if (argc != 5) {
di<<"Use: "<<argv[0]<<" CrankArmFile CylinderHeadFile PropellerFile EngineBlockFile"<<"\n"; di<<"Use: "<<argv[0]<<" CrankArmFile CylinderHeadFile PropellerFile EngineBlockFile"<<"\n";
return 1; return 1;
} }