Skip to content

Commit ea0921f

Browse files
author
sreeder
committed
merge conflicts
1 parent b5d5daa commit ea0921f

14 files changed

Lines changed: 28 additions & 754 deletions

‎odmtools/common/taskServer.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,12 @@ def worker(cls, dispatcher):
131131
if task_type == "InitEditValues":
132132
connection = SeriesService("sqlite:///:memory:")
133133
df = task[1]
134-
<<<<<<< HEAD
135134
logger.debug("Load series from db")
136135
df.to_sql(name="DataValues", con=connection._connection.engine, flavor='sqlite', index = False, chunksize = 10000)
137-
=======
138-
logger.debug("Load series_service from db")
139-
df.to_sql(name="DataValues", con=connection._session_factory.engine, flavor='sqlite', index = False, chunksize = 10000)
140-
>>>>>>> origin/update_cvs
136+
# =======
137+
# logger.debug("Load series_service from db")
138+
# df.to_sql(name="DataValues", con=connection._session_factory.engine, flavor='sqlite', index = False, chunksize = 10000)
139+
# >>>>>>> origin/update_cvs
141140
logger.debug("done loading database")
142141
result = connection
143142
if task_type == "UpdateEditDF":

‎odmtools/controller/WizardMethodController.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import wx
22
from wx.wizard import WizardPageSimple
33
from odmtools.view.WizardMethodView import WizardMethodView
4-
from odmtools.odmdata import Method
4+
from odm2api.ODM2.models import Methods as Method
55

66

77
class WizardMethodController(WizardPageSimple):

‎odmtools/controller/WizardProcessLevelController.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import wx
22
from odmtools.view.WizardProcessLevelView import WizardProcessLevelView
33
from wx.wizard import WizardPageSimple
4-
from odmtools.odmdata import QualityControlLevel
4+
# from odmtools.odmdata import QualityControlLevel
5+
from odm2api.ODM2.models import ProcessingLevels as QualityControlLevel
56

67

78
class WizardProcessLevelController(WizardPageSimple):

‎odmtools/controller/WizardVariableController.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import wx
22
from odmtools.view.WizardVariableView import WizardVariableView
33
from wx.wizard import WizardPageSimple
4-
from odmtools.odmdata import Variable
5-
4+
# from odmtools.odmdata import Variable
5+
from odm2api.ODM2.models import Variables as Variable
66

77
class WizardVariableController(WizardPageSimple):
88
def __init__(self, parent, service_manager, current_variable):

‎odmtools/gui/frmODMTools.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,7 @@ def _init_s_Items(self, parent):
123123

124124
def _init_database(self, quit_if_cancel=True):
125125
logger.info("Loading Database...")
126-
<<<<<<< HEAD
127126

128-
=======
129-
>>>>>>> origin/update_cvs
130127
while True:
131128
## Database connection is valid, therefore proceed through the rest of the program
132129
if self.service_manager.is_valid_connection():

‎odmtools/gui/pageMethod.py‎

Lines changed: 0 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -18,129 +18,7 @@
1818
# logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
1919
logger =logging.getLogger('main')
2020

21-
<<<<<<< HEAD
2221

