Merge branch 'master' of gitlab.doc.ic.ac.uk:g1453017/anisopter

juancarlosfarah · May 18, 2015 · 8d795c5 · 8d795c5
2 parents bd927bb + 585d78b
commit 8d795c5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/animation/animation/target_animation.py b/src/animation/animation/target_animation.py
@@ -220,9 +220,8 @@ def create_movie(self, out_directory, fps, total_frames):
         video.release()
 
         # TO-DO: change this not to be hard coded.
-        dir = out_directory.strip(".avi")
-
-        command = "avconv -i %s.avi -c:v libx264 -c:a copy %s.mp4" % (dir, dir)
+        d = out_directory.split(".avi")[0]
+        command = "avconv -i %s.avi -c:v libx264 -c:a copy %s.mp4" % (d, d)
         call(command.split())
 
         cv2.destroyAllWindows()

diff --git a/src/server/estmd_dao.py b/src/server/estmd_dao.py
@@ -148,7 +148,6 @@ def run_simulation(self, sample_id, description, H_filter, b, a,
 
         input_directory = "assets/animations/" + str(sample_id) + ".avi"
 
-
         e = ESTMD(sample_id, description, H_filter, b, a, CSKernel, b1, a1)
 
         if return_object:
@@ -166,8 +165,8 @@ def run_simulation(self, sample_id, description, H_filter, b, a,
         e.open_movie(input_directory)
         e.run(out_dir=out_directory)
 
-        dir = out_directory.strip(".avi")
-        command = "avconv -i %s.avi -c:v libx264 -c:a copy %s.mp4" % (dir, dir)
+        d = out_directory.split(".avi")[0]
+        command = "avconv -i %s.avi -c:v libx264 -c:a copy %s.mp4" % (d, d)
         call(command.split())
 
         return _id

diff --git a/src/server/views/cstmd.tpl b/src/server/views/cstmd.tpl
@@ -34,6 +34,11 @@
 	<img src="/assets/images/CSTMD.png" alt="CSTMD" class="img-responsive img-rounded">
       </div>
     </div>
+    <div class="row">
+        <div class="col-md-12 text-center">
+            <p>Structure of an actual CSTMD1 neuron.</p>
+        </div>
+    </div>
     <br />
     <br />
     <div class="row">

diff --git a/src/server/views/estmd.tpl b/src/server/views/estmd.tpl
@@ -35,7 +35,11 @@
     </div>
     <div class="row">
         <div class="col-md-12 text-center">
-            <p>Sample caption.</p>
+            <p>Outline of ESTMD implentation. </p>
+        </div>
+        <div class="col-md-12 text-center">
+            <p> Steven Wiederman. A Neurobiological and Computational Analysis of Target Discrimination in
+Visual Clutter by the Insect Visual System. (September), 2008. </p>
         </div>
     </div>
     <br />

diff --git a/src/server/views/pattern_recognition.tpl b/src/server/views/pattern_recognition.tpl
@@ -56,6 +56,14 @@
 	<img src="/assets/images/stdp.png" alt="STDP" class="img-responsive img-rounded">
       </div>
     </div>
+    <div class="row">
+        <div class="col-md-12 text-center">
+            <p>
+                The effect of STDP on the synaptic weights given the time 
+                difference between the presynaptic and the post synaptic spike.
+            </p>
+        </div>
+    </div>
     <br />
     <br />
     <div class="row">