65 Commits

Author SHA1 Message Date
Paolo Cignoni
a68d41beba Corrected bug #30 Alignment issue
Unexpected side effect of the setRenderingData functions. The new
rendering framework is quite mysterious sometime…
2016-12-30 01:38:10 +01:00
Guido Ranzuglia
286761d6e8 - fixed problems with edit align widget rendering 2016-12-15 17:25:09 +01:00
Paolo Cignoni cignoni
adde39c9be Refactored edit align so that it never uses mesh id as indexes but only as keys. 2016-10-06 22:46:13 +00:00
Guido Ranzuglia granzuglia
d32dbd44b4 - removed stupid crash 2016-09-30 06:31:02 +00:00
Marco Callieri mcallieri
bc27d048c7 updated some error messages 2016-09-13 14:00:25 +00:00
Marco Callieri mcallieri
5b95bfae23 changed a bit the alignment dialog: when manual aligning, all options are greyed out until manual alignment is complete, and afterwards restrored 2016-09-13 13:16:42 +00:00
Marco Callieri mcallieri
313f65ca8d corrected a bug in manual align, the state of the layer was not properly updated 2016-09-13 10:29:28 +00:00
Marco Callieri mcallieri
abebf10dbf corrected a bug: when a layer to be glued had a transformation, it was ignored, resulting in a wrong rendering in the point-picking interface, and in an incorrect transfrmation later on. 2016-09-13 09:54:47 +00:00
Paolo Cignoni cignoni
4fa4f0eeff Small changes to make the edit align working again:
- removed assert disabling
- removed wrong assert
- corrected test in the aling (thanks gianpaolo)
2016-09-09 13:03:06 +00:00
Guido Ranzuglia granzuglia
e97bb36721 - restored edit_align plugin. WARNING!!!!! the alignment process seems not to work!!! HAS TO BE FIXED AS SOON AS POSSIBLE 2016-09-01 06:11:12 +00:00
Gianpaolo Palma gianpaolopalma
6037502524 Bug fixed due to a parenthesis mismatch 2016-07-21 09:19:14 +00:00
Guido Ranzuglia granzuglia
d311c3f2a6 - bug fixing
- integration
- so on...
2016-06-29 12:58:10 +00:00
Marco Callieri mcallieri
1a603024fb revised ICP defaults (to manage more "modern" datasets)
revised a bit the buttons placement and text in interface
added buttons to automatically set ICP defaults for METERS and MILLIMETERS
WARNING- edit:align filter does not compile yet due to rendering issues
2016-04-11 13:37:43 +00:00
Paolo Cignoni cignoni
1d722cc4ed Updated filter_autoalign to float/double independence 2014-08-26 09:33:25 +00:00
Guido Ranzuglia granzuglia
3e7fa9962e - removed compiling errors. Warnings are still there. 2014-07-29 15:15:38 +00:00
Paolo Cignoni cignoni
ba52676379 Refactored and improved the old code for finding rotation matrix that matches meshes 2014-05-23 15:07:00 +00:00
Guido Ranzuglia granzuglia
dfa659b096 - fixed crash caused by stupid call to histogram function when no matchable arcs were found (Fabio Ganovelli is responsible for the change) 2014-03-31 16:14:13 +00:00
Guido Ranzuglia granzuglia
6484164ee3 - font changed for mac/win compatibility reason 2014-03-28 09:45:16 +00:00
Guido Ranzuglia granzuglia
39f536a143 - font size inside the dialog buttons has been harmonized 2014-03-28 09:34:31 +00:00
Guido Ranzuglia granzuglia
f261464f14 - morphed QToolButtons (why?!?!?!?!?!?!?!?) into QPushButtons in AlignDialog
- a minimum size has been given to all the buttons
2014-03-28 09:15:20 +00:00
Guido Ranzuglia granzuglia
265d9b87a9 - added missing include 2014-03-05 09:45:57 +00:00
Paolo Cignoni cignoni
46b2d9f65f Added a missing class prototype 2014-02-28 10:37:05 +00:00
Paolo Cignoni cignoni
b13473baec Corrected bug in the creation of the AlignPairDialog (missing parent widget) 2014-02-21 12:58:57 +00:00
Paolo Cignoni cignoni
4bf8bc9884 Removed a number of annoying and useless warning. 2014-02-13 17:30:41 +00:00
Paolo Cignoni cignoni
815535f13f removed useless inclusion of <QtGui> that was causing warnings for GLEW conflicts
(and various other cleaning of qt includes)
2014-02-12 15:29:23 +00:00
Matteo Dellepiane matteodelle
3ebe37d1a2 dellepiane for ganovelli: fixed small issue for non rigid alignment (un-check was not seen) BUT there are still issue if there's a starting tr with scale! 2014-01-14 18:46:52 +00:00
Paolo Cignoni cignoni
63c5e4cc41 updated Added correct managment between logical and device window coords for mouse input and trackball.
Now with qt5.2 retina display correctly works
2013-12-16 11:35:30 +00:00
Guido Ranzuglia granzuglia
93b65ec6df - updated the plugins code using the new per mesh rendering system.
This code will be changed again as soon as possible in order to prevent any possible concurrent access to the mesh rendering map.
2013-10-09 12:18:31 +00:00
Paolo Cignoni cignoni
5181420e9e Changed default value for arc area threshed from 0.4 to 0.3 as suggested... 2013-04-03 07:28:38 +00:00
Paolo Cignoni cignoni
5579f55e40 Corrected stupid bug introduced during the recent matrix44 name changes. Global alignment now works again 2013-03-27 10:27:39 +00:00
Paolo Cignoni cignoni
06ab63798f cleared harmless gcc warnings 2013-03-26 22:22:42 +00:00
Guido Ranzuglia granzuglia
2446d7782f - huge commit! MeshLab is now qt 5.0 compatible. Compiling process has not been yet tested on MacOSx. 2013-03-24 19:36:54 +00:00
Marco Callieri mcallieri
55d2baa536 added a glewInit to initialize extensions used by the mesh-2-mesh aligner GL window 2013-03-20 14:10:09 +00:00
Paolo Cignoni cignoni
7bcab92a14 updated to reflect the new changes to the matrix classes of the vcg lib 2013-03-19 17:01:41 +00:00
Marco Callieri mcallieri
5e47cd63d7 added #include <cstdarg> to have va_start and va_end defined 2013-03-14 17:02:01 +00:00
Marco Callieri mcallieri
aa78d64def added #include <ctime> to have CLOCKS_PER_SEC defined 2013-03-14 16:13:04 +00:00
Paolo Cignoni cignoni
b2a580d483 After the completion of the arc creation process (and before global alignment)
it also prints some stats on the distribution of the error of the arcs
2013-03-01 14:26:41 +00:00
Paolo Cignoni cignoni
3ce684134b Added another parameter to the alignment system that allows to recompute autmatically a percentage of the arcs.
Improved names on the align tool buttons. Glue all now glues only the visible meshes.
2013-03-01 14:23:26 +00:00
Paolo Cignoni cignoni
cd6c9db487 HEAVY RESTRUCTURING of the alignment tool;
Many major changes:
- New parameter for controlling the arc creation process
- Search of bad alignment
- Improved ICP (borderflag bug removed)
- Improved Process (now it only compute new arcs and it does not recompute all the arcs every time) Global Alignment is triggered every time.
2013-02-28 11:57:07 +00:00
Paolo Cignoni cignoni
a6ef1422dd refactored getMeshEditInterface in order to shorten it and avoid a warning 2013-02-26 22:10:07 +00:00
Paolo Cignoni cignoni
e01e8aa4b5 changed the return type of point matching scale from bool to void (it could not never return false) 2013-02-26 22:08:51 +00:00
Paolo Cignoni cignoni
541891c1ad Changed the base class in the occupancy grid for counting the mesh passing in a cell. Now it uses a bitset instead of a vector 2013-02-26 22:07:34 +00:00
Fabio Ganovelli ganovelli
c4600248ee Update use og vcg::tri::Allocate< >::Get*Attribute
to revision 4811 of vcglib (below):

