X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FOperationGUI%2FOperationGUI_PartitionDlg.cxx;h=9649e3a9174eeb7e9d48ece66d7e89cd9aaf5a87;hb=a46ed42b20faee8edeaf0002ba7af44c39cce93c;hp=fb93269ddc190ec8f57dcf72c1adfab4bc4e556e;hpb=8bc9b430c5f9f3cf77539fee550f1b56769d3893;p=modules%2Fgeom.git

diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
index fb93269dd..9649e3a91 100644
--- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx
+++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -26,8 +26,21 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "OperationGUI_PartitionDlg.h"
+#include "OperationGUI_MaterialDlg.h"
+
+#include "GEOMImpl_Types.hxx"
+
+#include "SUIT_Desktop.h"
+#include "SUIT_Session.h"
+#include "SalomeApp_Application.h"
+#include "LightApp_SelectionMgr.h"
+
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qlabel.h>
+
+#include "utilities.h"
 
 //=================================================================================
 // class    : OperationGUI_PartitionDlg()
@@ -36,37 +49,40 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-OperationGUI_PartitionDlg::OperationGUI_PartitionDlg(QWidget* parent, const char* name, OperationGUI* theOperationGUI, SALOME_Selection* Sel, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+OperationGUI_PartitionDlg::OperationGUI_PartitionDlg(GeometryGUI* theGeometryGUI, QWidget* parent)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, "OperationGUI_PartitionDlg", false,
+                     WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
-  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_PARTITION")));
-  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PARTITION")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PARTITION_PLANE")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
   setCaption(tr("GEOM_PARTITION_TITLE"));
 
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_PARTITION"));
   RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
+  RadioButton2->setPixmap(image1);
   RadioButton3->close(TRUE);
 
-  GroupPoints = new DlgRef_4Sel1List_QTD(this, "GroupPoints");
+  // Full partition (contains half-space partition)
+  GroupPoints = new DlgRef_2Sel1List1Check_QTD(this, "GroupPoints");
   GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION"));
   GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
   GroupPoints->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
   GroupPoints->TextLabel3->setText(tr("GEOM_RECONSTRUCTION_LIMIT"));
