bug in show live fixed, README edited

README

@@ -1 +1,6 @@
-README FILE
+Circle Packings v1.0 (released Oct 2012) by Benjamin and Brice Loustau.
+Licensed under GPL v3 (doc/gpl.txt)
+
+Please see the documentation (doc/index.html) for detailed information. You will find there how to install the program.
+
+

doc/index.html

@@ -531,7 +531,9 @@ <h1 id = "program"> About the program </h1>
 		here in the future (or not). See the <a href=#troubleshooting>Troubleshooting section</a> for a couple words about convergence and speed.
 		</p>
 
-		<p> This program is copyrighted under the <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">GNU General Public License</a>. </p>
+		<p> This program is copyrighted under the <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">GNU General Public License</a>. 
+		It is free and open source, all the sources and other files are available on gitub: 
+		<a href="https://github.com/seub/CirclePackings">https://github.com/seub/CirclePackings</a>.</p>
 
 
 

doc/index.html~

@@ -186,6 +186,7 @@
 		<h3> Mac users: </h3>
 
 		<p> Download <a href="http://brice.loustau.free.fr/CirclePackings.app">this app file</a> and move it to your applications directory. </p>
+    		<p> You may also compile the application from the sources: follow the same procedure as Linux users.</p>
 
 		<h3> Linux (or UNIX) users: </h3>
 
@@ -199,7 +200,7 @@
 		<p> Installing the package can be done by 
 		opening a terminal, stepping into the folder containing the package (using <em>cd</em>) and typing:
 		<div class= "code">
-		sudo dpkg -i CirclePackings.deb
+		sudo dpkg -i CirclePackings-32.deb
 		</div> </p>
 		<p> You will be prompted to install <strong>libqt4-dev</strong> if not already installed on your system.
 		This can be done by typing:
@@ -213,15 +214,18 @@
 		On Debian-based
 		distributions, this is done by installing the package <strong>libqt4-dev</strong>. </li>
 		<li> Download
-		<a href="http://brice.loustau.free.fr/CirclePackings.tar.gz">this compressed folder</a> and extract it somewhere in your hard disk. </li>
-		<li> Open a terminal, <em>cd</em> into that folder and type:
+		<a href="http://brice.loustau.free.fr/CirclePackings.tar.gz">this compressed folder</a> and extract it somewhere in your hard disk. 
+		You may also clone the git repository: 
+		<div class= "code">
+		git clone https://github.com/seub/CirclePackings.git
+		</div></li>
+		<li> Open a terminal, <em>cd</em> into that folder and type the following two commands:
 		<div class = "code">
-		qmake CirclePackings.pro <br>
-		qmake <br>
+		qmake<br>
 		make
 		</div> </p>
-
-		 <p> <em> Note: The last step may take a minute. You may type instead <span class = "in_code"> make -j N</span> where <em>N</em> is 
+		<p> <em> Note: The <span class = "in_code"> make</span> step may take a minute. 
+		You may type instead <span class = "in_code"> make -j N</span> where <em>N</em> is 
 		the number of processor cores that you have to speed things up. </em> </p>
 		</li>
 		<li> You're done! An executable file <em>CirclePackings</em> was generated. Double-click on it or run it from the terminal:
@@ -543,8 +547,6 @@
 
 		<p> Brice Loustau: currently a post-doc at University Paris-Sud XI. My research interests lie in Teichm&uuml;ller theory. <br>
 		Contact me: <a href="mailto:[email protected]"> [email protected] </a> </p>
-
-
 
 	</body>
 </html>

window.cpp

@@ -1361,14 +1361,17 @@ void Window::set_canvas_delegates_show_live()
         break;
     case DRAW_GRAPH:
         delete right_canvas_->canvas_delegate_;
+        maths_contents_.show_live_cp_right_.reset_graph();
         right_canvas_->canvas_delegate_ = new Canvas_Delegate_Show_Live(right_canvas_->size_in_pixels_,
                                                                         &(maths_contents_.show_live_cp_right_));
         break;
     case DRAW_CURVE:
         delete left_canvas_->canvas_delegate_;
+        maths_contents_.show_live_cp_left_.reset_graph();
         left_canvas_->canvas_delegate_ = new Canvas_Delegate_Show_Live(left_canvas_->size_in_pixels_,
                                                                        &(maths_contents_.show_live_cp_left_));
         delete right_canvas_->canvas_delegate_;
+        maths_contents_.show_live_cp_right_.reset_graph();
         right_canvas_->canvas_delegate_ = new Canvas_Delegate_Show_Live(right_canvas_->size_in_pixels_,
                                                                         &(maths_contents_.show_live_cp_right_));
         break;