fixing new import paths

Author: denvaar

src/controllers/Database.py

@@ -8,8 +8,8 @@
 
 # sys.path.append('/home/denver/Documents/ODM2PythonAPI')
 
-from api.ODMconnection import dbconnection
-from api.ODM2.services import *
+from odm2api.ODMconnection import dbconnection
+from odm2api.ODM2.services import *
 
 
 

src/wizard/controller/frmActionsSelectPanel.py

@@ -1,8 +1,8 @@
 import wx
 
-from api.ODMconnection import dbconnection
+from odm2api.ODMconnection import dbconnection
 #TODO get rid of *
-from api.ODM2.services.readService import *
+from odm2api.ODM2.services.readService import *
 from src.wizard.controller.frmNewSeriesDialog \
     import NewSeriesDialog
 from src.wizard.controller.frmAddNewActionsPanel \

src/wizard/controller/frmAddNewSampFeatPanel.py

@@ -3,9 +3,9 @@
 import uuid
 # TODO 
 # Clean these up.
-from api.ODM2.services.createService import *
-from api.ODM2.services.readService import *
-from api.ODMconnection import dbconnection
+from odm2api.ODM2.services.createService import *
+from odm2api.ODM2.services.readService import *
+from odm2api.ODMconnection import dbconnection
 
 from src.wizard.view.clsAddNewSampFeatPanel import AddNewSampFeatPanelView
 #from src.wizard.view.clsAddSpatialReferences import NewSpatialReferenceView

src/wizard/controller/frmDataConfigPanel.py

@@ -11,7 +11,7 @@
 from src.wizard.controller.frmVirtualGrid import GridBase
 from src.wizard.controller.frmSeriesDialog import SeriesSelectDialog
 from src.wizard.models.ResultMapping import ResultMapping
-from api.ODM2.services.readService import ReadODM2
+from odm2api.ODM2.services.readService import ReadODM2
 
 class DataConfigPanelController(DataConfigPanelView):
     def __init__(self, daddy, **kwargs):

src/wizard/controller/frmDatabaseConfigPanel.py

@@ -3,7 +3,7 @@
 from collections import namedtuple
 
 from src.wizard.view.clsDBConfig import clsDBConfiguration
-from api.ODMconnection import dbconnection
+from odm2api.ODMconnection import dbconnection
 from src.common.functions import searchDict
 
 from src.wizard.controller.frmChainedDialogPage import ChainedDialogPage

src/wizard/controller/frmProcLevelSelectPanel.py

@@ -1,8 +1,8 @@
 import wx
 
-from api.ODMconnection import dbconnection
+from odm2api.ODMconnection import dbconnection
 #TODO get rid of *
-from api.ODM2.services.readService import *
+from odm2api.ODM2.services.readService import *
 from src.controllers.Database import Database
 from src.wizard.controller.frmAddNewProcLevelPanel \
     import AddNewProcLevelPanelController

src/wizard/controller/frmResultSummaryPanel.py

@@ -3,9 +3,9 @@
 from datetime import datetime
 import dateutil.parser as dparser
 
-from api.ODMconnection import dbconnection
+from odm2api.ODMconnection import dbconnection
 #TODO get rid of *
-from api.ODM2.services.readService import *
+from odm2api.ODM2.services.readService import *
 #from src.wizard.controller.frmNewSeriesDialog import NewSeriesDialog
 #from src.wizard.controller.frmAddNewResultsPanel import AddNewResultsPanelController
 #from src.wizard.controller.frmSeriesSelectPanel import SeriesSelectPanel
@@ -14,8 +14,8 @@
 from src.wizard.view.clsCustomDialog import CustomDialog
 
 from src.wizard.view.clsResultPage import ResultPageView
-from api.ODM2.services.readService import *
-from api.ODM2.services.createService import *
+from odm2api.ODM2.services.readService import *
+from odm2api.ODM2.services.createService import *
 
 from ObjectListView import ObjectListView, ColumnDefn
 

src/wizard/controller/frmResultsSelectPanel.py

@@ -1,8 +1,8 @@
 import wx
 
-from api.ODMconnection import dbconnection
+from odm2api.ODMconnection import dbconnection
 #TODO get rid of *
-from api.ODM2.services.readService import *
+from odm2api.ODM2.services.readService import *
 from src.wizard.controller.frmNewSeriesDialog import NewSeriesDialog
 from src.wizard.controller.frmAddNewResultsPanel import AddNewResultsPanelController
 from src.wizard.controller.frmSeriesSelectPanel import SeriesSelectPanel

src/wizard/controller/frmSampFeatSelectPanel.py

@@ -1,8 +1,8 @@
 import wx
 
-from api.ODMconnection import dbconnection
+from odm2api.ODMconnection import dbconnection
 #TODO get rid of *
-from api.ODM2.services.readService \
+from odm2api.ODM2.services.readService \
     import *
 from src.wizard.controller.frmNewSeriesDialog \
     import NewSeriesDialog

src/wizard/controller/frmSeriesDialog.py

@@ -22,7 +22,7 @@
 from src.wizard.controller.frmResultSummaryPanel \
     import ResultSummaryPanel
 
-from api.ODM2.services.readService \
+from odm2api.ODM2.services.readService \
     import DetailedResult
 
 from src.wizard.models.ResultMapping import ResultMapping