Commit Graph

310 Commits

Author SHA1 Message Date
Stéphane Tayeb 8e01b3cd32 Mesh_3_demo:
+ A window now pops-up during meshing (with a 'stop' button)
2010-06-18 13:06:08 +00:00
Stéphane Tayeb 660d56a9b1 Mesh_3_optimization_plugin
+ Add an error window if selected object is not a scene_c3t3_item
2010-06-18 07:47:02 +00:00
Stéphane Tayeb 3d48c6d945 Change default colors for new Scene_c3t3_item (created by meshing or optimization). 2010-06-17 15:43:05 +00:00
Stéphane Tayeb 2db8efab58 Remove buggy #include. 2010-06-17 14:09:07 +00:00
Stéphane Tayeb 08e6269f08 Second step towards run of mesh optimization process in a separated thread:
+ A message box pops up when optimizer is launched.
  + Optimization can be stop using 'stop' button of this message box

  + todo: add (dynamic) information in message box about status of running optimizer
2010-06-17 14:02:02 +00:00
Stéphane Tayeb 70ae043666 + Improve implicit function drawing efficiency (use display list stuff from base class)
+ Adjust Color_ramp
2010-06-16 16:12:32 +00:00
Stéphane Tayeb fdb69bc827 Mesh_3 demo: Replace Knot_3 function by Klein function. 2010-06-16 15:07:16 +00:00
Stéphane Tayeb b62635e181 First step towards run of mesh optimization process in a separated thread. 2010-06-15 16:40:57 +00:00
Stéphane Tayeb 6e92184996 Add (and fix) implicit functions compilation in Mesh_3 demo CMakeLists.txt. 2010-06-15 09:36:04 +00:00
Stéphane Tayeb 2a001438a9 Rename Mesh_3_demo plugins. 2010-06-15 08:55:41 +00:00
Stéphane Tayeb 7745e6101e Remove 'Polyhedron_demo_' from demo interface classes. 2010-06-15 07:47:18 +00:00
Stéphane Tayeb c2c3a5cba7 Rename IO plugins. 2010-06-15 07:28:10 +00:00
Stéphane Tayeb 34813708ac Try to extract generic interfaces and files which comes from the Polyhedron demo framework
+ Move generic headers in include/CGAL_demo
 + Move generic source files in src/CGAL_demo

Change organization of Mesh_3 demo files
 + Move ui files in directory ui_files
2010-06-14 15:45:15 +00:00
Stéphane Tayeb 86ed389470 + Fix test suite wrt mesher efficiency improvement
+ Fix typo
2010-06-11 08:11:12 +00:00
Stéphane Tayeb 038b2ec240 Optimize (efficiency) Mesh_3 refinement process:
+ do not update bad tet queue during the first surface refinement

  + rebuild restricted Delaunay uses adjacency informations during volume
  refinement (could be disabled by setting macro CGAL_MESH_3_USE_OLD_SURFACE_RESTRICTED_DELAUNAY_UPDATE)
2010-06-10 13:08:29 +00:00
Sébastien Loriot d53e01f1a1 remove package namespace macro 2010-06-09 08:45:58 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Stéphane Tayeb 4597b7f502 Add a new implicit function to Mesh_3 demo. 2010-06-08 16:44:51 +00:00
Stéphane Tayeb b8324d2a50 Add colors to dihedral angle histogram. 2010-06-08 15:17:34 +00:00
Andreas Fabri 816c9c9948 Fixed name of Analyze file format in the file dialog 2010-06-07 06:34:31 +00:00
Andreas Fabri 6b0682fe33 Fix windows export macros 2010-06-07 06:33:30 +00:00
Stéphane Tayeb 8399597314 Add windows export macros. 2010-06-04 15:15:06 +00:00
Laurent Rineau 09e21e48d1 Merged revisions 56414-56415,56551-56552 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56414 | reichel | 2010-05-21 19:16:35 +0200 (Fri, 21 May 2010) | 2 lines
  
  Fix syntax error in generated VRML 2 file in IndexedFaceSet nodes.
........
  r56415 | reichel | 2010-05-21 19:22:44 +0200 (Fri, 21 May 2010) | 2 lines
  
  Add changelog entry for r56414.
........
  r56551 | stayeb | 2010-06-03 11:11:44 +0200 (Thu, 03 Jun 2010) | 8 lines
  
  Backport r54173 from trunk
  
    | New Revision: 54173
    | Author: stayeb
    | Date: 2010-02-15 09:55:02 +0100 (Mon, 15 Feb 2010)
    | 
    | Log message:
    | Add missing includes.
