Skip to content

Commit

Permalink
Small updates to the documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
ahojnnes committed May 13, 2016
1 parent ea8af0a commit 94eb69f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Getting Started
http://people.inf.ethz.ch/jschoenb/colmap/ or build the library manually as
described in the documentation.
2. Download one of the provided datasets at
http://people.inf.ethz.ch/jschoenb/colmap/datasets/.
http://people.inf.ethz.ch/jschoenb/colmap/datasets/ or use your own images.
3. Watch the short introductory video at
https://www.youtube.com/watch?v=P-EC0DzeVEU or read the tutorial
in the documentation for more details.
Expand Down
1 change: 0 additions & 1 deletion doc/_build/html
Submodule html deleted from 355e6a
2 changes: 2 additions & 0 deletions doc/gui.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. _gui:

Graphical User Interface
========================

Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Getting Started
http://people.inf.ethz.ch/jschoenb/colmap/ or build the library manually
(see :ref:`Installation <installation>`).
2. Download one of the provided datasets at
http://people.inf.ethz.ch/jschoenb/colmap/datasets/.
http://people.inf.ethz.ch/jschoenb/colmap/datasets/ or use your own images.
3. Watch the short introductory video at
`YouTube <https://www.youtube.com/watch?v=P-EC0DzeVEU>`_ or read the
:ref:`Tutorial <tutorial>` for more details.
Expand Down
20 changes: 11 additions & 9 deletions doc/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ matching modes, that are intended for different input scenarios:
matched against every other image, while the block size determines how many
images are loaded from disk into memory at the same time. The preemptive
option filters image pairs that are not likely to match [wu13]_.
Typically though, vocabulary tree matching yields better results than
Typically though, vocabulary tree matching yields much better results than
preemptive matching [schoenberger15]_.

- **Sequential Matching**: This mode is useful if the images are acquired in
Expand Down Expand Up @@ -284,13 +284,14 @@ incremental reconstruction process by choosing ``Reconstruction > Start``.
COLMAP first loads all extracted data from the database into memory and seeds
the reconstruction from an initial image pair. Then, the scene is incrementally
extended by registering new images and triangulating new points. The results are
visualized in "real-time" during this reconstruction process. COLMAP attempts to
reconstruct multiple models if not all images are registered into the same
model. The different models can be selected from the drop-down menu in the
toolbar. If all your images use the `SIMPLE_RADIAL` camera model (default)
without shared intrinsics, you can use PBA [wu11]_ for fast bundle adjustment,
which can be activated in the reconstruction options under the bundle adjustment
section (`use_pba=true`).
visualized in "real-time" during this reconstruction process. Refer to the
:ref:`Graphical User Interface <gui>` section for more details about the
available controls. COLMAP attempts to reconstruct multiple models if not all
images are registered into the same model. The different models can be selected
from the drop-down menu in the toolbar. If all your images use the
`SIMPLE_RADIAL` camera model (default) without shared intrinsics, you can use
PBA [wu11]_ for fast bundle adjustment, which can be activated in the
reconstruction options under the bundle adjustment section (`use_pba=true`).

Ideally, the reconstruction works fine and all images are registered. If this is
not the case, it is recommended to:
Expand Down Expand Up @@ -391,7 +392,8 @@ arguments or you can provide a `.ini` project configuration file containing the
options as the ``./bin --project_path path/to/project.ini`` argument. To start
the GUI application, please execute ``./src/exe/colmap`` or directly specify a
project configuration as ``./src/exe/colmap --project_path path/to/project.ini``
to avoid tedious selection in the GUI.
to avoid tedious selection in the GUI. The :ref:`Graphical User Interface <gui>`
section provides more details about the available controls.


.. rubric:: Footnotes
Expand Down
2 changes: 1 addition & 1 deletion src/exe/vocab_tree_builder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ int main(int argc, char** argv) {

std::cout << "Building index for visual words..." << std::endl;
visual_index.Build(build_options, descriptors);
std::cout << " => Quantized descriptor space using "
std::cout << " => Quantized descriptor space using "
<< visual_index.NumVisualWords() << " visual words" << std::endl;

std::cout << "Saving index to file..." << std::endl;
Expand Down

0 comments on commit 94eb69f

Please sign in to comment.