From: isn Date: Mon, 11 Dec 2017 13:33:12 +0000 (+0300) Subject: refs #1493 X-Git-Tag: v2.1.1~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6ff4bc1675014b07fb4aefef6479ef1e82bda9f2;p=modules%2Fhydro.git refs #1493 --- diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx index c6c49c1c..2fb8b2f6 100644 --- a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx @@ -58,7 +58,7 @@ const QString splitter_key = "HYDROGUI_ProfileDlg::splitter"; HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle, bool theIsEdit ) -: HYDROGUI_ViewerDlg( theModule, theTitle, true ), +: HYDROGUI_ViewerDlg( theModule, theTitle, true, false ), myName( NULL ), myProfileNames (NULL), myProfilesPointer (NULL), myIsEdit (theIsEdit) { @@ -142,6 +142,7 @@ void HYDROGUI_ProfileDlg::reset() myEditorWidget->reset(); myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode ); viewer()->setTrihedronShown( false ); // Issue #548 + viewer()->setStaticTrihedronDisplayed(false); if (myProfileNames) myProfileNames->clear(); } diff --git a/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx b/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx index 78c17941..29c307f4 100644 --- a/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx @@ -43,7 +43,7 @@ #include #include -HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QString& theTitle, bool isSplitter ) +HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QString& theTitle, bool isSplitter, bool dispTrihedron ) : HYDROGUI_InputPanel( theModule, theTitle, true, isSplitter ) { SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); @@ -53,7 +53,7 @@ HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QStrin SUIT_Study* aStudy = 0; #endif myViewManager = new OCCViewer_ViewManager( aStudy, 0 ); - OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( true ); + OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( dispTrihedron ); aViewer->setBackground( OCCViewer_ViewFrame::TOP_LEFT, aResMgr->backgroundValue( "OCCViewer", "xz_background", aViewer->background(OCCViewer_ViewFrame::TOP_LEFT) ) ); diff --git a/src/HYDROGUI/HYDROGUI_ViewerDlg.h b/src/HYDROGUI/HYDROGUI_ViewerDlg.h index 8c0f15b1..9059523c 100644 --- a/src/HYDROGUI/HYDROGUI_ViewerDlg.h +++ b/src/HYDROGUI/HYDROGUI_ViewerDlg.h @@ -35,7 +35,7 @@ class HYDROGUI_ViewerDlg : public HYDROGUI_InputPanel Q_OBJECT public: - HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QString& theTitle, bool isSplitter ); + HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QString& theTitle, bool isSplitter, bool dispTrihedron = true ); virtual ~HYDROGUI_ViewerDlg(); Handle(AIS_InteractiveContext) getAISContext();