23-
class pnlMethod(wx.Panel):
24-
def _init_ctrls(self, prnt):
25-
# generated method, don't edit
26-
wx.Panel.__init__(self, id=wxID_PNLMETHOD, name=u'pnlMethod',
27-
parent=prnt, pos=wx.Point(135, 307), size=wx.Size(439, 357),
28-
style=wx.TAB_TRAVERSAL)
29-
self.SetClientSize(wx.Size(423, 319))
30-
31-
self.rbGenerate = wx.RadioButton(id=wxID_PNLMETHODSRBGENERATE,
32-
label=u'Automatically generate a Method ', name=u'rbGenerate',
33-
parent=self, pos=wx.Point(16, 8), size=wx.Size(392, 16), style=0)
34-
self.rbGenerate.SetValue(True)
35-
self.rbGenerate.Bind(wx.EVT_RADIOBUTTON, self.OnRbGenerateRadiobutton,
36-
id=wxID_PNLMETHODSRBGENERATE)
37-
38-
self.rbSelect = wx.RadioButton(id=wxID_PNLMETHODSRBSELECT,
39-
label=u'Select an existing Method', name=u'rbSelect', parent=self,
40-
pos=wx.Point(16, 32), size=wx.Size(392, 13), style=0)
41-
self.rbSelect.SetValue(False)
42-
self.rbSelect.Bind(wx.EVT_RADIOBUTTON, self.OnRbSelectRadiobutton,
43-
id=wxID_PNLMETHODSRBSELECT)
44-
45-
self.rbCreateNew = wx.RadioButton(id=wxID_PNLMETHODSRBCREATENEW,
46-
label=u'Create a new Method ', name=u'rbCreateNew', parent=self,
47-
pos=wx.Point(16, 208), size=wx.Size(392, 13), style=0)
48-
self.rbCreateNew.SetValue(False)
49-
self.rbCreateNew.Bind(wx.EVT_RADIOBUTTON, self.OnRbCreateNewRadiobutton,
50-
id=wxID_PNLMETHODSRBCREATENEW)
51-
52-
self.txtMethodDescrip = wx.richtext.RichTextCtrl(id=wxID_PNLMETHODSRICHTEXTCTRL1,
53-
parent=self, pos=wx.Point(16, 224), size=wx.Size(392, 84),
54-
style=wx.richtext.RE_MULTILINE, value=u'Method Description')
55-
self.txtMethodDescrip.Enable(False)
56-
self.txtMethodDescrip.Bind(wx.EVT_SET_FOCUS, self.OnTxtMethodDescripSetFocus)
57-
self.txtMethodDescrip.Bind(wx.EVT_KILL_FOCUS, self.OnTxtMethodDescripKillFocus)
58-
59-
self.lstMethods = wx.ListCtrl(id=wxID_PNLMETHODSLISTCTRL1,
60-
name='lstMethods', parent=self, pos=wx.Point(16, 48),
61-
size=wx.Size(392, 152), style=wx.LC_REPORT|wx.LC_SINGLE_SEL)
62-
self.lstMethods.Bind(wx.EVT_SET_FOCUS, self.OnLstMethodSetFocus)
63-
64-
65-
self.lstMethods.InsertColumn(0, 'Description')
66-
self.lstMethods.InsertColumn(1, 'Link')
67-
self.lstMethods.InsertColumn(2, 'id')
68-
self.lstMethods.SetColumnWidth(0, 200)
69-
self.lstMethods.SetColumnWidth(1, 153)
70-
self.lstMethods.SetColumnWidth(2,0)
71-
# self.lstMethods.Enable(False)
72-
73-
74-
75-
76-
def __init__(self, parent, id, pos, size, style, name, ss, method):
77-
self.series_service = ss
78-
self.prev_val = method
79-
self._init_ctrls(parent)
80-
81-
def OnLstMethodSetFocus(self, event):
82-
self.rbSelect.SetValue(True)
83-
84-
def OnRbGenerateRadiobutton(self, event):
85-
# self.lstMethods.Enable(False)
86-
self.txtMethodDescrip.Enable(False)
87-
88-
event.Skip()
89-
90-
def OnRbSelectRadiobutton(self, event):
91-
self.lstMethods.Enable(True)
92-
self.txtMethodDescrip.Enable(False)
93-
94-
event.Skip()
95-
96-
def OnRbCreateNewRadiobutton(self, event):
97-
# self.lstMethods.Enable(False)
98-
self.txtMethodDescrip.Enable(True)
99-
100-
event.Skip()
101-
102-
def OnTxtMethodDescripSetFocus(self, event):
103-
if self.txtMethodDescrip.GetValue() =="Method Description":
104-
self.txtMethodDescrip.SetValue("")
105-
106-
event.Skip()
107-
108-
def OnTxtMethodDescripKillFocus(self, event):
109-
if self.txtMethodDescrip.GetValue() =="":
110-
self.txtMethodDescrip.SetValue("Method Description")
111-
112-
event.Skip()
113-
114-
115-
def getMethod(self):
116-
117-
m = None
118-
if self.rbGenerate.Value:
119-
genmethod = "Values derived from ODM Tools Python"
120-
121-
m= self.series_service.get_method_by_description(genmethod)
122-
if m is None:
123-
logger.debug("assigning new method description")
124-
m = Methods()
125-
m.MethodDescription = genmethod
126-
127-
128-
elif self.rbSelect.Value:
129-
index = self.lstMethods.GetFirstSelected()
130-
desc= self.lstMethods.GetItem(index, 0).GetText()
131-
132-
logger.debug(desc)
133-
m= self.series_service.get_method_by_description(desc)
134-
135-
136-
137-
elif self.rbCreateNew.Value:
138-
139-
logger.debug("assigning new method description")
140-
m.description = self.txtMethodDescrip.GetValue()
141-
142-
return m
143-
=======
14422
class pnlMethod(wx.Panel): # Rename this to page method view
14523
def __init__(self, parent):
14624
wx.Panel.__init__(self, parent)
@@ -324,4 +202,3 @@ def __init__(self, parent):
324202
# logger.debug("assigning new method description")
325203
# m.description = self.txtMethodDescrip.GetValue()
326204
# return m
327-
>>>>>>> origin/update_cvs

