merging

Author: sreeder

ODMTools.py

@@ -57,6 +57,7 @@ def OnInit(self):
         kwargs['taskServer'] = self.taskserver
         kwargs['memdb']= self.memdb
         self.frame = frmODMToolsMain(**kwargs)
+        self.frame.CenterOnScreen()
         self.frame.Show(True)
         app= self.frame
         return True

odmtools/controller/NewFlagValuesController.py

@@ -9,25 +9,25 @@ def __init__(self, parent, series_service, qualifier_choice, record_service):
         self.series_service = series_service
         self.qualifer_choice = qualifier_choice
         self.record_service = record_service
-        self.__new_annotation = "[New Annontation]"
+        self.__new_annotation = "New Annontation"
 
         annotations = self.series_service.get_all_annotations()
         self.append_items_to_annotation(annotations)
         self.annotation_combo.SetSelection(0)
+        self.annotation_combo.Append(self.__new_annotation)
 
         self.cancel_button.Bind(wx.EVT_BUTTON, self.on_cancel)
         self.Bind(wx.EVT_CLOSE, self.on_cancel)
         self.ok_button.Bind(wx.EVT_BUTTON, self.on_ok)
         self.MakeModal(True)
 
     def append_items_to_annotation(self, annotations):
-        self.annotation_combo.Append(self.__new_annotation)
         if not isinstance(annotations, list):
             print "type(annotations) must be list of annotations"
             return
 
         for item in annotations:
-            self.annotation_combo.Append(str(item.AnnotationID))
+            self.annotation_combo.Append(str(item.AnnotationCode + ":" + item.AnnotationText))
 
     def on_cancel(self, event):
         self.MakeModal(False)
@@ -41,6 +41,16 @@ def on_ok(self, event):
             text = self.text_textbox.GetValue()
 
             annotation = self.series_service.create_annotation(code, text)
-            self.record_service.flag(annotation.AnnotationID)
+        else:
+            code = selection.split(':')[0]
+            annotation = self.series_service.get_annotation_by_code(code)
+        self.record_service.flag(annotation.AnnotationID)
 
         self.on_cancel(event)
+
+if __name__ == '__main__':
+    app = wx.App(False)
+    controller = NewFlagValuesController(None, None, None, None)
+    controller.Show()
+    app.MainLoop()
+

odmtools/controller/WizardMethodController.py

@@ -14,16 +14,17 @@ def __init__(self, parent, series_service):
         self.SetSizer(main_sizer)
 
         self.series_service = series_service
-        table_columns = ["Descriptions", "Link", "ID"]
+        table_columns = ["ID", "Descriptions", "Link", "Code", "Type"]
+        self.cv_types = []
         self.method_view.existing_method_table.set_columns(table_columns)
-        self.method_view.method_type_combo.AppendItems(["ABC"])
         self.on_auto_radio(None)
 
         self.method_view.auto_method_radio.Bind(wx.EVT_RADIOBUTTON, self.on_auto_radio)
         self.method_view.existing_method_radio.Bind(wx.EVT_RADIOBUTTON, self.on_existing_method_radio)
         self.method_view.create_method_radio.Bind(wx.EVT_RADIOBUTTON, self.on_create_method_radio)
 
         self.__fetch_data()
+        self.method_view.method_type_combo.AppendItems(self.cv_types)
 
     def on_auto_radio(self, event):
         self.method_view.existing_method_table.Enable(False)
@@ -53,28 +54,61 @@ def __fetch_data(self):
         data = []
         for meth in methods:
             data.append([
-                meth.MethodDescription,
-                meth.MethodLink,
-                meth.MethodID
+                meth.MethodID, meth.MethodDescription,
+                meth.MethodLink, meth.MethodCode,
+                meth.MethodTypeCV
             ])
 
+            if meth.MethodTypeCV not in self.cv_types:
+                self.cv_types.append(meth.MethodTypeCV)
+
         self.method_view.existing_method_table.set_table_content(data=data)
 
     def getMethod(self):
-        m = Method()
         if self.method_view.auto_method_radio.GetValue():
