minor 1.0.1

linz · Nov 2, 2016 · dfb328f · dfb328f
1 parent b6561b5
commit dfb328f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 18 deletions.
diff --git a/AimsUI/AimsClient/Gui/DictionaryList.py b/AimsUI/AimsClient/Gui/DictionaryList.py
@@ -11,7 +11,7 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-from qgis.core import * # temp for testing
+from qgis.core import *
 
 # DictionaryListView and DictionaryListModel.  
 

diff --git a/AimsUI/AimsClient/Gui/QueueEditorWidget.py b/AimsUI/AimsClient/Gui/QueueEditorWidget.py
@@ -66,12 +66,7 @@ def __init__( self, parent=None, controller=None ):
         hide = (self.uExternalObjectId, self.uExtObjectIdScheme, 
                  self.lExtObjectIdScheme,  self.lExternalObjectId
                  )
-
-        """ self.uObjectType, self.uObjectName, self.uPositionType, self.uUpdatePosButton
-                , self.uExtObjectIdScheme, self.uExternalObjectId, self.uValuationReference
-                , self.uCertificateOfTitle, self.uAppellation, self.uMblkOverride
-        """
-
+
         for uiElement in hide:
             uiElement.hide()
 
@@ -161,8 +156,6 @@ def reinstateEdits(self):
                 elif isinstance(getattr(self, uiElement), QComboBox) and getattr(self, v[0]):
                     getattr(self, uiElement).setCurrentIndex(QComboBox.findText(getattr(self, uiElement),getattr(self, v[0])))
 
-
-                    #uiElement.setCurrentIndex(QComboBox.findText(uiElement, prop))
     def clearEdits(self):
         """
         set all temp properties to None

diff --git a/AimsUI/AimsClient/Gui/QueueModelView.py b/AimsUI/AimsClient/Gui/QueueModelView.py
@@ -230,8 +230,8 @@ def __init__(self, data = None, featureModel = None, headerdata = None, parent=N
         @type headerdata: list    
         @param parent: Inherits from QtGui.QWidget
 
-
         """
+
         QAbstractTableModel.__init__(self, parent)
         self.dummyData = {('','', '', '', ''): [['', '', '', '', '']]}
         if not data: data = self.dummyData

diff --git a/AimsUI/AimsClient/Gui/ReviewQueueWidget.py b/AimsUI/AimsClient/Gui/ReviewQueueWidget.py
@@ -24,7 +24,7 @@
 
 from AIMSDataManager.AimsLogging import Logger
 
-import sys # temp
+import sys # temp - debugging
 
 # Dev only - debugging
 try:

diff --git a/AimsUI/AimsClient/Gui/UiUtility.py b/AimsUI/AimsClient/Gui/UiUtility.py
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2015 Crown copyright (c)
+# Copyright 2016 Crown copyright (c)
 # Land Information New Zealand and the New Zealand Government.
 # All rights reserved
 #

diff --git a/AimsUI/DelAddressTool.py b/AimsUI/DelAddressTool.py
@@ -165,7 +165,7 @@ def selectionToRetirementJson(self, selected):
             retireIds = {}        
             retireIds['version'] = i['version']
             retireIds['components'] = {'addressId': i['addressId']}
-            retireIds['address'] = i['fullAddress'] #this data not required by the API but useful for error reporting
+            retireIds['address'] = i['fullAddress']
             retireFeatures.append(retireIds)
         return retireFeatures        
 

diff --git a/AimsUI/LayerManager.py b/AimsUI/LayerManager.py
@@ -521,7 +521,7 @@ def notify(self, feedType):
         @param feedType: Type of AIMS API
         @type  feedType: AIMSDataManager.FeatureFactory.FeedRef
         """
-        uilog.info('<<<<<<<<<<<<<<<<< NOTIFY >>>>>>>>>>>>>>>')
+
         uilog.info('*** NOTIFY ***     Notify A[{}]'.format(feedType))
         if feedType == FEEDS['AF']:
             self.getAimsFeatures()

diff --git a/AimsUI/LineageTool.py b/AimsUI/LineageTool.py
@@ -9,6 +9,10 @@
 #
 ################################################################################
 
+# Removed from "go live" schedule
+
+"""
+
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
@@ -148,4 +152,4 @@ def groupIdChanged(self):
         if len(self.uGroupId.text()) != 0:
             self.uGroupDescription.setEnabled(False)
         else: self.uGroupDescription.setEnabled(True)
-        
+"""
diff --git a/metadata.txt b/metadata.txt
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# Copyright 2015 Crown copyright (c)
+# Copyright 2016 Crown copyright (c)
 # Land Information New Zealand and the New Zealand Government.
 # All rights reserved
 #
@@ -14,10 +14,10 @@ name=Aims Plugin
 description=QGIS Plugin for managing LINZ address information
 about=QGIS Plugin for managing LINZ address information
 category=Vector
-version=0.8.24
+version=1.0.1
 experimental=True
 qgisMinimumVersion=2.6
-author=splanzer
+author=LINZ
 email=splanzer@linz.govt.nz
 icon=./resources/loadaddress.png
 homepage=https://github.com/linz/QGIS-AIMS-Plugin