-  GroupPoints->TextLabel4->setText(tr("GEOM_SUPPRESS_RESULT_INSIDE"));
-  GroupPoints->TextLabel5->setText(tr("GEOM_SUPPRESS_RESULT_OUTSIDE"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  GroupPoints->PushButton3->setPixmap(image1);
-  GroupPoints->PushButton4->setPixmap(image1);
-
-  Layout1->addWidget(GroupPoints, 1, 0);
+  GroupPoints->PushButton1->setPixmap(image2);
+  GroupPoints->PushButton2->setPixmap(image2);
+  GroupPoints->LineEdit1->setReadOnly( true );
+  GroupPoints->LineEdit2->setReadOnly( true );
+  GroupPoints->radioButton4->setText(tr("GEOM_KEEP_NONLIMIT_SHAPES"));
+
+  Layout1->addWidget(GroupPoints, 2, 0);
   /***************************************************************/
 
-  /* Initialisations */
-  myOperationGUI = theOperationGUI;
+  setHelpFileName("partition.htm"); 
+ 
   Init();
 }
 
@@ -87,11 +103,6 @@ OperationGUI_PartitionDlg::~OperationGUI_PartitionDlg()
 //=================================================================================
 void OperationGUI_PartitionDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-
-  myOkListShapes = myOkListTools = myOkKeepShape = myOkRemoveShape = false;
-
   /* type for sub shape selection */
   GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_SOLID"));
   GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_SHELL"));
@@ -99,34 +110,80 @@ void OperationGUI_PartitionDlg::Init()
   GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_WIRE"));
   GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_EDGE"));
   GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_VERTEX"));
-
-  /* Current item is 'Shape' */
-  GroupPoints->ComboBox1->setCurrentItem(0);
-  myLimit = GroupPoints->ComboBox1->currentItem();
-
+  GroupPoints->radioButton4->setChecked(FALSE);
+  
   /* signals and slots connections */
   connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
   connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-
+  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+  
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton4, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
+  
   connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit4, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
+  
   connect(GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(ComboTextChanged()));
   
-  connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(GroupPoints->radioButton4, SIGNAL(stateChanged(int)), this, SLOT(ReverseSense(int)));
+
+  connect(myGeomGUI->getApp()->selectionMgr(), 
+	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  
+  initName( tr( "GEOM_PARTITION" ) );
+  ConstructorsClicked( 0 );
+}
+
 
-  /* displays Dialog */
-  GroupPoints->show();
-  this->show();
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose  : Radio button management
+//=================================================================================
+void OperationGUI_PartitionDlg::ConstructorsClicked(int constructorId)
+{
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection();
+  
+  myListShapes.length(0);
+  myListTools.length(0);  
+  myListKeepInside.length(0);
+  myListRemoveInside.length(0);
+  myListMaterials.length(0);
+
+  switch (constructorId)
+    {
+    case 0: /*Full partition */
+      {
+	GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION"));
+	GroupPoints->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
+	resize(0, 0);
+	GroupPoints->TextLabel3->show();
+	GroupPoints->ComboBox1->show();
+	GroupPoints->ComboBox1->setCurrentItem(0);
+	GroupPoints->radioButton4->show();
+	break;
+      }
+    case 1: /*Half-space partition */
+      {
 
-  return;
+	GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION_HALFSPACE"));
+	GroupPoints->TextLabel3->hide();
+	GroupPoints->ComboBox1->hide();
+	GroupPoints->TextLabel2->setText(tr("GEOM_PLANE"));
+	GroupPoints->radioButton4->hide();
+	resize(0, 0);
+	break;
+      } 
+    }
+
+  myEditCurrentArgument = GroupPoints->LineEdit1;
+  GroupPoints->LineEdit1->clear();
+  GroupPoints->LineEdit2->clear();
+
+  myEditCurrentArgument->setFocus();
+  connect(myGeomGUI->getApp()->selectionMgr(), 
+	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  MESSAGE(width()<<" "<<height());
 }
 
 
@@ -136,9 +193,8 @@ void OperationGUI_PartitionDlg::Init()
 //=================================================================================
 void OperationGUI_PartitionDlg::ClickOnOk()
 {
-  this->ClickOnApply();
-  ClickOnCancel();
-  return;
+  if ( ClickOnApply() )
+    ClickOnCancel();
 }
 
 
@@ -146,51 +202,14 @@ void OperationGUI_PartitionDlg::ClickOnOk()
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
-void OperationGUI_PartitionDlg::ClickOnApply()
+bool OperationGUI_PartitionDlg::ClickOnApply()
 {
-  QAD_Application::getDesktop()->putInfo(tr(""));
-
-  if(myOkListShapes || myOkListTools || myOkKeepShape || myOkRemoveShape) {
-    GEOM::shape_type limit;
-    switch(myLimit)
-      {
-      case 0 : 
-	{
-	  limit = GEOM::SHAPE;
-	  break;
-	}
-      case 1 :
-	{
-	  limit = GEOM::SHELL;
-	  break;
-	}
-      case 2 :
-	{
-	  limit = GEOM::FACE;
-	  break;
-	}
-      case 3 :
-	{
-	  limit = GEOM::WIRE;
-	  break;
- 	}
-      case 4 :
-	{
-	  limit = GEOM::EDGE;
-	  break;
-	}
-      case 5 :
-	{
-	  limit = GEOM::VERTEX;
-	  break;
-	}
-      default :
-	limit = GEOM::SHAPE;
-      }
-
-    myOperationGUI->MakePartitionAndDisplay(myListShapes, myListTools, myListKeepInside, myListRemoveInside, limit);
-  }
-  return;
+  if ( !onAccept() )
+    return false;
+  
+  initName();
+  ConstructorsClicked( getConstructorId() );
+  return true;
 }
 
 
@@ -200,50 +219,45 @@ void OperationGUI_PartitionDlg::ClickOnApply()
 //=================================================================================
 void OperationGUI_PartitionDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
-  QString aString = ""; /* name of selection */
-
-  int nbSel = myGeomBase->GetNameOfSelectedIObjects(mySelection, aString);
-  if(nbSel < 1) {
-    if(myEditCurrentArgument == GroupPoints->LineEdit1) {
-      myListShapes.length(0);
-      myOkListShapes = false;
-    } else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
-      myListTools.length(0);
-      myOkListTools = false;
-    } else if(myEditCurrentArgument == GroupPoints->LineEdit3) {
-      myListRemoveInside.length(0);
-      myOkKeepShape = false;
-    } else if(myEditCurrentArgument == GroupPoints->LineEdit4) {
-      myListKeepInside.length(0);
-      myOkRemoveShape = false;
+  myEditCurrentArgument->setText( "" );
+  QString aString = "";
+  
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString, true );
+    
+  if ( nbSel < 1 )
+  {
+    if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
+    {
+      myListShapes.length( 0 );
+      myListMaterials.length( 0 );
     }
-    return;
-  }
-
-  if(myEditCurrentArgument == GroupPoints->LineEdit1) {
-    myGeomBase->ConvertListOfIOInListOfIOR(mySelection->StoredIObjects(), myListShapes);
-    myEditCurrentArgument->setText(aString);
-    myOkListShapes = true;
+    else if ( myEditCurrentArgument == GroupPoints->LineEdit2 )
+      myListTools.length( 0 );
   }
-  else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
-    myGeomBase->ConvertListOfIOInListOfIOR(mySelection->StoredIObjects(), myListTools);
-    myEditCurrentArgument->setText(aString);
-    myOkListTools = true;
+  
+  // One and only one plane can be selected
+  
+  if ( getConstructorId() == 1 && myEditCurrentArgument == GroupPoints->LineEdit2 && nbSel != 1 )
+  {
+    myListTools.length( 0 );
+    return;
   }
-  else if(myEditCurrentArgument == GroupPoints->LineEdit3) {
-    myGeomBase->ConvertListOfIOInListOfIOR(mySelection->StoredIObjects(), myListRemoveInside);
-    myEditCurrentArgument->setText(aString);
-    myOkKeepShape = true;
+  
+  if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
+  {
+    GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myListShapes, true );
+    myListMaterials.length( 0 );
+    if ( !myListShapes.length() )
+      return;
   }
-  else if(myEditCurrentArgument == GroupPoints->LineEdit4) {
-    myGeomBase->ConvertListOfIOInListOfIOR(mySelection->StoredIObjects(), myListKeepInside);
-    myEditCurrentArgument->setText(aString);
-    myOkRemoveShape = true;
+  else if ( myEditCurrentArgument == GroupPoints->LineEdit2 )
+  {
+    GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myListTools, true );
+    if ( !myListTools.length() )
+      return;
   }
-
-  /* no simulation */
-  return;
+  
+  myEditCurrentArgument->setText( aString );
 }
 
 
@@ -254,26 +268,20 @@ void OperationGUI_PartitionDlg::SelectionIntoArgument()
 void OperationGUI_PartitionDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-
-  if(send == GroupPoints->PushButton1) {
-    GroupPoints->LineEdit1->setFocus();
+  
+  if(send == GroupPoints->PushButton1) 
     myEditCurrentArgument = GroupPoints->LineEdit1;
-  }
-  else if(send == GroupPoints->PushButton2) {
-    GroupPoints->LineEdit2->setFocus();
+  else if(send == GroupPoints->PushButton2)
+  {
     myEditCurrentArgument = GroupPoints->LineEdit2;
+    if( getConstructorId()==1 )
+      globalSelection( GEOM_PLANE  );
   }
-  else if(send == GroupPoints->PushButton3) {
-    GroupPoints->LineEdit3->setFocus();
-    myEditCurrentArgument = GroupPoints->LineEdit3;
-  }
-  else if(send == GroupPoints->PushButton4) {
-    GroupPoints->LineEdit4->setFocus();
-    myEditCurrentArgument = GroupPoints->LineEdit4;
-  }
-  this->SelectionIntoArgument();
-
-  return;
+ 
+  globalSelection( GEOM_ALLSHAPES );
+      
+  myEditCurrentArgument->setFocus();
+  SelectionIntoArgument();
 }
 
 
@@ -284,19 +292,13 @@ void OperationGUI_PartitionDlg::SetEditCurrentArgument()
 void OperationGUI_PartitionDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1)
