Revision: 5881
http://sourceforge.net/p/jump-pilot/code/5881
Author: michaudm
Date: 2018-06-17 16:39:49 +0000 (Sun, 17 Jun 2018)
Log Message:
-----------
GraphToolBox : 0.6.1 : use paramaters in GraphNodesPlugIn to ease usage in
beanshell
Modified Paths:
--------------
plug-ins/GraphToolboxPlugin/trunk/build.xml
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphExtension.java
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphNodesPlugIn.java
Modified: plug-ins/GraphToolboxPlugin/trunk/build.xml
===================================================================
--- plug-ins/GraphToolboxPlugin/trunk/build.xml 2018-06-17 13:37:50 UTC (rev
5880)
+++ plug-ins/GraphToolboxPlugin/trunk/build.xml 2018-06-17 16:39:49 UTC (rev
5881)
@@ -17,7 +17,7 @@
<property name="dist" value="dist" />
<property name="javadoc" value="javadoc" />
- <property name="version" value="0.6.0" />
+ <property name="version" value="0.6.1" />
<!-- ===================================================================
-->
<!-- Defines the classpath used for compilation and test.
-->
Modified:
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphExtension.java
===================================================================
---
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphExtension.java
2018-06-17 13:37:50 UTC (rev 5880)
+++
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphExtension.java
2018-06-17 16:39:49 UTC (rev 5881)
@@ -35,8 +35,9 @@
* <li>CycleFinderPlugIn : computes a graph from a linear network and find
base cycles</li>
* </ul>
* @author Michaël Michaud
- * @version 0.6.0 (2018-06-12)
+ * @version 0.6.1 (2018-06-17)
*/
+//version 0.6.1 (2018-06-17) refactor to use AbstractPlugIn parameters in
GraphNodesPlugIn
//version 0.6.0 (2018-06-12) refactor to use AbstractPlugIn parameters in
SkeletonPlugIn
//version 0.5.9 (2018-06-06) fix a new robustess problem
//version 0.5.8 (2018-05-27) improve SkeletonPlugIn (and add a parameter)
@@ -60,7 +61,7 @@
}
public String getVersion() {
- return "0.6.0 (2018-06-12)";
+ return "0.6.1 (2018-06-17)";
}
public void configure(PlugInContext context) throws Exception {
Modified:
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphNodesPlugIn.java
===================================================================
---
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphNodesPlugIn.java
2018-06-17 13:37:50 UTC (rev 5880)
+++
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphNodesPlugIn.java
2018-06-17 16:39:49 UTC (rev 5881)
@@ -54,8 +54,9 @@
* (network dead-end), degree 2 nodes, degree 3+ nodes (intersection) or all
* the nodes with their degree as attribute.
* @author Michaël Michaud
- * @version 0.4.0 (2017-01-17)
+ * @version 0.5.0 (2018-06-17)
*/
+//version 0.5.0 (2018-06-17) use parameters to ease usage in beanshell
//version 0.4.0 (2017-01-17) directedGraph support
//version 0.1.2 (2011-07-16) typos and comments
//version 0.1.1 (2010-04-22) first svn version
@@ -62,6 +63,20 @@
//version 0.1 (2010-04-22)
public class GraphNodesPlugIn extends ThreadedBasePlugIn {
+ private static String P_LAYER = "Layer";
+
+ private static String P_ATTRIBUTE = "Attribute";
+ private static String P_IGNORE_NULL = "IgnoreNull";
+
+ private static String P_GRAPH_3D = "Graph3D";
+
+ private static String P_DEGREE_0 = "Degree0";
+ private static String P_DEGREE_1 = "Degree1";
+ private static String P_DEGREE_2 = "Degree2";
+ private static String P_DEGREE_3P = "Degree3P";
+ private static String P_IN_DEGREE_0 = "InDegree0";
+ private static String P_OUT_DEGREE_0 = "OutDegree0";
+
private static String LAYER;
private static String GRAPH;
@@ -97,18 +112,31 @@
private static String NO_NODE_FOUND;
- Layer layer;
- String attribute;
- boolean use_attribute;
- boolean ignore_empty;
- boolean dim3;
- boolean indegree0 = false;
- boolean outdegree0 = false;
- boolean degree0 = false;
- boolean degree1 = true;
- boolean degree2 = false;
- boolean degree3p = false;
+ private Layer layer;
+ private String attribute;
+ private boolean use_attribute;
+ private boolean ignore_empty;
+ private boolean dim3;
+ private boolean indegree0 = false;
+ private boolean outdegree0 = false;
+ private boolean degree0 = false;
+ private boolean degree1 = true;
+ private boolean degree2 = false;
+ private boolean degree3p = false;
+ {
+ addParameter(P_LAYER, null);
+ addParameter(P_ATTRIBUTE, null);
+ addParameter(P_IGNORE_NULL, false);
+ addParameter(P_GRAPH_3D, false);
+ addParameter(P_DEGREE_0, false);
+ addParameter(P_DEGREE_1, true);
+ addParameter(P_DEGREE_2, false);
+ addParameter(P_DEGREE_3P, false);
+ addParameter(P_IN_DEGREE_0, false);
+ addParameter(P_OUT_DEGREE_0,false);
+ }
+
public String getName() {return "Graph nodes PlugIn";}
public void initialize(final PlugInContext context) throws Exception {
@@ -220,6 +248,18 @@
degree1 = dialog.getBoolean(DEGREE1);
degree2 = dialog.getBoolean(DEGREE2);
degree3p = dialog.getBoolean(DEGREE3P);
+
+ addParameter(P_LAYER, layer.getName());
+ addParameter(P_ATTRIBUTE, (use_attribute ? attribute : null));
+ addParameter(P_IGNORE_NULL, ignore_empty);
+ addParameter(P_GRAPH_3D, dim3);
+ addParameter(P_DEGREE_0, degree0);
+ addParameter(P_DEGREE_1, degree1);
+ addParameter(P_DEGREE_2, degree2);
+ addParameter(P_DEGREE_3P, degree3p);
+ addParameter(P_IN_DEGREE_0, indegree0);
+ addParameter(P_OUT_DEGREE_0,outdegree0);
+
return true;
}
else return false;
@@ -229,13 +269,20 @@
public void run(TaskMonitor monitor, PlugInContext context) throws
Exception {
monitor.allowCancellationRequests();
monitor.report(GRAPH_COMPUTATION + "...");
-
+
+ if (getStringParam(P_LAYER) == null) throw new Exception("Layer
parameter is undefined");
+ Layer layer =
context.getLayerManager().getLayer(getStringParam(P_LAYER));
+ if (layer == null) throw new Exception("Layer " + layer.getName() + "
has not been found");
FeatureCollection fc = layer.getFeatureCollectionWrapper();
// Creates the schema for the output dataset (nodes)
FeatureSchema schemaNodes = new FeatureSchema();
schemaNodes.addAttribute("GEOMETRY", AttributeType.GEOMETRY);
- if (use_attribute) {
+ String attribute = getStringParam(P_ATTRIBUTE);
+ if (attribute != null &&
!fc.getFeatureSchema().hasAttribute(attribute)) {
+ throw new Exception("Layer " + layer.getName() + " has no
attribute named " + attribute);
+ }
+ if (attribute != null) {
schemaNodes.addAttribute(attribute,
fc.getFeatureSchema().getAttributeType(attribute));
}
schemaNodes.addAttribute(IN_DEGREE, AttributeType.INTEGER);
@@ -249,15 +296,20 @@
Object key = "NO_ATTRIBUTE_USED";
for (Iterator i = fc.iterator() ; i.hasNext() ; ) {
Feature f = (Feature)i.next();
- if (use_attribute) key = f.getAttribute(attribute);
- if (use_attribute && ignore_empty &&
+ if (attribute != null) key = f.getAttribute(attribute);
+ if (attribute != null && getBooleanParam(P_IGNORE_NULL) &&
(key == null || key.toString().trim().length() == 0))
{continue;}
else if (!map.containsKey(key)) {map.put(key, new
ArrayList<Feature>());}
- else {}
map.get(key).add(f);
}
//int count = 1;
+ degree0 = getBooleanParam(P_DEGREE_0);
+ degree1 = getBooleanParam(P_DEGREE_1);
+ degree2 = getBooleanParam(P_DEGREE_2);
+ degree3p = getBooleanParam(P_DEGREE_3P);
+ indegree0 = getBooleanParam(P_IN_DEGREE_0);
+ outdegree0 = getBooleanParam(P_OUT_DEGREE_0);
for (Object k : map.keySet()) {
monitor.report(GRAPH_COMPUTATION + " (" + k + ")");
DirectedGraph graph =
(DirectedGraph)GraphFactory.createDirectedPseudograph(map.get(k), dim3);
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
