OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0024757: DRAW: Move commands fixshape, tolerance, and similar to MODELING

Browse Source 
Package SWDRAW has been moved to TKTopTest toolkit. Class SWDRAW_ToVRML has been moved to XSDRAWSTLVRML_ToVRML
Removed unused classes:
SWDRAW_ShapeBuild
SWDRAW_ShapeConstruct
XSDRAW_Shape
Removed NSPApply command
Test script update
Removed xtrace command
This commit is contained in:
dbv 2014-04-03 16:22:15 +04:00 committed by apn
parent a0a3f6aca4
commit 7da5f7b1c2
24 changed files with 49 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/IFSelect/IFSelect_Functions.cxx
View File

@ -136,29 +136,6 @@ static IFSelect_ReturnStatus fun1
return IFSelect_RetDone; return IFSelect_RetDone;
} }
static IFSelect_ReturnStatus fun2
(const Handle(IFSelect_SessionPilot)& pilot)
{
// **** Trace File ****
Standard_Integer argc = pilot->NbWords();
Handle(Message_Messenger) sout = Message::DefaultMessenger();
const Standard_CString arg1 = pilot->Arg(1);
if (argc < 2) {
// sout<<" Trace : Level="<<Message_PrinterOStream::Default()->GetTraceLevel();
} else if (arg1[1] == '\0' && arg1[0] == '.') {
sout<<" Trace -> Standard Output"<<endl;
// Message_PrinterOStream::SetDefault();
} else if (arg1[1] == '\0' && (arg1[0] >= '0' && arg1[0] <= '9')) {
sout<<" Trace Level : "<<arg1<<endl;
// Message_PrinterOStream::Default()->SetTraceLevel((Message_TraceLevel)atoi(arg1));
} else {
sout<<" Trace -> Append File : "<<arg1<<endl;
// Message_PrinterOStream::SetDefault (Message_PrinterOStream::Default()->GetTraceLevel(),arg1,Standard_True);
}
return IFSelect_RetVoid;
}
static IFSelect_ReturnStatus fun3 static IFSelect_ReturnStatus fun3
(const Handle(IFSelect_SessionPilot)& pilot) (const Handle(IFSelect_SessionPilot)& pilot)
{ {
@ -2485,7 +2462,6 @@ static int initactor = 0;
IFSelect_Act::SetGroup("DE: General"); IFSelect_Act::SetGroup("DE: General");
IFSelect_Act::AddFunc("xstatus","Lists XSTEP Status : Version, System Name ...",funstatus); IFSelect_Act::AddFunc("xstatus","Lists XSTEP Status : Version, System Name ...",funstatus);
IFSelect_Act::AddFunc("handler","Toggle status catch Handler Error of the session",fun1); IFSelect_Act::AddFunc("handler","Toggle status catch Handler Error of the session",fun1);
IFSelect_Act::AddFunc("xtrace",". -> stdout or file:string or level:integer -> File/Level Trace XSTEP",fun2);
IFSelect_Act::AddFunc("xload","file:string : Read File -> Load Model",fun3); IFSelect_Act::AddFunc("xload","file:string : Read File -> Load Model",fun3);
// IFSelect_Act::AddFunc("load","file:string : Read File -> Load Model",fun3); // IFSelect_Act::AddFunc("load","file:string : Read File -> Load Model",fun3);
IFSelect_Act::AddFunc("xread","file:string : Read File -> Load Model",fun3); IFSelect_Act::AddFunc("xread","file:string : Read File -> Load Model",fun3);

11
src/SWDRAW/SWDRAW.cdl
View File

@ -33,12 +33,6 @@ is
class ShapeAnalysis; class ShapeAnalysis;
---Purpose: Contains commands to activate package ShapeAnalysis ---Purpose: Contains commands to activate package ShapeAnalysis
class ShapeBuild;
---Purpose: Contains commands to activate package ShapeBuild
class ShapeConstruct;
---Purpose: Contains commands to activate package ShapeConstruct
class ShapeCustom; class ShapeCustom;
---Purpose: Contains commands to activate package ShapeCustom ---Purpose: Contains commands to activate package ShapeCustom
@ -56,11 +50,6 @@ is
class ShapeProcessAPI; class ShapeProcessAPI;
---Purpose: Contains commands to activate package ShapeProcessAPI ---Purpose: Contains commands to activate package ShapeProcessAPI
class ToVRML;
---Purpose: A utility which writes a Shape to VRML format
---Remark : It can be placed elsewhere, while it depends on
-- only BRepMesh i.e. TOPOLOGY
Init (theCommands: in out Interpretor from Draw); Init (theCommands: in out Interpretor from Draw);
---Purpose: Loads commands defined in SWDRAW ---Purpose: Loads commands defined in SWDRAW

64
src/SWDRAW/SWDRAW.cxx
View File

@ -18,8 +18,6 @@
#include <SWDRAW_ShapeTool.hxx> #include <SWDRAW_ShapeTool.hxx>
#include <SWDRAW_ShapeAnalysis.hxx> #include <SWDRAW_ShapeAnalysis.hxx>
#include <SWDRAW_ShapeBuild.hxx>
#include <SWDRAW_ShapeConstruct.hxx>
#include <SWDRAW_ShapeCustom.hxx> #include <SWDRAW_ShapeCustom.hxx>
#include <SWDRAW_ShapeExtend.hxx> #include <SWDRAW_ShapeExtend.hxx>
#include <SWDRAW_ShapeFix.hxx> #include <SWDRAW_ShapeFix.hxx>
@ -27,9 +25,6 @@
#include <SWDRAW_ShapeProcess.hxx> #include <SWDRAW_ShapeProcess.hxx>
#include <SWDRAW_ShapeProcessAPI.hxx> #include <SWDRAW_ShapeProcessAPI.hxx>
// tovrml
#include <TopoDS_Shape.hxx>
#include <SWDRAW_ToVRML.hxx>
//#72 rln 09.03.99 Packaging of SWDRAW //#72 rln 09.03.99 Packaging of SWDRAW
#include <ShapeProcess_OperLibrary.hxx> #include <ShapeProcess_OperLibrary.hxx>
@ -48,21 +43,6 @@ static int dejadraw = 0;
//#72 rln 09.03.99 Packaging of SWDRAW //#72 rln 09.03.99 Packaging of SWDRAW
//=======================================================================
//function : tovrml
//purpose :
//=======================================================================
static Standard_Integer tovrml(Draw_Interpretor& /*di*/, Standard_Integer n, const char** a)
{
if (n < 3) return 1;
SWDRAW_ToVRML avrml;
TopoDS_Shape sh = DBRep::Get (a[1]);
const char* filename = a[2];
if (!avrml.Write (sh,filename)) return 1;
return 0;
}
//======================================================================= //=======================================================================
//function : LocSet //function : LocSet
//purpose : //purpose :
@ -138,42 +118,6 @@ static Standard_Integer LocDump (Draw_Interpretor& di, Standard_Integer argc, co
return 0; return 0;
} }
//=======================================================================
//function : NSPApply
//purpose : CKY , 12 JUL 2001
//=======================================================================
static Standard_Integer NSPApply (Draw_Interpretor& di, Standard_Integer argc, const char** argv)
{
if ( argc < 6) {
di<<"NSPApply result(new shape) shape(initial shape) rscfile sequence tol [maxtol, default=1]"<<"\n";
return 1;
}
TopoDS_Shape shape = DBRep::Get ( argv[2] );
if (shape.IsNull()) {
di << "No shape named \"" << argv[1] << "\" found" << "\n";
return 1;
}
TopoDS_Shape newshape;
Standard_Real tol = Draw::Atof(argv[5]);
Standard_Real maxtol = 1.;
if (argc > 6) maxtol = Draw::Atof(argv[6]);
XSAlgo::AlgoContainer()->PrepareForTransfer();
Handle(Standard_Transient) info; // reserved for special uses
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (di, 1);
newshape = XSAlgo::AlgoContainer()->ProcessShape
( shape, tol, maxtol, argv[3] , argv[4] , info, aProgress);
// WHAT IS MISSING HERE IS MERGING with starting transfer map
if (newshape.IsNull()) {
di<<"No result produced"<<"\n";
}
else
DBRep::Set ( argv[1], newshape );
return 0;
}
//======================================================================= //=======================================================================
//function : Init //function : Init
//purpose : //purpose :
@ -192,8 +136,6 @@ void SWDRAW::Init (Draw_Interpretor& theCommands)
SWDRAW_ShapeTool::InitCommands (theCommands); SWDRAW_ShapeTool::InitCommands (theCommands);
SWDRAW_ShapeAnalysis::InitCommands (theCommands); SWDRAW_ShapeAnalysis::InitCommands (theCommands);
SWDRAW_ShapeBuild::InitCommands (theCommands);
SWDRAW_ShapeConstruct::InitCommands (theCommands);
SWDRAW_ShapeCustom::InitCommands (theCommands); SWDRAW_ShapeCustom::InitCommands (theCommands);
SWDRAW_ShapeExtend::InitCommands (theCommands); SWDRAW_ShapeExtend::InitCommands (theCommands);
SWDRAW_ShapeFix::InitCommands (theCommands); SWDRAW_ShapeFix::InitCommands (theCommands);
@ -205,15 +147,9 @@ void SWDRAW::Init (Draw_Interpretor& theCommands)
theCommands.Add("LocSet", "a [b [c]]: set loc b->a; use no args to get help",__FILE__,LocSet,"essai"); theCommands.Add("LocSet", "a [b [c]]: set loc b->a; use no args to get help",__FILE__,LocSet,"essai");
theCommands.Add("LocDump", "a: dump location of a",__FILE__,LocDump,"essai"); theCommands.Add("LocDump", "a: dump location of a",__FILE__,LocDump,"essai");
//tovrml
theCommands.Add("tovrml", "shape filename",__FILE__, tovrml, "essai");
// register operators for ShapeProcessing // register operators for ShapeProcessing
ShapeProcess_OperLibrary::Init(); ShapeProcess_OperLibrary::Init();
// new shape processing
theCommands.Add ("NSPApply","NSPApply result shape rscfilename sequence tol [maxtol, default=1]",
__FILE__,NSPApply,"essai");
} }
//======================================================================= //=======================================================================

