songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
88,761 Commits 3 Branches 156 Tags 963 MiB
Commit Graph

215 Commits

Author SHA1 Message Date
Aurélien Vialon 2d65524aea All last demonstrations ported to Qt4or5. Need to check working of it on Linux. 2014-08-12 22:12:42 +02:00
Aurelien Vialon c3aaf0bffe Some modification of CGAL Graphic view to a better compatibility of Windows with the Qt5 version of CGAL (especially about dll import and export stuff). 2014-07-17 01:55:07 +02:00
Aurélien Vialon ff94f3bf39 Arrangement_on_surface_2 ported. 2014-07-04 17:57:12 +02:00
Aurélien Vialon aee9e4eb24 Commit of new demonstrations porting. 2014-06-26 14:38:23 +02:00
Efi Fogel 6af55c4978 Resolved min/max issue with msvc 2013-12-06 13:15:13 +02:00
Efi Fogel d86ec409a3 commented out unused vars. 2013-11-17 08:54:42 +02:00
Dror Atariah 2d7cb01fba Removed unused reference to a deprecated type 2013-11-11 09:34:52 +01:00
Dror Atariah 00def304a2 Removed white spaces at the end of some lines 2013-11-10 13:28:32 +01:00
Dror Atariah b254bdf2f0 construction functor instead of direct construction 
in mousePressEvent
 2013-11-10 13:28:01 +01:00
Dror Atariah 219eeb036b Segments iteration instead of points iterations 
in paintFace
 2013-11-10 13:10:01 +01:00
Dror Atariah bd4a4cddbf Reverted to iterat on seg's 
in Compute_squared_distance_2
 2013-11-10 11:37:25 +01:00
Dror Atariah 8154dba9b0 Initial clean of deprecated function in polylines case 2013-10-25 11:52:20 +02:00
Dror Atariah dd24d24128 Reverted to construction functor of polylines in demo 2013-10-25 11:35:26 +02:00
Efi Fogel 564a6c794d Synchronized with a recent version of master 2013-10-22 10:00:18 +03:00
Laurent Rineau 2286ad89ab Remove the executable bit of .h and .cpp files 2013-08-27 14:58:04 +02:00
Efi Fogel a898b561f9 fixed min/max calls to pacify msvc 2013-08-10 15:12:38 +03:00
Efi Fogel 548dc1aa24 commented out unused variable 2013-08-07 22:59:25 +03:00
Efi Fogel d019b2da3b pacified MSVC 2013-08-07 22:58:34 +03:00
Efi Fogel fb26cd3756 commented out unused variable 2013-08-07 22:57:41 +03:00
Efi Fogel 7adf488d2e commented out unused variable 2013-08-07 22:55:47 +03:00
Dror Atariah f008466061 Removed white spaces at EOL 2013-07-02 16:29:49 +02:00
Efi Fogel fe6e9b860d Apply fixes to compile the arrangement demo with VC 10 2013-06-11 18:27:33 +03:00
Alex Tsui 0b52b8bcf3 Addressed some issues in Aos_2-demo. 
* Removed stray debug messages.
* Removed unused 'Traits' and 'Testing' menus.
* Fixed the mix up of lower and upper envelopes.
* Draw user-specified points when using circular arc traits.
* Fixed a memory error when demo is closed.
 2013-03-23 17:22:21 -07:00
