Merge branch 'tidyngUp' into 'master'

add a branch for tidynig up, and for now if daq not found it prints outputs

See merge request martindrech/control_app!1

ADoutputs.py

@@ -7,6 +7,7 @@ Created on Wed May 30 15:27:17 2018
 
 from __future__ import absolute_import, division, print_function
 
+daqfound = True
 
 try:
     from mcculw import ul
@@ -20,12 +21,16 @@ try:
 
 except:
     print('import error: mcculw not installed. In linux this might not be available. ')
+    daqfound = False
 #%%
         
 class daq_DO(object):
     def __init__(self, out_num):
+        global daqfound
         
         self.board_num = 0
+        self.out_num = out_num
+        if daqfound:
             self.digital_props = DigitalProps(self.board_num)
     
             # Find the first port that supports output, defaulting to None
@@ -42,30 +47,26 @@ class daq_DO(object):
                 except ULError as e:
                     self.show_ul_error(e)
             
-    
-        self.out_num = out_num
-        
+    if daqfound:
         def set_out(self, bit_value):
             try:
                 # Output the value to the board
                 ul.d_bit_out(self.board_num, self.port.type, self.out_num, bit_value)
             except ULError as e:
                 self.show_ul_error(e)
+    else:
+        def set_out(self, bit_value):
+            return bit_value, self.out_num
                        
-    def get_digital_out(self):
-        try:
-            state = ul.d_bit_in(self.board_num, self.port.type, self.out_num)
-            print(state)
-        except ValueError:
-            return 0
         
 class daq_AO(object):
     def __init__(self, out_num):
-        
+        global daqfound
         self.board_num = 0
-        self.ao_props = AnalogOutputProps(self.board_num)
         self.out_num = out_num
-
+        if daqfound:
+            self.ao_props = AnalogOutputProps(self.board_num)
+    if daqfound:
         def set_out(self, value):
             try:
                 ul.v_out(self.board_num, self.out_num, ao_range, value)
@@ -80,5 +81,7 @@ class daq_AO(object):
                 print(state)
             except ValueError:
                 return 0
-        
+    else:
+        def set_out(self, value):
+            return value, self.out_num
 ######################################################################################

myToolbar.py

@@ -92,11 +92,11 @@ class myToolbarMenu(QWidget):
         settings.endGroup()
     
     def first_load(self, aos):
-        try:
+        
         settings = QSettings('C:\\Users\\Usuario\\Documents\\control_app\\config.ini', QSettings.IniFormat)
-        except:
+        if not settings:
             print('Warning: no config.ini file in control_app folder. Pleace, be kindful and create one')
-            return 
+        return 0 
         
         settings.beginGroup('Ventana')
         for ao in aos: