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

Merge pull request #5099 from theartful/fix_demo_compiling_without_core 

Fix arrangement demo compiling without CORE
This commit is contained in:
Laurent Rineau 2020-10-29 10:52:59 +01:00
parent 12cf69b59c 2dcdea9b05
commit e6dbcd97d4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp
View File

@ -280,9 +280,9 @@ void ArrangementDemoWindow::updateInputType(QAction* a)
tab->activateCurveInputCallback(curveType);
}
#ifdef CGAL_USE_CORE
void ArrangementDemoWindow::on_actionAddAlgebraicCurve_triggered()
{
#ifdef CGAL_USE_CORE
AlgebraicCurveInputDialog newDialog;
if (newDialog.exec() == QDialog::Accepted)
@ -312,10 +312,12 @@ void ArrangementDemoWindow::on_actionAddAlgebraicCurve_triggered()
algCurveInputCallback->generate(cv);
if (is_first_curve) currentTab->adjustViewport();
}
#endif
}
void ArrangementDemoWindow::on_actionAddRationalCurve_triggered()
{
#ifdef CGAL_USE_CORE
RationalCurveInputDialog newDialog;
if (newDialog.exec() == QDialog::Accepted)
@ -346,8 +348,8 @@ void ArrangementDemoWindow::on_actionAddRationalCurve_triggered()
algCurveInputCallback->generate(cv);
if (is_first_curve) currentTab->adjustViewport();
}
}
#endif
}
void ArrangementDemoWindow::on_actionQuit_triggered() { qApp->exit(); }

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.h
View File

@ -78,10 +78,8 @@ public Q_SLOTS:
void on_actionMerge_toggled(bool);
void on_actionSplit_toggled(bool);
void on_actionFill_toggled(bool);
#ifdef CGAL_USE_CORE
void on_actionAddAlgebraicCurve_triggered();
void on_actionAddRationalCurve_triggered();
#endif
Q_SIGNALS:
void modelChanged();

4
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/RationalTypes.h
View File

@ -12,10 +12,10 @@
#ifndef ARRANGEMENT_DEMO_RATIONAL_TYPES_H
#define ARRANGEMENT_DEMO_RATIONAL_TYPES_H
#include <CGAL/Cartesian.h>
#include <CGAL/Point_2.h>
#ifdef CGAL_USE_CORE
#include <CGAL/CORE_BigRat.h>
#include <CGAL/Cartesian.h>
#include <CGAL/Point_2.h>
#else
#include <CGAL/Exact_rational.h>
#endif