Windows porting

This commit is contained in:
szy 2005-08-24 13:12:16 +00:00
parent e22560c4dc
commit c26d1e41d3
3 changed files with 48 additions and 48 deletions

View File

@ -26,7 +26,6 @@
// Module : GEOM
// $Header$
using namespace std;
#include "BlocksGUI_PropagateDlg.h"
#include "GEOMImpl_Types.hxx"
@ -38,6 +37,8 @@ using namespace std;
#include <qlabel.h>
using namespace std;
//=================================================================================
// class : BlocksGUI_PropagateDlg()
// purpose : Constructs a BlocksGUI_PropagateDlg which is a child of 'parent', with the

View File

@ -1,8 +1,7 @@
using namespace std;
#include "GEOM_Superv_i.hh"
#include "SALOME_LifeCycleCORBA.hxx"
using namespace std;
//=============================================================================
// constructor:
//=============================================================================
@ -791,8 +790,8 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePartition (GEOM::GEOM_List_ptr theSha
GEOM::GEOM_List_ptr theTools,
GEOM::GEOM_List_ptr theKeepInside,
GEOM::GEOM_List_ptr theRemoveInside,
const CORBA::Short theLimit,
const CORBA::Boolean theRemoveWebs,
CORBA::Short theLimit,
CORBA::Boolean theRemoveWebs,
GEOM::GEOM_List_ptr theMaterials)
{
MESSAGE("GEOM_Superv_i::MakePartition");
@ -1280,7 +1279,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCompound (GEOM::GEOM_List_ptr theShapes
// MakeGlueFaces:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeGlueFaces (GEOM::GEOM_Object_ptr theShape,
const CORBA::Double theTolerance)
CORBA::Double theTolerance)
{
MESSAGE("GEOM_Superv_i::MakeGlueFaces");
if (CORBA::is_nil(myShapesOp)) getShapesOp();
@ -1291,8 +1290,8 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeGlueFaces (GEOM::GEOM_Object_ptr theSha
// MakeExplode:
//=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::MakeExplode (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType,
const CORBA::Boolean isSorted)
CORBA::Long theShapeType,
CORBA::Boolean isSorted)
{
MESSAGE("GEOM_Superv_i::MakeExplode");
if (CORBA::is_nil(myShapesOp)) getShapesOp();
@ -1402,10 +1401,10 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeHexa2Faces (GEOM::GEOM_Object_ptr theFa
// GetPoint:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::GetPoint (GEOM::GEOM_Object_ptr theShape,
const CORBA::Double theX,
const CORBA::Double theY,
const CORBA::Double theZ,
const CORBA::Double theEpsilon)
CORBA::Double theX,
CORBA::Double theY,
CORBA::Double theZ,
CORBA::Double theEpsilon)
{
MESSAGE("GEOM_Superv_i::GetPoint");
if (CORBA::is_nil(myBlocksOp)) getBlocksOp();
@ -1498,8 +1497,8 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetFaceByNormale (GEOM::GEOM_Object_ptr the
// IsCompoundOfBlocks:
//=============================================================================
CORBA::Boolean GEOM_Superv_i::IsCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
const CORBA::Long theMinNbFaces,
const CORBA::Long theMaxNbFaces,
CORBA::Long theMinNbFaces,
CORBA::Long theMaxNbFaces,
CORBA::Long& theNbBlocks)
{
MESSAGE("GEOM_Superv_i::IsCompoundOfBlocks");
@ -1534,8 +1533,8 @@ char* GEOM_Superv_i::PrintBCErrors (GEOM::GEOM_Object_ptr theCompound,
// ExplodeCompoundOfBlocks:
//=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::ExplodeCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
const CORBA::Long theMinNbFaces,
const CORBA::Long theMaxNbFaces)
CORBA::Long theMinNbFaces,
CORBA::Long theMaxNbFaces)
{
MESSAGE("GEOM_Superv_i::ExplodeCompoundOfBlocks");
if (CORBA::is_nil(myBlocksOp)) getBlocksOp();
@ -1592,9 +1591,9 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::GetBlocksByParts (GEOM::GEOM_Object_ptr theCo
// MakeMultiTransformation1D:
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMultiTransformation1D (GEOM::GEOM_Object_ptr theBlock,
const CORBA::Long theDirFace1,
const CORBA::Long theDirFace2,
const CORBA::Long theNbTimes)
CORBA::Long theDirFace1,
CORBA::Long theDirFace2,
CORBA::Long theNbTimes)
{
MESSAGE("GEOM_Superv_i::MakeMultiTransformation1D");
if (CORBA::is_nil(myBlocksOp)) getBlocksOp();
@ -1606,12 +1605,12 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMultiTransformation1D (GEOM::GEOM_Objec
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMultiTransformation2D
(GEOM::GEOM_Object_ptr theBlock,
const CORBA::Long theDirFace1U,
const CORBA::Long theDirFace2U,
const CORBA::Long theNbTimesU,
const CORBA::Long theDirFace1V,
const CORBA::Long theDirFace2V,
const CORBA::Long theNbTimesV)
CORBA::Long theDirFace1U,
CORBA::Long theDirFace2U,
CORBA::Long theNbTimesU,
CORBA::Long theDirFace1V,
CORBA::Long theDirFace2V,
CORBA::Long theNbTimesV)
{
MESSAGE("GEOM_Superv_i::MakeMultiTransformation2D");
if (CORBA::is_nil(myBlocksOp)) getBlocksOp();

View File

@ -212,8 +212,8 @@ public:
GEOM::GEOM_List_ptr theTools,
GEOM::GEOM_List_ptr theKeepInside,
GEOM::GEOM_List_ptr theRemoveInside,
const CORBA::Short theLimit,
const CORBA::Boolean theRemoveWebs,
CORBA::Short theLimit,
CORBA::Boolean theRemoveWebs,
GEOM::GEOM_List_ptr theMaterials);
GEOM::GEOM_Object_ptr MakeHalfPartition (GEOM::GEOM_Object_ptr theShape,
GEOM::GEOM_Object_ptr thePlane);
@ -323,10 +323,10 @@ public:
GEOM::GEOM_Object_ptr MakeSolidShells (GEOM::GEOM_List_ptr theShells);
GEOM::GEOM_Object_ptr MakeCompound (GEOM::GEOM_List_ptr theShapes);
GEOM::GEOM_Object_ptr MakeGlueFaces (GEOM::GEOM_Object_ptr theShape,
const CORBA::Double theTolerance);
CORBA::Double theTolerance);
GEOM::GEOM_List_ptr MakeExplode (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType,
const CORBA::Boolean isSorted);
CORBA::Long theShapeType,
CORBA::Boolean isSorted);
CORBA::Long NumberOfFaces (GEOM::GEOM_Object_ptr theShape);
CORBA::Long NumberOfEdges (GEOM::GEOM_Object_ptr theShape);
GEOM::GEOM_Object_ptr ChangeOrientation (GEOM::GEOM_Object_ptr theShape);
@ -353,10 +353,10 @@ public:
GEOM::GEOM_Object_ptr MakeHexa2Faces (GEOM::GEOM_Object_ptr theFace1,
GEOM::GEOM_Object_ptr theFace2);
GEOM::GEOM_Object_ptr GetPoint (GEOM::GEOM_Object_ptr theShape,
const CORBA::Double theX,
const CORBA::Double theY,
const CORBA::Double theZ,
const CORBA::Double theEpsilon);
CORBA::Double theX,
CORBA::Double theY,
CORBA::Double theZ,
CORBA::Double theEpsilon);
GEOM::GEOM_Object_ptr GetEdge (GEOM::GEOM_Object_ptr theShape,
GEOM::GEOM_Object_ptr thePoint1,
GEOM::GEOM_Object_ptr thePoint2);
@ -377,16 +377,16 @@ public:
GEOM::GEOM_Object_ptr GetFaceByNormale (GEOM::GEOM_Object_ptr theBlock,
GEOM::GEOM_Object_ptr theVector);
CORBA::Boolean IsCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
const CORBA::Long theMinNbFaces,
const CORBA::Long theMaxNbFaces,
CORBA::Long theMinNbFaces,
CORBA::Long theMaxNbFaces,
CORBA::Long& theNbBlocks);
CORBA::Boolean CheckCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
GEOM::GEOM_IBlocksOperations::BCErrors_out theErrors);
char* PrintBCErrors (GEOM::GEOM_Object_ptr theCompound,
const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors);
GEOM::GEOM_List_ptr ExplodeCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
const CORBA::Long theMinNbFaces,
const CORBA::Long theMaxNbFaces);
CORBA::Long theMinNbFaces,
CORBA::Long theMaxNbFaces);
GEOM::GEOM_Object_ptr GetBlockNearPoint (GEOM::GEOM_Object_ptr theCompound,
GEOM::GEOM_Object_ptr thePoint);
GEOM::GEOM_Object_ptr GetBlockByParts (GEOM::GEOM_Object_ptr theCompound,
@ -394,16 +394,16 @@ public:
GEOM::GEOM_List_ptr GetBlocksByParts (GEOM::GEOM_Object_ptr theCompound,
GEOM::GEOM_List_ptr theParts);
GEOM::GEOM_Object_ptr MakeMultiTransformation1D (GEOM::GEOM_Object_ptr theBlock,
const CORBA::Long theDirFace1,
const CORBA::Long theDirFace2,
const CORBA::Long theNbTimes);
CORBA::Long theDirFace1,
CORBA::Long theDirFace2,
CORBA::Long theNbTimes);
GEOM::GEOM_Object_ptr MakeMultiTransformation2D (GEOM::GEOM_Object_ptr theBlock,
const CORBA::Long theDirFace1U,
const CORBA::Long theDirFace2U,
const CORBA::Long theNbTimesU,
const CORBA::Long theDirFace1V,
const CORBA::Long theDirFace2V,
const CORBA::Long theNbTimesV);
CORBA::Long theDirFace1U,
CORBA::Long theDirFace2U,
CORBA::Long theNbTimesU,
CORBA::Long theDirFace1V,
CORBA::Long theDirFace2V,
CORBA::Long theNbTimesV);
//-----------------------------------------------------------//
// CurvesOperations //
@ -424,7 +424,7 @@ public:
GEOM::GEOM_Object_ptr MakeSplineBezier (GEOM::GEOM_List_ptr thePoints);
GEOM::GEOM_Object_ptr MakeSplineInterpolation (GEOM::GEOM_List_ptr thePoints);
GEOM::GEOM_Object_ptr MakeSketcher (const char* theCommand,
const GEOM::GEOM_List_ptr theWorkingPlane);
GEOM::GEOM_List_ptr theWorkingPlane);
//-----------------------------------------------------------//
// LocalOperations //