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

oops, something had gotten confused, CGALQT should now compile

This commit is contained in:
Daniel Russel 2007-06-15 20:42:44 +00:00
parent 82b9c5eb56
commit 2f35c55283
5 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
View File

@ -22,6 +22,7 @@
#define CGAL_KINETIC_IO_INTERNAL_QT_TIMER_H
#include <map>
#include <qtimer.h>
#include <CGAL/Kinetic/Listener.h>
namespace CGAL
{
namespace Kinetic

1
Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h
View File

@ -24,6 +24,7 @@
#include <CGAL/Kinetic/basic.h>
#include <CGAL/IO/Qt_widget.h>
#include <qmainwindow.h>
#include <CGAL/Kinetic/Listener.h>
namespace CGAL
{

27
Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
View File

@ -134,6 +134,33 @@
return !operator>(o); \
}
#define CGAL_COMPARISONS3(a, b, c) bool operator==(const This &o) const { \
return (a== o.a && b== o.b && c == o.c); \
} \
bool operator!=(const This &o) const { \
return (a!= o.a || b != o.b || c != o.c); \
} \
bool operator<(const This &o) const { \
if (a < o.a ) return true; \
else if (a > o.a) return false; \
else if (b < o.b) return true; \
else if (b > o.b) return false; \
else return c < o.c; \
} \
bool operator>(const This &o) const { \
if (a > o.a ) return true; \
else if (a < o.a) return false; \
else if (b > o.b) return true; \
else if (b < o.b) return false; \
else return c > o.c; \
} \
bool operator>=(const This &o) const { \
return !operator<(o); \
} \
bool operator<=(const This &o) const { \
return !operator>(o); \
}
#endif

3
Kinetic_data_structures/src/CGALQt/Kinetic_Qt_timer.cpp
View File

@ -40,6 +40,7 @@ void Qt_timer::run(double time_in_seconds) {
void Qt_timer::timerDone() {
++tick_;
cb_->new_notification(Listener::TICKS);
CGAL_KINETIC_NOTIFY(TICKS);
//cb_->new_notification(Listener::TICKS);
}
CGAL_KINETIC_END_INTERNAL_NAMESPACE

5
Kinetic_data_structures/src/CGALQt/Kinetic_Qt_widget_2_core.cpp
View File

@ -29,14 +29,15 @@ void Qt_widget_2_core::redraw() {
clear();
//std::cout << "size of drawables = " << drawable_s.size() << std::endl;
is_drawn_=false;
if (drawable_!= NULL) drawable_->new_notification(Listener::PICTURE_IS_CURRENT);
CGAL_KINETIC_NOTIFY(PICTURE_IS_CURRENT);
//if (drawable_!= NULL) drawable_->new_notification(Listener::PICTURE_IS_CURRENT);
is_drawn_=true;
unlock();
//::CGAL::Qt_widget::redraw();
}
Qt_widget_2_core::Qt_widget_2_core(QMainWindow *parent): ::CGAL::Qt_widget(parent) {
drawable_=NULL;
//drawable_=NULL;
is_drawn_=false;
}
CGAL_KINETIC_END_INTERNAL_NAMESPACE