ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-01 03:25:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
stv 2008-02-21 11:24:35 +00:00
parent a6a410efbe
commit 2672e3aa3d
6 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OBJECT/SMESH_Actor.cxx
View File

@ -33,6 +33,8 @@
#include "SMESH_ControlsDef.hxx" #include "SMESH_ControlsDef.hxx"
#include "VTKViewer_ExtractUnstructuredGrid.h" #include "VTKViewer_ExtractUnstructuredGrid.h"
#include <SALOME_InteractiveObject.hxx>
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SUIT_ResourceMgr.h" #include "SUIT_ResourceMgr.h"

2
src/OBJECT/SMESH_ActorUtils.cxx
View File

@ -42,7 +42,7 @@ namespace SMESH
GetFloat( const QString& theValue, GetFloat( const QString& theValue,
vtkFloatingPointType theDefault ) vtkFloatingPointType theDefault )
{ {
int pos = theValue.find( ":" ); int pos = theValue.indexOf( ":" );
vtkFloatingPointType val = theDefault; vtkFloatingPointType val = theDefault;
if( pos>=0 ) if( pos>=0 )
{ {

11
src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
View File

@ -26,7 +26,7 @@
// name : SMESH_LogicalFilter::SMESH_LogicalFilter // name : SMESH_LogicalFilter::SMESH_LogicalFilter
// Purpose : Constructor // Purpose : Constructor
//======================================================================= //=======================================================================
SMESH_LogicalFilter::SMESH_LogicalFilter (const QPtrList<SUIT_SelectionFilter>& theFilters, SMESH_LogicalFilter::SMESH_LogicalFilter (const QList<SUIT_SelectionFilter*>& theFilters,
const int theLogOp) const int theLogOp)
{ {
setFilters(theFilters); setFilters(theFilters);
@ -48,10 +48,9 @@ SMESH_LogicalFilter::~SMESH_LogicalFilter()
bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const
{ {
bool res = true; bool res = true;
QPtrListIterator<SUIT_SelectionFilter> it (myFilters); for ( QList<SUIT_SelectionFilter*>::const_iterator it = myFilters.begin(); it != myFilters.end() && res; ++it )
SUIT_SelectionFilter* filter;
for (; ((filter = it.current()) != 0) && res; ++it)
{ {
SUIT_SelectionFilter* filter = *it;
if (myOperation == LO_OR && filter->isOk(owner)) if (myOperation == LO_OR && filter->isOk(owner))
return true; return true;
if (myOperation == LO_AND && !filter->isOk(owner)) if (myOperation == LO_AND && !filter->isOk(owner))
@ -67,7 +66,7 @@ bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const
// name : SMESH_LogicalFilter::setFilters // name : SMESH_LogicalFilter::setFilters
// Purpose : Set new list of filters. Old wilters are removed // Purpose : Set new list of filters. Old wilters are removed
//======================================================================= //=======================================================================
void SMESH_LogicalFilter::setFilters (const QPtrList<SUIT_SelectionFilter>& theFilters) void SMESH_LogicalFilter::setFilters (const QList<SUIT_SelectionFilter*>& theFilters)
{ {
myFilters = theFilters; myFilters = theFilters;
} }
@ -85,7 +84,7 @@ void SMESH_LogicalFilter::setOperation (const int theLogOp)
// name : SMESH_LogicalFilter::getFilters // name : SMESH_LogicalFilter::getFilters
// Purpose : Get list of filters // Purpose : Get list of filters
//======================================================================= //=======================================================================
const QPtrList<SUIT_SelectionFilter> SMESH_LogicalFilter::getFilters() const const QList<SUIT_SelectionFilter*> SMESH_LogicalFilter::getFilters() const
{ {
return myFilters; return myFilters;
} }

11
src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
View File

@ -27,7 +27,7 @@
#include <SUIT_SelectionFilter.h> #include <SUIT_SelectionFilter.h>
#include <qptrlist.h> #include <QList>
class SMESHFILTERSSELECTION_EXPORT SMESH_LogicalFilter : public SUIT_SelectionFilter class SMESHFILTERSSELECTION_EXPORT SMESH_LogicalFilter : public SUIT_SelectionFilter
{ {
@ -35,19 +35,18 @@ class SMESHFILTERSSELECTION_EXPORT SMESH_LogicalFilter : public SUIT_SelectionFi
enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED }; enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
public: public:
SMESH_LogicalFilter (const QPtrList<SUIT_SelectionFilter>&, SMESH_LogicalFilter( const QList<SUIT_SelectionFilter*>&, const int );
const int);
virtual ~SMESH_LogicalFilter(); virtual ~SMESH_LogicalFilter();
virtual bool isOk (const SUIT_DataOwner*) const; virtual bool isOk (const SUIT_DataOwner*) const;
void setFilters (const QPtrList<SUIT_SelectionFilter>&); void setFilters (const QList<SUIT_SelectionFilter*>&);
void setOperation (const int); void setOperation (const int);
const QPtrList<SUIT_SelectionFilter> getFilters() const; const QList<SUIT_SelectionFilter*> getFilters() const;
int getOperation() const; int getOperation() const;
private: private:
QPtrList<SUIT_SelectionFilter> myFilters; QList<SUIT_SelectionFilter*> myFilters;
int myOperation; int myOperation;
}; };

2
src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
View File

@ -165,7 +165,7 @@ GEOM::GEOM_Object_ptr SMESH_NumberFilter::getGeom
_PTR(Study) study = appStudy->studyDS(); _PTR(Study) study = appStudy->studyDS();
QString entry = owner->entry(); QString entry = owner->entry();
_PTR(SObject) aSO( study->FindObjectID( entry.latin1() ) ), aRefSO; _PTR(SObject) aSO( study->FindObjectID( (const char*)entry.toLatin1() ) ), aRefSO;
if( extractReference && aSO && aSO->ReferencedObject( aRefSO ) ) if( extractReference && aSO && aSO->ReferencedObject( aRefSO ) )
aSO = aRefSO; aSO = aRefSO;

2
src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
View File

@ -50,7 +50,7 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
_PTR(Study) study = appStudy->studyDS(); _PTR(Study) study = appStudy->studyDS();
QString entry = owner->entry(); QString entry = owner->entry();
_PTR(SObject) obj (study->FindObjectID(entry.latin1())), aRefSO; _PTR(SObject) obj (study->FindObjectID((const char*)entry.toLatin1())), aRefSO;
if( extractReference && obj && obj->ReferencedObject( aRefSO ) ) if( extractReference && obj && obj->ReferencedObject( aRefSO ) )
obj = aRefSO; obj = aRefSO;
if (!obj) return false; if (!obj) return false;