30
src/SWDRAW/SWDRAW_ShapeBuild.cdl
View File

@ -1,30 +0,0 @@
-- Created on: 1999-03-09
-- Created by: data exchange team
-- Copyright (c) 1999 Matra Datavision
-- Copyright (c) 1999-2014 OPEN CASCADE SAS
--
-- This file is part of Open CASCADE Technology software library.
--
-- This library is free software; you can redistribute it and/or modify it under
-- the terms of the GNU Lesser General Public License version 2.1 as published
-- by the Free Software Foundation, with special exception defined in the file
-- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-- distribution for complete text of the license and disclaimer of any warranty.
--
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
class ShapeBuild from SWDRAW
---Purpose: Contains commands to activate package ShapeBuild
-- List of DRAW commands and corresponding functionalities:
uses
Interpretor from Draw
is
InitCommands (myclass; theCommands: in out Interpretor from Draw);
---Purpose: Loads commands defined in ShapeBuild
end ShapeBuild;

26
src/SWDRAW/SWDRAW_ShapeBuild.cxx
View File

@ -1,26 +0,0 @@
// Created on: 1999-03-09
// Created by: data exchange team
// Copyright (c) 1999-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <SWDRAW_ShapeBuild.ixx>
//=======================================================================
//function : InitCommands
//purpose :
//=======================================================================
void SWDRAW_ShapeBuild::InitCommands(Draw_Interpretor& )
{
}

