mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-25 17:00:35 +05:00
fight warnings: additional corrections
This commit is contained in:
parent
3e27c82214
commit
b6838cebdf
@ -16,7 +16,7 @@
|
||||
#
|
||||
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
#
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
|
||||
INCLUDE(CMakeDependentOption)
|
||||
|
||||
PROJECT(SalomeGEOM C CXX)
|
||||
|
@ -523,4 +523,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver)
|
||||
|
@ -33,7 +33,7 @@ class gp_Pnt;
|
||||
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
|
||||
{
|
||||
|
@ -459,31 +459,32 @@ bool AdvancedEngine_IOperations::MakeGroups(Handle(GEOM_Object) theShape, int sh
|
||||
|
||||
#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.);
|
||||
@ -1338,7 +1339,7 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the
|
||||
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;
|
||||
@ -1412,9 +1413,9 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the
|
||||
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()) {
|
||||
@ -1563,7 +1564,7 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the
|
||||
// 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);
|
||||
|
||||
@ -1682,16 +1683,17 @@ TopoDS_Shape AdvancedEngine_IOperations::MakePipeTShapeThicknessReduction
|
||||
{
|
||||
// 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();
|
||||
@ -1805,15 +1807,17 @@ TopoDS_Shape AdvancedEngine_IOperations::MakeThicknessReduction (gp_Ax2 theAxes,
|
||||
}
|
||||
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;
|
||||
|
@ -684,4 +684,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver)
|
||||
|
@ -28,7 +28,7 @@
|
||||
#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
|
||||
{
|
||||
|
@ -266,4 +266,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver)
|
||||
|
@ -25,7 +25,7 @@
|
||||
#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
|
||||
{
|
||||
|
@ -134,7 +134,7 @@ void AdvancedGUI_DividedCylinderDlg::Init()
|
||||
// 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 @@//
|
||||
}
|
||||
@ -223,7 +223,7 @@ GEOM::GEOM_IOperations_ptr AdvancedGUI_DividedCylinderDlg::createOperation()
|
||||
// function : isValid
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
bool AdvancedGUI_DividedCylinderDlg::isValid (QString& msg)
|
||||
bool AdvancedGUI_DividedCylinderDlg::isValid (QString& /*msg*/)
|
||||
{
|
||||
bool ok = true;
|
||||
|
||||
|
@ -169,7 +169,7 @@ void AdvancedGUI_DividedDiskDlg::Init()
|
||||
// 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 @@//
|
||||
}
|
||||
@ -399,7 +399,7 @@ GEOM::GEOM_IOperations_ptr AdvancedGUI_DividedDiskDlg::createOperation()
|
||||
// function : isValid
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
bool AdvancedGUI_DividedDiskDlg::isValid (QString& msg)
|
||||
bool AdvancedGUI_DividedDiskDlg::isValid (QString& /*msg*/)
|
||||
{
|
||||
bool ok = true;
|
||||
|
||||
|
@ -420,7 +420,7 @@ void AdvancedGUI_PipeTShapeDlg::ApplyNewDimensions()
|
||||
// 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)
|
||||
@ -504,7 +504,7 @@ void AdvancedGUI_PipeTShapeDlg::SetPosition (bool isChecked)
|
||||
// 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);
|
||||
|
@ -54,7 +54,7 @@ BREPPlugin_ExportDriver::BREPPlugin_ExportDriver()
|
||||
//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() );
|
||||
@ -89,10 +89,10 @@ Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log
|
||||
*/
|
||||
//================================================================================
|
||||
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 )
|
||||
|
@ -23,7 +23,7 @@
|
||||
// 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
|
||||
{
|
||||
|
@ -47,8 +47,8 @@ BREPPlugin_IECallBack::~BREPPlugin_IECallBack()
|
||||
//=============================================================================
|
||||
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 );
|
||||
@ -61,7 +61,7 @@ BREPPlugin_IECallBack::Export( const Handle(GEOM_Object) theOriginal,
|
||||
*/
|
||||
//=============================================================================
|
||||
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() );
|
||||
|
@ -109,4 +109,4 @@ GetCreationInformation( std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver );
|
||||
IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver )
|
||||
|
@ -23,7 +23,7 @@
|
||||
// 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
|
||||
{
|
||||
|
@ -126,7 +126,7 @@ bool BasicGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
|
||||
// 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();
|
||||
|
||||
|
@ -459,7 +459,7 @@ GEOM::GEOM_IOperations_ptr BasicGUI_ArcDlg::createOperation()
|
||||
// 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;
|
||||
|
@ -360,7 +360,7 @@ void BasicGUI_EllipseDlg::enterEvent( QEvent* )
|
||||
// function : ValueChangedInSpinBox()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BasicGUI_EllipseDlg::ValueChangedInSpinBox( double newValue )
|
||||
void BasicGUI_EllipseDlg::ValueChangedInSpinBox( double /*newValue*/ )
|
||||
{
|
||||
displayPreview(true);
|
||||
}
|
||||
|
@ -371,7 +371,7 @@ GEOM::GEOM_IOperations_ptr BasicGUI_LineDlg::createOperation()
|
||||
// function : isValid
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
bool BasicGUI_LineDlg::isValid( QString& msg )
|
||||
bool BasicGUI_LineDlg::isValid( QString& /*msg*/ )
|
||||
{
|
||||
bool ok = false;
|
||||
switch ( getConstructorId() ) {
|
||||
|
@ -378,13 +378,13 @@ void BasicGUI_MarkerDlg::onSelectionDone()
|
||||
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() );
|
||||
|
@ -633,7 +633,7 @@ void BasicGUI_PlaneDlg::enterEvent( QEvent* )
|
||||
// function : ValueChangedInSpinBox()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BasicGUI_PlaneDlg::ValueChangedInSpinBox( double newValue )
|
||||
void BasicGUI_PlaneDlg::ValueChangedInSpinBox( double /*newValue*/ )
|
||||
{
|
||||
displayPreview(true);
|
||||
}
|
||||
|
@ -667,7 +667,7 @@ void BasicGUI_PointDlg::DeactivateActiveDialog()
|
||||
// function : ValueChangedInSpinBox()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BasicGUI_PointDlg::ValueChangedInSpinBox(double newValue)
|
||||
void BasicGUI_PointDlg::ValueChangedInSpinBox(double /*newValue*/)
|
||||
{
|
||||
displayPreview(true);
|
||||
}
|
||||
@ -957,7 +957,7 @@ QList<GEOM::GeomObjPtr> BasicGUI_PointDlg::getSourceObjects()
|
||||
// function : ClickParamCoord()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BasicGUI_PointDlg::ClickParamCoord(int id)
|
||||
void BasicGUI_PointDlg::ClickParamCoord(int /*id*/)
|
||||
{
|
||||
updateParamCoord(true);
|
||||
displayPreview(true);
|
||||
|
@ -367,7 +367,7 @@ void BasicGUI_VectorDlg::enterEvent( QEvent* )
|
||||
// function : ValueChangedInSpinBox()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BasicGUI_VectorDlg::ValueChangedInSpinBox( double newValue )
|
||||
void BasicGUI_VectorDlg::ValueChangedInSpinBox( double /*newValue*/ )
|
||||
{
|
||||
displayPreview(true);
|
||||
}
|
||||
@ -376,7 +376,7 @@ void BasicGUI_VectorDlg::ValueChangedInSpinBox( double newValue )
|
||||
// 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();
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
#include <Precision.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient)
|
||||
|
||||
//=======================================================================
|
||||
//function : BlockFix_BlockFixAPI
|
||||
|
@ -31,7 +31,7 @@
|
||||
#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
|
||||
{
|
||||
|
@ -50,7 +50,7 @@
|
||||
|
||||
#include <gp_Pnt.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification)
|
||||
|
||||
//=======================================================================
|
||||
//function : BlockFix_PeriodicSurfaceModifier()
|
||||
|
@ -44,7 +44,7 @@ class Geom_Curve;
|
||||
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 {
|
||||
|
||||
|
@ -56,7 +56,7 @@
|
||||
#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
|
||||
|
@ -42,7 +42,7 @@ class Geom_Curve;
|
||||
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 {
|
||||
|
||||
|
@ -904,7 +904,7 @@ Standard_Boolean BlockFix_UnionFaces::IsSameDomain(const TopoDS_Face& aFace,
|
||||
|
||||
return anIIInt.TangentFaces();
|
||||
}
|
||||
catch (Standard_Failure) {
|
||||
catch (Standard_Failure&) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -195,7 +195,7 @@ void BuildGUI_CompoundDlg::ActivateThisDialog()
|
||||
// function : enterEvent()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BuildGUI_CompoundDlg::enterEvent(QEvent* e)
|
||||
void BuildGUI_CompoundDlg::enterEvent(QEvent*)
|
||||
{
|
||||
if ( !mainFrame()->GroupConstructors->isEnabled() )
|
||||
ActivateThisDialog();
|
||||
|
@ -405,7 +405,7 @@ void BuildGUI_EdgeDlg::enterEvent (QEvent*)
|
||||
// function : ValueChangedInSpinBox()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void BuildGUI_EdgeDlg::ValueChangedInSpinBox(double newValue)
|
||||
void BuildGUI_EdgeDlg::ValueChangedInSpinBox(double /*newValue*/)
|
||||
{
|
||||
displayPreview(true);
|
||||
}
|
||||
|
@ -554,7 +554,7 @@ void BuildGUI_FaceDlg::ActivateThisDialog()
|
||||
// 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;
|
||||
|
@ -371,24 +371,22 @@ bool BuildGUI_SolidDlg::execute( ObjectList& objects )
|
||||
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();
|
||||
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;
|
||||
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:
|
||||
{
|
||||
@ -397,9 +395,9 @@ bool BuildGUI_SolidDlg::execute( ObjectList& objects )
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
@ -48,6 +48,6 @@ namespace CurveCreator
|
||||
typedef std::list<CurveCreator_PosPoint*> PosPointsList;
|
||||
//! Map of sections with positioned points
|
||||
typedef std::map<int,PosPointsList> SectionsMap;
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -48,19 +48,19 @@
|
||||
// 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)
|
||||
{
|
||||
}
|
||||
|
||||
@ -95,12 +95,12 @@ std::string CurveCreator_Curve::getUniqSectionName() const
|
||||
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 "";
|
||||
@ -791,8 +791,8 @@ bool CurveCreator_Curve::addPointsInternal( const CurveCreator::SectionsMap &the
|
||||
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());
|
||||
}
|
||||
@ -884,9 +884,9 @@ bool CurveCreator_Curve::setPoint( const int theISection,
|
||||
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();
|
||||
|
||||
|
@ -217,7 +217,7 @@ public:
|
||||
//! 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];
|
||||
}
|
||||
|
@ -275,6 +275,8 @@ bool CurveCreator_Diff::init(const CurveCreator_Curve *theCurve,
|
||||
setNbUndos(1);
|
||||
isOK = myPUndo[0].init(CurveCreator_Operation::RemoveSection, -1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -299,6 +301,8 @@ bool CurveCreator_Diff::init(const CurveCreator_Curve *theCurve,
|
||||
isOK = myPUndo[0].init(CurveCreator_Operation::RenameSection,
|
||||
theCurve->getSectionName(theIntParam1), theIntParam1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( !isOK ){
|
||||
|
@ -29,7 +29,7 @@ CurveCreator_Displayer::CurveCreator_Displayer( Handle(AIS_InteractiveContext) t
|
||||
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();
|
||||
@ -54,7 +54,7 @@ void CurveCreator_Displayer::eraseAll( bool isUpdate )
|
||||
{
|
||||
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 )
|
||||
@ -80,7 +80,7 @@ Quantity_Color CurveCreator_Displayer::getActiveColor( bool isHL )
|
||||
|
||||
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();
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ namespace CurveCreator
|
||||
Dim3d = 3
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
//! The type represents the interface to the curve section.
|
||||
struct CURVECREATOR_EXPORT CurveCreator_ISection
|
||||
|
@ -363,6 +363,8 @@ void CurveCreator_Operation::apply(CurveCreator_Curve *theCurve)
|
||||
case CurveCreator_Operation::SetCoordinates:
|
||||
theCurve->setPointInternal( aSectionsMap );
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -205,10 +205,12 @@ int CurveCreator_TableView::getPointId( const int theRowId ) const
|
||||
void CurveCreator_TableView::OnHeaderClick( int theLogicalId )
|
||||
{
|
||||
if( theLogicalId == myCurrentSortId )
|
||||
{
|
||||
if( myCurrentSortOrder == Qt::AscendingOrder )
|
||||
myCurrentSortOrder = Qt::DescendingOrder;
|
||||
else
|
||||
myCurrentSortOrder = Qt::AscendingOrder;
|
||||
}
|
||||
|
||||
sortByColumn( theLogicalId, myCurrentSortOrder );
|
||||
|
||||
|
@ -65,7 +65,7 @@ CurveCreator_TreeViewModel::CurveCreator_TreeViewModel( CurveCreator_ICurve* the
|
||||
|
||||
int CurveCreator_TreeViewModel::columnCount(const QModelIndex & parent ) const
|
||||
{
|
||||
if( parent.internalId() == ID_SECTION )
|
||||
if( parent.internalId() == (quintptr)ID_SECTION )
|
||||
return 2;
|
||||
else
|
||||
return 2;
|
||||
@ -76,7 +76,7 @@ QVariant CurveCreator_TreeViewModel::data(const QModelIndex & index, int role )
|
||||
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));
|
||||
@ -150,7 +150,7 @@ QModelIndex CurveCreator_TreeViewModel::parent(const QModelIndex & theIndex) con
|
||||
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 );
|
||||
@ -165,7 +165,7 @@ int CurveCreator_TreeViewModel::rowCount(const QModelIndex & parent ) const
|
||||
aRowCnt = myCurve->getNbSections();
|
||||
}
|
||||
else{
|
||||
if( parent.internalId() == ID_SECTION ){
|
||||
if( parent.internalId() == (quintptr)ID_SECTION ){
|
||||
//Points level
|
||||
aRowCnt = myCurve->getNbPoints(parent.row());
|
||||
}
|
||||
@ -191,21 +191,21 @@ QModelIndex CurveCreator_TreeViewModel::pointIndex( int theSection, int thePoint
|
||||
|
||||
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();
|
||||
}
|
||||
@ -320,7 +320,7 @@ void CurveCreator_TreeView::sectionsRemoved( int theSection, int theSectionCnt )
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
@ -618,9 +618,9 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo
|
||||
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 );
|
||||
@ -634,7 +634,7 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo
|
||||
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;
|
||||
@ -663,14 +663,14 @@ void CurveCreator_Utils::setLocalPointContext( const CurveCreator_ICurve* theCur
|
||||
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 ) );
|
||||
}
|
||||
}
|
||||
|
@ -82,10 +82,10 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
|
||||
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 );
|
||||
@ -431,6 +431,8 @@ void CurveCreator_Widget::updateActionsStates()
|
||||
break;
|
||||
}*/
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/*int aSelObjsCnt = aSelPoints.size() + aSelSections.size();
|
||||
@ -480,7 +482,7 @@ void CurveCreator_Widget::onModificationMode(bool checked)
|
||||
myLocalPointView->setVisible( checked );
|
||||
}
|
||||
|
||||
void CurveCreator_Widget::onDetectionMode(bool checked)
|
||||
void CurveCreator_Widget::onDetectionMode(bool /*checked*/)
|
||||
{
|
||||
}
|
||||
|
||||
@ -511,6 +513,8 @@ void CurveCreator_Widget::onModeChanged(bool checked)
|
||||
else if (myActionMap[MODIFICATION_MODE_ID]->isChecked())
|
||||
myActionMap[MODIFICATION_MODE_ID]->trigger();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
updateActionsStates();
|
||||
@ -617,18 +621,18 @@ void CurveCreator_Widget::onModifySection()
|
||||
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();
|
||||
@ -706,7 +710,7 @@ void CurveCreator_Widget::onJoinAll()
|
||||
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();
|
||||
@ -1113,7 +1117,7 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow* theWindow, QMouseEven
|
||||
return;
|
||||
|
||||
if (!aHasShift)
|
||||
aCtx->ClearCurrents( false );
|
||||
aCtx->ClearCurrents( false ); // todo: deprecated OCCT API
|
||||
|
||||
Handle(V3d_View) aView3d = aView->getViewPort()->getView();
|
||||
if ( !aView3d.IsNull() )
|
||||
@ -1141,7 +1145,6 @@ void CurveCreator_Widget::onMouseRelease( SUIT_ViewWindow* theWindow, QMouseEven
|
||||
}
|
||||
|
||||
if ( myDragStarted ) {
|
||||
bool isDragged = myDragged;
|
||||
CurveCreator_ICurve::SectionToPointList aDraggedPoints;
|
||||
QMap<CurveCreator_ICurve::SectionToPoint, CurveCreator::Coordinates > anInitialDragPointsCoords;
|
||||
if ( myDragged ) {
|
||||
@ -1246,7 +1249,7 @@ void CurveCreator_Widget::onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent )
|
||||
* 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;
|
||||
}
|
||||
@ -1266,7 +1269,7 @@ void CurveCreator_Widget::onMouseMove( QMouseEvent* theEvent )
|
||||
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 );
|
||||
@ -1459,7 +1462,7 @@ void CurveCreator_Widget::updateLocalPointView()
|
||||
return;
|
||||
|
||||
CurveCreator_Utils::getSelectedPoints( aContext, myCurve, myLocalPoints );
|
||||
int aNbPoints = myLocalPoints.size();
|
||||
//int aNbPoints = myLocalPoints.size();
|
||||
|
||||
//bool isRowLimit = aNbPoints > myLocalPointRowLimit;
|
||||
myLocalPointView->setVisible( getActionMode() == ModificationMode/* && !isRowLimit */);
|
||||
|
@ -38,11 +38,11 @@ const qreal arrowSize = 20;
|
||||
|
||||
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();
|
||||
|
||||
|
@ -82,7 +82,7 @@ DisplayGUI::~DisplayGUI()
|
||||
// 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;
|
||||
|
@ -979,6 +979,6 @@ public:
|
||||
namespace DlgRef
|
||||
{
|
||||
DLGREF_EXPORT QString PrintDoubleValue( double, int = 16 );
|
||||
};
|
||||
}
|
||||
|
||||
#endif // GEOM_DLGREF_H
|
||||
|
@ -31,7 +31,7 @@
|
||||
<property name="title">
|
||||
<string/>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<layout class="QGridLayout" name="gridLayout1">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
|
@ -31,7 +31,7 @@
|
||||
<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">
|
||||
|
@ -143,8 +143,8 @@
|
||||
<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>
|
||||
|
@ -25,7 +25,7 @@
|
||||
<property name="title">
|
||||
<string/>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<layout class="QGridLayout" name="gridLayout1">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -25,7 +25,7 @@
|
||||
<property name="title">
|
||||
<string/>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<layout class="QGridLayout" name="gridLayout1">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -36,7 +36,7 @@
|
||||
<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>
|
||||
|
@ -22,7 +22,7 @@
|
||||
<property name="title">
|
||||
<string/>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<layout class="QGridLayout" name="gridLayout1">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
|
@ -36,7 +36,7 @@
|
||||
<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" >
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -213,7 +213,7 @@ bool EntityGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
|
||||
// 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();
|
||||
|
||||
@ -295,7 +295,7 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi
|
||||
// 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
|
||||
@ -324,7 +324,7 @@ bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_View
|
||||
// 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();
|
||||
|
||||
@ -390,7 +390,7 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
|
||||
}
|
||||
ic->UpdateCurrentViewer();
|
||||
}
|
||||
catch( Standard_Failure ) {
|
||||
catch( Standard_Failure& ) {
|
||||
MESSAGE( "Exception caught in EntityGUI::DisplaySimulationShape" );
|
||||
}
|
||||
}
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -128,8 +128,8 @@ private:
|
||||
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;
|
||||
@ -169,11 +169,11 @@ AIS_Text::AIS_Text( const TCollection_ExtendedString& text, const gp_Pnt& positi
|
||||
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();
|
||||
@ -189,8 +189,8 @@ void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentation
|
||||
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)
|
||||
{
|
||||
@ -208,11 +208,11 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q
|
||||
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")));
|
||||
@ -829,7 +829,7 @@ void EntityGUI_3DSketcherDlg::ActivateThisDialog()
|
||||
// function : ValueChangedInSpinBox()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void EntityGUI_3DSketcherDlg::ValueChangedInSpinBox (double newValue)
|
||||
void EntityGUI_3DSketcherDlg::ValueChangedInSpinBox (double /*newValue*/)
|
||||
{
|
||||
GEOMBase_Helper::displayPreview(true, false, true, true, myLineWidth);
|
||||
}
|
||||
@ -915,7 +915,7 @@ void EntityGUI_3DSketcherDlg::BoxChecked (bool checked)
|
||||
// function : ButtonClicked()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void EntityGUI_3DSketcherDlg::ButtonClicked (bool checked)
|
||||
void EntityGUI_3DSketcherDlg::ButtonClicked (bool /*checked*/)
|
||||
{
|
||||
if (GroupAngles->radioButton_1->isChecked())
|
||||
myOrientation = OXY;
|
||||
@ -1324,8 +1324,8 @@ void EntityGUI_3DSketcherDlg::displayPreview (GEOM::GEOM_Object_ptr object,
|
||||
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();
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -25,7 +25,7 @@
|
||||
<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">
|
||||
|
@ -30,7 +30,7 @@
|
||||
</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">
|
||||
|
@ -407,8 +407,8 @@ void EntityGUI_FeatureDetectorDlg::SelectionIntoArgument()
|
||||
{
|
||||
|
||||
// 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;
|
||||
@ -618,9 +618,10 @@ ShapeRec_Parameters* EntityGUI_FeatureDetectorDlg::parametersChanged()
|
||||
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();
|
||||
|
@ -106,7 +106,7 @@ private:
|
||||
QList<QWidget*> myWidgets;
|
||||
|
||||
// Output typeselection widget
|
||||
DlgRef_3Radio* myOutputGroup;;
|
||||
DlgRef_3Radio* myOutputGroup;
|
||||
|
||||
gp_Pnt myStartPnt;
|
||||
gp_Pnt myEndPnt;
|
||||
|
@ -344,7 +344,7 @@ void EntityGUI_FieldDlg::Delegate::setModelData( QWidget* editor,
|
||||
|
||||
void EntityGUI_FieldDlg::Delegate::updateEditorGeometry( QWidget* editor,
|
||||
const QStyleOptionViewItem& option,
|
||||
const QModelIndex& index ) const
|
||||
const QModelIndex& /*index*/ ) const
|
||||
{
|
||||
editor->setGeometry( option.rect );
|
||||
}
|
||||
@ -393,7 +393,7 @@ EntityGUI_FieldDlg::StepTable::StepTable (int stepID, int dataType,
|
||||
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++ ]));
|
||||
@ -407,7 +407,7 @@ EntityGUI_FieldDlg::StepTable::StepTable (int stepID, int dataType,
|
||||
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++ ]));
|
||||
@ -420,7 +420,7 @@ EntityGUI_FieldDlg::StepTable::StepTable (int stepID, int dataType,
|
||||
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++ ]));
|
||||
@ -432,7 +432,7 @@ EntityGUI_FieldDlg::StepTable::StepTable (int stepID, int dataType,
|
||||
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() ));
|
||||
@ -1054,7 +1054,7 @@ void EntityGUI_FieldDlg::Init()
|
||||
// function : enterEvent()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void EntityGUI_FieldDlg::enterEvent(QEvent* e)
|
||||
void EntityGUI_FieldDlg::enterEvent(QEvent*)
|
||||
{
|
||||
if (!buttonCancel()->isEnabled())
|
||||
ActivateThisDialog();
|
||||
@ -1413,7 +1413,7 @@ void EntityGUI_FieldDlg::showCurStep()
|
||||
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
|
||||
@ -1628,7 +1628,7 @@ void EntityGUI_FieldDlg::updateDims(int curDim)
|
||||
//=================================================================================
|
||||
void EntityGUI_FieldDlg::activateSelection()
|
||||
{
|
||||
bool isApply = ((QPushButton*)sender() == buttonApply());
|
||||
//bool isApply = ((QPushButton*)sender() == buttonApply());
|
||||
if(!isApplyAndClose())
|
||||
erasePreview(false);
|
||||
|
||||
|
@ -199,7 +199,7 @@ GEOM::GEOM_IOperations_ptr EntityGUI_IsolineDlg::createOperation()
|
||||
// function : isValid
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
bool EntityGUI_IsolineDlg::isValid (QString& msg)
|
||||
bool EntityGUI_IsolineDlg::isValid (QString& /*msg*/)
|
||||
{
|
||||
return myFace;
|
||||
}
|
||||
@ -279,7 +279,7 @@ void EntityGUI_IsolineDlg::SetEditFace()
|
||||
// function : ValueChangedInSpinBox
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void EntityGUI_IsolineDlg::ValueChangedInSpinBox(double newValue)
|
||||
void EntityGUI_IsolineDlg::ValueChangedInSpinBox(double /*newValue*/)
|
||||
{
|
||||
displayPreview(true);
|
||||
}
|
||||
|
@ -62,8 +62,8 @@ EntityGUI_PolylineDlg::EntityGUI_PolylineDlg
|
||||
myPlnComboBox (0),
|
||||
myPlnButton (0),
|
||||
myPlnSelButton (0),
|
||||
myWPlaneLineEdit (0),
|
||||
myPolylineSelButton (0),
|
||||
myWPlaneLineEdit (0),
|
||||
myPolylineEdit (0),
|
||||
myEditCurrentArgument (0),
|
||||
myPreviewManager(0),
|
||||
@ -293,7 +293,7 @@ GEOM::GEOM_IOperations_ptr EntityGUI_PolylineDlg::createOperation()
|
||||
// function : isValid
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
bool EntityGUI_PolylineDlg::isValid( QString& msg )
|
||||
bool EntityGUI_PolylineDlg::isValid( QString& /*msg*/ )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@ -530,7 +530,7 @@ void EntityGUI_PolylineDlg::SelectionIntoArgument( bool isForced )
|
||||
// function : SetEditCurrentArgument()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
void EntityGUI_PolylineDlg::SetEditCurrentArgument( bool isChecked )
|
||||
void EntityGUI_PolylineDlg::SetEditCurrentArgument( bool /*isChecked*/ )
|
||||
{
|
||||
if (sender() == myPlnSelButton)
|
||||
{
|
||||
|
@ -83,9 +83,9 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg( GeometryGUI* GUI, QWidget* parent,
|
||||
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 )
|
||||
{
|
||||
@ -1873,7 +1873,7 @@ void EntityGUI_SketcherDlg::ValueChangedInSpinBox( double newValue )
|
||||
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 );
|
||||
@ -2492,8 +2492,8 @@ void EntityGUI_SketcherDlg::displayPreview( GEOM::GEOM_Object_ptr object,
|
||||
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();
|
||||
|
||||
|
@ -910,7 +910,7 @@ void EntityGUI_SubShapeDlg::ClickOnOkFilter()
|
||||
|
||||
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();
|
||||
|
@ -176,7 +176,7 @@ GEOM::GEOM_IOperations_ptr EntityGUI_SurfFromFaceDlg::createOperation()
|
||||
// function : isValid
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
bool EntityGUI_SurfFromFaceDlg::isValid (QString& msg)
|
||||
bool EntityGUI_SurfFromFaceDlg::isValid (QString& /*msg*/)
|
||||
{
|
||||
return myFace;
|
||||
}
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <TDataStd_Name.hxx>
|
||||
#include <TDocStd_Owner.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
|
@ -100,6 +100,6 @@ public:
|
||||
DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
|
||||
};
|
||||
|
||||
DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);
|
||||
DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver)
|
||||
|
||||
#endif
|
||||
|
@ -486,4 +486,4 @@ TDF_Label GEOM_BaseObject::GetFreeLabel()
|
||||
return _label.FindChild(FREE_LABEL);
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient )
|
||||
|
@ -37,7 +37,7 @@
|
||||
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
|
||||
{
|
||||
|
@ -114,7 +114,7 @@ bool ProcessFunction(Handle(GEOM_Function)& theFunction,
|
||||
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);
|
||||
@ -1560,7 +1560,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
|
||||
//=============================================================================
|
||||
void ReplaceEntriesByNames (TCollection_AsciiString& theScript,
|
||||
TSting2ObjDataMap& aEntry2ObjData,
|
||||
const bool theIsPublished,
|
||||
const bool /*theIsPublished*/,
|
||||
TColStd_SequenceOfAsciiString& theObjListToPublish,
|
||||
Standard_Integer& objectCounter,
|
||||
Resource_DataMapOfAsciiStringAsciiString& aNameToEntry)
|
||||
|
@ -756,5 +756,5 @@ const Standard_GUID& GEOM_FieldStep::GetDataID()
|
||||
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 )
|
||||
|
@ -33,8 +33,8 @@ const int GEOM_FIELD_STEP_OBJTYPE = 53;
|
||||
|
||||
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
|
||||
{
|
||||
|
@ -977,4 +977,4 @@ void* GEOM_Function::GetCallBackData()
|
||||
return reinterpret_cast<void*> ( address );
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient )
|
||||
|
@ -37,7 +37,7 @@
|
||||
#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
|
||||
{
|
||||
|
@ -296,5 +296,5 @@ GEOM_Object::GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObject
|
||||
return funs;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject );
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject )
|
||||
|
||||
|
@ -37,7 +37,7 @@ class GEOM_Object;
|
||||
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
|
||||
{
|
||||
|
@ -34,7 +34,7 @@
|
||||
* Update
|
||||
*/
|
||||
//=============================================================================
|
||||
bool GEOM_Solver::Update(TDF_LabelSequence& theSeq)
|
||||
bool GEOM_Solver::Update(TDF_LabelSequence& /*theSeq*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -44,7 +44,7 @@ bool GEOM_Solver::Update(TDF_LabelSequence& theSeq)
|
||||
* 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;
|
||||
}
|
||||
|
@ -155,4 +155,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver)
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver );
|
||||
DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver )
|
||||
|
||||
class GEOM_SubShapeDriver : public GEOM_BaseDriver {
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
//
|
||||
#include <GEOMAlgo_Clsf.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo)
|
||||
|
||||
//=======================================================================
|
||||
//function :
|
||||
|
@ -39,7 +39,7 @@
|
||||
#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
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
#include <Geom_Plane.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf)
|
||||
|
||||
//=======================================================================
|
||||
//function :
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
#include <GEOMAlgo_SurfaceTools.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf)
|
||||
|
||||
//=======================================================================
|
||||
//function :
|
||||
|
@ -344,7 +344,7 @@ void GEOMAlgo_FinderShapeOn2::ProcessEdges()
|
||||
//
|
||||
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;
|
||||
@ -378,7 +378,7 @@ void GEOMAlgo_FinderShapeOn2::ProcessEdges()
|
||||
}
|
||||
//
|
||||
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;
|
||||
}
|
||||
//
|
||||
|
@ -260,7 +260,7 @@ gp_Vec GEOMAlgo_GetInPlaceAPI::GetNormal
|
||||
|
||||
return du ^ dv;
|
||||
|
||||
} catch (Standard_Failure ) {
|
||||
} catch (Standard_Failure&) {
|
||||
}
|
||||
return defaultNorm;
|
||||
}
|
||||
|
@ -27,7 +27,7 @@
|
||||
//
|
||||
#include <GEOMAlgo_HAlgo.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient)
|
||||
|
||||
//=======================================================================
|
||||
// function:
|
||||
|
@ -34,7 +34,7 @@
|
||||
#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
|
||||
|
@ -300,7 +300,7 @@ void GEOMAlgo_ShellSolid::Perform()
|
||||
}//for (i=iBeg; i<=iEnd; ++i) {
|
||||
|
||||
}// try
|
||||
catch (Standard_Failure) {
|
||||
catch (Standard_Failure&) {
|
||||
myErrorStatus=12;
|
||||
}
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user