From 32757c6e158438725a50d4fca50c2f6224d24502 Mon Sep 17 00:00:00 2001 From: apn Date: Tue, 9 Feb 2016 14:30:52 +0300 Subject: [PATCH] 0012042: Problem with standard Qt-based Import/Export sample application Front and right views in OCCT CSharp/mfc/qt samples were swapped. --- samples/CSharp/OCCTProxy/OCCTProxy.cpp | 8 ++++---- samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp | 8 ++++---- samples/CSharp/WinForms/Form1.cs | 16 ++++++++-------- .../standard/04_Viewer3d/src/Viewer3dView.cpp | 16 ++++++++-------- .../mfc/standard/08_HLR/src/SelectionDialog.cpp | 8 ++++---- .../09_Animation/src/AnimationView3D.cpp | 8 ++++---- samples/mfc/standard/Common/OCC_3dView.cpp | 8 ++++---- samples/qt/Common/src/View.cxx | 8 ++++---- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/samples/CSharp/OCCTProxy/OCCTProxy.cpp b/samples/CSharp/OCCTProxy/OCCTProxy.cpp index 1888521696..f9a18c5236 100644 --- a/samples/CSharp/OCCTProxy/OCCTProxy.cpp +++ b/samples/CSharp/OCCTProxy/OCCTProxy.cpp @@ -340,7 +340,7 @@ public: { if (!myView().IsNull()) { - myView()->SetProj(V3d_Xpos); + myView()->SetProj(V3d_Yneg); } } @@ -362,7 +362,7 @@ public: { if (!myView().IsNull()) { - myView()->SetProj(V3d_Ypos); + myView()->SetProj(V3d_Xneg); } } @@ -373,7 +373,7 @@ public: { if (!myView().IsNull()) { - myView()->SetProj(V3d_Xneg); + myView()->SetProj(V3d_Ypos); } } @@ -384,7 +384,7 @@ public: { if (!myView().IsNull()) { - myView()->SetProj(V3d_Yneg); + myView()->SetProj(V3d_Xpos); } } diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp b/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp index f3beaee7be..8dc71cfc7d 100644 --- a/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp +++ b/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp @@ -353,7 +353,7 @@ public: { if (!myView().IsNull()) { - myView()->SetProj (V3d_Xpos); + myView()->SetProj (V3d_Yneg); } } @@ -375,7 +375,7 @@ public: { if (!myView().IsNull()) { - myView()->SetProj (V3d_Ypos); + myView()->SetProj (V3d_Xneg); } } @@ -386,7 +386,7 @@ public: { if (!myView().IsNull()) { - myView()->SetProj (V3d_Xneg); + myView()->SetProj (V3d_Ypos); } } @@ -397,7 +397,7 @@ public: { if (!myView().IsNull()) { - myView()->SetProj (V3d_Yneg); + myView()->SetProj (V3d_Xpos); } } diff --git a/samples/CSharp/WinForms/Form1.cs b/samples/CSharp/WinForms/Form1.cs index 469aa50f48..d3f6a169c4 100644 --- a/samples/CSharp/WinForms/Form1.cs +++ b/samples/CSharp/WinForms/Form1.cs @@ -1009,19 +1009,19 @@ namespace IE_WinForms curForm.View.FrontView(); break; case 6: - curForm.View.TopView(); - break; - case 7: - curForm.View.LeftView(); - break; - case 8: curForm.View.BackView(); break; + case 7: + curForm.View.TopView(); + break; + case 8: + curForm.View.BottomView(); + break; case 9: - curForm.View.RightView(); + curForm.View.LeftView(); break; case 10: - curForm.View.BottomView(); + curForm.View.RightView(); break; case 11: curForm.View.AxoView(); diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp index 785de91a18..a410788be2 100755 --- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp @@ -236,10 +236,10 @@ void CViewer3dView::OnSize(UINT /*nType*/, int /*cx*/, int /*cy*/) void CViewer3dView::OnBUTTONBack() { - myView->SetProj(V3d_Xneg); + myView->SetProj(V3d_Ypos); TCollection_AsciiString Message("\ -myView->SetProj(V3d_Xneg);\n\ +myView->SetProj(V3d_Ypos);\n\ "); // Update The Result Message Dialog @@ -247,10 +247,10 @@ GetDocument()->UpdateResultMessageDlg("SetProj",Message); } // See the back View void CViewer3dView::OnBUTTONFront() { - myView->SetProj(V3d_Xpos); + myView->SetProj(V3d_Yneg); TCollection_AsciiString Message("\ -myView->SetProj(V3d_Xpos);\n\ +myView->SetProj(V3d_Yneg);\n\ "); // Update The Result Message Dialog @@ -282,10 +282,10 @@ GetDocument()->UpdateResultMessageDlg("SetProj",Message); void CViewer3dView::OnBUTTONLeft() { - myView->SetProj(V3d_Ypos); + myView->SetProj(V3d_Xneg); TCollection_AsciiString Message("\ -myView->SetProj(V3d_Ypos);\n\ +myView->SetProj(V3d_Xneg);\n\ "); // Update The Result Message Dialog @@ -293,10 +293,10 @@ GetDocument()->UpdateResultMessageDlg("SetProj",Message); } // See the left View void CViewer3dView::OnBUTTONRight() { - myView->SetProj(V3d_Yneg); + myView->SetProj(V3d_Xpos); TCollection_AsciiString Message("\ -myView->SetProj(V3d_Yneg);\n\ +myView->SetProj(V3d_Xpos);\n\ "); // Update The Result Message Dialog diff --git a/samples/mfc/standard/08_HLR/src/SelectionDialog.cpp b/samples/mfc/standard/08_HLR/src/SelectionDialog.cpp index 9c3d477d21..465ee387bf 100644 --- a/samples/mfc/standard/08_HLR/src/SelectionDialog.cpp +++ b/samples/mfc/standard/08_HLR/src/SelectionDialog.cpp @@ -400,25 +400,25 @@ void CSelectionDialog::OnBottomView() void CSelectionDialog::OnLeftView() { - myActiveView->SetProj(V3d_Ypos); + myActiveView->SetProj(V3d_Xneg); OnDisplay(true); } void CSelectionDialog::OnRightView() { - myActiveView->SetProj(V3d_Yneg); + myActiveView->SetProj(V3d_Xpos); OnDisplay(true); } void CSelectionDialog::OnFrontView() { - myActiveView->SetProj(V3d_Xpos); + myActiveView->SetProj(V3d_Yneg); OnDisplay(true); } void CSelectionDialog::OnBackView() { - myActiveView->SetProj(V3d_Xneg); + myActiveView->SetProj(V3d_Ypos); OnDisplay(true); } diff --git a/samples/mfc/standard/09_Animation/src/AnimationView3D.cpp b/samples/mfc/standard/09_Animation/src/AnimationView3D.cpp index ec6d921628..4324a162c3 100755 --- a/samples/mfc/standard/09_Animation/src/AnimationView3D.cpp +++ b/samples/mfc/standard/09_Animation/src/AnimationView3D.cpp @@ -236,9 +236,9 @@ void CAnimationView3D::OnSize(UINT /*nType*/, int cx, int cy) } void CAnimationView3D::OnBUTTONBack() -{ myView->SetProj(V3d_Xneg); } // See the back View +{ myView->SetProj(V3d_Ypos); } // See the back View void CAnimationView3D::OnBUTTONFront() -{ myView->SetProj(V3d_Xpos); } // See the front View +{ myView->SetProj(V3d_Yneg); } // See the front View void CAnimationView3D::OnBUTTONBottom() { myView->SetProj(V3d_Zneg); } // See the bottom View @@ -246,9 +246,9 @@ void CAnimationView3D::OnBUTTONTop() { myView->SetProj(V3d_Zpos); } // See the top View void CAnimationView3D::OnBUTTONLeft() -{ myView->SetProj(V3d_Ypos); } // See the left View +{ myView->SetProj(V3d_Xneg); } // See the left View void CAnimationView3D::OnBUTTONRight() -{ myView->SetProj(V3d_Yneg); } // See the right View +{ myView->SetProj(V3d_Xpos); } // See the right View void CAnimationView3D::OnBUTTONAxo() { myView->SetProj(V3d_XposYnegZpos); } // See the axonometric View diff --git a/samples/mfc/standard/Common/OCC_3dView.cpp b/samples/mfc/standard/Common/OCC_3dView.cpp index 324919eb22..ed77baa0c5 100755 --- a/samples/mfc/standard/Common/OCC_3dView.cpp +++ b/samples/mfc/standard/Common/OCC_3dView.cpp @@ -171,13 +171,13 @@ void OCC_3dView::OnSize(UINT /*nType*/, int /*cx*/, int /*cy*/) // See the back View void OCC_3dView::OnBUTTONBack() { - myView->SetProj(V3d_Xneg); + myView->SetProj(V3d_Ypos); } // See the front View void OCC_3dView::OnBUTTONFront() { - myView->SetProj(V3d_Xpos); + myView->SetProj(V3d_Yneg); } // See the bottom View @@ -195,13 +195,13 @@ void OCC_3dView::OnBUTTONTop() // See the left View void OCC_3dView::OnBUTTONLeft() { - myView->SetProj(V3d_Ypos); + myView->SetProj(V3d_Xneg); } // See the right View void OCC_3dView::OnBUTTONRight() { - myView->SetProj(V3d_Yneg); + myView->SetProj(V3d_Xpos); } // See the axonometric View diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx index ae4df1d9b8..08c8db68e8 100755 --- a/samples/qt/Common/src/View.cxx +++ b/samples/qt/Common/src/View.cxx @@ -154,12 +154,12 @@ void View::globalPan() void View::front() { - myView->SetProj( V3d_Xpos ); + myView->SetProj( V3d_Yneg ); } void View::back() { - myView->SetProj( V3d_Xneg ); + myView->SetProj( V3d_Ypos ); } void View::top() @@ -174,12 +174,12 @@ void View::bottom() void View::left() { - myView->SetProj( V3d_Ypos ); + myView->SetProj( V3d_Xneg ); } void View::right() { - myView->SetProj( V3d_Yneg ); + myView->SetProj( V3d_Xpos ); } void View::axo()