-            description = "Values derived from ODM Tools Python"
-            m = self.series_service.get_method_by_code(description)
-            if m is None:
-                m = Method()
-                m.description = description
-        elif self.method_view.existing_method_radio.GetValue():
-            index = self.method_view.existing_method_table.GetFirstSelected()
-            desc = self.method_view.existing_method_table.GetItem(index, 0).GetText()
-
-            m = self.series_service.get_method_by_code(desc)
-        elif self.method_view.create_method_radio.GetValue():
-            m.description = self.method_view.description_text_ctrl.GetValue()
-
-
-        return m
+            return self.__auto_generate_a_method()
+
+        if self.method_view.existing_method_radio.GetValue():
+            return self.__select_existing_method()
+
+        if self.method_view.create_method_radio.GetValue():
+            return self.__create_new_method()
+
+        return None
+
+    def __auto_generate_a_method(self):
+        code = "odmtools"
+        method = self.series_service.get_method_by_code(method_code=code)
+        if method is None:
+            method = Method()
+            method.MethodCode = code
+            method.MethodDescription = "Values derived from ODM Tools Python"
+        return method
+
+    def __select_existing_method(self):
+        index = self.method_view.existing_method_table.GetFirstSelected()
+        desc = self.method_view.existing_method_table.GetItem(index, 1).GetText()
+        link = self.method_view.existing_method_table.GetItem(index, 2).GetText()
+        code = self.method_view.existing_method_table.GetItem(index, 3).GetText()
+
+        method = self.series_service.get_method_by_code(method_code=code)
+        method.MethodLink = link
+        method.MethodDescription = desc
+        return method
+
+    def __create_new_method(self):
+        code = self.method_view.method_code_text_ctrl.GetValue()
+        name = self.method_view.method_name_text_ctrl.GetValue()
+        typeCV = self.method_view.method_type_combo.GetValue()
+        # organization = self.method_view.organization_combo.GetValue()
+        link = self.method_view.method_link_text_ctrl.GetValue()
+        description = self.method_view.description_text_ctrl.GetValue()
+
+        method = Method()
+        method.MethodCode = code
+        method.MethodName = name
+        method.MethodTypeCV = typeCV
+        method.MethodLink = link
+        method.MethodDescription = description
+
+        return method

odmtools/controller/WizardProcessLevelController.py

@@ -1,8 +1,7 @@
 import wx
 from odmtools.view.WizardProcessLevelView import WizardProcessLevelView
 from wx.wizard import WizardPageSimple
-# from odmtools.odmdata import QualityControlLevel
-from odm2api.ODM2.models import ProcessingLevels as QualityControlLevel
+from odm2api.ODM2.models import ProcessingLevels
 
 
 class WizardProcessLevelController(WizardPageSimple):
@@ -53,16 +52,29 @@ def __fetch_data(self):
 
         self.processing_level_view.existing_process_table.set_table_content(data=data)
 
-    def getQCL(self):
-        q = QualityControlLevel()
+    def get_processing_level(self):
         if self.processing_level_view.create_process_level_radio.GetValue():
-            q.code = self.processing_level_view.level_code_text_ctrl.GetValue()
-            q.definition = self.processing_level_view.definition_text_ctrl.GetValue()
-            q.explanation = self.processing_level_view.explanation_text_ctrl.GetValue()
+            return self.__select_existing_processing_level()
 
-        elif self.processing_level_view.existing_process_radio.GetValue():
-            selected_row = self.processing_level_view.existing_process_table.get_selected_row()
-            code = selected_row[0]
-            q = self.service_manager.get_series_service().get_processing_level_by_code(proc_level_code=code)
+        if self.processing_level_view.existing_process_radio.GetValue():
+            return self.__select_existing_processing_level()
 
-        return q
+        return None
+
+    def __select_existing_processing_level(self):
+        selected_row = self.processing_level_view.existing_process_table.get_selected_row()
+        code = selected_row[0]
+        proc_level = self.service_manager.get_series_service().get_processing_level_by_code(codes=code)
+        return proc_level
+
+    def __create_processing_level(self):
+        code = self.processing_level_view.level_code_text_ctrl.GetValue()
+        definition = self.processing_level_view.definition_text_ctrl.GetValue()
+        explanation = self.processing_level_view.explanation_text_ctrl.GetValue()
+
+        proc = ProcessingLevels()
+        proc.ProcessingLevelCode = code
+        proc.Definition = definition
+        proc.Explanation = explanation
+
+        return proc

