2D regular triangulation demo

.gitattributes

@@ -1577,6 +1577,7 @@ GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.qrc -text
 GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui -text
 GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.qrc -text
 GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui -text
+GraphicsView/demo/Triangulation_2/Regular_triangulation_2.ui -text
 GraphicsView/demo/Triangulation_2/about_Constrained_Delaunay_triangulation_2.html svneol=native#text/html
 GraphicsView/demo/Triangulation_2/about_Delaunay_triangulation_2.html svneol=native#text/html
 GraphicsView/demo/Triangulation_2/data/clusters.poly -text svneol=unset#application/octet-stream

GraphicsView/demo/Triangulation_2/RegularTriangulationRemoveVertex.h

@@ -0,0 +1,80 @@
+
+#ifndef CGAL_QT_REGULAR_TRIANGULATION_REMOVE_VERTEX_H
+#define CGAL_QT_REGULAR_TRIANGULATION_REMOVE_VERTEX_H
+
+#include <CGAL/Qt/GraphicsViewInput.h>
+#include <QGraphicsSceneMouseEvent>
+#include <QEvent>
+#include <list>
+#include <CGAL/Qt/Converter.h>
+
+
+
+namespace CGAL {
+namespace Qt {
+
+template <typename DT>
+class RegularTriangulationRemoveVertex : public GraphicsViewInput
+{
+public:
+  typedef typename DT::Vertex_handle Vertex_handle;
+
+  RegularTriangulationRemoveVertex(DT  * dt_, QObject* parent);
+
+protected:
+
+  void mousePressEvent(QGraphicsSceneMouseEvent *event);
+ 
+  bool eventFilter(QObject *obj, QEvent *event);
+
+  DT * dt;
+};
+
+
+template <typename T>
+RegularTriangulationRemoveVertex<T>::RegularTriangulationRemoveVertex(T * dt_,
+							  QObject* parent)
+  :  GraphicsViewInput(parent), dt(dt_)
+{}
+
+
+
+template <typename T>
+void 
+RegularTriangulationRemoveVertex<T>::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{  
+  if((event->modifiers()  & ::Qt::ShiftModifier)
+     && (! (event->modifiers() & ::Qt::ControlModifier))){
+    if(dt->number_of_vertices() == 0){
+      dt->clear();
+    }else {
+      typedef Kernel_traits<typename T::Bare_point>::Kernel K;
+      Converter<K> convert;
+      typename T::Vertex_handle selected_vertex = dt->nearest_power_vertex(convert(event->scenePos()));
+      dt->remove(selected_vertex);
+    }
+    emit (modelChanged());
+  }
+}
+
+
+
+template <typename T>
+bool 
+RegularTriangulationRemoveVertex<T>::eventFilter(QObject *obj, QEvent *event)
+{
+  if (event->type() == QEvent::GraphicsSceneMousePress) {
+    QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+    mousePressEvent(mouseEvent);
+    return false;
+  } else{
+    // standard event processing
+    return QObject::eventFilter(obj, event);
+  }
+} 
+
+
+} // namespace Qt
+} // namespace CGAL
+
+#endif // CGAL_QT_REGULAR_TRIANGULATION_REMOVE_VERTEX_H

GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp

