mirror of https://github.com/CGAL/cgal
add pictures for package overview
bug in read acive objects bug in circle generation
This commit is contained in:
parent
40a0aaa21a
commit
e0a87fe913
|
|
@ -1285,6 +1285,8 @@ CGAL_ipelets/doc_tex/CGAL_ipelets/PkgDescription.tex -text
|
||||||
CGAL_ipelets/doc_tex/CGAL_ipelets/cgal_ipelets.tex -text
|
CGAL_ipelets/doc_tex/CGAL_ipelets/cgal_ipelets.tex -text
|
||||||
CGAL_ipelets/doc_tex/CGAL_ipelets/cgal_ipelets_def.tex -text
|
CGAL_ipelets/doc_tex/CGAL_ipelets/cgal_ipelets_def.tex -text
|
||||||
CGAL_ipelets/doc_tex/CGAL_ipelets/fig/example.png -text
|
CGAL_ipelets/doc_tex/CGAL_ipelets/fig/example.png -text
|
||||||
|
CGAL_ipelets/doc_tex/CGAL_ipelets/fig/ipeico.jpg -text
|
||||||
|
CGAL_ipelets/doc_tex/CGAL_ipelets/fig/ipelarge.jpg -text
|
||||||
CGAL_ipelets/doc_tex/CGAL_ipelets/main.tex -text
|
CGAL_ipelets/doc_tex/CGAL_ipelets/main.tex -text
|
||||||
CGAL_ipelets/doc_tex/CGAL_ipelets_ref/cgal_ipelets.tex -text
|
CGAL_ipelets/doc_tex/CGAL_ipelets_ref/cgal_ipelets.tex -text
|
||||||
CGAL_ipelets/doc_tex/CGAL_ipelets_ref/intro.tex -text
|
CGAL_ipelets/doc_tex/CGAL_ipelets_ref/intro.tex -text
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (c) 2005-2009 INRIA Sophia-Antipolis (France).
|
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
//
|
//
|
||||||
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
|
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@
|
||||||
#include <CGAL/copy_n.h>
|
#include <CGAL/copy_n.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
namespace CGAL_generator{
|
namespace CGAL_generator{
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -67,7 +66,7 @@ void generator::protected_run(int fn)
|
||||||
}
|
}
|
||||||
|
|
||||||
int nbelements=30;
|
int nbelements=30;
|
||||||
int size=200;
|
double size=200;
|
||||||
int ret_val;
|
int ret_val;
|
||||||
|
|
||||||
boost::tie(ret_val,nbelements)=request_value_from_user<int>((boost::format("Number of elements (default : %1%)") % nbelements).str() );
|
boost::tie(ret_val,nbelements)=request_value_from_user<int>((boost::format("Number of elements (default : %1%)") % nbelements).str() );
|
||||||
|
|
@ -142,7 +141,8 @@ void generator::protected_run(int fn)
|
||||||
if (fn==6){
|
if (fn==6){
|
||||||
CGAL::Random random;
|
CGAL::Random random;
|
||||||
for (std::vector<Point_2>::iterator it_pt=points.begin();it_pt!=points.end();++it_pt)
|
for (std::vector<Point_2>::iterator it_pt=points.begin();it_pt!=points.end();++it_pt)
|
||||||
draw_in_ipe(Circle_2(*it_pt,random.get_double(size/20.,size/2.)));
|
draw_in_ipe(Circle_2(*it_pt,pow(random.get_double(size/20.,size/2.),2) ));
|
||||||
|
get_IpePage()->Group(get_IpeletHelper()->CurrentLayer());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if (!points.empty())// Draw points
|
if (!points.empty())// Draw points
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (c) 2005-2009 INRIA Sophia-Antipolis (France).
|
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
//
|
//
|
||||||
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
|
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
|
||||||
|
|
|
||||||
|
|
@ -7,5 +7,5 @@ the Ipe extensible drawing editor.}
|
||||||
|
|
||||||
\ccPkgIntroducedInCGAL{3.5}
|
\ccPkgIntroducedInCGAL{3.5}
|
||||||
\ccPkgLicense{\ccLicenseLGPL}
|
\ccPkgLicense{\ccLicenseLGPL}
|
||||||
\ccPkgIllustration{Spatial_sorting/fig/hilbert.png}{Spatial_sorting/fig/hilbertLarge.jpg}
|
\ccPkgIllustration{CGAL_ipelets/fig/ipeico.jpg}{CGAL_ipelets/fig/ipelarge.jpg}
|
||||||
\end{ccPkgDescription}
|
\end{ccPkgDescription}
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 164 KiB |
|
|
@ -797,6 +797,14 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
//
|
||||||
|
// .-----7---------2-------.
|
||||||
|
// | |
|
||||||
|
// 3 6
|
||||||
|
// | indices |
|
||||||
|
// 4 1
|
||||||
|
// | |
|
||||||
|
// .-----0---------5-------.
|
||||||
template <class Output_iterator>
|
template <class Output_iterator>
|
||||||
void
|
void
|
||||||
restrict_circle_to_bbox(const Circle_2& approx_circle,
|
restrict_circle_to_bbox(const Circle_2& approx_circle,
|
||||||
|
|
@ -894,14 +902,16 @@ public:
|
||||||
multi_output_iterator it_out) const
|
multi_output_iterator it_out) const
|
||||||
{
|
{
|
||||||
if (object->AsGroup()){
|
if (object->AsGroup()){
|
||||||
|
bool deselect_grp=false;
|
||||||
for (IpeGroup::const_iterator it=object->AsGroup()->begin();
|
for (IpeGroup::const_iterator it=object->AsGroup()->begin();
|
||||||
it!=object->AsGroup()->end();++it){
|
it!=object->AsGroup()->end();++it)
|
||||||
|
{
|
||||||
IpeObject *obj = (*it)->Clone();
|
IpeObject *obj = (*it)->Clone();
|
||||||
obj->SetMatrix(obj->Matrix()*object->Matrix());
|
obj->SetMatrix(obj->Matrix()*object->Matrix());
|
||||||
read_one_active_object(obj,it_out);
|
bool cur=read_one_active_object(obj,it_out);
|
||||||
|
deselect_grp=deselect_grp || cur;
|
||||||
}
|
}
|
||||||
return true;
|
return deselect_grp;
|
||||||
}
|
}
|
||||||
|
|
||||||
//detect Points
|
//detect Points
|
||||||
|
|
@ -917,7 +927,7 @@ public:
|
||||||
//iterate on each subpath
|
//iterate on each subpath
|
||||||
to_deselect=false;
|
to_deselect=false;
|
||||||
for (int i=0;i<object->AsPath()->NumSubPaths();++i){
|
for (int i=0;i<object->AsPath()->NumSubPaths();++i){
|
||||||
if(object->AsPath()-> SubPath(i)->AsSegs()){//do not take elliptic segments
|
if(object->AsPath()-> SubPath(i)->AsSegs()){
|
||||||
std::list<Segment_2> seg_list;
|
std::list<Segment_2> seg_list;
|
||||||
bool is_polygon=object-> AsPath() -> SubPath(i)->Closed();
|
bool is_polygon=object-> AsPath() -> SubPath(i)->Closed();
|
||||||
|
|
||||||
|
|
@ -952,6 +962,8 @@ public:
|
||||||
);
|
);
|
||||||
it_out++=arc;
|
it_out++=arc;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
to_deselect=true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (object->AsPath() -> SubPath(i)->Closed() &&
|
if (object->AsPath() -> SubPath(i)->Closed() &&
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue