mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00701
[Branch ~cdd-dev/cdd/trunk] Rev 247: CDD 2.0 preview.
Merge authors:
Eduardo César (eduardo.cesar)
------------------------------------------------------------
revno: 247 [merge]
committer: Eduardo C. P. Ribeiro <eduardo.cesar@xxxxxxx>
branch nick: mirror
timestamp: Mon 2012-09-03 21:34:10 -0300
message:
CDD 2.0 preview.
modified:
src/2.0/cdd.py
src/2.0/cdd.wxg
--
lp:cdd
https://code.launchpad.net/~cdd-dev/cdd/trunk
Your team MLHIM Specifications Developers is subscribed to branch lp:cdd.
To unsubscribe from this branch go to https://code.launchpad.net/~cdd-dev/cdd/trunk/+edit-subscription
=== modified file 'src/2.0/cdd.py'
--- src/2.0/cdd.py 2012-09-03 22:50:29 +0000
+++ src/2.0/cdd.py 2012-09-04 00:33:39 +0000
@@ -319,6 +319,8 @@
self.radio_box_language = wx.RadioBox(self, -1, _("Selected?"), choices=[_("No"), _("Yes")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
self.choice_language = wx.Choice(self, -1, choices=[])
self.sizer_48_staticbox = wx.StaticBox(self, -1, _("language"))
+ self.text_ctrl_data_name = wx.TextCtrl(self, -1, "")
+ self.sizer_21_staticbox = wx.StaticBox(self, -1, _("data_name"))
self.__set_properties()
self.__do_layout()
@@ -340,6 +342,9 @@
# begin wxGlade: DvIdentifier.__do_layout
sizer_46 = wx.BoxSizer(wx.HORIZONTAL)
sizer_47 = wx.BoxSizer(wx.VERTICAL)
+ sizer_13 = wx.BoxSizer(wx.HORIZONTAL)
+ self.sizer_21_staticbox.Lower()
+ sizer_21 = wx.StaticBoxSizer(self.sizer_21_staticbox, wx.HORIZONTAL)
self.sizer_48_staticbox.Lower()
sizer_48 = wx.StaticBoxSizer(self.sizer_48_staticbox, wx.HORIZONTAL)
sizer_49 = wx.BoxSizer(wx.HORIZONTAL)
@@ -383,7 +388,10 @@
sizer_48.Add(self.radio_box_language, 0, 0, 0)
sizer_48.Add((20, 20), 1, wx.EXPAND, 0)
sizer_48.Add(self.choice_language, 0, 0, 0)
- sizer_47.Add(sizer_48, 0, wx.EXPAND, 0)
+ sizer_13.Add(sizer_48, 0, 0, 0)
+ sizer_21.Add(self.text_ctrl_data_name, 1, 0, 0)
+ sizer_13.Add(sizer_21, 1, 0, 0)
+ sizer_47.Add(sizer_13, 0, wx.EXPAND, 0)
sizer_46.Add(sizer_47, 1, wx.EXPAND, 0)
self.SetSizer(sizer_46)
sizer_46.Fit(self)
@@ -446,6 +454,8 @@
self.radio_box_language = wx.RadioBox(self, -1, _("Selected?"), choices=[_("No"), _("Yes")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
self.choice_language = wx.Choice(self, -1, choices=[])
self.sizer_48_copy_staticbox = wx.StaticBox(self, -1, _("language"))
+ self.text_ctrl_data_name = wx.TextCtrl(self, -1, "")
+ self.sizer_21_copy_staticbox = wx.StaticBox(self, -1, _("data_name"))
self.__set_properties()
self.__do_layout()
@@ -467,6 +477,9 @@
# begin wxGlade: DvCodedString.__do_layout
sizer_54 = wx.BoxSizer(wx.HORIZONTAL)
sizer_55 = wx.BoxSizer(wx.VERTICAL)
+ sizer_13_copy = wx.BoxSizer(wx.HORIZONTAL)
+ self.sizer_21_copy_staticbox.Lower()
+ sizer_21_copy = wx.StaticBoxSizer(self.sizer_21_copy_staticbox, wx.HORIZONTAL)
self.sizer_48_copy_staticbox.Lower()
sizer_48_copy = wx.StaticBoxSizer(self.sizer_48_copy_staticbox, wx.HORIZONTAL)
sizer_49_copy = wx.BoxSizer(wx.HORIZONTAL)
@@ -510,7 +523,10 @@
sizer_48_copy.Add(self.radio_box_language, 0, 0, 0)
sizer_48_copy.Add((20, 20), 1, wx.EXPAND, 0)
sizer_48_copy.Add(self.choice_language, 0, 0, 0)
- sizer_55.Add(sizer_48_copy, 0, wx.EXPAND, 0)
+ sizer_13_copy.Add(sizer_48_copy, 0, 0, 0)
+ sizer_21_copy.Add(self.text_ctrl_data_name, 1, 0, 0)
+ sizer_13_copy.Add(sizer_21_copy, 1, 0, 0)
+ sizer_55.Add(sizer_13_copy, 0, wx.EXPAND, 0)
sizer_54.Add(sizer_55, 1, wx.EXPAND, 0)
self.SetSizer(sizer_54)
sizer_54.Fit(self)
@@ -737,13 +753,18 @@
parent = self.GetParent()
grandparent = self.GetGrandParent()
+ subject = None
if self.radio_btn_cluster.GetValue():
sel_string = 'Cluster'
+ subject = self.text_ctrl_cluster.GetValue()
elif self.radio_btn_element.GetValue():
sel_string = 'Element'
elif self.radio_btn_slot.GetValue():
sel_string = 'Slot'
+ if subject:
+ sel_string += ' .' + subject
+
tree.AppendItem(item, sel_string)
tree.Expand(item)
@@ -763,13 +784,18 @@
tree = top_panel.tree_ctrl_ccd
tree_selected = tree.GetSelection()
+ subject = None
if self.radio_btn_cluster.GetValue():
sel_string = 'Cluster'
+ subject = self.text_ctrl_cluster.GetValue()
elif self.radio_btn_element.GetValue():
sel_string = 'Element'
elif self.radio_btn_slot.GetValue():
sel_string = 'Slot'
+ if subject:
+ sel_string += ' .' + subject
+
sel_string += self.suffix
child, cookie = tree.GetFirstChild(tree_selected)
@@ -1183,7 +1209,6 @@
self.radio_btn_cluster = wx.RadioButton(self, -1, _("Cluster"))
self.radio_btn_element = wx.RadioButton(self, -1, _("Element"))
self.sizer_22_staticbox = wx.StaticBox(self, -1, _("Select the type of the CCD:"))
- self.radio_box_cluster = wx.RadioBox(self, -1, _("Choose the desired class:"), choices=[_("Cluster"), _("Element"), _("Slot")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
self.__set_properties()
self.__do_layout()
@@ -1194,13 +1219,11 @@
self.radio_btn_care_entry.SetForegroundColour(wx.Colour(127, 0, 255))
self.radio_btn_cluster.SetForegroundColour(wx.Colour(255, 127, 0))
self.radio_btn_element.SetForegroundColour(wx.Colour(255, 127, 0))
- self.radio_box_cluster.SetSelection(0)
# end wxGlade
def __do_layout(self):
# begin wxGlade: MyPanel4.__do_layout
sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_13 = wx.BoxSizer(wx.VERTICAL)
self.sizer_22_staticbox.Lower()
sizer_22 = wx.StaticBoxSizer(self.sizer_22_staticbox, wx.VERTICAL)
sizer_22.Add(self.radio_btn_care_entry, 0, 0, 0)
@@ -1209,8 +1232,6 @@
sizer_22.Add(self.radio_btn_cluster, 0, 0, 0)
sizer_22.Add(self.radio_btn_element, 0, 0, 0)
sizer_16.Add(sizer_22, 1, wx.EXPAND, 0)
- sizer_13.Add(self.radio_box_cluster, 1, wx.EXPAND, 0)
- sizer_16.Add(sizer_13, 1, wx.EXPAND, 0)
self.SetSizer(sizer_16)
sizer_16.Fit(self)
# end wxGlade
=== modified file 'src/2.0/cdd.wxg'
--- src/2.0/cdd.wxg 2012-09-03 22:41:02 +0000
+++ src/2.0/cdd.wxg 2012-09-04 00:33:39 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- generated by wxGlade 0.6.4 on Mon Sep 3 19:39:59 2012 -->
+<!-- generated by wxGlade 0.6.4 on Mon Sep 3 21:19:35 2012 -->
<application path="cdd.py" name="" class="" option="0" language="python" top_window="frame_main" encoding="UTF-8" use_gettext="1" overwrite="0" use_new_namespace="1" for_version="2.8" is_template="0" indent_amount="4" indent_symbol="space" source_extension=".cpp" header_extension=".h">
<object class="MainFrame" name="frame_main" base="EditFrame">
@@ -560,30 +560,7 @@
</object>
</object>
</object>
- <object class="sizeritem">
- <flag>wxEXPAND</flag>
- <border>0</border>
- <option>1</option>
- <object class="wxBoxSizer" name="sizer_13" base="EditBoxSizer">
- <orient>wxVERTICAL</orient>
- <object class="sizeritem">
- <flag>wxEXPAND</flag>
- <border>0</border>
- <option>1</option>
- <object class="wxRadioBox" name="radio_box_cluster" base="EditRadioBox">
- <style>wxRA_SPECIFY_ROWS</style>
- <selection>0</selection>
- <dimension>0</dimension>
- <label>Choose the desired class:</label>
- <choices>
- <choice>Cluster</choice>
- <choice>Element</choice>
- <choice>Slot</choice>
- </choices>
- </object>
- </object>
- </object>
- </object>
+ <object class="sizerslot" />
<object class="sizerslot" />
</object>
</object>
@@ -1542,43 +1519,64 @@
<flag>wxEXPAND</flag>
<border>0</border>
<option>0</option>
- <object class="wxStaticBoxSizer" name="sizer_48" base="EditStaticBoxSizer">
+ <object class="wxBoxSizer" name="sizer_13" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
- <label>language</label>
<object class="sizeritem">
<border>0</border>
<option>0</option>
- <object class="wxRadioBox" name="radio_box_language" base="EditRadioBox">
- <style>wxRA_SPECIFY_ROWS</style>
- <selection>0</selection>
- <dimension>0</dimension>
- <label>Selected?</label>
- <choices>
- <choice>No</choice>
- <choice>Yes</choice>
- </choices>
- <events>
- <handler event="EVT_RADIOBOX">evt_radiobox_language</handler>
- </events>
+ <object class="wxStaticBoxSizer" name="sizer_48" base="EditStaticBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <label>language</label>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>0</option>
+ <object class="wxRadioBox" name="radio_box_language" base="EditRadioBox">
+ <style>wxRA_SPECIFY_ROWS</style>
+ <selection>0</selection>
+ <dimension>0</dimension>
+ <label>Selected?</label>
+ <choices>
+ <choice>No</choice>
+ <choice>Yes</choice>
+ </choices>
+ <events>
+ <handler event="EVT_RADIOBOX">evt_radiobox_language</handler>
+ </events>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxEXPAND</flag>
+ <border>0</border>
+ <option>1</option>
+ <object class="spacer" name="spacer" base="EditSpacer">
+ <height>20</height>
+ <width>20</width>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>0</option>
+ <object class="wxChoice" name="choice_language" base="EditChoice">
+ <selection>0</selection>
+ <disabled>1</disabled>
+ <choices>
+ </choices>
+ </object>
+ </object>
</object>
</object>
<object class="sizeritem">
- <flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
- <object class="spacer" name="spacer" base="EditSpacer">
- <height>20</height>
- <width>20</width>
- </object>
- </object>
- <object class="sizeritem">
- <border>0</border>
- <option>0</option>
- <object class="wxChoice" name="choice_language" base="EditChoice">
- <selection>0</selection>
- <disabled>1</disabled>
- <choices>
- </choices>
+ <object class="wxStaticBoxSizer" name="sizer_21" base="EditStaticBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <label>data_name</label>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>1</option>
+ <object class="wxTextCtrl" name="text_ctrl_data_name" base="EditTextCtrl">
+ </object>
+ </object>
</object>
</object>
</object>
@@ -1771,43 +1769,64 @@
<flag>wxEXPAND</flag>
<border>0</border>
<option>0</option>
- <object class="wxStaticBoxSizer" name="sizer_48_copy" base="EditStaticBoxSizer">
+ <object class="wxBoxSizer" name="sizer_13_copy" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
- <label>language</label>
<object class="sizeritem">
<border>0</border>
<option>0</option>
- <object class="wxRadioBox" name="radio_box_language" base="EditRadioBox">
- <style>wxRA_SPECIFY_ROWS</style>
- <selection>0</selection>
- <dimension>0</dimension>
- <label>Selected?</label>
- <choices>
- <choice>No</choice>
- <choice>Yes</choice>
- </choices>
- <events>
- <handler event="EVT_RADIOBOX">evt_radiobox_language</handler>
- </events>
+ <object class="wxStaticBoxSizer" name="sizer_48_copy" base="EditStaticBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <label>language</label>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>0</option>
+ <object class="wxRadioBox" name="radio_box_language" base="EditRadioBox">
+ <style>wxRA_SPECIFY_ROWS</style>
+ <selection>0</selection>
+ <dimension>0</dimension>
+ <label>Selected?</label>
+ <choices>
+ <choice>No</choice>
+ <choice>Yes</choice>
+ </choices>
+ <events>
+ <handler event="EVT_RADIOBOX">evt_radiobox_language</handler>
+ </events>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxEXPAND</flag>
+ <border>0</border>
+ <option>1</option>
+ <object class="spacer" name="spacer" base="EditSpacer">
+ <height>20</height>
+ <width>20</width>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>0</option>
+ <object class="wxChoice" name="choice_language" base="EditChoice">
+ <selection>0</selection>
+ <disabled>1</disabled>
+ <choices>
+ </choices>
+ </object>
+ </object>
</object>
</object>
<object class="sizeritem">
- <flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
- <object class="spacer" name="spacer" base="EditSpacer">
- <height>20</height>
- <width>20</width>
- </object>
- </object>
- <object class="sizeritem">
- <border>0</border>
- <option>0</option>
- <object class="wxChoice" name="choice_language" base="EditChoice">
- <selection>0</selection>
- <disabled>1</disabled>
- <choices>
- </choices>
+ <object class="wxStaticBoxSizer" name="sizer_21_copy" base="EditStaticBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <label>data_name</label>
+ <object class="sizeritem">
+ <border>0</border>
+ <option>1</option>
+ <object class="wxTextCtrl" name="text_ctrl_data_name" base="EditTextCtrl">
+ </object>
+ </object>
</object>
</object>
</object>