@@ -0,0 +1,303 @@
+#include <fstream>
+
+// CGAL headers
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Regular_triangulation_euclidean_traits_2.h>
+#include <CGAL/Regular_triangulation_2.h>
+
+#include <CGAL/point_generators_2.h>
+
+// Qt headers
+#include <QtGui>
+#include <QString>
+#include <QActionGroup>
+#include <QFileDialog>
+#include <QInputDialog>
+
+// GraphicsView items and event filters (input classes)
+
+#include "RegularTriangulationRemoveVertex.h"
+#include <CGAL/Qt/GraphicsViewCircleInput.h>
+#include <CGAL/Qt/RegularTriangulationGraphicsItem.h>
+#include <CGAL/Qt/PowerdiagramGraphicsItem.h>
+  
+// for viewportsBbox
+#include <CGAL/Qt/utility.h>
+// the two base classes
+#include "ui_Regular_triangulation_2.h"
+#include <CGAL/Qt/DemosMainWindow.h>
+
+typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
+typedef K::Point_2 Point_2;
+typedef K::Point_2 Circle_2;
+typedef K::Iso_rectangle_2 Iso_rectangle_2;
+
+typedef double Weight;
+typedef CGAL::Regular_triangulation_euclidean_traits_2<K,Weight>  Gt;
+typedef CGAL::Regular_triangulation_2<Gt> Regular;
+
+class MainWindow :
+  public CGAL::Qt::DemosMainWindow,
+  public Ui::Regular_triangulation_2
+{
+  Q_OBJECT
+  
+private:  
+  Regular dt; 
+  QGraphicsScene scene;  
+
+  CGAL::Qt::RegularTriangulationGraphicsItem<Regular> * dgi;
+  CGAL::Qt::PowerdiagramGraphicsItem<Regular> * vgi;
+
+  CGAL::Qt::RegularTriangulationRemoveVertex<Regular> * trv;
+  CGAL::Qt::GraphicsViewCircleInput<K> * pi;
+public:
+  MainWindow();
+
+public slots:
+
+  void processInput(CGAL::Object o);
+
+  void on_actionShowRegular_toggled(bool checked);
+
+  void on_actionShowPowerdiagram_toggled(bool checked);
+
+  void on_actionInsertPoint_toggled(bool checked);
+  
+  void on_actionInsertRandomPoints_triggered();
+
+  void on_actionLoadPoints_triggered();
+
+  void on_actionSavePoints_triggered();
+
+  void on_actionClear_triggered();
+
+  void on_actionRecenter_triggered();
+
+
+signals:
+  void changed();
+};
+
+
+MainWindow::MainWindow()
+  : DemosMainWindow()
+{
+  setupUi(this);
+
+  // Add a GraphicItem for the Regular triangulation
+  dgi = new CGAL::Qt::RegularTriangulationGraphicsItem<Regular>(&dt);
+
+  QObject::connect(this, SIGNAL(changed()),
+		   dgi, SLOT(modelChanged()));
+
+  dgi->setVerticesPen(QPen(Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+  scene.addItem(dgi);
+
+  // Add a GraphicItem for the Powerdiagram diagram
+  vgi = new CGAL::Qt::PowerdiagramGraphicsItem<Regular>(&dt);
+
+  QObject::connect(this, SIGNAL(changed()),
+		   vgi, SLOT(modelChanged()));
+
+  vgi->setEdgesPen(QPen(Qt::blue, 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+  scene.addItem(vgi);
+  vgi->hide();
+
+  // Setup input handlers. They get events before the scene gets them
+  // and the input they generate is passed to the triangulation with 
+  // the signal/slot mechanism    
+  pi = new CGAL::Qt::GraphicsViewCircleInput<K>(this, &scene, 1); // emits center/radius
+                                                                           
+
+  QObject::connect(pi, SIGNAL(generate(CGAL::Object)),
+		   this, SLOT(processInput(CGAL::Object)));
+
+  trv = new CGAL::Qt::RegularTriangulationRemoveVertex<Regular>(&dt, this);
+  QObject::connect(trv, SIGNAL(modelChanged()),
+		   this, SIGNAL(changed()));
+
+  // 
+  // Manual handling of actions
+  //
+  QObject::connect(this->actionQuit, SIGNAL(triggered()), 
+		   this, SLOT(close()));
+
+  // We put mutually exclusive actions in an QActionGroup
+  QActionGroup* ag = new QActionGroup(this);
+  ag->addAction(this->actionInsertPoint);
+
+  // Check two actions 
+  this->actionInsertPoint->setChecked(true);
+  this->actionShowRegular->setChecked(true);
+
+  //
+  // Setup the scene and the view
+  //
+  scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+  scene.setSceneRect(-100, -100, 100, 100);
+  this->graphicsView->setScene(&scene);
+  this->graphicsView->setMouseTracking(true);
+
+  // Turn the vertical axis upside down
+  this->graphicsView->matrix().scale(1, -1);
+                                                      
+  // The navigation adds zooming and translation functionality to the
+  // QGraphicsView
+  this->addNavigation(this->graphicsView);
+
+  this->setupStatusBar();
+  this->setupOptionsMenu();
+  this->addAboutDemo(":/cgal/help/about_Regular_triangulation_2.html");
+  this->addAboutCGAL();
+}
+
+
+void
+MainWindow::processInput(CGAL::Object o)
+{
+  std::pair<Point_2, K::FT > center_sqr;
+  if(CGAL::assign(center_sqr, o)){
+    Regular::Point wp(center_sqr.first, center_sqr.second);
+    dt.insert(wp);
+  }
+
+  emit(changed());
+}
+
+
+/* 
+ *  Qt Automatic Connections
+ *  http://doc.trolltech.com/4.4/designer-using-a-component.html#automatic-connections
+ * 
+ *  setupUi(this) generates connections to the slots named
+ *  "on_<action_name>_<signal_name>"
+ */
+void
+MainWindow::on_actionInsertPoint_toggled(bool checked)
+{
+  if(checked){
+    scene.installEventFilter(pi);
+    scene.installEventFilter(trv);
+  } else {
+    scene.removeEventFilter(pi);
+    scene.removeEventFilter(trv);
+  }
+}
+
+
+
+void
+MainWindow::on_actionShowRegular_toggled(bool checked)
+{
+  dgi->setVisibleEdges(checked);
+}
+
+
+void
+MainWindow::on_actionShowPowerdiagram_toggled(bool checked)
+{
+  vgi->setVisible(checked);
+}
+
+
+void
+MainWindow::on_actionClear_triggered()
+{
+  dt.clear();
+  emit(changed());
+}
+
+
+void
+MainWindow::on_actionInsertRandomPoints_triggered()
+{
+  QRectF rect = CGAL::Qt::viewportsBbox(&scene);
+  CGAL::Qt::Converter<K> convert;
+  Iso_rectangle_2 isor = convert(rect);
+  CGAL::Random_points_in_iso_rectangle_2<Point_2> pg(isor.min(), isor.max());
+  const int number_of_points = 
+    QInputDialog::getInteger(this, 
+                             tr("Number of random points"),
+                             tr("Enter number of random points"), 100, 0);
+
+  // wait cursor
+  QApplication::setOverrideCursor(Qt::WaitCursor);
+  std::vector<Point_2> points;
+  points.reserve(number_of_points);
+  for(int i = 0; i < number_of_points; ++i){
+    points.push_back(*pg++);
+  }
+  dt.insert(points.begin(), points.end());
+  // default cursor
+  QApplication::setOverrideCursor(Qt::ArrowCursor);
+  emit(changed());
+}
+
+
+void
+MainWindow::on_actionLoadPoints_triggered()
+{
+  QString fileName = QFileDialog::getOpenFileName(this,
+						  tr("Open Points file"),
+						  ".");
+  if(! fileName.isEmpty()){
+    std::ifstream ifs(qPrintable(fileName));
+
+    K::Point_2 p;
+    std::vector<K::Point_2> points;
+    while(ifs >> p) {
+      points.push_back(p);
+    }
+    dt.insert(points.begin(), points.end());
+
+    actionRecenter->trigger();
+    emit(changed());
+  }
+}
+
+
+void
+MainWindow::on_actionSavePoints_triggered()
+{
+  QString fileName = QFileDialog::getSaveFileName(this,
+						  tr("Save points"),
+						  ".");
+  if(! fileName.isEmpty()){
+    std::ofstream ofs(qPrintable(fileName));
+    for(Regular::Finite_vertices_iterator 
+          vit = dt.finite_vertices_begin(),
+          end = dt.finite_vertices_end();
+        vit!= end; ++vit)
+    {
+      ofs << vit->point() << std::endl;
+    }
+  }
+}
+
+
+void
+MainWindow::on_actionRecenter_triggered()
+{
+  this->graphicsView->setSceneRect(dgi->boundingRect());
+  this->graphicsView->fitInView(dgi->boundingRect(), Qt::KeepAspectRatio);  
+}
+
+
+#include "Regular_triangulation_2.moc"
+
+int main(int argc, char **argv)
+{
+  QApplication app(argc, argv);
+
+  // Import resources from libCGALQt4.
+  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
+  Q_INIT_RESOURCE(File);
+  Q_INIT_RESOURCE(Triangulation_2);
+  Q_INIT_RESOURCE(Input);
+  Q_INIT_RESOURCE(CGAL);
+
+  MainWindow mainWindow;
+  mainWindow.show();
+  return app.exec();
+}

GraphicsView/demo/Triangulation_2/Regular_triangulation_2.ui

@@ -0,0 +1,247 @@
+<ui version="4.0" >
+ <author>GeometryFactory</author>
+ <class>Regular_triangulation_2</class>
+ <widget class="QMainWindow" name="Regular_triangulation_2" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>CGAL Regular Triangulation</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="../resources/CGAL.qrc" >
+    <normaloff>:/cgal/logos/cgal_icon</normaloff>:/cgal/logos/cgal_icon</iconset>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QGridLayout" >
+    <item row="0" column="0" >
+     <widget class="QGraphicsView" name="graphicsView" >
+      <property name="focusPolicy" >
+       <enum>Qt::StrongFocus</enum>
+      </property>
+      <property name="verticalScrollBarPolicy" >
+       <enum>Qt::ScrollBarAlwaysOn</enum>
+      </property>
+      <property name="horizontalScrollBarPolicy" >
+       <enum>Qt::ScrollBarAlwaysOn</enum>
+      </property>
+      <property name="transformationAnchor" >
+       <enum>QGraphicsView::NoAnchor</enum>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <widget class="QToolBar" name="fileToolBar" >
+   <property name="windowTitle" >
+    <string>File Tools</string>
+   </property>
+   <attribute name="toolBarArea" >
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionClear" />
+   <addaction name="actionLoadPoints" />
+   <addaction name="actionSavePoints" />
+  </widget>
+  <widget class="QToolBar" name="toolBar" >
+   <property name="windowTitle" >
+    <string>Visualization Tools</string>
+   </property>
+   <attribute name="toolBarArea" >
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionInsertPoint" />
+   <addaction name="actionShowRegular" />
+   <addaction name="actionShowPowerdiagram" />
+   <addaction name="actionRecenter" />
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>400</width>
+     <height>19</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <addaction name="separator" />
+    <addaction name="actionClear" />
+    <addaction name="actionLoadPoints" />
+    <addaction name="actionSavePoints" />
+    <addaction name="separator" />
+    <addaction name="actionQuit" />
+   </widget>
+   <widget class="QMenu" name="menuEdit" >
+    <property name="title" >
+     <string>&amp;Edit</string>
+    </property>
+    <addaction name="actionInsertRandomPoints" />
+   </widget>
+   <widget class="QMenu" name="menuTools" >
+    <property name="title" >
+     <string>&amp;Tools</string>
+    </property>
+    <addaction name="actionInsertPoint" />
+    <addaction name="actionShowRegular" />
+    <addaction name="actionShowPowerdiagram" />
+    <addaction name="separator" />
+    <addaction name="actionRecenter" />
+   </widget>
+   <addaction name="menuFile" />
+   <addaction name="menuEdit" />
+   <addaction name="menuTools" />
+  </widget>
+  <action name="actionAbout" >
+   <property name="text" >
+    <string>&amp;About</string>
+   </property>
+  </action>
+  <action name="actionAboutCGAL" >
+   <property name="text" >
+    <string>About &amp;CGAL</string>
+   </property>
+  </action>
+  <action name="actionQuit" >
+   <property name="text" >
+    <string>&amp;Quit</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="actionInsertRandomPoints" >
+   <property name="text" >
+    <string>&amp;Insert random points</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+I</string>
+   </property>
+  </action>
+  <action name="actionInsertPoint" >
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="checked" >
+    <bool>false</bool>
+   </property>
+   <property name="icon" >
+    <iconset resource="../icons/Input.qrc" >
+     <normaloff>:/cgal/Input/inputPoint.png</normaloff>:/cgal/Input/inputPoint.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Insert Point</string>
+   </property>
+   <property name="toolTip" >
+    <string>Insert Point</string>
+   </property>
+   <property name="statusTip" >
+    <string>Left: Insert vtx</string>
+   </property>
+  </action>
+  <action name="actionClear" >
+   <property name="icon" >
+    <iconset resource="../icons/File.qrc" >
+     <normaloff>:/cgal/fileToolbar/fileNew.png</normaloff>:/cgal/fileToolbar/fileNew.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Clear</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+C</string>
+   </property>
+  </action>
+  <action name="actionShowPowerdiagram" >
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="checked" >
+    <bool>false</bool>
+   </property>
+   <property name="icon" >
+    <iconset resource="../icons/Triangulation_2.qrc" >
+     <normaloff>:/cgal/Triangulation_2/Voronoi_diagram_2.png</normaloff>:/cgal/Triangulation_2/Voronoi_diagram_2.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Show &amp;Voronoi Diagram</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+V</string>
+   </property>
+  </action>
+  <action name="actionShowRegular" >
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="icon" >
+    <iconset resource="../icons/Triangulation_2.qrc" >
+     <normaloff>:/cgal/Triangulation_2/Delaunay_triangulation_2.png</normaloff>:/cgal/Triangulation_2/Delaunay_triangulation_2.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Show &amp;Regular Triangulation</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+D</string>
+   </property>
+  </action>
+  <action name="actionLoadPoints" >
+   <property name="icon" >
+    <iconset resource="../icons/File.qrc" >
+     <normaloff>:/cgal/fileToolbar/fileOpen.png</normaloff>:/cgal/fileToolbar/fileOpen.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Load Points...</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+L</string>
+   </property>
+  </action>
+  <action name="actionSavePoints" >
+   <property name="icon" >
+    <iconset resource="../icons/File.qrc" >
+     <normaloff>:/cgal/fileToolbar/fileSave.png</normaloff>:/cgal/fileToolbar/fileSave.png</iconset>
+   </property>
+   <property name="text" >
+    <string>&amp;Save Points...</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="actionRecenter" >
+   <property name="icon" >
+    <iconset resource="../icons/Input.qrc" >
+     <normaloff>:/cgal/Input/zoom-best-fit</normaloff>:/cgal/Input/zoom-best-fit</iconset>
+   </property>
+   <property name="text" >
+    <string>Re&amp;center the viewport</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+R</string>
+   </property>
+  </action>
+ </widget>
+ <resources>
+  <include location="Regular_triangulation_2.qrc" />
+  <include location="../icons/File.qrc" />
+  <include location="../resources/CGAL.qrc" />
+  <include location="../icons/Triangulation_2.qrc" />
+  <include location="../icons/Input.qrc" />
+ </resources>
+ <connections/>
+</ui>

GraphicsView/demo/Triangulation_2/about_Regular_triangulation_2.html

@@ -0,0 +1,11 @@
+<html>
+  <body>
+    <h2>Delaunay Triangulation</h2>
+    <p>Copyright &copy; 2008 GeometryFactory</p>
+    <p>This application illustrates the 2D Regular triangulation
+      of <a href="http://www.cgal.org/">CGAL</a>, and its dual Power
+      diagram.</p>
+    <p>See also <a href="http://www.cgal.org/Pkg/Triangulation2">the online
+        manual</a>.</p>
+  </body>
+</html>