Instantiate nodata edom on supersize to lower memory needs

on files with numerours attrs. Delete on regularsize
ColinTalbert · May 4, 2018 · f52bb86 · f52bb86
1 parent ea4aa26
commit f52bb86
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 21 deletions.
diff --git a/pymdwizard/gui/attr.py b/pymdwizard/gui/attr.py
@@ -87,7 +87,7 @@ def __init__(self, parent=None):
         self.ef = 0
 
         self.nodata = None
-        self.nodata_edom = edom.Edom()
+        self.nodata_content = (False, None) # nodata checked, last nodata node
 
         WizardWidget.__init__(self, parent=parent)
 
@@ -129,10 +129,9 @@ def build_ui(self):
         self.ui.fgdc_attrdefs.mousePressEvent = self.attrdefs_press
         self.ui.comboBox.mousePressEvent = self.combo_press
         self.ui.rbtn_nodata_yes.toggled.connect(self.include_nodata_change)
-        self.nodata_edom.ui.fgdc_edomv.textChanged.connect(self.nodata_changed)
+
         self.domain = None
         self.ui.nodata_content.hide()
-        self.ui.nodata_content.layout().addWidget(self.nodata_edom)
         self.ui.rbtn_nodata_no.setChecked(True)
         self.ui.comboBox.setCurrentIndex(3)
 
@@ -149,13 +148,12 @@ def include_nodata_change(self, b):
             None
             """
         if b:
-            # self.ui.nodata_section.show()
-            self.nodata
-            self.nodata_edom.show()
+            self.ui.nodata_section.show()
+            # self.nodata
+            # self.nodata_edom.show()
         else:
-            # self.ui.nodata_section.hide()
-            self.nodata_edom.hide()
-            self.nodata = None
+            self.ui.nodata_section.hide()
+            # self.nodata = None
 
     def mousePressEvent(self, event):
         self.activate()
@@ -181,6 +179,11 @@ def clear_domain(self):
             if isinstance(child, QWidget):
                 child.deleteLater()
 
+        try:
+            self.nodata_edom.deleteLater()
+        except:
+            pass
+
     def set_series(self, series):
         """
         store a series with this attri
@@ -248,6 +251,12 @@ def store_current_content(self):
             elif cur_xml.tag == 'attr':
                 self._domain_content[0] = cur_xml
 
+        if self.ui.rbtn_nodata_yes.isChecked():
+            self.nodata_content = (True, self.nodata_edom.to_xml())
+        else:
+            self.nodata_content = (False, self.nodata_edom.to_xml())
+
+
     def populate_domain_content(self, which='guess'):
         """
         Fill out this widget with the content from it's associated series
@@ -353,11 +362,19 @@ def supersize_me(self):
             self.animation.setEndValue(QSize(345, self.height()))
             self.animation.start()
             self.ui.attrdomv_contents.show()
-            self.ui.nodata_content.show()
             self.ui.place_holder.hide()
             cbo = self.ui.comboBox
             self.populate_domain_content(cbo.currentIndex())
 
+            self.ui.nodata_content.show()
+            self.nodata_edom = edom.Edom()
+            self.ui.rbtn_nodata_yes.setChecked(self.nodata_content[0])
+            if self.nodata_content[1] is not None:
+                self.nodata_edom.from_xml(self.nodata_content[1])
+
+            self.nodata_edom.ui.fgdc_edomv.textChanged.connect(self.nodata_changed)
+            self.ui.nodata_section.layout().addWidget(self.nodata_edom)
+
     def regularsize_me(self):
         """
         Collapse this attribute and hide it's content
@@ -419,15 +436,18 @@ def sniff_nodata(self):
             if nd in list(uniques):
                 self.nodata = nd
 
-        if self.nodata is not None:
-            self.ui.rbtn_nodata_yes.setChecked(True)
+        if self.nodata is None:
+            self.nodata_content = (False, self.nodata_content[1])
+        else:
+            temp_edom = edom.Edom()
             if self.nodata == '':
-                self.nodata_edom.ui.fgdc_edomv.setText('<< empty cell >>')
+                temp_edom.ui.fgdc_edomv.setText('<< empty cell >>')
             else:
-                self.nodata_edom.ui.fgdc_edomv.setText(str(self.nodata))
+                temp_edom.ui.fgdc_edomv.setText(str(self.nodata))
 