31
src/SWDRAW/SWDRAW_ShapeConstruct.cdl
View File

@ -1,31 +0,0 @@
-- Created on: 1999-03-09
-- Created by: data exchange team
-- Copyright (c) 1999 Matra Datavision
-- Copyright (c) 1999-2014 OPEN CASCADE SAS
--
-- This file is part of Open CASCADE Technology software library.
--
-- This library is free software; you can redistribute it and/or modify it under
-- the terms of the GNU Lesser General Public License version 2.1 as published
-- by the Free Software Foundation, with special exception defined in the file
-- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-- distribution for complete text of the license and disclaimer of any warranty.
--
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
class ShapeConstruct from SWDRAW
---Purpose: Contains commands to activate package ShapeConstruct
-- List of DRAW commands and corresponding functionalities:
uses
Interpretor from Draw
is
InitCommands (myclass; theCommands: in out Interpretor from Draw);
---Purpose: Loads commands defined in ShapeConstruct
end ShapeConstruct;

21
src/SWDRAW/SWDRAW_ShapeConstruct.cxx
View File

@ -1,21 +0,0 @@
// Created on: 1999-03-09
// Created by: data exchange team
// Copyright (c) 1999-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <SWDRAW_ShapeConstruct.ixx>
void SWDRAW_ShapeConstruct::InitCommands(Draw_Interpretor& /*theCommands*/)
{
}