odmtools/controller/WizardVariableController.py

@@ -83,8 +83,7 @@ def get_variable(self):
             v = self.service_manager.get_series_service().get_variable_by_code(code)
 
         elif self.variable_view.create_variable_radio.GetValue():
-            # v = self.createdVar
-            v = self.get_new_variable()
+            return self.get_new_variable()
 
         return v
 

odmtools/gui/wizSave.py

@@ -182,34 +182,34 @@ def __init__(self, parent, title, series_service):
 
 
     def fill_summary(self):
-        Site, Variable, Method, Source, QCL = self.parent.get_metadata()
+        sampling_feature, variable, method, source, processing_level = self.parent.get_metadata()
 
         ##        self.panel.treeSummary.SetItemText(self.panel.treeSummary.qc, "Code: "+ str(QCL.code))
 
 
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.sc, 'Code: ' + str(Site.code))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.sn, 'Name: ' + str(Site.name))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.sc, 'Code: ' + str(sampling_feature.SamplingFeatureCode))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.sn, 'Name: ' + str(sampling_feature.SamplingFeatureName))
 
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vc, 'Code: ' + str(Variable.code))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vn, 'Name: ' + str(Variable.name))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vu, 'Units: ' + str(Variable.variable_unit.name))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vsm, 'Sample Medium: ' + str(Variable.sample_medium))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vvt, 'Value Type: ' + str(Variable.value_type))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vts, 'Time Support: ' + str(Variable.time_support))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vtu, 'Time Units: ' + str(Variable.time_unit.name))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vdt, 'Data Type: ' + str(Variable.data_type))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vc, 'Code: ' + str(variable.VariableCode))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vn, 'Name: ' + str(variable.VariableNameCV))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vu, 'Units: ' + str(variable.variable_unit.name))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vsm, 'Sample Medium: ' + str(variable.sample_medium))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vvt, 'Value Type: ' + str(variable.value_type))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vts, 'Time Support: ' + str(variable.time_support))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vtu, 'Time Units: ' + str(variable.time_unit.name))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.vdt, 'Data Type: ' + str(variable.data_type))
         self.panel.treeSummary.SetItemText(self.panel.treeSummary.vgc,
-                                           'General Category: ' + str(Variable.general_category))
+                                           'General Category: ' + str(variable.general_category))
 
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.md, 'Description: ' + str(Method.description))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.md, 'Description: ' + str(method.description))
 
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.soo, 'Organization: ' + str(Source.organization))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.sod, 'Description: ' + str(Source.description))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.soc, 'Citation: ' + str(Source.citation))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.soo, 'Organization: ' + str(source.organization))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.sod, 'Description: ' + str(source.description))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.soc, 'Citation: ' + str(source.citation))
 
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.qc, 'Code: ' + str(QCL.code))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.qd, 'Definition: ' + str(QCL.definition))
-        self.panel.treeSummary.SetItemText(self.panel.treeSummary.qe, 'Explanation: ' + str(QCL.explanation))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.qc, 'Code: ' + str(processing_level.code))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.qd, 'Definition: ' + str(processing_level.definition))
+        self.panel.treeSummary.SetItemText(self.panel.treeSummary.qe, 'Explanation: ' + str(processing_level.explanation))
 
         self.panel.treeSummary.ExpandAll()
 
@@ -235,25 +235,29 @@ def _init_ctrls(self, prnt):
         self.Bind(wx.wizard.EVT_WIZARD_FINISHED, self.on_wizard_finished)
 
     def get_metadata(self):
+        method = None
+        variable = None
+        processing_level = None
+        source = None
 
         if self.pgIntro.pnlIntroduction.rbSaveAs.GetValue():
             logger.debug("SaveAs")
             method = self.pgMethod.getMethod()
-            qcl = self.pgQCL.getQCL()
+            processing_level = self.pgQCL.get_processing_level()
             variable = self.pgVariable.get_variable()
         elif self.pgIntro.pnlIntroduction.rbSave.GetValue():
             logger.debug("Save")
