0012042: Problem with standard Qt-based Import/Export sample application

Front and right views in OCCT CSharp/mfc/qt samples were swapped.

diff --git a/samples/CSharp/OCCTProxy/OCCTProxy.cpp b/samples/CSharp/OCCTProxy/OCCTProxy.cpp
index 1888521696a67354ddc5c2849f738ea8b134570b..f9a18c52360124a29f48e28fd0289aa84842084e 100644 (file)
--- 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 f3beaee7beb2e912722dc9ab7d7534e430b16a5d..8dc71cfc7db78639e07e7bb8ddd58ad7c048a199 100644 (file)
--- 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 469aa50f4892dea016004aae992a9d78a1513fed..d3f6a169c48e1b908dc8e3c67c146f22b817d500 100644 (file)
--- 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();
+          curForm.View.BackView();
           break;
         case 7:
-          curForm.View.LeftView();
+          curForm.View.TopView();
           break;
         case 8:
-          curForm.View.BackView();
+          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 785de91a180f41f68541040a026236a93afcbd81..a410788be2803d11ab9849b1d21fc99bb208d55b 100755 (executable)
--- 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 9c3d477d21e2bfce645576d5d73e42a990abf76f..465ee387bf58d9e131a4a5dc18a8e7b92c3b24e5 100644 (file)
--- 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 ec6d9216286c53f0c2424b0a992962399be97734..4324a162c3b4c9e02850132dab61d55110073f5c 100755 (executable)
--- 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 324919eb221797e14ea0b0633d8e7b65e98ff39b..ed77baa0c57e3eb344ff7d37a994cff7c329d25d 100755 (executable)
--- 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 ae4df1d9b8bed00cf851660028f821fc361443ad..08c8db68e8c3c2718403e5d4bf7e032eb7642c39 100755 (executable)
--- 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()