-----------------------------------------------------------------------
vcg::tri::Allocate<MESH>::Get*Attribute(m,name);
 has CHANGED!

Before it was returning a valid handle to the attribute
IF it existed, otherwise the handle was invalid.
 
Now it always returns a valid handle to the attribute,
by creating the attribute name if it did not exist or returning
the handle to it if it was already there.

ALl the code using Get*Attribute  has been changed accordingly.
2013-01-30 17:23:22 +00:00
Guido Ranzuglia granzuglia
cc50089b50 - changed function names according to the new vcglib syntax
(WARNING! edit_align still doesn't compile)
2012-10-22 11:57:25 +00:00
Guido Ranzuglia granzuglia
e5fb5e2792 - changed function names according to the new vcglib syntax
(WARNING! edit_align still doesn't compile)
2012-10-22 10:37:48 +00:00
Guido Ranzuglia granzuglia
d00a28d3b5 - changed function names according to the new vcglib syntax
(WARNING! edit_align still doesn't compile)
2012-10-22 10:32:47 +00:00
Guido Ranzuglia granzuglia
9541dfd73c - changed the fake colors signal and slot system 2012-07-12 13:03:58 +00:00
Guido Ranzuglia granzuglia
d037bd8b0f avoided "close alignDialog when ICPParamDialog is still open window" problem on Windows system 2012-07-12 09:21:28 +00:00
Guido Ranzuglia granzuglia
c57d1824fc avoided "icp params dialog in background" problem 2012-07-12 07:37:23 +00:00
Guido Ranzuglia granzuglia
3907588c47 avoided "icp params dialog in background" problem 2012-07-12 07:29:36 +00:00