diff --git a/src/meshlabplugins/edit_scan/edit_scan.cpp b/src/meshlabplugins/edit_scan/edit_scan.cpp index a7146011f..c10153be2 100644 --- a/src/meshlabplugins/edit_scan/edit_scan.cpp +++ b/src/meshlabplugins/edit_scan/edit_scan.cpp @@ -101,8 +101,8 @@ bool VirtualScan::StartEdit(MeshDocument& md, GLArea* gla){ widget = new Widget(gla->window()); connect(widget, SIGNAL(laser_parameter_updated()), this, SLOT(laser_parameter_updated())); - //connect(widget, SIGNAL(scan_requested()), - // this, SLOT(scan_requested())); + connect(widget, SIGNAL(scan_requested()), + this, SLOT(scan_requested())); connect(widget, SIGNAL(save_requested()), this, SLOT(save_requested())); @@ -213,6 +213,9 @@ void VirtualScan::Decorate(MeshModel& mm, GLArea* gla){ ScanLine::ScanLine(int N, Point2f& srt, Point2f& end ){ float delta = 1.0 / (N-1); // qDebug() << "Scanpoint list: "; + +#define RANGE +#ifdef LASER float alpha=0; for( int i=0; ikey() == Qt::Key_S ) isScanning = true; + + // D is used for range-like scans + if( e->key() == Qt::Key_D ) + scan_requested(); } //--- Dummy implementation of MeshEditInterfaceFactory, passes control to this MeshEditInterface @@ -80,9 +85,6 @@ public: virtual MeshEditInterface* getMeshEditInterface(QAction* ){ return this; } virtual QString getEditToolDescription(QAction *){ return this->Info(); } -private: - //--- Virtual scan functions - void scanPoints(); public slots: // called repeatedly by the timer void readytoscan(){ sampleReady = true; }