mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00788
[Branch ~cdd-dev/cdd/trunk] Rev 301: Deletion of unused code
------------------------------------------------------------
revno: 301
committer: Eduardo Ribeiro <xcesar@xxxxxxxxx>
branch nick: devel
timestamp: Tue 2013-01-22 00:59:18 -0200
message:
Deletion of unused code
modified:
src/2.0/cdd.py
--
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 2013-01-22 02:58:54 +0000
+++ src/2.0/cdd.py 2013-01-22 02:59:18 +0000
@@ -29,13 +29,10 @@
import wx
from wx.lib.wordwrap import wordwrap
-from wx.gizmos import EditableListBox
import cdd_gui
from aux_gui import *
-
-
class Slot(cdd_gui.Slot):
def __init__(self, *args, **kwds):
cdd_gui.Slot.__init__(self, *args, **kwds)
@@ -109,7 +106,7 @@
tree = top_panel.tree_ctrl_ccd
sel = tree.GetSelection()
old_first_name = tree.GetItemText(sel).split(' ')[0]
- tree.SetItemText(sel, old_first_name + ' .' + name)
+ tree.SetItemText(sel, old_first_name + ' . ' + name)
def evt_radiobox_language(self, event): # wxGlade: DvIdentifier.<event_handler>
@@ -224,8 +221,6 @@
self.suffix = kwds.pop('suffix', '')
cdd_gui.Cluster.__init__(self, *args, **kwds)
-
-
def evt_button_ok(self):
top_panel = self.GetTopLevelParent()
tree = top_panel.tree_ctrl_ccd
@@ -234,11 +229,14 @@
subject = None
if self.radio_btn_cluster.GetValue():
subject = self.text_ctrl_cluster.GetValue()
- sel_string = 'Cluster' + self.suffix + ' .' + subject
+ sel_string = 'Cluster' + ' . ' + subject if subject else 'Cluster'
elif self.radio_btn_element.GetValue():
- sel_string = 'Element' + self.suffix
+ sel_string = 'Element'
elif self.radio_btn_slot.GetValue():
- sel_string = 'Slot' + self.suffix
+ sel_string = 'Slot'
+
+ if self.suffix:
+ sel_string += ' - ' + self.suffix
i = tree.AppendItem(item, sel_string)
top_panel.set_item_index(i)
@@ -252,9 +250,7 @@
child, cookie = tree.GetFirstChild(tree_selected)
while child.IsOk():
txt = tree.GetItemText(child)
- splitted = txt.split()
-
- if splitted.count('Data'):
+ if txt.endswith(self.suffix):
tree.Delete(child)
return
@@ -263,53 +259,6 @@
# end of class Cluster
-# class ClusterEmbed(Cluster):
-# def __init__(self, *args, **kwds):
-# self.suffix = kwds.pop('suffix', '')
-
-# Cluster.__init__(self, *args, **kwds)
-# self.Bind(wx.EVT_RADIOBUTTON, self.evt_radio_button)
-
-# def evt_radio_button(self, event):
-
-# top_panel = self.GetTopLevelParent()
-# 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)
-# while child.IsOk():
-# txt = tree.GetItemText(child)
-# if txt.endswith(self.suffix):
-# tree.InsertItem(tree_selected, child, sel_string)
-# tree.Delete(child)
-# return
-
-# child, cookie = tree.GetNextChild(tree_selected, cookie)
-
-
-
-# i = tree.AppendItem(tree_selected, sel_string)
-# top_panel.set_item_index(i)
-# tree.Expand(tree_selected)
-
-# # Undefining parent function
-# def evt_button_ok(self):
-# pass
-
class Element(cdd_gui.Element):
def __init__(self, *args, **kwds):
cdd_gui.Element.__init__(self, *args, **kwds)
@@ -367,7 +316,7 @@
sel_string = self.radio_btn_demographic_entry.GetLabel()
elif self.radio_btn_cluster.GetValue():
subject = self.text_ctrl_cluster.GetValue()
- sel_string = self.radio_btn_cluster.GetLabel() + ' .' + subject
+ sel_string = self.radio_btn_cluster.GetLabel() + ' . ' + subject if subject else self.radio_btn_cluster.GetLabel()
elif self.radio_btn_element.GetValue():
sel_string = self.radio_btn_element.GetLabel()
@@ -388,9 +337,12 @@
item = tree.GetSelection()
if self.radio_btn_party_self.GetValue():
- sel_string = 'PartySelf' + self.suffix
+ sel_string = 'PartySelf'
elif self.radio_btn_party_identified.GetValue():
- sel_string = 'PartyIdentified' + self.suffix
+ sel_string = 'PartyIdentified'
+
+ if self.suffix:
+ sel_string += ' - ' + self.suffix
i = tree.AppendItem(item, sel_string)
top_panel.set_item_index(i)
@@ -495,74 +447,6 @@
tab = DvURI(self.notebook_care_entry)
self.notebook_care_entry.AddPage(tab, 'WorkflowId')
- def evt_radiobox_data(self, event): # wxGlade: CareEntry.<event_handler>
-
- top_panel = self.GetTopLevelParent()
- tree = top_panel.tree_ctrl_ccd
- tree_selected = tree.GetSelection()
-
- sel_string = self.radio_box_data.GetStringSelection() + ' - Data'
-
- child, cookie = tree.GetFirstChild(tree_selected)
- while child.IsOk():
- txt = tree.GetItemText(child)
- if txt.endswith('Data'):
- tree.InsertItem(tree_selected, child, sel_string)
- tree.Delete(child)
- return
-
- child, cookie = tree.GetNextChild(tree_selected, cookie)
-
- i = tree.AppendItem(tree_selected, sel_string)
- top_panel.set_item_index(i)
- tree.Expand(tree_selected)
-
- def evt_radio_box_provider(self, event): # wxGlade: CareEntry.<event_handler>
- top_panel = self.GetTopLevelParent()
- tree = top_panel.tree_ctrl_ccd
- tree_selected = tree.GetSelection()
-
- sel_string = self.radio_box_provider.GetStringSelection() + ' - Provider'
- child, cookie = tree.GetFirstChild(tree_selected)
- while child.IsOk():
- txt = tree.GetItemText(child)
- if txt.endswith('Provider'):
- tree.InsertItem(tree_selected, child, sel_string)
- tree.Delete(child)
- return
-
- child, cookie = tree.GetNextChild(tree_selected, cookie)
-
-
-
- i = tree.AppendItem(tree_selected, sel_string)
- top_panel.set_item_index(i)
-
- tree.Expand(tree_selected)
-
- def evt_radiobox_subject(self, event): # wxGlade: CareEntry.<event_handler>
- top_panel = self.GetTopLevelParent()
- tree = top_panel.tree_ctrl_ccd
- tree_selected = tree.GetSelection()
-
- sel_string = self.radio_box_subject.GetStringSelection() + ' - Subject'
- child, cookie = tree.GetFirstChild(tree_selected)
- while child.IsOk():
- txt = tree.GetItemText(child)
- if txt.endswith('Subject'):
- tree.InsertItem(tree_selected, child, sel_string)
- tree.Delete(child)
- return
-
- child, cookie = tree.GetNextChild(tree_selected, cookie)
-
-
-
- i = tree.AppendItem(tree_selected, sel_string)
- top_panel.set_item_index(i)
-
- tree.Expand(tree_selected)
-
def evt_radiobox_language(self, event): # wxGlade: CareEntry.<event_handler>
state = self.radio_box_language.GetSelection()
@@ -573,19 +457,19 @@
def evt_button_data(self, event): # wxGlade: CareEntry.<event_handler>
"Opens another tab with a Cluster panel on it"
- tab = Cluster(self.notebook_care_entry, suffix=' - Data')
+ tab = Cluster(self.notebook_care_entry, suffix='Data')
self.notebook_care_entry.AddPage(tab, 'Data')
def evt_button_provider(self, event): # wxGlade: CareEntry.<event_handler>
"Opens another tab with a Cluster panel on it"
- tab = Cluster(self.notebook_care_entry, suffix=' - Provider')
+ tab = Cluster(self.notebook_care_entry, suffix='Provider')
self.notebook_care_entry.AddPage(tab, 'Provider')
def evt_button_subject(self, event): # wxGlade: CareEntry.<event_handler>
"Opens another tab with a Cluster panel on it"
- tab = Party(self.notebook_care_entry, suffix=' - Subject')
+ tab = Party(self.notebook_care_entry, suffix='Subject')
self.notebook_care_entry.AddPage(tab, 'Subject')
@@ -855,30 +739,21 @@
def evt_tree_delete_item(self, event): # wxGlade: MainFrame.<event_handler>
pass
+
def file_new(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `file_new' not implemented"
- event.Skip()
def file_open(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `file_open' not implemented"
- event.Skip()
def file_save(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `file_save' not implemented"
- event.Skip()
def file_save_as(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `file_save_as' not implemented"
- event.Skip()
def file_validate(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `file_validate' not implemented"
- event.Skip()
def file_quit(self, event): # wxGlade: MainFrame.<event_handler>
dlg = wx.MessageDialog(self,
@@ -891,8 +766,6 @@
def project_new(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `project_new' not implemented"
- event.Skip()
def config_options(self, event): # wxGlade: MainFrame.<event_handler>
result = self.config_dialog.ShowModal()
@@ -945,18 +818,12 @@
def export_xform(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `export_xform' not implemented"
- event.Skip()
def edit_undo(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `edit_undo' not implemented"
- event.Skip()
def edit_redo(self, event): # wxGlade: MainFrame.<event_handler>
not_implemented_diag(self)
- print "Event handler `edit_redo' not implemented"
- event.Skip()
# end of class MainFrame
