diff --git a/src/meshlabplugins/edit_manipulators/edit_manipulators.cpp b/src/meshlabplugins/edit_manipulators/edit_manipulators.cpp index 324962da8..1b6246d37 100644 --- a/src/meshlabplugins/edit_manipulators/edit_manipulators.cpp +++ b/src/meshlabplugins/edit_manipulators/edit_manipulators.cpp @@ -1069,6 +1069,7 @@ void EditManipulatorsPlugin::Decorate(MeshModel &model, GLArea *gla, QPainter* / case EditManipulatorsPlugin::ManMove : HelpString1 = "
LEFT CLICK and DRAG to move"; break; case EditManipulatorsPlugin::ManRotate : HelpString1 = "
LEFT CLICK and DRAG to rotate"; break; case EditManipulatorsPlugin::ManScale : HelpString1 = "
LEFT CLICK and DRAG to scale"; break; + case EditManipulatorsPlugin::ManNone : break; } if((current_manip != EditManipulatorsPlugin::ManMove) || (current_manip_mode != EditManipulatorsPlugin::ModNone)) diff --git a/src/meshlabplugins/edit_measure/edit_measure.cpp b/src/meshlabplugins/edit_measure/edit_measure.cpp index 074fc2be0..13fc2a120 100644 --- a/src/meshlabplugins/edit_measure/edit_measure.cpp +++ b/src/meshlabplugins/edit_measure/edit_measure.cpp @@ -89,7 +89,7 @@ void EditMeasurePlugin::Decorate(MeshModel & m, GLArea * gla,QPainter* p) this->Log(GLLogStream::FILTER, "Distance %s: %f", newM.ID.toStdString().c_str(), measuredDistance); } - for (int mind = 0; mind").arg(measures[mind].ID).arg(measures[mind].length)); } @@ -129,7 +129,7 @@ void EditMeasurePlugin::keyReleaseEvent(QKeyEvent *e, MeshModel &mod, GLArea *gl { this->Log(GLLogStream::FILTER, "------- Distances -------"); this->Log(GLLogStream::FILTER, "ID: Dist [pointA][pointB]"); - for (int mind = 0; mindLog(GLLogStream::FILTER, "%s: %f [%f,%f,%f][%f,%f,%f]", measures[mind].ID.toStdString().c_str(), measures[mind].length, measures[mind].startP[0], measures[mind].startP[1], measures[mind].startP[2], measures[mind].endP[0], measures[mind].endP[1], measures[mind].endP[2]); @@ -154,7 +154,7 @@ void EditMeasurePlugin::keyReleaseEvent(QKeyEvent *e, MeshModel &mod, GLArea *gl openFileTS << mod.shortName().toStdString().c_str() << "\n\n"; openFileTS << "ID : Dist [pointA][pointB]" << "\n"; - for (int mind = 0; mind(); diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp index a10458181..08e422e53 100644 --- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp +++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp @@ -96,7 +96,6 @@ void EditMutualCorrsPlugin::Decorate(MeshModel &m, GLArea *gla, QPainter *p) // draw picked & reference points if(true) { - int pindex; Point3m currpoint; Point2m currim; QString buf; @@ -107,9 +106,9 @@ void EditMutualCorrsPlugin::Decorate(MeshModel &m, GLArea *gla, QPainter *p) glDisable(GL_LIGHTING); - for(pindex=0; pindexmd()->rm()->currentPlane->fullPathFileName << "\n"; // writing reference - for(pindex=0; pindexui->tableWidget->setSelectionMode(QAbstractItemView::SingleSelection); this->ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows); - int pindex =0; - for(pindex=0; pindex < this->mutualcorrsPlugin->usePoint.size(); pindex++) + for(size_t pindex=0; pindex < this->mutualcorrsPlugin->usePoint.size(); pindex++) { QTableWidgetItem* useIt = new QTableWidgetItem(); if(this->mutualcorrsPlugin->usePoint[pindex]) diff --git a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.cpp b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.cpp index 5496df21a..bd4c5573a 100644 --- a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.cpp +++ b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.cpp @@ -56,7 +56,7 @@ CREATE DATA SET Modify data,x, opts and info(?) *********************************************/ //TOGLIERE SHOT DAI PARAMETRI! -bool LevmarMethods::createDataSet(std::list* corr,vcg::Shot* s, LevmarData* data, double* x,double opts[LM_OPTS_SZ],double info[LM_INFO_SZ]) +bool LevmarMethods::createDataSet(std::list* corr,vcg::Shot* s, LevmarData* data, double* x,double opts[LM_OPTS_SZ],double /*info*/[LM_INFO_SZ]) { bool my_ret_val=false; @@ -221,7 +221,7 @@ void LevmarMethods::estimateExtr(double *p, double *x, int /*m*/, int n, void *d } //Estimate only the focal. -void LevmarMethods::estimateFocal(double *p, double *x, int m, int n, void *data) +void LevmarMethods::estimateFocal(double *p, double *x, int /*m*/, int n, void *data) { vcg::Point3f** ptr = ((LevmarData*) data)->points3d; vcg::Shot* levmarCam = ((LevmarData*) data)->levmarCam; @@ -236,4 +236,4 @@ void LevmarMethods::estimateFocal(double *p, double *x, int m, int n, void *data } -} \ No newline at end of file +} diff --git a/src/meshlabplugins/edit_mutualcorrs/parameters.cpp b/src/meshlabplugins/edit_mutualcorrs/parameters.cpp index 63d4f8593..4141730ca 100644 --- a/src/meshlabplugins/edit_mutualcorrs/parameters.cpp +++ b/src/meshlabplugins/edit_mutualcorrs/parameters.cpp @@ -261,9 +261,9 @@ void Parameters::scramble(double *_p, bool rescale) { fcenter[0] = 0; fcenter[1] = 0; fcenter = reference.ConvertCameraToWorldCoordinates(fcenter); - Point3f view = reference.Extrinsics.Tra(); - //view = center + (view - center)*ratio; - Point3f diff = view - (center + (view - center)*ratio); +// Point3f view = reference.Extrinsics.Tra(); +// view = center + (view - center)*ratio; +// Point3f diff = view - (center + (view - center)*ratio); _p[2] += ratio*dist; diff --git a/src/meshlabplugins/edit_mutualcorrs/solver.cpp b/src/meshlabplugins/edit_mutualcorrs/solver.cpp index 0c0ac0779..0eb8e5670 100644 --- a/src/meshlabplugins/edit_mutualcorrs/solver.cpp +++ b/src/meshlabplugins/edit_mutualcorrs/solver.cpp @@ -430,7 +430,7 @@ double Solver::calculateError2( Shot &shot){ std::vector correspList = align->correspList; double error = 0; - for( int i=0; i *correspList = align->correspList; std::list *corrs = new std::list(); - for (int i = 0; icorrespList.size(); i++){ + for (size_t i = 0; icorrespList.size(); i++){ //PointCorrespondence *corr = correspList->at(i); //PointOnLayer currentPointOnLayer1= corr->getPointAt(0); //PointOnLayer currentPointOnLayer2= corr->getPointAt(1);