diff --git a/docs/authors.html b/docs/authors.html
index 39b1516..5c3a5e5 100644
--- a/docs/authors.html
+++ b/docs/authors.html
@@ -60,7 +60,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/index.html b/docs/index.html
index 854c743..2407bc6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -33,7 +33,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/news/index.html b/docs/news/index.html
index c4fc010..fe6d86b 100644
--- a/docs/news/index.html
+++ b/docs/news/index.html
@@ -60,7 +60,7 @@
catmaid
- 0.9.4
+ 0.9.5
@@ -103,6 +103,14 @@
Changelog
Source: NEWS.md
+
+
+
+- Stop
catmaid_get_connector_table()
returning duplicate rows when there are multiple connections between the same partner neurons at a given connector. Thanks to Shanice Bailey and Istvan Taisz for the bug report (#106).
+- Pass on pid in
catmaid_skids()
, thereby fixing an issue with read.neurons.catmaid()
with annotation queries when project id is not 1. Thanks to Marta Costa for the bug report (#105)
+
+
@@ -291,6 +299,7 @@
diff --git a/docs/reference/catmaid-package.html b/docs/reference/catmaid-package.html
index 7fc2dd8..6e167e3 100644
--- a/docs/reference/catmaid-package.html
+++ b/docs/reference/catmaid-package.html
@@ -68,7 +68,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_add_volume.html b/docs/reference/catmaid_add_volume.html
index 990366a..1e04ac2 100644
--- a/docs/reference/catmaid_add_volume.html
+++ b/docs/reference/catmaid_add_volume.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_connection_setenv.html b/docs/reference/catmaid_connection_setenv.html
index d756e7b..10d02a5 100644
--- a/docs/reference/catmaid_connection_setenv.html
+++ b/docs/reference/catmaid_connection_setenv.html
@@ -68,7 +68,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_entities_from_models.html b/docs/reference/catmaid_entities_from_models.html
index 7ccb7c6..e15811c 100644
--- a/docs/reference/catmaid_entities_from_models.html
+++ b/docs/reference/catmaid_entities_from_models.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_fetch.html b/docs/reference/catmaid_fetch.html
index a09fb04..4fdad17 100644
--- a/docs/reference/catmaid_fetch.html
+++ b/docs/reference/catmaid_fetch.html
@@ -65,7 +65,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_annotationlist.html b/docs/reference/catmaid_get_annotationlist.html
index 90a14ca..56564ce 100644
--- a/docs/reference/catmaid_get_annotationlist.html
+++ b/docs/reference/catmaid_get_annotationlist.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_annotations_for_skeletons.html b/docs/reference/catmaid_get_annotations_for_skeletons.html
index 534bbf1..3d4b9b0 100644
--- a/docs/reference/catmaid_get_annotations_for_skeletons.html
+++ b/docs/reference/catmaid_get_annotations_for_skeletons.html
@@ -68,7 +68,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_compact_skeleton.html b/docs/reference/catmaid_get_compact_skeleton.html
index 7adc3ae..12ebfce 100644
--- a/docs/reference/catmaid_get_compact_skeleton.html
+++ b/docs/reference/catmaid_get_compact_skeleton.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_connector_table.html b/docs/reference/catmaid_get_connector_table.html
index c485c10..f2bc31f 100644
--- a/docs/reference/catmaid_get_connector_table.html
+++ b/docs/reference/catmaid_get_connector_table.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_connectors.html b/docs/reference/catmaid_get_connectors.html
index fc9f803..1a67980 100644
--- a/docs/reference/catmaid_get_connectors.html
+++ b/docs/reference/catmaid_get_connectors.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_connectors_between.html b/docs/reference/catmaid_get_connectors_between.html
index 6e09a7b..2ca8c64 100644
--- a/docs/reference/catmaid_get_connectors_between.html
+++ b/docs/reference/catmaid_get_connectors_between.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_contributor_stats.html b/docs/reference/catmaid_get_contributor_stats.html
index 65284be..1e7bb8a 100644
--- a/docs/reference/catmaid_get_contributor_stats.html
+++ b/docs/reference/catmaid_get_contributor_stats.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_label_stats.html b/docs/reference/catmaid_get_label_stats.html
index 9a08c1a..4c2da57 100644
--- a/docs/reference/catmaid_get_label_stats.html
+++ b/docs/reference/catmaid_get_label_stats.html
@@ -65,7 +65,7 @@
catmaid
- 0.9.4
+ 0.9.5
@@ -171,8 +171,8 @@ Examp
arrange(desc(n))
multiple_soma_info = soma_labels %>%
- filter(skeletonID%in% multiple_soma$skeletonID)
#> [1] "ends" "synapse?" "TO LEFT ANTE BRANCH"
-#> [4] "TO RIGHT ANTE BRANCH" "synapse onto glia?" "TO RIGHT POST BRANCH"
+ filter(skeletonID%in% multiple_soma$skeletonID)#> [1] "ends" "not a branch" "end of series" "uncertain end"
+#> [5] "lost" "nucleus"
diff --git a/docs/reference/catmaid_get_neuronnames.html b/docs/reference/catmaid_get_neuronnames.html
index 6b1765d..fa82945 100644
--- a/docs/reference/catmaid_get_neuronnames.html
+++ b/docs/reference/catmaid_get_neuronnames.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_node_count.html b/docs/reference/catmaid_get_node_count.html
index beeee04..e95195b 100644
--- a/docs/reference/catmaid_get_node_count.html
+++ b/docs/reference/catmaid_get_node_count.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_review_status.html b/docs/reference/catmaid_get_review_status.html
index 5e6b10b..1164b59 100644
--- a/docs/reference/catmaid_get_review_status.html
+++ b/docs/reference/catmaid_get_review_status.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_treenode_table.html b/docs/reference/catmaid_get_treenode_table.html
index 558b6b7..96eadb7 100644
--- a/docs/reference/catmaid_get_treenode_table.html
+++ b/docs/reference/catmaid_get_treenode_table.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_treenodes_detail.html b/docs/reference/catmaid_get_treenodes_detail.html
index dca8c33..c245056 100644
--- a/docs/reference/catmaid_get_treenodes_detail.html
+++ b/docs/reference/catmaid_get_treenodes_detail.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
@@ -190,14 +190,14 @@ See a
Examples
#> treenode_id parent_id x y z confidence radius skid
-#> 1 9943214 NA 65439.8 20611.2 41250 5 1911 4453485
-#> 2 25069047 10983327 53296.5 14791.1 42650 5 -1 4453485
-#> 3 12829015 12829014 59222.2 65869.2 51150 5 -1 10418394
+
catmaid_get_treenodes_detail(
c(
9943214L,
25069047L,
12829015L))
#> treenode_id parent_id x y z confidence radius skid
+#> 1 9943214 9943217 419085 175627 120280 5 -1 4116825
+#> 2 25069047 25069046 426264 244230 143920 5 -1 7138957
+#> 3 12829015 12829013 442500 147757 175160 5 -1 3821611
#> edition_time user_id
-#> 1 1496315535 18
-#> 2 1525270313 71
-#> 3 1523630041 18
+#> 1 1498514622 113
+#> 2 1521466478 134
+#> 3 1496347172 150
# example label search
tosoma=catmaid_get_treenodes_detail("to soma")
#> Error in catmaid_error_check(nodeinfo): invalid literal for int() with base 10: 'to soma' type: ValueError
diff --git a/docs/reference/catmaid_get_user_list.html b/docs/reference/catmaid_get_user_list.html
index fe22862..d187ac0 100644
--- a/docs/reference/catmaid_get_user_list.html
+++ b/docs/reference/catmaid_get_user_list.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_volume.html b/docs/reference/catmaid_get_volume.html
index a9ba910..c36dee4 100644
--- a/docs/reference/catmaid_get_volume.html
+++ b/docs/reference/catmaid_get_volume.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_get_volumelist.html b/docs/reference/catmaid_get_volumelist.html
index 18633cd..4ca5beb 100644
--- a/docs/reference/catmaid_get_volumelist.html
+++ b/docs/reference/catmaid_get_volumelist.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_login.html b/docs/reference/catmaid_login.html
index c098001..700d34d 100644
--- a/docs/reference/catmaid_login.html
+++ b/docs/reference/catmaid_login.html
@@ -74,7 +74,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_parse_url.html b/docs/reference/catmaid_parse_url.html
index d02ff8f..90e2952 100644
--- a/docs/reference/catmaid_parse_url.html
+++ b/docs/reference/catmaid_parse_url.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_query_by_name.html b/docs/reference/catmaid_query_by_name.html
index 6a6ab80..68a6dca 100644
--- a/docs/reference/catmaid_query_by_name.html
+++ b/docs/reference/catmaid_query_by_name.html
@@ -74,7 +74,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_query_connected.html b/docs/reference/catmaid_query_connected.html
index ae20030..d2c92ab 100644
--- a/docs/reference/catmaid_query_connected.html
+++ b/docs/reference/catmaid_query_connected.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_rename_neuron.html b/docs/reference/catmaid_rename_neuron.html
index 869dc79..a96900e 100644
--- a/docs/reference/catmaid_rename_neuron.html
+++ b/docs/reference/catmaid_rename_neuron.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_skids.html b/docs/reference/catmaid_skids.html
index 478b557..6792951 100644
--- a/docs/reference/catmaid_skids.html
+++ b/docs/reference/catmaid_skids.html
@@ -64,7 +64,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_user_history.html b/docs/reference/catmaid_user_history.html
index e6dc536..f5d226f 100644
--- a/docs/reference/catmaid_user_history.html
+++ b/docs/reference/catmaid_user_history.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/catmaid_version.html b/docs/reference/catmaid_version.html
index b4688d0..218c8e1 100644
--- a/docs/reference/catmaid_version.html
+++ b/docs/reference/catmaid_version.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/connectors.html b/docs/reference/connectors.html
index 653e088..747c1bc 100644
--- a/docs/reference/connectors.html
+++ b/docs/reference/connectors.html
@@ -65,7 +65,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/copy_tags_connectors.html b/docs/reference/copy_tags_connectors.html
index b15dbd1..732ed00 100644
--- a/docs/reference/copy_tags_connectors.html
+++ b/docs/reference/copy_tags_connectors.html
@@ -65,7 +65,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/index.html b/docs/reference/index.html
index dcf2ca5..ac7a632 100644
--- a/docs/reference/index.html
+++ b/docs/reference/index.html
@@ -60,7 +60,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/nsoma.html b/docs/reference/nsoma.html
index 7273205..301a25a 100644
--- a/docs/reference/nsoma.html
+++ b/docs/reference/nsoma.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
@@ -166,20 +166,8 @@ Examp
#> 0 0 0 0 0 0 0 0 0 0 0
#> TL4R TS7L TT27R VA15R VA20R VB37L VB58L
#> 0 0 0 0 0 0 0
#> [1] 1
nsoma("ORN PNs")
#> Warning: CATMAID version: 2018.11.09-31f4a19f60 could not be parsed!
-#> I will assume that you are running the latest version of CATMAID!
#>
-#> 3486381 8021456 4354933 4493199 4651929 7843730 8399890 7515491
-#> 1 1 1 1 1 1 1 1
-#> 7092417 7107433 7198338 7852250 7845346 7851153 7864823 7865652
-#> 1 1 1 1 1 1 1 1
-#> 7865696 7865767 7873135 7916593 7934904 7935088 8140109 8243455
-#> 1 1 1 1 1 1 1 1
-#> 8244723 8244823 8245014 8245146 8245513 8245692 8245869 8246081
-#> 1 1 2 1 1 1 1 1
-#> 8246750 8247451 8248631 8252067 8253413 8256186 11279244 13589251
-#> 1 1 1 1 1 1 1 1
-#> 14604028 16259595
-#> 1 1
# NOT RUN {
+nsoma(AV4b1)#> [1] 1
nsoma("ORN PNs")
#> Warning: Assumed you want a complete annotation but found no matches for query "annotation:^ORN PNs$"!
#> Warning: CATMAID version: 2018.11.09-254-g70f32ec could not be parsed!
+#> I will assume that you are running the latest version of CATMAID!
#> integer(0)
# NOT RUN {
nsoma(3486381)
# }
diff --git a/docs/reference/plot3d.catmaidneuron.html b/docs/reference/plot3d.catmaidneuron.html
index 5ffa251..9bb3403 100644
--- a/docs/reference/plot3d.catmaidneuron.html
+++ b/docs/reference/plot3d.catmaidneuron.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/read.neuron.catmaid.html b/docs/reference/read.neuron.catmaid.html
index eb2b91d..705abc8 100644
--- a/docs/reference/read.neuron.catmaid.html
+++ b/docs/reference/read.neuron.catmaid.html
@@ -65,7 +65,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/read_catmaid_selection.html b/docs/reference/read_catmaid_selection.html
index 4ad4c26..2f31bf7 100644
--- a/docs/reference/read_catmaid_selection.html
+++ b/docs/reference/read_catmaid_selection.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5
diff --git a/docs/reference/write_catmaid_selection.html b/docs/reference/write_catmaid_selection.html
index 3cfb973..54a27e1 100644
--- a/docs/reference/write_catmaid_selection.html
+++ b/docs/reference/write_catmaid_selection.html
@@ -63,7 +63,7 @@
catmaid
- 0.9.4
+ 0.9.5