........
  r56552 | lrineau | 2010-06-03 11:57:44 +0200 (Thu, 03 Jun 2010) | 2 lines
  
  Add missing includes.
........
2010-06-03 12:22:15 +00:00
Stéphane Tayeb 1ba1d02075 Move 'Load implicit function' action from Operation menu to File menu. 2010-06-02 15:24:45 +00:00
Stéphane Tayeb 271b5bd799 Fix: avoid an infinite loop in plugin loading if directory 'implicit_functions' does not exist. 2010-05-27 07:19:57 +00:00
Laurent Rineau 2012e2cd2f Fix bad copy-paste. :-) 2010-05-26 20:51:42 +00:00
Stéphane Tayeb ec61d46e2e Clean code of implicit functions. 2010-05-25 07:48:14 +00:00
Stéphane Tayeb 73fb44c155 Use qglviewer::Vec instead of ad-hoc Scene_interface::Point_ structure to represent (CGAL independent) 3D positions. 2010-05-25 07:28:53 +00:00
Stéphane Tayeb b331ffa0e1 Mesh_3_demo: Add the possibility to load, mesh and optimize implicit functions. 2010-05-21 16:17:27 +00:00
Stéphane Tayeb aee6dce7ad Mesh_3_demo: Add a struct Point_ in Scene_interface (which does not depend on CGAL kernel). 2010-05-21 16:09:35 +00:00
Stéphane Tayeb 0ea97af230 Mesh_3_demo: add a checkbox in Rib_dialog to render flat edges. 2010-05-21 16:08:20 +00:00
Stéphane Tayeb 29812bb131 Mesh_3_demo:
+ Fix color map computation in scene_c3t3_item
  + Print min and max angle value in green if they are good
2010-05-21 16:06:14 +00:00
Stéphane Tayeb e37473940b Mesh_3 demo: increase bisection precision for 3D image mesh generation. 2010-05-21 16:04:07 +00:00
Stéphane Tayeb eb0b1fee38 Remove first line of *.ui file (compatibility issue). 2010-05-21 16:02:18 +00:00
Stéphane Tayeb f8638f27cd Fix compilation on x86-64_Linux-2.6_llvm-clang-with-g++-4.4.1_F11: implement private classes before using their internal types. 2010-05-20 07:13:39 +00:00
Stéphane Tayeb 2ae782d74a Remove extra ';'. 2010-05-17 07:00:15 +00:00
Andreas Fabri 480ddb54f5 Remove ';' 2010-05-14 09:46:02 +00:00
Andreas Fabri 85462651e4 Replace derivation of a kernel by a typedef, as otherwise we do not profit from static filters in the EPIC kernels 2010-05-14 08:58:30 +00:00
Andreas Fabri 224606fadd Remove ';' after free function 2010-05-14 08:42:39 +00:00
Andreas Fabri cac05ca398 fix typo 2010-05-12 12:58:06 +00:00
Stéphane Tayeb 312ab0f9f0 Add 'this->' for ansi-compliance. 2010-05-10 07:23:51 +00:00
Stéphane Tayeb ab513413a7 Add 'this->' for ansi-compliance. 2010-05-10 07:23:41 +00:00
Stéphane Tayeb d2572ea9e5 Enrich test_c3t3 2010-04-21 11:10:55 +00:00
Stéphane Tayeb a5764fa49f + fix commit 55520 2010-04-19 12:31:52 +00:00
Stéphane Tayeb 2b34fe9d2d + add protected access to bounding_box of Labeled_mesh_domain_3
+ remove old commented code
2010-04-19 12:24:52 +00:00
Stéphane Tayeb 8384929e2f Add default ctor in Mesh_complex_3_in_triangulation_3::Cell_iterator class. 2010-04-12 08:27:53 +00:00
Stéphane Tayeb 98318a5264 Revert previous commit. 2010-04-12 08:21:41 +00:00
Stéphane Tayeb e93766f06d Wrong commit (reverted in r55407). 2010-04-12 08:19:08 +00:00
Stéphane Tayeb de3a8f9cb5 + attempt to remove warnings C4244, C4181, C4180 (MSVS) 2010-04-06 09:13:53 +00:00
Stéphane Tayeb 48ccaef648 Remove useless includes. 2010-04-02 11:32:06 +00:00
Laurent Rineau c73ac47939 Fix inconsistency in the list of authors (between ref manual and user
manual).
2010-03-23 14:53:05 +00:00
Stéphane Tayeb 3f7e04340b Add missing file... 2010-03-23 07:40:10 +00:00
Stéphane Tayeb f78b400fe0 Improve rib exporter plugin parameters default behavior 2010-03-22 17:57:28 +00:00
Stéphane Tayeb 2ae402acb2 Add a user dialog window to rib exporter. 2010-03-22 17:14:04 +00:00
Stéphane Tayeb e2727ac131 Remove buggy ';' 2010-03-18 15:34:41 +00:00
Stéphane Tayeb 36f2dce9e5 Fix default parameters. 2010-03-18 14:13:15 +00:00
Stéphane Tayeb 03cfb643e5 Sphere and cylinder radius (which are used to draw points and edges) now depends on mesh bbox. 2010-03-18 12:33:56 +00:00
Stéphane Tayeb 398abaf638 Minor fixes in rib exporter. 2010-03-18 09:43:18 +00:00
Stéphane Tayeb 45b22095b0 Add rib_exporter_plugin:
+ exports the displayed c3t3 in a RIB file which can be rendered using Pixie