Andreas Fabri 50c4c6e494 bug fix for clang / Most_vexing_parse 2013-03-01 09:15:17 +01:00
Alex Tsui de5f238a71 Removed large .arr files from Aos_2 demo. 2013-02-22 07:42:52 -08:00
Andreas Fabri c029f702a3 use more types 2013-02-07 11:02:14 +01:00
Efi Fogel 1bb3428af1 Skip compilation if Qt4 is missing 2012-11-23 01:23:15 +02:00
Efi Fogel fb62071fb8 Merge branch 'gsoc2012-Arrangement_on_surface_2-demo-atsui' of ssh://scm.cgal.org/var/git/cgal into demo 2012-11-21 10:16:08 +02:00
Efi Fogel a41b333be9 Added missing return statement in boundingRect() 2012-11-21 09:50:41 +02:00
Efi Fogel b618b5635c included QGraphicsScene to pacify intelcompiler? 2012-11-20 17:09:06 +02:00
Efi Fogel 1eebfe2904 removed redundant this-> 2012-11-20 16:38:34 +02:00
Efi Fogel b8de11c59b cleanup 2012-11-15 11:10:28 +02:00
Efi Fogel 209d1d88ed cleanup 2012-11-06 09:06:28 +00:00
Efi Fogel 09c6567b19 cleanup 2012-11-05 23:57:06 +00:00
Efi Fogel bb82c3a6eb cleanup 2012-11-01 13:17:06 +00:00
Efi Fogel 27534ef311 updated 2012-11-01 10:29:57 +00:00
Efi Fogel 19bb1eb5f4 updated 2012-11-01 10:16:09 +00:00
Efi Fogel fb436f7ec0 updated 2012-10-31 16:18:47 +00:00
Efi Fogel 88e1a360eb cleanup 2012-10-31 01:36:24 +00:00
Efi Fogel a960f7d5f6 updated 2012-10-31 00:35:33 +00:00
Efi Fogel 1e3833930c merged with next 2012-10-25 10:07:41 +00:00
Efi Fogel 01fcca7364 suppressed printouts 2012-10-25 09:44:49 +00:00
Alex Tsui 739cd32f3f Implemented painting arc regions. 2012-10-21 00:59:13 +00:00
Alex Tsui c410d61db2 Added support for .dat files. 2012-10-05 23:47:32 +00:00
Alex Tsui 03490e833e Add points to the envelope when they should be. 2012-10-01 18:12:01 +00:00
Alex Tsui 063e631b15 Implemented face color filling for original traits. 2012-09-29 18:05:43 +00:00
Alex Tsui 3cd9969be7 Added face fill functionality that supports segment traits so far. 2012-09-24 22:20:33 +00:00
Alex Tsui 82deb1f1dd Fixed y-axis flip in the graphics view. 
* adjusted default colors
* converted some old *.dat files to *.arr files.
 2012-09-23 20:01:51 +00:00
Alex Tsui a318f1ea26 Added envelope and ray shoot color properties. 2012-09-17 23:34:29 +00:00
Alex Tsui 3050948b3c Add arrowhead drawing. 2012-09-16 18:28:45 +00:00
Alex Tsui 6921377b1f Add point feedback when inserting 3 or 5 point conic arcs. 2012-09-15 18:36:26 +00:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy 
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
 2012-08-22 12:35:03 +00:00
Alex Tsui 53b4f22e91 Remove Test.ui 2012-08-20 20:41:15 +00:00
Alex Tsui 51b0dc6c96 Enable overlaying circular arcs and algebraic traits arrangements. 2012-08-20 20:40:31 +00:00
Alex Tsui 95f2de9801 Fix callback handling when switching tabs. 2012-08-20 20:05:10 +00:00
Alex Tsui d285a87d87 Various fixes/workarounds to fix crashing in algebraic traits arrangements. 2012-08-20 18:31:02 +00:00
Alex Tsui 2fc1e22a23 Add some algebraic curve arrangement samples. 2012-08-20 18:18:02 +00:00
Alex Tsui 85d80459b1 Implemented algebraic curve rendering. 2012-08-18 00:53:55 +00:00
Alex Tsui 3ebb8ea23f Working skeleton with algebraic segment traits 2012-08-16 20:23:51 +00:00
Alex Tsui 284cd602e2 Updated SnapStrategy template parameters to use proper point types. 2012-08-13 22:51:09 +00:00
Alex Tsui c92fcd1730 Preparing to refactor. 2012-08-12 23:51:14 +00:00
Alex Tsui dd17cc6a85 Fixed circular arc input and splitting. 2012-08-06 22:42:16 +00:00
Alex Tsui f27e1c2c7f Circular_arc_traits example compiles and runs, but just barely. 
* Currently errors out on attempting to insert intersecting arcs.
 2012-08-02 21:00:08 +00:00
Alex Tsui 09857e2e74 Used sfinae to use circular and non-circular kernels with Converter. 2012-07-30 21:03:25 +00:00
Alex Tsui d675535274 Added some circular_arc_traits typedefs 2012-07-27 19:03:24 +00:00
Alex Tsui 70ef88bd35 Arr_linear_traits overlaying works. 2012-07-23 18:13:24 +00:00
Alex Tsui 765232f21f Implemented linear traits tab. 
* Supports basic operations on unbounded arrangement with linear curves.
* Also fixed a bug in conic point-curve distance computation.
 2012-07-21 23:24:33 +00:00
