//
// 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 version 2.1 as published
+// 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.
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColStd_HArray1OfBoolean.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
#include <AppParCurves_MultiBSpCurve.hxx>
#include <AppParCurves_MultiCurve.hxx>
#include <AppDef_MultiLine.hxx>
-#include <AppDef_TheVariational.hxx>
+#include <AppDef_Variational.hxx>
#include <AppDef_Compute.hxx>
#include <AppParCurves_HArray1OfConstraintCouple.hxx>
#include <AppParCurves_ConstraintCouple.hxx>
#include <AppDef_Array1OfMultiPointConstraint.hxx>
#include <math_Vector.hxx>
-#ifdef WNT
+#ifdef _MSC_VER
#include <stdio.h>
+#endif
+
+#ifdef _WIN32
Standard_IMPORT Draw_Viewer dout;
#endif
{
Standard_Integer id,XX,YY,b, i;
- di << "Pick points "<< "\n";
+ di << "Pick points \n";
dout.Select(id, XX, YY, b);
Standard_Real zoom = dout.Zoom(id);
if (b != 1) return 0;
AppDef_MultiPointConstraint mpc(1,0);
MPC->ChangeArray1().Init(mpc);
for (i=1; i<=ThePoints.Length(); i++) {
- AppDef_MultiPointConstraint mpc(1,0);
- mpc.SetPoint(1, ThePoints.Value(i));
- MPC->SetValue(i, mpc);
+ AppDef_MultiPointConstraint aLocalMpc(1,0);
+ aLocalMpc.SetPoint(1, ThePoints.Value(i));
+ MPC->SetValue(i, aLocalMpc);
}
}
//=======================================================================
static void PointsByFile(Handle(AppDef_HArray1OfMultiPointConstraint)& MPC,
Handle(AppParCurves_HArray1OfConstraintCouple)& TABofCC,
- ifstream& iFile,
+ std::ifstream& iFile,
Draw_Interpretor& di)
{
Standard_Integer nbp, i, nbc;
for(i=1; i<=nbc; i++) {
iFile >> num >> ordre;
if ((num<1)||(num>nbp)) {
- di << "Error on point Index in constrainte" << "\n";
+ di << "Error on point Index in constrainte\n";
return;
}
Constraint = (AppParCurves_Constraint) (ordre+1);
for(i=1; i<=nbc; i++) {
iFile >> num >> ordre;
if ((num<1)||(num>nbp)) {
- di << "Error on point Index in constrainte" << "\n";
+ di << "Error on point Index in constrainte\n";
return;
}
Constraint = (AppParCurves_Constraint) (ordre+1);
Standard_Integer id = 0, DegMax = -1;
if (n == 1) {
- di <<"give a name to your curve !" << "\n";
+ di <<"give a name to your curve !\n";
return 0;
}
if (n == 2) {
- di <<"give a tolerance to your curve !" << "\n";
+ di <<"give a tolerance to your curve !\n";
return 0;
}
if (n == 3) {
// lecture du fichier.
// nbpoints, 2d ou 3d, puis valeurs.
const char* nomfic = a[ific];
- ifstream iFile(nomfic, ios::in);
+ std::ifstream iFile(nomfic, std::ios::in);
if (!iFile) {
- di << a[ific] <<"do not exist !" << "\n";
+ di << a[ific] <<"do not exist !\n";
return 1;
}
PointsByFile(Points, TABofCC, iFile, di);
}
}
- AppDef_TheVariational Variation(AML,
+ AppDef_Variational Variation(AML,
1, NbPoints,
TABofCC);
if (Tolerance>0) { Variation.SetWithMinMax(Standard_True);}
Variation.Approximate();
-# ifdef DEB
- //Variation.Dump(cout);
+# ifdef GEOMLITETEST_DEB
+ //Variation.Dump(std::cout);
Standard_SStream aSStream;
Variation.Dump(aSStream);
di << aSStream;
}
}
- AppDef_TheVariational Variation(AML,
+ AppDef_Variational Variation(AML,
1, NbPoints,
TABofCC);
Variation.SetTolerance( Abs(Tolerance));
if (Tolerance>0) { Variation.SetWithMinMax(Standard_True);}
Variation.Approximate();
-# ifdef DEB
- //Variation.Dump(cout);
+# ifdef GEOMLITETEST_DEB
+ //Variation.Dump(std::cout);
Standard_SStream aSStream;
Variation.Dump(aSStream);
di << aSStream;
Standard_Integer Degree = 8;
if (n == 1) {
- di <<"give a name to your curve !" << "\n";
+ di <<"give a name to your curve !\n";
return 0;
}
if (n == 2) {
- di <<"give a tolerance to your curve !" << "\n";
+ di <<"give a tolerance to your curve !\n";
return 0;
}
if (n == 3) {
- di <<"give a max degree!" << "\n";
+ di <<"give a max degree!\n";
return 0;
}
if (n == 4) {
- di <<"give an option!" << "\n";
+ di <<"give an option!\n";
return 0;
}
if (n >= 5) {
// lecture du fichier.
// nbpoints, 2d ou 3d, puis valeurs.
const char* nomfic = a[5];
- ifstream iFile(nomfic, ios::in);
+ std::ifstream iFile(nomfic, std::ios::in);
if (!iFile) {
- di << a[6] <<"do not exist !" << "\n";
+ di << a[6] <<"do not exist !\n";
return 1;
}
PointsByFile(Points, TABofCC, iFile, di);
Appr.Perform (AML);
if (! Appr.IsAllApproximated()) {
- di << " No result" << "\n";
+ di << " No result\n";
}
AppParCurves_MultiCurve AnMuC = Appr.Value();
ThePoints = new (TColgp_HArray1OfPnt2d) (1, AnMuC.NbPoles() );
di <<" Error2D is : " << err2d << "\n";
}
else {
- AppDef_TheVariational Varia(AML,
+ AppDef_Variational Varia(AML,
1, NbPoints,
TABofCC,
Degree, 1);
Varia.Approximate();
if (! Varia.IsDone()) {
- di << " No result" << "\n";
+ di << " No result\n";
}
AppParCurves_MultiBSpCurve AnMuC = Varia.Value();
Appr.Perform (AML);
if (! Appr.IsAllApproximated()) {
- di << " No result" << "\n";
+ di << " No result\n";
}
AppParCurves_MultiCurve AnMuC = Appr.Value();
ThePoints = new (TColgp_HArray1OfPnt) (1, AnMuC.NbPoles() );
di <<" Error3D is : " << err << "\n";
}
else {
- AppDef_TheVariational Varia(AML,
+ AppDef_Variational Varia(AML,
1, NbPoints,
TABofCC,
Degree, 1);
Varia.SetTolerance(Abs(Tolerance));
Varia.Approximate();
if (! Varia.IsDone()) {
- di << " No result" << "\n";
+ di << " No result\n";
}
AppParCurves_MultiBSpCurve AnMuC = Varia.Value();