bug fixes

* fixes bug with monochrome styles in explorer * fixes issues #162, #168
SpaceGroupUCL · Aug 29, 2018 · 4cc6261 · 4cc6261
1 parent f9cc477
commit 4cc6261
Show file tree

Hide file tree

Showing 7 changed files with 702 additions and 42 deletions.
diff --git a/esstoolkit/analysis/ui_Analysis.py b/esstoolkit/analysis/ui_Analysis.py
@@ -198,20 +198,20 @@ def setupUi(self, AnalysisDialog):
         self.axialDepthmapReportList = QtGui.QPlainTextEdit(self.axialDepthmapTab)
         self.axialDepthmapReportList.setObjectName(_fromUtf8("axialDepthmapReportList"))
         self.verticalLayout.addWidget(self.axialDepthmapReportList)
-        self.axialDepthmapDownload = QtGui.QLabel(self.axialDepthmapTab)
-        self.axialDepthmapDownload.setAlignment(QtCore.Qt.AlignCenter)
-        self.axialDepthmapDownload.setOpenExternalLinks(True)
-        self.axialDepthmapDownload.setObjectName(_fromUtf8("axialDepthmapDownload"))
-        self.verticalLayout.addWidget(self.axialDepthmapDownload)
         self.verticalLayout.setStretch(3, 1)
         self.axialAnalysisTabs.addTab(self.axialDepthmapTab, _fromUtf8(""))
         self.verticalLayout_2.addWidget(self.axialAnalysisTabs)
-        self.verticalLayout_2.setStretch(2, 5)
+        self.axialDepthmapDownload = QtGui.QLabel(self.analysisLayout)
+        self.axialDepthmapDownload.setAlignment(QtCore.Qt.AlignCenter)
+        self.axialDepthmapDownload.setOpenExternalLinks(True)
+        self.axialDepthmapDownload.setObjectName(_fromUtf8("axialDepthmapDownload"))
+        self.verticalLayout_2.addWidget(self.axialDepthmapDownload)
+        self.verticalLayout_2.setStretch(2, 10)
         AnalysisDialog.setWidget(self.analysisLayout)
 
         self.retranslateUi(AnalysisDialog)
         self.analysisLayersTabs.setCurrentIndex(0)
-        self.axialAnalysisTabs.setCurrentIndex(0)
+        self.axialAnalysisTabs.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(AnalysisDialog)
 
     def retranslateUi(self, AnalysisDialog):
@@ -240,8 +240,8 @@ def retranslateUi(self, AnalysisDialog):
         self.axialDepthmapOutputLabel.setText(_translate("AnalysisDialog", "Output table:", None))
         self.axialDepthmapCalculateButton.setText(_translate("AnalysisDialog", "Calculate", None))
         self.axialDepthmapCancelButton.setText(_translate("AnalysisDialog", "Cancel", None))
+        self.axialAnalysisTabs.setTabText(self.axialAnalysisTabs.indexOf(self.axialDepthmapTab), _translate("AnalysisDialog", "depthmapX remote", None))
         self.axialDepthmapDownload.setToolTip(_translate("AnalysisDialog", "https://varoudis.github.io/depthmapX/", None))
         self.axialDepthmapDownload.setText(_translate("AnalysisDialog", "<qt><a href=\"http://archtech.gr/varoudis/depthmapX/?dir=depthmapXnet\"><span style=\" text-decoration: underline; color:#0000ff;\">Download depthmapXnet...</a></qt>", None))
-        self.axialAnalysisTabs.setTabText(self.axialAnalysisTabs.indexOf(self.axialDepthmapTab), _translate("AnalysisDialog", "depthmapX remote", None))
 
 import resources_rc
diff --git a/esstoolkit/analysis/ui_Analysis.ui b/esstoolkit/analysis/ui_Analysis.ui
@@ -23,7 +23,7 @@
    <string>Graph Analysis</string>
   </property>
   <widget class="QWidget" name="analysisLayout">
-   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,5">
+   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,10,0">
     <item>
      <layout class="QHBoxLayout" name="analysisDataLayout">
       <item>
@@ -138,7 +138,7 @@
     <item>
      <widget class="QTabWidget" name="axialAnalysisTabs">
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="axialEditTab">
        <attribute name="title">
@@ -238,7 +238,7 @@
        <attribute name="title">
         <string>depthmapX remote</string>
        </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1,0">
+       <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
         <property name="bottomMargin">
          <number>10</number>
         </property>
@@ -349,26 +349,26 @@
         <item>
          <widget class="QPlainTextEdit" name="axialDepthmapReportList"/>
         </item>
-        <item>
-         <widget class="QLabel" name="axialDepthmapDownload">
-          <property name="toolTip">
-           <string>https://varoudis.github.io/depthmapX/</string>
-          </property>
-          <property name="text">
-           <string>&lt;qt&gt;&lt;a href=&quot;http://archtech.gr/varoudis/depthmapX/?dir=depthmapXnet&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Download depthmapXnet...&lt;/a&gt;&lt;/qt&gt;</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-          <property name="openExternalLinks">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
      </widget>
     </item>
+    <item>
+     <widget class="QLabel" name="axialDepthmapDownload">
+      <property name="toolTip">
+       <string>https://varoudis.github.io/depthmapX/</string>
+      </property>
+      <property name="text">
+       <string>&lt;qt&gt;&lt;a href=&quot;http://archtech.gr/varoudis/depthmapX/?dir=depthmapXnet&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Download depthmapXnet...&lt;/a&gt;&lt;/qt&gt;</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+      <property name="openExternalLinks">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>

diff --git a/esstoolkit/explorer/AttributeSymbology.py b/esstoolkit/explorer/AttributeSymbology.py
@@ -125,7 +125,7 @@ def updateRenderer(self, layer, attribute_vals, settings):
             if ramp_type == 3:
                 new_width = np.linspace(0.1, line_width, intervals)
                 step = intervals / 8.0  # this is usd for fill patterns
-                color = QColor(ramp.color(0).getRgb())  # same as above
+                #color = QColor(ramp.color(0).getRgb())  # same as above
                 for i in range(0, intervals):
                     symbol = renderer.symbols()[i]
                     if invert:

diff --git a/esstoolkit/metadata.txt b/esstoolkit/metadata.txt
@@ -11,7 +11,7 @@
 name=Space Syntax Toolkit
 qgisMinimumVersion=2.14
 description=Collection of tools for space syntax analysis workflows in a GIS environment.
-version=0.2.0
+version=0.2.1
 author=Jorge Gil, Ioanna Kovolou, Abhimanyu Acharya, Stephen Law, Laurens Versluis
 email=jorge.gil@ucl.ac.uk
 
@@ -27,6 +27,9 @@ about=The “Space Syntax Toolkit” is a QGIS plug-in offering user friendly sp
     Dependencies: For network analysis requires depthmapXnet 0.35. It can be downloaded from: http://archtech.gr/varoudis/depthmapX/?dir=depthmapXnet
 category = Vector
 changelog=
+    0.2.1 -
+    * fixes bug with monochrome styles in explorer
+    * fixes issues #162, #168
     0.2.0 - First expanded release:
     * integrates 4 new modules contributed by Space Syntax Ltd
     0.1.8 -

diff --git a/esstoolkit/pb_tool.cfg b/esstoolkit/pb_tool.cfg
@@ -38,7 +38,7 @@
 [plugin]
 # Name of the plugin. This is the name of the directory that will
 # be created in .qgis2/python/plugins
-name: esstoolkit-dev
+name: esstoolkit
 
 [files]
 # Python files that should be deployed with the plugin