Alex Tsui aaa591be04 Implemented curve clipping to view. 2012-07-18 18:03:58 +00:00
Alex Tsui 5742a14f53 Slight cleanup 2012-07-16 19:04:38 +00:00
Alex Tsui 27ecc589a6 Give ourselves a clipping rectangle; now need to clip curves. 2012-07-16 17:05:47 +00:00
Alex Tsui 407c31cd60 Fix point drawing for conic arrangements. 2012-07-13 18:31:08 +00:00
Alex Tsui dfb9b2bce0 Fixed a bug with ray drawing in conic arrangements. 2012-07-13 17:35:28 +00:00
Alex Tsui 4b0d1e5468 Constrain certain properties in the properties dialog. 2012-07-10 16:30:25 +00:00
Alex Tsui d7cb5ec240 Implemented a properties dialog that is not yet hooked up to the graphics item. 2012-07-09 07:03:57 +00:00
Alex Tsui a0a2deb349 Minor painting fixes. 2012-07-04 22:15:09 +00:00
Alex Tsui 9d926d8fd2 Implemented arrangement I/O. 2012-07-04 20:19:12 +00:00
Alex Tsui f9554d0e9d Implemented overlays of two arrangements with matched geometry traits. 2012-06-29 23:42:27 +00:00
Alex Tsui ebb6cf73fe Implement insertion of conics by specifying 3 or 5 points. 2012-06-29 04:12:55 +00:00
Alex Tsui 1a5c7a49dc Implemented adding circles to a conic arrangement. 
* Fixed a bug in conic subcurve construction.
 2012-06-28 23:12:42 +00:00
Alex Tsui fc349d0e1b Finally implemented the necessities to support conic arrangements. 2012-06-28 18:42:04 +00:00
Alex Tsui 24d68609b5 Improved tabbing behavior. 2012-06-27 02:44:42 +00:00
Alex Tsui c6b0d86bc3 Implemented polyline curve drawing. 
* Replaced ArrangementSegmentInputCallback with ArrangementCurveInputCallback.
 2012-06-25 00:47:31 +00:00
Alex Tsui 7b686080a2 Able to instantiate arrangement demo tabs with polyline traits. 2012-06-24 05:51:58 +00:00
Alex Tsui d6670b2c70 Fixed bugged usage of ArrangementPainterOstream. 2012-06-24 05:12:22 +00:00
Alex Tsui 0a5e05c0b8 Fixed some typedef inconsistencies. 2012-06-23 21:55:11 +00:00
Alex Tsui e86e1c877a Change template name K to K_ to fit code convention 2012-06-23 06:18:10 +00:00
Alex Tsui ee173632ec Rename template name TArr to Arr_ to fit conventions 2012-06-23 06:15:27 +00:00
Alex Tsui 67d20515d5 Add an adapter to find the kernel in non-segment traits 2012-06-22 18:04:49 +00:00
Alex Tsui 0a440bf0f0 Prepare to refactor arrangement graphics items. 2012-06-22 16:19:35 +00:00
Alex Tsui 2bbfd7b8a1 Implement adding new tabs. 2012-06-22 00:46:05 +00:00
Alex Tsui c8176cf991 Refactored demo tabs. 2012-06-21 20:50:53 +00:00
Alex Tsui 96564917f6 Commit before refactoring to use tabs. 2012-06-21 19:47:32 +00:00
Alex Tsui 6f9008417e Implemented vertex and grid snapping. 2012-06-21 06:12:19 +00:00
Alex Tsui 29d4145360 Implemented lower/upper envelope callback. 2012-06-19 01:29:24 +00:00
Alex Tsui 80495b7811 Refactor segment input callback logic out of the demo window. 2012-06-18 00:55:07 +00:00
Alex Tsui 3996d52e27 Implement edge splitting callback. 2012-06-17 17:57:32 +00:00
Alex Tsui 8c1de4997c Implement edge merging. 2012-06-17 17:01:19 +00:00
Alex Tsui 8fea132dcd Implemented point location callback. 2012-06-16 19:28:01 +00:00
Alex Tsui e093efe148 Added a stub implementation of point location callback. 2012-06-16 17:32:43 +00:00
Alex Tsui 1d241766c9 Rename .hpp files to .h files to match convention. 2012-06-16 16:36:03 +00:00