songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2777 from MaelRL/IO-Fix_dxf_reader-GF 

Circular_kernel_2: Fix the circle reading in the `.dxf ` file reader
This commit is contained in:
Laurent Rineau 2018-02-02 16:06:09 +01:00
parent d2ac299266 558465d2a6
commit 24b50f5c5c
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Circular_kernel_2/benchmark/dxf_to_bff/dxf_converter.h
View File

@ -122,7 +122,7 @@ private:
is >> n;
assert(n == 40);
is >> r;
NT1 x(cx),y(cy),gr(r);
NT1 x(cx), y(cy), gr(r*r);
os<<"Circle_2 ("<<"Point_2("<<"Rational(" <<x.numerator()<< ", "<<x.denominator()<<")"<< ", "<<"Rational(" <<y.numerator()<< ", "<<y.denominator()<<")""),"<<"Rational(" <<gr.numerator()<< ", "<<gr.denominator()<<")"<<")"<<std::endl;
// circ = typename K::Construct_circle_2()(Point_2(cx,cy), r*r);
}

9
Circular_kernel_2/include/CGAL/IO/Dxf_reader.h
View File

@ -23,9 +23,8 @@
// and a STREP (FET Open) Project under Contract No IST-006413
// (ACS -- Algorithms for Complex Shapes)
// Descriptions of the file format can be found at
// Description of the file format can be found at the following address:
// http://www.autodesk.com/techpubs/autocad/acad2000/dxf/
// http://www.tnt.uni-hannover.de/soft/compgraph/fileformats/docs/DXF.ascii
#ifndef CGAL_IO_DXF_READER_H
#define CGAL_IO_DXF_READER_H
@ -136,8 +135,8 @@ private:
is >> n;
CGAL_assertion(n == 40);
is >> iformat(r);
FT rft(r);
circ = typename K::Construct_circle_2()(Point_2(cx,cy), rft);
FT sqr_ft(r*r);
circ = typename K::Construct_circle_2()(Point_2(cx,cy), sqr_ft);
}
void
@ -162,7 +161,7 @@ private:
is >> iformat(r);
center = typename K::Construct_point_2()(cx,cy);
rft = FT(r);
rft = FT(r); // intentionally not squared
}

5
Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h
View File

@ -139,9 +139,8 @@ private:
is >> n;
CGAL_assertion(n == 40);
is >> iformat(r);
FT rft(r);
circ = CGAL::make_array(cx,cy,rft);
FT sqr_ft(r*r);
circ = CGAL::make_array(cx,cy,sqr_ft);
}

3
Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h
View File

@ -24,9 +24,8 @@
// and a STREP (FET Open) Project under Contract No IST-006413
// (ACS -- Algorithms for Complex Shapes)
// Descriptions of the file format can be found at
// Description of the file format can be found at the following address:
// http://www.autodesk.com/techpubs/autocad/acad2000/dxf/
// http://www.tnt.uni-hannover.de/soft/compgraph/fileformats/docs/DXF.ascii
#ifndef CGAL_IO_DXF_VARIANT_READER_H
#define CGAL_IO_DXF_VARIANT_READER_H

3
Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h
View File

@ -17,10 +17,9 @@
//
// Author(s) : Fernando Cacciola
//
// Descriptions of the file format can be found at
// Description of the file format can be found at the following address:
// http://www.autodesk.com/techpubs/autocad/acad2000/dxf/
#ifndef CGAL_IO_DXF_WRITER_H
#define CGAL_IO_DXF_WRITER_H