1
src/TKTopTest/EXTERNLIB
View File

@ -17,3 +17,4 @@ TKPrim
TKBool TKBool
TKOffset TKOffset
TKFeat TKFeat
TKShHealing

1
src/TKTopTest/PACKAGES
View File

@ -8,3 +8,4 @@ MeshTest
GeomliteTest GeomliteTest
DrawFairCurve DrawFairCurve
BOPTest BOPTest
SWDRAW

1
src/TKXSDRAW/EXTERNLIB
View File

@ -11,7 +11,6 @@ TKViewerTest
TKG2d TKG2d
TKSTEPBase TKSTEPBase
TKTopAlgo TKTopAlgo
TKShHealing
TKGeomBase TKGeomBase
TKGeomAlgo TKGeomAlgo
TKMesh TKMesh

1
src/TKXSDRAW/PACKAGES
View File

@ -1,4 +1,3 @@
SWDRAW
XSDRAW XSDRAW
XSDRAWIGES XSDRAWIGES
XSDRAWSTEP XSDRAWSTEP

3
src/TestTopOpe/TestTopOpe.cxx
View File

@ -24,6 +24,7 @@
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
#include <Draw_PluginMacro.hxx> #include <Draw_PluginMacro.hxx>
#include <BOPTest.hxx> #include <BOPTest.hxx>
#include <SWDRAW.hxx>
#ifdef WNT #ifdef WNT
#pragma warning(4:4190) #pragma warning(4:4190)
#endif #endif
@ -117,6 +118,8 @@ void TestTopOpe::Factory(Draw_Interpretor& theDI)
BOPTest::Factory(theDI); BOPTest::Factory(theDI);
SWDRAW::Init (theDI);
#ifdef DEB #ifdef DEB
cout << "Draw Plugin : All topological operations kernel commands are loaded" << endl; cout << "Draw Plugin : All topological operations kernel commands are loaded" << endl;
#endif #endif

2
src/XDEDRAW/XDEDRAW.cxx
View File

@ -80,7 +80,6 @@
#include <XDEDRAW_Common.hxx> #include <XDEDRAW_Common.hxx>
#include <XSDRAWIGES.hxx> #include <XSDRAWIGES.hxx>
#include <XSDRAWSTEP.hxx> #include <XSDRAWSTEP.hxx>
#include <SWDRAW.hxx>
#include <XSDRAW.hxx> #include <XSDRAW.hxx>
#include <XCAFPrs.hxx> #include <XCAFPrs.hxx>
#include <ViewerTest.hxx> #include <ViewerTest.hxx>
@ -1162,7 +1161,6 @@ void XDEDRAW::Factory(Draw_Interpretor& theDI)
XSDRAWSTEP::InitCommands(theDI); XSDRAWSTEP::InitCommands(theDI);
SWDRAW::Init(theDI);
XSDRAW::LoadDraw(theDI); XSDRAW::LoadDraw(theDI);
XDEDRAW::Init(theDI); XDEDRAW::Init(theDI);

