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

0023323: Duplicate if-clause in Visual3d_View.cxx

Browse Source 
Changed an outer condition.
Deleted MyMatOfOriIsModified and MyMatOfMapIsModified flags.Deleted all modification flags from ViewOrientationReset() and SetViewOrientation() functions.
Checkings of view modifications in SetViewOrientation() and ViewOrientationReset() methods were returned
CustomIsModified flag was replaced by ScaleIsModified flag in modification checking.
Added 'IsInitialized' flag to check if orientation matrix was set
This commit is contained in:
aba 2012-12-14 16:08:27 +04:00
parent d27ea0ef51
commit bd92cc2a59
2 changed files with 106 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/Visual3d/Visual3d_View.cxx
View File

@ -274,13 +274,13 @@ Standard_Real um, vm, uM, vM;
MyCView.Context.ZBufferActivity = -1; MyCView.Context.ZBufferActivity = -1;
MyMatOfMapIsModified = Standard_True;
MyMatOfOriIsModified = Standard_True;
MyMatOfMapIsEvaluated = Standard_False; MyMatOfMapIsEvaluated = Standard_False;
MyMatOfOriIsEvaluated = Standard_False; MyMatOfOriIsEvaluated = Standard_False;
DegenerateModeIsActive = Standard_False; DegenerateModeIsActive = Standard_False;
AnimationModeIsActive = Standard_False; AnimationModeIsActive = Standard_False;
IsInitialized = Standard_False;
#ifdef G003 #ifdef G003
MyCView.IsDegenerates = 0; MyCView.IsDegenerates = 0;
MyCView.IsDegeneratesPrev = 0; MyCView.IsDegeneratesPrev = 0;
@ -413,10 +413,10 @@ Standard_Real um, vm, uM, vM;
MyCView.Context.ZBufferActivity = -1; MyCView.Context.ZBufferActivity = -1;
MyMatOfMapIsModified = Standard_True;
MyMatOfOriIsModified = Standard_True;
MyMatOfMapIsEvaluated = Standard_False; MyMatOfMapIsEvaluated = Standard_False;
MyMatOfOriIsEvaluated = Standard_False; MyMatOfOriIsEvaluated = Standard_False;
IsInitialized = Standard_False;
#ifdef G003 #ifdef G003
AnimationModeIsActive = Standard_False; AnimationModeIsActive = Standard_False;
MyCView.IsDegenerates = 0; MyCView.IsDegenerates = 0;
@ -602,11 +602,11 @@ void Visual3d_View::Remove () {
MyCView.IsDeleted = 1; MyCView.IsDeleted = 1;
MyCView.DefWindow.IsDefined = 0; MyCView.DefWindow.IsDefined = 0;
MyMatOfMapIsModified = Standard_True;
MyMatOfOriIsModified = Standard_True;
MyMatOfMapIsEvaluated = Standard_False; MyMatOfMapIsEvaluated = Standard_False;
MyMatOfOriIsEvaluated = Standard_False; MyMatOfOriIsEvaluated = Standard_False;
IsInitialized = Standard_False;
MyWindow.Nullify (); MyWindow.Nullify ();
} }
@ -1099,7 +1099,6 @@ Visual3d_ViewOrientation NewViewOrientation;
SetViewOrientation (NewViewOrientation); SetViewOrientation (NewViewOrientation);
MyMatOfOriIsModified = Standard_True;
MyMatOfOriIsEvaluated = Standard_False; MyMatOfOriIsEvaluated = Standard_False;
} }
@ -1116,14 +1115,13 @@ void Visual3d_View::SetViewOrientation (const Visual3d_ViewOrientation& VO) {
MyViewOrientation = VO; MyViewOrientation = VO;
Standard_Real X, Y, Z; Standard_Real X, Y, Z;
// Tests on modification of parameters. // Tests on modification of parameters.
Standard_Boolean VUPIsModified = Standard_False; Standard_Boolean VUPIsModified = Standard_False;
Standard_Boolean VRPIsModified = Standard_False; Standard_Boolean VRPIsModified = Standard_False;
Standard_Boolean VRUIsModified = Standard_False; Standard_Boolean VRUIsModified = Standard_False;
Standard_Boolean ScaleIsModified = Standard_False; Standard_Boolean ScaleIsModified = Standard_False;
Standard_Boolean CustomIsModified = Standard_False; Standard_Boolean CustomIsModified = Standard_False;
(MyViewOrientation.ViewReferencePoint ()).Coord (X, Y, Z); (MyViewOrientation.ViewReferencePoint ()).Coord (X, Y, Z);
VUPIsModified = VUPIsModified =
@ -1152,16 +1150,14 @@ Standard_Boolean CustomIsModified = Standard_False;
MyCView.Orientation.ViewReferenceUp.y = float (Y); MyCView.Orientation.ViewReferenceUp.y = float (Y);
MyCView.Orientation.ViewReferenceUp.z = float (Z); MyCView.Orientation.ViewReferenceUp.z = float (Z);
Standard_Real Sx, Sy, Sz; MyViewOrientation.AxialScale(X, Y, Z);
MyViewOrientation.AxialScale(Sx, Sy, Sz);
ScaleIsModified = ScaleIsModified =
MyCView.Orientation.ViewScaleX != float (X) MyCView.Orientation.ViewScaleX != float (X)
|| MyCView.Orientation.ViewScaleY != float (Y) || MyCView.Orientation.ViewScaleY != float (Y)
|| MyCView.Orientation.ViewScaleZ != float (Z); || MyCView.Orientation.ViewScaleZ != float (Z);
MyCView.Orientation.ViewScaleX = float (Sx); MyCView.Orientation.ViewScaleX = float (X);
MyCView.Orientation.ViewScaleY = float (Sy); MyCView.Orientation.ViewScaleY = float (Y);
MyCView.Orientation.ViewScaleZ = float (Sz); MyCView.Orientation.ViewScaleZ = float (Z);
CustomIsModified = CustomIsModified =
MyCView.Orientation.IsCustomMatrix != MyViewOrientation.IsCustomMatrix(); MyCView.Orientation.IsCustomMatrix != MyViewOrientation.IsCustomMatrix();
@ -1172,34 +1168,33 @@ Standard_Real Sx, Sy, Sz;
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
if (!CustomIsModified) CustomIsModified = if (!CustomIsModified) CustomIsModified =
MyCView.Orientation.ModelViewMatrix[i][j] != MyViewOrientation.MyModelViewMatrix->Value(i,j); MyCView.Orientation.ModelViewMatrix[i][j] != MyViewOrientation.MyModelViewMatrix->Value(i,j);
MyCView.Orientation.ModelViewMatrix[i][j] = MyViewOrientation.MyModelViewMatrix->Value(i,j);
} }
} }
#ifdef TRACE_TRSF #ifdef TRACE_TRSF
cout << "Visual3d_View::SetViewOrientation\n"; cout << "Visual3d_View::SetViewOrientation\n";
if (VUPIsModified || VRPIsModified || VRUIsModified || CustomIsModified) if (VUPIsModified || VRPIsModified || VRUIsModified || ScaleIsModified || CustomIsModified)
cout << "VUPIsModified : " << VUPIsModified cout << "VUPIsModified : " << VUPIsModified
<< ", VRPIsModified : " << VRPIsModified << ", VRPIsModified : " << VRPIsModified
<< ", VRUIsModified : " << VRUIsModified << ", VRUIsModified : " << VRUIsModified
<< ", CustomIsModified : " << CustomIsModified << "\n" << flush; << ", CustomIsModified : " << CustomIsModified
<< ", ScaleIsModified : " << ScaleIsModified << "\n" << flush;
else else
cout << "no modification\n" << flush; cout << "no modification\n" << flush;
#endif #endif
// restart if one of parameters is modified // restart if one of parameters is modified
if (VUPIsModified || VRPIsModified || VRUIsModified || ScaleIsModified || CustomIsModified) { if (!IsInitialized || VUPIsModified || VRPIsModified
|| VRUIsModified || ScaleIsModified || CustomIsModified) {
if (VUPIsModified || VRPIsModified || VRUIsModified || CustomIsModified) { MyMatOfOriIsEvaluated = !VUPIsModified && !VRPIsModified
MyMatOfOriIsModified = Standard_True; && !VRUIsModified && !ScaleIsModified;
MyMatOfOriIsEvaluated = Standard_False;
}
if (! IsDefined ()) return; if (! IsDefined ()) return;
Standard_Boolean AWait = Standard_False; // => immediate update Standard_Boolean AWait = Standard_False; // => immediate update
MyGraphicDriver->ViewOrientation (MyCView, AWait); MyGraphicDriver->ViewOrientation (MyCView, AWait);
IsInitialized = Standard_True;
Compute (); Compute ();
if (MyViewManager->UpdateMode () == Aspect_TOU_ASAP) Update (); if (MyViewManager->UpdateMode () == Aspect_TOU_ASAP) Update ();
@ -1231,14 +1226,14 @@ void Visual3d_View::ViewOrientationReset () {
MyViewOrientation = MyViewOrientationReset; MyViewOrientation = MyViewOrientationReset;
Standard_Real X, Y, Z; Standard_Real X, Y, Z;
// Tests on modification of parameters. // Tests on modification of parameters.
Standard_Boolean VUPIsModified = Standard_False; Standard_Boolean VUPIsModified = Standard_False;
Standard_Boolean VRPIsModified = Standard_False; Standard_Boolean VRPIsModified = Standard_False;
Standard_Boolean VRUIsModified = Standard_False; Standard_Boolean VRUIsModified = Standard_False;
Standard_Boolean ScaleIsModified = Standard_False; Standard_Boolean ScaleIsModified = Standard_False;
Standard_Boolean CustomIsModified = Standard_False; Standard_Boolean CustomIsModified = Standard_False;
(MyViewOrientation.ViewReferencePoint ()).Coord (X, Y, Z); (MyViewOrientation.ViewReferencePoint ()).Coord (X, Y, Z);
VUPIsModified = VUPIsModified =
@ -1267,16 +1262,14 @@ Standard_Boolean CustomIsModified = Standard_False;
MyCView.Orientation.ViewReferenceUp.y = float (Y); MyCView.Orientation.ViewReferenceUp.y = float (Y);
MyCView.Orientation.ViewReferenceUp.z = float (Z); MyCView.Orientation.ViewReferenceUp.z = float (Z);
Standard_Real Sx, Sy, Sz; MyViewOrientation.AxialScale(X, Y, Z);
MyViewOrientation.AxialScale(Sx, Sy, Sz);
ScaleIsModified = ScaleIsModified =
MyCView.Orientation.ViewScaleX != float (X) MyCView.Orientation.ViewScaleX != float (X)
|| MyCView.Orientation.ViewScaleY != float (Y) || MyCView.Orientation.ViewScaleY != float (Y)
|| MyCView.Orientation.ViewScaleZ != float (Z); || MyCView.Orientation.ViewScaleZ != float (Z);
MyCView.Orientation.ViewScaleX = float (Sx); MyCView.Orientation.ViewScaleX = float (X);
MyCView.Orientation.ViewScaleY = float (Sy); MyCView.Orientation.ViewScaleY = float (Y);
MyCView.Orientation.ViewScaleZ = float (Sz); MyCView.Orientation.ViewScaleZ = float (Z);
CustomIsModified = CustomIsModified =
MyCView.Orientation.IsCustomMatrix != MyViewOrientation.IsCustomMatrix(); MyCView.Orientation.IsCustomMatrix != MyViewOrientation.IsCustomMatrix();
@ -1287,39 +1280,38 @@ Standard_Real Sx, Sy, Sz;
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
if (!CustomIsModified) CustomIsModified = if (!CustomIsModified) CustomIsModified =
MyCView.Orientation.ModelViewMatrix[i][j] != MyViewOrientation.MyModelViewMatrix->Value(i,j); MyCView.Orientation.ModelViewMatrix[i][j] != MyViewOrientation.MyModelViewMatrix->Value(i,j);
MyCView.Orientation.ModelViewMatrix[i][j] = MyViewOrientation.MyModelViewMatrix->Value(i,j);
} }
} }
#ifdef TRACE_TRSF #ifdef TRACE_TRSF
cout << "Visual3d_View::ViewOrientationReset\n"; cout << "Visual3d_View::ViewOrientationReset\n";
if (VUPIsModified || VRPIsModified || VRUIsModified || CustomIsModified) if (VUPIsModified || VRPIsModified || VRUIsModified || ScaleIsModified || CustomIsModified)
cout << "VUPIsModified : " << VUPIsModified cout << "VUPIsModified : " << VUPIsModified
<< ", VRPIsModified : " << VRPIsModified << ", VRPIsModified : " << VRPIsModified
<< ", VRUIsModified : " << VRUIsModified << ", VRUIsModified : " << VRUIsModified
<< ", CustomIsModified : " << CustomIsModified << "\n" << flush; << ", CustomIsModified : " << CustomIsModified
else << ", ScaleIsModified : " << ScaleIsModified << "\n" << flush;
cout << "no modification\n" << flush; else
cout << "no modification\n" << flush;
#endif #endif
// Restart if one of parameters is modified // Restart if one of parameters is modified
if (VUPIsModified || VRPIsModified || VRUIsModified || CustomIsModified) { if (!IsInitialized || VUPIsModified || VRPIsModified
|| VRUIsModified || ScaleIsModified || CustomIsModified) {
if (VUPIsModified || VRPIsModified || VRUIsModified || CustomIsModified) { MyMatOfOriIsEvaluated = !VUPIsModified && !VRPIsModified
MyMatOfOriIsModified = Standard_True; && !VRUIsModified && !ScaleIsModified;
MyMatOfOriIsEvaluated = Standard_False;
}
if (! IsDefined ()) return; if (! IsDefined ()) return;
Standard_Boolean AWait = Standard_False; // => immediate update Standard_Boolean AWait = Standard_False; // => immediate update
MyGraphicDriver->ViewOrientation (MyCView, AWait); MyGraphicDriver->ViewOrientation (MyCView, AWait);
IsInitialized = Standard_True;
Compute (); Compute ();
if (MyViewManager->UpdateMode () == Aspect_TOU_ASAP) Update (); if (MyViewManager->UpdateMode () == Aspect_TOU_ASAP) Update ();
} }
} }
void Visual3d_View::SetViewMapping (const Visual3d_ViewMapping& VM) { void Visual3d_View::SetViewMapping (const Visual3d_ViewMapping& VM) {
@ -1360,7 +1352,6 @@ Standard_Real um, vm, uM, vM;
MyViewMapping.MyProjectionMatrix->Value(i,j); MyViewMapping.MyProjectionMatrix->Value(i,j);
} }
MyMatOfMapIsModified = Standard_True;
MyMatOfMapIsEvaluated = Standard_False; MyMatOfMapIsEvaluated = Standard_False;
if (! IsDefined ()) return; if (! IsDefined ()) return;
@ -1429,7 +1420,6 @@ Standard_Real um, vm, uM, vM;
MyViewMapping.MyProjectionMatrix->Value(i,j); MyViewMapping.MyProjectionMatrix->Value(i,j);
} }
MyMatOfMapIsModified = Standard_True;
MyMatOfMapIsEvaluated = Standard_False; MyMatOfMapIsEvaluated = Standard_False;
if (! IsDefined ()) return; if (! IsDefined ()) return;
@ -1897,9 +1887,6 @@ Aspect_CLayer2d UnderCLayer;
MyGraphicDriver->Update (MyCView, UnderCLayer, OverCLayer); MyGraphicDriver->Update (MyCView, UnderCLayer, OverCLayer);
//OSD::SetSignal (Standard_True); //OSD::SetSignal (Standard_True);
MyMatOfMapIsModified = Standard_False;
MyMatOfOriIsModified = Standard_False;
} }
Visual3d_TypeOfAnswer Visual3d_View::AcceptDisplay (const Handle(Graphic3d_Structure)& AStructure) const { Visual3d_TypeOfAnswer Visual3d_View::AcceptDisplay (const Handle(Graphic3d_Structure)& AStructure) const {

15
src/Visual3d/Visual3d_View.pxx
View File

@ -28,14 +28,11 @@
#define MyViewManager ((Visual3d_ViewManager *) MyPtrViewManager) #define MyViewManager ((Visual3d_ViewManager *) MyPtrViewManager)
#define MyMatOfMapIsModified MyCBitFields.bool1 #define MyMatOfMapIsEvaluated MyCBitFields.bool1
#define MyMatOfMapIsEvaluated MyCBitFields.bool2 #define MyMatOfOriIsEvaluated MyCBitFields.bool2
#define MyMatOfOriIsModified MyCBitFields.bool3 #define DegenerateModeIsActive MyCBitFields.bool3
#define MyMatOfOriIsEvaluated MyCBitFields.bool4 #define AnimationModeIsActive MyCBitFields.bool4
#define DegenerateModeIsActive MyCBitFields.bool5 #define IsInitialized MyCBitFields.bool5
#define AnimationModeIsActive MyCBitFields.bool6 #define ComputedModeIsActive MyCBitFields.bool6
#ifdef G003
#define ComputedModeIsActive MyCBitFields.bool7
#endif
#endif #endif