-    myEditCurrentArgument = GroupPoints->LineEdit1;
-  else if (send == GroupPoints->LineEdit2)
-    myEditCurrentArgument = GroupPoints->LineEdit2;
-  else if (send == GroupPoints->LineEdit3)
-    myEditCurrentArgument = GroupPoints->LineEdit3;
-  else if (send == GroupPoints->LineEdit4)
-    myEditCurrentArgument = GroupPoints->LineEdit4;
-  else
-    return;
 
-  GEOMBase_Skeleton::LineEditReturnPressed();
-  return;
+  if(send == GroupPoints->LineEdit1 || 
+     send == GroupPoints->LineEdit2 )
+    {
+      myEditCurrentArgument = send;
+      GEOMBase_Skeleton::LineEditReturnPressed();
+    }
 }
 
 
@@ -307,8 +309,10 @@ void OperationGUI_PartitionDlg::LineEditReturnPressed()
 void OperationGUI_PartitionDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-  return;
+  connect(myGeomGUI->getApp()->selectionMgr(), 
+	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+
+  ConstructorsClicked( getConstructorId() ); 
 }
 
 
@@ -318,10 +322,82 @@ void OperationGUI_PartitionDlg::ActivateThisDialog()
 //=================================================================================
 void OperationGUI_PartitionDlg::enterEvent(QEvent* e)
 {
-  if(GroupConstructors->isEnabled())
-    return;
-  this->ActivateThisDialog();
-  return;
+  if (!GroupConstructors->isEnabled())
+    this->ActivateThisDialog();
+}
+
+
+//=================================================================================
+// function : createOperation
+// purpose  :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr OperationGUI_PartitionDlg::createOperation()
+{
+  return getGeomEngine()->GetIBooleanOperations( getStudyId() );
+}
+
+
+//=================================================================================
+// function : isValid
+// purpose  :
+//=================================================================================
+bool OperationGUI_PartitionDlg::isValid( QString& msg )
+{
+  return (myListShapes.length()     || myListTools.length() ||
+	  myListKeepInside.length() || myListRemoveInside.length());
+}
+
+
+//=================================================================================
+// function : execute
+// purpose  :
+//=================================================================================
+bool OperationGUI_PartitionDlg::execute( ObjectList& objects )
+{
+  bool res = false;
+
+  GEOM::GEOM_Object_var anObj;
+  QString msg;
+
+  int aLimit = GetLimit();
+  int aConstructorId = getConstructorId();
+
+  int aKeepNonlimitShapes = 0;
+  if (aConstructorId == 1) {
+    aLimit = GEOM::SHAPE;
+  }
+  else {
+    if(GroupPoints->radioButton4->isChecked()) {
+      aKeepNonlimitShapes = 1;
+    }
+    else {
+      aKeepNonlimitShapes = 0;
+    }
+  }
+
+  if (isValid( msg )) {
+
+    anObj = GEOM::GEOM_IBooleanOperations::_narrow(getOperation())->
+      MakePartition(myListShapes, myListTools,
+                    myListKeepInside, myListRemoveInside,
+		    aLimit, false, myListMaterials, aKeepNonlimitShapes);
+    res = true;
+  }
+
+  if (!anObj->_is_nil())
+    objects.push_back( anObj._retn() );
+
+  return res;
+}
+
+
+//=================================================================================
+// function : closeEvent
+// purpose  :
+//=================================================================================
+void OperationGUI_PartitionDlg::closeEvent( QCloseEvent* e )
+{
+  GEOMBase_Skeleton::closeEvent( e );
 }
 
 