1
src/XDEDRAW/XDEDRAW_Common.cxx
View File

@ -23,7 +23,6 @@
#include <Draw.hxx> #include <Draw.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
#include <SWDRAW.hxx>
#include <XSDRAW.hxx> #include <XSDRAW.hxx>
#include <XDEDRAW.hxx> #include <XDEDRAW.hxx>
#include <XSDRAWIGES.hxx> #include <XSDRAWIGES.hxx>

8
src/XSDRAW/XSDRAW.cdl
View File

@ -36,14 +36,6 @@ is
-- --
-- Loaded by LoadDraw -- Loaded by LoadDraw
class Shape;
---Purpose : Gathers commands which only apply to shapes/geometry, and are
-- not concerned by XSTEP features for files
-- This set of functions just enriches the standard DRAW set,
-- with either useful but lacking basic functions, or complements
-- used in transfer operations, or specific control functions
-- Loaded by LoadDraw
class Vars; class Vars;
---Purpose : Takes variables to/from the DRAW session ---Purpose : Takes variables to/from the DRAW session

5
src/XSDRAW/XSDRAW.cxx
View File

@ -17,7 +17,6 @@
#include <TColStd_HSequenceOfAsciiString.hxx> #include <TColStd_HSequenceOfAsciiString.hxx>
#include <IFSelect_Functions.hxx> #include <IFSelect_Functions.hxx>
#include <IFSelect_SessionPilot.hxx> #include <IFSelect_SessionPilot.hxx>
#include <SWDRAW.hxx>
//#include <XSDRAW_Shape.hxx> //#include <XSDRAW_Shape.hxx>
#include <XSDRAW_Vars.hxx> #include <XSDRAW_Vars.hxx>
#include <XSControl_Functions.hxx> #include <XSControl_Functions.hxx>
@ -95,9 +94,7 @@ static Standard_Integer XSTEPDRAWRUN (Draw_Interpretor& , Standard_Integer argc,
void XSDRAW::LoadDraw (Draw_Interpretor& theCommands) void XSDRAW::LoadDraw (Draw_Interpretor& theCommands)
{ {
if (dejald) return; dejald = 1; if (dejald) return; dejald = 1;
// XSDRAW_Shape::InitCommands (theCommands); // Pour tout faire d un coup : BRepTest & cie:
// Pour tout faire d un coup : BRepTest & cie, SWDRAW & cie :
SWDRAW::Init (theCommands);
LoadSession(); LoadSession();
//skl: we make remove commands "x" and "exit" in order to this commands are //skl: we make remove commands "x" and "exit" in order to this commands are

32
src/XSDRAW/XSDRAW_Shape.cdl
View File

@ -1,32 +0,0 @@
-- Created on: 1997-04-22
-- Created by: Christian CAILLET
-- Copyright (c) 1997-1999 Matra Datavision
-- Copyright (c) 1999-2014 OPEN CASCADE SAS
--
-- This file is part of Open CASCADE Technology software library.
--
-- This library is free software; you can redistribute it and/or modify it under
-- the terms of the GNU Lesser General Public License version 2.1 as published
-- by the Free Software Foundation, with special exception defined in the file
-- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-- distribution for complete text of the license and disclaimer of any warranty.
--
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
class Shape from XSDRAW
---Purpose : Defines functions to control shapes (in way useful for XSTEP),
-- additional features which should be basic, or call tools which
-- are bound with transfer needs.
-- But these functions work on shapes, geometry, nothing else
-- (no file, no model, no entity)
uses CString, Interpretor from Draw
is
InitCommands (myclass; theCommands : in out Interpretor from Draw);
---Purpose : Defines and loads all basic functions for XSDRAW on Shapes
end Shape;

23
src/XSDRAW/XSDRAW_Shape.cxx
View File

@ -1,23 +0,0 @@
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <XSDRAW_Shape.ixx>
#include <SWDRAW_ShapeTool.hxx>
//unused variable
//static int initactor = 0;
void XSDRAW_Shape::InitCommands (Draw_Interpretor& theCommands)
{
SWDRAW_ShapeTool::InitCommands (theCommands);
}

5
src/XSDRAWSTLVRML/XSDRAWSTLVRML.cdl
View File

@ -17,7 +17,7 @@ package XSDRAWSTLVRML
---Purpose: ---Purpose:
uses Draw, MeshVS, StlMesh, TColStd, TCollection, Standard uses Draw, MeshVS, StlMesh, TColStd, TCollection, Standard, TopoDS
is is
@ -31,6 +31,9 @@ is
class CoordsMap instantiates DataMap from TCollection class CoordsMap instantiates DataMap from TCollection
( Integer from Standard, DataMapOfIntegerReal from TColStd, MapIntegerHasher from TColStd ); ( Integer from Standard, DataMapOfIntegerReal from TColStd, MapIntegerHasher from TColStd );
class ToVRML;
---Purpose: A utility which writes a Shape to VRML format
InitCommands (theCommands : in out Interpretor from Draw); InitCommands (theCommands : in out Interpretor from Draw);
---Purpose : Inits commands for writing to STL and VRML formats ---Purpose : Inits commands for writing to STL and VRML formats

20
src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
View File

@ -26,7 +26,6 @@
#include <Quantity_HArray1OfColor.hxx> #include <Quantity_HArray1OfColor.hxx>
#include <StlAPI_Writer.hxx> #include <StlAPI_Writer.hxx>
#include <Draw_PluginMacro.hxx> #include <Draw_PluginMacro.hxx>
#include <SWDRAW.hxx>
#include <XSDRAW.hxx> #include <XSDRAW.hxx>
#include <XSDRAWSTEP.hxx> #include <XSDRAWSTEP.hxx>
#include <XSDRAWIGES.hxx> #include <XSDRAWIGES.hxx>
@ -71,6 +70,8 @@
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <Bnd_Box.hxx> #include <Bnd_Box.hxx>
#include <XSDRAWSTLVRML_ToVRML.hxx>
// avoid warnings on 'extern "C"' functions returning C++ classes // avoid warnings on 'extern "C"' functions returning C++ classes
#ifdef WNT #ifdef WNT
#pragma warning(4:4190) #pragma warning(4:4190)
@ -979,6 +980,21 @@ static Standard_Integer mesh_edge_width( Draw_Interpretor& di,
return 0; return 0;
} }
//=======================================================================
//function : tovrml
//purpose :
//=======================================================================
static Standard_Integer tovrml(Draw_Interpretor& /*di*/, Standard_Integer n, const char** a)
{
if (n < 3) return 1;
XSDRAWSTLVRML_ToVRML avrml;
TopoDS_Shape sh = DBRep::Get (a[1]);
const char* filename = a[2];
if (!avrml.Write (sh,filename)) return 1;
return 0;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void XSDRAWSTLVRML::InitCommands (Draw_Interpretor& theCommands) void XSDRAWSTLVRML::InitCommands (Draw_Interpretor& theCommands)
@ -987,6 +1003,7 @@ void XSDRAWSTLVRML::InitCommands (Draw_Interpretor& theCommands)
//XSDRAW::LoadDraw(theCommands); //XSDRAW::LoadDraw(theCommands);
theCommands.Add ("writevrml", "shape file",__FILE__,writevrml,g); theCommands.Add ("writevrml", "shape file",__FILE__,writevrml,g);
theCommands.Add ("tovrml", "shape file",__FILE__, tovrml, g);
theCommands.Add ("writestl", "shape file [ascii/binary (0/1) : 1 by default] [InParallel (0/1) : 0 by default]",__FILE__,writestl,g); theCommands.Add ("writestl", "shape file [ascii/binary (0/1) : 1 by default] [InParallel (0/1) : 0 by default]",__FILE__,writestl,g);
theCommands.Add ("readstl", "shape file",__FILE__,readstl,g); theCommands.Add ("readstl", "shape file",__FILE__,readstl,g);
theCommands.Add ("loadvrml" , "shape file",__FILE__,loadvrml,g); theCommands.Add ("loadvrml" , "shape file",__FILE__,loadvrml,g);
@ -1019,7 +1036,6 @@ void XSDRAWSTLVRML::Factory(Draw_Interpretor& theDI)
XSDRAWIGES::InitFromBRep(theDI); XSDRAWIGES::InitFromBRep(theDI);
XSDRAWSTEP::InitCommands(theDI); XSDRAWSTEP::InitCommands(theDI);
XSDRAWSTLVRML::InitCommands(theDI); XSDRAWSTLVRML::InitCommands(theDI);
SWDRAW::Init(theDI);
XSDRAW::LoadDraw(theDI); XSDRAW::LoadDraw(theDI);
#ifdef DEB #ifdef DEB
theDI << "Draw Plugin : All TKXSDRAW commands are loaded" << "\n"; theDI << "Draw Plugin : All TKXSDRAW commands are loaded" << "\n";

2
src/SWDRAW/SWDRAW_ToVRML.cdl → src/XSDRAWSTLVRML/XSDRAWSTLVRML_ToVRML.cdl
View File

@ -14,7 +14,7 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
class ToVRML from SWDRAW class ToVRML from XSDRAWSTLVRML
---Purpose : Writes a Shape to a File in VRML Format ---Purpose : Writes a Shape to a File in VRML Format

36
src/SWDRAW/SWDRAW_ToVRML.cxx → src/XSDRAWSTLVRML/XSDRAWSTLVRML_ToVRML.cxx
View File

@ -11,7 +11,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <SWDRAW_ToVRML.ixx> #include <XSDRAWSTLVRML_ToVRML.ixx>
#include <Standard_Stream.hxx> #include <Standard_Stream.hxx>
#include <BRepMesh_FastDiscret.hxx> #include <BRepMesh_FastDiscret.hxx>
@ -22,7 +22,7 @@
#include <gp_Pnt.hxx> //ied_modif_for_compil_Nov-20-1998 #include <gp_Pnt.hxx> //ied_modif_for_compil_Nov-20-1998
SWDRAW_ToVRML::SWDRAW_ToVRML () XSDRAWSTLVRML_ToVRML::XSDRAWSTLVRML_ToVRML ()
{ {
myEmissiveColorRed = 0.3; myEmissiveColorRed = 0.3;
myEmissiveColorGreen = 0.3; myEmissiveColorGreen = 0.3;
@ -41,28 +41,28 @@ SWDRAW_ToVRML::SWDRAW_ToVRML ()
myDeflection = 0.005; myDeflection = 0.005;
} }
Standard_Real& SWDRAW_ToVRML::EmissiveColorRed () { return myEmissiveColorRed ; } Standard_Real& XSDRAWSTLVRML_ToVRML::EmissiveColorRed () { return myEmissiveColorRed ; }
Standard_Real& SWDRAW_ToVRML::EmissiveColorGreen() { return myEmissiveColorGreen; } Standard_Real& XSDRAWSTLVRML_ToVRML::EmissiveColorGreen() { return myEmissiveColorGreen; }
Standard_Real& SWDRAW_ToVRML::EmissiveColorBlue () { return myEmissiveColorBlue ; } Standard_Real& XSDRAWSTLVRML_ToVRML::EmissiveColorBlue () { return myEmissiveColorBlue ; }
Standard_Real& SWDRAW_ToVRML::DiffuseColorRed () { return myDiffuseColorRed ; } Standard_Real& XSDRAWSTLVRML_ToVRML::DiffuseColorRed () { return myDiffuseColorRed ; }
Standard_Real& SWDRAW_ToVRML::DiffuseColorGreen () { return myDiffuseColorGreen ; } Standard_Real& XSDRAWSTLVRML_ToVRML::DiffuseColorGreen () { return myDiffuseColorGreen ; }
Standard_Real& SWDRAW_ToVRML::DiffuseColorBlue () { return myDiffuseColorBlue ; } Standard_Real& XSDRAWSTLVRML_ToVRML::DiffuseColorBlue () { return myDiffuseColorBlue ; }
Standard_Real& SWDRAW_ToVRML::Transparency () { return myTransparency ; } Standard_Real& XSDRAWSTLVRML_ToVRML::Transparency () { return myTransparency ; }
Standard_Real& SWDRAW_ToVRML::AmbientIntensity () { return myAmbientIntensity ; } Standard_Real& XSDRAWSTLVRML_ToVRML::AmbientIntensity () { return myAmbientIntensity ; }
Standard_Real& SWDRAW_ToVRML::SpecularColorRed () { return mySpecularColorRed ; } Standard_Real& XSDRAWSTLVRML_ToVRML::SpecularColorRed () { return mySpecularColorRed ; }
Standard_Real& SWDRAW_ToVRML::SpecularColorGreen() { return mySpecularColorGreen; } Standard_Real& XSDRAWSTLVRML_ToVRML::SpecularColorGreen() { return mySpecularColorGreen; }
Standard_Real& SWDRAW_ToVRML::SpecularColorBlue () { return mySpecularColorBlue ; } Standard_Real& XSDRAWSTLVRML_ToVRML::SpecularColorBlue () { return mySpecularColorBlue ; }
Standard_Real& SWDRAW_ToVRML::Shininess () { return myShininess ; } Standard_Real& XSDRAWSTLVRML_ToVRML::Shininess () { return myShininess ; }
TCollection_AsciiString& SWDRAW_ToVRML::Texture () { return myTexture ; } TCollection_AsciiString& XSDRAWSTLVRML_ToVRML::Texture () { return myTexture ; }
Standard_Real& SWDRAW_ToVRML::CreaseAngle() { return myCreaseAngle; } Standard_Real& XSDRAWSTLVRML_ToVRML::CreaseAngle() { return myCreaseAngle; }
Standard_Real& SWDRAW_ToVRML::Deflection () { return myDeflection ; } Standard_Real& XSDRAWSTLVRML_ToVRML::Deflection () { return myDeflection ; }
//======================================================================= //=======================================================================
// function : ToVRML::Write // function : ToVRML::Write
// purpose : conversion of a Shape into VRML format for 3d visualisation // purpose : conversion of a Shape into VRML format for 3d visualisation
//======================================================================= //=======================================================================
Standard_Boolean SWDRAW_ToVRML::Write Standard_Boolean XSDRAWSTLVRML_ToVRML::Write
(const TopoDS_Shape& aShape, const Standard_CString filename) const (const TopoDS_Shape& aShape, const Standard_CString filename) const
{ {
filebuf thefile; filebuf thefile;

8
tests/heal/begin
View File

@ -1,9 +1,5 @@
if { [array get Draw_Groups "TOPOLOGY Check commands"] == "" } { pload TOPTEST
pload TOPTEST
}
if { [array get Draw_Groups "Shape Healing"] == "" } {
pload XSDRAW
}
# To prevent loops limit to 5 minutes # To prevent loops limit to 5 minutes
cpulimit 300 cpulimit 300

1
tests/heal/elementary_to_revolution/end
View File

@ -1,6 +1,5 @@
set env(CSF_dataDefaults) [file dirname [info script]]/../data set env(CSF_dataDefaults) [file dirname [info script]]/../data
puts $env(CSF_dataDefaults) puts $env(CSF_dataDefaults)
xtrace 3
DT_ApplySeq result a data data1 DT_ApplySeq result a data data1
set b [explode a f] set b [explode a f]
set b1 [explode result f] set b1 [explode result f]