Merge branch 'master' of spider:~/picroscopy

Conflicts: picroscopy/templates/settings.pt
waveform80 · Oct 13, 2013 · f237ccc · f237ccc
2 parents 1da09f3 + bcd3aa1
commit f237ccc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/picroscopy/library.py b/picroscopy/library.py
@@ -134,7 +134,8 @@ def camera_reset(self):
         self.camera.contrast = 0
         self.camera.brightness = 50
         self.camera.saturation = 0
-        self.camera.ISO = 400
+        # XXX Bug in the camera: ISO needs to be zero for exposure mode to work
+        self.camera.ISO = 0
         self.camera.exposure_compensation = 0
         self.camera.hflip = False
         self.camera.vflip = False

diff --git a/picroscopy/templates/settings.pt b/picroscopy/templates/settings.pt
@@ -129,6 +129,7 @@
               <div class="small-2 columns">+100</div>
             </div>
 
+            <!-- XXX Commented out until camera's firmware is fixed -->
             <!--div class="row advanced">
               <div class="small-3 columns">
                 <label for="ISO" class="right inline">ISO</label>
@@ -170,13 +171,14 @@
               </div>
             </div>
 
-            <div class="row">
+            <div class="row advanced">
               <div class="small-3 columns">
                 <label for="exposure-mode" class="right inline">Exposure Mode</label>
               </div>
               <div class="small-9 columns">
                 <select required name="exposure-mode" id="exposure-mode">
-                  <option tal:repeat="value camera.EXPOSURE_MODES" value="${value}" tal:attributes="selected camera.exposure_mode==value">${value}</option>
+                  <!-- XXX verylong excluded until camera firmware is fixed -->
+                  <option tal:repeat="value [m for m in camera.EXPOSURE_MODES if m != 'verylong']" value="${value}" tal:attributes="selected camera.exposure_mode==value">${value}</option>
                 </select>
               </div>
             </div>