-            self.nodata_edom.ui.fgdc_edomvd.setPlainText('No Data')
-            self.clean_domain_nodata()
+            temp_edom.ui.fgdc_edomvd.setPlainText('No Data')
+            self.nodata_content = (True, temp_edom.to_xml())
+            temp_edom.deleteLater()
 
     def contextMenuEvent(self, event):
 
@@ -586,7 +606,7 @@ def from_xml(self, attr):
                     if attrdomv.children[0].tag == 'edom' and \
                             (attrdomv.children[0].children[0].text in self.nodata_matches or \
                             attrdomv.children[0].children[1].text.lower() in ['nodata', 'no data']
-                            or attr_domains.count('edom')==1):
+                            or (attr_domains.count('edom')==1) and len(attr_domains) > 1):
                         self.ui.rbtn_nodata_yes.setChecked(True)
                         self.nodata_edom.from_xml(attrdomv.children[0].to_xml())
                         attrdomvs.remove(attrdomv)

diff --git a/pymdwizard/gui/ui_files/UI_edom.py b/pymdwizard/gui/ui_files/UI_edom.py
@@ -42,6 +42,7 @@ def setupUi(self, fgdc_attrdomv):
         self.widget_3.setObjectName("widget_3")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.widget_3)
         self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_2.setSpacing(0)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.fgdc_edomv = QtWidgets.QLineEdit(self.widget_3)
         self.fgdc_edomv.setText("")
@@ -97,7 +98,7 @@ def setupUi(self, fgdc_attrdomv):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.fgdc_edomvd.sizePolicy().hasHeightForWidth())
         self.fgdc_edomvd.setSizePolicy(sizePolicy)
-        self.fgdc_edomvd.setMinimumSize(QtCore.QSize(0, 30))
+        self.fgdc_edomvd.setMinimumSize(QtCore.QSize(0, 45))
         self.fgdc_edomvd.setObjectName("fgdc_edomvd")
         self.horizontalLayout_9.addWidget(self.fgdc_edomvd)
         self.label_25 = QtWidgets.QLabel(self.widget)
@@ -129,7 +130,8 @@ def setupUi(self, fgdc_attrdomv):
         self.widget_2.setSizePolicy(sizePolicy)
         self.widget_2.setObjectName("widget_2")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.widget_2)
-        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout.setContentsMargins(0, 4, 0, 0)
+        self.horizontalLayout.setSpacing(0)
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.label_22 = QtWidgets.QLabel(self.widget_2)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
@@ -143,6 +145,8 @@ def setupUi(self, fgdc_attrdomv):
         self.label_22.setIndent(0)
         self.label_22.setObjectName("label_22")
         self.horizontalLayout.addWidget(self.label_22)
+        spacerItem = QtWidgets.QSpacerItem(4, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
         self.fgdc_edomvds = QtWidgets.QLineEdit(self.widget_2)
         self.fgdc_edomvds.setObjectName("fgdc_edomvds")
         self.horizontalLayout.addWidget(self.fgdc_edomvds)

diff --git a/pymdwizard/gui/ui_files/edom.ui b/pymdwizard/gui/ui_files/edom.ui
@@ -71,6 +71,9 @@
          </sizepolicy>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -208,7 +211,7 @@
            <property name="minimumSize">
             <size>
              <width>0</width>
-             <height>30</height>
+             <height>45</height>
             </size>
            </property>
           </widget>
@@ -274,11 +277,14 @@
          </sizepolicy>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="spacing">
+          <number>0</number>
+         </property>
          <property name="leftMargin">
           <number>0</number>
          </property>
          <property name="topMargin">
-          <number>0</number>
+          <number>4</number>
          </property>
          <property name="rightMargin">
           <number>0</number>
@@ -320,6 +326,22 @@
            </property>
           </widget>
          </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>4</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
          <item>
           <widget class="QLineEdit" name="fgdc_edomvds">
            <property name="text">

diff --git a/pymdwizard/resources/spelling/words.txt b/pymdwizard/resources/spelling/words.txt
@@ -1,3 +1,11 @@
+microhabitats
+microhabitat
+geodatabase
+georeferenced
+arcgis
+translocation
+translocations
+email
 dendrochronology
 borers
 intraguild