TODO: implement option dialog
2010-03-12 17:24:40 +00:00
Stéphane Tayeb 31e924b559 FPS are no longer displayed by default. 2010-03-12 17:15:35 +00:00
Stéphane Tayeb 4420a4ef71 Scene c3t3 change: Draw interior edges with the color (darker) of the material instead of black. 2010-02-25 14:50:05 +00:00
Laurent Rineau 09a9faa25a Remove the executable bit. 2010-02-23 13:36:03 +00:00
Stéphane Tayeb 9a8208dc96 Fix warning and a risk of div by 0. 2010-02-23 12:42:20 +00:00
Laurent Rineau 1a9777d966 Better usage of GLEW.
http://glew.sourceforge.net/basic.html
2010-02-23 10:05:31 +00:00
Laurent Rineau 52fd0a41ad Add the use of GLEW (http://glew.sourceforge.net/)
It allows the use of OpenGL extensions.
2010-02-22 16:32:42 +00:00
Stéphane Tayeb a7199d7af1 * protect calls to glDeleteBuffers
* use QColor::HueF() (available in QT4.0) instead of QColor::hsvHueF()
2010-02-22 15:06:41 +00:00
Stéphane Tayeb 5fa8b11231 Delete glBuffers in Scene_segmented_image_item destructor. 2010-02-22 14:45:48 +00:00
Stéphane Tayeb da665ab3a5 Add a plugin (c3t3_saver) designed to save a c3t3_item. 2010-02-22 14:23:53 +00:00
Laurent Rineau 897bdd6d59 Merged revisions 53967-53968,54001-54002,54005-54007,54046,54058,54096,54098,54229,54237-54238 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53967 | lrineau | 2010-02-01 15:46:07 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  Typo
........
  r53968 | lrineau | 2010-02-01 16:09:48 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  Update the link to the installation manual.
........
  r54001 | fcacciola | 2010-02-02 16:34:59 +0100 (Tue, 02 Feb 2010) | 1 line
  
  Fixed warnings
........
  r54002 | fcacciola | 2010-02-02 16:50:18 +0100 (Tue, 02 Feb 2010) | 1 line
  
  CORRECT fix for the *branch* code
........
  r54005 | lrineau | 2010-02-02 21:26:25 +0100 (Tue, 02 Feb 2010) | 10 lines
  
  Backport from trunk:`
    | ------------------------------------------------------------------------
    | r53983 | afabri | 2010-02-02 14:26:07 +0100 (Tue, 02 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h
    | 
    | Use the traits for comparing points, not ==
    | ------------------------------------------------------------------------
    | 
........
  r54006 | lrineau | 2010-02-03 14:12:26 +0100 (Wed, 03 Feb 2010) | 18 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r53978 | afabri | 2010-02-02 09:32:59 +0100 (Tue, 02 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Surface_mesh_simplification/test/Surface_mesh_simplification/test_edge_collapse_Polyhedron_3.cpp
    | 
    | Add virtual destructor in the testsuite to turn a 'W' to a 'Y'
    | ------------------------------------------------------------------------
    | r53988 | afabri | 2010-02-02 15:11:06 +0100 (Tue, 02 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Polyhedron/demo/Polyhedron/Messages_interface.h
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_io_plugin_interface.h
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_interface.h
    |    M /trunk/Polyhedron/demo/Polyhedron/Scene_draw_interface.h
    | 
    | Define virtual destructors
    | ------------------------------------------------------------------------
........
  r54007 | fcacciola | 2010-02-03 14:46:31 +0100 (Wed, 03 Feb 2010) | 1 line
  
  Added bug fix from recent user report (Feb-2010)
........
  r54046 | penarand | 2010-02-08 12:04:59 +0100 (Mon, 08 Feb 2010) | 3 lines
  
  removed Elias from authors
........
  r54058 | mcaroli | 2010-02-09 12:06:20 +0100 (Tue, 09 Feb 2010) | 3 lines
  
  replace version number by "last" in links to the online manual
  this is a merge from the trunk rev 54041
........
  r54096 | yvinec | 2010-02-10 15:08:17 +0100 (Wed, 10 Feb 2010) | 4 lines
  
  added Pierre and Jane as authors.
  Fixed approved by RM.
........
  r54098 | yvinec | 2010-02-10 15:17:49 +0100 (Wed, 10 Feb 2010) | 4 lines
  
  added Pierre and Jane as authors in Mesh_3.
  Fixed approved by RM
........
  r54229 | lrineau | 2010-02-19 13:52:46 +0100 (Fri, 19 Feb 2010) | 2 lines
  
  s|Qt/qglobal.h|QtCore/qglobal.h|
........
  r54237 | lrineau | 2010-02-19 17:43:53 +0100 (Fri, 19 Feb 2010) | 3 lines
  
  - Add a section about RS in the third party libraries of Preliminaries.
  - Use macros, to help the cross-referencing of RS.
........
  r54238 | stayeb | 2010-02-19 17:47:25 +0100 (Fri, 19 Feb 2010) | 1 line
  
  Bug fix: do not use infinite vertice to compute bbox.
........
2010-02-19 17:21:11 +00:00
Stéphane Tayeb 980816e7b1 + Add a dock window for infos (instead of having them in QGLViewer frame)
+ Ensure that text is inserted at the end of the console
+ Minor modification in color map construction of segmented image
2010-02-19 09:17:34 +00:00
Stéphane Tayeb 718c806bca Allow the user to modify the color of c3t3 item 2010-02-18 10:07:13 +00:00
Stéphane Tayeb 45638421da + Tet radius-edge ratio is now properly used by polyhedral mesher
+ Cosmetics
2010-02-17 16:57:33 +00:00
Stéphane Tayeb faf8db25d1 + Use item bbox instead of scene bbox to compute default meshing values
+ Meshing and optimization now outputs some information in console frame of main window
2010-02-17 15:22:28 +00:00
Stéphane Tayeb 735600d18a Add the possibility to disable calls to glBuffers functions. 2010-02-16 17:26:36 +00:00
Stéphane Tayeb 25c9b57d8a + Mesh_3 demo does not depend on Polyhedron demo anymore (lots of files are duplicated however)
+ Add some features
  - Add an optimization plugin
  - Add an histogram for scene_c3t3_item

+ Improve existing features
  - Improve parameters window
  - Add a preview of 3d image (displaying cubes)
  - Add the possibility to select an item from its index (e.g. to select a mesh object after meshing)
2010-02-16 16:13:36 +00:00
Stéphane Tayeb 0a9354a9f6 Inline some non-templated functions. 2010-02-16 15:55:09 +00:00
Stéphane Tayeb bf07514d00 Add missing includes. 2010-02-15 08:55:02 +00:00
Mariette Yvinec 965d951038 added Pierre and Jane as authors in Mesh_3 2010-02-10 14:29:35 +00:00
Stéphane Tayeb e5e356f314 Improve mesher_tester. 2010-02-02 14:02:02 +00:00
Sylvain Pion 85dc12f2a7 Remove empty lines at beginning and end of files
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Stéphane Tayeb 2c1944c3eb Fix: ensure that no '0' is inserted in the sizing field. 2010-01-29 15:33:26 +00:00
Stéphane Tayeb 2776bd6219 Postpone vector normalization when computing perturbation moves. 2010-01-29 10:21:06 +00:00
Stéphane Tayeb 33fc21a9c8 Improve weighted robust circumcenter: do not compute same thing twice. 2010-01-29 08:47:59 +00:00
Stéphane Tayeb d822ef8474 Fix: replace Vector_3() by CGAL::NULL_VECTOR. 2010-01-29 08:47:00 +00:00
Michael Hemmer d4bc692102 use CGAL::cpp0x for tuple 2010-01-27 13:50:01 +00:00
Laurent Rineau 5e4c755bdb Merged revisions 53668-53669,53678-53679,53682-53686 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53668 | yvinec | 2010-01-19 11:00:41 +0100 (Tue, 19 Jan 2010) | 3 lines
  
  added changes for Mesh_3
........
  r53669 | yvinec | 2010-01-19 11:04:38 +0100 (Tue, 19 Jan 2010) | 3 lines
  
  fixed page layout in Changes for Mesh_3
........
  r53678 | spion | 2010-01-20 13:32:36 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Link AK_d and reorder to have Modular close to NT.
........
  r53679 | lrineau | 2010-01-20 13:37:23 +0100 (Wed, 20 Jan 2010) | 9 lines
  
  Merge from trunk:
    | New Revision: 53666
    |  Author: sloriot
    |  Date: 2010-01-19 08:41:16 +0100 (Tue, 19 Jan 2010)
    |  
    |  Log message:
    |  
    | remove warnings
........
  r53682 | lrineau | 2010-01-20 14:31:41 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Simplify the URL to CORE, so that "_" is not in the URL (Pb with manual tools)
........
  r53683 | lrineau | 2010-01-20 14:42:23 +0100 (Wed, 20 Jan 2010) | 3 lines
  
  Fix the package description of AK (fix the bib label and the version of
  CGAL)
........
  r53684 | lrineau | 2010-01-20 14:45:53 +0100 (Wed, 20 Jan 2010) | 1 line
  
  clean PkgDescription.tex
........
  r53685 | lrineau | 2010-01-20 15:01:09 +0100 (Wed, 20 Jan 2010) | 3 lines
  
  - Update PkgDexcription.tex to year 2010.
  - Add manual-3.6.bib
........
  r53686 | lrineau | 2010-01-20 15:03:10 +0100 (Wed, 20 Jan 2010) | 1 line
  
  Update the biblio shipped in manual tools, using manual-3.6.bib
........
2010-01-20 14:07:18 +00:00
Stéphane Tayeb b583906228 Cosmetics. 2010-01-20 12:41:17 +00:00
Stéphane Tayeb 98803452d1 Update mesher_tester:
- 2 apps: 1 for images, 1 for polyhedron (reduce compile time)
  - improved outputs
  - meshes could now be computed simultaneously
2010-01-20 12:24:05 +00:00
Stéphane Tayeb 593e6cedc5 Remove useless expensive preconditions. 2010-01-18 09:22:51 +00:00
Stéphane Tayeb d8e224951c Fix html manual and ircad database url. 2010-01-14 08:15:26 +00:00
Stéphane Tayeb 69fc6a5cad * revert commit 51550 (only on doc_tex/Mesh_3/main.tex)
* fix typo
2010-01-13 16:58:23 +00:00
Stéphane Tayeb 1f3332bf63 Move Mesh_3 from candidate-packages to trunk (2/2) 2010-01-06 13:46:02 +00:00
Stéphane Tayeb 313a28d9a2 Move Mesh_3 from candidate-packages to trunk (1/2) 2010-01-06 13:44:50 +00:00
Laurent Rineau d8d7924ac0 Fix colors of edges. 2009-12-16 15:02:11 +00:00
Laurent Rineau 9e0fdd5948 Scene_c3t3_item now implements direct_draw_edges, so that it can display
edges in a different color (that way one can *see* them!).
2009-12-16 14:57:59 +00:00
Laurent Rineau f37e42744b Fix compilation on Windows. -- Laurent Rineau 2009-12-15 14:48:21 +00:00
Laurent Rineau 7036da22c9 New c3t3 item library. Previously the class Scene_c3t3_item was hidden in
the mesh_3 plugin.
2009-12-15 13:44:07 +00:00
Laurent Rineau 8c0dfb8d92 C3t3 item now displays colored triangles/cells, and uses display lists. 2009-12-11 16:21:17 +00:00
Andreas Fabri 783130ed4f yet another MSVS decl(export/import) problem. --LR 2009-12-11 15:30:13 +00:00
Stéphane Tayeb 9707b3edea Merge r53152 from 3.5 branch
r53152 | stayeb
Fix bug (typo) in polyhedral domain initialization.
2009-11-24 12:46:06 +00:00