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

Merge OCC22357, OCC22199 and replacing french comments by englih one

Browse Source
This commit is contained in:
bugmaster 2011-04-28 16:31:41 +00:00 committed by bugmaster
parent 81bba7173e
commit ab943560bd
3 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/AIS/AIS_InteractiveContext_2.cxx
View File

@ -20,8 +20,6 @@
#include <Graphic3d_MapIteratorOfMapOfStructure.hxx> #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
#include <AIS_Selection.hxx> #include <AIS_Selection.hxx>
static TColStd_ListIteratorOfListOfInteger ItL;
//======================================================================= //=======================================================================
//function : OpenLocalContext //function : OpenLocalContext
//purpose : //purpose :
@ -63,21 +61,13 @@ OpenLocalContext(const Standard_Boolean UseDisplayedObjects,
UseDisplayedObjects, UseDisplayedObjects,
AllowShapeDecomposition, AllowShapeDecomposition,
AcceptEraseOfTemporary); AcceptEraseOfTemporary);
NewLocal->MainSelector()->Set ((myLocalContexts.Extent() > 0)
// rob 16/04/97 Problems of asynchronous orders ? myLocalContexts (untilnow)->MainSelector()->Projector()
if(myLocalContexts.Extent()>0){ : myMainSel->Projector());
const Select3D_Projector& Prj = myLocalContexts(untilnow)->MainSelector()->Projector();
NewLocal->MainSelector()->Set(Prj);
}
else{
const Select3D_Projector& Prj = myMainSel->Projector();
NewLocal->MainSelector()->Set(Prj);
}
NewLocal->MainSelector()->UpdateConversion();
myLocalContexts.Bind(myCurLocalIndex,NewLocal);
NewLocal->MainSelector()->UpdateConversion();
myLocalContexts.Bind(myCurLocalIndex,NewLocal);
#ifdef DEB #ifdef DEB
cout<<"\tOpen Local Context No "<<myCurLocalIndex<<endl; cout<<"\tOpen Local Context No "<<myCurLocalIndex<<endl;
@ -92,7 +82,6 @@ OpenLocalContext(const Standard_Boolean UseDisplayedObjects,
cout<<"\t\tNo Objects Were Loaded "<<endl; cout<<"\t\tNo Objects Were Loaded "<<endl;
#endif #endif
return myCurLocalIndex; return myCurLocalIndex;
} }
//======================================================================= //=======================================================================
@ -267,6 +256,7 @@ Deactivate(const Handle(AIS_InteractiveObject)& anIObj)
{ {
if(!HasOpenedContext()){ if(!HasOpenedContext()){
if(!myObjects.IsBound(anIObj)) return; if(!myObjects.IsBound(anIObj)) return;
TColStd_ListIteratorOfListOfInteger ItL;
for(ItL.Initialize(myObjects(anIObj)->SelectionModes()); for(ItL.Initialize(myObjects(anIObj)->SelectionModes());
ItL.More(); ItL.More();
ItL.Next()){ ItL.Next()){
@ -311,9 +301,9 @@ void AIS_InteractiveContext::
ActivatedModes(const Handle(AIS_InteractiveObject)& anIObj, ActivatedModes(const Handle(AIS_InteractiveObject)& anIObj,
TColStd_ListOfInteger& theList) const TColStd_ListOfInteger& theList) const
{ {
TColStd_ListIteratorOfListOfInteger ItL;
if(!HasOpenedContext()){ if(!HasOpenedContext()){
if(myObjects.IsBound(anIObj)){ if(myObjects.IsBound(anIObj)){
//ItL is a static variable...
for(ItL.Initialize(myObjects(anIObj)->SelectionModes()); for(ItL.Initialize(myObjects(anIObj)->SelectionModes());
ItL.More(); ItL.More();
ItL.Next()) ItL.Next())
@ -392,6 +382,7 @@ SubIntensityOn(const Handle(AIS_InteractiveObject)& anIObj,
if(myObjects.IsBound(anIObj)){ if(myObjects.IsBound(anIObj)){
const Handle(AIS_GlobalStatus)& STAT = myObjects(anIObj); const Handle(AIS_GlobalStatus)& STAT = myObjects(anIObj);
STAT->SubIntensityOn(); STAT->SubIntensityOn();
TColStd_ListIteratorOfListOfInteger ItL;
for (ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next()) for (ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next())
myMainPM->Color(anIObj,mySubIntensity,ItL.Value()); myMainPM->Color(anIObj,mySubIntensity,ItL.Value());
} }
@ -445,6 +436,7 @@ SubIntensityOff(const Handle(AIS_InteractiveObject)& anIObj,
if(myObjects.IsBound(anIObj)){ if(myObjects.IsBound(anIObj)){
const Handle(AIS_GlobalStatus)& STAT = myObjects(anIObj); const Handle(AIS_GlobalStatus)& STAT = myObjects(anIObj);
STAT->SubIntensityOff(); STAT->SubIntensityOff();
TColStd_ListIteratorOfListOfInteger ItL;
for (ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next()) for (ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next())
myMainPM->Unhighlight(anIObj,ItL.Value()); myMainPM->Unhighlight(anIObj,ItL.Value());
if(STAT->IsHilighted()) if(STAT->IsHilighted())
@ -488,11 +480,10 @@ void AIS_InteractiveContext::SubIntensityOn(const Standard_Boolean updateviewer)
//======================================================================= //=======================================================================
void AIS_InteractiveContext::SubIntensityOff(const Standard_Boolean updateviewer) void AIS_InteractiveContext::SubIntensityOff(const Standard_Boolean updateviewer)
{ {
if(!HasOpenedContext()) return; if(!HasOpenedContext()) return;
AIS_DataMapIteratorOfDataMapOfIOStatus It (myObjects); AIS_DataMapIteratorOfDataMapOfIOStatus It (myObjects);
TColStd_ListIteratorOfListOfInteger ItL;
for(;It.More();It.Next()){ for(;It.More();It.Next()){
const Handle(AIS_GlobalStatus)& STAT = It.Value(); const Handle(AIS_GlobalStatus)& STAT = It.Value();
if(STAT->IsSubIntensityOn()) if(STAT->IsSubIntensityOn())
@ -500,7 +491,7 @@ void AIS_InteractiveContext::SubIntensityOff(const Standard_Boolean updateviewer
for(ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next()) for(ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next())
myMainPM->Unhighlight(It.Key()); myMainPM->Unhighlight(It.Key());
} }
if(updateviewer) myMainVwr->Update(); if(updateviewer) myMainVwr->Update();
} }
@ -876,7 +867,7 @@ void AIS_InteractiveContext::ResetOriginalState(const Standard_Boolean updatevie
{ {
Standard_Boolean upd_main(Standard_False),upd_col(Standard_False); Standard_Boolean upd_main(Standard_False),upd_col(Standard_False);
TColStd_ListIteratorOfListOfInteger itl; TColStd_ListIteratorOfListOfInteger itl;
for (AIS_DataMapIteratorOfDataMapOfIOStatus it(myObjects);it.More();it.Next()){ for (AIS_DataMapIteratorOfDataMapOfIOStatus it(myObjects);it.More();it.Next()){
const Handle(AIS_InteractiveObject)& iobj = it.Key(); const Handle(AIS_InteractiveObject)& iobj = it.Key();
const Handle(AIS_GlobalStatus)& STAT = it.Value(); const Handle(AIS_GlobalStatus)& STAT = it.Value();

31
src/AIS/AIS_LocalContext.cxx
View File

@ -463,6 +463,8 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
for(It.Initialize(Att->SelectionModes());It.More();It.Next()){ for(It.Initialize(Att->SelectionModes());It.More();It.Next()){
mySM->Deactivate(aSelectable,It.Value(),myMainVS); mySM->Deactivate(aSelectable,It.Value(),myMainVS);
} }
// pop : si je laisses cela plantes dans les elements de construction
// alors a toi de jouer ROB
// RemoveSelected(aSelectable); // RemoveSelected(aSelectable);
if(IsSelected(aSelectable)) if(IsSelected(aSelectable))
@ -656,22 +658,25 @@ void AIS_LocalContext::RemoveFilter(const Handle(SelectMgr_Filter)& aFilter)
Standard_Boolean AIS_LocalContext::HasSameProjector(const Select3D_Projector& aPrj) const Standard_Boolean AIS_LocalContext::HasSameProjector(const Handle(Select3D_Projector)& thePrj) const
{ {
const Select3D_Projector& CurPrj = myMainVS->Projector(); const Handle(Select3D_Projector)& aCurPrj = myMainVS->Projector();
if(CurPrj.Perspective()!=aPrj.Perspective()) return Standard_False; if (aCurPrj->Perspective() != thePrj->Perspective())
if(CurPrj.Perspective()) return Standard_False;
if(CurPrj.Focus()!=aPrj.Focus()) return Standard_False; if (aCurPrj->Perspective() && aCurPrj->Focus() != thePrj->Focus())
gp_GTrsf CurTrsf(CurPrj.Transformation()); return Standard_False;
gp_GTrsf PrjTrsf(aPrj.Transformation()); const gp_GTrsf& aCurTrsf = aCurPrj->Transformation();
const gp_GTrsf& aPrjTrsf = thePrj->Transformation();
for(Standard_Integer i=1;i<=3;i++){
for(Standard_Integer j=1;j<=3;j++){ for (Standard_Integer i = 1; i <= 3; ++i)
if(CurTrsf.Value(i,j)!=PrjTrsf.Value(i,j)) {
return Standard_False; for (Standard_Integer j = 1; j <= 3 ; ++j)
{
if (aCurTrsf.Value (i, j) != aPrjTrsf.Value (i, j))
return Standard_False;
} }
} }
return Standard_True; return Standard_True;
} }

6
src/AIS/AIS_TexturedShape.cxx
View File

@ -342,8 +342,10 @@ void AIS_TexturedShape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aP
BRepTools::Update(myshape); BRepTools::Update(myshape);
Handle(Graphic3d_StructureManager) aStrucMana = GetContext()->MainPrsMgr()->StructureManager(); Handle(Graphic3d_StructureManager) aStrucMana = GetContext()->MainPrsMgr()->StructureManager();
{
myAspect = (new Prs3d_ShadingAspect())->Aspect(); Handle(Prs3d_ShadingAspect) aPrs3d_ShadingAspect = new Prs3d_ShadingAspect;
myAspect = aPrs3d_ShadingAspect->Aspect();
}
if (!DoMapTexture) if (!DoMapTexture)
{ {
myAspect->SetTextureMapOff(); myAspect->SetTextureMapOff();