Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

Commit ed06ba40 authored by VIGNET Pierre's avatar VIGNET Pierre
Browse files

Fix strings in GUI & warnings for better comprehension on who do what...

parent 51fa01bb
...@@ -201,7 +201,7 @@ class OccurenceForm(object): ...@@ -201,7 +201,7 @@ class OccurenceForm(object):
# get info # get info
final_prop = self.property_entry.get_text() final_prop = self.property_entry.get_text()
if len(final_prop) == 0: if len(final_prop) == 0:
cancel_warn("Void property") cancel_warn("Missing property")
return return
inv_prop = self.inv_prop_entry.get_text() inv_prop = self.inv_prop_entry.get_text()
start_prop = self.start_prop_entry.get_text() start_prop = self.start_prop_entry.get_text()
...@@ -262,7 +262,7 @@ class OccurenceForm(object): ...@@ -262,7 +262,7 @@ class OccurenceForm(object):
# get info # get info
final_prop = self.property_entry.get_text() final_prop = self.property_entry.get_text()
if len(final_prop) == 0: if len(final_prop) == 0:
cancel_warn("Void property") cancel_warn("Missing property")
return return
inv_prop = self.inv_prop_entry.get_text() inv_prop = self.inv_prop_entry.get_text()
start_prop = self.start_prop_entry.get_text() start_prop = self.start_prop_entry.get_text()
...@@ -327,7 +327,7 @@ class OccurenceForm(object): ...@@ -327,7 +327,7 @@ class OccurenceForm(object):
self.max_sol = max_sol self.max_sol = max_sol
if len(self.lsol) == 0: if len(self.lsol) == 0:
cancel_warn("No conditions") cancel_warn("No solution")
return return
# activate buttons # activate buttons
...@@ -360,16 +360,16 @@ class OccurenceForm(object): ...@@ -360,16 +360,16 @@ class OccurenceForm(object):
""" """
launch mac computations launch mac computations
""" """
ask = confirm(None, 'This process takes time' + '\n' + ask = confirm(None, 'This process takes time.\n' +
'You will not be able to use cadbiom.'+'\n' + 'You will not be able to use cadbiom.\n' +
' Do you want to continue ?') 'Do you want to continue ?')
if ask: if ask:
query = MCLSimpleQuery(self.start_prop, query = MCLSimpleQuery(self.start_prop,
self.inv_prop, self.property) self.inv_prop, self.property)
cam_list = self.mcla.mac_search(query, self.max_step) cam_list = self.mcla.mac_search(query, self.max_step)
if len(cam_list)==0 : if len(cam_list)==0 :
ok_warn("The solver returns an empty list" + ok_warn("The solver could not find a MAC," +
"\n"+" you should refine your query") "\n you should refine your query")
else : else :
CNSWindow(cam_list, self.__emvc, CNSWindow(cam_list, self.__emvc,
self.__error_reporter, self) self.__error_reporter, self)
......
...@@ -139,13 +139,13 @@ ...@@ -139,13 +139,13 @@
<child> <child>
<widget class="GtkLabel" id="label7"> <widget class="GtkLabel" id="label7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Starting with the property</property> <property name="label" translatable="yes">Starting with the property (start prop)</property>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="label10"> <widget class="GtkLabel" id="label10">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Without checking the property</property> <property name="label" translatable="yes">Without checking the property (invariant prop)</property>
</widget> </widget>
<packing> <packing>
<property name="position">1</property> <property name="position">1</property>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="label" translatable="yes">Yes/No</property> <property name="label" translatable="yes">Is the problem satisfiable ?</property>
<property name="response_id">0</property> <property name="response_id">0</property>
</widget> </widget>
<packing> <packing>
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="label" translatable="yes">Minimal Activation Conditions</property> <property name="label" translatable="yes">Search Minimal Activation Conditions</property>
<property name="response_id">0</property> <property name="response_id">0</property>
</widget> </widget>
<packing> <packing>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="label" translatable="yes"> Frontier Initialisations</property> <property name="label" translatable="yes"> Search solutions</property>
<property name="response_id">0</property> <property name="response_id">0</property>
</widget> </widget>
<packing> <packing>
......
...@@ -446,13 +446,15 @@ class SCCWindow(object): ...@@ -446,13 +446,15 @@ class SCCWindow(object):
# info label # info label
info = self.wtree.get_widget("label_nbsol") info = self.wtree.get_widget("label_nbsol")
if not SCC_found: if not SCC_found:
info.set_text("No isolated Strongly Connected Components found.") info.set_text("No isolated Strongly Connected Component(s) found.")
return return
else: else:
info.set_text(str(len(self.l_solutions)) + \ info.set_text(
" isolated Strongly Connected Components found.\n" str(len(self.l_solutions)) + \
"(Only 1 node of each of them requires an input " " isolated Strongly Connected Components found.\n"
"transition with a StartNode)") "Only 1 node of each of them requires an input transition "
"with a StartNode.\nWithout this, places in such a part of the "
"model will remain unactivated in any scenario.")
self.frame_sol = self.wtree.get_widget("frame_sol") self.frame_sol = self.wtree.get_widget("frame_sol")
# button frame # button frame
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment