X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileDlg.cxx;h=8e1ed22c9380adf6fbbc411f9694a0c8f6b5a576;hb=541470db80142c32e3812a7b79e26727df1dcece;hp=e6e24a486302691f93e9e895cabd9dc51d060ebe;hpb=8cf8e5df32a76302cf00863147bbab55a3b45dbe;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
index e6e24a48..8e1ed22c 100644
--- a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,12 +19,18 @@
 #include "HYDROGUI_ProfileDlg.h"
 
 #include "HYDROGUI_Module.h"
+#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_AISTrihedron.h"
+
 #include <CurveCreator_Widget.h>
 #include <CurveCreator_ICurve.hxx>
+#include <CurveCreator_Utils.hxx>
 
-#include <OCCViewer_ViewWidget.h>
 #include <OCCViewer_ViewPort3d.h>
 #include <OCCViewer_Utilities.h>
+#include <OCCViewer_ViewManager.h>
+#include <OCCViewer_ViewFrame.h>
+#include <LightApp_Application.h>
 
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
@@ -37,9 +39,11 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMouseEvent>
 
 HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle )
-: HYDROGUI_InputPanel( theModule, theTitle ), myName(NULL)
+: HYDROGUI_ViewerDlg( theModule, theTitle ),
+  myName( NULL )
 {
   QHBoxLayout* aNameLayout = new QHBoxLayout();
   QLabel* aNameLabel = new QLabel(tr("PROFILE_NAME_TLT"), this);
@@ -49,68 +53,39 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr
 
   addLayout(aNameLayout);
 
-  myEditorWidget = new CurveCreator_Widget( this, NULL );
+  int anActionFlags = 
+    CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode |
+    CurveCreator_Widget::DisableClosedSection;
+  QStringList aCoordTitles;
+  aCoordTitles << tr( "U_TITLE" ) << tr( "Z_TITLE" );
+  myEditorWidget = new CurveCreator_Widget( this, NULL, anActionFlags, aCoordTitles );
   addWidget( myEditorWidget, 3 );
 
-  myViewWidget = new OCCViewer_ViewWidget( this, false );
-  OCCViewer_ViewPort3d* aViewPort = myViewWidget->getViewPort();
-  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-  if ( aResMgr )
-    aViewPort->setBackground( aResMgr->backgroundValue( "OCCViewer", "background",
-                                                         Qtx::BackgroundData( Qt::black ) ) );
-  OCCViewer_Utilities::setViewWidget2DMode( myViewWidget, OCCViewer_ViewWidget::XZPlane );
-  addWidget( myViewWidget, 4 );
+  myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this );
+  addWidget( myAddElementBox, 2 );
 
-  //myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this );
-  //addWidget( myAddElementBox, 2 );
+  QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox );
+  anAddElementLayout->setMargin( 0 );
+  anAddElementLayout->setSpacing( 5 );
 
-  //QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox );
-  //anAddElementLayout->setMargin( 0 );
-  //anAddElementLayout->setSpacing( 5 );
+  myEditorWidget->setOCCViewer( viewer() );
 
   connect( myEditorWidget, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) );
-  connect( myEditorWidget, SIGNAL( subOperationStarted(QWidget*) ), this, SLOT( processStartedSubOperation(QWidget*) ) );
+  connect( myEditorWidget, SIGNAL( subOperationStarted(QWidget*, bool) ), this, SLOT( processStartedSubOperation(QWidget*, bool) ) );
   connect( myEditorWidget, SIGNAL( subOperationFinished(QWidget*) ), this, SLOT( processFinishedSubOperation(QWidget*) ) );
 
-  //myAddElementBox->hide();
-
-  myEditorWidget->setOCCViewWidget( myViewWidget );
+  myAddElementBox->hide();
 }
 
 HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg()
 {
 }
 
-void HYDROGUI_ProfileDlg::processStartedSubOperation( QWidget* theWidget )
-{
-  //myEditorWidget->setEnabled( false );
-
-  //QBoxLayout* anAddElementLayout = dynamic_cast<QBoxLayout*>( myAddElementBox->layout() );
-  //anAddElementLayout->addWidget( theWidget );
-
-  //theWidget->show();
-  //myAddElementBox->show();
-}
-
-void HYDROGUI_ProfileDlg::processFinishedSubOperation( QWidget* theWidget )
-{
-  /*myEditorWidget->setEnabled( true );
-
-  QBoxLayout* anAddElementLayout = dynamic_cast<QBoxLayout*>( myAddElementBox->layout() );
-  anAddElementLayout->removeWidget( theWidget );
-
-  theWidget->hide();
-  myAddElementBox->hide();*/
-}
-
 void HYDROGUI_ProfileDlg::reset()
 {
   myEditorWidget->reset();
-}
-
-Handle(AIS_InteractiveContext) HYDROGUI_ProfileDlg::getAISContext()
-{
-  return myViewWidget->getAISContext();
+  myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode );
+  viewer()->setTrihedronShown( false ); // Issue #548
 }
 
 void HYDROGUI_ProfileDlg::setProfileName( const QString& theName )
@@ -126,6 +101,11 @@ QString HYDROGUI_ProfileDlg::getProfileName() const
 void HYDROGUI_ProfileDlg::setProfile( CurveCreator_ICurve* theProfile )
 {
   myEditorWidget->setCurve( theProfile );
+
+  // select the single section by default
+  QList<int> aSections;
+  aSections << 0;
+  myEditorWidget->setSelectedSections( aSections );
 }
 
 QList<int> HYDROGUI_ProfileDlg::getSelectedSections()
@@ -133,11 +113,6 @@ QList<int> HYDROGUI_ProfileDlg::getSelectedSections()
   return myEditorWidget->getSelectedSections();
 }
 
-QList< QPair< int, int > > HYDROGUI_ProfileDlg::getSelectedPoints()
-{
-  return myEditorWidget->getSelectedPoints();
-}
-
 /**
  * Redirect the delete action to editor widget
  */
@@ -153,3 +128,34 @@ bool HYDROGUI_ProfileDlg::deleteEnabled()
 {
   return myEditorWidget->removeEnabled();
 }
+
+void HYDROGUI_ProfileDlg::processStartedSubOperation( QWidget* theWidget, bool theIsEdit )
+{
+  myEditorWidget->setEnabled( false );
+
+  myAddElementBox->setTitle( theIsEdit ? tr( "EDIT_ELEMENT" ) : tr( "ADD_ELEMENT" ) );
+  QBoxLayout* anAddElementLayout = dynamic_cast<QBoxLayout*>( myAddElementBox->layout() );
+  anAddElementLayout->addWidget( theWidget );
+
+  theWidget->show();
+  myAddElementBox->show();
+}
+
+void HYDROGUI_ProfileDlg::processFinishedSubOperation( QWidget* theWidget )
+{
+  myEditorWidget->setEnabled( true );
+
+  QBoxLayout* anAddElementLayout = dynamic_cast<QBoxLayout*>( myAddElementBox->layout() );
+  anAddElementLayout->removeWidget( theWidget );
+
+  theWidget->hide();
+  myAddElementBox->hide();
+}
+
+Handle(AIS_Trihedron) HYDROGUI_ProfileDlg::trihedron()
+{
+    SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+    Handle(AIS_Trihedron) aTrihedron =
+        HYDROGUI_AISTrihedron::createTrihedron( aResMgr->doubleValue( "3DViewer", "trihedron_size", viewer()->trihedronSize() ) );
+    return aTrihedron;
+}