Menu
▾
▴
[Openlcb-svn-commits] SF.net SVN: openlcb:[3033] trunk/prototypes/python_gui/olcbtests/src/ olcbtests
|
From: <nra...@us...> - 2013-02-28 11:56:56
|
Revision: 3033
http://openlcb.svn.sourceforge.net/openlcb/?rev=3033&view=rev
Author: nratonpass
Date: 2013-02-28 11:56:48 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Added testAliasConflict box modified ethernet_connect.py and SNII.py
Modified Paths:
--------------
trunk/prototypes/python_gui/olcbtests/src/olcbtests/SNII.py
trunk/prototypes/python_gui/olcbtests/src/olcbtests/ethernet_connect.py
trunk/prototypes/python_gui/olcbtests/src/olcbtests/main.ui
trunk/prototypes/python_gui/olcbtests/src/olcbtests/menu.py
Modified: trunk/prototypes/python_gui/olcbtests/src/olcbtests/SNII.py
===================================================================
--- trunk/prototypes/python_gui/olcbtests/src/olcbtests/SNII.py 2013-02-25 23:29:05 UTC (rev 3032)
+++ trunk/prototypes/python_gui/olcbtests/src/olcbtests/SNII.py 2013-02-28 11:56:48 UTC (rev 3033)
@@ -13,7 +13,7 @@
def simple_node_ident_info(conn, config):
''''''
- src_alias, dst_alias , node_id = config['src_alias'], config['dst_alias'] , config['dst_id']
+ src_alias, dst_alias , node_id = config['src_alias'], config['dst_alias'] , config['node_id']
msg = messages.SimpleNodeIdentInfo(
src_alias=src_alias,
Modified: trunk/prototypes/python_gui/olcbtests/src/olcbtests/ethernet_connect.py
===================================================================
--- trunk/prototypes/python_gui/olcbtests/src/olcbtests/ethernet_connect.py 2013-02-25 23:29:05 UTC (rev 3032)
+++ trunk/prototypes/python_gui/olcbtests/src/olcbtests/ethernet_connect.py 2013-02-28 11:56:48 UTC (rev 3033)
@@ -50,4 +50,6 @@
self.ethernet_dialog.hide()
self.Show_Connected_OK(ip_data)
self.eth_disconnect.show_all()
- self.connected_no.hide()
\ No newline at end of file
+ self.connected_no.hide()
+ self.status_connect_button.hide()
+ self.status_dst_alias_combo_box.hide()
\ No newline at end of file
Modified: trunk/prototypes/python_gui/olcbtests/src/olcbtests/main.ui
===================================================================
--- trunk/prototypes/python_gui/olcbtests/src/olcbtests/main.ui 2013-02-25 23:29:05 UTC (rev 3032)
+++ trunk/prototypes/python_gui/olcbtests/src/olcbtests/main.ui 2013-02-28 11:56:48 UTC (rev 3033)
@@ -2612,7 +2612,15 @@
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkVSeparator" id="vseparator10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
<object class="GtkVSeparator" id="vseparator5">
@@ -2929,21 +2937,6 @@
</packing>
</child>
<child>
- <object class="GtkProgressBar" id="progress_bar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="activity_mode">True</property>
- <property name="show_text">True</property>
- <property name="text" translatable="yes">Running Test</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="close_connection">
<property name="label" translatable="yes">Disconnect</property>
<property name="use_action_appearance">False</property>
@@ -2962,6 +2955,21 @@
</packing>
</child>
<child>
+ <object class="GtkProgressBar" id="progress_bar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="activity_mode">True</property>
+ <property name="show_text">True</property>
+ <property name="text" translatable="yes">Running Test</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
<child>
Modified: trunk/prototypes/python_gui/olcbtests/src/olcbtests/menu.py
===================================================================
--- trunk/prototypes/python_gui/olcbtests/src/olcbtests/menu.py 2013-02-25 23:29:05 UTC (rev 3032)
+++ trunk/prototypes/python_gui/olcbtests/src/olcbtests/menu.py 2013-02-28 11:56:48 UTC (rev 3033)
@@ -133,7 +133,17 @@
def Hide_Unknown_Datagram(self, w):
self.unknown_datagram_box.hide()
+
+ def show_alias_conflict(self, w):
+ for box in self.test_boxes:
+ box.hide()
+ self.test_alias_conflict_box.show_all()
+ def hide_alias_conflict(self, w):
+ self.test_alias_conflict_box.hide()
+
+
+
def Show_Connected_OK(self, w):
self.connected_ok.show_all()
def Hide_Connected_OK(self, w):
@@ -276,7 +286,7 @@
Consumers and Producer Events Global and Addressed
'''
def Identify_Events_Global(self, w):
- self.pbar.show_all()
+ #self.pbar.show_all()
events_global = identify_events_global(self.conn, self.config)
@@ -424,6 +434,10 @@
self.test_pc_loop_box = self.builder.get_object("test_pc_loop_box")
self.test_pc_loop_box.hide()
self.test_boxes.append(self.test_pc_loop_box)
+
+ self.test_alias_conflict_box = self.builder.get_object("test_alias_conflict_box")
+ self.test_alias_conflict_box.hide()
+ self.test_boxes.append(self.test_alias_conflict_box)
#end test boxes
self.comport_dialog = self.builder.get_object("comport_dialog")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