@@ -329,17 +405,36 @@ void OperationGUI_PartitionDlg::enterEvent(QEvent* e)
 //function : ComboTextChanged
 //purpose  : 
 //=======================================================================
-
 void OperationGUI_PartitionDlg::ComboTextChanged()
 {
- myLimit = GroupPoints->ComboBox1->currentItem();
-
- bool IsEnabled = GroupPoints->ComboBox1->currentItem() < 3;
- GroupPoints->LineEdit3->setEnabled(IsEnabled);
- GroupPoints->LineEdit4->setEnabled(IsEnabled);
- GroupPoints->TextLabel4->setEnabled(IsEnabled);
- GroupPoints->TextLabel5->setEnabled(IsEnabled);
- GroupPoints->PushButton3->setEnabled(IsEnabled);
- GroupPoints->PushButton4->setEnabled(IsEnabled);
- return;
+  bool IsEnabled = GroupPoints->ComboBox1->currentItem() < 3;
+  //GroupPoints->LineEdit3->setEnabled(IsEnabled);
+  //GroupPoints->LineEdit4->setEnabled(IsEnabled);
+  //GroupPoints->TextLabel4->setEnabled(IsEnabled);
+  //GroupPoints->TextLabel5->setEnabled(IsEnabled);
+  //GroupPoints->PushButton3->setEnabled(IsEnabled);
+  //GroupPoints->PushButton4->setEnabled(IsEnabled);
+}
+
+
+//=================================================================================
+// function : GetLimit()
+// purpose  : 
+//=================================================================================
+int OperationGUI_PartitionDlg::GetLimit() const
+{
+  int aLimit = GroupPoints->ComboBox1->currentItem();
+
+  switch(aLimit)
+  {
+  case 0:  aLimit = GEOM::SOLID ; break;
+  case 1:  aLimit = GEOM::SHELL ; break;
+  case 2:  aLimit = GEOM::FACE  ; break;
+  case 3:  aLimit = GEOM::WIRE  ; break;
+  case 4:  aLimit = GEOM::EDGE  ; break;
+  case 5:  aLimit = GEOM::VERTEX; break;
+  default: aLimit = GEOM::SHAPE ;
+  }
+
+  return aLimit;
 }