refs #430: incorrect coordinates in dump polyline

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ProfileDlg.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
index 499e5ec74d4f589de2ba21498d30da8c49ecfe0e..0829ac445474b8d2c741cbc5090314cb0ac5e024 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
@@ -24,6 +24,7 @@
 
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_AISTrihedron.h"
 
 #include <CurveCreator_Widget.h>
 #include <CurveCreator_ICurve.hxx>
@@ -58,7 +59,9 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr
   int anActionFlags = 
     CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode |
     CurveCreator_Widget::DisableClosedSection;
-  myEditorWidget = new CurveCreator_Widget( this, NULL, anActionFlags );
+  QStringList aCoordTitles;
+  aCoordTitles << tr( "U_TITLE" ) << tr( "Z_TITLE" );
+  myEditorWidget = new CurveCreator_Widget( this, NULL, anActionFlags, aCoordTitles );
   addWidget( myEditorWidget, 3 );
 
   myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this );
@@ -69,7 +72,7 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr
   anAddElementLayout->setSpacing( 5 );
 
   myViewManager = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 );
-  OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( true );
+  OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( false /*erase trihedron*/);
 
   SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
   aViewer->setBackground( OCCViewer_ViewFrame::TOP_LEFT,
@@ -90,6 +93,16 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr
 
   myViewManager->setViewModel( aViewer );// custom view model, which extends SALOME_View interface
   SUIT_ViewWindow* aViewWin = myViewManager->createViewWindow();
+  aViewer->setStaticTrihedronDisplayed( false );
+  Handle(AIS_Trihedron) aTrihedron = HYDROGUI_AISTrihedron::createTrihedron(
+                         aResMgr->doubleValue( "3DViewer", "trihedron_size",
+                                               aViewer->trihedronSize() ));
+  Handle(AIS_InteractiveContext) anAISContext = aViewer->getAISContext();
+  if ( !anAISContext.IsNull() ) {
+    anAISContext->Display( aTrihedron );
+    anAISContext->Deactivate( aTrihedron );
+  }
+
   addWidget( aViewWin, 4 );
   myEditorWidget->setOCCViewer( aViewer );
 
@@ -207,9 +220,9 @@ void HYDROGUI_ProfileDlg::onMouseMove( SUIT_ViewWindow* theViewWindow, QMouseEve
       theEvent->x(), theEvent->y(), anOCCViewWindow->getViewPort()->getView() );
 
     // Show the coordinates
-    QString aX = HYDROGUI_Tool::GetCoordinateString( aPnt.X() );
-    QString anY = HYDROGUI_Tool::GetCoordinateString( aPnt.Y() );
-    myCoordLabel->setText( tr("COORDINATES_INFO").arg( aX ).arg( anY ) );
+    QString aX = HYDROGUI_Tool::GetCoordinateString( aPnt.X(), true );
+    QString anY = HYDROGUI_Tool::GetCoordinateString( aPnt.Y(), true );
+    myCoordLabel->setText( tr("UZ_COORDINATES_INFO").arg( aX ).arg( anY ) );
   }
 }
 
@@ -224,4 +237,4 @@ bool HYDROGUI_ProfileDlg::eventFilter( QObject* theObj, QEvent* theEvent )
   }
 
   return HYDROGUI_InputPanel::eventFilter( theObj, theEvent );
-}
\ No newline at end of file
+}