Merge pull request #136 from usgs/dev

Dev

ArcToolbox/introspector.py

@@ -70,7 +70,7 @@ def introspect_dataset(fname):
         elif field_type == "Geometry":
             contents = [
                 "Feature geometry.",
-                "Coordinates defining the features.",
+                "Shape type.",
                 "ESRI",
             ]
 

pymdwizard/gui/attributes.py

@@ -179,7 +179,7 @@ def clear_children(self):
 
     def get_attr(self, which):
         for attr in self.attrs:
-            if mdattr.ui.fgdc_attrlabl.text() == which:
+            if attr.ui.fgdc_attrlabl.text() == which:
                 return attr
         return None
 

pymdwizard/gui/detailed.py

@@ -117,7 +117,6 @@ def browse(self):
         if fname[0]:
             settings.setValue("lastDataFname", fname[0])
             try:
-
                 self.populate_from_fname(fname[0])
             except BaseException as e:
                 import traceback
@@ -214,7 +213,7 @@ def populate_from_fname(self, fname):
                 shape_attr.ui.fgdc_attrdef.setPlainText("Feature geometry.")
                 utils.set_text(shape_attr.ui.fgdc_attrdefs, "ESRI")
                 shape_attr.domain.ui.fgdc_udom.setPlainText(
-                    "Coordinates defining the features."
+                    "Shape type."
                 )
                 shape_attr.store_current_content()
                 shape_attr.supersize_me()

pymdwizard/gui/ui_files/UI_useconst.py

@@ -12,17 +12,23 @@
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName("Form")
-        Form.resize(700, 130)
-        Form.setMinimumSize(QtCore.QSize(0, 130))
-        Form.setMaximumSize(QtCore.QSize(16777215, 165))
+        Form.resize(592, 140)
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum
+        )
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
+        Form.setSizePolicy(sizePolicy)
+        Form.setMinimumSize(QtCore.QSize(0, 135))
+        Form.setMaximumSize(QtCore.QSize(16777215, 16777215))
         font = QtGui.QFont()
         font.setFamily("Arial")
         font.setPointSize(9)
         Form.setFont(font)
-        self.gridLayout = QtWidgets.QGridLayout(Form)
-        self.gridLayout.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout.setHorizontalSpacing(3)
-        self.gridLayout.setObjectName("gridLayout")
+        self.verticalLayout = QtWidgets.QVBoxLayout(Form)
+        self.verticalLayout.setContentsMargins(3, 3, 3, 3)
+        self.verticalLayout.setObjectName("verticalLayout")
         self.groupBox = QtWidgets.QGroupBox(Form)
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum
@@ -32,17 +38,23 @@ def setupUi(self, Form):
         sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth())
         self.groupBox.setSizePolicy(sizePolicy)
         self.groupBox.setObjectName("groupBox")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox)
-        self.verticalLayout.setContentsMargins(3, 3, 3, -1)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.label = QtWidgets.QLabel(self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum
+        )
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.label.setSizePolicy(sizePolicy)
         font = QtGui.QFont()
         font.setItalic(True)
         self.label.setFont(font)
         self.label.setStyleSheet("font: italic;")
         self.label.setWordWrap(True)
         self.label.setObjectName("label")
-        self.verticalLayout.addWidget(self.label)
+        self.verticalLayout_2.addWidget(self.label)
         self.fgdc_useconst = GrowingTextEdit(self.groupBox)
         sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
@@ -53,11 +65,9 @@ def setupUi(self, Form):
             self.fgdc_useconst.sizePolicy().hasHeightForWidth()
         )
         self.fgdc_useconst.setSizePolicy(sizePolicy)
-        self.fgdc_useconst.setMinimumSize(QtCore.QSize(0, 45))
-        self.fgdc_useconst.setMaximumSize(QtCore.QSize(16777215, 16777215))
         self.fgdc_useconst.setObjectName("fgdc_useconst")
-        self.verticalLayout.addWidget(self.fgdc_useconst)
-        self.gridLayout.addWidget(self.groupBox, 0, 0, 1, 1)
+        self.verticalLayout_2.addWidget(self.fgdc_useconst)
+        self.verticalLayout.addWidget(self.groupBox)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)

pymdwizard/resources/CSDGM_Template.xml

@@ -107,7 +107,7 @@
         <cntemail>sciencebase@usgs.gov</cntemail>
       </cntinfo>
     </distrib>
-    <distliab>Unless otherwise stated, all data, metadata and related materials are considered to satisfy the quality standards relative to the purpose for which the data were collected. Although these data and associated metadata have been reviewed for accuracy and completeness and approved for release by the U.S. Geological Survey (USGS), no warranty expressed or implied is made regarding the display or utility of the data on any other system or for general or scientific purposes, nor shall the act of distribution constitute any such warranty.</distliab>
+    <distliab>Unless otherwise stated, all data, metadata and related materials are considered to satisfy the quality standards relative to the purpose for which the data were collected. Although these data and associated metadata have been reviewed for accuracy and completeness and approved for release by the U.S. Geological Survey (USGS), no warranty expressed or implied is made regarding the display or utility of the data for other purposes, nor on all computer systems, nor shall the act of distribution constitute any such warranty.</distliab>
     <stdorder>
       <digform>
         <digtinfo>