-            method = self.currSeries.method
-            qcl = self.currSeries.quality_control_level
+            method = self.currSeries.FeatureActionObj.ActionObj.MethodObj
+            processing_level = self.currSeries.quality_control_level
             variable = self.currSeries.variable
         elif self.pgIntro.pnlIntroduction.rbSaveExisting.GetValue():
             logger.debug("Existing")
-            method, qcl, variable = self.pgExisting.getSeries()
-        site = self.currSeries.site
-        source = self.currSeries.source
-        logger.debug("site: %s, variable: %s, method: %s, source: %s, qcl: %s" % (
-        str(site), str(variable), str(method), str(source), str(qcl)))
-        return site, variable, method, source, qcl
+            method, processing_level, variable = self.pgExisting.getSeries()
+        site = self.currSeries.FeatureActionObj.SamplingFeatureObj
+        # source = self.currSeries.source
+        logger.debug("site: %s, variable: %s, method: %s, source: %s, processing_level: %s" % (
+        str(site), str(variable), str(method), str(source), str(processing_level)))
+        return site, variable, method, source, processing_level
 
     def __init__(self, parent, service_manager, record_service):
         self._init_ctrls(parent)
@@ -352,7 +356,7 @@ def on_wizard_finished(self, event):
                                 wx.YES_NO | wx.ICON_QUESTION)
             if val == 2:
                 logger.info("User selected yes to save a level 0 dataset")
-                val_2 = wx.MessageBox("This action cannot be undone.\nAre you sure you are sure?\n",
+                val_2 = wx.MessageBox("This interactive_item cannot be undone.\nAre you sure you are sure?\n",
                                       'Are you REALLY sure?',
                                       wx.YES_NO | wx.ICON_QUESTION)
                 if val_2 == 2:
@@ -364,7 +368,7 @@ def on_wizard_finished(self, event):
             if self.pgExisting.pnlExisting.rbAppend.GetValue():
                 keyword = "append to"
 
-            message = "You are about to " + keyword + " an existing series_service,\nthis action cannot be undone.\nWould you like to continue?\n"
+            message = "You are about to " + keyword + " an existing series_service,\nthis interactive_item cannot be undone.\nWould you like to continue?\n"
             cont = wx.MessageBox(message, 'Are you sure?', wx.YES_NO | wx.ICON_QUESTION)
             if cont == 2:
                 closeSuccessful = True

odmtools/lib/ObjectListView/ListCtrlPrinter.py

@@ -76,7 +76,7 @@
 particular, it configures the printing DC so that its origin and scale are correct. This
 enables the ``ReportEngine`` to simply render the report without knowing the
 characteristics of the underlying printer DPI, unprintable region, or the scale of a print
-preview. When The ``ListCtrlPrintout`` encounters some action that is cannot perform (like
+preview. When The ``ListCtrlPrintout`` encounters some interactive_item that is cannot perform (like
 actually rendering a page) it calls back into ``ListCtrlPrinter`` (which simply forwards
 to the ``ReportEngine``).
 
@@ -1879,7 +1879,7 @@ def CalculateSlices(self, maxWidth, columnWidths):
         """
         firstColumn = 0
 
-        # If a GroupListView has a column just for the expand/collapse, don't include it
+        # If a GroupListView has a column just for the is_expanded/collapse, don't include it
         if hasattr(self.lv, "useExpansionColumn") and self.lv.useExpansionColumn:
             firstColumn = 1
 

odmtools/lib/ObjectListView/OLVEvent.py

@@ -229,10 +229,10 @@ def __init__(self, objectListView, groups):
 
 class ExpandCollapseEvent(VetoableEvent):
     """
-    The user wants to expand or collapse one or more groups, or has just done so.
+    The user wants to is_expanded or collapse one or more groups, or has just done so.
 
     If the handler calls Veto() for a Expanding or Collapsing event,
-    the expand/collapse action will be cancelled.
+    the is_expanded/collapse interactive_item will be cancelled.
 
     Calling Veto() has no effect on a Expanded or Collapsed event
     """