X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.cxx;h=ba31ad82e4c0b010e89da283171866f569a8ca70;hb=9f7b45d044e701442d0b370e9779299d25a5d44c;hp=9b53a2499e4713e20e8ee912a51c05189650f139;hpb=cc6e0c0f0c273dce8decc92a2e931f28067042a5;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
index 9b53a249..ba31ad82 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
@@ -64,9 +64,8 @@ HYDROGUI_CalculationDlg::HYDROGUI_CalculationDlg( HYDROGUI_Module* theModule, co
 : HYDROGUI_Wizard( theModule, theTitle )
 {
   addPage( createObjectsPage() );
+  addPage( createGroupsPage() );
   addPage( createZonesPage() );
-  connect( button( QWizard::NextButton ), SIGNAL( clicked() ), SIGNAL( splitZones() ) );
-  connect( button( QWizard::BackButton ), SIGNAL( clicked() ), SIGNAL( hideZones() ) );
 }
 
 HYDROGUI_CalculationDlg::~HYDROGUI_CalculationDlg()
@@ -77,6 +76,8 @@ void HYDROGUI_CalculationDlg::reset()
 {
   myObjectName->clear();
   myGeomObjects->clear();
+  myPolylineName->clear();
+  myAvailableGeomObjects->clear();
 }
 
 QWizardPage* HYDROGUI_CalculationDlg::createObjectsPage() {
@@ -91,59 +92,138 @@ QWizardPage* HYDROGUI_CalculationDlg::createObjectsPage() {
   connect( myValidator, SIGNAL( emptyName() ), SLOT( onEmptyName() ) );
   connect( myValidator, SIGNAL( alreadyExists( QString ) ), SLOT( onAlreadyExists( QString ) ) );
 
+  myPolylineName = new QComboBox( aPage );
+  connect( myPolylineName, SIGNAL( activated( const QString & ) ), 
+    SIGNAL( boundarySelected( const QString & ) ) );
+
   myGeomObjects = new QListWidget( aPage );
-  myGeomObjects->setSelectionMode( QListWidget::SingleSelection );
+  myGeomObjects->setSelectionMode( QListWidget::ExtendedSelection );
   myGeomObjects->setEditTriggers( QListWidget::NoEditTriggers );
   myGeomObjects->setViewMode( QListWidget::ListMode );
   myGeomObjects->setSortingEnabled( true );
 
-  connect( myGeomObjects, SIGNAL( currentTextChanged( const QString & ) ), 
-    SIGNAL( objectSelected( const QString & ) ) );
+  myAvailableGeomObjects = new QListWidget( aPage );
+  myAvailableGeomObjects->setSelectionMode( QListWidget::ExtendedSelection );
+  myAvailableGeomObjects->setEditTriggers( QListWidget::NoEditTriggers );
+  myAvailableGeomObjects->setViewMode( QListWidget::ListMode );
+  myAvailableGeomObjects->setSortingEnabled( true );
+
+  connect( myGeomObjects, SIGNAL( itemSelectionChanged() ), 
+    SIGNAL( objectsSelected() ) );
 
-  QFrame* aBtnsFrame = new QFrame( aPage );
+  QFrame* anObjectsFrame = new QFrame( aPage );
+  QGridLayout* anObjsLayout = new QGridLayout( anObjectsFrame );
+  anObjsLayout->setMargin( 5 );
+  anObjsLayout->setSpacing( 5 );
+  anObjectsFrame->setLayout( anObjsLayout );
+
+  QFrame* aBtnsFrame = new QFrame( anObjectsFrame );
   QVBoxLayout* aBtnsLayout = new QVBoxLayout( aBtnsFrame );
   aBtnsLayout->setMargin( 5 );
   aBtnsLayout->setSpacing( 5 );
   aBtnsFrame->setLayout( aBtnsLayout );
-  QPushButton* anAddBtn = new QPushButton( tr("ADD"), aBtnsFrame );
-  QPushButton* aRemoveBtn = new QPushButton( tr("REMOVE"), aBtnsFrame );
+  QPushButton* anAddBtn = new QPushButton( tr("INCLUDE"), aBtnsFrame );
+  QPushButton* aRemoveBtn = new QPushButton( tr("EXCLUDE"), aBtnsFrame );
+
+  // Fill the butons frame with two buttons
   aBtnsLayout->addWidget( anAddBtn );
   aBtnsLayout->addWidget( aRemoveBtn );
   aBtnsLayout->addStretch( 1 );
 
+  QLabel* anIncludedLabel = new QLabel( tr( "INCLUDED_OBJECTS" ), anObjectsFrame );
+  QLabel* anObjectsLabel = new QLabel( tr( "CALCULATION_REFERENCE_OBJECTS" ), anObjectsFrame );
+
+  // Fill the objects frame with two lists, two labels and with buttons frame
+  anObjsLayout->addWidget( anObjectsLabel, 0, 0, Qt::AlignHCenter );
+  anObjsLayout->addWidget( anIncludedLabel, 0, 2, Qt::AlignHCenter );
+  anObjsLayout->addWidget( myAvailableGeomObjects, 1, 0, Qt::AlignHCenter );
+  anObjsLayout->addWidget( aBtnsFrame, 1, 1, Qt::AlignHCenter );
+  anObjsLayout->addWidget( myGeomObjects, 1, 2, Qt::AlignHCenter );
+
+
   QLabel* aNameLabel = new QLabel( tr( "NAME" ), aPage );
-  QLabel* anObjectsLabel = new QLabel( tr( "CALCULATION_REFERENCE_OBJECTS" ), aPage );
+  QLabel* aLimitsLabel = new QLabel( tr( "LIMITS" ), aPage );
 
-  QGridLayout* aZonesLayout = new QGridLayout( aPage );
-  aZonesLayout->setMargin( 5 );
-  aZonesLayout->setSpacing( 5 );
-  aZonesLayout->setVerticalSpacing( 10 );
-  aZonesLayout->addWidget( aNameLabel,     0, 0, Qt::AlignHCenter );
-  aZonesLayout->addWidget( myObjectName,   0, 1 );
-  aZonesLayout->addWidget( anObjectsLabel, 1, 0, Qt::AlignHCenter );
-  aZonesLayout->addWidget( myGeomObjects,  1, 1, 2, 1 );
-  aZonesLayout->addWidget( aBtnsFrame,     2, 0, Qt::AlignHCenter );
+  // Fill the page
+  QGridLayout* aPageLayout = new QGridLayout( aPage );
+  aPageLayout->setMargin( 5 );
+  aPageLayout->setSpacing( 5 );
+  aPageLayout->setVerticalSpacing( 10 );
+  aPageLayout->addWidget( aNameLabel,     0, 0, Qt::AlignHCenter );
+  aPageLayout->addWidget( myObjectName,   0, 1 );
+  aPageLayout->addWidget( aLimitsLabel,   1, 0, Qt::AlignHCenter );
+  aPageLayout->addWidget( myPolylineName, 1, 1 );
+  aPageLayout->addWidget( anObjectsFrame, 2, 0, 1, 2, Qt::AlignHCenter );
 
-  aPage->setLayout( aZonesLayout );
+  aPage->setLayout( aPageLayout );
 
-  connect( anAddBtn, SIGNAL( clicked() ), this, SIGNAL( addObjects() ) );
-  connect( aRemoveBtn, SIGNAL( clicked() ), this, SIGNAL( removeObjects() ) );
+  connect( anAddBtn, SIGNAL( clicked() ), SIGNAL( addObjects() ) );
+  connect( aRemoveBtn, SIGNAL( clicked() ), SIGNAL( removeObjects() ) );
 
   return aPage;
 }
 
-void HYDROGUI_CalculationDlg::onEmptyName()
-{
-  QString aTitle = QObject::tr( "INSUFFICIENT_INPUT_DATA" );
-  QString aMessage = QObject::tr( "INCORRECT_OBJECT_NAME" );
-  SUIT_MessageBox::critical( module()->getApp()->desktop(), aTitle, aMessage );
-}
+QWizardPage* HYDROGUI_CalculationDlg::createGroupsPage() {
+  QWizardPage* aPage = new QWizardPage( mainFrame() );
+  QFrame* aFrame = new QFrame( aPage );
 
-void HYDROGUI_CalculationDlg::onAlreadyExists( QString theName )
-{
-  QString aTitle = QObject::tr( "INSUFFICIENT_INPUT_DATA" );
-  QString aMessage = QObject::tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( theName );
-  SUIT_MessageBox::critical( module()->getApp()->desktop(), aTitle, aMessage );
+  myGroups = new QListWidget( aPage );
+  myGroups->setSelectionMode( QListWidget::ExtendedSelection );
+  myGroups->setEditTriggers( QListWidget::NoEditTriggers );
+  myGroups->setViewMode( QListWidget::ListMode );
+  myGroups->setSortingEnabled( true );
+
+  myAvailableGroups = new QListWidget( aPage );
+  myAvailableGroups->setSelectionMode( QListWidget::ExtendedSelection );
+  myAvailableGroups->setEditTriggers( QListWidget::NoEditTriggers );
+  myAvailableGroups->setViewMode( QListWidget::ListMode );
+  myAvailableGroups->setSortingEnabled( true );
+
+  connect( myGroups, SIGNAL( itemSelectionChanged() ), 
+    SIGNAL( groupsSelected() ) );
+
+  QFrame* aGroupsFrame = new QFrame( aPage );
+  QGridLayout* aGroupsLayout = new QGridLayout( aGroupsFrame );
+  aGroupsLayout->setMargin( 5 );
+  aGroupsLayout->setSpacing( 5 );
+  aGroupsFrame->setLayout( aGroupsLayout );
+
+  QFrame* aBtnsFrame = new QFrame( aGroupsFrame );
+  QVBoxLayout* aBtnsLayout = new QVBoxLayout( aBtnsFrame );
+  aBtnsLayout->setMargin( 5 );
+  aBtnsLayout->setSpacing( 5 );
+  aBtnsFrame->setLayout( aBtnsLayout );
+  QPushButton* anAddBtn = new QPushButton( tr("INCLUDE"), aBtnsFrame );
+  QPushButton* aRemoveBtn = new QPushButton( tr("EXCLUDE"), aBtnsFrame );
+
+  // Fill the butons frame with two buttons
+  aBtnsLayout->addWidget( anAddBtn );
+  aBtnsLayout->addWidget( aRemoveBtn );
+  aBtnsLayout->addStretch( 1 );
+
+  QLabel* anIncludedLabel = new QLabel( tr( "INCLUDED_GROUPS" ), aGroupsFrame );
+  QLabel* anAvailableLabel = new QLabel( tr( "AVAILABLE_GROUPS" ), aGroupsFrame );
+
+  // Fill the objects frame with two lists, two labels and with buttons frame
+  aGroupsLayout->addWidget( anAvailableLabel, 0, 0, Qt::AlignHCenter );
+  aGroupsLayout->addWidget( anIncludedLabel, 0, 2, Qt::AlignHCenter );
+  aGroupsLayout->addWidget( myAvailableGroups, 1, 0, Qt::AlignHCenter );
+  aGroupsLayout->addWidget( aBtnsFrame, 1, 1, Qt::AlignHCenter );
+  aGroupsLayout->addWidget( myGroups, 1, 2, Qt::AlignHCenter );
+
+  // Fill the page
+  QGridLayout* aPageLayout = new QGridLayout( aPage );
+  aPageLayout->setMargin( 5 );
+  aPageLayout->setSpacing( 5 );
+  aPageLayout->setVerticalSpacing( 10 );
+  aPageLayout->addWidget( aGroupsFrame, 0, 0, Qt::AlignHCenter );
+
+  aPage->setLayout( aPageLayout );
+
+  connect( anAddBtn, SIGNAL( clicked() ), SIGNAL( addGroups() ) );
+  connect( aRemoveBtn, SIGNAL( clicked() ), SIGNAL( removeGroups() ) );
+
+  return aPage;
 }
 
 QWizardPage* HYDROGUI_CalculationDlg::createZonesPage() {
@@ -152,7 +232,7 @@ QWizardPage* HYDROGUI_CalculationDlg::createZonesPage() {
 
   QGridLayout* aLayout = new QGridLayout( aPage );
   
-  myBrowser = new HYDROGUI_DataBrowser( module(), 0, aPage );
+  myBrowser = new HYDROGUI_DataBrowser( module(), NULL, aPage );
   myBrowser->setAutoOpenLevel( 3 );
   aLayout->setMargin( 5 );
   aLayout->setSpacing( 5 );
@@ -170,6 +250,7 @@ QWizardPage* HYDROGUI_CalculationDlg::createZonesPage() {
 
   aPage->setLayout( aLayout );
 
+  connect( myBrowser, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
   connect( myBrowser, SIGNAL( clicked( SUIT_DataObject* ) ), SIGNAL( clickedInZonesBrowser( SUIT_DataObject* ) ) );
   connect( myBrowser, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onSelected( SUIT_DataObject* ) ) );
   connect( myBathymetryChoice, SIGNAL( activated( int ) ), SLOT( onMergeTypeSelected( int ) ) );
@@ -180,6 +261,42 @@ QWizardPage* HYDROGUI_CalculationDlg::createZonesPage() {
   return aPage;
 }
 
+
+bool HYDROGUI_CalculationDlg::acceptCurrent() const
+{
+  QString anErrorMsg;
+
+  if ( myGeomObjects->count() == 0 )
+  {
+    anErrorMsg = tr( "EMPTY_GEOMETRY_OBJECTS" );
+  }
+
+  if ( !anErrorMsg.isEmpty() )
+  {
+    anErrorMsg += "\n" + tr( "INPUT_VALID_DATA" );
+    
+    QString aTitle = tr( "INSUFFICIENT_INPUT_DATA" );
+    SUIT_MessageBox::critical( module()->getApp()->desktop(), aTitle, anErrorMsg );
+  }
+
+  return anErrorMsg.isEmpty();
+}
+
+void HYDROGUI_CalculationDlg::onEmptyName()
+{
+  QString aTitle = tr( "INSUFFICIENT_INPUT_DATA" );
+  QString aMessage = tr( "INCORRECT_OBJECT_NAME" ) + "\n" + tr( "INPUT_VALID_DATA" );
+  SUIT_MessageBox::critical( module()->getApp()->desktop(), aTitle, aMessage );
+}
+
+void HYDROGUI_CalculationDlg::onAlreadyExists( QString theName )
+{
+  QString aTitle = tr( "INSUFFICIENT_INPUT_DATA" );
+  QString aMessage = QObject::tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( theName ) +
+                     "\n" + tr( "INPUT_VALID_DATA" );
+  SUIT_MessageBox::critical( module()->getApp()->desktop(), aTitle, aMessage );
+}
+
 void HYDROGUI_CalculationDlg::onZonesDropped( const QList<SUIT_DataObject*>& theList, 
     SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction )
 {
@@ -239,7 +356,7 @@ void HYDROGUI_CalculationDlg::onSelected( SUIT_DataObject* theObject )
     myBathymetryChoice->addItem( tr("MERGE_UNKNOWN"), HYDROData_Zone::Merge_UNKNOWN );
     myBathymetryChoice->addItem( tr("MERGE_ZMIN"), HYDROData_Zone::Merge_ZMIN );
     myBathymetryChoice->addItem( tr("MERGE_ZMAX"), HYDROData_Zone::Merge_ZMAX );
-    QStringList aList = aZone->getBathymetries();
+    QStringList aList = aZone->getAltitudes();
     for ( int i = 0; i < aList.length(); i++ )
     {
       myBathymetryChoice->addItem( aList.at( i ), HYDROData_Zone::Merge_Object );
@@ -255,7 +372,7 @@ void HYDROGUI_CalculationDlg::onSelected( SUIT_DataObject* theObject )
         aCurIndex = 2;
         break;
       case HYDROData_Zone::Merge_Object:
-        aCurIndex = 3 + aList.indexOf( aZone->text( HYDROGUI_DataObject::BathymetryId ) );
+        aCurIndex = 3 + aList.indexOf( aZone->text( HYDROGUI_DataObject::AltitudeObjId ) );
         break;
       default:
         aCurIndex = 0; // Select unknown by default
@@ -278,23 +395,72 @@ QString HYDROGUI_CalculationDlg::getObjectName() const
   return myObjectName->text();
 }
 
-void HYDROGUI_CalculationDlg::setGeomObjects( const QStringList& theObjects )
+void moveItems( QListWidget* theSource, QListWidget* theDest, const QStringList& theObjects )
 {
-  myGeomObjects->clear();
+  QList<QListWidgetItem*> aFoundItems;
+  int anIdx;
+  QListWidgetItem* anItem;
+
+  for ( int i = 0, n = theObjects.length(); i < n; ++i )
+  {
+    QString anObjName = theObjects.at( i );
+    aFoundItems = theSource->findItems( anObjName, Qt::MatchExactly );
+    for ( anIdx = 0; anIdx < aFoundItems.length(); anIdx++ )
+    {
+      anItem = aFoundItems.at( anIdx );
+      // Remove this object from available objects list
+      anItem = theSource->takeItem( theSource->row( anItem ) );
+      // Add the item to the included objects list
+      theDest->addItem( anItem );
+    }
+  }
+}
+
+void HYDROGUI_CalculationDlg::includeGeomObjects( const QStringList& theObjects )
+{
+  moveItems( myAvailableGeomObjects, myGeomObjects, theObjects );
+}
+
+void HYDROGUI_CalculationDlg::excludeGeomObjects( const QStringList& theObjects )
+{
+  moveItems( myGeomObjects, myAvailableGeomObjects, theObjects );
+}
+
+void HYDROGUI_CalculationDlg::setBoundary( const QString& theObjName )
+{
+  bool isBlocked = myPolylineName->blockSignals( true );
+  myPolylineName->setCurrentIndex( myPolylineName->findText( theObjName ) );
+  myPolylineName->blockSignals( isBlocked );
+}
+
+void HYDROGUI_CalculationDlg::setPolylineNames( const QStringList& theObjects, const QStringList& theObjectsEntries )
+{
+  myPolylineName->clear();
+  myPolylineName->addItem( "", "" ); // No boundary item
+
+  for ( int i = 0, n = theObjects.length(); i < n; ++i )
+  {
+    myPolylineName->addItem( theObjects.at( i ), theObjectsEntries.at( i ) );
+  }
+}
+void HYDROGUI_CalculationDlg::setAllGeomObjects( const QStringList& theObjects, const QStringList& theObjectsEntries )
+{
+  myAvailableGeomObjects->clear();
 
   for ( int i = 0, n = theObjects.length(); i < n; ++i )
   {
     QString anObjName = theObjects.at( i );
 
-    QListWidgetItem* aListItem = new QListWidgetItem( anObjName, myGeomObjects );
+    QListWidgetItem* aListItem = new QListWidgetItem( anObjName, myAvailableGeomObjects );
     aListItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
+    aListItem->setData( Qt::UserRole, theObjectsEntries.at( i ) );
   }
 }
 
-QStringList HYDROGUI_CalculationDlg::getSelectedGeomObjects() const
+QStringList getSelected( QListWidget* theWidget )
 {
   QStringList aResList;
-  QList<QListWidgetItem*> aList = myGeomObjects->selectedItems();
+  QList<QListWidgetItem*> aList = theWidget->selectedItems();
   for ( int i = 0, n = aList.length(); i < n; ++i )
   {
     aResList.append( aList.at( i )->text() );
@@ -302,18 +468,30 @@ QStringList HYDROGUI_CalculationDlg::getSelectedGeomObjects() const
   return aResList;
 }
 
+QStringList HYDROGUI_CalculationDlg::getSelectedGeomObjects() const
+{
+  return getSelected( myGeomObjects );
+}
+
+QStringList HYDROGUI_CalculationDlg::getSelectedAvailableGeomObjects() const
+{
+  return getSelected( myAvailableGeomObjects );
+}
+
 void HYDROGUI_CalculationDlg::setEditedObject( const Handle(HYDROData_CalculationCase) theCase )
 {
   myEditedObject = theCase;
   myValidator->setEditedObject( theCase );
 
-  HYDROGUI_DataObject* anobj = new HYDROGUI_DataObject( 0, NULL, "" );
-  myBrowser->setRoot(anobj);
+  // Build the calculation case subtree
+  module()->getDataModel()->buildCaseTree( myBrowser->root(), myEditedObject );
 
-  module()->getDataModel()->buildCaseTree( anobj, myEditedObject );
   myBrowser->updateTree();
   myBrowser->openLevels();
   myBrowser->adjustColumnsWidth();
+  myBrowser->setAutoUpdate( true );
+  myBrowser->setUpdateModified( true );
+
 }
 
 HYDROGUI_Zone* HYDROGUI_CalculationDlg::getCurrentZone() const
@@ -323,5 +501,43 @@ HYDROGUI_Zone* HYDROGUI_CalculationDlg::getCurrentZone() const
 
 void HYDROGUI_CalculationDlg::refreshZonesBrowser()
 {
-  myBrowser->updateTree();
-}
\ No newline at end of file
+  SUIT_DataObject* aRoot = myBrowser->root();
+  module()->getDataModel()->updateObjectTree( myEditedObject );
+  module()->getDataModel()->buildCaseTree( aRoot, myEditedObject );
+  myBrowser->updateTree( aRoot );
+}
+
+void HYDROGUI_CalculationDlg::onDataChanged()
+{
+  SUIT_DataObject* aRoot = myBrowser->root();
+  module()->getDataModel()->buildCaseTree( aRoot, myEditedObject );
+  myBrowser->updateTree( aRoot );
+}
+
+void HYDROGUI_CalculationDlg::setAvailableGroups( const QStringList& theGroups )
+{
+  myAvailableGroups->clear();
+  myGroups->clear();
+  foreach( QString aGroup, theGroups )
+    myAvailableGroups->addItem( aGroup );
+}
+
+QStringList HYDROGUI_CalculationDlg::getSelectedGroups() const
+{
+  return getSelected( myGroups );
+}
+
+QStringList HYDROGUI_CalculationDlg::getSelectedAvailableGroups() const
+{
+  return getSelected( myAvailableGroups );
+}
+
+void HYDROGUI_CalculationDlg::includeGroups( const QStringList& theObjects )
+{
+  moveItems( myAvailableGroups, myGroups, theObjects );
+}
+
+void HYDROGUI_CalculationDlg::excludeGroups( const QStringList& theObjects )
+{
+  moveItems( myGroups, myAvailableGroups, theObjects );
+}