Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR: relax constraints on node distances on StdMeshers_import_1D
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_NbSegmentsCreator.h
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h
b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h
index f1ec2298c7b6e996b9583ff420f8a311c3005c7b..1792ae8559441808a45eb3b14dd10652c21cb8f5 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h
+++ b/
src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h
@@
-1,4
+1,6
@@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// 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
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// This library is free software; you can redistribute it and/or
@@
-6,7
+8,7
@@
// License as published by the Free Software Foundation; either
// version 2.1 of the License.
//
// 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
+// 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.
// 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.
@@
-18,23
+20,32
@@
// 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 NB_SEGMENTS_CREATOR_HEADER
-#define NB_SEGMENTS_CREATOR_HEADER
+// File : StdMeshersGUI_NbSegmentsCreator.h
+// Author : Open CASCADE S.A.S.
+//
+#ifndef STDMESHERSGUI_NBSEGMENTSCREATOR_H
+#define STDMESHERSGUI_NBSEGMENTSCREATOR_H
+
+// SMESH includes
+#include "SMESH_StdMeshersGUI.hxx"
#include "StdMeshersGUI_StdHypothesisCreator.h"
#include "StdMeshersGUI_StdHypothesisCreator.h"
+// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
-class
Qtx
IntSpinBox;
+class
SalomeApp_
IntSpinBox;
class QtxComboBox;
class SMESHGUI_SpinBox;
class StdMeshersGUI_DistrTableFrame;
class StdMeshersGUI_DistrPreview;
class QLineEdit;
class QButtonGroup;
class QtxComboBox;
class SMESHGUI_SpinBox;
class StdMeshersGUI_DistrTableFrame;
class StdMeshersGUI_DistrPreview;
class QLineEdit;
class QButtonGroup;
+class QGroupBox;
class QGridLayout;
class QRadioButton;
class QGridLayout;
class QRadioButton;
+class StdMeshersGUI_SubShapeSelectorWdg;
typedef struct
{
typedef struct
{
@@
-42,10
+53,11
@@
typedef struct
double myScale;
SMESH::double_array myTable;
QString myName, myExpr;
double myScale;
SMESH::double_array myTable;
QString myName, myExpr;
+ QString myNbSegVarName, myScaleVarName;
} NbSegmentsHypothesisData;
} NbSegmentsHypothesisData;
-class StdMeshersGUI_NbSegmentsCreator : public StdMeshersGUI_StdHypothesisCreator
+class S
TDMESHERSGUI_EXPORT S
tdMeshersGUI_NbSegmentsCreator : public StdMeshersGUI_StdHypothesisCreator
{
Q_OBJECT
{
Q_OBJECT
@@
-53,7
+65,7
@@
public:
StdMeshersGUI_NbSegmentsCreator();
virtual ~StdMeshersGUI_NbSegmentsCreator();
StdMeshersGUI_NbSegmentsCreator();
virtual ~StdMeshersGUI_NbSegmentsCreator();
- virtual bool checkParams() const;
+ virtual bool checkParams(
QString&
) const;
protected:
virtual QFrame* buildFrame();
protected:
virtual QFrame* buildFrame();
@@
-69,17
+81,21
@@
private:
bool storeParamsToHypo( const NbSegmentsHypothesisData& ) const;
private:
bool storeParamsToHypo( const NbSegmentsHypothesisData& ) const;
private:
-
Qtx
IntSpinBox* myNbSeg;
+
SalomeApp_
IntSpinBox* myNbSeg;
QtxComboBox* myDistr;
SMESHGUI_SpinBox* myScale;
StdMeshersGUI_DistrTableFrame* myTable;
StdMeshersGUI_DistrPreview* myPreview;
QLineEdit *myName, *myExpr;
QtxComboBox* myDistr;
SMESHGUI_SpinBox* myScale;
StdMeshersGUI_DistrTableFrame* myTable;
StdMeshersGUI_DistrPreview* myPreview;
QLineEdit *myName, *myExpr;
+ QGroupBox* myConvBox;
QButtonGroup* myConv;
QButtonGroup* myConv;
- QLabel *myLScale, *myLTable, *myLExpr, *my
LConv, *my
Info;
+ QLabel *myLScale, *myLTable, *myLExpr, *myInfo;
QGridLayout* myGroupLayout;
int myTableRow, myPreviewRow;
QGridLayout* myGroupLayout;
int myTableRow, myPreviewRow;
- QRadioButton* myCutNeg;
+ //QRadioButton* myCutNeg;
+ QGroupBox* myReversedEdgesBox;
+
+ StdMeshersGUI_SubShapeSelectorWdg* myDirectionWidget;
};
};
-#endif
+#endif
// STDMESHERSGUI_NBSEGMENTSCREATOR_H