Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_CalculationDlg.h
diff --git
a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index eaf3aa26aa6a52a2e81a437d88753c6953b79619..a769f3d44ddd8eecdd81bb41a939568eba419d1f 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/
src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@
-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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,6
+16,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#ifndef HYDROGUI_CALCULATIONDLG_H
#define HYDROGUI_CALCULATIONDLG_H
#ifndef HYDROGUI_CALCULATIONDLG_H
#define HYDROGUI_CALCULATIONDLG_H
@@
-27,16
+24,23
@@
#include <HYDROData_CalculationCase.h>
class HYDROGUI_ObjSelector;
#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 QGroupBox;
class QLineEdit;
class QListWidget;
class QComboBox;
class QLabel;
+class QSplitter;
class QStringList;
class QStringList;
-class HYDROGUI_DataBrowser;
-class HYDROGUI_NameValidator;
-class SUIT_DataObject;
-class HYDROGUI_Zone;
+
class HYDROGUI_CalculationDlg : public HYDROGUI_Wizard
{
class HYDROGUI_CalculationDlg : public HYDROGUI_Wizard
{
@@
-48,22
+52,31
@@
public:
void reset();
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 );
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 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 setAvailableGroups( const QStringList& );
+ void setEditZonesEnabled( const bool theIsEnabled );
+
+ HYDROData_ListOfRules getRules() const;
+ void setRules( const HYDROData_ListOfRules& theRules ) const;
+
public slots:
public slots:
+ void setMode( int theMode );
void setBoundary( const QString& theObjName );
void includeGeomObjects( const QStringList& theObjects );
void excludeGeomObjects( const QStringList& theObjects );
void setBoundary( const QString& theObjName );
void includeGeomObjects( const QStringList& theObjects );
void excludeGeomObjects( const QStringList& theObjects );
@@
-73,6
+86,8
@@
public slots:
void onAlreadyExists( QString theName );
void refreshZonesBrowser();
void onDataChanged();
void onAlreadyExists( QString theName );
void refreshZonesBrowser();
void onDataChanged();
+ void onOrderChanged();
+
/**
* Process items selection: hide/show bathymetry merge type selector.
*/
/**
* Process items selection: hide/show bathymetry merge type selector.
*/
@@
-88,9
+103,12
@@
public slots:
SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
signals:
SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
signals:
+ void changeMode( int theMode );
+
void addObjects();
void removeObjects();
void objectsSelected();
void addObjects();
void removeObjects();
void objectsSelected();
+ void orderChanged( bool& isConfirmed );
void addGroups();
void removeGroups();
void addGroups();
void removeGroups();
@@
-106,20
+124,30
@@
protected:
virtual bool acceptCurrent() const;
virtual bool acceptCurrent() const;
+protected slots:
+ void OnNewRegion();
+
private:
private:
+ QList<Handle(HYDROData_Object)> getGeometryObjects();
QWizardPage* createObjectsPage();
QWizardPage* createGroupsPage();
QWizardPage* createZonesPage();
QWizardPage* createObjectsPage();
QWizardPage* createGroupsPage();
QWizardPage* createZonesPage();
+ QSplitter* mySplitter;
+
QGroupBox* myObjectNameGroup;
QLineEdit* myObjectName;
HYDROGUI_NameValidator* myValidator;
QComboBox* myPolylineName;
QGroupBox* myObjectNameGroup;
QLineEdit* myObjectName;
HYDROGUI_NameValidator* myValidator;
QComboBox* myPolylineName;
+ QButtonGroup* myModeButtons;
+
QListWidget* myAvailableGeomObjects;
QListWidget* myAvailableGeomObjects;
- QListWidget* myGeomObjects;
+ HYDROGUI_OrderedListWidget* myGeomObjects;
+
+ HYDROGUI_PriorityWidget* myPriorityWidget;
QListWidget* myAvailableGroups;
QListWidget* myGroups;
QListWidget* myAvailableGroups;
QListWidget* myGroups;
@@
-127,7
+155,7
@@
private:
HYDROGUI_DataBrowser* myBrowser;
Handle(HYDROData_CalculationCase) myEditedObject;
QComboBox* myBathymetryChoice;
HYDROGUI_DataBrowser* myBrowser;
Handle(HYDROData_CalculationCase) myEditedObject;
QComboBox* myBathymetryChoice;
- QLabel* myBat
i
metryLabel;
+ QLabel* myBat
hy
metryLabel;
HYDROGUI_Zone* myCurrentZone;
};
HYDROGUI_Zone* myCurrentZone;
};