{
TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
HYDROData_PriorityQueue::ClearRules( aRulesLab );
+
+ // Indicate model of the need to update splitting
+ SetToUpdate( true );
}
void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Object)& theObject1,
{
TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomRules );
HYDROData_PriorityQueue::AddRule( aRulesLab, theObject1, thePriority, theObject2, theMergeType );
+
+ // Indicate model of the need to update splitting
+ SetToUpdate( true );
}
QString HYDROData_CalculationCase::DumpRules() const
{
TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentMode );
TDataStd_Integer::Set( aModeLab, ( int ) theMode );
+
+ // Indicate model of the need to update splitting
+ SetToUpdate( true );
}
HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentMode() const
HYDROGUI_OrderedListWidget.h
HYDROGUI_ListSelector.h
HYDROGUI_ZLayers.h
+ HYDROGUI_PriorityWidget.h
)
QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
HYDROGUI_ListSelector.cxx
HYDROGUI_ZLayers.cxx
HYDROGUI_ZLayers2.cxx
+ HYDROGUI_PriorityWidget.cxx
)
add_definitions(
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_DataBrowser.h"
#include "HYDROGUI_DataModel.h"
+#include "HYDROGUI_ListSelector.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_DataObject.h"
#include "HYDROGUI_NameValidator.h"
#include "HYDROGUI_Region.h"
#include "HYDROGUI_Zone.h"
+#include "HYDROGUI_OrderedListWidget.h"
+#include "HYDROGUI_PriorityWidget.h"
#include <HYDROData_Document.h>
#include <HYDROData_Entity.h>
#include <SUIT_Study.h>
#include <LightApp_Application.h>
+#include <LightApp_SelectionMgr.h>
#include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h>
+#include <QButtonGroup>
+#include <QComboBox>
#include <QGroupBox>
#include <QLabel>
#include <QLayout>
#include <QListWidget>
#include <QPicture>
#include <QPushButton>
+#include <QRadioButton>
+#include <QSplitter>
+#include <QTableWidget>
#include <QToolButton>
+#include <QTreeView>
#include <QWizardPage>
-#include <QComboBox>
-#include <QStackedWidget>
+
HYDROGUI_CalculationDlg::HYDROGUI_CalculationDlg( HYDROGUI_Module* theModule, const QString& theTitle )
: HYDROGUI_Wizard( theModule, theTitle )
void HYDROGUI_CalculationDlg::reset()
{
myObjectName->clear();
- myGeomObjects->clear();
+ HYDROGUI_ListModel::Object2VisibleList anObject2VisibleList;
+ myGeomObjects->setObjects(anObject2VisibleList);
myPolylineName->clear();
myAvailableGeomObjects->clear();
+
+ // Activate the automatic mode
+ setMode( HYDROData_CalculationCase::AUTOMATIC );
}
QWizardPage* HYDROGUI_CalculationDlg::createObjectsPage() {
QWizardPage* aPage = new QWizardPage( mainFrame() );
QFrame* aFrame = new QFrame( aPage );
- // Calculation name
+ // Splitter
+ mySplitter = new QSplitter(Qt::Vertical);
+
+ // Top of the page
+ QWidget* aTopContainer = new QWidget;
+
+ // calculation name
myObjectName = new QLineEdit( aPage );
myValidator = new HYDROGUI_NameValidator(module(), myObjectName);
myObjectName->setValidator( myValidator );
connect( myValidator, SIGNAL( emptyName() ), SLOT( onEmptyName() ) );
connect( myValidator, SIGNAL( alreadyExists( QString ) ), SLOT( onAlreadyExists( QString ) ) );
+ // polyline name
myPolylineName = new QComboBox( aPage );
connect( myPolylineName, SIGNAL( activated( const QString & ) ),
SIGNAL( boundarySelected( const QString & ) ) );
- myGeomObjects = new QListWidget( aPage );
- myGeomObjects->setSelectionMode( QListWidget::ExtendedSelection );
- myGeomObjects->setEditTriggers( QListWidget::NoEditTriggers );
- myGeomObjects->setViewMode( QListWidget::ListMode );
- myGeomObjects->setSortingEnabled( true );
+ // names labels
+ QLabel* aNameLabel = new QLabel( tr( "NAME" ), aPage );
+ QLabel* aLimitsLabel = new QLabel( tr( "LIMITS" ), aPage );
+
+ // mode selector (auto/manual)
+ QGroupBox* aModeGroup = new QGroupBox( tr( "MODE" ) );
+ QRadioButton* aManualRB = new QRadioButton( tr( "MANUAL" ), mainFrame() );
+ QRadioButton* anAutoRB = new QRadioButton( tr( "AUTO" ), mainFrame() );
+
+ myModeButtons = new QButtonGroup( mainFrame() );
+ myModeButtons->addButton( anAutoRB, HYDROData_CalculationCase::AUTOMATIC );
+ myModeButtons->addButton( aManualRB, HYDROData_CalculationCase::MANUAL );
+
+ QBoxLayout* aModeSelectorLayout = new QHBoxLayout;
+ aModeSelectorLayout->setMargin( 5 );
+ aModeSelectorLayout->setSpacing( 5 );
+ aModeSelectorLayout->addWidget( anAutoRB );
+ aModeSelectorLayout->addWidget( aManualRB );
+ aModeGroup->setLayout( aModeSelectorLayout );
+
+ // geometry objects
+ QLabel* anObjectsLabel = new QLabel( tr( "CALCULATION_REFERENCE_OBJECTS" ) );
+ myGeomObjects = new HYDROGUI_OrderedListWidget( aPage, 16 );
+ myGeomObjects->setHiddenObjectsShown(true);
+ myGeomObjects->setVisibilityIconShown(false);
+ myGeomObjects->setContentsMargins(QMargins());
+
+ // included geometry objects
+ QLabel* anIncludedLabel = new QLabel( tr( "INCLUDED_OBJECTS" ) );
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* anObjectsFrame = new QFrame( aPage );
- QGridLayout* anObjsLayout = new QGridLayout( anObjectsFrame );
- anObjsLayout->setMargin( 5 );
- anObjsLayout->setSpacing( 5 );
- anObjectsFrame->setLayout( anObjsLayout );
-
- QFrame* aBtnsFrame = new QFrame( anObjectsFrame );
+ // buttons
+ QFrame* aBtnsFrame = new QFrame;
QVBoxLayout* aBtnsLayout = new QVBoxLayout( aBtnsFrame );
aBtnsLayout->setMargin( 5 );
aBtnsLayout->setSpacing( 5 );
QPushButton* anAddBtn = new QPushButton( tr("INCLUDE"), aBtnsFrame );
QPushButton* aRemoveBtn = new QPushButton( tr("EXCLUDE"), aBtnsFrame );
- // Fill the butons frame with two buttons
+ // 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
+
+ // top of the page layout
+
+ // objects frame
+ QFrame* anObjectsFrame = new QFrame( aPage );
+ anObjectsFrame->setFrameStyle( QFrame::Panel | QFrame::Raised );
+ QGridLayout* anObjsLayout = new QGridLayout( anObjectsFrame );
+ anObjsLayout->setMargin( 5 );
+ anObjsLayout->setSpacing( 5 );
+ anObjectsFrame->setLayout( anObjsLayout );
+
+ // 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* aLimitsLabel = new QLabel( tr( "LIMITS" ), aPage );
-
- // Fill the page
- QGridLayout* aPageLayout = new QGridLayout( aPage );
+
+ // fill the top of the page
+ QGridLayout* aTopLayout = new QGridLayout;
+ aTopLayout->setMargin( 5 );
+ aTopLayout->setSpacing( 5 );
+ aTopLayout->setVerticalSpacing( 10 );
+ aTopLayout->addWidget( aNameLabel, 0, 0, Qt::AlignHCenter );
+ aTopLayout->addWidget( myObjectName, 0, 1 );
+ aTopLayout->addWidget( aLimitsLabel, 1, 0, Qt::AlignHCenter );
+ aTopLayout->addWidget( myPolylineName, 1, 1 );
+ aTopLayout->addWidget( aModeGroup, 2, 0, 1, 2 );
+ aTopLayout->addWidget( anObjectsFrame, 3, 0, 1, 2, Qt::AlignHCenter );
+
+ aTopContainer->setLayout( aTopLayout );
+
+ // add the top of the page to the splitter
+ mySplitter->insertWidget(0, aTopContainer);
+ mySplitter->setStretchFactor(0, 2);
+
+ // Bottom of the page
+ myPriorityWidget = new HYDROGUI_PriorityWidget( mainFrame() );
+
+ QGroupBox* aPriorityGroup = new QGroupBox( tr( "PRIORITY" ) );
+ QBoxLayout* aPriorityLayout = new QHBoxLayout;
+ aPriorityLayout->setMargin( 5 );
+ aPriorityLayout->setSpacing( 5 );
+ aPriorityLayout->addWidget( myPriorityWidget );
+ aPriorityGroup->setLayout( aPriorityLayout );
+
+ // add the bottom of the page to the splitter
+ mySplitter->insertWidget(1, aPriorityGroup);
+ mySplitter->setStretchFactor(1, 1);
+
+ // Page layout
+ QVBoxLayout* aPageLayout = new QVBoxLayout;
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 );
+ aPageLayout->addWidget( mySplitter );
aPage->setLayout( aPageLayout );
+ // Create selector
+ if ( module() ) {
+ HYDROGUI_ListSelector* aListSelector =
+ new HYDROGUI_ListSelector( myGeomObjects, module()->getApp()->selectionMgr() );
+ aListSelector->setAutoBlock( true );
+ }
+
+ // Connections
+ connect( myModeButtons, SIGNAL( buttonClicked( int ) ), SIGNAL( changeMode( int ) ) );
connect( anAddBtn, SIGNAL( clicked() ), SIGNAL( addObjects() ) );
connect( aRemoveBtn, SIGNAL( clicked() ), SIGNAL( removeObjects() ) );
{
QString anErrorMsg;
- if ( myGeomObjects->count() == 0 )
+ if ( false /*myGeomObjects->count() == 0*/ )
{
anErrorMsg = tr( "EMPTY_GEOMETRY_OBJECTS" );
}
void HYDROGUI_CalculationDlg::includeGeomObjects( const QStringList& theObjects )
{
- moveItems( myAvailableGeomObjects, myGeomObjects, theObjects );
+ HYDROGUI_ListModel::Object2VisibleList anObjectsToInclude;
+ QList<QListWidgetItem*> aFoundItems;
+ foreach ( const QString& anObjName, theObjects ) {
+ // Hide the object in the available objects list
+ aFoundItems = myAvailableGeomObjects->findItems( anObjName, Qt::MatchExactly );
+ foreach ( QListWidgetItem* anItem, aFoundItems ) {
+ anItem->setHidden( true );
+ }
+
+ // Add the object to the list of included objects
+ Handle(HYDROData_Entity) anObject =
+ HYDROGUI_Tool::FindObjectByName( module(), anObjName );
+ myGeomObjects->addObject( HYDROGUI_ListModel::Object2Visible( anObject, true ) );
+ }
}
void HYDROGUI_CalculationDlg::excludeGeomObjects( const QStringList& theObjects )
{
- moveItems( myGeomObjects, myAvailableGeomObjects, theObjects );
+ QList<QListWidgetItem*> aFoundItems;
+ foreach ( const QString& anObjName, theObjects ) {
+ // Set visible the object in the available objects list
+ aFoundItems = myAvailableGeomObjects->findItems( anObjName, Qt::MatchExactly );
+ foreach ( QListWidgetItem* anItem, aFoundItems ) {
+ anItem->setHidden( false );
+ }
+
+ // Remove the object from the list of included objects
+ myGeomObjects->removeObjectByName( anObjName );
+ }
}
void HYDROGUI_CalculationDlg::setBoundary( const QString& theObjName )
QStringList HYDROGUI_CalculationDlg::getSelectedGeomObjects() const
{
- return getSelected( myGeomObjects );
+ return myGeomObjects->getSelectedNames();
+}
+
+QStringList HYDROGUI_CalculationDlg::getAllGeomObjects() const
+{
+ return myGeomObjects->getAllNames();
}
QStringList HYDROGUI_CalculationDlg::getSelectedAvailableGeomObjects() const
myBrowser->adjustColumnsWidth();
myBrowser->setAutoUpdate( true );
myBrowser->setUpdateModified( true );
-
}
HYDROGUI_Zone* HYDROGUI_CalculationDlg::getCurrentZone() const
{
moveItems( myGroups, myAvailableGroups, theObjects );
}
+
+/**
+ Get creation mode.
+ @param theMode the mode
+*/
+int HYDROGUI_CalculationDlg::getMode() const
+{
+ return myModeButtons->checkedId();
+}
+
+/**
+ Set creation mode.
+ @param theMode the mode
+*/
+void HYDROGUI_CalculationDlg::setMode( int theMode )
+{
+ bool isBlocked = myModeButtons->blockSignals( true );
+ myModeButtons->button( theMode )->setChecked( true );
+ myModeButtons->blockSignals( isBlocked );
+
+ bool isAuto = ( theMode == HYDROData_CalculationCase::AUTOMATIC );
+
+ myGeomObjects->setOrderingEnabled( isAuto );
+ QWidget* aWidget = mySplitter->widget( 1 );
+ if ( aWidget ) {
+ aWidget->setVisible( isAuto );
+ }
+}
+
+/**
+ Enable/disable zones drag and drop.
+ @param theIsEnabled if true - zones drag and drop will be enabled
+*/
+void HYDROGUI_CalculationDlg::setMoveZonesEnabled( const bool theIsEnabled )
+{
+ //TODO: to be reimplemented
+ foreach ( QTreeView* aView, myBrowser->findChildren<QTreeView*>() ) {
+ aView->setDragEnabled ( theIsEnabled );
+ }
+}
\ No newline at end of file
#include <HYDROData_CalculationCase.h>
class HYDROGUI_ObjSelector;
+class HYDROGUI_DataBrowser;
+class HYDROGUI_NameValidator;
+class HYDROGUI_Zone;
+class HYDROGUI_OrderedListWidget;
+class HYDROGUI_PriorityWidget;
+
+class SUIT_DataObject;
+
+class QButtonGroup;
class QGroupBox;
class QLineEdit;
class QListWidget;
class QComboBox;
class QLabel;
+class QSplitter;
class QStringList;
-class HYDROGUI_DataBrowser;
-class HYDROGUI_NameValidator;
-class SUIT_DataObject;
-class HYDROGUI_Zone;
+
class HYDROGUI_CalculationDlg : public HYDROGUI_Wizard
{
void reset();
+ int getMode() const;
+
void setObjectName( const QString& theName );
QString getObjectName() const;
void setEditedObject( const Handle(HYDROData_CalculationCase) theCase );
void setAllGeomObjects( const QStringList& theObjects, const QStringList& theObjectsEntries );
+ QStringList getAllGeomObjects() const;
void setPolylineNames( const QStringList& theObjects, const QStringList& theObjectsEntries );
QStringList getSelectedGeomObjects() const;
QStringList getSelectedAvailableGeomObjects() const;
QStringList getSelectedGroups() const;
QStringList getSelectedAvailableGroups() const;
HYDROGUI_Zone* getCurrentZone() const;
-
+
void setAvailableGroups( const QStringList& );
+ void setMoveZonesEnabled( const bool theIsEnabled );
+
public slots:
+ void setMode( int theMode );
void setBoundary( const QString& theObjName );
void includeGeomObjects( const QStringList& theObjects );
void excludeGeomObjects( const QStringList& theObjects );
SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
signals:
+ void changeMode( int theMode );
+
void addObjects();
void removeObjects();
void objectsSelected();
QWizardPage* createGroupsPage();
QWizardPage* createZonesPage();
+ QSplitter* mySplitter;
+
QGroupBox* myObjectNameGroup;
QLineEdit* myObjectName;
HYDROGUI_NameValidator* myValidator;
QComboBox* myPolylineName;
+ QButtonGroup* myModeButtons;
+
QListWidget* myAvailableGeomObjects;
- QListWidget* myGeomObjects;
+ HYDROGUI_OrderedListWidget* myGeomObjects;
+
+ HYDROGUI_PriorityWidget* myPriorityWidget;
QListWidget* myAvailableGroups;
QListWidget* myGroups;
myEditedObject = Handle(HYDROData_CalculationCase)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if ( !myEditedObject.IsNull() )
{
+ aPanel->setMode( myEditedObject->GetAssignmentMode() );
anObjectName = myEditedObject->GetName();
aPolylineObj = myEditedObject->GetBoundaryPolyline();
if ( aPolylineObj.IsNull() )
{
myEditedObject =
Handle(HYDROData_CalculationCase)::DownCast( doc()->CreateObject( KIND_CALCULATION ) );
- myEditedObject->SetName(anObjectName);
+ myEditedObject->SetName( anObjectName );
+ myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getMode() );
}
aPanel->setObjectName( anObjectName );
HYDROGUI_CalculationDlg* aPanel = new HYDROGUI_CalculationDlg( module(), getName() );
// Connect signals and slots
+ connect( aPanel, SIGNAL( changeMode( int ) ), SLOT( onChangeMode( int ) ) );
connect( aPanel, SIGNAL( addObjects() ), SLOT( onAddObjects() ) );
connect( aPanel, SIGNAL( removeObjects() ), SLOT( onRemoveObjects() ) );
connect( aPanel, SIGNAL( addGroups() ), SLOT( onAddGroups() ) );
// If there are already defined zones then ask a user to confirm zones recalculation
isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
tr( "REGIONS_CHANGED" ),
- tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION" ),
+ tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION_REGIONS" ),
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::No ) == QMessageBox::Yes );
+ }
+ else
+ {
+ isConfirmed = true; // No regions - no zones - nothing to recalculate
+ }
+ }
+ return isConfirmed;
+}
+
+bool HYDROGUI_CalculationOp::confirmModeChange() const
+{
+ // Check if the case is already modified or not
+ bool isConfirmed = myEditedObject->IsMustBeUpdated();
+ if ( !isConfirmed )
+ {
+ // If not modified check if the case has already defined regions with zones
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
+ if ( aSeq.Length() > 0 )
+ {
+ // If there are already defined zones then ask a user to confirm zones recalculation
+ isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
+ tr( "MODE_CHANGED" ),
+ tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION_MODE" ),
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No ) == QMessageBox::Yes );
}
// At first we must to update the case name because of
// automatic names generation for regions and zones
myEditedObject->SetName( aNewCaseName );
-
+
+ // Set objects in the specified order
+ int aMode = aPanel->getMode();
+ if ( aMode == HYDROData_CalculationCase::AUTOMATIC ) {
+ myEditedObject->RemoveGeometryObjects();
+ foreach ( const QString& aName, aPanel->getAllGeomObjects() ) {
+ Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), aName ) );
+ if ( anObject.IsNull() ) {
+ continue;
+ }
+
+ myEditedObject->AddGeometryObject( anObject );
+ }
+ }
+ aPanel->setMoveZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
+
if ( myEditedObject->IsMustBeUpdated() )
{
myShowZones = true;
aPanel->excludeGroups( aSelectedList );
}
+
+void HYDROGUI_CalculationOp::onChangeMode( int theMode )
+{
+ HYDROGUI_CalculationDlg* aPanel =
+ ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+ if ( !aPanel )
+ return;
+
+ if ( !confirmModeChange() ) {
+ aPanel->setMode( myEditedObject->GetAssignmentMode() );
+ return;
+ }
+
+ myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)theMode );
+ aPanel->setMode( theMode );
+}
void setAvailableGroups();
protected slots:
+
+ /**
+ * Change the creation mode.
+ * @param theMode the mode to set
+ */
+ void onChangeMode( int theMode );
+
/**
* Add geometry objects selected in the module browser to the calculation case.
*/
QStringList& theNames, QStringList& theEntries ) const;
/**
- * Ask user to confirm splitting zones recalculation.
+ * Ask user to confirm splitting zones recalculation after regions list modification.
* \return true if confirmed
*/
bool confirmRegionsChange() const;
+ /**
+ * Ask user to confirm splitting zones recalculation after mode change.
+ * \return true if confirmed
+ */
+ bool confirmModeChange() const;
+
private:
bool myIsEdit;
bool myShowZones;
@param theParent the parent object
*/
HYDROGUI_ListModel::HYDROGUI_ListModel( QObject* theParent )
- : QAbstractListModel( theParent )
+ : QAbstractListModel( theParent ), myIsDecorationEnabled( true )
{
// Get resource manager
SUIT_ResourceMgr* aResMgr = 0;
case Qt::DecorationRole:
{
- if( aColumn==0 && aRow >=0 && aRow < myObjects.count() )
- {
+ if( myIsDecorationEnabled &&
+ aColumn==0 && aRow >=0 && aRow < myObjects.count() ) {
bool isVisible = isObjectVisible( aRow );
if( isVisible )
return myEye;
return anObjects;
}
+/**
+ Add the object to the end of the list.
+ @param theObjects the pair (object; visibility)
+*/
+void HYDROGUI_ListModel::addObject( const Object2Visible& theObject )
+{
+ myObjects << theObject;
+
+ reset();
+}
+
+/**
+ Remove the object from the list.
+ @param theObjectName the name of the object to remove
+*/
+void HYDROGUI_ListModel::removeObjectByName( const QString& theObjectName )
+{
+ Object2Visible anItem;
+ foreach( anItem, myObjects ) {
+ if ( anItem.first->GetName() == theObjectName ) {
+ break;
+ }
+ }
+
+ myObjects.removeAll(anItem);
+
+ reset();
+}
+
+
/**
Check if the object is visible.
@param theIndex the object index
return isAllowed;
}
+
+/**
+ Enable/disable decoration (eye icon).
+ @param theIsToEnable if true - the decoration will be enabled
+*/
+void HYDROGUI_ListModel::setDecorationEnabled( const bool theIsToEnable )
+{
+ myIsDecorationEnabled = theIsToEnable;
+}
\ No newline at end of file
void setObjects( const Object2VisibleList& theObjects );
ObjectList getObjects() const;
+ void addObject( const Object2Visible& theObject );
+ void removeObjectByName( const QString& theObjectName );
+
bool move( const int theItem, const OpType theType, bool theIsVisibleOnly,
const int theDropItem = -1 );
bool move( const QList<int>& theItems, const OpType theType, bool theIsVisibleOnly,
const int theDropItem = -1 );
+ void setDecorationEnabled( const bool theIsToEnable );
+
protected:
bool isObjectVisible( int theIndex ) const;
bool isDragAndDropAllowed( const QList<int>& theItems, const int theDropItem ) const;
Object2VisibleList myObjects;
QPixmap myEmpty, myEye;
+
+ bool myIsDecorationEnabled;
};
#endif
\ No newline at end of file
/**
Constructor.
@param theParent the parent widget
+ @param theIconSize the icon size for arrow buttons
*/
-HYDROGUI_OrderedListWidget::HYDROGUI_OrderedListWidget( QWidget* theParent )
+HYDROGUI_OrderedListWidget::HYDROGUI_OrderedListWidget( QWidget* theParent, int theArrowIconSize )
: QWidget( theParent )
{
// Main layout
QHBoxLayout* aMainLayout = new QHBoxLayout( this );
+ aMainLayout->setMargin( 0 );
aMainLayout->setSpacing( 5 );
// List view
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
myTop = new QPushButton( this );
myTop->setIcon( aResMgr->loadPixmap( "HYDRO", tr( "ARROW_TOP_ICO" ) ) );
- myTop->setIconSize( QSize( 32, 32 ) );
+ myTop->setIconSize( QSize( theArrowIconSize, theArrowIconSize ) );
myTop->setToolTip( tr( "TOP_TLT" ) );
myUp = new QPushButton( this );
myUp->setIcon( aResMgr->loadPixmap( "HYDRO", tr( "ARROW_UP_ICO" ) ) );
// Initialize
setHiddenObjectsShown( true );
+ setVisibilityIconShown( true );
}
/**
return anObjects;
}
+/**
+ Add the object to the end of the list.
+ @param theObjects the pair (object; visibility)
+*/
+void HYDROGUI_OrderedListWidget::addObject( const HYDROGUI_ListModel::Object2Visible& theObject )
+{
+ HYDROGUI_ListModel* aModel = getSourceModel();
+ if( aModel ) {
+ aModel->addObject(theObject);
+ }
+}
+
+/**
+ Remove the object from the list.
+ @param theObjectName the name of the object to remove
+*/
+void HYDROGUI_OrderedListWidget::removeObjectByName( const QString& theObjectName )
+{
+ HYDROGUI_ListModel* aModel = getSourceModel();
+ if( aModel ) {
+ aModel->removeObjectByName(theObjectName);
+ }
+}
+
/**
Set whether the hidden objects are presented in the list.
@param theIsToShow if true - the hidden objects will be shown in the list
aFilterModel->setFilterRegExp( anExpr );
}
+/**
+ Set whether the visibility icon (eye icon) are presented in the list.
+ @param theIsToShow if true - the eye icon will be shown in the list
+*/
+void HYDROGUI_OrderedListWidget::setVisibilityIconShown( const bool theIsToShow )
+{
+ HYDROGUI_ListModel* aModel = getSourceModel();
+ if( aModel ) {
+ aModel->setDecorationEnabled( theIsToShow );
+ }
+}
+
/**
Get entries of the selected objects.
@return the list of entries
}
}
+/**
+ Get names of the selected objects.
+ @return the list of names
+*/
+QStringList HYDROGUI_OrderedListWidget::getSelectedNames() const
+{
+ QStringList aNames;
+
+ QSortFilterProxyModel* aFilterModel =
+ dynamic_cast<QSortFilterProxyModel*>( myList->model() );
+ if ( aFilterModel ) {
+ HYDROGUI_ListModel* aSourceModel =
+ dynamic_cast<HYDROGUI_ListModel*>( aFilterModel->sourceModel() );
+ if ( aSourceModel ) {
+ QModelIndexList aSelectedIndexes = myList->selectionModel()->selectedIndexes();
+ foreach ( const QModelIndex& anIndex, aSelectedIndexes ) {
+ QModelIndex aSourceIndex = aFilterModel->mapToSource( anIndex );
+ QString anEntry = aSourceModel->data( aSourceIndex, Qt::DisplayRole ).toString();
+ aNames << anEntry;
+ }
+ }
+ }
+
+ return aNames;
+}
+
+/**
+ Get names of all objects.
+ @return the list of names
+*/
+QStringList HYDROGUI_OrderedListWidget::getAllNames() const
+{
+ QStringList aNames;
+
+
+ foreach ( const Handle(HYDROData_Entity)& anObject, getObjects() ) {
+ aNames << anObject->GetName();
+ }
+
+ return aNames;
+}
+
/**
Slot called on top, up, down and bottom button click.
@param theType the move operation type
}
return aSourceModel;
+}
+
+/**
+ Enable/disable ordering (i.e. enable/disable arrow buttons and drag and drop).
+ @param theIsToEnable if true - ordering will bw enabled
+*/
+void HYDROGUI_OrderedListWidget::setOrderingEnabled( const bool theIsToEnable )
+{
+ // enable/disable arrow buttons
+ myTop->setEnabled( theIsToEnable );
+ myUp->setEnabled( theIsToEnable );
+ myDown->setEnabled( theIsToEnable );
+ myBottom->setEnabled( theIsToEnable );
+
+ // enable/disable drag and drop
+ myList->setDragEnabled( theIsToEnable );
}
\ No newline at end of file
Q_OBJECT
public:
- HYDROGUI_OrderedListWidget( QWidget* theParent );
+ HYDROGUI_OrderedListWidget( QWidget* theParent, int theArrowIconSize = 32 );
virtual ~HYDROGUI_OrderedListWidget();
void setObjects( const HYDROGUI_ListModel::Object2VisibleList& theObjects );
HYDROGUI_ListModel::ObjectList getObjects() const;
+ void addObject( const HYDROGUI_ListModel::Object2Visible& theObject );
+ void removeObjectByName( const QString& theObjectName );
+
void setHiddenObjectsShown( const bool theIsToShow );
+ void setVisibilityIconShown( const bool theIsToShow );
+
+ void setOrderingEnabled( const bool theIsToEnable );
QStringList getSelectedEntries() const;
void setSelectedEntries( const QStringList& theEntries ) const;
+ QStringList getSelectedNames() const;
+ QStringList getAllNames() const;
+
signals:
void selectionChanged();
private:
HYDROGUI_ListModel* getSourceModel() const;
+ QModelIndexList getSelectedIndexes() const;
+
private:
QListView* myList; ///< the list view
QPushButton* myTop; ///< the move on top button
QPushButton* myBottom; ///< the move on bottom button
bool myIsHiddenObjectsShown; ///< defines whether to include hidden objects in the list
+ bool myIsVisibilityIconShown; ///< defines whether to show visibility icon (eye icon)
};
#endif
--- /dev/null
+// 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
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#include "HYDROGUI_PriorityWidget.h"
+
+#include <QLayout>
+#include <QTableView>
+#include <QPushButton>
+
+
+/**
+ Constructor.
+ @param theParent the parent widget
+*/
+HYDROGUI_PriorityWidget::HYDROGUI_PriorityWidget( QWidget* theParent )
+: QWidget( theParent )
+{
+ // Main layout
+ QVBoxLayout* aMainLayout = new QVBoxLayout( this );
+ aMainLayout->setMargin( 0 );
+ aMainLayout->setSpacing( 5 );
+
+ // Buttons
+ myAdd = new QPushButton( tr( "ADD" ) );
+ myRemove = new QPushButton( tr( "REMOVE" ) );
+
+ // Table view
+ myTable = new QTableView( this );
+
+ // Layout
+ // buttons
+ QHBoxLayout* aButtonsLayout = new QHBoxLayout();
+ aButtonsLayout->addWidget( myAdd );
+ aButtonsLayout->addWidget( myRemove );
+ aButtonsLayout->addStretch( 1 );
+
+ // main
+ aMainLayout->addLayout( aButtonsLayout );
+ aMainLayout->addWidget( myTable );
+
+ // Connections
+ connect( myAdd, SIGNAL( clicked() ), this, SLOT( onAdd() ) );
+ connect( myRemove, SIGNAL( clicked() ), this, SLOT( onRemove() ) );
+}
+
+/**
+ Destructor.
+*/
+HYDROGUI_PriorityWidget::~HYDROGUI_PriorityWidget()
+{
+}
+
+/**
+ Adds the new rule.
+*/
+void HYDROGUI_PriorityWidget::onAddRule()
+{
+}
+
+/**
+ Removes the selected rule.
+*/
+void HYDROGUI_PriorityWidget::onRemoveRule()
+{
+}
\ No newline at end of file
--- /dev/null
+// 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
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef HYDROGUI_PRIORITYWIDGET_H
+#define HYDROGUI_PRIORITYWIDGET_H
+
+#include <HYDROGUI.h>
+
+#include <QWidget>
+
+class QTableView;
+class QPushButton;
+
+/**
+ * \class HYDROGUI_PriorityWidget
+ * \brief The class representing widget for tuning of the objects priorities and bathymetry conflicts
+ *
+ * The widget represents a table and a set of buttons (add and remove)
+ * providing the possibility to define priority rules.
+ */
+class HYDRO_EXPORT HYDROGUI_PriorityWidget : public QWidget
+{
+ Q_OBJECT
+
+public:
+ HYDROGUI_PriorityWidget( QWidget* theParent );
+ virtual ~HYDROGUI_PriorityWidget();
+
+ void setObjects( const QStringList& theObjects );
+
+protected slots:
+ void onAddRule();
+ void onRemoveRule();
+
+private:
+ QTableView* myTable; ///< the table view
+ QPushButton* myAdd; ///< the add rule button
+ QPushButton* myRemove; ///< the remove rule button
+};
+
+#endif
<source>EMPTY_GEOMETRY_OBJECTS</source>
<translation>No one geometry object is selected, should be at least one.</translation>
</message>
+ <message>
+ <source>MODE</source>
+ <translation>Mode</translation>
+ </message>
+ <message>
+ <source>AUTO</source>
+ <translation>Auto</translation>
+ </message>
+ <message>
+ <source>MANUAL</source>
+ <translation>Manual</translation>
+ </message>
+ <message>
+ <source>PRIORITY</source>
+ <translation>Priority</translation>
+ </message>
</context>
<context>
<translation>Regions list modification</translation>
</message>
<message>
- <source>CONFIRM_SPLITTING_ZONES_RECALCULATION</source>
+ <source>CONFIRM_SPLITTING_ZONES_RECALCULATION_REGIONS</source>
<translation>Case splitting zones already exist and will be recalculated after regions list modification. Do you confirm the recalculation?</translation>
</message>
+ <message>
+ <source>MODE_CHANGED</source>
+ <translation>Change creation mode</translation>
+ </message>
+ <message>
+ <source>CONFIRM_SPLITTING_ZONES_RECALCULATION_MODE</source>
+ <translation>Case splitting zones already exist and will be recalculated after mode change. Do you confirm the recalculation?</translation>
+ </message>
</context>
<context>
</message>
</context>
+ <context>
+ <name>HYDROGUI_PriorityWidget</name>
+ <message>
+ <source>ADD</source>
+ <translation>Add</translation>
+ </message>
+ <message>
+ <source>REMOVE</source>
+ <translation>Remove</translation>
+ </message>
+ </context>
+
</TS>
