Deleting old tutorial files and put them in folders
authorAna Huaman <no@email>
Tue, 21 Jun 2011 03:30:18 +0000 (03:30 +0000)
committerAna Huaman <no@email>
Tue, 21 Jun 2011 03:30:18 +0000 (03:30 +0000)
74 files changed:
doc/tutorials/CxCore/Matrix/Drawing_1/Drawing_1.rst [moved from doc/tutorials/Drawing_1.rst with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_1/images/Drawing_1_Tutorial_Result_0.png [moved from doc/tutorials/images/Drawing_1_Tutorial_Result_0.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_1/images/Drawing_1_Tutorial_Result_0a.png [moved from doc/tutorials/images/Drawing_1_Tutorial_Result_0a.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_1/images/Drawing_1_Tutorial_Result_0b.png [moved from doc/tutorials/images/Drawing_1_Tutorial_Result_0b.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/Drawing_2.rst [moved from doc/tutorials/Drawing_2.rst with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_0.png [moved from doc/tutorials/images/Drawing_2_Tutorial_Result_0.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_1.png [moved from doc/tutorials/images/Drawing_2_Tutorial_Result_1.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_2.png [moved from doc/tutorials/images/Drawing_2_Tutorial_Result_2.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_3.png [moved from doc/tutorials/images/Drawing_2_Tutorial_Result_3.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_4.png [moved from doc/tutorials/images/Drawing_2_Tutorial_Result_4.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_5.png [moved from doc/tutorials/images/Drawing_2_Tutorial_Result_5.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_6.png [moved from doc/tutorials/images/Drawing_2_Tutorial_Result_6.png with 100% similarity]
doc/tutorials/CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_7.png [moved from doc/tutorials/images/Drawing_2_Tutorial_Result_7.png with 100% similarity]
doc/tutorials/Display_Image.rst [deleted file]
doc/tutorials/HighGUI/Adding_Trackbars/Adding_Trackbars.rst [moved from doc/tutorials/Adding_Trackbars.rst with 100% similarity]
doc/tutorials/HighGUI/Adding_Trackbars/images/Adding_Trackbars_Tutorial_Cover.png [moved from doc/tutorials/images/Adding_Trackbars_Tutorial_Cover.png with 100% similarity]
doc/tutorials/HighGUI/Adding_Trackbars/images/Adding_Trackbars_Tutorial_Result_0.png [moved from doc/tutorials/images/Adding_Trackbars_Tutorial_Result_0.png with 100% similarity]
doc/tutorials/HighGUI/Adding_Trackbars/images/Adding_Trackbars_Tutorial_Result_1.png [moved from doc/tutorials/images/Adding_Trackbars_Tutorial_Result_1.png with 100% similarity]
doc/tutorials/HighGUI/Adding_Trackbars/images/Adding_Trackbars_Tutorial_Result_1a.png [moved from doc/tutorials/images/Adding_Trackbars_Tutorial_Result_1a.png with 100% similarity]
doc/tutorials/HighGUI/Adding_Trackbars/images/Adding_Trackbars_Tutorial_Result_1b.png [moved from doc/tutorials/images/Adding_Trackbars_Tutorial_Result_1b.png with 100% similarity]
doc/tutorials/HighGUI/Adding_Trackbars/images/Adding_Trackbars_Tutorial_Trackbar.png [moved from doc/tutorials/images/Adding_Trackbars_Tutorial_Trackbar.png with 100% similarity]
doc/tutorials/ImgProc/Adding_Images/Adding_Images.rst [moved from doc/tutorials/Adding_Images.rst with 100% similarity]
doc/tutorials/ImgProc/Adding_Images/images/Adding_Images_Tutorial_Result_0.png [moved from doc/tutorials/images/Adding_Images_Tutorial_Result_0.png with 100% similarity]
doc/tutorials/ImgProc/Basic_Linear_Transforms/Basic_Linear_Transform.rst [moved from doc/tutorials/Basic_Linear_Transform.rst with 100% similarity]
doc/tutorials/ImgProc/Basic_Linear_Transforms/images/Basic_Linear_Transform_Tutorial_Result_0.png [moved from doc/tutorials/images/Basic_Linear_Transform_Tutorial_Result_0.png with 100% similarity]
doc/tutorials/ImgProc/Basic_Linear_Transforms/images/Basic_Linear_Transform_a.png [moved from doc/tutorials/images/Basic_Linear_Transform_a.png with 100% similarity]
doc/tutorials/ImgProc/Basic_Linear_Transforms/images/Basic_Linear_Transform_b.png [moved from doc/tutorials/images/Basic_Linear_Transform_b.png with 100% similarity]
doc/tutorials/ImgProc/FloodFill/FloodFill.rst [new file with mode: 0644]
doc/tutorials/ImgProc/Morphology_1/Morphology_1.rst [moved from doc/tutorials/Morphology_1.rst with 100% similarity]
doc/tutorials/ImgProc/Morphology_1/images/Morphology_1_Tutorial_Cover.png [moved from doc/tutorials/images/Morphology_1_Tutorial_Cover.png with 100% similarity]
doc/tutorials/ImgProc/Morphology_1/images/Morphology_1_Tutorial_Dilation_Result.png [moved from doc/tutorials/images/Morphology_1_Tutorial_Dilation_Result.png with 100% similarity]
doc/tutorials/ImgProc/Morphology_1/images/Morphology_1_Tutorial_Erosion_Result.png [moved from doc/tutorials/images/Morphology_1_Tutorial_Erosion_Result.png with 100% similarity]
doc/tutorials/ImgProc/Morphology_1/images/Morphology_1_Tutorial_Original_Image.png [moved from doc/tutorials/images/Morphology_1_Tutorial_Original_Image.png with 100% similarity]
doc/tutorials/ImgProc/Morphology_1/images/Morphology_1_Tutorial_Theory_Dilation.png [moved from doc/tutorials/images/Morphology_1_Tutorial_Theory_Dilation.png with 100% similarity]
doc/tutorials/ImgProc/Morphology_1/images/Morphology_1_Tutorial_Theory_Erosion.png [moved from doc/tutorials/images/Morphology_1_Tutorial_Theory_Erosion.png with 100% similarity]
doc/tutorials/ImgProc/Morphology_1/images/Morphology_1_Tutorial_Theory_Original_Image.png [moved from doc/tutorials/images/Morphology_1_Tutorial_Theory_Original_Image.png with 100% similarity]
doc/tutorials/ImgProc/Morphology_2/Morphology_2.rst [new file with mode: 0644]
doc/tutorials/ImgProc/Smoothing/Smoothing.rst [moved from doc/tutorials/Smoothing.rst with 100% similarity]
doc/tutorials/ImgProc/Smoothing/images/Smoothing_Tutorial_Cover.png [moved from doc/tutorials/images/Smoothing_Tutorial_Cover.png with 100% similarity]
doc/tutorials/ImgProc/Smoothing/images/Smoothing_Tutorial_Result_Median_Filter.png [moved from doc/tutorials/images/Smoothing_Tutorial_Result_Median_Filter.png with 100% similarity]
doc/tutorials/ImgProc/Smoothing/images/Smoothing_Tutorial_theory_gaussian_0.jpg [moved from doc/tutorials/images/Smoothing_Tutorial_theory_gaussian_0.jpg with 100% similarity]
doc/tutorials/Linux_Eclipse_Usage.rst [deleted file]
doc/tutorials/Linux_GCC_Usage.rst [deleted file]
doc/tutorials/Linux_Installation.rst [deleted file]
doc/tutorials/Load_Save_Image.rst [deleted file]
doc/tutorials/Windows_Installation.rst [deleted file]
doc/tutorials/images/Display_Image_Tutorial_Result.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-0.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-1.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-10.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-11.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-12.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-13.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-14.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-15.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-2.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-3.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-4.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-5.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-6.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-7.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-8.png [deleted file]
doc/tutorials/images/Eclipse_Tutorial_Screenshot-9.png [deleted file]
doc/tutorials/images/GCC_CMake_Example_Tutorial.png [deleted file]
doc/tutorials/images/Load_Save_Image_Result_1.png [deleted file]
doc/tutorials/images/Load_Save_Image_Result_2.png [deleted file]
doc/tutorials/images/Load_Save_Image_Result_a.png [deleted file]
doc/tutorials/images/Load_Save_Image_Result_b.png [deleted file]
doc/tutorials/images/eclipse_cpp_logo.jpeg [deleted file]
doc/tutorials/images/gccegg-65-2.png [deleted file]
doc/tutorials/images/gccegg-65.png [deleted file]
doc/tutorials/images/ubuntu_logo.jpeg [deleted file]
doc/tutorials/images/windows_logo.jpg [deleted file]
doc/tutorials/tutorials.rst

diff --git a/doc/tutorials/Display_Image.rst b/doc/tutorials/Display_Image.rst
deleted file mode 100644 (file)
index 72fe5c1..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-.. _Display_Image:
-
-Display an Image
-*****************
-
-Goal
-=====
-
-In this tutorial you will learn how to:
-
-* Load an image using :imread:`imread <>`
-* Create a named window (using :named_window:`namedWindow <>`)
-* Display an image in an OpenCV window (using :imshow:`imshow <>`)
-
-Code
-=====
-
-Here it is:
-
-.. code-block:: cpp
-
-   #include <cv.h>
-   #include <highgui.h>
-
-   using namespace cv;
-
-   int main( int argc, char** argv )
-   {
-    Mat image;
-    image = imread( argv[1], 1 );
-
-    if( argc != 2 || !image.data )
-      { 
-        printf( "No image data \n" );
-        return -1; 
-      }
-
-    namedWindow( "Display Image", CV_WINDOW_AUTOSIZE );
-    imshow( "Display Image", image );
-
-    waitKey(0);
-
-    return 0;
-   }
-
-
-Explanation
-============
-
-#. .. code-block:: cpp
-
-      #include <cv.h>
-      #include <highgui.h>
-   
-      using namespace cv;
-
-   These are OpenCV headers:
-
-   * *cv.h* : Main OpenCV functions
-   * *highgui.h* : Graphical User Interface (GUI) functions
-
-   Now, let's analyze the *main* function:
-
-#. .. code-block:: cpp 
-
-      Mat image;
-   
-   We create a Mat object to store the data of the image to load.
-
-#. .. code-block:: cpp
-    
-      image = imread( argv[1], 1 );
-
-   Here, we called the function :imread:`imread <>` which basically loads the image specified by the first argument (in this case *argv[1]*). The second argument is by default.
-
-#. After checking that the image data was loaded correctly, we want to display our image, so we create a window:
-
-   .. code-block:: cpp
-
-      namedWindow( "Display Image", CV_WINDOW_AUTOSIZE );
-
-
-   :named_window:`namedWindow <>` receives as arguments the window name ("Display Image") and an additional argument that defines windows properties. In this case **CV_WINDOW_AUTOSIZE** indicates that the window will adopt the size of the image to be displayed.
-
-#. Finally, it is time to show the image, for this we use :imshow:`imshow <>` 
-
-   .. code-block:: cpp
-  
-      imshow( "Display Image", image )
-
-#. Finally, we want our window to be displayed until the user presses a key (otherwise the program would end far too quickly):
-
-   .. code-block:: cpp
-      waitKey(0);
-
-   We use the :wait_key:`waitKey <>` function, which allow us to wait for a keystroke during a number of milliseconds (determined by the argument). If the argument is zero, then it will wait indefinitely.
-
-Result
-=======
-
-* Compile your code and then run the executable giving a image path as argument:
-
-  .. code-block:: bash
-     ./DisplayImage HappyFish.jpg
-
-* You should get a nice window as the one shown below:
-
-  .. image:: images/Display_Image_Tutorial_Result.png
-     :alt: Display Image Tutorial - Final Result
-     :align: center 
diff --git a/doc/tutorials/ImgProc/FloodFill/FloodFill.rst b/doc/tutorials/ImgProc/FloodFill/FloodFill.rst
new file mode 100644 (file)
index 0000000..6ffff43
--- /dev/null
@@ -0,0 +1,38 @@
+.. _FloodFill:
+
+How to fill an image
+**********************
+
+Goal
+=====
+
+In this tutorial you will learn how to:
+
+* Use the :flood_fill:`FloodFill <>` OpenCV function
+
+Cool Theory
+============
+
+.. note::
+   The explanation below belongs to the book **Learning OpenCV** by Bradski and Kaehler.
+
+
+Code
+======
+
+This tutorial code's is shown lines below. You can also download it from `here <https://code.ros.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Image_Processing/Morphology_1.cpp>`_
+
+.. code-block:: cpp 
+
+
+
+Explanation
+=============
+
+
+
+
+Results
+========
+
+
diff --git a/doc/tutorials/ImgProc/Morphology_2/Morphology_2.rst b/doc/tutorials/ImgProc/Morphology_2/Morphology_2.rst
new file mode 100644 (file)
index 0000000..cd333f2
--- /dev/null
@@ -0,0 +1,44 @@
+.. _Morphology_2::
+
+Morphology 2
+**************
+
+Goal
+=====
+
+In this tutorial you will learn how to:
+
+* Use the OpenCV function :morphology_ex:`morphologyEx <>` to operate an image and convert it using:
+  
+  * Opening 
+  * Closing
+  * Morphological Gradient
+  * Top Hat
+  * Black Hat
+
+Cool Theory
+============
+
+.. note::
+   The explanation below belongs to the book **Learning OpenCV** by Bradski and Kaehler.
+
+
+
+Code
+======
+
+This tutorial code's is shown lines below. You can also download it from `here <https://code.ros.org/svn/opencv/trunk/opencv/samples/cpp/tutorial_code/Image_Processing/Morphology_2.cpp>`_
+
+.. code-block:: cpp 
+
+
+
+Explanation
+=============
+
+
+
+Results
+========
+
+
diff --git a/doc/tutorials/Linux_Eclipse_Usage.rst b/doc/tutorials/Linux_Eclipse_Usage.rst
deleted file mode 100644 (file)
index 97df609..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-.. _Linux_Eclipse_Usage:
-
-Using OpenCV with Eclipse (plugin CDT)
-****************************************
-
-.. note::
-   For me at least, this works, is simple and quick. Suggestions are welcome
-
-Prerequisites
-===============
-
-#. Having installed `Eclipse <http://www.eclipse.org/>`_ in your workstation (only the CDT plugin for C/C++ is needed). You can follow the following steps:
-
-   * Go to the Eclipse site  
-
-   * Download `Eclipse IDE for C/C++ Developers <http://www.eclipse.org/downloads/packages/eclipse-ide-cc-developers/heliossr2>`_ . Choose the link according to your workstation.
-
-#. Having installed OpenCV. If not yet, go :ref:`here <Linux_Installation>`
-
-Making a project
-=================
-
-#. Start Eclipse. Just run the executable that comes in the folder. 
-
-#. Go to **File -> New -> C/C++ Project**
-
-   .. image:: images/Eclipse_Tutorial_Screenshot-0.png
-      :height: 400px 
-      :alt: Eclipse Tutorial Screenshot 0
-      :align: center
-
-#. Choose a name for your project (i.e. DisplayImage). An **Empty Project** should be okay for this example. 
-
-   .. image:: images/Eclipse_Tutorial_Screenshot-1.png
-      :height: 400px 
-      :alt: Eclipse Tutorial Screenshot 1
-      :align: center
-
-#. Leave everything else by default. Press **Finish**. 
-
-   .. image:: images/Eclipse_Tutorial_Screenshot-2.png
-      :height: 400px 
-      :alt: Eclipse Tutorial Screenshot 2
-      :align: center
-
-#. Your project (in this case DisplayImage) should appear in the **Project Navigator** (usually at the left side of your window).
-
-   .. image:: images/Eclipse_Tutorial_Screenshot-3.png
-      :height: 400px 
-      :alt: Eclipse Tutorial Screenshot 3
-      :align: center
-
-
-#. Now, let's add a source file using OpenCV:
-
-   * Right click on **DisplayImage** (in the Navigator). **New -> Folder** . 
-
-     .. image:: images/Eclipse_Tutorial_Screenshot-4.png
-        :height: 400px 
-        :alt: Eclipse Tutorial Screenshot 4
-        :align: center
-
-   * Name your folder **src** and then hit **Finish**
-
-     .. image:: images/Eclipse_Tutorial_Screenshot-5.png
-        :height: 400px 
-        :alt: Eclipse Tutorial Screenshot 5
-        :align: center
-
-   * Right click on your newly created **src** folder. Choose **New source file**:
-
-     .. image:: images/Eclipse_Tutorial_Screenshot-6.png
-        :height: 400px 
-        :alt: Eclipse Tutorial Screenshot 6
-        :align: center
-
-   * Call it **DisplayImage.cpp**. Hit **Finish**
-
-     .. image:: images/Eclipse_Tutorial_Screenshot-7.png
-        :height: 400px 
-        :alt: Eclipse Tutorial Screenshot 7
-        :align: center
-
-#. So, now you have a project with a empty .cpp file. Let's fill it with some sample code (in other words, copy and paste the snippet below):
-
-   .. code-block:: cpp
-
-      #include <cv.h>
-      #include <highgui.h>
-
-      using namespace cv;
-
-      int main( int argc, char** argv )
-      {
-        Mat image;
-        image = imread( argv[1], 1 );
-
-        if( argc != 2 || !image.data )
-          { 
-            printf( "No image data \n" );
-            return -1; 
-          }
-
-        namedWindow( "Display Image", CV_WINDOW_AUTOSIZE );
-        imshow( "Display Image", image );
-
-        waitKey(0);
-
-        return 0;
-      }
-
-#. We are only missing one final step: To tell OpenCV where the OpenCV headers and libraries are. For this, do the following:
-
-   * Go to  **Project-->Properties**
-
-     .. image:: images/Eclipse_Tutorial_Screenshot-8.png
-        :height: 400px 
-        :alt: Eclipse Tutorial Screenshot 8
-        :align: center
-
-    * In **C/C++ Build**, click on **Settings**. At the right, choose the **Tool Settings** Tab. Here we will enter the headers and libraries info:
-
-      a. In **GCC C++ Compiler**, go to **Includes**. In **Include paths(-l)** you should include the path of the folder where opencv was installed. In our example, this is: 
-         ::
-
-         /usr/local/include/opencv
-
-         .. image:: images/Eclipse_Tutorial_Screenshot-9.png
-            :height: 400px 
-            :alt: Eclipse Tutorial Screenshot 9
-            :align: center
-
-         .. note::
-            If you do not know where your opencv files are, open the **Terminal** and type: 
-
-            .. code-block:: bash
-            
-               pkg-config --cflags opencv
-
-            For instance, that command gave me this output:
-
-            .. code-block:: bash
-
-               -I/usr/local/include/opencv -I/usr/local/include 
-
-        
-      b. Now go to **GCC C++ Linker**,there you have to fill two spaces:
-
-          * In **Library search path (-L)** you have to write the path to where the opencv libraries reside, in my case the path is:
-            ::
-          
-            /usr/local/lib
-
-          * In **Libraries(-l)** add the OpenCV libraries that you may need. Usually just the 3 first on the list below are enough (for simple applications) . In my case, I am putting all of them since I plan to use the whole bunch:
-
-
-            * opencv_core      
-            * opencv_imgproc     
-            * opencv_highgui
-            * opencv_ml       
-            * opencv_video      
-            * opencv_features2d
-            * opencv_calib3d   
-            * opencv_objdetect   
-            * opencv_contrib
-            * opencv_legacy    
-            * opencv_flann
-          
-          .. image:: images/Eclipse_Tutorial_Screenshot-10.png
-             :height: 400px 
-             :alt: Eclipse Tutorial Screenshot 10
-             :align: center 
-
-          .. note::
-
-             If you don't know where your libraries are (or you are just psychotic and want to make sure the path is fine), type in **Terminal**:
-
-             .. code-block:: bash
-            
-                pkg-config --libs opencv
-
-             My output (in case you want to check) was:
-
-             .. code-block:: bash
-
-                -L/usr/local/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann  
-
-          Now you are done. Click **OK**
-
-    * Your project should be ready to be built. For this, go to **Project->Build all**   
-      .. image:: images/Eclipse_Tutorial_Screenshot-11.png
-         :height: 400px 
-         :alt: Eclipse Tutorial Screenshot 11
-         :align: center 
-
-      In the Console you should get something like 
-
-      .. image:: images/Eclipse_Tutorial_Screenshot-12.png
-         :height: 200px 
-         :alt: Eclipse Tutorial Screenshot 12
-         :align: center 
-
-      If you check in your folder, there should be an executable there.
-
-Running the executable
-========================
-
-So, now we have an executable ready to run. If we were to use the Terminal, we would probably do something like:
-
-.. code-block:: bash
-
-   cd <DisplayImage_directory>
-   cd src
-   ./DisplayImage ../images/HappyLittleFish.jpg
-  
-Assuming that the image to use as the argument would be located in <DisplayImage_directory>/images/HappyLittleFish.jpg. We can still do this, but let's do it from Eclipse:
-
-
-#. Go to **Run->Run Configurations** 
-
-   .. image:: images/Eclipse_Tutorial_Screenshot-13.png
-      :height: 300px 
-      :alt: Eclipse Tutorial Screenshot 13
-      :align: center 
-
-#. Under C/C++ Application you will see the name of your executable + Debug (if not, click over C/C++ Application a couple of times). Select the name (in this case **DisplayImage Debug**). 
-
-#. Now, in the right side of the window, choose the **Arguments** Tab. Write the path of the image file we want to open (path relative to the workspace/DisplayImage folder). Let's use **HappyLittleFish.jpg**:
-
-   .. image:: images/Eclipse_Tutorial_Screenshot-14.png
-      :height: 300px 
-      :alt: Eclipse Tutorial Screenshot 14
-      :align: center 
-
-#. Click on the **Apply** button and then in Run. An OpenCV window should pop up with the fish image (or whatever you used).
-
-   .. image:: images/Eclipse_Tutorial_Screenshot-15.png
-      :alt: Eclipse Tutorial Screenshot 15
-      :align: center 
-
-
-#. Congratulations! You are ready to have fun with OpenCV using Eclipse.
diff --git a/doc/tutorials/Linux_GCC_Usage.rst b/doc/tutorials/Linux_GCC_Usage.rst
deleted file mode 100644 (file)
index 7b9d5ed..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-.. _Linux_GCC_Usage:
-
-Using OpenCV with gcc and CMake
-*********************************
-
-.. note::
-   We assume that you have successfully installed OpenCV in your workstation.
-
-The easiest way of using OpenCV in your code is to use `CMake <http://www.cmake.org/>`_. A few advantages (taken from the Wiki):
-
-* No need to change anything when porting between Linux and Windows
-* Can easily be combined with other tools by CMake( i.e. Qt, ITK and VTK ) 
-
-If you are not familiar with CMake, checkout the `tutorial <http://www.cmake.org/cmake/help/cmake_tutorial.html>`_ on its website.
-
-Steps
-======
-
-Create a program using OpenCV
--------------------------------
-
-Let's use a simple program such as DisplayImage.cpp shown below. 
-
-.. code-block:: cpp
-
-   #include <cv.h>
-   #include <highgui.h>
-
-   using namespace cv;
-
-   int main( int argc, char** argv )
-   {
-     Mat image;
-     image = imread( argv[1], 1 );
-
-     if( argc != 2 || !image.data )
-       { 
-         printf( "No image data \n" );
-         return -1; 
-       }
-
-     namedWindow( "Display Image", CV_WINDOW_AUTOSIZE );
-     imshow( "Display Image", image );
-
-     waitKey(0);
-
-     return 0;
-   }
-
-Create a CMake file
----------------------
-Now you have to create your CMakeLists.txt file. It should look like this:
-
-.. code-block:: cmake
-
-   project( DisplayImage )
-   find_package( OpenCV REQUIRED )
-   add_executable( DisplayImage DisplayImage )
-   target_link_libraries( DisplayImage ${OpenCV_LIBS} )
-
-Generate the executable
--------------------------
-This part is easy, just proceed as with any other project using CMake:
-
-.. code-block:: bash
-
-   cd <DisplayImage_directory>
-   cmake .
-   make
-
-Result
---------
-By now you should have an executable (called DisplayImage in this case). You just have to run it giving an image location as an argument, i.e.:
-
-.. code-block:: bash
-
-   ./DisplayImage lena.jpg
-
-You should get a nice window as the one shown below:
-
-.. image:: images/GCC_CMake_Example_Tutorial.png
-   :alt: Display Image - Lena
-   :align: center
-
diff --git a/doc/tutorials/Linux_Installation.rst b/doc/tutorials/Linux_Installation.rst
deleted file mode 100644 (file)
index a9f1477..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-.. _Linux_Installation:
-
-Installation in Linux
-***********************
-These steps have been tested for Ubuntu 10.04 but should work with other distros.
-
-Required packages
-==================
-
-  * GCC 4.x or later. This can be installed with
-
-    .. code-block:: bash
-
-       sudo apt-get install build-essential 
-  * CMake 2.6 or higher
-  * Subversion (SVN) client
-  * GTK+2.x or higher, including headers
-  * pkgconfig
-  * libpng, zlib, libjpeg, libtiff, libjasper with development files (e.g. libpjeg-dev)
-  * Python 2.3 or later with developer packages (e.g. python-dev)
-  * SWIG 1.3.30 or later
-  * libavcodec
-  * libdc1394 2.x 
-
-All the libraries above can be installed via Terminal or by using Synaptic Manager
-
-Getting OpenCV source code 
-============================
-
-You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest snapshot from the SVN repository:
-
-Getting the latest stable OpenCV version
-------------------------------------------
-
-* Go to http://sourceforge.net/projects/opencvlibrary
-
-* Download the source tarball and unpack it
-
-
-Getting the cutting-edge OpenCV from SourceForge SVN repository
------------------------------------------------------------------
-
-Launch SVN client and checkout either
-
-a. the current OpenCV snapshot from here: https://code.ros.org/svn/opencv/trunk
-
-#. or the latest tested OpenCV snapshot from here: http://code.ros.org/svn/opencv/tags/latest_tested_snapshot
-
-In Ubuntu it can be done using the following command, e.g.:
-
-.. code-block:: bash
-
-   cd ~/<my_working _directory>
-   svn co https://code.ros.org/svn/opencv/trunk  
-
-Building OpenCV from source using CMake, using the command line
-================================================================
-
-#. Create a temporary directory, which we denote as <cmake_binary_dir>, where you want to put the generated Makefiles, project files as well the object filees and output binaries
-
-#. Enter the <cmake_binary_dir> and type
-
-   .. code-block:: bash
-     
-      cmake [<some optional parameters>] <path to the OpenCV source directory>
-
-   For example
-
-   .. code-block:: bash
-       
-      cd ~/opencv
-      mkdir release
-      cd release
-      cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX= /usr/local
-       
-#. Enter the created temporary directory (<cmake_binary_dir>) and proceed with:
-
-   .. code-block:: bash
-      
-      make
-      sudo make install
-
-
diff --git a/doc/tutorials/Load_Save_Image.rst b/doc/tutorials/Load_Save_Image.rst
deleted file mode 100644 (file)
index 8afdf0c..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-.. _Load_Save_Image:
-
-Load and Save an Image
-***********************
-
-.. note::
-
-   We assume that by now you know:
-
-   * Load an image using :imread:`imread <>`
-   * Display an image in an OpenCV window (using :imshow:`imshow <>`)
-Goals
-======
-
-In this tutorial you will learn how to:
-
-* Transform an image from RGB to Grayscale format by using :cvt_color:`cvtColor <>`
-* Save your transformed image in a file on disk (using :imwrite:`imwrite <>`)
-
-Code
-======
-
-Here it is:
-
-.. code-block:: cpp
-   :linenos:
-
-   #include <cv.h>
-   #include <highgui.h>
-
-   using namespace cv;
-
-   int main( int argc, char** argv )
-   {
-    char* imageName = argv[1];
-
-    Mat image; 
-    image = imread( imageName, 1 );
-  
-    if( argc != 2 || !image.data )
-    {
-      printf( " No image data \n " );
-      return -1;
-    }
-
-    Mat gray_image;
-    cvtColor( image, gray_image, CV_RGB2GRAY );
-
-    imwrite( "../../images/Gray_Image.png", gray_image );
-
-    namedWindow( imageName, CV_WINDOW_AUTOSIZE );
-    namedWindow( "Gray image", CV_WINDOW_AUTOSIZE );
-
-    imshow( imageName, image );
-    imshow( "Gray image", gray_image ); 
-
-    waitKey(0);
-
-    return 0;
-   }
-
-Explanation
-============
-
-#. We begin by:
-
-   * Creating a Mat object to store the image information
-   * Load an image using :imread:`imread <>`, located in the path given by *imageName*. Fort this example, assume you are loading a RGB image.
-   
-#. Now we are going to convert our image from RGB to Grayscale format. OpenCV has a really nice function to do this kind of transformations: 
-
-   .. code-block:: cpp
-     
-      cvtColor( image, gray_image, CV_RGB2GRAY );
-
-   As you can see, :cvt_color:`cvtColor <>` takes as arguments:
-
-   * a source image (*image*) 
-   * a destination image (*gray_image*), in which we will save the converted image.
-
-   And an additional parameter that indicates what kind of transformation will be performed. In this case we use **CV_RGB2GRAY** (self-explanatory).
-
-#. So now we have our new *gray_image* and want to save it on disk (otherwise it will get lost after the program ends). To save it, we will use a function analagous to :imread:`imread <>`: :imwrite:`imwrite <>`
-
-   .. code-block:: cpp
-
-      imwrite( "../../images/Gray_Image.png", gray_image );   
-
-   Which will save our *gray_image* as *Gray_Image.png* in the folder *images* located two levels up of my current location.
-
-#. Finally, let's check out the images. We create 02 windows and use them to show the original image as well as the new one:
-
-   .. code-block:: cpp
-
-      namedWindow( imageName, CV_WINDOW_AUTOSIZE );
-      namedWindow( "Gray image", CV_WINDOW_AUTOSIZE );
-
-      imshow( imageName, image );
-      imshow( "Gray image", gray_image );
-
-#. Add the usual *waitKey(0)* for the program to wait forever until the user presses a key.
-
-
-Result
-=======
-
-When you run your program you should get something like this:
-
- .. image:: images/Load_Save_Image_Result_1.png
-    :alt: Load Save Image Result 1
-    :height: 400px
-    :align: center
-
-And if you check in your folder (in my case *images*), you should have a newly .png file named *Gray_Image.png*:
-
- .. image:: images/Load_Save_Image_Result_2.png
-    :alt: Load Save Image Result 2
-    :height: 250px
-    :align: center
-
-Congratulations, you are done with this tutorial! 
diff --git a/doc/tutorials/Windows_Installation.rst b/doc/tutorials/Windows_Installation.rst
deleted file mode 100644 (file)
index 748d746..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-.. _Windows_Installation:
-
-Installation in Windows
-***********************
-For now this is just a stub article. It will be updated with valuable content as soon as possible. Make sure to check back for it!
\ No newline at end of file
diff --git a/doc/tutorials/images/Display_Image_Tutorial_Result.png b/doc/tutorials/images/Display_Image_Tutorial_Result.png
deleted file mode 100644 (file)
index 5ce6577..0000000
Binary files a/doc/tutorials/images/Display_Image_Tutorial_Result.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-0.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-0.png
deleted file mode 100644 (file)
index 4183cbd..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-0.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-1.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-1.png
deleted file mode 100644 (file)
index e37c40a..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-1.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-10.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-10.png
deleted file mode 100644 (file)
index b2237f8..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-10.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-11.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-11.png
deleted file mode 100644 (file)
index 8e29605..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-11.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-12.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-12.png
deleted file mode 100644 (file)
index d1a75ec..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-12.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-13.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-13.png
deleted file mode 100644 (file)
index 0667a29..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-13.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-14.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-14.png
deleted file mode 100644 (file)
index c11c293..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-14.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-15.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-15.png
deleted file mode 100644 (file)
index a2617fb..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-15.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-2.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-2.png
deleted file mode 100644 (file)
index e88d5eb..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-2.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-3.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-3.png
deleted file mode 100644 (file)
index 3cc590d..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-3.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-4.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-4.png
deleted file mode 100644 (file)
index c34de2d..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-4.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-5.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-5.png
deleted file mode 100644 (file)
index 85dab17..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-5.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-6.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-6.png
deleted file mode 100644 (file)
index a82a87d..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-6.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-7.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-7.png
deleted file mode 100644 (file)
index 2dcc65a..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-7.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-8.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-8.png
deleted file mode 100644 (file)
index 612c542..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-8.png and /dev/null differ
diff --git a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-9.png b/doc/tutorials/images/Eclipse_Tutorial_Screenshot-9.png
deleted file mode 100644 (file)
index 79969c9..0000000
Binary files a/doc/tutorials/images/Eclipse_Tutorial_Screenshot-9.png and /dev/null differ
diff --git a/doc/tutorials/images/GCC_CMake_Example_Tutorial.png b/doc/tutorials/images/GCC_CMake_Example_Tutorial.png
deleted file mode 100644 (file)
index 96a1e2e..0000000
Binary files a/doc/tutorials/images/GCC_CMake_Example_Tutorial.png and /dev/null differ
diff --git a/doc/tutorials/images/Load_Save_Image_Result_1.png b/doc/tutorials/images/Load_Save_Image_Result_1.png
deleted file mode 100644 (file)
index 7e02ae9..0000000
Binary files a/doc/tutorials/images/Load_Save_Image_Result_1.png and /dev/null differ
diff --git a/doc/tutorials/images/Load_Save_Image_Result_2.png b/doc/tutorials/images/Load_Save_Image_Result_2.png
deleted file mode 100644 (file)
index effd991..0000000
Binary files a/doc/tutorials/images/Load_Save_Image_Result_2.png and /dev/null differ
diff --git a/doc/tutorials/images/Load_Save_Image_Result_a.png b/doc/tutorials/images/Load_Save_Image_Result_a.png
deleted file mode 100644 (file)
index d50bc2b..0000000
Binary files a/doc/tutorials/images/Load_Save_Image_Result_a.png and /dev/null differ
diff --git a/doc/tutorials/images/Load_Save_Image_Result_b.png b/doc/tutorials/images/Load_Save_Image_Result_b.png
deleted file mode 100644 (file)
index d1f9f90..0000000
Binary files a/doc/tutorials/images/Load_Save_Image_Result_b.png and /dev/null differ
diff --git a/doc/tutorials/images/eclipse_cpp_logo.jpeg b/doc/tutorials/images/eclipse_cpp_logo.jpeg
deleted file mode 100644 (file)
index f1aecfe..0000000
Binary files a/doc/tutorials/images/eclipse_cpp_logo.jpeg and /dev/null differ
diff --git a/doc/tutorials/images/gccegg-65-2.png b/doc/tutorials/images/gccegg-65-2.png
deleted file mode 100644 (file)
index 6a74485..0000000
Binary files a/doc/tutorials/images/gccegg-65-2.png and /dev/null differ
diff --git a/doc/tutorials/images/gccegg-65.png b/doc/tutorials/images/gccegg-65.png
deleted file mode 100644 (file)
index cd59029..0000000
Binary files a/doc/tutorials/images/gccegg-65.png and /dev/null differ
diff --git a/doc/tutorials/images/ubuntu_logo.jpeg b/doc/tutorials/images/ubuntu_logo.jpeg
deleted file mode 100644 (file)
index 50544c1..0000000
Binary files a/doc/tutorials/images/ubuntu_logo.jpeg and /dev/null differ
diff --git a/doc/tutorials/images/windows_logo.jpg b/doc/tutorials/images/windows_logo.jpg
deleted file mode 100644 (file)
index 37e130d..0000000
Binary files a/doc/tutorials/images/windows_logo.jpg and /dev/null differ
index f9fa7cc..47fb884 100644 (file)
@@ -7,178 +7,180 @@ The following links describe a set of basic OpenCV  tutorials. All the source co
 
 As always, we would be happy to hear your comments and receive your contributions on any tutorial.
 
-* **INSTALLATION**
+* **INTRO**
 
   * :ref:`Linux_Installation`
 
-     =========== ======================================================
-     |Install_1| *Title:* **Installation steps in Linux**
+     =============== ======================================================
+     |Install_Linux| *Title:* **Installation steps in Linux**
 
-                *Compatibility:* > OpenCV 2.0
+                    *Compatibility:* > OpenCV 2.0
 
-                We will learn how to setup OpenCV in your computer!
+                    We will learn how to setup OpenCV in your computer!
     
-     =========== ======================================================
+     =============== ======================================================
     
-     .. |Install_1| image:: images/ubuntu_logo.jpeg
-                    :height: 120px
+     .. |Install_Linux| image:: Intro/Linux_Installation/images/ubuntu_logo.jpeg
+                        :height: 120px
 
   * :ref:`Windows_Installation`
   
-     =========== ======================================================
-     |Install_2| *Title:* **Installation steps in Windows**
+     ================= ======================================================
+     |Install_Windows| *Title:* **Installation steps in Windows**
 
-                *Compatibility:* > OpenCV 2.0
+                      *Compatibility:* > OpenCV 2.0
 
-                You will learn how to setup OpenCV in your Windows Operating System!
+                      You will learn how to setup OpenCV in your Windows Operating System!
 
-     =========== ======================================================
+     ================= ======================================================
 
-     .. |Install_2| image:: images/windows_logo.jpg
-                    :height: 120px
+     .. |Install_Windows| image:: Intro/Windows_Installation/images/windows_logo.jpg
+                          :height: 120px
 
 
-* **USAGE AND COMPILATION**
-
   * :ref:`Linux_GCC_Usage`
 
-     =========== ======================================================
-      |Usage_1|  *Title:* **Using OpenCV with gcc (and CMake)**
+     =================== ======================================================
+      |Usage_Linux_GCC|  *Title:* **Using OpenCV with gcc (and CMake)**
 
-                *Compatibility:* > OpenCV 2.0
+                        *Compatibility:* > OpenCV 2.0
 
-                We will learn how to compile your first project using gcc and CMake
+                        We will learn how to compile your first project using gcc and CMake
     
-     =========== ======================================================
+     =================== ======================================================
     
-     .. |Usage_1| image:: images/gccegg-65-2.png
-                  :height: 120px
+     .. |Usage_Linux_GCC| image:: Intro/Linux_GCC_Usage/images/gccegg-65-2.png
+                          :height: 120px
 
 
   * :ref:`Linux_Eclipse_Usage`
 
-     =========== ======================================================
-      |Usage_2|  *Title:* **Using OpenCV with Eclipse (CDT plugin)**
+     ======================= ======================================================
+      |Usage_Linux_Eclipse|  *Title:* **Using OpenCV with Eclipse (CDT plugin)**
 
-                *Compatibility:* > OpenCV 2.0
+                            *Compatibility:* > OpenCV 2.0
 
-                We will learn how to compile your first project using the Eclipse environment
+                            We will learn how to compile your first project using the Eclipse environment
     
-     =========== ======================================================
+     ======================= ======================================================
     
-     .. |Usage_2| image:: images/eclipse_cpp_logo.jpeg
-                  :height: 120px
+     .. |Usage_Linux_Eclipse| image:: Intro/Linux_Eclipse_Usage/images/eclipse_cpp_logo.jpeg
+                              :height: 120px
 
-* **BEGINNERS SECTION**
 
   * :ref:`Display_Image`
 
-     =============== ======================================================
-      |Beginners_1|  *Title:* **Display an Image**
+     ================= ======================================================
+      |Display_Image|  *Title:* **Display an Image**
 
-                    *Compatibility:* > OpenCV 2.0
+                      *Compatibility:* > OpenCV 2.0
 
-                    We will learn how to display an image using OpenCV
+                      We will learn how to display an image using OpenCV
     
-     =============== ======================================================
+     ================= ======================================================
     
-     .. |Beginners_1| image:: images/Display_Image_Tutorial_Result.png
-                      :height: 150px
+     .. |Display_Image| image:: Intro/Display_Image/images/Display_Image_Tutorial_Result.png
+                        :height: 120px
 
 
   * :ref:`Load_Save_Image`
 
-     =============== ======================================================
-      |Beginners_2|  *Title:* **Load and save an Image**
+     ================== ======================================================
+      |Load_Save_Image|  *Title:* **Load and save an Image**
 
-                    *Compatibility:* > OpenCV 2.0
+                        *Compatibility:* > OpenCV 2.0
 
-                    We will learn how to save an Image in OpenCV...plus a small conversion to grayscale
+                        We will learn how to save an Image in OpenCV...plus a small conversion to grayscale
     
-     =============== ======================================================
+     ================== ======================================================
     
-     .. |Beginners_2| image:: images/Load_Save_Image_Result_1.png
-                      :height: 150px
+     .. |Load_Save_Image| image:: Intro/Load_Save_Image/images/Load_Save_Image_Result_1.png
+                          :height: 150px
 
-  * :ref:`Basic_Linear_Transform`
+* **CX CORE**
+
+
+  * :ref:`Drawing_1`
 
      =============== ======================================================
-      |Beginners_3|  *Title:* **Changing the contrast and brightness of an image**
+      |Drawing_1|    *Title:* **Basic Drawing**
 
                     *Compatibility:* > OpenCV 2.0
 
-                    We will learn how to change our image appearance!
+                    We will learn how to draw simple geometry with OpenCV!
     
      =============== ======================================================
     
-     .. |Beginners_3| image:: images/Basic_Linear_Transform_Tutorial_Result_0.png
-                      :height: 200px
-
+     .. |Drawing_1| image:: CxCore/Matrix/Drawing_1/images/Drawing_1_Tutorial_Result_0.png
+                    :height: 200px
 
-  * :ref:`Adding_Images`
+  * :ref:`Drawing_2`
 
      =============== ======================================================
-      |Beginners_4|  *Title:* **Linear Blending**
+      |Drawing_2|    *Title:* **Cool Drawing**
 
                     *Compatibility:* > OpenCV 2.0
 
-                    We will learn how to blend two images!
+                    We will draw some *fancy-looking* stuff using OpenCV!
     
      =============== ======================================================
     
-     .. |Beginners_4| image:: images/Adding_Images_Tutorial_Result_0.png
+     .. |Drawing_2|   image:: CxCore/Matrix/Drawing_2/images/Drawing_2_Tutorial_Result_7.png
                       :height: 200px
 
 
-  * :ref:`Adding_Trackbars`
 
-     =============== ======================================================
-      |Beginners_5|  *Title:* **Creating Trackbars**
+* **IMAGE PROCESSING**
 
-                    *Compatibility:* > OpenCV 2.0
+  * :ref:`Basic_Linear_Transform`
+
+     ========================== =========================================================
+      |Basic_Linear_Transform|  *Title:* **Changing the contrast and brightness of an image**
 
-                    We will learn how to add a Trackbar to our applications
+                               *Compatibility:* > OpenCV 2.0
+
+                               We will learn how to change our image appearance!
     
-     =============== ======================================================
+     ========================== =========================================================
     
-     .. |Beginners_5| image:: images/Adding_Trackbars_Tutorial_Cover.png
-                      :height: 200px
+     .. |Basic_Linear_Transform| image:: ImgProc/Basic_Linear_Transforms/images/Basic_Linear_Transform_Tutorial_Result_0.png
+                                 :height: 200px
 
-  * :ref:`Drawing_1`
 
-     =============== ======================================================
-      |Beginners_6|  *Title:* **Basic Drawing**
+  * :ref:`Adding_Images`
 
-                    *Compatibility:* > OpenCV 2.0
+     ================= ======================================================
+      |Adding_Images|  *Title:* **Linear Blending**
 
-                    We will learn how to draw simple geometry with OpenCV!
+                      *Compatibility:* > OpenCV 2.0
+
+                      We will learn how to blend two images!
     
-     =============== ======================================================
+     ================= ======================================================
     
-     .. |Beginners_6| image:: images/Drawing_1_Tutorial_Result_0.png
-                      :height: 200px
+     .. |Adding_Images| image:: ImgProc/Adding_Images/images/Adding_Images_Tutorial_Result_0.png
+                        :height: 200px
 
-  * :ref:`Drawing_2`
 
-     =============== ======================================================
-      |Beginners_7|  *Title:* **Cool Drawing**
+  * :ref:`Adding_Trackbars`
 
-                    *Compatibility:* > OpenCV 2.0
+     ==================== ======================================================
+      |Adding_Trackbars|  *Title:* **Creating Trackbars**
 
-                    We will draw some *fancy-looking* stuff using OpenCV!
+                         *Compatibility:* > OpenCV 2.0
+
+                         We will learn how to add a Trackbar to our applications
     
-     =============== ======================================================
+     ==================== ======================================================
     
-     .. |Beginners_7| image:: images/Drawing_2_Tutorial_Result_7.png
-                      :height: 200px
-
+     .. |Adding_Trackbars| image:: HighGUI/Adding_Trackbars/images/Adding_Trackbars_Tutorial_Cover.png
+                           :height: 200px
 
-* **IMAGE PROCESSING**
 
   * :ref:`Smoothing`
 
      ===================== ======================================================
-      |ImageProcessing_1|  *Title:* **Smoothing Images**
+      |Smoothing|          *Title:* **Smoothing Images**
 
                           *Compatibility:* > OpenCV 2.0
 
@@ -186,14 +188,14 @@ As always, we would be happy to hear your comments and receive your contribution
     
      ===================== ======================================================
     
-     .. |ImageProcessing_1| image:: images/Smoothing_Tutorial_Cover.png
-                            :height: 200px
+     .. |Smoothing| image:: ImgProc/Smoothing/images/Smoothing_Tutorial_Cover.png
+                    :height: 200px
 
 
   * :ref:`Morphology_1`
 
      ===================== ======================================================
-      |ImageProcessing_2|  *Title:* **Erosion and Dilation**
+      |Morphology_1|       *Title:* **Erosion and Dilation**
 
                           *Compatibility:* > OpenCV 2.0
 
@@ -201,5 +203,8 @@ As always, we would be happy to hear your comments and receive your contribution
     
      ===================== ======================================================
     
-     .. |ImageProcessing_2| image:: images/Morphology_1_Tutorial_Cover.png
-                            :height: 200px
+     .. |Morphology_1| image:: ImgProc/Morphology_1/images/Morphology_1_Tutorial_Cover.png
+                       :height: 200px
+
+
+