‎odmtools/gui/plotProbability.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,10 @@ def updatePlot(self):
133133
self.plots.set_title("\n".join(textwrap.wrap(oneSeries.siteName, 55)))
134134

135135
if len(oneSeries.dataTable) > 0:
136-
<<<<<<< HEAD
136+
137137
#self.prob.append(
138138
#prop = oneSeries.Probability.plot(column="DataValue", ax=self.plots)
139139
#todo FutureWarning: order is deprecated, use sort_values(...)
140-
=======
141-
>>>>>>> origin/update_cvs
142140
xValues = oneSeries.Probability.xAxis.sort_values().values
143141
yValues = oneSeries.Probability.yAxis.sort_values().values
144142

‎odmtools/odmdata/__init__.py‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
3-
from base import Base
4-
from censor_code_cv import CensorCodeCV
5-
from data_type_cv import DataTypeCV
6-
from data_value import DataValue
7-
from general_category_cv import GeneralCategoryCV
8-
from iso_metadata import ISOMetadata
9-
from lab_method import LabMethod
10-
from method import Method
11-
from odm_version import ODMVersion
12-
from offset_type import OffsetType
13-
from qualifier import Qualifier
14-
from quality_control_level import QualityControlLevel
15-
from sample import Sample
16-
from sample_medium_cv import SampleMediumCV
17-
from sample_type_cv import SampleTypeCV
18-
from series import Series
19-
from odm2api.ODMconnection import SessionFactory
20-
from site import Site
21-
from site_type_cv import SiteTypeCV
22-
from source import Source
23-
from spatial_reference import SpatialReference
24-
from speciation_cv import SpeciationCV
25-
from topic_category_cv import TopicCategoryCV
26-
from unit import Unit
27-
from value_type_cv import ValueTypeCV
28-
from variable import Variable
29-
from variable_name_cv import VariableNameCV
30-
from vertical_datum_cv import VerticalDatumCV
31-
from memory_database import MemoryDatabase
32-
>>>>>>> origin/update_cvs
33-
341

352

363
#from odm2api.ODM1_1_1.services import SeriesService#, refreshDB

‎odmtools/odmdata/memory_database.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,7 @@ def initEditValues(self, seriesID):
230230
self.df.to_sql(name="DataValues", if_exists='replace', con=self.mem_service._session_factory.engine,
231231
index=False)#,flavor='sqlite', chunksize=10000)
232232
logger.debug("done loading database")
233-
<<<<<<< HEAD
234-
=======
235-
else:
236-
logger.debug("no data in series_service")
237-
>>>>>>> origin/update_cvs
233+
238234

239235

240236
#TODO: update to work with ODM2

‎odmtools/odmservices/__init__.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,12 @@
1111

1212
from odm2api.ODM1_1_1.services import EditService, ExportService#, , CVService, SeriesService,
1313
from series_service import SeriesService
14-
<<<<<<< HEAD
1514
from service_manager import ServiceManager
16-
=======
17-
from ReadService import ReadService
18-
from edit_service import EditService
19-
from export_service import ExportService
20-
>>>>>>> origin/update_cvs
2115

2216

2317
__all__ = [
2418
'EditService',
25-
<<<<<<< HEAD
2619
#'CVService',
27-
=======
28-
'ReadService',
29-
>>>>>>> origin/update_cvs
3020
'SeriesService',
3121
'ExportService',
3222
'ServiceManager',

0 commit comments

Comments
 (0)