Commit Graph

144 Commits

Author SHA1 Message Date
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