return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver)
class gp_Dir;
class gp_Ax3;
-DEFINE_STANDARD_HANDLE( AdvancedEngine_DividedDiskDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( AdvancedEngine_DividedDiskDriver, GEOM_BaseDriver )
class AdvancedEngine_DividedDiskDriver : public GEOM_BaseDriver
{
#ifdef FIND_GROUPS_BY_POINTS
// BEGIN: new groups search
-
- // W2 R2
- // .----.-----.----.
- // e| | | | |
- // | | | | |
- // . | | | .
- // g / ''..| | |..'' \
- // f / ''''''' \
- // .---.--'.. | | | ..'--.---.
- // |a \ '''...........''' / |
- // |-------\------' | '------/-------.
- // | \ | / |
- // c| \ | / |
- // | R1 \ | / |
- // | \ | / |
- // ._________________|_________________.
- // | L1 | |
- // | | |
- // | | |
- // b| | |
- // | | |
- // |-----------------|-----------------|
- // | W1 | |
- // '-----------------'-----------------'
- // d
+ /*
+ W2 R2
+ .----.-----.----.
+ e| | | | |
+ | | | | |
+ . | | | .
+ g / ''..| | |..'' \
+ f / ''''''' \
+ .---.--'.. | | | ..'--.---.
+ |a \ '''...........''' / |
+ |-------\------' | '------/-------.
+ | \ | / |
+ c| \ | / |
+ | R1 \ | / |
+ | \ | / |
+ ._________________|_________________.
+ | L1 | |
+ | | |
+ | | |
+ b| | |
+ | | |
+ |-----------------|-----------------|
+ | W1 | |
+ '-----------------'-----------------'
+ d
+ */
// "Thickness" group (a)
gp_Pnt aPntA (-theL1, 0, theR1 + theW1/2.);
else {
Handle(GEOM_Object) P1, P2, P3, P4, P5, P6;
int idP1, idP2, idP3, idP4;
- int PZX, PZY;
+ int PZX=0, PZY=0; // todo: PZX, PZY must be explicitly initialized to avoid warning (see below)
double ZX=0, ZY=0;
std::vector<int> LX;
std::vector<int> LY;
idP3 = LY.at(1);
P1 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP1));
- P2 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP2));
+ P2 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP2)); // todo: PZX must be explicitly initialized to avoid warning (see above)
P3 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP3));
- P4 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP4));
+ P4 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP4)); // todo: PZY must be explicitly initialized to avoid warning (see above)
Handle(GEOM_Object) Cote_1 = myBasicOperations->MakeLineTwoPnt(P1, vi1);
if (Cote_1.IsNull()) {
// Mirror and glue faces
bool AdvancedEngine_IOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Object) theShape,
double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2)
+ double /*theR2*/, double /*theW2*/, double theL2)
{
SetErrorCode(KO);
{
// Add thickness reduction elements
// at the three extremities: Left, Right and Incident
- //
- // ---------------------.
- // W \
- // ---------------------. \
- // ^ \ '-----------------.
- // |R \ Wthin |
- // | '-----------------'
- // v Rthin
- // --.--.--.--.--.--.--.--.--.--.--.--.--.--.--
- // Ltrans Lthin
+ /*
+ ---------------------.
+ W \
+ ---------------------. \
+ ^ \ '-----------------.
+ |R \ Wthin |
+ | '-----------------'
+ v Rthin
+ --.--.--.--.--.--.--.--.--.--.--.--.--.--.--
+ Ltrans Lthin
+ */
TopoDS_Shape aResult = theShape;
double aTol = Precision::Confusion();
}
bool isThinPart = (Lthin > aTol);
- // .
- // W |\
- // . \
- // ^ \ '-----------------.
- // |R \| | Wthin
- // | '-----------------'
- // v Rthin
- // --.--.--.--.--.--.--.--.--.--.--.--.--> theAxes.Direction()
- // Ltrans Lthin
+ /*
+ .
+ W |\
+ . \
+ ^ \ '-----------------.
+ |R \| | Wthin
+ | '-----------------'
+ v Rthin
+ --.--.--.--.--.--.--.--.--.--.--.--.--> theAxes.Direction()
+ Ltrans Lthin
+ */
double RExt = R + W;
double RthinExt = Rthin + Wthin;
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver)
#include <TColStd_HSequenceOfInteger.hxx>
#include <Geom_Surface.hxx>
-DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver )
class AdvancedEngine_PipeTShapeDriver : public GEOM_BaseDriver
{
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver)
#include <TColgp_HArray1OfPnt.hxx>
#include <TopoDS_Shape.hxx>
-DEFINE_STANDARD_HANDLE( AdvancedEngine_SmoothingSurfaceDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( AdvancedEngine_SmoothingSurfaceDriver, GEOM_BaseDriver )
class AdvancedEngine_SmoothingSurfaceDriver : public GEOM_BaseDriver
{
// function : SetDoubleSpinBoxStep()
// purpose : Double spin box management
//=================================================================================
-void AdvancedGUI_DividedCylinderDlg::SetDoubleSpinBoxStep (double step)
+void AdvancedGUI_DividedCylinderDlg::SetDoubleSpinBoxStep (double /*step*/)
{
//@@ set double spin box step for all spin boxes here @@//
}
// function : isValid
// purpose :
//=================================================================================
-bool AdvancedGUI_DividedCylinderDlg::isValid (QString& msg)
+bool AdvancedGUI_DividedCylinderDlg::isValid (QString& /*msg*/)
{
bool ok = true;
// function : SetDoubleSpinBoxStep()
// purpose : Double spin box management
//=================================================================================
-void AdvancedGUI_DividedDiskDlg::SetDoubleSpinBoxStep (double step)
+void AdvancedGUI_DividedDiskDlg::SetDoubleSpinBoxStep (double /*step*/)
{
//@@ set double spin box step for all spin boxes here @@//
}
// function : isValid
// purpose :
//=================================================================================
-bool AdvancedGUI_DividedDiskDlg::isValid (QString& msg)
+bool AdvancedGUI_DividedDiskDlg::isValid (QString& /*msg*/)
{
bool ok = true;
// function : UpdatePicture()
// purpose :
//=================================================================================
-void AdvancedGUI_PipeTShapeDlg::UpdatePicture (QWidget* old, QWidget* now)
+void AdvancedGUI_PipeTShapeDlg::UpdatePicture (QWidget* /*old*/, QWidget* now)
{
if (ChamferGroupParams->GroupBox1->isChecked())
if (now == MainTubeGroupParams->SpinBox_DX)
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void AdvancedGUI_PipeTShapeDlg::ValueChangedInSpinBox (double newValue)
+void AdvancedGUI_PipeTShapeDlg::ValueChangedInSpinBox (double /*newValue*/)
{
if (JunctionPointsSel->GroupBox1->isChecked() && myOkPoint1 && myOkPoint2 && myOkPoint3)
CheckCompatiblePosition(myPoint1, myPoint2, myPoint3, 0.01);
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
+Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
*/
//================================================================================
bool BREPPlugin_ExportDriver::
-GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& theParams )
+GetCreationInformation( std::string& /*theOperationName*/,
+ std::vector<GEOM_Param>& /*theParams*/ )
{
return false;
}
-IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver )
class BREPPlugin_ExportDriver : public GEOM_BaseDriver
{
//=============================================================================
bool
BREPPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal,
- const TCollection_AsciiString& theFileName,
- const TCollection_AsciiString& theFormatName )
+ const TCollection_AsciiString& theFileName,
+ const TCollection_AsciiString& /*theFormatName*/ )
{
BREPPlugin_IOperations* aPluginOperations = BREPPlugin_OperationsCreator::get( GetEngine() );
aPluginOperations->ExportBREP( theOriginal, theFileName );
*/
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
-BREPPlugin_IECallBack::Import( const TCollection_AsciiString& theFormatName,
+BREPPlugin_IECallBack::Import( const TCollection_AsciiString& /*theFormatName*/,
const TCollection_AsciiString& theFileName )
{
BREPPlugin_IOperations* aPluginOperations = BREPPlugin_OperationsCreator::get( GetEngine() );
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver )
class BREPPlugin_ImportDriver : public GEOM_BaseDriver
{
// function : 0nMousePress()
// purpose : [static] manage mouse events
//=================================================================================
-bool BasicGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
+bool BasicGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* theViewWindow )
{
QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
// function : isValid
// purpose :
//=================================================================================
-bool BasicGUI_ArcDlg::isValid( QString& msg )
+bool BasicGUI_ArcDlg::isValid( QString& /*msg*/ )
{
bool ok = myPoint1 && myPoint2 && myPoint3 &&
myPoint1 != myPoint2 && myPoint1 != myPoint3 && myPoint2 != myPoint3;
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void BasicGUI_EllipseDlg::ValueChangedInSpinBox( double newValue )
+void BasicGUI_EllipseDlg::ValueChangedInSpinBox( double /*newValue*/ )
{
displayPreview(true);
}
// function : isValid
// purpose :
//=================================================================================
-bool BasicGUI_LineDlg::isValid( QString& msg )
+bool BasicGUI_LineDlg::isValid( QString& /*msg*/ )
{
bool ok = false;
switch ( getConstructorId() ) {
return;
}
- TopAbs_ShapeEnum aNeedType;
+ TopAbs_ShapeEnum aNeedType = TopAbs_SHAPE; // todo: aNeedType must be explicitly initialized to avoid warning (see below)
if ( getConstructorId() == 1 ) // by shape position
aNeedType = TopAbs_SHAPE;
else if ( getConstructorId() == 2 ) // by point and two vectors
aNeedType = myEditCurrentArgument == Group2->LineEdit1 ? TopAbs_VERTEX : TopAbs_EDGE;
- GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType );
+ GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType ); // todo: aNeedType must be explicitly initialized to avoid warning (see above)
TopoDS_Shape aShape;
if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) {
QString aName = GEOMBase::GetName( aSelectedObject.get() );
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void BasicGUI_PlaneDlg::ValueChangedInSpinBox( double newValue )
+void BasicGUI_PlaneDlg::ValueChangedInSpinBox( double /*newValue*/ )
{
displayPreview(true);
}
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void BasicGUI_PointDlg::ValueChangedInSpinBox(double newValue)
+void BasicGUI_PointDlg::ValueChangedInSpinBox(double /*newValue*/)
{
displayPreview(true);
}
// function : ClickParamCoord()
// purpose :
//=================================================================================
-void BasicGUI_PointDlg::ClickParamCoord(int id)
+void BasicGUI_PointDlg::ClickParamCoord(int /*id*/)
{
updateParamCoord(true);
displayPreview(true);
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void BasicGUI_VectorDlg::ValueChangedInSpinBox( double newValue )
+void BasicGUI_VectorDlg::ValueChangedInSpinBox( double /*newValue*/ )
{
displayPreview(true);
}
// function : ReverseVector()
// purpose : 'state' not used here
//=================================================================================
-void BasicGUI_VectorDlg::ReverseVector( int state )
+void BasicGUI_VectorDlg::ReverseVector( int /*state*/ )
{
double dx = -GroupDimensions->SpinBox_DX->value();
double dy = -GroupDimensions->SpinBox_DY->value();
#include <Precision.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient);
+IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient)
//=======================================================================
//function : BlockFix_BlockFixAPI
#include <TopoDS_Shape.hxx>
#include <Standard_Real.hxx>
-DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, Standard_Transient);
+DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, Standard_Transient)
class BlockFix_BlockFixAPI : public Standard_Transient
{
#include <gp_Pnt.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
+IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification)
//=======================================================================
//function : BlockFix_PeriodicSurfaceModifier()
class Geom2d_Curve;
class gp_Pnt;
-DEFINE_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
+DEFINE_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification)
class BlockFix_PeriodicSurfaceModifier : public BRepTools_Modification {
#include <gp_Pnt.hxx>
#include <gp_Sphere.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification);
+IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification)
//=======================================================================
//function : BlockFix_SphereSpaceModifier
class Geom2d_Curve;
class gp_Pnt;
-DEFINE_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification);
+DEFINE_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification)
class BlockFix_SphereSpaceModifier : public BRepTools_Modification {
return anIIInt.TangentFaces();
}
- catch (Standard_Failure) {
+ catch (Standard_Failure&) {
return false;
}
}
// function : enterEvent()
// purpose :
//=================================================================================
-void BuildGUI_CompoundDlg::enterEvent(QEvent* e)
+void BuildGUI_CompoundDlg::enterEvent(QEvent*)
{
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void BuildGUI_EdgeDlg::ValueChangedInSpinBox(double newValue)
+void BuildGUI_EdgeDlg::ValueChangedInSpinBox(double /*newValue*/)
{
displayPreview(true);
}
// function : onItemClicked()
// purpose : called when tree item was clicked
//=================================================================================
-void BuildGUI_FaceDlg::onItemClicked( QTreeWidgetItem* theItem, int theColumn )
+void BuildGUI_FaceDlg::onItemClicked( QTreeWidgetItem* theItem, int /*theColumn*/ )
{
if ( !theItem || !( theItem->flags() & Qt::ItemIsSelectable ) )
return;
switch (getConstructorId()) {
case 0:
{
- if ( GroupSolid->CheckButton1->isChecked() ) {
- GEOM::ListOfGO_var objlist = new GEOM::ListOfGO();
- objlist->length( myShells.count() );
- for ( int i = 0; i < myShells.count(); i++ )
- objlist[i] = myShells[i].copy();
-
- anObj = anOper->MakeSolidShells( objlist.in() );
-
- if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() );
- }
- else {
- for ( int i = 0, n = myShells.count(); i< n; i++ ){
- anObj = anOper->MakeSolidShell( myShells[ i ].get() );
-
- if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() );
- }
- }
- break;
+ if ( GroupSolid->CheckButton1->isChecked() ) {
+ GEOM::ListOfGO_var objlist = new GEOM::ListOfGO();
+ objlist->length( myShells.count() );
+ for ( int i = 0; i < myShells.count(); i++ )
+ objlist[i] = myShells[i].copy();
+
+ anObj = anOper->MakeSolidShells( objlist.in() );
+ if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() );
+ }
+ else {
+ for ( int i = 0, n = myShells.count(); i< n; i++ ) {
+ anObj = anOper->MakeSolidShell( myShells[ i ].get() );
+ if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() );
+ }
+ }
+ break;
}
case 1:
{
for ( int i = 0; i < myShells.count(); i++ )
objlist[i] = myShells[i].copy();
- anObj = anOper->MakeSolidFromConnectedFaces( objlist.in(), GroupFaces->CheckButton1->isChecked() );
+ anObj = anOper->MakeSolidFromConnectedFaces( objlist.in(), GroupFaces->CheckButton1->isChecked() );
+ if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() );
- if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() );
break;
}
}
typedef std::list<CurveCreator_PosPoint*> PosPointsList;
//! Map of sections with positioned points
typedef std::map<int,PosPointsList> SectionsMap;
-};
+}
#endif
// purpose:
//=======================================================================
CurveCreator_Curve::CurveCreator_Curve( const CurveCreator::Dimension theDimension )
-: myIsLocked (false),
+: mySkipSorting (false),
+ myIsLocked (false),
myDimension (theDimension),
myDisplayer (NULL),
- myAISShape (NULL),
- myNbUndos (0),
- myNbRedos (0),
- myUndoDepth (-1),
- myOpLevel(0),
- mySkipSorting(false),
myPointAspectColor (Quantity_NOC_ROYALBLUE4),
myCurveColor (Quantity_NOC_RED),
- myEraseAll(true),
- myLineWidth(1)
+ myLineWidth (1),
+ myNbUndos (0),
+ myNbRedos (0),
+ myUndoDepth (-1),
+ myOpLevel (0),
+ myAISShape (NULL),
+ myEraseAll (true)
{
}
sprintf( aBuffer, "Section_%d", i+1 );
std::string aName(aBuffer);
int j;
- for( j = 0 ; j < mySections.size() ; j++ ){
+ for( j = 0 ; j < (int)mySections.size() ; j++ ){
aSection = (CurveCreator_Section*)getSection( j );
if ( aSection && aSection->myName == aName )
break;
}
- if( j == mySections.size() )
+ if( j == (int)mySections.size() )
return aName;
}
return "";
anIterPosition = aSection->myPoints.end();
else
anIterPosition = aSection->myPoints.begin() + toICoord(anIPnt);
- CurveCreator::Coordinates::const_iterator aFirstPosition =
- aCoords.begin();
+ /*CurveCreator::Coordinates::const_iterator aFirstPosition =
+ aCoords.begin();*/
aSection->myPoints.insert(anIterPosition,
aCoords.begin(), aCoords.end());
}
aPoints.push_back( aPosPoint );
aSectionsMap[theISection] = aPoints;
- int aSize1 = getNbPoints( theISection );
+ /*int aSize1 = */getNbPoints( theISection ); // todo: unused variable
res = setPointInternal( aSectionsMap );
- int aSize2 = getNbPoints( theISection );
+ /*int aSize2 = */getNbPoints( theISection ); // todo: unused variable
finishOperation();
//! A virtual method.
const CurveCreator_ISection* getSection(const int theSectionIndex) const
{
- if (theSectionIndex >= 0 && theSectionIndex < mySections.size())
+ if (theSectionIndex >= 0 && theSectionIndex < (int)mySections.size())
{
return (CurveCreator_ISection*)mySections[theSectionIndex];
}
setNbUndos(1);
isOK = myPUndo[0].init(CurveCreator_Operation::RemoveSection, -1);
break;
+ default:
+ break;
}
}
}
isOK = myPUndo[0].init(CurveCreator_Operation::RenameSection,
theCurve->getSectionName(theIntParam1), theIntParam1);
break;
+ default:
+ break;
}
}
if( !isOK ){
CurveCreator_Displayer::~CurveCreator_Displayer(void)
{
eraseAll( true );
- for( int i = 0 ; i < myObjects.size() ; i++ ){
+ for( int i = 0 ; i < (int)myObjects.size() ; i++ ){
myObjects[i].Nullify();
}
myObjects.clear();
{
if(myObjects.empty())
return;
- for( int i = 0 ; i < myObjects.size() ; i++ )
+ for( int i = 0 ; i < (int)myObjects.size() ; i++ )
myContext->Erase(myObjects[i], Standard_False);
myObjects.clear();
if( isUpdate )
void CurveCreator_Displayer::Update()
{
- for( int i = 0 ; i < myObjects.size() ; i++ )
+ for( int i = 0 ; i < (int)myObjects.size() ; i++ )
myContext->Update(myObjects[i], Standard_True);
myContext->UpdateCurrentViewer();
}
Dim3d = 3
};
-};
+}
//! The type represents the interface to the curve section.
struct CURVECREATOR_EXPORT CurveCreator_ISection
case CurveCreator_Operation::SetCoordinates:
theCurve->setPointInternal( aSectionsMap );
break;
+ default:
+ break;
}
}
break;
void CurveCreator_TableView::OnHeaderClick( int theLogicalId )
{
if( theLogicalId == myCurrentSortId )
+ {
if( myCurrentSortOrder == Qt::AscendingOrder )
myCurrentSortOrder = Qt::DescendingOrder;
else
myCurrentSortOrder = Qt::AscendingOrder;
+ }
sortByColumn( theLogicalId, myCurrentSortOrder );
int CurveCreator_TreeViewModel::columnCount(const QModelIndex & parent ) const
{
- if( parent.internalId() == ID_SECTION )
+ if( parent.internalId() == (quintptr)ID_SECTION )
return 2;
else
return 2;
int aRow = index.row();
int aColumn = index.column();
if( myCurve ){
- if( index.internalId() == ID_SECTION ){
+ if( index.internalId() == (quintptr)ID_SECTION ){
if( role == Qt::DisplayRole ){
if( aColumn == 0 )
return QString::fromStdString(myCurve->getSectionName(aRow));
if( !theIndex.isValid() )
return QModelIndex();
- if( theIndex.internalId() == ID_SECTION ){
+ if( theIndex.internalId() == (quintptr)ID_SECTION ){
return QModelIndex();
}
return createIndex( theIndex.internalId(), 0, ID_SECTION );
aRowCnt = myCurve->getNbSections();
}
else{
- if( parent.internalId() == ID_SECTION ){
+ if( parent.internalId() == (quintptr)ID_SECTION ){
//Points level
aRowCnt = myCurve->getNbPoints(parent.row());
}
bool CurveCreator_TreeViewModel::isSection( const QModelIndex& theIndx ) const
{
- if( theIndx.internalId() == ID_SECTION )
+ if( theIndx.internalId() == (quintptr)ID_SECTION )
return true;
return false;
}
int CurveCreator_TreeViewModel::getSection( const QModelIndex& theIndx ) const
{
- if( theIndx.internalId() == ID_SECTION )
+ if( theIndx.internalId() == (quintptr)ID_SECTION )
return theIndx.row();
return theIndx.internalId();
}
int CurveCreator_TreeViewModel::getPoint( const QModelIndex& theIndx ) const
{
- if( theIndx.internalId() == ID_SECTION )
+ if( theIndx.internalId() == (quintptr)ID_SECTION )
return -1;
return theIndx.row();
}
}
}
-void CurveCreator_TreeView::setIndexState( const QModelIndex& theIndx, bool& isExpanded, bool& isSelected, bool& isCurrent )
+void CurveCreator_TreeView::setIndexState( const QModelIndex& theIndx, bool& isExpanded, bool& isSelected, bool& /*isCurrent*/ ) // todo: isCurrent is not set!
{
setExpanded( theIndx, isExpanded );
QItemSelectionModel::SelectionFlags aFlag = QItemSelectionModel::Select;
Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
const NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>& selected = aSelection->Entities();
- CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
- aLast = thePoints.end();
- bool isFound = false;
+ /*CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
+ aLast = thePoints.end();*/
+ //bool isFound = false;
for( int i=0; i<aSize; i++ )
{
for ( NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator selIter( selected );
Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity );
gp_Pnt anOwnerPnt = aSenPnt->Point();
- Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast( aSenPnt->OwnerId() );
+ Handle(SelectMgr_EntityOwner) anOwner = aSenPnt->OwnerId();
bool isIntersect = fabs( aPntsToSelect[i].X() - anOwnerPnt.X() ) < LOCAL_SELECTION_TOLERANCE &&
fabs( aPntsToSelect[i].Y() - anOwnerPnt.Y() ) < LOCAL_SELECTION_TOLERANCE;
return;
if ( theOpen ) {
- theContext->ClearCurrents( false );
+ theContext->ClearCurrents( false ); // todo: deprecated OCCT API
// load the curve AIS object to the local context with the point selection
Handle(AIS_InteractiveObject) anAIS = theCurve->getAISObject();
if ( !anAIS.IsNull() )
{
if ( anAIS->IsKind( STANDARD_TYPE( AIS_Shape ) ) )
{
- theContext->Load( anAIS, -1/*selection mode*/, true/*allow decomposition*/ );
+ theContext->Load( anAIS, -1/*selection mode*/);
theContext->Activate( anAIS, AIS_Shape::SelectionMode( (TopAbs_ShapeEnum)TopAbs_VERTEX ) );
}
}
CurveCreator_ICurve *theCurve,
const int theActionFlags,
const QStringList& theCoordTitles,
- Qt::WindowFlags fl )
-: QWidget(parent), myNewSectionEditor(NULL), myCurve(theCurve), mySection(0),
+ Qt::WindowFlags /*fl*/ )
+: QWidget(parent), myCurve(theCurve), myNewSectionEditor(NULL),
+ myOCCViewer( 0 ), mySection(0),
myDragStarted( false ), myDragInteractionStyle( SUIT_ViewModel::STANDARD ),
- myOCCViewer( 0 ),
myOld2DMode(OCCViewer_ViewWindow::No2dMode)
{
bool isToEnableClosed = !( theActionFlags & DisableClosedSection );
break;
}*/
+ default:
+ break;
}
/*int aSelObjsCnt = aSelPoints.size() + aSelSections.size();
myLocalPointView->setVisible( checked );
}
-void CurveCreator_Widget::onDetectionMode(bool checked)
+void CurveCreator_Widget::onDetectionMode(bool /*checked*/)
{
}
else if (myActionMap[MODIFICATION_MODE_ID]->isChecked())
myActionMap[MODIFICATION_MODE_ID]->trigger();
break;
+ default:
+ break;
}
}
updateActionsStates();
bool isClosed = myNewSectionEditor->isClosed();
CurveCreator::SectionType aSectType = myNewSectionEditor->getSectionType();
if( myCurve->getSectionName(mySection) != aName.toStdString() )
- myCurve->setSectionName( mySection , aName.toStdString() );
+ myCurve->setSectionName( mySection, aName.toStdString() );
- bool isGeomModified = false;
+ //bool isGeomModified = false;
if( myCurve->getSectionType(mySection) != aSectType ) {
myCurve->setSectionType( mySection, aSectType );
- isGeomModified = true;
+ //isGeomModified = true;
}
if( myCurve->isClosed(mySection) != isClosed ) {
myCurve->setClosed( mySection, isClosed );
- isGeomModified = true;
+ //isGeomModified = true;
}
mySectionView->sectionChanged(mySection);
updateUndoRedo();
for( int i = 0, aNb = myCurve->getNbSections(); i < aNb ; i++ ){
aSectionsToJoin.push_back( i );
}
- bool aRes = myCurve->join( aSectionsToJoin );
+ /*bool aRes = */myCurve->join( aSectionsToJoin );
mySectionView->reset();
updateActionsStates();
return;
if (!aHasShift)
- aCtx->ClearCurrents( false );
+ aCtx->ClearCurrents( false ); // todo: deprecated OCCT API
Handle(V3d_View) aView3d = aView->getViewPort()->getView();
if ( !aView3d.IsNull() )
}
if ( myDragStarted ) {
- bool isDragged = myDragged;
CurveCreator_ICurve::SectionToPointList aDraggedPoints;
QMap<CurveCreator_ICurve::SectionToPoint, CurveCreator::Coordinates > anInitialDragPointsCoords;
if ( myDragged ) {
* Set zero viewer by the last view closed in
* \param theManager a viewer manager
*/
-void CurveCreator_Widget::onLastViewClosed( SUIT_ViewManager* theManager )
+void CurveCreator_Widget::onLastViewClosed( SUIT_ViewManager* /*theManager*/ )
{
myOCCViewer = 0;
}
onMouseMove( 0, theEvent );
}
-void CurveCreator_Widget::onCellChanged( int theRow, int theColumn )
+void CurveCreator_Widget::onCellChanged( int theRow, int /*theColumn*/ )
{
int aCurrSect = myLocalPointView->getSectionId( theRow );
int aPntIndex = myLocalPointView->getPointId( theRow );
return;
CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints );
- int aNbPoints = myLocalPoints.size();
+ //int aNbPoints = myLocalPoints.size();
//bool isRowLimit = aNbPoints > myLocalPointRowLimit;
myLocalPointView->setVisible( getActionMode() == ModificationMode/* && !isRowLimit */);
DependencyTree_Arrow::DependencyTree_Arrow( DependencyTree_Object* theStartItem,
DependencyTree_Object* theEndItem,
- QGraphicsItem* parent, QGraphicsScene* scene )
+ QGraphicsItem* parent, QGraphicsScene* /*scene*/ )
:QGraphicsLineItem( parent ),
-myIsBiLink( false ),
myStartItem( theStartItem ),
-myEndItem( theEndItem )
+myEndItem( theEndItem ),
+myIsBiLink( false )
{
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
// function : DisplayGUI::OnGUIEvent()
// purpose : Dispatch menu command
//=======================================================================
-bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/)
{
SalomeApp_Application* app = getGeometryGUI()->getApp();
if (!app) return false;
namespace DlgRef
{
DLGREF_EXPORT QString PrintDoubleValue( double, int = 16 );
-};
+}
#endif // GEOM_DLGREF_H
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<property name="spacing">
<number>6</number>
</property>
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<tabstops>
<tabstop>PushButton1</tabstop>
<tabstop>LineEdit1</tabstop>
+ <tabstop>ComboBox1</tabstop>
<tabstop>CheckButton1</tabstop>
- <tabstop>ListView1</tabstop>
<tabstop>PushButton2</tabstop>
<tabstop>PushButton3</tabstop>
<tabstop>PushButton4</tabstop>
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<property name="spacing">
<number>6</number>
</property>
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<property name="spacing">
<number>6</number>
</property>
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<property name="title" >
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout" >
+ <layout class="QGridLayout" name="gridLayout1" >
<item row="3" column="0" colspan="4" >
<layout class="QHBoxLayout" name="horizontalLayout" >
<item>
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<property name="spacing">
<number>6</number>
</property>
<property name="title" >
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout" >
+ <layout class="QGridLayout" name="gridLayout1" >
<item row="0" column="0" >
<widget class="QLabel" name="TextLabel1" >
<property name="sizePolicy" >
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
// function : 0nMousePress()
// purpose : [static] manage mouse events
//=================================================================================
-bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
+bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* theViewWindow )
{
QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
// function : 0nMouseRelease()
// purpose : [static] manage mouse events
//=================================================================================
-bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
+bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* theViewWindow )
{
((OCCViewer_ViewWindow*)theViewWindow)->setSketcherStyle(false);
#ifdef WITH_OPENCV
// function : 0nMouseMove()
// purpose : [static] manage mouse events
//=================================================================================
-bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
+bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* theViewWindow )
{
QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
}
ic->UpdateCurrentViewer();
}
- catch( Standard_Failure ) {
+ catch( Standard_Failure& ) {
MESSAGE( "Exception caught in EntityGUI::DisplaySimulationShape" );
}
}
<property name="title">\r
<string>Values</string>\r
</property>\r
- <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,1,0">\r
+ <layout class="QGridLayout" name="gridLayout1" columnstretch="0,0,1,0">\r
<item row="0" column="0">\r
<widget class="QLabel" name="TextLabel1">\r
<property name="sizePolicy">\r
<property name="title">\r
<string>Values</string>\r
</property>\r
- <layout class="QGridLayout" name="gridLayout">\r
+ <layout class="QGridLayout" name="gridLayout1">\r
<item row="0" column="0">\r
<widget class="QLabel" name="TextLabel1">\r
<property name="sizePolicy">\r
<property name="title">
<string>Values</string>
</property>
- <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,1,0">
+ <layout class="QGridLayout" name="gridLayout1" columnstretch="0,0,1,0">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode);
- void ComputeSelection ( const Handle(SelectMgr_Selection)& aSelection,
- const Standard_Integer aMode){} ;
+ void ComputeSelection ( const Handle(SelectMgr_Selection)& /*aSelection*/,
+ const Standard_Integer /*aMode*/){} ;
protected:
TCollection_ExtendedString aText;
aColor = color;
aFontAspect = fontAspect;
aFont = font;
-};
+}
-void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
const Handle(Prs3d_Presentation)& aPresentation,
- const Standard_Integer aMode)
+ const Standard_Integer /*aMode*/)
{
aPresentation->Clear();
asp->Aspect()->SetTextZoomable(aZoomable);
asp->Aspect()->SetTextAngle(aAngle);
asp->Aspect()->SetTextFontAspect(aFontAspect);
- Prs3d_Text::Draw(aPresentation, asp, aText, aPosition);
-};
+ Prs3d_Text::Draw(aPresentation, asp, aText, aPosition); // todo: deprecated OCCT API
+}
bool isSame (double d1, double d2)
{
bool modal, Qt::WindowFlags fl,
const double lineWidth)
: GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+ myLengthIORedoList(),
myMode(-1),
myOK(false),
myLineWidth(lineWidth),
myGeometryGUI(theGeometryGUI),
- myLengthIORedoList(),
myIsUndoRedo(false)
{
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void EntityGUI_3DSketcherDlg::ValueChangedInSpinBox (double newValue)
+void EntityGUI_3DSketcherDlg::ValueChangedInSpinBox (double /*newValue*/)
{
GEOMBase_Helper::displayPreview(true, false, true, true, myLineWidth);
}
// function : ButtonClicked()
// purpose :
//=================================================================================
-void EntityGUI_3DSketcherDlg::ButtonClicked (bool checked)
+void EntityGUI_3DSketcherDlg::ButtonClicked (bool /*checked*/)
{
if (GroupAngles->radioButton_1->isChecked())
myOrientation = OXY;
const bool activate,
const bool update,
const double lineWidth,
- const int displayMode,
- const int color)
+ const int /*displayMode*/,
+ const int /*color*/)
{
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
<property name="title">
<string>Values</string>
</property>
- <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,0">
+ <layout class="QGridLayout" name="gridLayout1" columnstretch="0,1,0">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<property name="title">
<string>Values</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout1">
<item row="0" column="0">
<widget class="QCheckBox" name="CheckBox2">
<property name="text">
{
// TODO supprimer les lignes qui ne servent à rien le cas échéant
- SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow();
- SOCC_Viewer* soccViewer = (SOCC_Viewer*)(theViewWindow->getViewManager()->getViewModel());
+ //SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow();
+ //SOCC_Viewer* soccViewer = (SOCC_Viewer*)(theViewWindow->getViewManager()->getViewModel());
if (!myEditCurrentArgument->isEnabled())
return;
aCornersParameters->qualityLevel = (dynamic_cast<QDoubleSpinBox*>(myWidgets[QUALITY_LEVEL]))->value();
aCornersParameters->minDistance = (dynamic_cast<QDoubleSpinBox*>(myWidgets[MIN_DISTANCE]))->value();
switch ( (dynamic_cast<QComboBox*>(myWidgets[TYPE_CRITERIA]))->currentIndex() ) {
- case 0: aCornersParameters->typeCriteria = CV_TERMCRIT_ITER;
- case 1: aCornersParameters->typeCriteria = CV_TERMCRIT_EPS;
- case 2: aCornersParameters->typeCriteria = CV_TERMCRIT_ITER | CV_TERMCRIT_EPS;
+ case 0: aCornersParameters->typeCriteria = CV_TERMCRIT_ITER; break;
+ case 1: aCornersParameters->typeCriteria = CV_TERMCRIT_EPS; break;
+ case 2: aCornersParameters->typeCriteria = CV_TERMCRIT_ITER | CV_TERMCRIT_EPS; break;
+ default: break;
}
aCornersParameters->maxIter = (dynamic_cast<QSpinBox*>(myWidgets[MAX_ITER]))->value();
aCornersParameters->epsilon = (dynamic_cast<QDoubleSpinBox*>(myWidgets[EPSILON]))->value();
QList<QWidget*> myWidgets;
// Output typeselection widget
- DlgRef_3Radio* myOutputGroup;;
+ DlgRef_3Radio* myOutputGroup;
gp_Pnt myStartPnt;
gp_Pnt myEndPnt;
void EntityGUI_FieldDlg::Delegate::updateEditorGeometry( QWidget* editor,
const QStyleOptionViewItem& option,
- const QModelIndex& index ) const
+ const QModelIndex& /*index*/ ) const
{
editor->setGeometry( option.rect );
}
if ( !bs->_is_nil() )
{
GEOM::short_array_var vals = bs->GetValues();
- if ( vals->length() == nbRows * nbComps )
+ if ( (int)vals->length() == nbRows * nbComps )
for ( int iV = 0, iR = 0; iR < nbRows; ++iR )
for ( int iC = 1; iC < nbColumns; ++iC )
setItem( iR, iC, new CheckItem( vals[ iV++ ]));
if ( !is->_is_nil() )
{
GEOM::ListOfLong_var vals = is->GetValues();
- if ( vals->length() == nbRows * nbComps )
+ if ( (int)vals->length() == nbRows * nbComps )
for ( int iV = 0, iR = 0; iR < nbRows; ++iR )
for ( int iC = 1; iC < nbColumns; ++iC )
setItem( iR, iC, new IntSpinItem( vals[ iV++ ]));
if ( !ds->_is_nil() )
{
GEOM::ListOfDouble_var vals = ds->GetValues();
- if ( vals->length() == nbRows * nbComps )
+ if ( (int)vals->length() == nbRows * nbComps )
for ( int iV = 0, iR = 0; iR < nbRows; ++iR )
for ( int iC = 1; iC < nbColumns; ++iC )
setItem( iR, iC, new DoubleSpinItem( vals[ iV++ ]));
if ( !ss->_is_nil() )
{
GEOM::string_array_var vals = ss->GetValues();
- if ( vals->length() == nbRows * nbComps )
+ if ( (int)vals->length() == nbRows * nbComps )
for ( int iV = 0, iR = 0; iR < nbRows; ++iR )
for ( int iC = 1; iC < nbColumns; ++iC )
setItem( iR, iC, new QTableWidgetItem( vals[ iV++ ].in() ));
// function : enterEvent()
// purpose :
//=================================================================================
-void EntityGUI_FieldDlg::enterEvent(QEvent* e)
+void EntityGUI_FieldDlg::enterEvent(QEvent*)
{
if (!buttonCancel()->isEnabled())
ActivateThisDialog();
if ( !myIsCreation && !myField->_is_nil() )
{
GEOM::string_array_var compNames = myField->GetComponents();
- for ( int iC = 0; iC < compNames->length(); ++iC )
+ for ( int iC = 0; iC < (int)compNames->length(); ++iC )
headers << compNames[ iC ].in();
}
else
//=================================================================================
void EntityGUI_FieldDlg::activateSelection()
{
- bool isApply = ((QPushButton*)sender() == buttonApply());
+ //bool isApply = ((QPushButton*)sender() == buttonApply());
if(!isApplyAndClose())
erasePreview(false);
// function : isValid
// purpose :
//=================================================================================
-bool EntityGUI_IsolineDlg::isValid (QString& msg)
+bool EntityGUI_IsolineDlg::isValid (QString& /*msg*/)
{
return myFace;
}
// function : ValueChangedInSpinBox
// purpose :
//=================================================================================
-void EntityGUI_IsolineDlg::ValueChangedInSpinBox(double newValue)
+void EntityGUI_IsolineDlg::ValueChangedInSpinBox(double /*newValue*/)
{
displayPreview(true);
}
myPlnComboBox (0),
myPlnButton (0),
myPlnSelButton (0),
- myWPlaneLineEdit (0),
myPolylineSelButton (0),
+ myWPlaneLineEdit (0),
myPolylineEdit (0),
myEditCurrentArgument (0),
myPreviewManager(0),
// function : isValid
// purpose :
//=================================================================================
-bool EntityGUI_PolylineDlg::isValid( QString& msg )
+bool EntityGUI_PolylineDlg::isValid( QString& /*msg*/ )
{
return true;
}
// function : SetEditCurrentArgument()
// purpose :
//=================================================================================
-void EntityGUI_PolylineDlg::SetEditCurrentArgument( bool isChecked )
+void EntityGUI_PolylineDlg::SetEditCurrentArgument( bool /*isChecked*/ )
{
if (sender() == myPlnSelButton)
{
bool modal, Qt::WindowFlags fl,
const double lineWidth )
: QDialog( parent, fl ),
+ GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
myIsAllAdded( false ),
myIsApply( false ),
- GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
myGeometryGUI( GUI ),
myLineWidth( lineWidth )
{
LastDecimal = aPrecision;
else // 'g' format in the QString
LastDecimal = qAbs( aPrecision ) - ceil( log10(minRad) );
- minRad = ceil(pow(10,LastDecimal) * minRad) / pow(10,LastDecimal); // Rounded up at the last allowed decimal place
+ minRad = ceil(pow(10,LastDecimal) * minRad) / pow(10,LastDecimal); // Rounded up at the last allowed decimal place
if ( Abs(vz) < minRad){
if (vz < 0.0)
Group3Spin->SpinBox_DZ->setValue( - minRad );
const bool activate,
const bool update,
const double lineWidth,
- const int displayMode,
- const int color )
+ const int /*displayMode*/,
+ const int /*color*/ )
{
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
TopTools_IndexedMapOfShape aSubShapesMap;
TopExp::MapShapes(myShape, aSubShapesMap);
- SALOME_View* view = GEOM_Displayer::GetActiveView();
+ //SALOME_View* view = GEOM_Displayer::GetActiveView();
getDisplayer()->Erase(myObject, false, false);
CORBA::String_var aMainEntry = myObject->GetStudyEntry();
QString anEntryBase = aMainEntry.in();
// function : isValid
// purpose :
//=================================================================================
-bool EntityGUI_SurfFromFaceDlg::isValid (QString& msg)
+bool EntityGUI_SurfFromFaceDlg::isValid (QString& /*msg*/)
{
return myFace;
}
#include <TDataStd_Name.hxx>
#include <TDocStd_Owner.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver);
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
//================================================================================
/*!
DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
};
-DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);
+DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver)
#endif
return _label.FindChild(FREE_LABEL);
}
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient )
class GEOM_BaseObject;
class GEOM_Engine;
-DEFINE_STANDARD_HANDLE( GEOM_BaseObject, Standard_Transient );
+DEFINE_STANDARD_HANDLE( GEOM_BaseObject, Standard_Transient )
class GEOM_BaseObject : public Standard_Transient
{
TCollection_AsciiString& theScript,
TCollection_AsciiString& theAfterScript,
const TVariablesList& theVariables,
- const bool theIsPublished,
+ const bool /*theIsPublished*/,
TDF_LabelMap& theProcessed,
std::set<TCollection_AsciiString>& theIgnoreObjs,
bool& theIsDumpCollected);
//=============================================================================
void ReplaceEntriesByNames (TCollection_AsciiString& theScript,
TSting2ObjDataMap& aEntry2ObjData,
- const bool theIsPublished,
+ const bool /*theIsPublished*/,
TColStd_SequenceOfAsciiString& theObjListToPublish,
Standard_Integer& objectCounter,
Resource_DataMapOfAsciiStringAsciiString& aNameToEntry)
return TDataStd_ExtStringArray::GetID();
}
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject );
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject )
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject )
class GEOM_Field;
class GEOM_FieldStep;
-DEFINE_STANDARD_HANDLE( GEOM_Field, GEOM_BaseObject );
-DEFINE_STANDARD_HANDLE( GEOM_FieldStep, GEOM_BaseObject );
+DEFINE_STANDARD_HANDLE( GEOM_Field, GEOM_BaseObject )
+DEFINE_STANDARD_HANDLE( GEOM_FieldStep, GEOM_BaseObject )
class GEOM_Field : public GEOM_BaseObject
{
return reinterpret_cast<void*> ( address );
}
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient )
#include <TopoDS_Shape.hxx>
class GEOM_Function;
-DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient);
+DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient)
class GEOM_Function : public Standard_Transient
{
return funs;
}
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject )
class TFunction_Driver;
class GEOM_Engine;
-DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject );
+DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject )
class GEOM_Object : public GEOM_BaseObject
{
* Update
*/
//=============================================================================
-bool GEOM_Solver::Update(TDF_LabelSequence& theSeq)
+bool GEOM_Solver::Update(TDF_LabelSequence& /*theSeq*/)
{
return false;
}
* UpdateObject
*/
//=============================================================================
-bool GEOM_Solver::UpdateObject(Handle(GEOM_Object) theObject, TDF_LabelSequence& theSeq)
+bool GEOM_Solver::UpdateObject(Handle(GEOM_Object) /*theObject*/, TDF_LabelSequence& /*theSeq*/)
{
return false;
}
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver )
class GEOM_SubShapeDriver : public GEOM_BaseDriver {
//
#include <GEOMAlgo_Clsf.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo)
//=======================================================================
//function :
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
-DEFINE_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
+DEFINE_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo)
//=======================================================================
//class : GEOMAlgo_Clsf
#include <Geom_Plane.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf)
//=======================================================================
//function :
#include <GEOMAlgo_SurfaceTools.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf)
//=======================================================================
//function :
//
Standard_Boolean bIsConformState, bIsToBreak;
Standard_Integer i, aNb, iCnt, iErr;
- TopAbs_State aSt;
+ TopAbs_State aSt = TopAbs_UNKNOWN; // todo: aSt must be explicitly initilized to avoid warning (see below)
TopTools_IndexedMapOfShape aM;
TopExp_Explorer aExp;
GEOMAlgo_ListIteratorOfListOfPnt aIt;
}
//
if (BRep_Tool::Degenerated(aE)) {
- myMSS.Add(aE, aSt);
+ myMSS.Add(aE, aSt); // todo: aSt must be explicitly initilized to avoid warning (see above)
continue;
}
//
return du ^ dv;
- } catch (Standard_Failure ) {
+ } catch (Standard_Failure&) {
}
return defaultNorm;
}
//
#include <GEOMAlgo_HAlgo.hxx>
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient)
//=======================================================================
// function:
#include <Standard_Integer.hxx>
#include <Standard_Transient.hxx>
-DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, Standard_Transient);
+DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, Standard_Transient)
//=======================================================================
//class : GEOMAlgo_HAlgo
}//for (i=iBeg; i<=iEnd; ++i) {
}// try
- catch (Standard_Failure) {
+ catch (Standard_Failure&) {
myErrorStatus=12;
}
}
myRank=2;
BuildResult();
}
- catch (Standard_Failure) {
+ catch (Standard_Failure&) {
myErrorStatus=12;
}
}
BuildResult();
}
//
- catch (Standard_Failure) {
+ catch (Standard_Failure&) {
myErrorStatus = 12;
}
}
BuildResult();
}
//
- catch (Standard_Failure) {
+ catch (Standard_Failure&) {
myErrorStatus= 12;
}
}
if ( it.Value()->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) ) {
Handle(GEOM_AISShape) sh = Handle(GEOM_AISShape)::DownCast( it.Value() );
if ( !sh.IsNull() && sh->hasIO() ) {
- Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject)::DownCast( sh->getIO() );
+ Handle(SALOME_InteractiveObject) IO = sh->getIO();
if ( !IO.IsNull() && IO->hasEntry() && obj->GetID() == IO->getEntry() )
shape = sh;
}
if ( a->IsA( "GEOM_Actor" ) ) {
GEOM_Actor* ga = GEOM_Actor::SafeDownCast( a );
if ( ga && ga->hasIO() ) {
- Handle(SALOME_InteractiveObject) IO = Handle(SALOME_InteractiveObject)::DownCast( ga->getIO() );
+ Handle(SALOME_InteractiveObject) IO = ga->getIO();
if ( !IO.IsNull() && IO->hasEntry() && obj->GetID() == IO->getEntry() )
actor = ga;
}
// purpose :
//=======================================================================
Handle(AIS_InteractiveObject) GEOMBase::GetAIS( const Handle(SALOME_InteractiveObject)& IO,
- bool onlyInActiveView, bool onlyGeom )
+ bool onlyInActiveView, bool /*onlyGeom*/ )
{
Handle(AIS_InteractiveObject) aisObject;
}
}
}
- catch ( Standard_Failure ) {
+ catch ( Standard_Failure& ) {
// OCC failures are hard to catch in GUI.
// This is because of the position for #include <Standard_ErrorHandler.hxx> that is very critical to find
// in SALOME environment : compilation error !
// It should perform the required operation and put all new or modified objects into
// <objects> argument.Should return <false> if some error occurs during its execution.
//================================================================
-bool GEOMBase_Helper::execute( ObjectList& objects )
+bool GEOMBase_Helper::execute( ObjectList& )
{
return false;
}
// for <theObj> or a nil reference if <theObj> should be published
// as a top-level object.
//================================================================
-GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr theObj )
+GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr )
{
return GEOM::GEOM_Object::_nil();
}
// Function : getObjectName
// Purpose : Redefine this method to return proper name for the given object
//================================================================
-QString GEOMBase_Helper::getObjectName(GEOM::GEOM_Object_ptr object) const
+QString GEOMBase_Helper::getObjectName( GEOM::GEOM_Object_ptr ) const
{
return QString();
}
// Function : getNewObjectName
// Purpose : Redefine this method to return proper name for a new object
//================================================================
-QString GEOMBase_Helper::getNewObjectName (int) const
+QString GEOMBase_Helper::getNewObjectName( int ) const
{
return QString();
}
QString( ":" ) + QString( "ShapeType=" ) + QString::number( theShapeType ) +
QString( " }" );
}
-};
+}
//=================================================================================
// function : FindAttributes
: myObj( theObject ),
myParameterMap( theParameter ) {}
- GEOMGUI_AnnotationAttrs( const GEOMGUI_AnnotationAttrs& theOther ) {}
-
- void operator=( const GEOMGUI_AnnotationAttrs& theOther ) {}
+ GEOMGUI_AnnotationAttrs( const GEOMGUI_AnnotationAttrs& ); // private copy constructor, must be never called
+ void operator=( const GEOMGUI_AnnotationAttrs& ); // private assignment operator, must be never called
private:
*/
class GEOMGUI_EXPORT GEOMGUI_AnnotationMgr : public QObject
{
- Q_OBJECT;
+ Q_OBJECT
public:
GEOMGUI_AnnotationMgr( SalomeApp_Application* theApplication );
try
{
- if ( &info && info.length() > 0 )
+ if ( info.length() > 0 )
{
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
for ( int j = 0, nb = info.length(); j < nb; ++j )
*/
class GEOMGUI_EXPORT GEOMGUI_CreationInfoWdg : public QWidget
{
- Q_OBJECT;
+ Q_OBJECT
public:
GEOMGUI_CreationInfoWdg( SalomeApp_Application* app );
PATTERN_XYZ.arg( "Point1" ) + ":" +
PATTERN_XYZ.arg( "Point2" ) + ":" +
PATTERN_XYZ.arg( "Point3" );
-};
+}
//=================================================================================
// function : Length::Init
VectorOfRecords myRecords;
};
-Q_DECLARE_METATYPE(GEOMGUI_DimensionProperty);
+Q_DECLARE_METATYPE(GEOMGUI_DimensionProperty)
#endif
for (ic->InitSelected(); ic->MoreSelected(); ic->NextSelected())
{
- Handle(AIS_InteractiveObject) io = Handle(AIS_InteractiveObject)::DownCast( ic->SelectedInteractive() );
+ Handle(AIS_InteractiveObject) io = ic->SelectedInteractive();
QString entryStr = entry(io);
int index = -1;
if (!entryStr.isEmpty())
{
Handle(SALOME_InteractiveObject) anIO = Handle(SALOME_InteractiveObject)::DownCast(io->GetOwner());
- LightApp_DataOwner* owner;
+ LightApp_DataOwner* owner = 0;
if (index > -1) // Local Selection
owner = new LightApp_DataSubOwner (entryStr, index);
else if ( !anIO.IsNull() ) // Global Selection
owner = new LightApp_DataOwner( anIO );
-
- aList.append(SUIT_DataOwnerPtr(owner));
+ if ( owner )
+ aList.append(SUIT_DataOwnerPtr(owner));
}
}
if ( entity.IsNull() )
continue;
- Handle(SelectMgr_EntityOwner) owner =
- Handle(SelectMgr_EntityOwner)::DownCast(entity->OwnerId());
+ Handle(SelectMgr_EntityOwner) owner = entity->OwnerId();
if ( !owner.IsNull() )
theMap.Add( owner );
}
for (; i <= n; i++)
{
Handle(SelectMgr_EntityOwner) owner = ownersmap( i );
- if ( owner->State() )
+ if ( owner->IsSelected() )
continue;
if ( owner->ComesFromDecomposition() )
//=================================================================================
QSharedPointer<GEOMGUI_TextTreeWdg::VisualProperty>
GEOMGUI_TextTreeWdg::getVisualProperty( const BranchType& theBranchType,
- SalomeApp_Study* theStudy,
+ SalomeApp_Study* /*theStudy*/,
const std::string& theEntry )
{
switch ( theBranchType )
//================================================================
SUIT_SelectionFilter* GEOM_Displayer::getComplexFilter( const QList<int>* aSubShapes)
{
- GEOM_CompoundFilter* aFilter;
+ GEOM_CompoundFilter* aFilter = 0;
if(aSubShapes != NULL ) {
aFilter = new GEOM_CompoundFilter(getStudy());
QList<SUIT_SelectionFilter*> aListOfFilters;
for ( ; anIter.More(); anIter.Next() )
{
- SUIT_SelectionFilter* aFilter;
+ SUIT_SelectionFilter* aFilter = 0;
int aMode = anIter.Key();
if ( aMode == GEOM_COMPOUNDFILTER )
aFilter = getComplexFilter( theSubShapes );
//=================================================================================
class GEOMGUI_EXPORT GeometryGUI : public SalomeApp_Module
{
- Q_OBJECT;
+ Q_OBJECT
public:
// Constructor
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_3DSketcherDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_3DSketcherDriver, GEOM_BaseDriver )
class GEOMImpl_3DSketcherDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_ArcDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ArcDriver, GEOM_BaseDriver )
class GEOMImpl_ArcDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_ArchimedeDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ArchimedeDriver, GEOM_BaseDriver )
class GEOMImpl_ArchimedeDriver : public GEOM_BaseDriver {
#include <TCollection_AsciiString.hxx>
#include <gp_Trsf.hxx>
- // Class GEOMImpl_Block6Explorer gives easy and fast access to a certain sub-elements of hexahedral solid
- // Each face can be accessed by its global ID [1-6]
- // Each edge can be accessed by its global ID [1-12] or by its local NB [1-4] inside certain face
- // Each vertex can be accessed by its global ID [1-8] or by its local NB [1-4] inside certain face
- // Numeration of the sub-shapes is defined in constructors, see they comments
- //
- // face 2 face 4 | 4 face 2 face |
- // | / | \ | |
- // \|/ |/_ | _\| \|/ |
- // ' ' | ' ' |
- // 8_______7__7 | 7__7_______8 |
- // /| /| | |\ |\ |
- // 8 12 6 11 | 11 6 12 8 |
- // / | / | | | \ | \ |
- // 5/______5__6/ | | | \6__5______\5 |
- // face 5 ---> | | | | <--- 6 face | face 6 ---> | | | | <--- 5 face |
- // | |__3__|____| | |____|__3__| | |
- // | /4 | /3 | 3\ | 4\ | |
- // | / | / | \ | \ | |
- // 9 4 10 2 | 2 10 4 9 |
- // |/__1______|/ | \|______1__\| |
- // 1 2 | 2 1 |
- // _. . | . ._ |
- // /| /|\ | /|\ |\ |
- // / | | | \ |
- // 3 face 1 face | face 1 face 3 |
- // | |
- // Picture 1 (right orientation) | Picture 2 (left orientation) |
- // |
- // For the moment, the orientation of numbering is not controlled
-
- // Faces: 1 - bottom, 2 - top, 3 - front, 4 - back, 5 - left (right), 6 - right (left)
-
- //
- // 4_______3__3 2 ______2__3
- // / / | |
- // 4 2 1 3
- // / / | |
- // 1/______1__2/ | |
- // | |
- // | __4______|
- // face 2 face 4 1 4
- // | /
- // \|/ |/_
- // ' '
- // 3 8_______7__7 3
- // /| /| /| /|
- // 3 2 8 12 6 11 3 2
- // / | / | / | / |
- // 4/ | 5/______5__6/ | 4/ |
- // | | face 5 ---> | | | | <--- 6 face | |
- // | | | |__3__|____| | |
- // | /2 | /4 | /3 | /2
- // | / | / | / | /
- // 4 1 9 4 10 2 4 1
- // |/ |/__1______|/ |/
- // 1 1 2 1
- // _. .
- // /| /|\
- // / |
- // 2 ______2__3 3 face 1 face
- // | |
- // | | __3_______
- // | | /4 /3
- // | | / /
- // 1 3 4 2
- // | __4______| /__1______ /
- // 1 4 1 2
- //
- // Picture 3 (On periferal pictures the local
- // numeration of edges and vertices is shown)
+ /* ======================================================================================================
+ Class GEOMImpl_Block6Explorer gives easy and fast access to a certain sub-elements of hexahedral solid
+ Each face can be accessed by its global ID [1-6]
+ Each edge can be accessed by its global ID [1-12] or by its local NB [1-4] inside certain face
+ Each vertex can be accessed by its global ID [1-8] or by its local NB [1-4] inside certain face
+ Numeration of the sub-shapes is defined in constructors, see they comments
+
+ face 2 face 4 | 4 face 2 face
+ | / | \ |
+ \|/ |/_ | _\| \|/
+ ' ' | ' '
+ 8_______7__7 | 7__7_______8
+ /| /| | |\ |\
+ 8 12 6 11 | 11 6 12 8
+ / | / | | | \ | \
+ 5/______5__6/ | | | \6__5______\5
+ face 5 ---> | | | | <--- 6 face | face 6 ---> | | | | <--- 5 face
+ | |__3__|____| | |____|__3__| |
+ | /4 | /3 | 3\ | 4\ |
+ | / | / | \ | \ |
+ 9 4 10 2 | 2 10 4 9
+ |/__1______|/ | \|______1__\|
+ 1 2 | 2 1
+ _. . | . ._
+ /| /|\ | /|\ |\
+ / | | | \
+ 3 face 1 face | face 1 face 3
+ |
+ Picture 1 (right orientation) | Picture 2 (left orientation)
+
+ For the moment, the orientation of numbering is not controlled
+
+ Faces: 1 - bottom, 2 - top, 3 - front, 4 - back, 5 - left (right), 6 - right (left)
+
+
+ 4_______3__3 2 ______2__3
+ / / | |
+ 4 2 1 3
+ / / | |
+ 1/______1__2/ | |
+ | |
+ | __4______|
+ face 2 face 4 1 4
+ | /
+ \|/ |/_
+ ' '
+ 3 8_______7__7 3
+ /| /| /| /|
+ 3 2 8 12 6 11 3 2
+ / | / | / | / |
+ 4/ | 5/______5__6/ | 4/ |
+ | | face 5 ---> | | | | <--- 6 face | |
+ | | | |__3__|____| | |
+ | /2 | /4 | /3 | /2
+ | / | / | / | /
+ 4 1 9 4 10 2 4 1
+ |/ |/__1______|/ |/
+ 1 1 2 1
+ _. .
+ /| /|\
+ / |
+ 2 ______2__3 3 face 1 face
+ | |
+ | | __3_______
+ | | /4 /3
+ | | / /
+ 1 3 4 2
+ | __4______| /__1______ /
+ 1 4 1 2
+
+ Picture 3 (On periferal pictures the local
+ numeration of edges and vertices is shown)
+ ====================================================================================================== */
class GEOMImpl_Block6Explorer
{
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_BlockDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_BlockDriver, GEOM_BaseDriver )
class GEOMImpl_BlockDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_BooleanDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_BooleanDriver, GEOM_BaseDriver )
class GEOMImpl_BooleanDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_BoxDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_BoxDriver, GEOM_BaseDriver )
class GEOMImpl_BoxDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_ChamferDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ChamferDriver, GEOM_BaseDriver )
class GEOMImpl_ChamferDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_CircleDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_CircleDriver, GEOM_BaseDriver )
class GEOMImpl_CircleDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_ConeDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ConeDriver, GEOM_BaseDriver )
class GEOMImpl_ConeDriver : public GEOM_BaseDriver {
* \brief Performs Transfer Data operation.
*/
//================================================================================
-Standard_Integer GEOMImpl_CopyDriver::transferData(Handle(TFunction_Logbook)& log) const
+Standard_Integer GEOMImpl_CopyDriver::transferData(Handle(TFunction_Logbook)& /*log*/) const
{
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
GEOMImpl_ITransferData aTD (aFunction);
return Standard_True;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver)
class TopoDS_Shape;
class Standard_GUID;
-DEFINE_STANDARD_HANDLE( GEOMImpl_CopyDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_CopyDriver, GEOM_BaseDriver )
class GEOMImpl_CopyDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_CylinderDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_CylinderDriver, GEOM_BaseDriver )
class GEOMImpl_CylinderDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_DiskDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_DiskDriver, GEOM_BaseDriver )
class GEOMImpl_DiskDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_EllipseDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_EllipseDriver, GEOM_BaseDriver )
class GEOMImpl_EllipseDriver : public GEOM_BaseDriver {
if (aFileName.IsEmpty() || aFormatName.IsEmpty() || aLibName.IsEmpty())
return 0;
- if( !GEOMImpl_IECallBack::GetCallBack( aFormatName )->Export( obj, aFileName, aFormatName ) );
+ if( !GEOMImpl_IECallBack::GetCallBack( aFormatName )->Export( obj, aFileName, aFormatName ) )
return 0;
log->SetTouched(Label());
//================================================================================
bool GEOMImpl_ExportDriver::
-GetCreationInformation(std::string& theOperationName,
- std::vector<GEOM_Param>& theParams)
+GetCreationInformation(std::string& /*theOperationName*/,
+ std::vector<GEOM_Param>& /*theParams*/)
{
return false;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_ExportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ExportDriver, GEOM_BaseDriver )
class GEOMImpl_ExportDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_FaceDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_FaceDriver, GEOM_BaseDriver )
class GEOMImpl_FaceDriver : public GEOM_BaseDriver {
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FieldDriver::Execute(Handle(TFunction_Logbook)& log) const
+Standard_Integer GEOMImpl_FieldDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const
{
return 0;
}
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_FieldDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_FieldDriver, GEOM_BaseDriver )
/*!
* \brief This class is needed only to retrieve creation information of GEOM_Field
aTargetPoint2d.SetCoord(aX, aY);
// choose the nearest circle
- Standard_Real aDistance, aP;
+ Standard_Real aDistance = 0., aP; // todo: aDistance must be explicitly initialized to avoid warning (see below)
GEOMImpl_Fillet1dPoint *aNearest;
Standard_Integer a;
TColStd_ListIteratorOfListOfReal anIter(myResultParams);
if (!aPoint->HasSolution(myRadius))
continue;
aP = fabs(aPoint->GetCenter().Distance(aTargetPoint2d) - myRadius);
- if (!aNearest || aP < aDistance)
+ if (!aNearest || aP < aDistance) // todo: aDistance must be explicitly initialized to avoid warning (see above)
{
aNearest = aPoint;
aDistance = aP;
{
Standard_Integer a;
Standard_Boolean aDiffsSet = (myD.Length() != 0);
- Standard_Real aDX = thePoint->GetParam() - myParam, aDY;
+ Standard_Real aDX = thePoint->GetParam() - myParam, aDY = 0.; // todo: aDY must be explicitly initialized to avoid warning (see below)
if (thePoint->myV.Length() == myV.Length())
{ // absolutely the same points
for(a = 1; a <= myV.Length(); a++)
}
else
{
- myD.Append( fabs(aDX) > gp::Resolution() ? aDY/aDX : 0);
+ myD.Append( fabs(aDX) > gp::Resolution() ? aDY/aDX : 0); // todo: aDY must be explicitly initialized to avoid warning (see above)
}
}
return false;
thePlane = gp_Pln( gp_Pnt(aXYZ), aDir1^ aDir2);
}
- catch (Standard_Failure) {
+ catch (Standard_Failure&) {
return false;
}
return true;
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet1dDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet1dDriver, GEOM_BaseDriver )
class GEOMImpl_Fillet1dDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet2dDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet2dDriver, GEOM_BaseDriver )
class GEOMImpl_Fillet2dDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_FilletDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_FilletDriver, GEOM_BaseDriver )
class GEOMImpl_FilletDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_FillingDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_FillingDriver, GEOM_BaseDriver )
class GEOMImpl_FillingDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_GlueDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_GlueDriver, GEOM_BaseDriver )
class GEOMImpl_GlueDriver : public GEOM_BaseDriver {
{
switch ( theErrorStatus )
{
- case ShHealOper_NotError: StdFail_NotDone::Raise( "ShHealOper_NotError_msg" );
- case ShHealOper_InvalidParameters: StdFail_NotDone::Raise( "ShHealOper_InvalidParameters_msg" );
+ case ShHealOper_NotError: StdFail_NotDone::Raise( "ShHealOper_NotError_msg" ); break;
+ case ShHealOper_InvalidParameters: StdFail_NotDone::Raise( "ShHealOper_InvalidParameters_msg" ); break;
case ShHealOper_ErrorExecution:
- default: StdFail_NotDone::Raise( "ShHealOper_ErrorExecution_msg" );
+ default: StdFail_NotDone::Raise( "ShHealOper_ErrorExecution_msg" ); break;
}
}
//function : ChangeOrientation
//purpose :
//=======================================================================
-Standard_Boolean GEOMImpl_HealingDriver::ChangeOrientation (GEOMImpl_IHealing* theHI,
+Standard_Boolean GEOMImpl_HealingDriver::ChangeOrientation (GEOMImpl_IHealing* /*theHI*/,
const TopoDS_Shape& theOriginalShape,
TopoDS_Shape& theOutShape) const
{
*stats = healer.GetStatistics();
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver)
class ShHealOper_Tool;
-DEFINE_STANDARD_HANDLE( GEOMImpl_HealingDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_HealingDriver, GEOM_BaseDriver )
class GEOMImpl_HealingDriver : public GEOM_BaseDriver {
*/
//=============================================================================
TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors
- (Handle(GEOM_Object) theCompound,
+ (Handle(GEOM_Object) /*theCompound*/,
const std::list<BCError>& theErrors)
{
TCollection_AsciiString aDescr;
static PyMethodDef PyStdOut_methods[] = {
{"write", (PyCFunction)PyStdOut_write, METH_VARARGS,
PyDoc_STR("write(string) -> None")},
- {NULL, NULL} /* sentinel */
+ {0, 0, 0, 0} /* sentinel */
};
static PyMemberDef PyStdOut_memberlist[] = {
{(char*)"softspace", T_INT, offsetof(PyStdOut, softspace), 0,
(char*)"flag indicating that a space needs to be printed; used by print"},
- {NULL} /* Sentinel */
+ {0, 0, 0, 0, 0} /* sentinel */
};
static PyTypeObject PyStdOut_Type = {
return NULL;
}
- TopAbs_ShapeEnum aType, aType_i;
+ TopAbs_ShapeEnum aType = TopAbs_SHAPE, aType_i; // todo: refactor: aType must be initialized to avoid warning (see below)
TDF_Label aLabel, aLabel_i;
TColStd_ListOfInteger aNewIDs;
TColStd_MapOfInteger mapIDs;
aType = aType_i;
else {
if (aType_i != aType) {
- if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) {
+ if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { // todo: refactor: aType must be initialized to avoid warning (see above)
if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND)
aType = aType_i;
else {
return NULL;
}
- TopAbs_ShapeEnum aType, aType_i;
+ TopAbs_ShapeEnum aType = TopAbs_SHAPE, aType_i; // todo: refactor: aType must be initialized to avoid warning (see below)
TDF_Label aLabel, aLabel_i;
TColStd_ListOfInteger aNewIDs;
TColStd_MapOfInteger mapIDs;
aType = aType_i;
else {
if (aType_i != aType) {
- if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) {
+ if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { // todo: refactor: aType must be initialized to avoid warning (see above)
if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND)
aType = aType_i;
else {
return NULL;
}
- TopAbs_ShapeEnum aType, aType_i;
+ TopAbs_ShapeEnum aType = TopAbs_SHAPE, aType_i; // todo: refactor: aType must be initialized to avoid warning (see below)
TDF_Label aLabel, aLabel_i;
TColStd_ListOfInteger aNewIDs;
TColStd_MapOfInteger mapIDs;
aType = aType_i;
else {
if (aType_i != aType) {
- if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) {
+ if (aType != TopAbs_SHAPE && aType != TopAbs_COMPOUND) { // todo: refactor: aType must be initialized to avoid warning (see above)
if (aType_i == TopAbs_SHAPE || aType_i == TopAbs_COMPOUND)
aType = aType_i;
else {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver)
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( GEOMImpl_ImportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ImportDriver, GEOM_BaseDriver )
class GEOMImpl_ImportDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_LineDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_LineDriver, GEOM_BaseDriver )
class GEOMImpl_LineDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_MarkerDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_MarkerDriver, GEOM_BaseDriver )
class GEOMImpl_MarkerDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_MeasureDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_MeasureDriver, GEOM_BaseDriver )
class GEOMImpl_MeasureDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_MirrorDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_MirrorDriver, GEOM_BaseDriver )
class GEOMImpl_MirrorDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_OffsetDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_OffsetDriver, GEOM_BaseDriver )
class GEOMImpl_OffsetDriver : public GEOM_BaseDriver {
Handle(TColStd_HArray1OfInteger) aMaterials = aCI.GetMaterials();
//skl Standard_Boolean DoRemoveWebs = !aMaterials.IsNull();
- unsigned int ind;
+ int ind;
//unsigned int ind, nbshapes = 0;
//nbshapes += aShapes->Length() + aTools->Length();
//nbshapes += aKeepIns->Length() + aRemIns->Length();
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_PartitionDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_PartitionDriver, GEOM_BaseDriver )
class GEOMImpl_PartitionDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_PipeDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_PipeDriver, GEOM_BaseDriver )
class GEOMImpl_PipeDriver : public GEOM_BaseDriver {
Standard_EXPORT GEOMImpl_PipeDriver();
Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
- Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)& log) const {}
- Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)& log) const { return Standard_True; }
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)& /*log*/) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)& /*log*/) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PipeDriver() {};
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_PipePathDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_PipePathDriver, GEOM_BaseDriver )
class GEOMImpl_PipePathDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_PlaneDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_PlaneDriver, GEOM_BaseDriver )
class GEOMImpl_PlaneDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_PointDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_PointDriver, GEOM_BaseDriver )
class GEOMImpl_PointDriver : public GEOM_BaseDriver {
return 0;
}
- if (aNbSections != aCoords.size()) {
+ if (aNbSections != (int)aCoords.size()) {
return 0;
}
Handle(TColStd_HArray1OfReal) coords = aCI.GetCoordinates();
if ( coords->Length() > 3 )
pntParam << ( coords->Length() ) / 3 << " points: ";
- for ( int i = coords->Lower(), nb = coords->Upper(); i <= nb; )
- pntParam << "( " << coords->Value( i++ )
- << ", " << coords->Value( i++ )
- << ", " << coords->Value( i++ ) << " ) ";
+ for ( int i = coords->Lower(), nb = coords->Lower()+(coords->Length()/3)*3; i < nb; i+=3)
+ pntParam << "( " << coords->Value( i ) << ", " << coords->Value( i+1 ) << ", " << coords->Value( i+2 ) << " ) ";
}
else
{
AddParam(theParams, "Number of curves", aNbCurves);
aP2d.GetCoords(aCoords);
- Standard_Integer aNbCoords = aCoords.size();
+ //Standard_Integer aNbCoords = aCoords.size();
std::list <std::list <double> >::const_iterator
anIt = aCoords.begin();
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_PolylineDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_PolylineDriver, GEOM_BaseDriver )
class GEOMImpl_PolylineDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_PositionDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_PositionDriver, GEOM_BaseDriver )
class GEOMImpl_PositionDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_PrismDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_PrismDriver, GEOM_BaseDriver )
class GEOMImpl_PrismDriver : public GEOM_BaseDriver {
return aResult;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_ProjectionDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ProjectionDriver, GEOM_BaseDriver )
class GEOMImpl_ProjectionDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_RevolutionDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_RevolutionDriver, GEOM_BaseDriver )
class GEOMImpl_RevolutionDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_RotateDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_RotateDriver, GEOM_BaseDriver )
class GEOMImpl_RotateDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_ScaleDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ScaleDriver, GEOM_BaseDriver )
class GEOMImpl_ScaleDriver : public GEOM_BaseDriver {
for (anIter.Initialize(aListFaces); anIter.More();) {
const TopoDS_Shape &aFace = anIter.Value();
- Standard_Boolean isFaceUsed = Standard_False;
+ //Standard_Boolean isFaceUsed = Standard_False;
if (aMapFaces.Contains(aFace) || aSewing.IsModified(aFace)) {
// Remove face from the list.
B.MakeWire(aWire);
// add edges
- for (unsigned int ind = 1; ind <= theEdgesFuncs->Length(); ind++) {
+ for (int ind = 1; ind <= theEdgesFuncs->Length(); ind++) {
Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(theEdgesFuncs->Value(ind));
TopoDS_Shape aShape_i = aRefShape->GetValue();
if (aShape_i.IsNull()) {
TColStd_SequenceOfReal FparSeq;
TColStd_SequenceOfReal LparSeq;
TColStd_SequenceOfReal TolSeq;
- GeomAbs_CurveType CurType;
+ GeomAbs_CurveType CurType = GeomAbs_OtherCurve; // todo: refactor: CurType must be explicitly initialized to avoid warning (see below)
TopoDS_Vertex FirstVertex, LastVertex;
Standard_Real aPntShiftDist = 0.;
LocSeq.Append(aLocShape);
FparSeq.Append(fpar);
LparSeq.Append(lpar);
- CurType = aType;
+ CurType = aType; // todo: refactor: CurType must be explicitly initialized to avoid warning (see above)
FirstVertex = wexp.CurrentVertex();
}
else
}
break;
}
+ default:
+ break;
} //end of switch (aType)
} // end of else if (aType == CurType && ...
if (Done)
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver)
//modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f
#include <TopoDS_Iterator.hxx>
class TopoDS_Face;
-DEFINE_STANDARD_HANDLE( GEOMImpl_ShapeDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ShapeDriver, GEOM_BaseDriver )
class GEOMImpl_ShapeDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_SketcherDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_SketcherDriver, GEOM_BaseDriver )
class GEOMImpl_SketcherDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_SphereDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_SphereDriver, GEOM_BaseDriver )
class GEOMImpl_SphereDriver : public GEOM_BaseDriver {
}
}
if (nearest > 0 && nearest != i + 1) {
- // Keep given order of points to use it in case of equidistant candidates
- // .-<---<-.
- // / \
- // o o o c o->o->o->o->n o o
- // | | |
- // i i+1 nearest
+ /*====================================================================
+ Keep given order of points to use it in case of equidistant candidates
+ .-<---<-.
+ / \
+ o o o c o->o->o->o->n o o
+ | | |
+ i i+1 nearest
+ ======================================================================*/
gp_Pnt p = points->Value(nearest);
for (int j = nearest; j > i+1; j--)
points->SetValue(j, points->Value(j-1));
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_SplineDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_SplineDriver, GEOM_BaseDriver )
class GEOMImpl_SplineDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_ThruSectionsDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_ThruSectionsDriver, GEOM_BaseDriver )
class GEOMImpl_ThruSectionsDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_TorusDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_TorusDriver, GEOM_BaseDriver )
class GEOMImpl_TorusDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_TranslateDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_TranslateDriver, GEOM_BaseDriver )
class GEOMImpl_TranslateDriver : public GEOM_BaseDriver {
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver)
#include <GEOM_BaseDriver.hxx>
-DEFINE_STANDARD_HANDLE( GEOMImpl_VectorDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( GEOMImpl_VectorDriver, GEOM_BaseDriver )
class GEOMImpl_VectorDriver : public GEOM_BaseDriver {
// function : OnGUIEvent()
// purpose :
//=======================================================================
-bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/)
{
getGeometryGUI()->EmitSignalDeactivateDialog();
// function : OnGUIEvent()
// purpose :
//=======================================================================
-bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent, const QVariant& theParam )
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/, const QVariant& theParam )
{
getGeometryGUI()->EmitSignalDeactivateDialog();
disp->EraseWithChildren(IObject);
// hide references if any
std::vector< _PTR(SObject) > vso = aStudy->FindDependances(obj);
- for ( int i = 0; i < vso.size(); i++ ) {
+ for ( int i = 0; i < (int)vso.size(); i++ ) {
_PTR(SObject) refObj = vso[i];
aDrw = B->FindOrCreateAttribute( refObj, "AttributeDrawable" );
aDrw->SetDrawable( false );
GEOM::GEOM_Gen_var engine = GeometryGUI::GetGeomGen();
myOperation = engine->GetIInsertOperations();
GEOM::ListOfLong_var ids = myOperation->GetAllTextures();
- for ( int i = 0; i < ids->length(); i++ )
+ for ( int i = 0; i < (int)ids->length(); i++ )
addTexture( ids[i] );
// ---
GeometryGUI::GetGeomGen()->GetEntriesToReduceStudy( keptObjects, parentsObjects,
subObjects, otherObjects );
- for ( int i = 0; i < keptObjects->length(); i++ )
+ for ( unsigned long i = 0; i < keptObjects->length(); i++ )
myKeptObjects.insert( keptObjects[i].in() );
- for( int i = 0; i< otherObjects->length(); i++ )
+ for( unsigned long i = 0; i< otherObjects->length(); i++ )
myRemovedObjects.insert( otherObjects[i].in() );
- for( int i = 0; i< parentsObjects->length(); i++ )
+ for( unsigned long i = 0; i< parentsObjects->length(); i++ )
myListParents.insert( parentsObjects[i].in() );
- for( int i = 0; i< subObjects->length(); i++ )
+ for( unsigned long i = 0; i< subObjects->length(); i++ )
myListSubObjects.insert( subObjects[i].in() );
update();
myDisplayer.EraseWithChildren( new SALOME_InteractiveObject( studyEntry.c_str(), "GEOM", "TEMP_IO" ) );
// hide references if any
std::vector< _PTR(SObject) > vso = aStudy->FindDependances(obj);
- for ( int i = 0; i < vso.size(); i++ ) {
+ for ( int i = 0; i < (int)vso.size(); i++ ) {
_PTR(SObject) refObj = vso[i];
aDrw = aStudyBuilder->FindOrCreateAttribute( refObj, "AttributeDrawable" );
aDrw->SetDrawable( false );
GEOMToolsGUI_TreeWidgetItem::GEOMToolsGUI_TreeWidgetItem( QTreeWidget* view, const QStringList &strings,
char* studyEntry, int type )
:QTreeWidgetItem( view, strings, type ),
- myStudyEntry( studyEntry ),
- myVisible( false )
+ myVisible( false ),
+ myStudyEntry( studyEntry )
{
}
GEOMToolsGUI_TreeWidgetItem::GEOMToolsGUI_TreeWidgetItem( QTreeWidgetItem* parent, const QStringList &strings,
char* studyEntry, int type )
:QTreeWidgetItem( parent, strings, type ),
- myStudyEntry( studyEntry ),
- myVisible( false )
+ myVisible( false ),
+ myStudyEntry( studyEntry )
{
}
std::string objectEntry = dependencyStr.substr( cursor, objectIndex - cursor );
cursor = objectIndex;
- std::size_t upwardIndexBegin = dependencyStr.find("{",cursor) + 1;
+ //std::size_t upwardIndexBegin = dependencyStr.find("{",cursor) + 1;
//std::size_t upwardIndexFinish = dependencyStr.find("}",upwardIndexBegin);
LevelsList upwardList = parseWard( dependencyStr, cursor );
* \brief Sort shapes in the list by their coordinates.
* \param SL The list of shapes to sort.
*/
- struct CompareShapes : public std::binary_function<TopoDS_Shape, TopoDS_Shape, bool>
+ struct CompareShapes //: public std::binary_function<TopoDS_Shape, TopoDS_Shape, bool>
{
CompareShapes (bool isOldSorting)
: myIsOldSorting(isOldSorting) {}
const double theTolShape,
const double theTolRef);
-};
+}
#endif
#include <GEOMUtils_HTrsfCurve2d.hxx>
namespace GEOMUtils {
- IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d);
+ IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d)
}
//=======================================================================
class HTrsfCurve2d;
- DEFINE_STANDARD_HANDLE(HTrsfCurve2d, Adaptor2d_HCurve2d);
+ DEFINE_STANDARD_HANDLE(HTrsfCurve2d, Adaptor2d_HCurve2d)
/*!
* This class represents an adaptor curve that represents an original curve
#endif
}
}
- return xmlPaths;
}
+ return xmlPaths;
}
#ifdef MYDEBUG
// function : IORToLocalPersistentID()
// purpose :
//============================================================================
-char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
+char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr /*theSObject*/,
const char* IORString,
- CORBA::Boolean isMultiFile,
- CORBA::Boolean isASCII)
+ CORBA::Boolean /*isMultiFile*/,
+ CORBA::Boolean /*isASCII*/)
{
GEOM::GEOM_BaseObject_var anObject =
GEOM::GEOM_BaseObject::_narrow(_orb->string_to_object(IORString));
// : Used when a study is loaded
// : The IOR (IORName) of object created is returned
//============================================================================
-char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
+char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr /*theSObject*/,
const char* aLocalPersistentID,
- CORBA::Boolean isMultiFile,
- CORBA::Boolean isASCII)
+ CORBA::Boolean /*isMultiFile*/,
+ CORBA::Boolean /*isASCII*/)
{
Handle(::GEOM_BaseObject) anObject =
_impl->GetObject(aLocalPersistentID);
SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject,
CORBA::Object_ptr theObject,
const char* theName)
- throw (SALOME::SALOME_Exception)
+
{
Unexpect aCatch(SALOME_SalomeException);
SALOMEDS::SObject_var aResultSO;
void GEOM_Gen_i::CreateAndPublishGroup(GEOM::GEOM_Object_var theMainShape,
const TopTools_IndexedMapOfShape& anIndices,
const TopTools_SequenceOfShape& SeqS,
- const TColStd_SequenceOfAsciiString& SeqN,
+ const TColStd_SequenceOfAsciiString& /*SeqN*/,
const Standard_CString& GrName,
- GEOM::ListOfGO_var aResList)
+ GEOM::ListOfGO_var /*aResList*/)
{
CORBA::String_var entry = theMainShape->GetEntry();
//Handle(::GEOM_Object) aMainShape = _impl->GetObject(entry);
// function : Save()
// purpose : save OCAF/Geom document
//============================================================================
-SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
+SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr /*theComponent*/,
const char* theURL,
bool isMultiFile) {
SALOMEDS::TMPFile_var aStreamFile;
// function : Close()
// purpose :
//============================================================================
-void GEOM_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
+void GEOM_Gen_i::Close(SALOMEDS::SComponent_ptr /*theComponent*/)
{
_impl->Close();
}
// function : CanPaste()
// purpose :
//============================================================================
-CORBA::Boolean GEOM_Gen_i::CanPaste(const char* theComponentName, CORBA::Long theObjectID) {
+CORBA::Boolean GEOM_Gen_i::CanPaste(const char* theComponentName, CORBA::Long /*theObjectID*/) {
// The Geometry component can paste only objects copied by Geometry component
// and with the object type = 1
if (strcmp(theComponentName, ComponentDataType()) != 0) return false;
BRep_Builder aBuilder;
try {
BRepTools::Read(aTopology, aStreamedBrep, aBuilder);
- } catch (Standard_Failure) {
+ } catch (Standard_Failure&) {
return aNewSO._retn();
}
// purpose :
//============================================================================
GEOM::GEOM_IBasicOperations_ptr GEOM_Gen_i::GetIBasicOperations()
- throw ( SALOME::SALOME_Exception )
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIBasicOperations" );
// purpose :
//============================================================================
GEOM::GEOM_ITransformOperations_ptr GEOM_Gen_i::GetITransformOperations()
- throw ( SALOME::SALOME_Exception )
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetITransformOperations" );
// purpose :
//============================================================================
GEOM::GEOM_I3DPrimOperations_ptr GEOM_Gen_i::GetI3DPrimOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetI3DPrimOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IShapesOperations_ptr GEOM_Gen_i::GetIShapesOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIShapesOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IBlocksOperations_ptr GEOM_Gen_i::GetIBlocksOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIBlocksOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IBooleanOperations_ptr GEOM_Gen_i::GetIBooleanOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIBooleanOperations" );
// purpose :
//============================================================================
GEOM::GEOM_ICurvesOperations_ptr GEOM_Gen_i::GetICurvesOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetICurvesOperations" );
// purpose :
//============================================================================
GEOM::GEOM_ILocalOperations_ptr GEOM_Gen_i::GetILocalOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetILocalOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IHealingOperations_ptr GEOM_Gen_i::GetIHealingOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::IHealingOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IInsertOperations_ptr GEOM_Gen_i::GetIInsertOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIInsertOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IMeasureOperations_ptr GEOM_Gen_i::GetIMeasureOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIMeasureOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IGroupOperations_ptr GEOM_Gen_i::GetIGroupOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIGroupOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IFieldOperations_ptr GEOM_Gen_i::GetIFieldOperations()
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIFieldOperations" );
// purpose :
//============================================================================
GEOM::GEOM_IOperations_ptr GEOM_Gen_i::GetPluginOperations(const char* theLibName)
- throw ( SALOME::SALOME_Exception )
+
{
Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetPluginOperations" );
continue;
stringIOR = handle_object->GetIOR();
- if ( !stringIOR.Length() > 1 )
+ if ( stringIOR.Length() < 1 )
continue;
geomObj = GetIORFromString( stringIOR.ToCString() );
bool CanPublishInStudy(CORBA::Object_ptr theIOR);
SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::SObject_ptr theSObject,
CORBA::Object_ptr theObject,
- const char* theName) throw (SALOME::SALOME_Exception) ;
+ const char* theName) ;
GEOM::ListOfGO* PublishNamedShapesInStudy(CORBA::Object_ptr theObject);
//-----------------------------------------------------------------------//
//Returns a pointer to BasicOperations interface
- virtual GEOM::GEOM_IBasicOperations_ptr GetIBasicOperations()
- throw (SALOME::SALOME_Exception);
+ virtual GEOM::GEOM_IBasicOperations_ptr GetIBasicOperations();
//Returns a pointer to TransformOperations interface
- virtual GEOM::GEOM_ITransformOperations_ptr GetITransformOperations()
- throw (SALOME::SALOME_Exception);
+ virtual GEOM::GEOM_ITransformOperations_ptr GetITransformOperations();
//Returns a pointer to 3DPrimOperations interface
- virtual GEOM::GEOM_I3DPrimOperations_ptr GetI3DPrimOperations()
- throw (SALOME::SALOME_Exception);
+ virtual GEOM::GEOM_I3DPrimOperations_ptr GetI3DPrimOperations();
//Returns a pointer to ShapesOperations interface
- virtual GEOM::GEOM_IShapesOperations_ptr GetIShapesOperations()
- throw (SALOME::SALOME_Exception);
+ virtual GEOM::GEOM_IShapesOperations_ptr GetIShapesOperations();
//Returns a pointer to BlocksOperations interface
- virtual GEOM::GEOM_IBlocksOperations_ptr GetIBlocksOperations()
- throw (SALOME::SALOME_Exception);
+ virtual GEOM::GEOM_IBlocksOperations_ptr GetIBlocksOperations();
//Returns a pointer to BooleanOperations interface
virtual GEOM::GEOM_IBooleanOperations_ptr GetIBooleanOperations()
- throw (SALOME::SALOME_Exception);
+ ;
//Returns a pointer to CurvesOperations interface
virtual GEOM::GEOM_ICurvesOperations_ptr GetICurvesOperations()
- throw (SALOME::SALOME_Exception);
+ ;
//Returns a pointer to LocalOperations interface
virtual GEOM::GEOM_ILocalOperations_ptr GetILocalOperations()
- throw (SALOME::SALOME_Exception);
+ ;
//Returns a pointer to HealingOperations interface
virtual GEOM::GEOM_IHealingOperations_ptr GetIHealingOperations()
- throw (SALOME::SALOME_Exception);
+ ;
//Returns a pointer to InsertOperations interface
virtual GEOM::GEOM_IInsertOperations_ptr GetIInsertOperations()
- throw (SALOME::SALOME_Exception);
+ ;
//Returns a pointer to MeasureOperations interface
virtual GEOM::GEOM_IMeasureOperations_ptr GetIMeasureOperations()
- throw (SALOME::SALOME_Exception);
+ ;
//Returns a pointer to GroupOperations interface
virtual GEOM::GEOM_IGroupOperations_ptr GetIGroupOperations()
- throw (SALOME::SALOME_Exception);
+ ;
//Returns a pointer to FiedlOperations interface
virtual GEOM::GEOM_IFieldOperations_ptr GetIFieldOperations()
- throw (SALOME::SALOME_Exception);
+ ;
//Returns a pointer to corresponding plugin operations interface
virtual GEOM::GEOM_IOperations_ptr GetPluginOperations (const char* theLibName)
- throw (SALOME::SALOME_Exception);
+ ;
//Adds a new sub-shape
virtual GEOM::GEOM_Object_ptr AddSubShape (GEOM::GEOM_Object_ptr theMainShape,
//Set a not done flag
GetOperations()->SetNotDone();
- GEOMImpl_ICurvesOperations::CurveType aType;
+ GEOMImpl_ICurvesOperations::CurveType aType = GEOMImpl_ICurvesOperations::Polyline; // todo: aType must be explicitly initialized to avoid warning
switch(theCurveType) {
case GEOM::Polyline:
aType = GEOMImpl_ICurvesOperations::Polyline;
//Set a not done flag
GetOperations()->SetNotDone();
- GEOMImpl_ICurvesOperations::CurveType aType;
+ GEOMImpl_ICurvesOperations::CurveType aType = GEOMImpl_ICurvesOperations::Polyline; // todo: aType must be explicitly initialized to avoid warning
switch(theCurveType) {
case GEOM::Polyline:
aType = GEOMImpl_ICurvesOperations::Polyline;
// function : Save()
// purpose : save OCAF/Geom document
//============================================================================
-SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr theComponent,
- const char* theURL,
- CORBA::Boolean isMultiFile)
+SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr /*theComponent*/,
+ const char* /*theURL*/,
+ CORBA::Boolean /*isMultiFile*/)
{
SALOMEDS::TMPFile_var aStreamFile;
return aStreamFile._retn();
// function : SaveASCII()
// purpose :
//============================================================================
-SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
- const char* theURL,
- CORBA::Boolean isMultiFile)
+SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr /*theComponent*/,
+ const char* /*theURL*/,
+ CORBA::Boolean /*isMultiFile*/)
{
SALOMEDS::TMPFile_var aStreamFile;
return aStreamFile._retn();
// function : Load()
// purpose :
//============================================================================
-CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr theComponent,
- const SALOMEDS::TMPFile& theStream,
- const char* theURL,
- CORBA::Boolean isMultiFile)
+CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr /*theComponent*/,
+ const SALOMEDS::TMPFile& /*theStream*/,
+ const char* /*theURL*/,
+ CORBA::Boolean /*isMultiFile*/)
{
return false;
}
// function : LoadASCII()
// purpose :
//============================================================================
-CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
- const SALOMEDS::TMPFile& theStream,
- const char* theURL,
- CORBA::Boolean isMultiFile)
+CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr /*theComponent*/,
+ const SALOMEDS::TMPFile& /*theStream*/,
+ const char* /*theURL*/,
+ CORBA::Boolean /*isMultiFile*/)
{
return false;
}
// function : Close()
// purpose :
//============================================================================
-void GEOM_Superv_i::Close(SALOMEDS::SComponent_ptr theComponent)
+void GEOM_Superv_i::Close(SALOMEDS::SComponent_ptr /*theComponent*/)
{
}
// function : IORToLocalPersistentID()
// purpose :
//============================================================================
-char* GEOM_Superv_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
- const char* IORString,
- CORBA::Boolean isMultiFile,
- CORBA::Boolean isASCII)
+char* GEOM_Superv_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr /*theSObject*/,
+ const char* /*IORString*/,
+ CORBA::Boolean /*isMultiFile*/,
+ CORBA::Boolean /*isASCII*/)
{
return 0;
}
// : Used when a study is loaded
// : The IOR (IORName) of object created is returned
//============================================================================
-char* GEOM_Superv_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
- const char* aLocalPersistentID,
- CORBA::Boolean isMultiFile,
- CORBA::Boolean isASCII)
+char* GEOM_Superv_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr /*theSObject*/,
+ const char* /*aLocalPersistentID*/,
+ CORBA::Boolean /*isMultiFile*/,
+ CORBA::Boolean /*isASCII*/)
{
return 0;
}
//============================================================================
SALOMEDS::SObject_ptr GEOM_Superv_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject,
CORBA::Object_ptr theObject,
- const char* theName) throw (SALOME::SALOME_Exception)
+ const char* theName)
{
if (CORBA::is_nil(myGeomEngine))
setGeomEngine();
// function : CanCopy()
// purpose :
//============================================================================
-CORBA::Boolean GEOM_Superv_i::CanCopy(SALOMEDS::SObject_ptr theObject)
+CORBA::Boolean GEOM_Superv_i::CanCopy(SALOMEDS::SObject_ptr /*theObject*/)
{
return false;
}
// function : CopyFrom()
// purpose :
//============================================================================
-SALOMEDS::TMPFile* GEOM_Superv_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID)
+SALOMEDS::TMPFile* GEOM_Superv_i::CopyFrom(SALOMEDS::SObject_ptr /*theObject*/, CORBA::Long& /*theObjectID*/)
{
SALOMEDS::TMPFile_var aStreamFile;
return aStreamFile._retn();
// function : CanPaste()
// purpose :
//============================================================================
-CORBA::Boolean GEOM_Superv_i::CanPaste(const char* theComponentName, CORBA::Long theObjectID)
+CORBA::Boolean GEOM_Superv_i::CanPaste(const char* /*theComponentName*/, CORBA::Long /*theObjectID*/)
{
return false;
}
// function : PasteInto()
// purpose :
//============================================================================
-SALOMEDS::SObject_ptr GEOM_Superv_i::PasteInto(const SALOMEDS::TMPFile& theStream,
- CORBA::Long theObjectID,
- SALOMEDS::SObject_ptr theObject)
+SALOMEDS::SObject_ptr GEOM_Superv_i::PasteInto(const SALOMEDS::TMPFile& /*theStream*/,
+ CORBA::Long /*theObjectID*/,
+ SALOMEDS::SObject_ptr /*theObject*/)
{
SALOMEDS::SObject_var aNewSO;
return aNewSO._retn();
MESSAGE("GEOM_Superv_i::ImportSTL");
getSTLPluginOp();
GEOM::ListOfGO* aSeq = mySTLOp->ImportSTL(theFileName );
- GEOM::GEOM_Object_ptr anObj;
+ GEOM::GEOM_Object_var anObj;
if (aSeq->length() > 0) {
anObj = aSeq->operator[](0);
}
endService( " GEOM_Superv_i::ImportSTL" );
- return anObj;
+ return anObj._retn();
}
//=============================================================================
MESSAGE("GEOM_Superv_i::ImportBREP");
getBREPPluginOp();
GEOM::ListOfGO* aSeq = myBREPOp->ImportBREP(theFileName );
- GEOM::GEOM_Object_ptr anObj;
+ GEOM::GEOM_Object_var anObj;
if (aSeq->length() > 0) {
anObj = aSeq->operator[](0);
}
endService( " GEOM_Superv_i::ImportBREP" );
- return anObj;
+ return anObj._retn();
}
//=============================================================================
MESSAGE("GEOM_Superv_i::ImportSTEP");
getSTEPPluginOp();
GEOM::ListOfGO* aSeq = mySTEPOp->ImportSTEP(theFileName, theIsIgnoreUnits, false );
- GEOM::GEOM_Object_ptr anObj;
+ GEOM::GEOM_Object_var anObj;
if (aSeq->length() > 0) {
anObj = aSeq->operator[](0);
}
endService( " GEOM_Superv_i::ImportSTEP" );
- return anObj;
+ return anObj._retn();
}
//=============================================================================
MESSAGE("GEOM_Superv_i::ImportIGES");
getIGESPluginOp();
GEOM::ListOfGO* aSeq = myIGESOp->ImportIGES(theFileName, theIsIgnoreUnits );
- GEOM::GEOM_Object_ptr anObj;
+ GEOM::GEOM_Object_var anObj;
if (aSeq->length() > 0) {
anObj = aSeq->operator[](0);
}
endService( " GEOM_Superv_i::ImportIGES" );
- return anObj;
+ return anObj._retn();
}
//=============================================================================
//=============================================================================
// Import XAO
//=============================================================================
-CORBA::Boolean GEOM_Superv_i::ImportXAO( const char* fileName,
- GEOM::GEOM_Object_out shape,
- GEOM::ListOfGO_out subShapes,
- GEOM::ListOfGO_out groups,
- GEOM::ListOfFields_out fields )
+CORBA::Boolean GEOM_Superv_i::ImportXAO( const char* /*fileName*/,
+ GEOM::GEOM_Object_out /*shape*/,
+ GEOM::ListOfGO_out /*subShapes*/,
+ GEOM::ListOfGO_out /*groups*/,
+ GEOM::ListOfFields_out /*fields*/ )
{
return false;
}
CORBA::Boolean CanPublishInStudy(CORBA::Object_ptr theIOR);
SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::SObject_ptr theSObject,
CORBA::Object_ptr theObject,
- const char* theName) throw (SALOME::SALOME_Exception) ;
+ const char* theName) ;
GEOM::ListOfGO* PublishNamedShapesInStudy(//SALOMEDS::SObject_ptr theSObject,
CORBA::Object_ptr theObject);
std::vector<int> ids;
for (int i = 1; i <= n; i++)
ids.push_back(aMap(i));
- for (int i =0; i < ids.size(); i++)
+ for (int i =0; i < (int)ids.size(); i++)
{
MESSAGE("ids[" << i << "] = " << ids[i]);
}
SUIT_Application* app = SUIT_Session::session()->activeApplication();
if ( app )
{
- SUIT_ViewWindow* window = app->desktop()->activeWindow();
+ //SUIT_ViewWindow* window = app->desktop()->activeWindow();
SUIT_ViewWindow* wnd = 0;
LightApp_Application* lapp = dynamic_cast<LightApp_Application*>(app);
if ( lapp )
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void GenerationGUI_FillingDlg::ValueChangedInSpinBox(double newValue)
+void GenerationGUI_FillingDlg::ValueChangedInSpinBox(double /*newValue*/)
{
processPreview();
}
GEOM::GEOM_I3DPrimOperations_var anOper =
GEOM::GEOM_I3DPrimOperations::_narrow(getOperation());
- GEOM::filling_oper_method aMethod;
+ GEOM::filling_oper_method aMethod = GEOM::FOM_Default; // todo: aMethod must be explicitly initialized to avoid warning (see below)
switch (GroupPoints->ComboBox1->currentIndex())
{
case 0: aMethod = GEOM::FOM_Default; break;
GroupPoints->SpinBox5->value(),
GroupPoints->SpinBox3->value(),
aMethod,
- GroupPoints->CheckBox1->isChecked());
+ GroupPoints->CheckBox1->isChecked()); // todo: aMethod must be explicitly initialized to avoid warning (see below)
if (!anObj->_is_nil())
{
if (!IsPreview())
// function : onChangeDirection(bool)
// purpose :
//=================================================================================
-void GenerationGUI_PrismDlg::onChangeDirection(bool isChecked)
+void GenerationGUI_PrismDlg::onChangeDirection(bool /*isChecked*/)
{
processPreview();
}
// function : enterEvent()
// purpose :
//=================================================================================
-void GroupGUI_GroupDlg::enterEvent(QEvent* e)
+void GroupGUI_GroupDlg::enterEvent(QEvent*)
{
if (!buttonCancel()->isEnabled())
ActivateThisDialog();
GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations();
GEOM::ListOfGO_var aSubObjects = aShapesOp->MakeExplode(myInPlaceObj, getShapeType(), false);
- for ( int i = 0; i < aSubObjects->length(); i++ )
+ for ( int i = 0; i < (int)aSubObjects->length(); i++ )
{
GEOM::ListOfLong_var aCurrList = aShapesOp->GetSameIDs( myMainObj, aSubObjects[i] );
if( aCurrList->length() > 1 ) {
// In case if GetSameIDs(...) method return more then one ID use
// GetSharedShapes(...) method to get sub-shapes of the second shape.
GEOM::ListOfGO_var aSubObjects2 = aShapesOp->GetSharedShapes( myMainObj, aSubObjects[i], getShapeType() );
- for( int j = 0; j < aSubObjects2->length(); j++ ) {
+ for( int j = 0; j < (int)aSubObjects2->length(); j++ ) {
CORBA::Long aMainIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects2[j] );
CORBA::Long aPlaceIndex = aLocOp->GetSubShapeIndex( myInPlaceObj, aSubObjects[i]);
if ( aMainIndex >= 0 && aPlaceIndex > 0 ) {
case TopAbs_EDGE: anId = 1; break;
case TopAbs_FACE: anId = 2; break;
case TopAbs_SOLID: anId = 3; break;
+ default: break;
}
setConstructorId(anId);
if (!myIsShapeType)
//=================================================================================
void GroupGUI_GroupDlg::activateSelection()
{
- bool isApply = ((QPushButton*)sender() == buttonApply());
+ //bool isApply = ((QPushButton*)sender() == buttonApply());
if(!isApplyAndClose())
erasePreview(false);
}
}
}
- else ;
aDisplayer->UnsetDisplayMode();
aDisplayer->UnsetColor();
aDisplayer->UpdateViewer();
TopoDS_Shape aMainShape = GEOM_Client::get_client().GetShape(GeometryGUI::GetGeomGen(), myMainObj);
TopTools_IndexedMapOfShape aSubShapesMap;
TopExp::MapShapes(aMainShape, aSubShapesMap);
- SALOME_View* view = GEOM_Displayer::GetActiveView();
+ //SALOME_View* view = GEOM_Displayer::GetActiveView();
getDisplayer()->Erase(myMainObj, false, false);
CORBA::String_var aMainEntry = myMainObj->GetStudyEntry();
QString anEntryBase = aMainEntry.in();
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer IGESPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
+Standard_Integer IGESPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
*/
//================================================================================
bool IGESPlugin_ExportDriver::
-GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& theParams )
+GetCreationInformation( std::string& /*theOperationName*/,
+ std::vector<GEOM_Param>& /*theParams*/ )
{
return false;
}
-IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver )
class IGESPlugin_ExportDriver : public GEOM_BaseDriver
{
getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) );
}
- return true; // ?????????????
+ return result;
}
//=======================================================================
//=============================================================================
TCollection_AsciiString
IGESPlugin_IECallBack::ReadValue( const TCollection_AsciiString& theFileName,
- const TCollection_AsciiString& theFormatName,
+ const TCollection_AsciiString& /*theFormatName*/,
const TCollection_AsciiString& theParameterName )
{
IGESPlugin_IOperations* aPluginOperations = IGESPlugin_OperationsCreator::get( GetEngine() );
return TCollection_AsciiString();
}
-IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver )
class IGESPlugin_ImportDriver : public GEOM_BaseDriver
{
class MATERIAL_SALOME_EXPORT Material_ResourceMgr : public QObject, public QtxResourceMgr
{
- Q_OBJECT;
+ Q_OBJECT
class Updater;
return aPrs;
}
}
- catch(Standard_Failure) {
+ catch(Standard_Failure&) {
}
}
{
const Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext();
- if ( anAISContext->IsHilighted( Handle(AIS_InteractiveObject)::DownCast( myActiveIO ) ) )
+ if ( anAISContext->IsHilighted( myActiveIO ) )
{
anAISContext->Unhilight( myActiveIO, Standard_False );
}
//=================================================================================
MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (GeometryGUI* GUI, QWidget* parent)
: GEOMBase_Skeleton (GUI, parent, false),
+ myCurrConstrId (-1),
+ myComputeButton1 (0),
myTextView1 (0),
- myTextView2 (0),
mySelButton1 (0),
- mySelButton2 (0),
myEditObjName1 (0),
- myEditObjName2 (0),
myLevelBox (0),
- myComputeButton1 (0),
- myComputeButton2 (0),
myInteList1 (0),
myShapeList1 (0),
+ myComputeButton2 (0),
+ myTextView2 (0),
+ mySelButton2 (0),
+ myEditObjName2 (0),
myInteList2 (0),
- myShapeList2 (0),
- myCurrConstrId (-1)
+ myShapeList2 (0)
{
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_CHECK_SELF_INTERSECTIONS")));
}
nbPairs = getInters()->length()/2;
- if (nbPairs*2 != getInters()->length()) {
+ if (nbPairs*2 != (int)getInters()->length()) {
isOK = false;
}
}
aPmin = aTrimmedCurve->FirstParameter();
aPmax = aTrimmedCurve->LastParameter();
- aCircle = Handle(Geom_Circle)::DownCast( aTrimmedCurve );
+ aCircle = Handle(Geom_Circle)::DownCast( aTrimmedCurve ); // todo: useless downcast: aCircle always NULL
}
break;
}
aPmin = aTrimmedCurve->FirstParameter();
aPmax = aTrimmedCurve->LastParameter();
- aCircle = Handle(Geom_Circle)::DownCast( aTrimmedCurve );
+ aCircle = Handle(Geom_Circle)::DownCast( aTrimmedCurve ); // todo: useless downcast: aCircle always NULL
}
break;
// do not break, go to edge checking
aMeasuredShape = anExpEdge;
}
+ // fall through!
case TopAbs_EDGE:
{
}
}
break;
+ default:
+ break;
}
if ( aCircle.IsNull() )
return Operation_None;
}
- Standard_Real anAngTolerance = M_PI / 30.0; // 6 degree tolerance
+ //Standard_Real anAngTolerance = M_PI / 30.0; // 6 degree tolerance
switch ( anOwner->SelectionMode() )
{
gp_Pnt aPointOnBase = gp_Pnt( aFirstPoint.XYZ() + aBaseDir.XYZ() * aPointVector.Dot( aBaseDir ) );
// snapping tolerance
- Quantity_Length aSize[2];
+ Standard_Real aSize[2];
theView->Size( aSize[0], aSize[1] );
Standard_Real aSnapTolerance = 1e-2 * Max( aSize[0], aSize[1] );
const gp_Pnt& aFirstPoint = anAngle->FirstPoint();
const gp_Pnt& aSecondPoint = anAngle->SecondPoint();
- Standard_Boolean isPositive = anAngle->GetFlyout() > 0.0;
+ //Standard_Boolean isPositive = anAngle->GetFlyout() > 0.0;
gp_Dir aFirstDir = gce_MakeDir( aCenterPoint, aFirstPoint );
gp_Dir aSecondDir = gce_MakeDir( aCenterPoint, aSecondPoint );
Standard_Real MeasureGUI_DimensionInteractor::SensitivityTolerance( const Handle(V3d_View)& theView )
{
// snapping tolerance
- Quantity_Length aSize[2];
+ Standard_Real aSize[2];
theView->Size( aSize[0], aSize[1] );
return 1e-2 * Max( aSize[0], aSize[1] );
}
return aPrs;
}
}
- catch (Standard_Failure) {
+ catch (Standard_Failure&) {
return 0;
}
}
// function : isValid()
// purpose :
//=================================================================================
-bool MeasureGUI_DistanceDlg::isValid (QString& msg)
+bool MeasureGUI_DistanceDlg::isValid (QString& /*msg*/)
{
return myObj1 && myObj2;
}
TopExp::MapShapes(aSelShape2, anIndices2);
//Sub-shapes of 1st Object
- for (int i = 0; i < myInters1->length(); i++) {
+ for (int i = 0; i < (int)myInters1->length(); i++) {
TopoDS_Shape aSubShape = anIndices1.FindKey(myInters1[i]);
QString aType = GEOMBase::GetShapeTypeString(aSubShape);
if (!aType.isEmpty())
myShapeList1->selectAll();
//Sub-shapes of second Object
- for (int i = 0; i < myInters2->length(); i++) {
+ for (int i = 0; i < (int)myInters2->length(); i++) {
TopoDS_Shape aSubShape = anIndices2.FindKey(myInters2[i]);
QString aType = GEOMBase::GetShapeTypeString(aSubShape);
if (!aType.isEmpty())
GEOM::GEOM_IMeasureOperations::_narrow(getOperation());
bool isOK = true;
- bool HasInte;
+ bool HasInte = false;
try {
HasInte = anOper->FastIntersect(myObj1.get(), myObj2.get(), getTolerance(), getDeflection(), myInters1, myInters2);
}
for (i=0, anIter = aObjLstExist.begin(); anIter != aObjLstExist.end(); i++, ++anIter) {
anObjLst[i] = *anIter;
}
- for (int j = 0; j < aObjLstCreate->length(); j++) {
+ for (int j = 0; j < (int)aObjLstCreate->length(); j++) {
anObjLst[aObjLstExist.size()+j]=aObjLstCreate[j];
}
return anObjLst._retn();
//Collect general intersection list
aCompList->length(nbObj);
int i;
- for (i = 0; i < aList1->length(); i++) {
+ for (i = 0; i < (int)aList1->length(); i++) {
GEOMBase::PublishSubObject( aList1[i] );
aCompList[i]=aList1[i];
}
- for (int j = 0; j < aList2->length(); j++) {
+ for (int j = 0; j < (int)aList2->length(); j++) {
GEOMBase::PublishSubObject( aList2[j] );
aCompList[i+j]=aList2[j];
}
Handle(AIS_InteractiveContext) anAISContext = myOperatedViewer->getAISContext();
- anAISContext->ClearCurrents( Standard_False );
+ anAISContext->ClearCurrents( Standard_False ); // todo: deprecated OCCT API
anAISContext->ClearSelected( Standard_False );
Handle(MeasureGUI_DimensionFilter) aFilter = new MeasureGUI_DimensionFilter( myEditObject->GetStudyEntry() );
anAISContext->InitSelected();
Handle(AIS_InteractiveObject) anAIS;
- anAIS = anAISContext->Current();
+ anAIS = anAISContext->Current(); // todo: deprecated OCCT API
int aDimensionId = IdFromPrs( anAIS );
{
return;
}
- anAISContext->ClearCurrents( Standard_False );
+ anAISContext->ClearCurrents( Standard_False ); // todo: deprecated OCCT API
SOCC_Prs* aPrs = dynamic_cast<SOCC_Prs*>( theViewer->CreatePrs( myEditObject->GetStudyEntry() ) );
AIS_ListOfInteractive aListOfIO;
anAISContext->Activate( anIO, AIS_DSM_Text );
#endif
- anAISContext->AddOrRemoveCurrentObject( anIO, Standard_False );
+ anAISContext->AddOrRemoveCurrentObject( anIO, Standard_False ); // todo: deprecated OCCT API
anAISContext->UpdateCurrentViewer();
}
}
// class : MeasureGUI_ShapeStatisticsDlg()
//===========================================================================
MeasureGUI_ShapeStatisticsDlg::MeasureGUI_ShapeStatisticsDlg( QWidget* parent, TopoDS_Shape aShape, TopAbs_ShapeEnum aSubShapeType )
-: GEOMBase_Helper( SUIT_Session::session()->activeApplication()->desktop() ),
- QDialog( parent ),
+: QDialog( parent ),
+ GEOMBase_Helper( SUIT_Session::session()->activeApplication()->desktop() ),
myHistogram ( 0 )
{
myShapes.push_back( aShape );
// computed deflection coefficient is stored as absolute.
Prs3d::GetDeflection (myshape, myDrawer);
#endif
- }
+ } // fall through!
// End 0023271
case CustomHighlight:
{
else
aDir = -aDirVec;
- Prs3d_Arrow::Draw(aPrs, aP2, aDir, M_PI/180.*5., aDist/10.);
+ Prs3d_Arrow::Draw(aPrs->CurrentGroup(), aP2, aDir, M_PI/180.*5., aDist/10.);
}
}
}
aGroup->AddText (aText);
#else
Graphic3d_Vertex aVertex( aCenter.X(), aCenter.Y(), aCenter.Z() );
- aGroup->Text( aString.toUtf8().constData(), aVertex, 14 );
+ aGroup->Text( aString.toUtf8().constData(), aVertex, 14 ); // deprecated API, to be removed (see above)
#endif
}
}
aGroup->AddText(aText);
#else
Graphic3d_Vertex aVertex( aCenter.X(), aCenter.Y(), aCenter.Z() );
- aGroup->Text( TCollection_ExtendedString( aName ), aVertex, 16 );
+ aGroup->Text( TCollection_ExtendedString( aName ), aVertex, 16 ); // deprecated API, to be removed (see above)
#endif
}
#include "SALOME_InteractiveObject.hxx"
-//vtkStandardNewMacro(GEOM_Actor);
+//vtkStandardNewMacro(GEOM_Actor)
#ifndef MYDEBUG
//#define MYDEBUG
return myShape;
}
-void GEOM_Actor::setInputShape(const TopoDS_Shape& ashape, double adef1,
- int imode, bool isVector)
+void GEOM_Actor::setInputShape(const TopoDS_Shape& /*ashape*/, double /*adef1*/,
+ int /*imode*/, bool /*isVector*/)
{
#ifdef MYDEBUG
MESSAGE ( "GEOM_Actor::setInputShape" );
*/
bool
GEOM_Actor
-::PreHighlight(vtkInteractorStyle *theInteractorStyle,
+::PreHighlight(vtkInteractorStyle* /*theInteractorStyle*/,
SVTK_SelectionEvent* theSelectionEvent,
bool theIsHighlight)
{
class GEOM_OBJECT_EXPORT GEOM_Actor: public SALOME_Actor
{
public:
- vtkTypeMacro(GEOM_Actor,SALOME_Actor);
+ vtkTypeMacro(GEOM_Actor,SALOME_Actor)
static GEOM_Actor* New();
void SetShape(const TopoDS_Shape& theShape,
unsigned int aResolution = GetContext()->CurrentViewer()->DefaultRenderingParams().Resolution;
if ( aFont.Init( anAsp->Aspect()->Font().ToCString(),
anAsp->Aspect()->GetTextFontAspect(),
- (unsigned int)anAsp->Height(),
- aResolution ) )
+ (unsigned int)anAsp->Height(),
+ aResolution ) ) // deprecated API, to be removed (see above)
#endif
{
const NCollection_String aText( (Standard_Utf16Char* )myText.ToExtString() );
// to avoid jittering when dragging text
myTextDraw->SetPosition( OpenGl_Vec3( static_cast<float>( myAISObject->myPosition.X() ),
static_cast<float>( myAISObject->myPosition.Y() ),
- static_cast<float>( myAISObject->myPosition.Z() ) ) );
+ static_cast<float>( myAISObject->myPosition.Z() ) ) ); // todo: deprecated OCCT API
}
myTextDraw->Render( theWorkspace );
#include <VTKViewer_TransformFilter.h>
-vtkStandardNewMacro(GEOM_DeviceActor);
+vtkStandardNewMacro(GEOM_DeviceActor)
GEOM_DeviceActor::GEOM_DeviceActor() :
- myStripper(vtkStripper::New(), true),
- myPolyDataMapper(vtkPolyDataMapper::New(), true),
myPolyDataNormals(vtkPolyDataNormals::New(), true),
+ myPolyDataMapper(vtkPolyDataMapper::New(), true),
+ myStripper(vtkStripper::New(), true),
myActor(VTKViewer_Actor::New(), true),
myTransformFilter(VTKViewer_TransformFilter::New())
{
myTransformFilter->SetInputConnection(myStripper->GetOutputPort());
myPolyDataMapper->SetInputConnection(myTransformFilter->GetOutputPort());
}
- else
+ else {
myTransformFilter->SetInputConnection(thePolyData);
myPolyDataMapper->SetInputConnection(myTransformFilter->GetOutputPort());
+ }
}
void
class VTK_EXPORT GEOM_DeviceActor: public vtkObject
{
public:
- vtkTypeMacro(GEOM_DeviceActor,vtkObject);
+ vtkTypeMacro(GEOM_DeviceActor,vtkObject)
static GEOM_DeviceActor* New();
void SetProperty(vtkProperty* theProperty);
//=======================================================================
int GEOM_OCCReader::RequestData(vtkInformation *vtkNotUsed(request),
- vtkInformationVector **inputVector,
+ vtkInformationVector **/*inputVector*/,
vtkInformationVector *outputVector)
{
vtkInformation *outInfo = outputVector->GetInformationObject(0);
Standard_Real T2,
vtkPoints* Pts,
vtkCellArray* Cells,
- Standard_Integer& startidx)
+ Standard_Integer& /*startidx*/)
{
Standard_Boolean halt = Standard_False;
// Purpose : Transfer wireframe data for VERTEX
//=======================================================================
-void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& aVertex,
+void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& /*aVertex*/,
vtkPoints* Pts,
vtkCellArray* Cells)
{
// Purpose : Transfer shading data for EDGE
//=======================================================================
-void GEOM_OCCReader::TransferEdgeSData(const TopoDS_Edge& aFace,
- vtkPoints* Pts,
- vtkCellArray* Cells)
+void GEOM_OCCReader::TransferEdgeSData(const TopoDS_Edge& /*aFace*/,
+ vtkPoints* /*Pts*/,
+ vtkCellArray* /*Cells*/)
{
}
#include <vtkObjectFactory.h>
-vtkStandardNewMacro(GEOM_PainterPolyDataMapper);
+vtkStandardNewMacro(GEOM_PainterPolyDataMapper)
{
public:
#ifndef VTK_OPENGL2
- vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper);
+ vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper)
#else
- vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPolyDataMapper);
+ vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPolyDataMapper)
#endif
static GEOM_PainterPolyDataMapper* New();
- virtual void RenderPiece(vtkRenderer *ren, vtkActor *act) {}
+ virtual void RenderPiece(vtkRenderer* /*ren*/, vtkActor* /*act*/) {}
protected:
GEOM_PainterPolyDataMapper() {}
#include <vtkObjectFactory.h>
-vtkStandardNewMacro( GEOM_VTKPropertyMaterial );
+vtkStandardNewMacro( GEOM_VTKPropertyMaterial )
GEOM_VTKPropertyMaterial::GEOM_VTKPropertyMaterial()
{
virtual ~GEOM_VTKPropertyMaterial();
public:
- vtkTypeMacro(GEOM_VTKPropertyMaterial, vtkProperty);
+ vtkTypeMacro(GEOM_VTKPropertyMaterial, vtkProperty)
vtkSetMacro(Physical, bool);
vtkGetMacro(Physical, bool);
public:
- vtkTypeMacro( GEOM_VTKTrihedronAxis, VTKViewer_Axis );
+ vtkTypeMacro( GEOM_VTKTrihedronAxis, VTKViewer_Axis )
static GEOM_VTKTrihedronAxis* New();
void SetAxis( const gp_Ax1& theAxis, const int theRot, double theColor[ 3 ] );
vtkTransform* myTrsf;
};
-vtkStandardNewMacro( GEOM_VTKTrihedronAxis );
+vtkStandardNewMacro( GEOM_VTKTrihedronAxis )
GEOM_VTKTrihedronAxis::GEOM_VTKTrihedronAxis()
{
Placement of trihedron is changed with SetPlacement() method
*/
-vtkStandardNewMacro( GEOM_VTKTrihedron );
+vtkStandardNewMacro( GEOM_VTKTrihedron )
GEOM_VTKTrihedron::GEOM_VTKTrihedron()
{
virtual ~GEOM_VTKTrihedron();
public:
- vtkTypeMacro( GEOM_VTKTrihedron, SALOME_Actor );
+ vtkTypeMacro( GEOM_VTKTrihedron, SALOME_Actor )
static GEOM_VTKTrihedron* New();
virtual double GetSize() { return mySize;}
#include <vtkInformation.h>
#include <vtkInformationVector.h>
-vtkStandardNewMacro(GEOM_EdgeSource);
+vtkStandardNewMacro(GEOM_EdgeSource)
GEOM_EdgeSource::GEOM_EdgeSource() :
myIsVector(false)
class OCC2VTK_EXPORT GEOM_EdgeSource: public vtkPolyDataAlgorithm
{
public:
- vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataAlgorithm);
+ vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataAlgorithm)
static GEOM_EdgeSource* New();
void AddEdge (const TopoDS_Edge& theEdge,
class OCC2VTK_EXPORT GEOM_FaceSource: public vtkPolyDataAlgorithm
{
public:
- vtkTypeMacro(GEOM_FaceSource,vtkPolyDataAlgorithm);
+ vtkTypeMacro(GEOM_FaceSource,vtkPolyDataAlgorithm)
void AddFace(const TopoDS_Face& theFace);
void Clear(){ myFaceSet.Clear();}
#include <Poly_Triangulation.hxx>
-vtkStandardNewMacro(GEOM_ShadingFace);
+vtkStandardNewMacro(GEOM_ShadingFace)
GEOM_ShadingFace::GEOM_ShadingFace()
{
class OCC2VTK_EXPORT GEOM_ShadingFace: public GEOM_FaceSource
{
public:
- vtkTypeMacro(GEOM_ShadingFace,GEOM_FaceSource);
+ vtkTypeMacro(GEOM_ShadingFace,GEOM_FaceSource)
static GEOM_ShadingFace* New();
static
#include <gp_Pnt.hxx>
#include <BRep_Tool.hxx>
-vtkStandardNewMacro(GEOM_VertexSource);
+vtkStandardNewMacro(GEOM_VertexSource)
GEOM_VertexSource::GEOM_VertexSource()
{
class OCC2VTK_EXPORT GEOM_VertexSource: public vtkPolyDataAlgorithm
{
public:
- vtkTypeMacro(GEOM_VertexSource,vtkPolyDataAlgorithm);
+ vtkTypeMacro(GEOM_VertexSource,vtkPolyDataAlgorithm)
static GEOM_VertexSource* New();
void AddVertex(const TopoDS_Vertex& theVertex);
#include <BRep_Tool.hxx>
#include <TColStd_Array1OfReal.hxx>
-vtkStandardNewMacro(GEOM_WireframeFace);
+vtkStandardNewMacro(GEOM_WireframeFace)
GEOM_WireframeFace::GEOM_WireframeFace():
Discret(15)
case GeomAbs_BSplineCurve :
case GeomAbs_OtherCurve :
for(j = 1; j <= theDiscret/2; j++){
- Standard_Real aStep = (theIsoType == GeomAbs_IsoV) ? stepU*2. : stepV*2.;
- CreateIso__(S, theIsoType, U1, V1, aStep, thePolyData, thePts);
+ Standard_Real aStep = (theIsoType == GeomAbs_IsoV) ? stepU*2. : stepV*2.;
+ CreateIso__(S, theIsoType, U1, V1, aStep, thePolyData, thePts);
U1 += stepU*2.;
V1 += stepV*2.;
}
break;
+ default:
+ break;
}
}
}
class OCC2VTK_EXPORT GEOM_WireframeFace: public GEOM_FaceSource
{
public:
- vtkTypeMacro(GEOM_WireframeFace,GEOM_FaceSource);
+ vtkTypeMacro(GEOM_WireframeFace,GEOM_FaceSource)
static GEOM_WireframeFace* New();
/* vtkSetMacro(NbIso,int);
ret->ShallowCopy(myAppendFilter->GetOutput());
myAppendFilter->Delete();
}
- catch(Standard_Failure) {
+ catch(Standard_Failure&) {
}
}
return ret;
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void OperationGUI_ArchimedeDlg::ValueChangedInSpinBox(double newValue)
+void OperationGUI_ArchimedeDlg::ValueChangedInSpinBox(double /*newValue*/)
{
processPreview();
}
default: aLimit = GEOM::SHAPE ; break;
}
- GEOM::shape_state aState;
+ GEOM::shape_state aState = GEOM::ST_IN; // todo: aState must be explicitly initialized to avoid warning (see below)
switch (GroupPoints->ComboBox2->currentIndex())
{
case 0: aState = GEOM::ST_IN; break;
GEOM::GEOM_IShapesOperations_var anOper = GEOM::GEOM_IShapesOperations::_narrow(getOperation());
GEOM::GEOM_Object_var anObj = anOper->GetShapesOnShapeAsCompound(myObject2, myObject1,
(CORBA::Short) aLimit,
- aState);
+ aState); // todo: aState must be explicitly initialized to avoid warning (see above)
if (!anObj->_is_nil())
objects.push_back(anObj._retn());
// function : ConstructorsClicked()
// purpose : Radio button management
//=================================================================================
-void OperationGUI_GetSharedShapesDlg::ConstructorsClicked (int constructorId)
+void OperationGUI_GetSharedShapesDlg::ConstructorsClicked (int /*constructorId*/)
{
disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
globalSelection();
//myListMaterials.length( 0 ); // obsolete
GEOM::shape_type type = GEOM::SHAPE;
- for (int i = 0; i < myListShapes.length(); i++)
+ for (int i = 0; i < (int)myListShapes.length(); i++)
type = qMin( type, myListShapes[i]->GetMaxShapeType() );
int idx = qMax( 0, GroupPoints->ComboBox1->findData( type ) );
GroupPoints->ComboBox1->setCurrentIndex( idx );
QList<GEOM::GeomObjPtr> OperationGUI_PartitionDlg::getSourceObjects()
{
QList<GEOM::GeomObjPtr> res;
- for (int i = 0; i < myListShapes.length(); i++) {
+ for (int i = 0; i < (int)myListShapes.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(myListShapes[i]);
res << aGeomObjPtr;
}
- for (int i = 0; i < myListTools.length(); i++) {
+ for (int i = 0; i < (int)myListTools.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(myListTools[i]);
res << aGeomObjPtr;
}
- for (int i = 0; i < myListRemoveInside.length(); i++) {
+ for (int i = 0; i < (int)myListRemoveInside.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(myListRemoveInside[i]);
res << aGeomObjPtr;
}
- for (int i = 0; i < myListKeepInside.length(); i++) {
+ for (int i = 0; i < (int)myListKeepInside.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(myListKeepInside[i]);
res << aGeomObjPtr;
}
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void PrimitiveGUI_FaceDlg::ValueChangedInSpinBox( double newValue )
+void PrimitiveGUI_FaceDlg::ValueChangedInSpinBox( double /*newValue*/ )
{
displayPreview(true);
}
// function : isValid()
// purpose : Verify validity of input data
//=================================================================================
-bool RepairGUI_FuseEdgesDlg::isValid (QString& msg)
+bool RepairGUI_FuseEdgesDlg::isValid (QString& /*msg*/)
{
return (!myShape->_is_nil());
}
aHelpFileName = "glue_faces_operation_page.html";
break;
}
+ default:
+ break;
}
setHelpFileName(aHelpFileName);
// purpose : Constructs a RepairGUI_InspectObjectDlg which is a child of 'parent'.
//=================================================================================
RepairGUI_InspectObjectDlg::RepairGUI_InspectObjectDlg(GeometryGUI *theGeomGUI, SUIT_Desktop* parent )
-: GEOMBase_Helper (parent),
- QDialog (parent),
+: QDialog (parent),
+ GEOMBase_Helper (parent),
myGeomGUI (theGeomGUI),
myTreeObjects (0),
myFilteredTreeObjects (0),
myTolFilterGrp (0),
myShapeTypeBtnGrp (0),
myComparisonCompo (0),
+ myTolEdit (0),
myMinTolValLabel (0),
myMaxTolValLabel (0),
- myTolEdit (0),
myTreesLayout (0),
- myTransparency (0.0),
- myIsSelectAll (false),
myMaxTol (-1.),
- myMinTol (-1.)
+ myMinTol (-1.),
+ myIsSelectAll (false),
+ myTransparency (0.0)
{
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
QIcon iconSelect( resMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
GEOM::ListOfGO_var aList = anOper->MakeSubShapes( aMainObject, anArray );
// publish sub-shapes
- for ( int i = 0; i < aList->length(); i++ )
+ for ( int i = 0; i < (int)aList->length(); i++ )
GeometryGUI::GetGeomGen()->AddInStudy( aList[i],
anIndices.values().at(i).toStdString().c_str(), aMainObject );
// function : ConstructorsClicked()
// purpose : Radio button management
//=================================================================================
-void RepairGUI_LimitToleranceDlg::ConstructorsClicked(int constructorId)
+void RepairGUI_LimitToleranceDlg::ConstructorsClicked(int /*constructorId*/)
{
disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
// function : enterEvent()
// purpose : Mouse enter onto the dialog to activate it
//=================================================================================
-void RepairGUI_RemoveExtraEdgesDlg::enterEvent(QEvent* e)
+void RepairGUI_RemoveExtraEdgesDlg::enterEvent(QEvent*)
{
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
// function : isValid
// purpose :
//=================================================================================
-bool RepairGUI_RemoveExtraEdgesDlg::isValid( QString& msg )
+bool RepairGUI_RemoveExtraEdgesDlg::isValid( QString& /*msg*/ )
{
return myOkObject;
}
// function : enterEvent()
// purpose : Mouse enter onto the dialog to activate it
//=================================================================================
-void RepairGUI_RemoveWebsDlg::enterEvent (QEvent* e)
+void RepairGUI_RemoveWebsDlg::enterEvent (QEvent*)
{
if (!mainFrame()->GroupConstructors->isEnabled())
ActivateThisDialog();
// function : isValid
// purpose :
//=================================================================================
-bool RepairGUI_RemoveWebsDlg::isValid (QString& msg)
+bool RepairGUI_RemoveWebsDlg::isValid (QString& /*msg*/)
{
return myOkObject;
}
anOp->GetShapeProcessParameters( anOperators, aParams, aValues );
// check the default items-operators
- for ( int i = 0; i < anOperators->length(); i++ ) {
+ for ( int i = 0; i < (int)anOperators->length(); i++ ) {
//MESSAGE("-->"<<(const char*)anOperators[i]);
QList<QListWidgetItem*> items = myOpList->findItems ( (const char*)anOperators[i], Qt::MatchFixedString );
if ( items.count() )
if ( aParams->length() != aValues->length() )
continue;
- for ( int j = 0; j < aParams->length(); j++ ) {
+ for ( int j = 0; j < (int)aParams->length(); j++ ) {
QWidget* aCtrl = getControl( (const char*)aParams[j] );
setValue( aCtrl, set_convert( (const char*)aParams[j], aValues[j] ));
}
*/// -----------
QStringList anErrorObjNames;
- for ( int i = 0; i < myObjects->length(); i++ ) {
+ for ( int i = 0; i < (int)myObjects->length(); i++ ) {
GEOM::GEOM_Object_var obj = myObjects[i];
GEOM::GEOM_IHealingOperations_var anOper = GEOM::GEOM_IHealingOperations::_narrow( getOperation() );
GEOM::GEOM_Object_var anObj = anOper->ProcessShape( obj, anOperators, aParams, aValues );
{
QStringList aParameters;
- for ( int i = 0; i < anOperators->length(); i++ )
+ for ( int i = 0; i < (int)anOperators->length(); i++ )
aParameters << QString( anOperators[i] );
- for ( int i = 0; i < aParams->length(); i++ )
+ for ( int i = 0; i < (int)aParams->length(); i++ )
aParameters << QString( aParams[i] );
aParameters << getTexts( aParams );
if ( !anErrorObjNames.empty() )
MESSAGE( "ERRORS occurred while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() );
- return anErrorObjNames.size() < myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing.
+ return anErrorObjNames.size() < (int)myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing.
}
//=================================================================================
int i = 0, j = 0;
// calculate the length of parameters
- for ( i = 0, j = 0; i < theOperators.length(); i++ )
+ for ( i = 0, j = 0; i < (int)theOperators.length(); i++ )
j += myValMap[ QString( theOperators[i].in() ) ].size();
// set the new length of parameters
aParams->length( j );
// fill the parameters
- for ( i = 0, j = 0; i < theOperators.length(); i++ ) {
+ for ( i = 0, j = 0; i < (int)theOperators.length(); i++ ) {
QStringList aParamLst = myValMap[ QString( theOperators[i].in() ) ];
foreach ( QString aParam, aParamLst ) {
aParams[j++] = CORBA::string_dup( aParam.toLatin1().constData() );
GEOM::string_array_var aValues = new GEOM::string_array();
aValues->length( theParams.length() );
- for ( int i = 0; i < theParams.length(); i++ ) {
+ for ( int i = 0; i < (int)theParams.length(); i++ ) {
QWidget* aCtrl = getControl( (const char*)theParams[i] );
if ( aCtrl )
aValues[i] = get_convert( (const char*)theParams[i], getValue( aCtrl ));
{
QStringList aTexts;
- for ( int i = 0; i < theParams.length(); i++ ) {
+ for ( int i = 0; i < (int)theParams.length(); i++ ) {
QWidget* aCtrl = getControl( (const char*)theParams[i] );
if ( aCtrl )
{
{
QList<GEOM::GeomObjPtr> res;
GEOM::ListOfGO aListPtr(myObjects);
- for (int i = 0; i < aListPtr.length(); i++) {
+ for (int i = 0; i < (int)aListPtr.length(); i++) {
GEOM::GeomObjPtr aGeomObjPtr(aListPtr[i]);
res << aGeomObjPtr;
}
// function : enterEvent()
// purpose : Mouse enter onto the dialog to activate it
//=================================================================================
-void RepairGUI_UnionFacesDlg::enterEvent(QEvent* e)
+void RepairGUI_UnionFacesDlg::enterEvent(QEvent*)
{
if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
// function : isValid
// purpose :
//=================================================================================
-bool RepairGUI_UnionFacesDlg::isValid( QString& msg )
+bool RepairGUI_UnionFacesDlg::isValid( QString& /*msg*/ )
{
return myOkObject;
}
void Sketcher_Profile::ShapeFunctor::addSegmentX( const TCollection_AsciiString& x,
int CurrentIndex )
{
+ (void)CurrentIndex; // unused in release mode
myMove = none;
myLength = x.RealValue();
if ( Abs( myDx ) < Precision::Confusion() ) {
void Sketcher_Profile::ShapeFunctor::addSegmentY( const TCollection_AsciiString& y,
int CurrentIndex )
{
+ (void)CurrentIndex; // unused in release mode
myMove = none;
myLength = y.RealValue();
if ( Abs( myDy ) < Precision::Confusion() ) {
\internal
*/
void Sketcher_Profile::DumpFunctor::addSegmentX( const TCollection_AsciiString& x,
- int CurrentIndex )
+ int /*CurrentIndex*/ )
{
myDescr += "sk.addSegmentX(";
myDescr += x + ")";
\internal
*/
void Sketcher_Profile::DumpFunctor::addSegmentY( const TCollection_AsciiString& y,
- int CurrentIndex )
+ int /*CurrentIndex*/ )
{
myDescr += "sk.addSegmentY(";
myDescr += y + ")";
*/
void Sketcher_Profile::DumpFunctor::addSegmentAngleLength( const TCollection_AsciiString& angle,
const TCollection_AsciiString& length,
- int& CurrentIndex )
+ int& /*CurrentIndex*/ )
{
double aAngle = angle.RealValue();
if ( aAngle == 90 ) {
*/
void Sketcher_Profile::DumpFunctor::addSegmentAngleX( const TCollection_AsciiString& angle,
const TCollection_AsciiString& x,
- int& CurrentIndex )
+ int& /*CurrentIndex*/ )
{
double aAngle = angle.RealValue();
if ( aAngle == 90 ) {
*/
void Sketcher_Profile::DumpFunctor::addSegmentAngleY( const TCollection_AsciiString& angle,
const TCollection_AsciiString& y,
- int& CurrentIndex )
+ int& /*CurrentIndex*/ )
{
double aAngle = angle.RealValue();
if ( aAngle == 90 ) {
void Sketcher_Profile::DumpFunctor::addSegmentDirectionLength( const TCollection_AsciiString& dx,
const TCollection_AsciiString& dy,
const TCollection_AsciiString& length,
- int& CurrentIndex )
+ int& /*CurrentIndex*/ )
{
myDescr += "sk.addSegmentDirectionLength(";
myDescr += dx + ", " + dy + ", " + length + ")";
void Sketcher_Profile::DumpFunctor::addSegmentDirectionX( const TCollection_AsciiString& dx,
const TCollection_AsciiString& dy,
const TCollection_AsciiString& x,
- int& CurrentIndex )
+ int& /*CurrentIndex*/ )
{
myDescr += "sk.addSegmentDirectionX(";
myDescr += dx + ", " + dy + ", " + x + ")";
void Sketcher_Profile::DumpFunctor::addSegmentDirectionY( const TCollection_AsciiString& dx,
const TCollection_AsciiString& dy,
const TCollection_AsciiString& y,
- int& CurrentIndex )
+ int& /*CurrentIndex*/ )
{
myDescr += "sk.addSegmentDirectionY(";
myDescr += dx + ", " + dy + ", " + y + ")";
void Sketcher_Profile::DumpFunctor::addArcAngleRadiusLength( const TCollection_AsciiString& angle,
const TCollection_AsciiString& radius,
const TCollection_AsciiString& length ,
- int& CurrentIndex )
+ int& /*CurrentIndex*/ )
{
double aAngle = angle.RealValue();
if ( aAngle == 90 ) {
const TCollection_AsciiString& dy,
const TCollection_AsciiString& radius,
const TCollection_AsciiString& length ,
- int& CurrentIndex )
+ int& /*CurrentIndex*/ )
{
myDescr += "sk.addArcDirectionRadiusLength(";
myDescr += dx + ", " + dy + ", " + radius + ", " + length + ")";
\param cmd sketcher script to parse
\internal
*/
-void Sketcher_Profile::parse( const TCollection_AsciiString& cmd, Functor* functor )
+void Sketcher_Profile::parse( const TCollection_AsciiString& /*cmd*/, Functor* functor )
{
int CurrentIndex = 1;
int NumberOfArg = 0;
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
+Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
if( status == IFSelect_RetDone )
return 1;
}
- catch (Standard_Failure)
+ catch (Standard_Failure&)
{
//THROW_SALOME_CORBA_EXCEPTION("Exception caught in STEPExport", SALOME::BAD_PARAM);
}
*/
//================================================================================
bool STEPPlugin_ExportDriver::
-GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& theParams )
+GetCreationInformation( std::string& /*theOperationName*/,
+ std::vector<GEOM_Param>& /*theParams*/ )
{
return false;
}
-IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver )
class STEPPlugin_ExportDriver : public GEOM_BaseDriver
{
bool
STEPPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal,
const TCollection_AsciiString& theFileName,
- const TCollection_AsciiString& theFormatName )
+ const TCollection_AsciiString& /*theFormatName*/ )
{
STEPPlugin_IOperations* aPluginOperations = STEPPlugin_OperationsCreator::get( GetEngine() );
const STEPPlugin_IOperations::LengthUnit aUnit = STEPPlugin_IOperations::LengthUnit_Meter;
//=============================================================================
TCollection_AsciiString
STEPPlugin_IECallBack::ReadValue( const TCollection_AsciiString& theFileName,
- const TCollection_AsciiString& theFormatName,
+ const TCollection_AsciiString& /*theFormatName*/,
const TCollection_AsciiString& theParameterName )
{
STEPPlugin_IOperations* aPluginOperations = STEPPlugin_OperationsCreator::get( GetEngine() );
return aValue;
}
-IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver )
class STEPPlugin_ImportDriver : public GEOM_BaseDriver
{
log->SetTouched(Label());
return 1;
}
- catch( Standard_Failure )
+ catch( Standard_Failure& )
{
//THROW_SALOME_CORBA_EXCEPTION("Exception caught in ExportSTL", SALOME::BAD_PARAM);
}
*/
//================================================================================
bool STLPlugin_ExportDriver::
-GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& theParams )
+GetCreationInformation( std::string& /*theOperationName*/,
+ std::vector<GEOM_Param>& /*theParams*/ )
{
return false;
}
-IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver )
class STLPlugin_ExportDriver : public GEOM_BaseDriver
{
getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) );
}
- return true; // ?????????
+ return result;
}
//=======================================================================
*/
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
-STLPlugin_IECallBack::Import( const TCollection_AsciiString& theFormatName,
+STLPlugin_IECallBack::Import( const TCollection_AsciiString& /*theFormatName*/,
const TCollection_AsciiString& theFileName )
{
STLPlugin_IOperations* aPluginOperations = STLPlugin_OperationsCreator::get( GetEngine() );
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver )
class STLPlugin_ImportDriver : public GEOM_BaseDriver
{
if (!BRep_Tool::Degenerated (TopoDS::Edge (aExp.Current())))
if(myEdgeFaces.Contains(aExp.Current()) && myEdgeFaces.FindFromKey(aExp.Current()).Extent() >1)
continue;
- aSeqEdges->Append(aExp.Current());
+ aSeqEdges->Append(aExp.Current()); // to do: mustn't this clause be within if(!BRep_Tool::Degenerated...)?
}
}
theSenses = aBuilder.Sense();
}
- catch (Standard_Failure) {
+ catch (Standard_Failure&) {
aSurf.Nullify();
return aSurf;
}
for(; aIterOtherFace.More() && aIsDeleted ; aIterOtherFace.Next()) {
if(aIterOtherFace.Value().IsSame(theFace))
continue;
- TopoDS_Face aFaceOther = TopoDS::Face(aIterOtherFace.Value());
- Handle(Geom_Surface) aSurf = BRep_Tool::Surface( aFaceOther);
- aIsDeleted = (aSurf != aSurfDel);
+ TopoDS_Face aFaceOther = TopoDS::Face(aIterOtherFace.Value());
+ Handle(Geom_Surface) aSurf = BRep_Tool::Surface( aFaceOther);
+ aIsDeleted = (aSurf != aSurfDel);
}
TopoDS_Edge aEdge = TopoDS::Edge(myContext->Apply(aExpEdges.Current()));
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void TransformationGUI_ExtensionDlg::ValueChangedInSpinBox(double newValue)
+void TransformationGUI_ExtensionDlg::ValueChangedInSpinBox(double /*newValue*/)
{
processPreview();
}
// function : TextValueChangedInSpinBox
// purpose :
//=================================================================================
-void TransformationGUI_MultiTranslationDlg::TextValueChangedInSpinBox( const QString& s)
+void TransformationGUI_MultiTranslationDlg::TextValueChangedInSpinBox( const QString& )
{
QObject* send = (QObject*)sender();
bool isDigit = true;
{
anObj = anOper->ScaleShapeAlongAxesCopy(myObjects[i].get(), myPoint.get(), SpinBox_FX->value(),
SpinBox_FY->value(), SpinBox_FZ->value());
- if (!anObj->_is_nil())
+ if (!anObj->_is_nil()) {
if(!IsPreview()) {
QStringList aParameters;
aParameters<<SpinBox_FX->text();
anObj->SetParameters(aParameters.join(":").toUtf8().constData());
}
objects.push_back(anObj._retn());
+ }
}
}
else
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
+Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& /*log*/) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return 1;
}
- catch( Standard_Failure )
+ catch( Standard_Failure& )
{
//THROW_SALOME_CORBA_EXCEPTION("Exception caught in ExportVTK", SALOME::BAD_PARAM);
}
*/
//================================================================================
bool VTKPlugin_ExportDriver::
-GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& theParams )
+GetCreationInformation( std::string& /*theOperationName*/,
+ std::vector<GEOM_Param>& /*theParams*/ )
{
return false;
}
-IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver )
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver );
+DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver )
class VTKPlugin_ExportDriver : public GEOM_BaseDriver
{
getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) );
}
- return true; // ???????????
+ return result;
}
//=======================================================================
//=============================================================================
bool VTKPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal,
const TCollection_AsciiString& theFileName,
- const TCollection_AsciiString& theFormatName )
+ const TCollection_AsciiString& /*theFormatName*/ )
{
VTKPlugin_IOperations* aPluginOperations = VTKPlugin_OperationsCreator::get( GetEngine() );
const double aDeflection = 0.001;
using namespace XAO;
-BooleanField::BooleanField(const XAO::Dimension& dimension,
- const int& nbElements, const int& nbComponents, const std::string& name)
+BooleanField::BooleanField(XAO::Dimension dimension,
+ int nbElements, int nbComponents, const std::string& name)
: Field(dimension, nbElements, nbComponents, name)
{
}
-Step* BooleanField::addNewStep(const int& step)
-throw (XAO_Exception)
+Step* BooleanField::addNewStep(int step)
{
return addStep(step, 0);
}
-BooleanStep* BooleanField::addStep(const int& step)
-throw (XAO_Exception)
+BooleanStep* BooleanField::addStep(int step)
{
return addStep(step, 0);
}
-BooleanStep* BooleanField::addStep(const int& step, const int& stamp)
-throw (XAO_Exception)
+BooleanStep* BooleanField::addStep(int step, int stamp)
{
if (hasStep(step))
throw XAO_Exception(MsgBuilder() << "Step with number " << step << " already exists.");
return bstep;
}
-BooleanStep* BooleanField::getStep(const int& index)
-throw (XAO_Exception)
+BooleanStep* BooleanField::getStep(int index)
{
checkStepIndex(index);
return (BooleanStep*)m_steps[index];
* @param nbComponents the number of components.
* @param name the name of the field.
*/
- BooleanField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name);
+ BooleanField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name);
- virtual const XAO::Type getType() { return XAO::BOOLEAN; }
+ virtual XAO::Type getType() { return XAO::BOOLEAN; }
- virtual Step* addNewStep(const int& step) throw (XAO_Exception);
+ virtual Step* addNewStep(int step);
/**
* Adds a new step.
* @param step the number of the step.
* @return the newly created step.
*/
- BooleanStep* addStep(const int& step) throw (XAO_Exception);
+ BooleanStep* addStep(int step);
/**
* Adds a new step.
* @param stamp the stamp of the step.
* @return the newly created step.
*/
- BooleanStep* addStep(const int& step, const int& stamp)
- throw (XAO_Exception);
+ BooleanStep* addStep(int step, int stamp);
/**
* Gets the step of given index.
* @param index the index.
* @return the step for the given index.
*/
- BooleanStep* getStep(const int& index) throw (XAO_Exception);
+ BooleanStep* getStep(int index);
};
}
using namespace XAO;
-BooleanStep::BooleanStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents)
+BooleanStep::BooleanStep(int step, int stamp, int nbElements, int nbComponents)
{
m_nbElements = nbElements;
m_nbComponents = nbComponents;
return result;
}
-std::vector<bool> BooleanStep::getElement(const int& element)
-throw (XAO_Exception)
+std::vector<bool> BooleanStep::getElement(int element)
{
checkElementIndex(element);
return result;
}
-std::vector<bool> BooleanStep::getComponent(const int& component)
-throw (XAO_Exception)
+std::vector<bool> BooleanStep::getComponent(int component)
{
checkComponentIndex(component);
return result;
}
-const bool BooleanStep::getValue(const int& element, const int& component)
-throw (XAO_Exception)
+bool BooleanStep::getValue(int element, int component)
{
checkElementIndex(element);
checkComponentIndex(component);
return m_values[element][component];
}
-const std::string BooleanStep::getStringValue(const int& element, const int& component)
-throw (XAO_Exception)
+const std::string BooleanStep::getStringValue(int element, int component)
{
return XaoUtils::booleanToString(getValue(element, component));
}
void BooleanStep::setValues(const std::vector<bool>& values)
-throw (XAO_Exception)
{
checkNbValues((int)values.size());
}
}
-void BooleanStep::setElement(const int& element, const std::vector<bool>& elements)
-throw (XAO_Exception)
+void BooleanStep::setElement(int element, const std::vector<bool>& elements)
{
checkElementIndex(element);
checkNbComponents(elements.size());
m_values[element][i] = elements[i];
}
-void BooleanStep::setComponent(const int& component, const std::vector<bool>& components)
-throw (XAO_Exception)
+void BooleanStep::setComponent(int component, const std::vector<bool>& components)
{
checkComponentIndex(component);
checkNbElements(components.size());
m_values[i][component] = components[i];
}
-void BooleanStep::setValue(const int& element, const int& component, const bool& value)
-throw (XAO_Exception)
+void BooleanStep::setValue(int element, int component, bool value)
{
checkElementIndex(element);
checkComponentIndex(component);
m_values[element][component] = value;
}
-void BooleanStep::setStringValue(const int& element, const int& component, const std::string& value)
-throw (XAO_Exception)
+void BooleanStep::setStringValue(int element, int component, const std::string& value)
{
setValue(element, component, XaoUtils::stringToBoolean(value));
}
* @param nbElements the number elements of the geometry.
* @param nbComponents the number of components of the field.
*/
- BooleanStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents);
+ BooleanStep(int step, int stamp, int nbElements, int nbComponents);
- virtual const XAO::Type getType() { return XAO::BOOLEAN; }
+ virtual XAO::Type getType() { return XAO::BOOLEAN; }
/**
* Gets all the values in a vector by elements and by components.
* @param element the index of the element to get.
* @return a vector containing all the values for the given element.
*/
- std::vector<bool> getElement(const int& element) throw (XAO_Exception);
+ std::vector<bool> getElement(int element);
/**
* Gets all the values for a component.
* @param component the index of the component to get.
* @return a vector containing all the values for the given component.
*/
- std::vector<bool> getComponent(const int& component) throw (XAO_Exception);
+ std::vector<bool> getComponent(int component);
/**
* Gets a value for an element and a component.
* @param component the index of the component.
* @return the value.
*/
- const bool getValue(const int& element, const int& component) throw (XAO_Exception);
+ bool getValue(int element, int component);
/**
* Sets all the values from a list.
* @param values the list of values to set.
*/
- void setValues(const std::vector<bool>& values) throw (XAO_Exception);
+ void setValues(const std::vector<bool>& values);
/**
* Sets the values for an element.
* @param element the index of the element to set.
* @param elements the values to set.
*/
- void setElement(const int& element, const std::vector<bool>& elements) throw (XAO_Exception);
+ void setElement(int element, const std::vector<bool>& elements);
/**
* Sets the values for a component.
* @param component the index of the component to set.
* @param components the values to set.
*/
- void setComponent(const int& component, const std::vector<bool>& components) throw (XAO_Exception);
+ void setComponent(int component, const std::vector<bool>& components);
/**
* Sets the value for an element and a component.
* @param component the index of the component.
* @param value the value.
*/
- void setValue(const int& element, const int& component, const bool& value) throw (XAO_Exception);
+ void setValue(int element, int component, bool value);
- virtual const std::string getStringValue(const int& element, const int& component) throw (XAO_Exception);
- virtual void setStringValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception);
+ virtual const std::string getStringValue(int element, int component);
+ virtual void setStringValue(int element, int component, const std::string& value);
private:
std::vector< std::vector<bool> > m_values;
}
void BrepGeometry::writeShapeFile(const std::string& fileName)
-throw (XAO_Exception)
{
bool res = BRepTools::Write(m_shape, fileName.c_str());
if (!res)
}
void BrepGeometry::readShapeFile(const std::string& fileName)
-throw (XAO_Exception)
{
BRep_Builder builder;
bool res = BRepTools::Read(m_shape, fileName.c_str(), builder);
}
}
-TopoDS_Shape BrepGeometry::getSubShape(const TopoDS_Shape& mainShape, const TopAbs_ShapeEnum& shapeType, const int& shapeIndex)
-throw (XAO_Exception)
+TopoDS_Shape BrepGeometry::getSubShape(const TopoDS_Shape& mainShape, const TopAbs_ShapeEnum& shapeType, int shapeIndex)
{
TopTools_MapOfShape mapShape;
TopTools_ListOfShape listShape;
}
// -----------------------------
-const int BrepGeometry::countGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType)
+int BrepGeometry::countGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType)
{
int res = 0;
TopExp_Explorer exp(shape, shapeType);
return res;
}
-std::vector<int> BrepGeometry::getGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType, const XAO::Dimension& dim)
+std::vector<int> BrepGeometry::getGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType, XAO::Dimension dim)
{
std::vector<int> indexList;
return indexList;
}
-void BrepGeometry::getEdgeVertices(const int& edgeIndex, int& vertexA, int& vertexB)
+void BrepGeometry::getEdgeVertices(int edgeIndex, int& vertexA, int& vertexB)
{
TopoDS_Shape edge = getSubShape(m_shape, TopAbs_EDGE, edgeIndex);
std::vector<int> vertices = getGeometricalElements(edge, TopAbs_VERTEX, XAO::VERTEX);
vertexB = vertices[1];
}
-const int BrepGeometry::countFaceWires(const int& faceIndex)
+int BrepGeometry::countFaceWires(int faceIndex)
{
TopoDS_Shape face = getSubShape(m_shape, TopAbs_FACE, faceIndex);
return countGeometricalElements(face, TopAbs_WIRE);
}
-std::vector<int> BrepGeometry::getFaceEdges(const int& faceIndex, const int& wireIndex)
+std::vector<int> BrepGeometry::getFaceEdges(int faceIndex, int wireIndex)
{
// get the face
TopoDS_Shape face = getSubShape(m_shape, TopAbs_FACE, faceIndex);
return getGeometricalElements(wire, TopAbs_EDGE, XAO::EDGE);
}
-const int BrepGeometry::countSolidShells(const int& solidIndex)
+int BrepGeometry::countSolidShells(int solidIndex)
{
TopoDS_Shape solid = getSubShape(m_shape, TopAbs_SOLID, solidIndex);
return countGeometricalElements(solid, TopAbs_SHELL);
}
-std::vector<int> BrepGeometry::getSolidFaces(const int& solidIndex, const int& shellIndex)
+std::vector<int> BrepGeometry::getSolidFaces(int solidIndex, int shellIndex)
{
TopoDS_Shape solid = getSubShape(m_shape, TopAbs_SOLID, solidIndex);
TopoDS_Shape shell = getSubShape(solid, TopAbs_SHELL, shellIndex);
return getGeometricalElements(shell, TopAbs_FACE, XAO::FACE);
}
-void BrepGeometry::getVertexXYZ(const int& vertexIndex, double& xCoord, double& yCoord, double& zCoord)
-throw (XAO_Exception)
+void BrepGeometry::getVertexXYZ(int vertexIndex, double& xCoord, double& yCoord, double& zCoord)
{
xCoord = 0.;
yCoord = 0.;
}
// -----------------------------
-const double BrepGeometry::getEdgeLength(const int& edgeIndex)
+double BrepGeometry::getEdgeLength(int edgeIndex)
{
TopoDS_Shape edge = getSubShape(m_shape, TopAbs_EDGE, edgeIndex);
GProp_GProps system;
return system.Mass();
}
-const double BrepGeometry::getFaceArea(const int& faceIndex)
+double BrepGeometry::getFaceArea(int faceIndex)
{
TopoDS_Shape face = getSubShape(m_shape, TopAbs_FACE, faceIndex);
GProp_GProps system;
return system.Mass();
}
-const double BrepGeometry::getSolidVolume(const int& solidIndex)
+double BrepGeometry::getSolidVolume(int solidIndex)
{
TopoDS_Shape solid = getSubShape(m_shape, TopAbs_SOLID, solidIndex);
GProp_GProps system;
}
// -----------------------------
-const int BrepGeometry::getVertexID(const int& index)
+int BrepGeometry::getVertexID(int index)
{
return XaoUtils::stringToInt(getVertexReference(index));
}
-const int BrepGeometry::getEdgeID(const int& index)
+int BrepGeometry::getEdgeID(int index)
{
return XaoUtils::stringToInt(getEdgeReference(index));
}
-const int BrepGeometry::getFaceID(const int& index)
+int BrepGeometry::getFaceID(int index)
{
return XaoUtils::stringToInt(getFaceReference(index));
}
-const int BrepGeometry::getSolidID(const int& index)
+int BrepGeometry::getSolidID(int index)
{
return XaoUtils::stringToInt(getSolidReference(index));
}
// -----------------------------
-void BrepGeometry::setVertexID(const int& index, const int& id)
+void BrepGeometry::setVertexID(int index, int id)
{
setVertexReference(index, XaoUtils::intToString(id));
}
-void BrepGeometry::setEdgeID(const int& index, const int& id)
+void BrepGeometry::setEdgeID(int index, int id)
{
setEdgeReference(index, XaoUtils::intToString(id));
}
-void BrepGeometry::setFaceID(const int& index, const int& id)
+void BrepGeometry::setFaceID(int index, int id)
{
setEdgeReference(index, XaoUtils::intToString(id));
}
-void BrepGeometry::setSolidID(const int& index, const int& id)
+void BrepGeometry::setSolidID(int index, int id)
{
setEdgeReference(index, XaoUtils::intToString(id));
}
// -----------------------------
-const int BrepGeometry::findElement(const XAO::Dimension& dim, const int& id)
-throw (XAO_Exception)
+int BrepGeometry::findElement(XAO::Dimension dim, int id)
{
if (dim == XAO::VERTEX)
return findVertex(id);
throw XAO_Exception(MsgBuilder() << "Unknown Dimension: " << dim);
}
-const int BrepGeometry::findVertex(const int& id)
+int BrepGeometry::findVertex(int id)
{
return getVertexIndexByReference(XaoUtils::intToString(id));
}
-const int BrepGeometry::findEdge(const int& id)
+int BrepGeometry::findEdge(int id)
{
return getEdgeIndexByReference(XaoUtils::intToString(id));
}
-const int BrepGeometry::findFace(const int& id)
+int BrepGeometry::findFace(int id)
{
return getFaceIndexByReference(XaoUtils::intToString(id));
}
-const int BrepGeometry::findSolid(const int& id)
+int BrepGeometry::findSolid(int id)
{
return getSolidIndexByReference(XaoUtils::intToString(id));
}
// -----------------------------
-const std::string BrepGeometry::findVertexName(const int& id)
+const std::string BrepGeometry::findVertexName(int id)
{
return getVertexName(findVertex(id));
}
-const std::string BrepGeometry::findEdgeName(const int& id)
+const std::string BrepGeometry::findEdgeName(int id)
{
return getEdgeName(findEdge(id));
}
-const std::string BrepGeometry::findFaceName(const int& id)
+const std::string BrepGeometry::findFaceName(int id)
{
return getFaceName(findFace(id));
}
-const std::string BrepGeometry::findSolidName(const int& id)
+const std::string BrepGeometry::findSolidName(int id)
{
return getSolidName(findSolid(id));
}
// -----------------------------
-void BrepGeometry::changeVertexName(const int& id, const std::string& name)
-throw (XAO_Exception)
+void BrepGeometry::changeVertexName(int id, const std::string& name)
{
setVertexName(findVertex(id), name);
}
-void BrepGeometry::changeEdgeName(const int& id, const std::string& name)
-throw (XAO_Exception)
+void BrepGeometry::changeEdgeName(int id, const std::string& name)
{
setEdgeName(findEdge(id), name);
}
-void BrepGeometry::changeFaceName(const int& id, const std::string& name)
-throw (XAO_Exception)
+void BrepGeometry::changeFaceName(int id, const std::string& name)
{
setFaceName(findFace(id), name);
}
-void BrepGeometry::changeSolidName(const int& id, const std::string& name)
-throw (XAO_Exception)
+void BrepGeometry::changeSolidName(int id, const std::string& name)
{
setSolidName(findSolid(id), name);
}
* Gets the format of the geometry.
* @return the format of the geometry.
*/
- virtual const XAO::Format getFormat() { return XAO::BREP; }
+ virtual XAO::Format getFormat() { return XAO::BREP; }
/**
* Gets the shape as a string.
* Writes shape to a file
* @param fileName the path to the file
*/
- virtual void writeShapeFile(const std::string& fileName) throw (XAO_Exception);
+ virtual void writeShapeFile(const std::string& fileName) ;
/**
* Reads shape from a file
* @param fileName the path to the file
*/
- virtual void readShapeFile(const std::string& fileName) throw (XAO_Exception);
+ virtual void readShapeFile(const std::string& fileName) ;
#ifdef SWIG
%pythoncode %{
* @param vertexA
* @param vertexB
*/
- void getEdgeVertices(const int& edgeIndex, int& vertexA, int& vertexB);
+ void getEdgeVertices(int edgeIndex, int& vertexA, int& vertexB);
/**
* Gets the number of wires of a face (including holes).
* @param faceIndex the index of the face.
* @return the number of wires.
*/
- const int countFaceWires(const int& faceIndex);
+ int countFaceWires(int faceIndex);
/**
* Gets the indices of the wires of the face.
* @param wireIndex the index of the wire.
* @return the list of wires for the given face.
*/
- std::vector<int> getFaceEdges(const int& faceIndex, const int& wireIndex);
+ std::vector<int> getFaceEdges(int faceIndex, int wireIndex);
/**
* Gets the number of shells of a solid (including cavities).
* @param solidIndex the index of the solid.
* @return the number of shells.
*/
- const int countSolidShells(const int& solidIndex);
+ int countSolidShells(int solidIndex);
/**
* Gets the indices of the shells of the solids.
* @param shellIndex the index of the shell (for the given solid).
* @return the list of shells for the given solid.
*/
- std::vector<int> getSolidFaces(const int& solidIndex, const int& shellIndex);
+ std::vector<int> getSolidFaces(int solidIndex, int shellIndex);
/**
* Gets the coordinates of a vertex.
* @param yCoord the Y coordinate.
* @param zCoord the Z coordinate.
*/
- void getVertexXYZ(const int& vertexIndex, double& xCoord, double& yCoord, double& zCoord)
- throw (XAO_Exception);
+ void getVertexXYZ(int vertexIndex, double& xCoord, double& yCoord, double& zCoord)
+ ;
/**
* Gets the length of an edge.
* @param index the index of the edge.
* @return the length of the edge.
*/
- const double getEdgeLength(const int& index);
+ double getEdgeLength(int index);
/**
* Gets the are of a face.
* @param index the index of a face.
* @return the area of the face.
*/
- const double getFaceArea(const int& index);
+ double getFaceArea(int index);
/**
* Gets the volume of a solid.
* @param index the index of the solid.
* @return the volume of the solid.
*/
- const double getSolidVolume(const int& index);
+ double getSolidVolume(int index);
/**
* Gets the ID of a vertex.
* @param index the index of the vertex.
* @return the ID of the vertex.
*/
- const int getVertexID(const int& index);
+ int getVertexID(int index);
/**
* Gets the ID of an edge.
* @param index the index of the edge.
* @return the ID of the edge.
*/
- const int getEdgeID(const int& index);
+ int getEdgeID(int index);
/**
* Gets the ID of a face.
* @param index the index of the face.
* @return the ID of the face.
*/
- const int getFaceID(const int& index);
+ int getFaceID(int index);
/**
* Gets the ID of a solid.
* @param index the index of the solid.
* @return the ID of the solid.
*/
- const int getSolidID(const int& index);
+ int getSolidID(int index);
/**
* Sets the ID of a vertex.
* @param index the index of the vertex to set.
* @param id the id to set.
*/
- void setVertexID(const int& index, const int& id);
+ void setVertexID(int index, int id);
/**
* Sets the ID of an edge.
* @param index the index of the edge to set.
* @param id the id to set.
*/
- void setEdgeID(const int& index, const int& id);
+ void setEdgeID(int index, int id);
/**
* Sets the ID of a face.
* @param index the index of the face to set.
* @param id the id to set.
*/
- void setFaceID(const int& index, const int& id);
+ void setFaceID(int index, int id);
/**
* Sets the ID of a solid.
* @param index the index of the solid to set.
* @param id the id to set.
*/
- void setSolidID(const int& index, const int& id);
+ void setSolidID(int index, int id);
/**
* Finds a vertex with its ID.
* @param id the ID of the vertex.
* @return the index of the vertex.
*/
- const int findVertex(const int& id);
+ int findVertex(int id);
/**
* Finds an edge with its ID.
* @param id the ID of the edge.
* @return the index of the edge.
*/
- const int findEdge(const int& id);
+ int findEdge(int id);
/**
* Finds a face with its ID.
* @param id the ID of the face.
* @return the index of the face.
*/
- const int findFace(const int& id);
+ int findFace(int id);
/**
* Finds a solid with its ID.
* @param id the ID of the solid.
* @return th index of the solid.
*/
- const int findSolid(const int& id);
+ int findSolid(int id);
/**
* Finds the name of a vertex with its ID.
* @param id the ID of the vertex.
* @return the name of the vertex.
*/
- const std::string findVertexName(const int& id);
+ const std::string findVertexName(int id);
/**
* Finds the name of an edge with its ID.
* @param id the ID of the edge.
* @return the name of the edge.
*/
- const std::string findEdgeName(const int& id);
+ const std::string findEdgeName(int id);
/**
* Finds the name of a face with its ID.
* @param id the ID of the face.
* @return the name of the face.
*/
- const std::string findFaceName(const int& id);
+ const std::string findFaceName(int id);
/**
* Finds the name of a solid with its ID.
* @param id the ID of the solid.
* @return the name of the solid.
*/
- const std::string findSolidName(const int& id);
+ const std::string findSolidName(int id);
/**
* Changes the name of a vertex.
* @param id the ID of the vertex.
* @param name the name to set.
*/
- void changeVertexName(const int& id, const std::string& name) throw (XAO_Exception);
+ void changeVertexName(int id, const std::string& name) ;
/**
* Changes the name of an edge.
* @param id the ID of the edge
* @param name the name to set.
*/
- void changeEdgeName(const int& id, const std::string& name) throw (XAO_Exception);
+ void changeEdgeName(int id, const std::string& name) ;
/**
* Changes the name of a face.
* @param id the ID of the face.
* @param name the name to set.
*/
- void changeFaceName(const int& id, const std::string& name) throw (XAO_Exception);
+ void changeFaceName(int id, const std::string& name) ;
/**
* Changes the name of a solid.
* @param id the ID of the solid.
* @param name the name to set.
*/
- void changeSolidName(const int& id, const std::string& name) throw (XAO_Exception);
+ void changeSolidName(int id, const std::string& name) ;
private:
void initIds();
void initListIds(const TopAbs_ShapeEnum& shapeType, GeometricElementList& eltList);
- TopoDS_Shape getSubShape(const TopoDS_Shape& mainShape, const TopAbs_ShapeEnum& shapeType, const int& shapeIndex)
- throw (XAO_Exception);
- const int countGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType);
- std::vector<int> getGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType, const XAO::Dimension& dim);
- const int findElement(const XAO::Dimension& dim, const int& id)
- throw (XAO_Exception);
+ TopoDS_Shape getSubShape(const TopoDS_Shape& mainShape, const TopAbs_ShapeEnum& shapeType, int shapeIndex)
+ ;
+ int countGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType);
+ std::vector<int> getGeometricalElements(const TopoDS_Shape& shape, const TopAbs_ShapeEnum& shapeType, XAO::Dimension dim);
+ int findElement(XAO::Dimension dim, int id)
+ ;
private:
TopoDS_Shape m_shape;
using namespace XAO;
-DoubleField::DoubleField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name)
+DoubleField::DoubleField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name)
: Field(dimension, nbElements, nbComponents, name)
{
}
-Step* DoubleField::addNewStep(const int& step)
-throw (XAO_Exception)
+Step* DoubleField::addNewStep(int step)
+
{
return addStep(step, 0);
}
-DoubleStep* DoubleField::addStep(const int& step)
-throw (XAO_Exception)
+DoubleStep* DoubleField::addStep(int step)
+
{
return addStep(step, 0);
}
-DoubleStep* DoubleField::addStep(const int& step, const int& stamp)
-throw (XAO_Exception)
+DoubleStep* DoubleField::addStep(int step, int stamp)
+
{
if (hasStep(step))
throw XAO_Exception(MsgBuilder() << "Step with number " << step << " already exists.");
return bstep;
}
-DoubleStep* DoubleField::getStep(const int& index)
-throw (XAO_Exception)
+DoubleStep* DoubleField::getStep(int index)
+
{
checkStepIndex(index);
return (DoubleStep*)m_steps[index];
* @param nbComponents the number of components.
* @param name the name of the field.
*/
- DoubleField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name);
+ DoubleField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name);
- virtual const XAO::Type getType() { return XAO::DOUBLE; }
+ virtual XAO::Type getType() { return XAO::DOUBLE; }
- virtual Step* addNewStep(const int& step) throw (XAO_Exception);
+ virtual Step* addNewStep(int step) ;
/**
* Adds a new step.
* @param step the number of the step.
* @return the newly created step.
*/
- DoubleStep* addStep(const int& step) throw (XAO_Exception);
+ DoubleStep* addStep(int step) ;
/**
* Adds a new step.
* @param stamp the stamp of the step.
* @return the newly created step.
*/
- DoubleStep* addStep(const int& step, const int& stamp) throw (XAO_Exception);
+ DoubleStep* addStep(int step, int stamp) ;
/**
* Gets the step of given index.
* @param index the index.
* @return the step for the given index.
*/
- DoubleStep* getStep(const int& index) throw (XAO_Exception);
+ DoubleStep* getStep(int index) ;
};
}
using namespace XAO;
-DoubleStep::DoubleStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents)
+DoubleStep::DoubleStep(int step, int stamp, int nbElements, int nbComponents)
{
m_nbElements = nbElements;
m_nbComponents = nbComponents;
return result;
}
-std::vector<double> DoubleStep::getElement(const int& element)
-throw (XAO_Exception)
+std::vector<double> DoubleStep::getElement(int element)
+
{
checkElementIndex(element);
return result;
}
-std::vector<double> DoubleStep::getComponent(const int& component)
-throw (XAO_Exception)
+std::vector<double> DoubleStep::getComponent(int component)
+
{
checkComponentIndex(component);
return result;
}
-const double DoubleStep::getValue(const int& element, const int& component)
-throw (XAO_Exception)
+double DoubleStep::getValue(int element, int component)
+
{
checkElementIndex(element);
checkComponentIndex(component);
return m_values[element][component];
}
-const std::string DoubleStep::getStringValue(const int& element, const int& component)
-throw (XAO_Exception)
+const std::string DoubleStep::getStringValue(int element, int component)
+
{
return XaoUtils::doubleToString(getValue(element, component));
}
void DoubleStep::setValues(const std::vector<double>& values)
-throw (XAO_Exception)
+
{
checkNbValues(values.size());
}
}
-void DoubleStep::setElement(const int& element, const std::vector<double>& elements)
-throw (XAO_Exception)
+void DoubleStep::setElement(int element, const std::vector<double>& elements)
+
{
checkElementIndex(element);
checkNbComponents(elements.size());
m_values[element][i] = elements[i];
}
-void DoubleStep::setComponent(const int& component, const std::vector<double>& components)
-throw (XAO_Exception)
+void DoubleStep::setComponent(int component, const std::vector<double>& components)
+
{
checkElementIndex(component);
checkNbElements(components.size());
m_values[i][component] = components[i];
}
-void DoubleStep::setValue(const int& element, const int& component, const double& value)
-throw (XAO_Exception)
+void DoubleStep::setValue(int element, int component, double value)
+
{
checkElementIndex(element);
checkComponentIndex(component);
m_values[element][component] = value;
}
-void DoubleStep::setStringValue(const int& element, const int& component, const std::string& value)
-throw (XAO_Exception)
+void DoubleStep::setStringValue(int element, int component, const std::string& value)
+
{
setValue(element, component, XaoUtils::stringToDouble(value));
}
* @param nbElements the number elements of the geometry.
* @param nbComponents the number of components of the field.
*/
- DoubleStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents);
+ DoubleStep(int step, int stamp, int nbElements, int nbComponents);
- virtual const XAO::Type getType() { return XAO::DOUBLE; }
+ virtual XAO::Type getType() { return XAO::DOUBLE; }
/**
* Gets all the values of the step as a list.
* @param element the index of the element.
* @return a vector containing all the values for the given element.
*/
- std::vector<double> getElement(const int& element) throw (XAO_Exception);
+ std::vector<double> getElement(int element) ;
/**
* Gets all the values for a given component.
* @param component the index of the component.
* @return a vector containing all the values for the given component.
*/
- std::vector<double> getComponent(const int& component) throw (XAO_Exception);
+ std::vector<double> getComponent(int component) ;
/**
* Gets the value for an element and a component.
* @param component the index of the component.
* @return the value for the given element and component.
*/
- const double getValue(const int& element, const int& component) throw (XAO_Exception);
+ double getValue(int element, int component) ;
/**
* Sets all the values from a list.
* @param values the list of values to set.
*/
- void setValues(const std::vector<double>& values) throw (XAO_Exception);
+ void setValues(const std::vector<double>& values) ;
/**
* Sets the values for an element.
* @param element the index of the element to set.
* @param elements the values to set.
*/
- void setElement(const int& element, const std::vector<double>& elements) throw (XAO_Exception);
+ void setElement(int element, const std::vector<double>& elements) ;
/**
* Sets the values for a component.
* @param component the index of the component to set.
* @param components the values to set.
*/
- void setComponent(const int& component, const std::vector<double>& components) throw (XAO_Exception);
+ void setComponent(int component, const std::vector<double>& components) ;
/**
* Sets the value for an element and a component.
* @param component the index of the component.
* @param value the value.
*/
- void setValue(const int& element, const int& component, const double& value) throw (XAO_Exception);
+ void setValue(int element, int component, double value) ;
- virtual const std::string getStringValue(const int& element, const int& component) throw (XAO_Exception);
- virtual void setStringValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception);
+ virtual const std::string getStringValue(int element, int component) ;
+ virtual void setStringValue(int element, int component, const std::string& value) ;
private:
std::vector< std::vector<double> > m_values;
{
}
- virtual ~XAO_Exception() throw() {};
+ virtual ~XAO_Exception() noexcept {};
/**
* Returns the error message.
* @return the error message.
*/
- virtual const char* what() const throw ()
+ virtual const char* what() const noexcept
{
return m_message;
}
// -------------------------------------------------------
-Field::Field(const XAO::Dimension& dimension,
- const int& nbElements, const int& nbComponents, const std::string& name)
+Field::Field(XAO::Dimension dimension,
+ int nbElements, int nbComponents, const std::string& name)
: m_name(name), m_dimension(dimension),
m_nbComponents(nbComponents), m_components(nbComponents, ""),
m_nbElements(nbElements)
delete m_steps[i];
}
-Field* Field::createField(const XAO::Type& type, const XAO::Dimension& dimension,
- const int& nbElements, const int& nbComponents, const std::string& name)
-throw (XAO_Exception)
+Field* Field::createField(XAO::Type type, XAO::Dimension dimension,
+ int nbElements, int nbComponents, const std::string& name)
{
if (type == XAO::BOOLEAN)
return new BooleanField(dimension, nbElements, nbComponents, name);
throw XAO_Exception(MsgBuilder() << "Bad Type: " << type);
}
-const std::string Field::getComponentName(const int& index)
-throw (XAO_Exception)
+const std::string Field::getComponentName(int index)
{
checkComponent(index);
return m_components[index];
}
-void Field::setComponentName(const int& index, const std::string& name)
-throw (XAO_Exception)
+void Field::setComponentName(int index, const std::string& name)
{
checkComponent(index);
m_components[index] = name;
}
void Field::setComponentsNames(const std::vector<std::string>& names)
-throw (XAO_Exception)
{
for (unsigned int i = 0; i < names.size(); ++i)
{
return false;
}
-bool Field::hasStep(const int& step)
+bool Field::hasStep(int step)
{
std::vector<Step*>::iterator it = m_steps.begin();
for (; it != m_steps.end(); ++it)
return false;
}
-void Field::checkComponent(const int& component)
-throw (XAO_Exception)
+void Field::checkComponent(int component)
{
if (component < m_nbComponents && component >= 0)
return;
<< m_nbComponents-1 << "]: " << component);
}
-void Field::checkStepIndex(const int& step)
-throw (XAO_Exception)
+void Field::checkStepIndex(int step)
{
if (step < (int)m_steps.size() && step >= 0)
return;
* @param nbComponents the number of components.
* @param name the name of the field.
*/
- Field(const XAO::Dimension& dimension,
- const int& nbElements, const int& nbComponents, const std::string& name);
+ Field(XAO::Dimension dimension,
+ int nbElements, int nbComponents, const std::string& name);
public:
/**
* @name the name of the field.
* @return the created field.
*/
- static Field* createField(const XAO::Type& type, const XAO::Dimension& dimension,
- const int& nbElements, const int& nbComponents,
- const std::string& name = std::string(""))
- throw (XAO_Exception);
+ static Field* createField(XAO::Type type, XAO::Dimension dimension,
+ int nbElements, int nbComponents,
+ const std::string& name = std::string(""));
/**
* Destructor.
* Gets the Type of the field.
* @return the Type of the field.
*/
- virtual const XAO::Type getType() = 0;
+ virtual XAO::Type getType() = 0;
/**
* Gets the name of the Field.
* Gets the Dimension of the Field.
* @return the Dimension of the Field.
*/
- const XAO::Dimension getDimension() const
+ XAO::Dimension getDimension() const
{
return m_dimension;
}
* Gets the number of elements of each step.
* @return the number of elements of each step.
*/
- const int countElements() const
+ int countElements() const
{
return m_nbElements;
}
* Gets the number of components.
* @return the number of components.
*/
- const int countComponents() const
+ int countComponents() const
{
return m_nbComponents;
}
* Gets the number of values for each step.
* @return the number of values for each step.
*/
- const int countValues() const
+ int countValues() const
{
return m_nbElements * m_nbComponents;
}
* Gets the number of the steps.
* @return the number of steps.
*/
- const int countSteps() const { return m_steps.size(); }
+ int countSteps() const { return m_steps.size(); }
/**
* Gets the name of a component.
* @param index the index of the component to get.
* @return the name of the component for the given index.
*/
- const std::string getComponentName(const int& index) throw (XAO_Exception);
+ const std::string getComponentName(int index);
/**
* Sets the name of a component.
* @param componentIndex the index of the component to set.
* @param name the name to set.
*/
- void setComponentName(const int& componentIndex, const std::string& name) throw (XAO_Exception);
+ void setComponentName(int componentIndex, const std::string& name);
/**
* Sets the name of the components.
* @param names the names to set.
*/
- void setComponentsNames(const std::vector<std::string>& names) throw (XAO_Exception);
+ void setComponentsNames(const std::vector<std::string>& names);
/**
* Adds a new step of the same type than the field.
* @param number the numer of the step.
* @return the new create step.
*/
- virtual Step* addNewStep(const int& number) throw (XAO_Exception) = 0;
+ virtual Step* addNewStep(int number) = 0;
/**
* Remove a step.
* @param step the step number.
* @return true if the field has a step for the given number.
*/
- bool hasStep(const int& step);
+ bool hasStep(int step);
/**
* Returns the first step.
stepIterator end() { return m_steps.end(); }
protected:
- void checkComponent(const int& component) throw (XAO_Exception);
- void checkStepIndex(const int& step) throw (XAO_Exception);
+ void checkComponent(int component) ;
+ void checkStepIndex(int step) ;
protected:
/** The name of the Field. */
{
}
-const bool GeometricElement::hasName()
+bool GeometricElement::hasName()
{
return !m_name.empty();
}
setSize(0);
}
-GeometricElementList::GeometricElementList(const int& count)
+GeometricElementList::GeometricElementList(int count)
{
setSize(count);
}
-void GeometricElementList::setSize(const int& nb)
+void GeometricElementList::setSize(int nb)
{
m_count = nb;
m_elements.clear();
}
}
-void GeometricElementList::checkElementIndex(const int& index) const
-throw (XAO_Exception)
+void GeometricElementList::checkElementIndex(int index) const
{
if (m_count >= 0 && index < m_count)
return;
<< m_count-1 << "]: " << index);
}
-void GeometricElementList::setElement(const int& index, const std::string& name, const std::string& reference)
-throw (XAO_Exception)
+void GeometricElementList::setElement(int index, const std::string& name, const std::string& reference)
{
checkElementIndex(index);
m_elements[index].setName(name);
m_elements[index].setReference(reference);
}
-const std::string GeometricElementList::getName(const int& index)
-throw (XAO_Exception)
+const std::string GeometricElementList::getName(int index)
{
checkElementIndex(index);
return m_elements[index].getName();
}
-void GeometricElementList::setName(const int& index, const std::string& name)
-throw (XAO_Exception)
+void GeometricElementList::setName(int index, const std::string& name)
{
checkElementIndex(index);
m_elements[index].setName(name);
}
-const bool GeometricElementList::hasName(const int& index)
-throw (XAO_Exception)
+bool GeometricElementList::hasName(int index)
{
checkElementIndex(index);
return m_elements[index].hasName();
}
-const std::string GeometricElementList::getReference(const int& index)
-throw (XAO_Exception)
+const std::string GeometricElementList::getReference(int index)
{
checkElementIndex(index);
return m_elements[index].getReference();
}
-void GeometricElementList::setReference(const int& index, const std::string& name)
-throw (XAO_Exception)
+void GeometricElementList::setReference(int index, const std::string& name)
{
checkElementIndex(index);
m_elements[index].setReference(name);
}
-const int GeometricElementList::getIndexByReference(const std::string& ref)
-throw (XAO_Exception)
+int GeometricElementList::getIndexByReference(const std::string& ref)
{
for (int index = 0; index < m_count; ++index)
{
* Checks if the element has a name.
* @return true if the element has a name, false otherwise.
*/
- const bool hasName();
+ bool hasName();
/**
* Gets the reference of the element.
* Constructor with size.
* \param nb the size to set.
*/
- GeometricElementList(const int& nb);
+ GeometricElementList(int nb);
/**
* Destructor.
* Gets the size of the list.
* \return the size of the list.
*/
- const int getSize() const { return m_count; }
+ int getSize() const { return m_count; }
/**
* Sets the size of the list.
* \param nb the size to set.
* \warning the list will be cleared.
*/
- void setSize(const int& nb);
+ void setSize(int nb);
/**
* Sets the name and the reference of an element.
* \param reference the reference to set.
* \throw XAO_Exception if index is bigger than the size of the list.
*/
- void setElement(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception);
+ void setElement(int index, const std::string& name, const std::string& reference);
/**
* Gets the name of an element.
* \param index the index of the element to set.
* \return the name of the element with the given index.
* \throw XAO_Exception if index is bigger than the size of the list.
*/
- const std::string getName(const int& index) throw (XAO_Exception);
+ const std::string getName(int index);
/**
* Sets the name of an element.
* \param index the index of the element.
* \param name the name to set.
* \throw XAO_Exception if index is bigger than the size of the list.
*/
- void setName(const int& index, const std::string& name) throw (XAO_Exception);
+ void setName(int index, const std::string& name);
/**
* Checks if an element has a name.
* @param index the index of the element.
* @return true if the element has a name, false otherwise.
*/
- const bool hasName(const int& index) throw (XAO_Exception);
+ bool hasName(int index);
/**
* Gets the reference of an element.
* \return the reference of the element.
* \throw XAO_Exception if index is bigger than the size of the list.
*/
- const std::string getReference(const int& index) throw (XAO_Exception);
+ const std::string getReference(int index);
/**
* Sets the reference of an element.
* \param index the index of the element to set.
* \param reference the reference to set.
* \throw XAO_Exception if index is bigger than the size of the list.
*/
- void setReference(const int& index, const std::string& reference) throw (XAO_Exception);
+ void setReference(int index, const std::string& reference);
/**
* Gets the index of an element using its reference.
* \param reference the searched reference.
* \return the index of the element or -1 if no element found.
*/
- const int getIndexByReference(const std::string& reference) throw (XAO_Exception);
+ int getIndexByReference(const std::string& reference);
/**
* Iterator on the element of the list.
iterator end() { return m_elements.end(); }
private:
- void checkElementIndex(const int& index) const throw (XAO_Exception);
+ void checkElementIndex(int index) const;
private:
int m_count;
m_readOnly = false;
}
-Geometry* Geometry::createGeometry(const XAO::Format& format)
-throw (XAO_Exception)
+Geometry* Geometry::createGeometry(XAO::Format format)
{
return createGeometry(format, "");
}
-Geometry* Geometry::createGeometry(const XAO::Format& format, const std::string& name)
-throw (XAO_Exception)
+Geometry* Geometry::createGeometry(XAO::Format format, const std::string& name)
{
if (format == XAO::BREP)
return new BrepGeometry(name);
}
void Geometry::checkReadOnly()
-throw (XAO_Exception)
{
if (m_readOnly)
throw XAO_Exception("Geometry is read only.");
}
-const int Geometry::countElements(const XAO::Dimension& dim) const
-throw (XAO_Exception)
+int Geometry::countElements(XAO::Dimension dim) const
{
if (dim == XAO::VERTEX)
return countVertices();
throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim);
}
-const std::string Geometry::getElementReference(const XAO::Dimension& dim, const int& index)
-throw (XAO_Exception)
+const std::string Geometry::getElementReference(XAO::Dimension dim, int index)
{
if (dim == XAO::VERTEX)
return getVertexReference(index);
throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim);
}
-const int Geometry::getElementIndexByReference(const XAO::Dimension& dim, const std::string& reference)
-throw (XAO_Exception)
+int Geometry::getElementIndexByReference(XAO::Dimension dim, const std::string& reference)
{
if (dim == XAO::VERTEX)
return getVertexIndexByReference(reference);
throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim);
}
-GeometricElementList::iterator Geometry::begin(const XAO::Dimension& dim)
-throw (XAO_Exception)
+GeometricElementList::iterator Geometry::begin(XAO::Dimension dim)
{
if (dim == XAO::VERTEX)
return m_vertices.begin();
throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim);
}
-GeometricElementList::iterator Geometry::end(const XAO::Dimension& dim)
-throw (XAO_Exception)
+GeometricElementList::iterator Geometry::end(XAO::Dimension dim)
{
if (dim == XAO::VERTEX)
return m_vertices.end();
throw XAO_Exception(MsgBuilder() << "Unknown dimension:" << dim);
}
-void Geometry::setCountVertices(const int& nb) throw (XAO_Exception)
+void Geometry::setCountVertices(int nb)
{
checkReadOnly();
m_vertices.setSize(nb);
}
-void Geometry::setCountEdges(const int& nb) throw (XAO_Exception)
+void Geometry::setCountEdges(int nb)
{
checkReadOnly();
m_edges.setSize(nb);
}
-void Geometry::setCountFaces(const int& nb) throw (XAO_Exception)
+void Geometry::setCountFaces(int nb)
{
checkReadOnly();
m_faces.setSize(nb);
}
-void Geometry::setCountSolids(const int& nb) throw (XAO_Exception)
+void Geometry::setCountSolids(int nb)
{
checkReadOnly();
m_solids.setSize(nb);
}
-void Geometry::setVertexReference(const int& index, const std::string& reference) throw (XAO_Exception)
+void Geometry::setVertexReference(int index, const std::string& reference)
{
checkReadOnly();
m_vertices.setReference(index, reference);
}
-void Geometry::setEdgeReference(const int& index, const std::string& reference) throw (XAO_Exception)
+void Geometry::setEdgeReference(int index, const std::string& reference)
{
checkReadOnly();
m_edges.setReference(index, reference);
}
-void Geometry::setFaceReference(const int& index, const std::string& reference) throw (XAO_Exception)
+void Geometry::setFaceReference(int index, const std::string& reference)
{
checkReadOnly();
m_faces.setReference(index, reference);
}
-void Geometry::setSolidReference(const int& index, const std::string& reference) throw (XAO_Exception)
+void Geometry::setSolidReference(int index, const std::string& reference)
{
checkReadOnly();
m_solids.setReference(index, reference);
}
-void Geometry::setVertex(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception)
+void Geometry::setVertex(int index, const std::string& name, const std::string& reference)
{
checkReadOnly();
m_vertices.setElement(index, name, reference);
}
-void Geometry::setEdge(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception)
+void Geometry::setEdge(int index, const std::string& name, const std::string& reference)
{
checkReadOnly();
m_edges.setElement(index, name, reference);
}
-void Geometry::setFace(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception)
+void Geometry::setFace(int index, const std::string& name, const std::string& reference)
{
checkReadOnly();
m_faces.setElement(index, name, reference);
}
-void Geometry::setSolid(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception)
+void Geometry::setSolid(int index, const std::string& name, const std::string& reference)
{
checkReadOnly();
m_solids.setElement(index, name, reference);
* @param format the format of the geometry.
* @return the created geometry.
*/
- static Geometry* createGeometry(const XAO::Format& format) throw (XAO_Exception);
+ static Geometry* createGeometry(XAO::Format format) ;
/**
* Constructor.
* @name name the name of the geometry.
* @return the created geometry.
*/
- static Geometry* createGeometry(const XAO::Format& format, const std::string& name)
- throw (XAO_Exception);
+ static Geometry* createGeometry(XAO::Format format, const std::string& name);
/** Destructor. */
virtual ~Geometry();
* Gets the format of the geometry.
* @return the format of the geometry.
*/
- virtual const XAO::Format getFormat() = 0;
+ virtual XAO::Format getFormat() = 0;
virtual const std::string getShapeString() = 0;
virtual void setShapeString(const std::string& shape) = 0;
virtual void writeShapeFile(const std::string& fileName) = 0;
virtual void readShapeFile(const std::string& fileName) = 0;
- const int countElements(const XAO::Dimension& dim) const throw (XAO_Exception);
- const int countVertices() const { return m_vertices.getSize(); }
- const int countEdges() const { return m_edges.getSize(); }
- const int countFaces() const { return m_faces.getSize(); }
- const int countSolids() const { return m_solids.getSize(); }
-
- void setCountVertices(const int& nb) throw (XAO_Exception);
- void setCountEdges(const int& nb) throw (XAO_Exception);
- void setCountFaces(const int& nb) throw (XAO_Exception);
- void setCountSolids(const int& nb) throw (XAO_Exception);
-
- const std::string getVertexName(const int& index) throw (XAO_Exception) { return m_vertices.getName(index); }
- const std::string getEdgeName(const int& index) throw (XAO_Exception) { return m_edges.getName(index); }
- const std::string getFaceName(const int& index) throw (XAO_Exception) { return m_faces.getName(index); }
- const std::string getSolidName(const int& index) throw (XAO_Exception) { return m_solids.getName(index); }
-
- void setVertexName(const int& index, const std::string& name) throw (XAO_Exception) { m_vertices.setName(index, name); }
- void setEdgeName(const int& index, const std::string& name) throw (XAO_Exception) { m_edges.setName(index, name); }
- void setFaceName(const int& index, const std::string& name) throw (XAO_Exception) { m_faces.setName(index, name); }
- void setSolidName(const int& index, const std::string& name) throw (XAO_Exception) { m_solids.setName(index, name); }
-
- const bool hasVertexName(const int& index) throw (XAO_Exception) { return m_vertices.hasName(index); }
- const bool hasEdgeName(const int& index) throw (XAO_Exception) { return m_edges.hasName(index); }
- const bool hasFaceName(const int& index) throw (XAO_Exception) { return m_faces.hasName(index); }
- const bool hasSolidName(const int& index) throw (XAO_Exception) { return m_solids.hasName(index); }
-
- const std::string getVertexReference(const int& index) throw (XAO_Exception) { return m_vertices.getReference(index); }
- const std::string getEdgeReference(const int& index) throw (XAO_Exception) { return m_edges.getReference(index); }
- const std::string getFaceReference(const int& index) throw (XAO_Exception) { return m_faces.getReference(index); }
- const std::string getSolidReference(const int& index) throw (XAO_Exception) { return m_solids.getReference(index); }
- const std::string getElementReference(const XAO::Dimension& dim, const int& index) throw (XAO_Exception);
-
- void setVertexReference(const int& index, const std::string& reference) throw (XAO_Exception);
- void setEdgeReference(const int& index, const std::string& reference) throw (XAO_Exception);
- void setFaceReference(const int& index, const std::string& reference) throw (XAO_Exception);
- void setSolidReference(const int& index, const std::string& reference) throw (XAO_Exception);
-
- void setVertex(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception);
- void setEdge(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception);
- void setFace(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception);
- void setSolid(const int& index, const std::string& name, const std::string& reference) throw (XAO_Exception);
-
- const int getVertexIndexByReference(const std::string& reference) { return m_vertices.getIndexByReference(reference); }
- const int getEdgeIndexByReference(const std::string& reference) { return m_edges.getIndexByReference(reference); }
- const int getFaceIndexByReference(const std::string& reference) { return m_faces.getIndexByReference(reference); }
- const int getSolidIndexByReference(const std::string& reference) { return m_solids.getIndexByReference(reference); }
- const int getElementIndexByReference(const XAO::Dimension& dim, const std::string& reference) throw (XAO_Exception);
-
- GeometricElementList::iterator begin(const XAO::Dimension& dim) throw (XAO_Exception);
- GeometricElementList::iterator end(const XAO::Dimension& dim) throw (XAO_Exception);
+ int countElements(XAO::Dimension dim) const ;
+ int countVertices() const { return m_vertices.getSize(); }
+ int countEdges() const { return m_edges.getSize(); }
+ int countFaces() const { return m_faces.getSize(); }
+ int countSolids() const { return m_solids.getSize(); }
+
+ void setCountVertices(int nb);
+ void setCountEdges(int nb);
+ void setCountFaces(int nb);
+ void setCountSolids(int nb);
+
+ const std::string getVertexName(int index) { return m_vertices.getName(index); }
+ const std::string getEdgeName(int index) { return m_edges.getName(index); }
+ const std::string getFaceName(int index) { return m_faces.getName(index); }
+ const std::string getSolidName(int index) { return m_solids.getName(index); }
+
+ void setVertexName(int index, const std::string& name) { m_vertices.setName(index, name); }
+ void setEdgeName(int index, const std::string& name) { m_edges.setName(index, name); }
+ void setFaceName(int index, const std::string& name) { m_faces.setName(index, name); }
+ void setSolidName(int index, const std::string& name) { m_solids.setName(index, name); }
+
+ bool hasVertexName(int index) { return m_vertices.hasName(index); }
+ bool hasEdgeName(int index) { return m_edges.hasName(index); }
+ bool hasFaceName(int index) { return m_faces.hasName(index); }
+ bool hasSolidName(int index) { return m_solids.hasName(index); }
+
+ const std::string getVertexReference(int index) { return m_vertices.getReference(index); }
+ const std::string getEdgeReference(int index) { return m_edges.getReference(index); }
+ const std::string getFaceReference(int index) { return m_faces.getReference(index); }
+ const std::string getSolidReference(int index) { return m_solids.getReference(index); }
+ const std::string getElementReference(XAO::Dimension dim, int index) ;
+
+ void setVertexReference(int index, const std::string& reference) ;
+ void setEdgeReference(int index, const std::string& reference) ;
+ void setFaceReference(int index, const std::string& reference) ;
+ void setSolidReference(int index, const std::string& reference) ;
+
+ void setVertex(int index, const std::string& name, const std::string& reference) ;
+ void setEdge(int index, const std::string& name, const std::string& reference) ;
+ void setFace(int index, const std::string& name, const std::string& reference) ;
+ void setSolid(int index, const std::string& name, const std::string& reference) ;
+
+ int getVertexIndexByReference(const std::string& reference) { return m_vertices.getIndexByReference(reference); }
+ int getEdgeIndexByReference(const std::string& reference) { return m_edges.getIndexByReference(reference); }
+ int getFaceIndexByReference(const std::string& reference) { return m_faces.getIndexByReference(reference); }
+ int getSolidIndexByReference(const std::string& reference) { return m_solids.getIndexByReference(reference); }
+ int getElementIndexByReference(XAO::Dimension dim, const std::string& reference) ;
+
+ GeometricElementList::iterator begin(XAO::Dimension dim) ;
+ GeometricElementList::iterator end(XAO::Dimension dim) ;
/**
* Verifies if the geometry is read only.
void setReadOnly() { m_readOnly = true; }
protected:
- void checkReadOnly() throw (XAO_Exception);
+ void checkReadOnly() ;
protected:
std::string m_name;
using namespace XAO;
-Group::Group(const XAO::Dimension& dim, const int& nbElements, const std::string& name)
-throw (XAO_Exception)
+Group::Group(XAO::Dimension dim, int nbElements, const std::string& name)
{
if (dim == XAO::WHOLE)
throw XAO_Exception("Dimension WHOLE is not valid for group.");
{
}
-void Group::checkIndex(const int& element)
-throw (XAO_Exception)
+void Group::checkIndex(int element)
{
if (element < (int)m_elements.size() && element >= 0)
return;
<< m_elements.size()-1 << "]: " << element);
}
-void Group::add(const int& value)
+void Group::add(int value)
{
m_elements.insert(value);
}
-void Group::remove(const int& value)
+void Group::remove(int value)
{
m_elements.erase(value);
}
* @param nbElements the number of geometrical elements for the dimension in the geometry.
* @param name the name of the group.
*/
- Group(const XAO::Dimension& dim, const int& nbElements, const std::string& name = std::string(""))
- throw (XAO_Exception);
+ Group(XAO::Dimension dim, int nbElements, const std::string& name = std::string(""));
/**
* Destructor.
* Gets the dimension of the group.
* \return the dimension of the group.
*/
- const XAO::Dimension getDimension()
+ XAO::Dimension getDimension()
{
return m_dimension;
}
* Gets the numbers of elements in the geometry of the same type than the group.
* \return the number of elements in the associated geometry.
*/
- const int getNbElements()
+ int getNbElements()
{
return m_nbElements;
}
* Gets the number of elements in the group.
* \return the number of elements.
*/
- const int count() const
+ int count() const
{
return m_elements.size();
}
* \return the reference of the element.
* \note use begin() and end() if you need to iterate.
*/
- const int get(const int& index)
+ int get(int index)
{
checkIndex(index);
std::set<int>::iterator it = m_elements.begin();
* Adds an element to the group.
* \param value the index of the element to add.
*/
- void add(const int& value);
+ void add(int value);
/**
* Removes an element from the group.
* \param value the index of the element to remove.
*/
- void remove(const int& value);
+ void remove(int value);
/**
* Gets an iterator on the first element in the group.
* @param element
* @throw XAO_Exception if element is bigger than the number of elements.
*/
- void checkIndex(const int& element)
- throw (XAO_Exception);
+ void checkIndex(int element);
private:
/** The name of the group. */
using namespace XAO;
-IntegerField::IntegerField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name)
+IntegerField::IntegerField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name)
: Field(dimension, nbElements, nbComponents, name)
{
}
-Step* IntegerField::addNewStep(const int& step)
-throw (XAO_Exception)
+Step* IntegerField::addNewStep(int step)
+
{
return addStep(step, 0);
}
-IntegerStep* IntegerField::addStep(const int& step)
-throw (XAO_Exception)
+IntegerStep* IntegerField::addStep(int step)
+
{
return addStep(step, 0);
}
-IntegerStep* IntegerField::addStep(const int& step, const int& stamp)
-throw (XAO_Exception)
+IntegerStep* IntegerField::addStep(int step, int stamp)
+
{
if (hasStep(step))
throw XAO_Exception(MsgBuilder() << "Step with number " << step << " already exists.");
return bstep;
}
-IntegerStep* IntegerField::getStep(const int& index)
-throw (XAO_Exception)
+IntegerStep* IntegerField::getStep(int index)
+
{
checkStepIndex(index);
return (IntegerStep*)m_steps[index];
* @param nbComponents the number of components.
* @param name the name of the field.
*/
- IntegerField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name);
+ IntegerField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name);
- virtual const XAO::Type getType() { return XAO::INTEGER; }
+ virtual XAO::Type getType() { return XAO::INTEGER; }
- virtual Step* addNewStep(const int& step) throw (XAO_Exception);
+ virtual Step* addNewStep(int step) ;
/**
* Adds a new step.
* @param step the number of the step.
* @return the newly created step.
*/
- IntegerStep* addStep(const int& step) throw (XAO_Exception);
+ IntegerStep* addStep(int step) ;
/**
* Adds a new step.
* @param stamp the stamp of the step.
* @return the newly created step.
*/
- IntegerStep* addStep(const int& step, const int& stamp) throw (XAO_Exception);
+ IntegerStep* addStep(int step, int stamp) ;
/**
* Gets the step of given index.
* @param index the index of the step.
* @return the step for the given index.
*/
- IntegerStep* getStep(const int& index) throw (XAO_Exception);
+ IntegerStep* getStep(int index) ;
};
}
using namespace XAO;
-IntegerStep::IntegerStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents)
+IntegerStep::IntegerStep(int step, int stamp, int nbElements, int nbComponents)
{
m_nbElements = nbElements;
m_nbComponents = nbComponents;
return result;
}
-std::vector<int> IntegerStep::getElement(const int& element)
-throw (XAO_Exception)
+std::vector<int> IntegerStep::getElement(int element)
+
{
checkElementIndex(element);
return result;
}
-std::vector<int> IntegerStep::getComponent(const int& component)
-throw (XAO_Exception)
+std::vector<int> IntegerStep::getComponent(int component)
+
{
checkComponentIndex(component);
return result;
}
-const int IntegerStep::getValue(const int& element, const int& component)
-throw (XAO_Exception)
+int IntegerStep::getValue(int element, int component)
+
{
checkElementIndex(element);
checkComponentIndex(component);
return m_values[element][component];
}
-const std::string IntegerStep::getStringValue(const int& element, const int& component)
-throw (XAO_Exception)
+const std::string IntegerStep::getStringValue(int element, int component)
+
{
return XaoUtils::intToString(getValue(element, component));
}
void IntegerStep::setValues(const std::vector<int>& values)
-throw (XAO_Exception)
+
{
checkNbValues(values.size());
}
}
-void IntegerStep::setElement(const int& element, const std::vector<int>& elements)
-throw (XAO_Exception)
+void IntegerStep::setElement(int element, const std::vector<int>& elements)
+
{
checkElementIndex(element);
checkNbComponents(elements.size());
m_values[element][i] = elements[i];
}
-void IntegerStep::setComponent(const int& component, const std::vector<int>& components)
-throw (XAO_Exception)
+void IntegerStep::setComponent(int component, const std::vector<int>& components)
+
{
checkElementIndex(component);
checkNbElements(components.size());
m_values[i][component] = components[i];
}
-void IntegerStep::setValue(const int& element, const int& component, const int& value)
-throw (XAO_Exception)
+void IntegerStep::setValue(int element, int component, int value)
+
{
checkElementIndex(element);
checkComponentIndex(component);
m_values[element][component] = value;
}
-void IntegerStep::setStringValue(const int& element, const int& component, const std::string& value)
-throw (XAO_Exception)
+void IntegerStep::setStringValue(int element, int component, const std::string& value)
+
{
setValue(element, component, XaoUtils::stringToInt(value));
}
* @param nbElements the number elements of the geometry.
* @param nbComponents the number of components of the field.
*/
- IntegerStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents);
+ IntegerStep(int step, int stamp, int nbElements, int nbComponents);
- virtual const XAO::Type getType() { return XAO::INTEGER; }
+ virtual XAO::Type getType() { return XAO::INTEGER; }
/**
* Gets all the values of the step as a list.
* @param element the index of the element.
* @return a vector containing all the values for the given element.
*/
- std::vector<int> getElement(const int& element) throw (XAO_Exception);
+ std::vector<int> getElement(int element) ;
/**
* Gets all the values for a given component.
* @param component the index of the component.
* @return a vector containing all the values for the given component.
*/
- std::vector<int> getComponent(const int& component) throw (XAO_Exception);
+ std::vector<int> getComponent(int component) ;
/**
* Gets the value for an element and a component.
* @param component the index of the component.
* @return the value for the given element and component.
*/
- const int getValue(const int& element, const int& component) throw (XAO_Exception);
+ int getValue(int element, int component) ;
/**
* Sets all the values from a list.
* @param values the list of values to set.
*/
- void setValues(const std::vector<int>& values) throw (XAO_Exception);
+ void setValues(const std::vector<int>& values) ;
/**
* Sets the values for an element.
* @param element the index of the element to set.
* @param elements the values to set.
*/
- void setElement(const int& element, const std::vector<int>& elements) throw (XAO_Exception);
+ void setElement(int element, const std::vector<int>& elements) ;
/**
* Sets the values for a component.
* @param component the index of the component to set.
* @param components the values to set.
*/
- void setComponent(const int& component, const std::vector<int>& components) throw (XAO_Exception);
+ void setComponent(int component, const std::vector<int>& components) ;
/**
* Sets the value for an element and a component.
* @param component the index of the component.
* @param value the value.
*/
- void setValue(const int& element, const int& component, const int& value) throw (XAO_Exception);
+ void setValue(int element, int component, int value) ;
- virtual const std::string getStringValue(const int& element, const int& component) throw (XAO_Exception);
- virtual void setStringValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception);
+ virtual const std::string getStringValue(int element, int component) ;
+ virtual void setStringValue(int element, int component, const std::string& value) ;
private:
std::vector< std::vector<int> > m_values;
using namespace XAO;
-void Step::checkElementIndex(const int& element)
-throw (XAO_Exception)
+void Step::checkElementIndex(int element)
{
if (element < m_nbElements && element >= 0)
return;
<< m_nbElements-1 << "]: " << element);
}
-void Step::checkComponentIndex(const int& component)
-throw (XAO_Exception)
+void Step::checkComponentIndex(int component)
{
if (component < m_nbComponents && component >= 0)
return;
<< m_nbComponents-1 << "]: " << component);
}
-void Step::checkNbElements(const int& nbElements)
-throw (XAO_Exception)
+void Step::checkNbElements(int nbElements)
{
if (nbElements == m_nbElements)
return;
<< ", expected " << m_nbElements);
}
-void Step::checkNbComponents(const int& nbComponents)
-throw (XAO_Exception)
+void Step::checkNbComponents(int nbComponents)
{
if (nbComponents == m_nbComponents)
return;
<< ", expected " << m_nbComponents);
}
-void Step::checkNbValues(const int& nbValues)
-throw (XAO_Exception)
+void Step::checkNbValues(int nbValues)
{
if (nbValues == m_nbElements * m_nbComponents)
return;
* Gets the type of the step.
* @return
*/
- virtual const XAO::Type getType() = 0;
+ virtual XAO::Type getType() = 0;
/**
* Gets the step index.
* @return the index of the step.
*/
- const int getStep() { return m_step; }
+ int getStep() { return m_step; }
/**
* Sets the number of the step.
* @param step the index to set.
*/
- void setStep(const int& step) { m_step = step; }
+ void setStep(int step) { m_step = step; }
/**
* Gets the stamp of the index.
* @return the stamp of the index.
*/
- const int getStamp() { return m_stamp; }
+ int getStamp() { return m_stamp; }
/**
* Sets the stamp of the index.
* @param stamp the stamp to set.
*/
- void setStamp(const int& stamp) { m_stamp = stamp; }
+ void setStamp(int stamp) { m_stamp = stamp; }
/**
* Gets the number of components of the step.
* @return the number of components.
*/
- const int countComponents() { return m_nbComponents; }
+ int countComponents() { return m_nbComponents; }
/**
* Gets the number of elements for the step.
* @return the number of elements.
*/
- const int countElements() { return m_nbElements; }
+ int countElements() { return m_nbElements; }
/**
* Gets the number of values for the step.
* @return the number of values.
*/
- const int countValues() { return m_nbElements * m_nbComponents; }
+ int countValues() { return m_nbElements * m_nbComponents; }
/**
* Gets a value as a string.
* @param component the index of the component.
* @return the value as a string.
*/
- virtual const std::string getStringValue(const int& element, const int& component) = 0;
+ virtual const std::string getStringValue(int element, int component) = 0;
/**
* Sets a value as a string
* @param value the string value.
* @throw XAO_Exception if the value is not valid.
*/
- virtual void setStringValue(const int& element, const int& component, const std::string& value) = 0;
+ virtual void setStringValue(int element, int component, const std::string& value) = 0;
protected:
/**
* Checks that given element index is in the range of element indexes.
* @param element the index to check.
*/
- void checkElementIndex(const int& element) throw (XAO_Exception);
+ void checkElementIndex(int element);
/**
* Checks that given component index is in the range of component indexes.
* @param component the index to check.
*/
- void checkComponentIndex(const int& component)throw (XAO_Exception);
+ void checkComponentIndex(int component);
/**
* Checks that the given number of elements is correct.
* @param nbElements the number of elements to check.
*/
- void checkNbElements(const int& nbElements)throw (XAO_Exception);
+ void checkNbElements(int nbElements);
/**
* Checks that the given number of components is correct.
* @param nbComponents the number of components to check.
*/
- void checkNbComponents(const int& nbComponents)throw (XAO_Exception);
+ void checkNbComponents(int nbComponents);
/**
* checks that the given number of values is correct.
* @param nbValues the number of values to check.
*/
- void checkNbValues(const int& nbValues)throw (XAO_Exception);
+ void checkNbValues(int nbValues);
protected:
/** the index of the step. */
using namespace XAO;
-StringField::StringField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name)
+StringField::StringField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name)
: Field(dimension, nbElements, nbComponents, name)
{
}
-Step* StringField::addNewStep(const int& step)
-throw (XAO_Exception)
+Step* StringField::addNewStep(int step)
+
{
return addStep(step, 0);
}
-StringStep* StringField::addStep(const int& step)
-throw (XAO_Exception)
+StringStep* StringField::addStep(int step)
+
{
return addStep(step, 0);
}
-StringStep* StringField::addStep(const int& step, const int& stamp)
-throw (XAO_Exception)
+StringStep* StringField::addStep(int step, int stamp)
+
{
if (hasStep(step))
throw XAO_Exception(MsgBuilder() << "Step with number " << step << " already exists.");
return bstep;
}
-StringStep* StringField::getStep(const int& index)
-throw (XAO_Exception)
+StringStep* StringField::getStep(int index)
+
{
checkStepIndex(index);
return (StringStep*)m_steps[index];
* @param nbComponents the number of components.
* @param name the name of the field.
*/
- StringField(const XAO::Dimension& dimension, const int& nbElements, const int& nbComponents, const std::string& name);
+ StringField(XAO::Dimension dimension, int nbElements, int nbComponents, const std::string& name);
- virtual const XAO::Type getType() { return XAO::STRING; }
+ virtual XAO::Type getType() { return XAO::STRING; }
- virtual Step* addNewStep(const int& step) throw (XAO_Exception);
+ virtual Step* addNewStep(int step) ;
/**
* Adds a new step.
* @param step the number of the step.
* @return the newly created step.
*/
- StringStep* addStep(const int& step) throw (XAO_Exception);
+ StringStep* addStep(int step) ;
/**
* Adds a new step.
* @param stamp the stamp of the step.
* @return the newly created step.
*/
- StringStep* addStep(const int& step, const int& stamp) throw (XAO_Exception);
+ StringStep* addStep(int step, int stamp) ;
/**
* Gets the step of given index.
* @param index the index of the step.
* @return the step for the given index.
*/
- StringStep* getStep(const int& index) throw (XAO_Exception);
+ StringStep* getStep(int index) ;
};
}
using namespace XAO;
-StringStep::StringStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents)
+StringStep::StringStep(int step, int stamp, int nbElements, int nbComponents)
{
m_nbElements = nbElements;
m_nbComponents = nbComponents;
return result;
}
-std::vector<std::string> StringStep::getElement(const int& element)
-throw (XAO_Exception)
+std::vector<std::string> StringStep::getElement(int element)
+
{
checkElementIndex(element);
return result;
}
-std::vector<std::string> StringStep::getComponent(const int& component)
-throw (XAO_Exception)
+std::vector<std::string> StringStep::getComponent(int component)
+
{
checkComponentIndex(component);
return result;
}
-const std::string StringStep::getValue(const int& element, const int& component)
-throw (XAO_Exception)
+const std::string StringStep::getValue(int element, int component)
+
{
checkElementIndex(element);
checkComponentIndex(component);
return m_values[element][component];
}
-const std::string StringStep::getStringValue(const int& element, const int& component)
-throw (XAO_Exception)
+const std::string StringStep::getStringValue(int element, int component)
+
{
return getValue(element, component);
}
void StringStep::setValues(const std::vector<std::string>& values)
-throw (XAO_Exception)
+
{
checkNbValues(values.size());
}
}
-void StringStep::setElement(const int& element, const std::vector<std::string>& elements)
-throw (XAO_Exception)
+void StringStep::setElement(int element, const std::vector<std::string>& elements)
+
{
checkElementIndex(element);
checkNbComponents(elements.size());
m_values[element][i] = elements[i];
}
-void StringStep::setComponent(const int& component, const std::vector<std::string>& components)
-throw (XAO_Exception)
+void StringStep::setComponent(int component, const std::vector<std::string>& components)
+
{
checkElementIndex(component);
checkNbElements(components.size());
m_values[i][component] = components[i];
}
-void StringStep::setValue(const int& element, const int& component, const std::string& value)
-throw (XAO_Exception)
+void StringStep::setValue(int element, int component, const std::string& value)
+
{
checkElementIndex(element);
checkComponentIndex(component);
m_values[element][component] = value;
}
-void StringStep::setStringValue(const int& element, const int& component, const std::string& value)
-throw (XAO_Exception)
+void StringStep::setStringValue(int element, int component, const std::string& value)
+
{
setValue(element, component, value);
}
* @param nbElements the number elements of the geometry.
* @param nbComponents the number of components of the field.
*/
- StringStep(const int& step, const int& stamp, const int& nbElements, const int& nbComponents);
+ StringStep(int step, int stamp, int nbElements, int nbComponents);
- virtual const XAO::Type getType() { return XAO::STRING; }
+ virtual XAO::Type getType() { return XAO::STRING; }
/**
* Gets all the values of the step as a list.
* @param element the index of the element.
* @return a vector containing all the values for the given element.
*/
- std::vector<std::string> getElement(const int& element) throw (XAO_Exception);
+ std::vector<std::string> getElement(int element) ;
/**
* Gets all the values for a given component.
* @param component the index of the component.
* @return a vector containing all the values for the given component.
*/
- std::vector<std::string> getComponent(const int& component) throw (XAO_Exception);
+ std::vector<std::string> getComponent(int component) ;
/**
* Gets the value for an element and a component.
* @param component the index of the component.
* @return the value for the given element and component.
*/
- const std::string getValue(const int& element, const int& component) throw (XAO_Exception);
+ const std::string getValue(int element, int component) ;
/**
* Sets all the values from a list.
* @param values the list of values to set.
*/
- void setValues(const std::vector<std::string>& values) throw (XAO_Exception);
+ void setValues(const std::vector<std::string>& values) ;
/**
* Sets the values for an element.
* @param element the index of the element to set.
* @param elements the values to set.
*/
- void setElement(const int& element, const std::vector<std::string>& elements) throw (XAO_Exception);
+ void setElement(int element, const std::vector<std::string>& elements) ;
/**
* Sets the values for a component.
* @param component the index of the component to set.
* @param components the values to set.
*/
- void setComponent(const int& component, const std::vector<std::string>& components) throw (XAO_Exception);
+ void setComponent(int component, const std::vector<std::string>& components) ;
/**
* Sets the value for an element and a component.
* @param component the index of the component.
* @param value the value.
*/
- void setValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception);
+ void setValue(int element, int component, const std::string& value) ;
- virtual const std::string getStringValue(const int& element, const int& component) throw (XAO_Exception);
- virtual void setStringValue(const int& element, const int& component, const std::string& value) throw (XAO_Exception);
+ virtual const std::string getStringValue(int element, int component) ;
+ virtual void setStringValue(int element, int component, const std::string& value) ;
private:
std::vector< std::vector<std::string> > m_values;
}
}
-const int Xao::countGroups() const
+int Xao::countGroups() const
{
return m_groups.size();
}
-Group* Xao::getGroup(const int& index)
-throw (XAO_Exception)
+Group* Xao::getGroup(int index)
+
{
checkGroupIndex(index);
return NULL;
}
-Group* Xao::addGroup(const XAO::Dimension& dim, const std::string& name)
-throw (XAO_Exception)
+Group* Xao::addGroup(XAO::Dimension dim, const std::string& name)
+
{
checkGeometry();
checkGroupDimension(dim);
return res;
}
-const int Xao::countFields() const
+int Xao::countFields() const
{
return m_fields.size();
}
-const XAO::Type Xao::getFieldType(const int& index)
-throw (XAO_Exception)
+XAO::Type Xao::getFieldType(int index)
+
{
return getField(index)->getType();
}
-Field* Xao::getField(const int& index)
-throw (XAO_Exception)
+Field* Xao::getField(int index)
+
{
checkFieldIndex(index);
throw XAO_Exception("Field not found.");
}
-BooleanField* Xao::getBooleanField(const int& index)
-throw (XAO_Exception)
+BooleanField* Xao::getBooleanField(int index)
+
{
Field* field = getField(index);
if (field->getType() != XAO::BOOLEAN)
return (BooleanField*)field;
}
-DoubleField* Xao::getDoubleField(const int& index)
-throw (XAO_Exception)
+DoubleField* Xao::getDoubleField(int index)
+
{
Field* field = getField(index);
if (field->getType() != XAO::DOUBLE)
return (DoubleField*)field;
}
-IntegerField* Xao::getIntegerField(const int& index)
-throw (XAO_Exception)
+IntegerField* Xao::getIntegerField(int index)
+
{
Field* field = getField(index);
if (field->getType() != XAO::INTEGER)
return (IntegerField*)field;
}
-StringField* Xao::getStringField(const int& index)
-throw (XAO_Exception)
+StringField* Xao::getStringField(int index)
+
{
Field* field = getField(index);
if (field->getType() != XAO::STRING)
return (StringField*)field;
}
-Field* Xao::addField(const XAO::Type& type, const XAO::Dimension& dim, const int& nbComponents, const std::string& name)
-throw (XAO_Exception)
+Field* Xao::addField(XAO::Type type, XAO::Dimension dim, int nbComponents, const std::string& name)
+
{
checkGeometry();
int nbElts = m_geometry->countElements(dim);
return field;
}
-IntegerField* Xao::addIntegerField(const XAO::Dimension& dim, const int& nbComponents, const std::string& name)
-throw (XAO_Exception)
+IntegerField* Xao::addIntegerField(XAO::Dimension dim, int nbComponents, const std::string& name)
+
{
checkGeometry();
int nbElts = m_geometry->countElements(dim);
m_fields.push_back(field);
return field;
}
-BooleanField* Xao::addBooleanField(const XAO::Dimension& dim, const int& nbComponents, const std::string& name)
-throw (XAO_Exception)
+BooleanField* Xao::addBooleanField(XAO::Dimension dim, int nbComponents, const std::string& name)
+
{
checkGeometry();
int nbElts = m_geometry->countElements(dim);
m_fields.push_back(field);
return field;
}
-DoubleField* Xao::addDoubleField(const XAO::Dimension& dim, const int& nbComponents, const std::string& name)
-throw (XAO_Exception)
+DoubleField* Xao::addDoubleField(XAO::Dimension dim, int nbComponents, const std::string& name)
+
{
checkGeometry();
int nbElts = m_geometry->countElements(dim);
m_fields.push_back(field);
return field;
}
-StringField* Xao::addStringField(const XAO::Dimension& dim, const int& nbComponents, const std::string& name)
-throw (XAO_Exception)
+StringField* Xao::addStringField(XAO::Dimension dim, int nbComponents, const std::string& name)
+
{
checkGeometry();
int nbElts = m_geometry->countElements(dim);
return res;
}
-const bool Xao::exportXAO(const std::string& fileName, const std::string& shapeFileName)
+bool Xao::exportXAO(const std::string& fileName, const std::string& shapeFileName)
{
return XaoExporter::saveToFile(this, fileName, shapeFileName);
}
return XaoExporter::saveToXml(this);
}
-const bool Xao::importXAO(const std::string& fileName)
+bool Xao::importXAO(const std::string& fileName)
{
return XaoExporter::readFromFile(fileName, this);
}
-const bool Xao::setXML(const std::string& xml)
+bool Xao::setXML(const std::string& xml)
{
return XaoExporter::setXML(xml, this);
}
void Xao::checkGeometry() const
-throw(XAO_Exception)
{
if (m_geometry == NULL)
throw XAO_Exception("Geometry is null");
}
-void Xao::checkGroupIndex(const int& index) const
-throw(XAO_Exception)
+void Xao::checkGroupIndex(int index) const
{
if (index >= 0 && index < countGroups())
return;
<< countGroups()-1 << "]: " << index);
}
-void Xao::checkFieldIndex(const int& index) const
-throw(XAO_Exception)
+void Xao::checkFieldIndex(int index) const
{
if (index >= 0 && index < countFields())
return;
<< countFields()-1 << "]: " << index);
}
-void Xao::checkGroupDimension(const XAO::Dimension& dim) const
-throw(XAO_Exception)
+void Xao::checkGroupDimension(XAO::Dimension dim) const
{
if (dim == XAO::WHOLE)
throw XAO_Exception(MsgBuilder() << "Invalid dimension for group: " << dim);
* Sets the geometry.
* \param geometry the geometry to set.
*/
- void setGeometry(Geometry* geometry) throw (XAO_Exception)
+ void setGeometry(Geometry* geometry)
{
if (m_geometry != NULL)
throw XAO_Exception("Geometry already set.");
* Gets the number of groups.
* \return the number of groups.
*/
- const int countGroups() const;
+ int countGroups() const;
/**
* Gets a group.
* \param index the index of the wanted group.
* \return the group.
*/
- Group* getGroup(const int& index) throw (XAO_Exception);
+ Group* getGroup(int index) ;
/**
* Adds a group.
* \param dim the dimension of the group.
* \param name the name of the group.
* \return the created group.
*/
- Group* addGroup(const XAO::Dimension& dim, const std::string& name = std::string("")) throw (XAO_Exception);
+ Group* addGroup(XAO::Dimension dim, const std::string& name = std::string("")) ;
/**
* Removes a group.
* \param group the group to remove.
* Gets the number of fields.
* \return the number of fields.
*/
- const int countFields() const;
+ int countFields() const;
/**
* Gets the type of a field.
* \param index the index of the wanted field.
* \return the type of the field.
*/
- const XAO::Type getFieldType(const int& index) throw (XAO_Exception);
+ XAO::Type getFieldType(int index) ;
/**
* Gets a field.
* \param index the index of the wanted field.
* \return the field.
*/
- Field* getField(const int& index) throw (XAO_Exception);
+ Field* getField(int index) ;
- BooleanField* getBooleanField(const int& index) throw (XAO_Exception);
- DoubleField* getDoubleField(const int& index) throw (XAO_Exception);
- IntegerField* getIntegerField(const int& index) throw (XAO_Exception);
- StringField* getStringField(const int& index) throw (XAO_Exception);
+ BooleanField* getBooleanField(int index) ;
+ DoubleField* getDoubleField(int index) ;
+ IntegerField* getIntegerField(int index) ;
+ StringField* getStringField(int index) ;
/**
* Adds a field.
* \param name the name of the field.
* \return the created field.
*/
- Field* addField(const XAO::Type& type, const XAO::Dimension& dim, const int& nbComponents,
+ Field* addField(XAO::Type type, XAO::Dimension dim, int nbComponents,
const std::string& name = std::string(""))
- throw (XAO_Exception);
+ ;
- BooleanField* addBooleanField(const XAO::Dimension& dim, const int& nbComponents,
- const std::string& name = std::string("")) throw (XAO_Exception);
- IntegerField* addIntegerField(const XAO::Dimension& dim, const int& nbComponents,
- const std::string& name = std::string("")) throw (XAO_Exception);
- DoubleField* addDoubleField(const XAO::Dimension& dim, const int& nbComponents,
- const std::string& name = std::string("")) throw (XAO_Exception);
- StringField* addStringField(const XAO::Dimension& dim, const int& nbComponents,
- const std::string& name = std::string("")) throw (XAO_Exception);
+ BooleanField* addBooleanField(XAO::Dimension dim, int nbComponents,
+ const std::string& name = std::string("")) ;
+ IntegerField* addIntegerField(XAO::Dimension dim, int nbComponents,
+ const std::string& name = std::string("")) ;
+ DoubleField* addDoubleField(XAO::Dimension dim, int nbComponents,
+ const std::string& name = std::string("")) ;
+ StringField* addStringField(XAO::Dimension dim, int nbComponents,
+ const std::string& name = std::string("")) ;
/**
* Removes a field.
* \param shapeFileName if not empty, export the shape to this external file.
* \return true is the export is successful.
*/
- const bool exportXAO(const std::string& fileName, const std::string& shapeFileName);
+ bool exportXAO(const std::string& fileName, const std::string& shapeFileName);
/**
* Gets the XML corresponding to this XAO.
* \return the XML as a string.
* \param fileName the name of the file to import.
* \return true if the import is successful.
*/
- const bool importXAO(const std::string& fileName);
+ bool importXAO(const std::string& fileName);
/**
* Sets an XML describing an XAO format to this object.
* \param xml the XML to set.
* \return true if the import is successful.
*/
- const bool setXML(const std::string& xml);
+ bool setXML(const std::string& xml);
private:
- void checkGeometry() const throw (XAO_Exception);
- void checkGroupIndex(const int& index) const throw (XAO_Exception);
- void checkFieldIndex(const int& index) const throw (XAO_Exception);
- void checkGroupDimension(const XAO::Dimension& dim) const throw (XAO_Exception);
+ void checkGeometry() const ;
+ void checkGroupIndex(int index) const ;
+ void checkFieldIndex(int index) const ;
+ void checkGroupDimension(XAO::Dimension dim) const ;
private:
/** The author of the file. */
void parseStepElementNode(xmlNodePtr eltNode, Step* step);
std::string readStringProp(xmlNodePtr node, const xmlChar* attribute,
- const bool& required, const std::string& defaultValue,
+ bool required, const std::string& defaultValue,
const std::string& exception = std::string(""));
int readIntegerProp(xmlNodePtr node, const xmlChar* attribute,
- const bool& required, const int& defaultValue,
+ bool required, int defaultValue,
const std::string& exception = std::string(""));
std::string readStringProp(xmlNodePtr node, const xmlChar* attribute,
- const bool& required, const std::string& defaultValue,
+ bool required, const std::string& defaultValue,
const std::string& exception /*= std::string() */)
{
xmlChar* strAttr = xmlGetProp(node, attribute);
}
int readIntegerProp(xmlNodePtr node, const xmlChar* attribute,
- const bool& required, const int& defaultValue,
+ bool required, int defaultValue,
const std::string& exception /*= std::string() */)
{
xmlChar* strAttr = xmlGetProp(node, attribute);
}
}
- void exportStep(Step* step, Field* field, xmlNodePtr nodeSteps)
+ void exportStep(Step* step, Field* /*field*/, xmlNodePtr nodeSteps)
{
xmlNodePtr nodeStep = xmlNewChild(nodeSteps, 0, C_TAG_STEP, 0);
xmlNewProp(nodeStep, C_ATTR_STEP_NUMBER, BAD_CAST XaoUtils::intToString(step->getStep()).c_str());
xaoObject->setGeometry(geometry);
}
- void parseShapeNode(xmlDocPtr doc, xmlNodePtr shapeNode, Geometry* geometry)
+ void parseShapeNode(xmlDocPtr /*doc*/, xmlNodePtr shapeNode, Geometry* geometry)
{
if (geometry->getFormat() == XAO::BREP)
{
}
}
-const bool XaoExporter::saveToFile(Xao* xaoObject, const std::string& fileName, const std::string& shapeFileName)
-throw (XAO_Exception)
+bool XaoExporter::saveToFile(Xao* xaoObject, const std::string& fileName, const std::string& shapeFileName)
+
{
xmlDocPtr doc = exportXMLDoc(xaoObject, shapeFileName);
xmlSaveFormatFileEnc(fileName.c_str(), doc, "UTF-8", 1); // format = 1 for node indentation
}
const std::string XaoExporter::saveToXml(Xao* xaoObject)
-throw (XAO_Exception)
+
{
xmlDocPtr doc = exportXMLDoc(xaoObject, "");
return (char*)xmlbuff;
}
-const bool XaoExporter::readFromFile(const std::string& fileName, Xao* xaoObject)
-throw (XAO_Exception)
+bool XaoExporter::readFromFile(const std::string& fileName, Xao* xaoObject)
+
{
// parse the file and get the DOM
int options = XML_PARSE_HUGE | XML_PARSE_NOCDATA;
return true;
}
-const bool XaoExporter::setXML(const std::string& xml, Xao* xaoObject)
-throw (XAO_Exception)
+bool XaoExporter::setXML(const std::string& xml, Xao* xaoObject)
+
{
int options = XML_PARSE_HUGE | XML_PARSE_NOCDATA;
xmlDocPtr doc = xmlReadDoc(BAD_CAST xml.c_str(), "", NULL, options);
* @param shapeFileName if not empty save the shape in an this external file.
* @return true if the export was successful, false otherwise.
*/
- static const bool saveToFile(Xao* xaoObject, const std::string& fileName, const std::string& shapeFileName)
- throw (XAO_Exception);
+ static bool saveToFile(Xao* xaoObject, const std::string& fileName, const std::string& shapeFileName)
+ ;
/**
* Saves the XAO object to a XML string.
* @return the XML string.
*/
static const std::string saveToXml(Xao* xaoObject)
- throw (XAO_Exception);
+ ;
/**
* Reads a XAO object from a file.
* @param xaoObject the XAO object.
* @return true if the XAO object was read successful, false otherwise.
*/
- static const bool readFromFile(const std::string& fileName, Xao* xaoObject)
- throw (XAO_Exception);
+ static bool readFromFile(const std::string& fileName, Xao* xaoObject)
+ ;
/**
* Reads a XAO object from an XML string.
* @param xaoObject the XAO object.
* @return true if the XAO object was read successful, false otherwise.
*/
- static const bool setXML(const std::string& xml, Xao* xaoObject)
- throw (XAO_Exception);
+ static bool setXML(const std::string& xml, Xao* xaoObject)
+ ;
};
}
using namespace XAO;
-const std::string XaoUtils::intToString(const int& value)
+std::string XaoUtils::intToString(int value)
{
std::ostringstream str;
str << value;
return str.str();
}
-const int XaoUtils::stringToInt(const std::string& value)
-throw(XAO_Exception)
+int XaoUtils::stringToInt(const std::string& value)
{
int res;
std::istringstream convert(value);
return res;
}
-const std::string XaoUtils::doubleToString(const double& value)
+std::string XaoUtils::doubleToString(double value)
{
std::ostringstream str;
str << value;
return str.str();
}
-const double XaoUtils::stringToDouble(const std::string& value)
-throw(XAO_Exception)
+double XaoUtils::stringToDouble(const std::string& value)
{
double res;
std::istringstream convert(value);
return res;
}
-const std::string XaoUtils::booleanToString(const bool& value)
+std::string XaoUtils::booleanToString(bool value)
{
- if (value)
- return "true";
- return "false";
+ return value ? "true" : "false";
}
-const bool XaoUtils::stringToBoolean(const std::string& value)
-throw(XAO_Exception)
+bool XaoUtils::stringToBoolean(const std::string& value)
{
if (value == "true" || value == "1")
return true;
throw XAO_Exception(MsgBuilder() << "Invalid boolean value: " << value);
}
-const std::string XaoUtils::dimensionToString(const XAO::Dimension& dimension)
-throw(XAO_Exception)
+std::string XaoUtils::dimensionToString(XAO::Dimension dimension)
{
if (dimension == XAO::VERTEX)
return "vertex";
throw XAO_Exception(MsgBuilder() << "Bad dimension: " << dimension);
}
-const XAO::Dimension XaoUtils::stringToDimension(const std::string& dimension)
-throw(XAO_Exception)
+XAO::Dimension XaoUtils::stringToDimension(const std::string& dimension)
{
if (dimension == "vertex")
return XAO::VERTEX;
throw XAO_Exception(MsgBuilder() << "Bad dimension: " << dimension);
}
-const std::string XaoUtils::fieldTypeToString(const XAO::Type& type)
-throw(XAO_Exception)
+std::string XaoUtils::fieldTypeToString(XAO::Type type)
{
if (type ==XAO:: BOOLEAN)
return "boolean";
throw XAO_Exception(MsgBuilder() << "Bad type: " << type);
}
-const XAO::Type XaoUtils::stringToFieldType(const std::string& type)
-throw(XAO_Exception)
+XAO::Type XaoUtils::stringToFieldType(const std::string& type)
{
if (type == "boolean")
return XAO::BOOLEAN;
throw XAO_Exception(MsgBuilder() << "Bad type: " << type);
}
-const std::string XaoUtils::shapeFormatToString(const XAO::Format& format)
-throw(XAO_Exception)
+std::string XaoUtils::shapeFormatToString(XAO::Format format)
{
if (format == XAO::BREP)
return "BREP";
throw XAO_Exception(MsgBuilder() << "Bad format: " << format);
}
-const XAO::Format XaoUtils::stringToShapeFormat(const std::string& format)
-throw(XAO_Exception)
+XAO::Format XaoUtils::stringToShapeFormat(const std::string& format)
{
if (format == "BREP")
return XAO::BREP;
* \param value the integer to convert.
* \return the string.
*/
- static const std::string intToString(const int& value);
+ static std::string intToString(int value);
/**
* Converts a string into an integer.
* \return the integer value.
* \throw XAO_Exception if value cannot be converted to string.
*/
- static const int stringToInt(const std::string& value) throw(XAO_Exception);
+ static int stringToInt(const std::string& value);
/**
* Converts a double into a string.
* \param value the double to convert.
* \return the string.
*/
- static const std::string doubleToString(const double& value);
+ static std::string doubleToString(double value);
/**
* Converts a string into a double.
* \param value the string to convert.
* \return the double value.
* \throw XAO_Exception if value cannot be converted to string.
*/
- static const double stringToDouble(const std::string& value) throw(XAO_Exception);
+ static double stringToDouble(const std::string& value);
/**
* Converts a boolean into a string.
* \param value the boolean to convert.
* \return the string.
*/
- static const std::string booleanToString(const bool& value);
+ static std::string booleanToString(bool value);
/**
* Converts a string into a boolean.
* \param value the string to convert.
* \throw XAO_Exception if value cannot be converted to boolean.
* \note accepted values are "true", "1", "false", "0".
*/
- static const bool stringToBoolean(const std::string& value) throw(XAO_Exception);
+ static bool stringToBoolean(const std::string& value);
/**
* Converts a Dimension to string.
* \return the dimension as a string.
* \throw XAO_Exception
*/
- static const std::string dimensionToString(const XAO::Dimension& dimension) throw(XAO_Exception);
+ static std::string dimensionToString(XAO::Dimension dimension);
/**
* Converts a string into a Dimension.
* \return the converted Dimension.
* \throw XAO_Exception if dimension cannot be converted.
*/
- static const XAO::Dimension stringToDimension(const std::string& dimension) throw(XAO_Exception);
+ static XAO::Dimension stringToDimension(const std::string& dimension);
/**
* Converts a Type to string.
* \return the Type as a string.
* \throw XAO_Exception
*/
- static const std::string fieldTypeToString(const XAO::Type& type) throw(XAO_Exception);
+ static std::string fieldTypeToString(XAO::Type type);
/**
* Converts a string into a Type.
* \return the converted Type.
* \throw XAO_Exception if type cannot be converted.
*/
- static const XAO::Type stringToFieldType(const std::string& type) throw(XAO_Exception);
+ static XAO::Type stringToFieldType(const std::string& type);
/**
* Converts a Format to string.
* \return the Format as a string.
* \throw XAO_Exception
*/
- static const std::string shapeFormatToString(const XAO::Format& format) throw(XAO_Exception);
+ static std::string shapeFormatToString(XAO::Format format);
/**
* Converts a string into a Format.
* \return the converted Format.
* \throw XAO_Exception if format cannot be converted.
*/
- static const XAO::Format stringToShapeFormat(const std::string& format) throw(XAO_Exception);
+ static XAO::Format stringToShapeFormat(const std::string& format);
};
/**
CPPUNIT_ASSERT_EQUAL(3, fi->countComponents());
Field* fb = obj.addField(XAO::BOOLEAN, XAO::FACE, 3);
- Field* fd = obj.addField(XAO::DOUBLE, XAO::FACE, 3);
- Field* fs = obj.addField(XAO::STRING, XAO::FACE, 3);
+ /*Field* fd = */obj.addField(XAO::DOUBLE, XAO::FACE, 3);
+ /*Field* fs = */obj.addField(XAO::STRING, XAO::FACE, 3);
CPPUNIT_ASSERT_EQUAL(4, obj.countFields());
CPPUNIT_ASSERT_THROW(obj.getField(10), XAO_Exception);
return true;
}
-IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver)
#include "GEOM_BaseDriver.hxx"
-DEFINE_STANDARD_HANDLE(XAOPlugin_Driver, GEOM_BaseDriver);
+DEFINE_STANDARD_HANDLE(XAOPlugin_Driver, GEOM_BaseDriver)
class XAOPlugin_Driver: public GEOM_BaseDriver
{
// function : isValid
// purpose :
//=================================================================================
-bool XAOPlugin_ExportDlg::isValid(QString& msg)
+bool XAOPlugin_ExportDlg::isValid(QString& /*msg*/)
{
// check shape
if (ledShape->text().isEmpty())
bool
XAOPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal,
const TCollection_AsciiString& theFileName,
- const TCollection_AsciiString& theFormatName,
+ const TCollection_AsciiString& /*theFormatName*/,
const TCollection_AsciiString& theShapeFileName )
{
XAOPlugin_IOperations* aPluginOperations = XAOPlugin_OperationsCreator::get( GetEngine() );
*/
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
-XAOPlugin_IECallBack::Import( const TCollection_AsciiString& theFormatName,
+XAOPlugin_IECallBack::Import( const TCollection_AsciiString& /*theFormatName*/,
const TCollection_AsciiString& theFileName )
{
XAOPlugin_IOperations* aPluginOperations = XAOPlugin_OperationsCreator::get( GetEngine() );
void XAOPlugin_IOperations::exportFields( std::list<Handle(GEOM_Field)> fieldList,
XAO::Xao* xaoObject,
- XAO::BrepGeometry* geometry )
+ XAO::BrepGeometry* /*geometry*/ )
{
std::list<Handle(GEOM_Field)>::iterator fieldIterator = fieldList.begin();
while (fieldIterator != fieldList.end())
// function : isValid
// purpose :
//=================================================================================
-bool XAOPlugin_ImportDlg::isValid(QString& msg)
+bool XAOPlugin_ImportDlg::isValid(QString& /*msg*/)
{
// check file name
if (ledFileName->text().isEmpty())
