+webKnossos is an open-source tool for annotating and exploring large 3D image datasets.
-> Boergens, Berning, Bocklisch, Bräunlein, Drawitsch, Frohnhofen, Herold, Otto, Rzepka, Werkmeister, Werner, Wiese, Wissler and Helmstaedter
-webKnossos: efficient online 3D data annotation for connectomics.
-[Nature Methods (2017) DOI:10.1038/NMETH.4331.](https://www.nature.com/articles/nmeth.4331)
-
-
+* Fly through your data for fast skeletonization and proof-reading
+* Create 3D training data for automated segmentations efficiently
+* Scale data reconstruction projects with crowdsourcing workflows
+* Share datasets and annotations with collaborating scientists
+[Start using webKnossos](https://webknossos.org) - [User Documentation](https://docs.webknossos.org) - [Contact us](mailto:hello@scalableminds.com)
[](https://circleci.com/gh/scalableminds/webknossos)
[](https://github.com/scalableminds/webknossos/releases/latest)
@@ -28,7 +26,7 @@ webKnossos: efficient online 3D data annotation for connectomics.
* User and task management for high-throughput crowdsourcing
* Sharing and collaboration features
* [Standalone datastore component](https://github.com/scalableminds/webknossos/tree/master/webknossos-datastore) for flexible deployments
-* [Supported dataset formats: WKW (Optimized), KNOSSOS cubes](https://github.com/scalableminds/webknossos/wiki/Datasets), [Neuroglancer Precomputed, and BossDB](https://github.com/scalableminds/webknossos-connect)
+* [Supported dataset formats: WKW, KNOSSOS cubes](https://github.com/scalableminds/webknossos/wiki/Datasets), [Neuroglancer Precomputed, and BossDB](https://github.com/scalableminds/webknossos-connect)
* Supported image formats: Grayscale, Segmentation Maps, RGB, Multi-Channel
* [Support for 3D mesh rendering and on-the-fly isosurface generation](https://docs.webknossos.org/guides/mesh_visualization)
* [Documented frontend API for user scripts](https://webknossos.org/assets/docs/frontend-api/index.html), REST API for backend access
@@ -36,8 +34,15 @@ webKnossos: efficient online 3D data annotation for connectomics.
* [Docker-based deployment](https://hub.docker.com/r/scalableminds/webknossos/) for production and development
* [Detailed Documentation](https://docs.webknossos.org)
+## Publication
+> Boergens, Berning, Bocklisch, Bräunlein, Drawitsch, Frohnhofen, Herold, Otto, Rzepka, Werkmeister, Werner, Wiese, Wissler and Helmstaedter
+> webKnossos: efficient online 3D data annotation for connectomics.
+> [Nature Methods (2017) DOI:10.1038/NMETH.4331.](https://www.nature.com/articles/nmeth.4331)
+
+[Read more about the original publication.](https://publication.webknossos.org)
-## Development setup
+
+## Development installation
### Docker
This is the fastest way to try webKnossos.
Docker CE 17+ and Docker Compose 1.18+ is required.
@@ -141,9 +146,7 @@ yarn start
Will fetch all Scala, Java and node dependencies and run the application on Port 9000.
Make sure that the PostgreSQL and Redis services are running before you start the application.
-## Production setup
-[See wiki](https://github.com/scalableminds/webknossos/wiki/Production-setup) for recommended production setup.
-
+## Upgrades
For upgrades, please check the [changelog](CHANGELOG.md) & [migration guide](MIGRATIONS.md).
## Tests
diff --git a/app/controllers/AnnotationIOController.scala b/app/controllers/AnnotationIOController.scala
index 7c8cbc8b35b..4de688f9fea 100755
--- a/app/controllers/AnnotationIOController.scala
+++ b/app/controllers/AnnotationIOController.scala
@@ -125,10 +125,10 @@ class AnnotationIOController @Inject()(nmlWriter: NmlWriter,
dataSetName <- assertAllOnSameDataSet(skeletonTracings, volumeTracingsWithDataLocations.headOption.map(_._1)) ?~> "nml.file.differentDatasets"
organizationNameOpt <- assertAllOnSameOrganization(parseSuccesses.flatMap(s => s.organizationName)) ?~> "nml.file.differentDatasets"
organizationIdOpt <- Fox.runOptional(organizationNameOpt) {
- organizationDAO.findOneByName(_).map(_._id)
- } ?~> Messages("dataSet.noAccess", dataSetName) ~> FORBIDDEN
+ organizationDAO.findOneByName(_)(GlobalAccessContext).map(_._id)
+ } ?~> Messages("dataSet.notFound", dataSetName) ~> FORBIDDEN
organizationId <- Fox.fillOption(organizationIdOpt) {
- dataSetDAO.getOrganizationForDataSet(dataSetName)
+ dataSetDAO.getOrganizationForDataSet(dataSetName)(GlobalAccessContext)
} ?~> Messages("dataSet.noAccess", dataSetName) ~> FORBIDDEN
dataSet <- dataSetDAO.findOneByNameAndOrganization(dataSetName, organizationId) ?~> Messages(
"dataSet.noAccess",
diff --git a/app/controllers/DataSetController.scala b/app/controllers/DataSetController.scala
index fa90e2ba6ed..5c4bad0ec99 100755
--- a/app/controllers/DataSetController.scala
+++ b/app/controllers/DataSetController.scala
@@ -156,7 +156,7 @@ class DataSetController @Inject()(userService: UserService,
def accessList(organizationName: String, dataSetName: String) = sil.SecuredAction.async { implicit request =>
for {
- dataSet <- dataSetDAO.findOneByNameAndOrganization(dataSetName, request.identity._organization) ?~> Messages(
+ dataSet <- dataSetDAO.findOneByNameAndOrganizationName(dataSetName, organizationName) ?~> Messages(
"dataSet.notFound",
dataSetName) ~> NOT_FOUND
allowedTeams <- dataSetService.allowedTeamIdsFor(dataSet._id)
diff --git a/app/controllers/InitialDataController.scala b/app/controllers/InitialDataController.scala
index d835bc670bb..bc19efd576e 100644
--- a/app/controllers/InitialDataController.scala
+++ b/app/controllers/InitialDataController.scala
@@ -94,6 +94,7 @@ Samplecountry
for {
_ <- insertLocalDataStoreIfEnabled
_ <- insertLocalTracingStoreIfEnabled
+ _ <- insertConnectDataStoreIfEnabled
_ <- assertInitialDataEnabled
_ <- assertNoOrganizationsPresent
_ <- insertOrganization
@@ -211,6 +212,16 @@ Samplecountry
}
} else Fox.successful(())
+ def insertConnectDataStoreIfEnabled: Fox[Any] =
+ if (conf.Application.insertLocalConnectDatastore) {
+ dataStoreDAO.findOneByName("connect").futureBox.map { maybeStore =>
+ if (maybeStore.isEmpty) {
+ logger.info("inserting connect datastore")
+ dataStoreDAO.insertOne(DataStore("connect", "http://localhost:8000", "secret-key", isConnector = true))
+ }
+ }
+ } else Fox.successful(())
+
def insertLocalTracingStoreIfEnabled: Fox[Any] =
if (conf.Tracingstore.enabled) {
tracingStoreDAO.findOneByName("localhost").futureBox.map { maybeStore =>
diff --git a/app/models/binary/DataSet.scala b/app/models/binary/DataSet.scala
index 27c0d4c7ca7..debd5ed7c8a 100755
--- a/app/models/binary/DataSet.scala
+++ b/app/models/binary/DataSet.scala
@@ -259,7 +259,10 @@ class DataSetDAO @Inject()(sqlClient: SQLClient,
_ <- dataSetDataLayerDAO.updateLayers(old._id, source)
} yield ()
- def deactivateUnreported(names: List[String], organizationId: ObjectId, dataStoreName: String): Fox[Unit] = {
+ def deactivateUnreported(names: List[String],
+ organizationId: ObjectId,
+ dataStoreName: String,
+ unreportedStatus: String): Fox[Unit] = {
val inclusionPredicate =
if (names.isEmpty) "true" else s"name not in ${writeStructTupleWithQuotes(names.map(sanitize))}"
val deleteResolutionsQuery =
@@ -272,7 +275,7 @@ class DataSetDAO @Inject()(sqlClient: SQLClient,
and #${inclusionPredicate})"""
val setToUnusableQuery =
sqlu"""update webknossos.datasets
- set isUsable = false, status = 'No longer available on datastore.', scale = NULL
+ set isUsable = false, status = $unreportedStatus, scale = NULL
where _dataStore = ${dataStoreName} and _organization = ${organizationId}
and #${inclusionPredicate}"""
for {
diff --git a/app/models/binary/DataSetService.scala b/app/models/binary/DataSetService.scala
index 11da1bb859a..db387ebccf0 100644
--- a/app/models/binary/DataSetService.scala
+++ b/app/models/binary/DataSetService.scala
@@ -45,6 +45,8 @@ class DataSetService @Inject()(organizationDAO: OrganizationDAO,
extends FoxImplicits
with LazyLogging {
+ val unreportedStatus = "No longer available on datastore."
+
def isProperDataSetName(name: String): Boolean =
name.matches("[A-Za-z0-9_\\-]*")
@@ -171,7 +173,8 @@ class DataSetService @Inject()(organizationDAO: OrganizationDAO,
case Full(organization) =>
dataSetDAO.deactivateUnreported(dataSourcesByOrganizationName(organizationName).map(_.id.name),
organization._id,
- dataStoreName)
+ dataStoreName,
+ unreportedStatus)
case _ => {
logger.info(s"Ignoring reported dataset for non-existing organization $organizationName")
Fox.successful(())
@@ -252,11 +255,16 @@ class DataSetService @Inject()(organizationDAO: OrganizationDAO,
case _ => Fox.successful(0L)
}
- def allowedTeamIdsFor(_dataSet: ObjectId)(implicit ctx: DBAccessContext) =
- dataSetAllowedTeamsDAO.findAllForDataSet(_dataSet)(GlobalAccessContext) ?~> "allowedTeams.notFound"
+ def allowedTeamIdsFor(_dataSet: ObjectId)(implicit ctx: DBAccessContext): Fox[List[ObjectId]] =
+ dataSetAllowedTeamsDAO.findAllForDataSet(_dataSet) ?~> "allowedTeams.notFound"
- def allowedTeamsFor(_dataSet: ObjectId)(implicit ctx: DBAccessContext) =
- teamDAO.findAllForDataSet(_dataSet)(GlobalAccessContext) ?~> "allowedTeams.notFound"
+ def allowedTeamsFor(_dataSet: ObjectId, requestingUser: Option[User])(
+ implicit ctx: DBAccessContext): Fox[List[Team]] =
+ for {
+ teams <- teamDAO.findAllForDataSet(_dataSet) ?~> "allowedTeams.notFound"
+ // dont leak team names of other organizations
+ teamsFiltered = teams.filter(team => requestingUser.map(_._organization).contains(team._organization))
+ } yield teamsFiltered
def isEditableBy(
dataSet: DataSet,
@@ -271,22 +279,22 @@ class DataSetService @Inject()(organizationDAO: OrganizationDAO,
}
def publicWrites(dataSet: DataSet,
- userOpt: Option[User],
+ requestingUserOpt: Option[User],
skipResolutions: Boolean = false,
- requestingUserTeamManagerMemberships: Option[List[TeamMembership]] = None): Fox[JsObject] = {
- implicit val ctx = GlobalAccessContext
+ requestingUserTeamManagerMemberships: Option[List[TeamMembership]] = None)(
+ implicit ctx: DBAccessContext): Fox[JsObject] =
for {
- organization <- organizationDAO.findOne(dataSet._organization) ?~> "organization.notFound"
- teams <- allowedTeamsFor(dataSet._id)
+ organization <- organizationDAO.findOne(dataSet._organization)(GlobalAccessContext) ?~> "organization.notFound"
+ teams <- allowedTeamsFor(dataSet._id, requestingUserOpt)
teamsJs <- Fox.serialCombined(teams)(t => teamService.publicWrites(t))
logoUrl <- logoUrlFor(dataSet, Some(organization))
- isEditable <- isEditableBy(dataSet, userOpt, requestingUserTeamManagerMemberships)
- lastUsedByUser <- lastUsedTimeFor(dataSet._id, userOpt)
+ isEditable <- isEditableBy(dataSet, requestingUserOpt, requestingUserTeamManagerMemberships)
+ lastUsedByUser <- lastUsedTimeFor(dataSet._id, requestingUserOpt)
dataStore <- dataStoreFor(dataSet)
dataStoreJs <- dataStoreService.publicWrites(dataStore)
dataSource <- dataSourceFor(dataSet, Some(organization), skipResolutions)
publicationOpt <- Fox.runOptional(dataSet._publication)(publicationDAO.findOne(_))
- publicationJson <- Fox.runOptional(publicationOpt)(publicationService.publicWrites(_))
+ publicationJson <- Fox.runOptional(publicationOpt)(publicationService.publicWrites)
} yield {
Json.obj(
"name" -> dataSet.name,
@@ -305,9 +313,9 @@ class DataSetService @Inject()(organizationDAO: OrganizationDAO,
"sortingKey" -> dataSet.sortingKey,
"details" -> dataSet.details,
"publication" -> publicationJson,
+ "isUnreported" -> Json.toJson(dataSource.statusOpt.contains(unreportedStatus)),
"isForeign" -> dataStore.isForeign
)
}
- }
}
diff --git a/app/utils/WkConf.scala b/app/utils/WkConf.scala
index 8da45400f06..88abe2be36c 100644
--- a/app/utils/WkConf.scala
+++ b/app/utils/WkConf.scala
@@ -12,6 +12,7 @@ class WkConf @Inject()(configuration: Configuration) extends ConfigReader {
object Application {
val insertInitialData = get[Boolean]("application.insertInitialData")
+ val insertLocalConnectDatastore = get[Boolean]("application.insertLocalConnectDatastore")
val title = get[String]("application.title")
object Authentication {
@@ -125,5 +126,16 @@ class WkConf @Inject()(configuration: Configuration) extends ConfigReader {
}
val children =
- List(Application, Http, Mail, WebKnossos, Datastore, User, Braintracing, Features, Silhouette, Airbrake, Google)
+ List(Application,
+ Http,
+ Mail,
+ WebKnossos,
+ Datastore,
+ Tracingstore,
+ User,
+ Braintracing,
+ Features,
+ Silhouette,
+ Airbrake,
+ Google)
}
diff --git a/conf/application.conf b/conf/application.conf
index adfc452ccfa..b6897125780 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -64,6 +64,7 @@ braintracing {
application {
insertInitialData = true
+ insertLocalConnectDatastore = true
authentication {
enableDevAutoLogin = false
enableDevAutoAdmin = false
diff --git a/conf/connect/.gitignore b/conf/connect/.gitignore
new file mode 100644
index 00000000000..0ca687ac137
--- /dev/null
+++ b/conf/connect/.gitignore
@@ -0,0 +1 @@
+datasets.json
diff --git a/conf/connect/config.json b/conf/connect/config.json
new file mode 100644
index 00000000000..0b758441137
--- /dev/null
+++ b/conf/connect/config.json
@@ -0,0 +1,7 @@
+{
+ "server": {"host": "0.0.0.0", "port": 8000, "url": "http://localhost:8000"},
+ "datastore": {"name": "connect", "key": "secret-key"},
+ "webknossos": {"url": "http://localhost:9000"},
+ "backends": {"neuroglancer": {}},
+ "datasets_path": "data/datasets.json"
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 6623d558908..cf0b0d13f3c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,11 +12,14 @@ services:
- "fossildb-persisted:fossildb"
- "postgres-persisted:postgres"
- redis
+ - webknossos-connect
depends_on:
postgres-persisted:
condition: service_healthy
fossildb-persisted:
condition: service_healthy
+ webknossos-connect:
+ condition: service_healthy
command:
- -Dconfig.file=conf/application.conf
- -Djava.net.preferIPv4Stack=true
@@ -122,11 +125,14 @@ services:
- "fossildb-dev:fossildb"
- "postgres-dev:postgres"
- redis
+ - webknossos-connect
depends_on:
postgres-dev:
condition: service_healthy
fossildb-dev:
condition: service_healthy
+ webknossos-connect:
+ condition: service_healthy
environment:
- POSTGRES_URL=jdbc:postgresql://postgres/webknossos
command:
@@ -166,11 +172,14 @@ services:
- postgres
- fossildb
- redis
+ - webknossos-connect
depends_on:
postgres:
condition: service_healthy
fossildb:
condition: service_healthy
+ webknossos-connect:
+ condition: service_healthy
environment:
- POSTGRES_URL=jdbc:postgresql://postgres/webknossos_testing
command:
@@ -195,6 +204,13 @@ services:
- ".:/home/pptruser/webknossos"
user: ${USER_UID:-1000}:${USER_GID:-1000}
+ # webKnossos-connect
+ webknossos-connect:
+ image: scalableminds/webknossos-connect:master__190
+ volumes:
+ - "./conf/connect:/app/data"
+ network_mode: host
+
# Postgres
postgres:
image: postgres:10-alpine
diff --git a/docs/hello.md b/docs/hello.md
index ed9f24ac54a..e0cd5f87cfe 100644
--- a/docs/hello.md
+++ b/docs/hello.md
@@ -5,7 +5,7 @@ The web-based tool is powered by a specialized data-delivery backend that stores
webKnossos has a GPU-accelerated viewer that includes tools for creating and sharing annotations (skeletons and volumes).
Powerful [user](./users.md) and [task](./tasks.md) management features automatically distribute tasks to human annotators.
There are a lot of productivity improvements to make the human part as efficient as possible.
-webKnossos is also a platform for [showcasing datasets](https://demo.webknossos.org) alongside a paper publication.
+webKnossos is also a platform for [showcasing datasets](https://webknossos.org) alongside a paper publication.
> Boergens, Berning, Bocklisch, Bräunlein, Drawitsch, Frohnhofen, Herold, Otto, Rzepka, Werkmeister, Werner, Wiese, Wissler and Helmstaedter
webKnossos: efficient online 3D data annotation for connectomics.
@@ -14,24 +14,21 @@ webKnossos: efficient online 3D data annotation for connectomics.
## Demo
-Dataset gallery: [https://demo.webknossos.org/](https://demo.webknossos.org/)
-Try webKnossos yourself: [https://try.webknossos.org/](https://try.webknossos.org/)
+Try webKnossos on a large selection of published datasets: [https://webknossos.org/](https://webknossos.org/)
## Features
* Exploration of large 3D image datasets
* Fully browser-based user experience with efficient data streaming
-* Creation/editing of [skeleton and volume annotations](./tracing_ui.md)
+* Creation/editing of skeleton and volume annotations
* [Innovative flight mode for fast skeleton tracing](https://www.nature.com/articles/nmeth.4331)
-* Optimized performance for large datasets and annotations
-* [User](./users.md) and [task](./tasks.md) management for high-throughput crowdsourcing
-* [Sharing and collaboration](./sharing.md) features
-* Efficient [keyboard shortcuts](./keyboard_shortcuts.md)
-* Undo/Redo functionality
+* Optimized performance for large tracings
+* User and task management for high-throughput crowdsourcing
+* Sharing and collaboration features
* [Standalone datastore component](https://github.com/scalableminds/webknossos/tree/master/webknossos-datastore) for flexible deployments
-* [Supported dataset formats](./datasets.md): WKW (Optimized), KNOSSOS cubes
+* [Supported dataset formats: WKW (Optimized), KNOSSOS cubes](https://github.com/scalableminds/webknossos/wiki/Datasets), [Neuroglancer Precomputed, and BossDB](https://github.com/scalableminds/webknossos-connect)
* [Supported image formats](./data_formats.md): Grayscale, Segmentation Maps, RGB, Multi-Channel
* [Mesh Visualization](./mesh_visualization.md)
-* [Documented frontend API for user scripts](https://demo.webknossos.org/assets/docs/frontend-api/index.html), REST API for backend access
+* [Documented frontend API for user scripts](https://webknossos.org/assets/docs/frontend-api/index.html), REST API for backend access
* Open-source development with [automated test suite](https://circleci.com/gh/scalableminds/webknossos)
* [Docker-based deployment](https://hub.docker.com/r/scalableminds/webknossos/) for production and development
diff --git a/docs/keyboard_shortcuts.md b/docs/keyboard_shortcuts.md
index 9372a6452e1..407447b58a3 100644
--- a/docs/keyboard_shortcuts.md
+++ b/docs/keyboard_shortcuts.md
@@ -18,6 +18,8 @@ Find all available keyboard shortcuts for webKnossos listed below.
| 3 | Toggle Segmentation Opacity |
| H | Increase the Move Value |
| G | Decrease the Move Value |
+| Q | Download Screenshot(s) of Viewport(s) |
+| . | Toggle Viewport Maximization |
## Skeleton Tracings
diff --git a/docs/sharing.md b/docs/sharing.md
index b46a0dc9c3f..af51af8e489 100644
--- a/docs/sharing.md
+++ b/docs/sharing.md
@@ -9,7 +9,7 @@ To manage access rights to certain datasets for webKnossos users check out [the
Dataset sharing allows outside users to view your datasets and segmentation layers within webKnossos.
Shared resources can be accessed through a direct URL or can be featured on a spotlight gallery for showcasing your work.
-[Please contact us](mailto:hello@scalableminds.com) to feature your dataset on https://demo.webknossos.org.
+[Please contact us](mailto:hello@scalableminds.com) to feature your dataset on https://webknossos.org.
Sharing a dataset is useful for multiple scenarios:
- You recorded a novel microscopy dataset and want to include links to it in your paper or for reviewers. Use wklink.org to shorten these URLs, e.g. https://wklink.org/5386 ([contact us](mailto:hello@scalableminds.com)).
diff --git a/docs/tracing_ui.md b/docs/tracing_ui.md
index 95df635a736..ced0b8a1807 100644
--- a/docs/tracing_ui.md
+++ b/docs/tracing_ui.md
@@ -19,7 +19,7 @@ The most common buttons are:
- `Archive`: Only available for Explorative Annotations. Closes the annotation and archives it, removing it from a user's dashboard. Archived annotations can be found on a user's dashboard under "Explorative Annotations" and by clicking on "Show Archived Annotations". Use this to declutter your dashboard.
- `Download`: Starts the download of the current annotation. Skeleton annotations are downloaded as [NML](./data_formats.md#nml) files. Volume annotation downloads contain the raw segmentation data as [WKW](./data_formats.md#wkw) files.
- `Share`: Create a shareable link to your dataset containing the current position, rotation, zoom level etc. Use this to collaboratively work with colleagues. Read more about this feature in the [Sharing guide](./sharing.md).
-- `Add Script`: Using the [webKnossos frontend API](https://demo.webknossos.org/assets/docs/frontend-api/index.html) users can interact with webKnossos programmatically. User scripts can be executed from here. Admins can add often used scripts to webKnossos to make them available to all users for easy access.
+- `Add Script`: Using the [webKnossos frontend API](https://webknossos.org/assets/docs/frontend-api/index.html) users can interact with webKnossos programmatically. User scripts can be executed from here. Admins can add often used scripts to webKnossos to make them available to all users for easy access.
- `Restore Older Version`: Opens a view that shows all previous versions of a tracing. From this view, any older version can be selected, previewed, and restored.
A user can directly jump to positions within their datasets by entering them in the position input field.
@@ -209,6 +209,10 @@ In the `Segmentation` tab on the right-hand side, you can see the cell IDs which
+### Merging Segments
+
+Segments from e.g. automatic segmentations can be merged with the merger mode to refine the result. The merger mode is available in skeleton and hybrid tracings. Each tree represents a merged segment and its nodes define the segments that are merged together. So each new merged segment needs its own tree. The merger mode can be enabled in the settings in the category Nodes & Trees under the option Enable Merger Mode. As soon as you enable it, all already existing trees will be used to form merged segments.
+
## Hybrid Annotations
Hybrid annotations combine the functionality of skeleton and volume annotations.
@@ -284,3 +288,4 @@ For multi-layer datasets, each layer can be adjusted separately.
- `4 Bit`: Toggles data download from the server using only 4 Bit instead of 8 Bit for each pixel. Use this to reduce the amount of necessary internet bandwidth for webKnossos. Useful for showcasing data on the go over cellular networks, e.g 3G.
- `Interpolation`: When interpolation is enabled, bilinear filtering is applied while rendering pixels between two voxels. As a result, data may look "smoother" (or blurry when being zoomed in very far). Without interpolation, data may look more "crisp" (or pixelated when being zomed in very far).
- `Render Missing Data Black`: If a dataset doesn't contain data at a specific position, webKnossos can either render "black" at that position or it can try to render data from another magnification.
+
diff --git a/frontend/javascripts/admin/api_flow_types.js b/frontend/javascripts/admin/api_flow_types.js
index 2f7d0f9217e..2a58b4e5738 100644
--- a/frontend/javascripts/admin/api_flow_types.js
+++ b/frontend/javascripts/admin/api_flow_types.js
@@ -111,6 +111,7 @@ export type APIDatasetDetails = {
};
type APIDatasetBase = APIDatasetId & {
+ +isUnreported: boolean,
+allowedTeams: Array
{
+ intervalId: ?number = null;
+
componentDidMount() {
this.intervalId = window.setInterval(this.props.onTick, this.props.interval);
}
@@ -20,8 +22,6 @@ class Loop extends Component
-
-
-
+
+
) : (
- search
+ searchBox
+ );
+
+ const adminHeader = (
+
+ {isUserAdmin ? (
+
+
+
+
+
+ {search}
+
+ ) : (
+ search
+ )}
+
);
const isEmpty = this.state.datasets.length === 0;
@@ -219,6 +270,7 @@ class DatasetView extends React.PureComponentDatasets
+
{this.renderIdTable()}
-
-
);
}
@@ -319,6 +324,7 @@ function mapStateToProps(state: OxalisState) {
activeCellId: getVolumeTracing(state.tracing)
.map(tracing => tracing.activeCellId)
.getOrElse(0),
+ isMergerModeEnabled: state.temporaryConfiguration.isMergerModeEnabled,
};
}
diff --git a/frontend/javascripts/oxalis/view/right-menu/search_popover.js b/frontend/javascripts/oxalis/view/right-menu/search_popover.js
index 42b229f6ade..8b283707752 100644
--- a/frontend/javascripts/oxalis/view/right-menu/search_popover.js
+++ b/frontend/javascripts/oxalis/view/right-menu/search_popover.js
@@ -13,7 +13,7 @@ type Props
-
+ ) : null}
-
-
-
- {/*
+ {/* Only display the mapping selection when merger mode is not active
+ to avoid conflicts in the logic of the UI. */
+ !this.props.isMergerModeEnabled ? (
+
+
+ {this.state.shouldMappingBeEnabled || this.props.mappingName != null ? (
+
+ ) : null}
+
+
+
+
+ {/*
Show mapping-select even when the mapping is disabled but the UI was used before
(i.e., mappingName != null)
*/}
- {this.state.shouldMappingBeEnabled || this.props.mappingName != null ? (
-
- ) : null}
- {this.getSelectedTreesAlert()}
- {this.getTreesComponents()}
+ {this.getTreesComponents(orderAttribute)}
+
+ Additionally available keyboard shortcuts: +
| 8 | ++ Replace the color of the current active tree and its mapped segments with a new one + | +
| 9 | +Enable / disable displaying the segmentation. | +
+
+ ) : null}
+
+ );
+}
diff --git a/frontend/javascripts/oxalis/view/settings/setting_input_views.js b/frontend/javascripts/oxalis/view/settings/setting_input_views.js
index ebe9563b750..e2fa15e4084 100644
--- a/frontend/javascripts/oxalis/view/settings/setting_input_views.js
+++ b/frontend/javascripts/oxalis/view/settings/setting_input_views.js
@@ -140,18 +140,35 @@ type SwitchSettingProps = {
onChange: (value: boolean) => void,
value: boolean,
label: string | React.Node,
+ disabled: boolean,
+ tooltipText: ?string,
};
export class SwitchSetting extends React.PureComponent
+
+ ␊
-
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
+ ␊
Datasets␊
@@ -103,8 +131,8 @@ Generated by [AVA](https://ava.li).
␊
␊
- ␊
␊
␊
Datasets␊
@@ -103,8 +131,8 @@ Generated by [AVA](https://ava.li).
␊
␊
␊
- ␊
- ␊
+ ␊
+ ␊
␊
␊
␊
@@ -112,10 +140,10 @@ Generated by [AVA](https://ava.li).
␊
␊
␊
- ␊
+ ␊
␊
- ␊
- ␊
+ ␊
+ ␊
␊
␊
␊
- ␊
+ ␊
+ ␊
␊
␊
␊
@@ -403,8 +431,8 @@ Generated by [AVA](https://ava.li).
␊
␊
- ␊
- ␊
+ ␊
+ ␊
␊
␊
␊
@@ -580,515 +608,75 @@ Generated by [AVA](https://ava.li).
␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- rgb␊
-
␊
- ␊
- ␊
- ␊
- ␊
- localhost␊
+ ␊
+
␊
+ ␊
+ ␊
␊
- ␊
- ␊
- ␊
+ ␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2016-04-11 15:00␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- team_X1␊
+ ␊
+ ␊
+ ␊
+ ␊
+
␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ - ␊
+ ␊
+
␊
+ ␊
+ - ␊
+ ␊
+ 1␊
+ ␊
+
␊
+ ␊
+ - ␊
+ ␊
+
␊
+
␊
+ ␊
+ ␊
+ ␊
␊
␊
+ ␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Import␊
- ␊
- ␊
- ␊
- No longer available on datastore.␊
+ ␊
␊
+
␊
+ ␊
␊
+ ␊
␊
- ␊
+ ␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2012-06-28_Cortex␊
-
␊
- ␊
- ␊
- ␊
- ␊
- localhost␊
- ␊
- ␊
- ␊
- ␊
+ ␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2016-04-11 14:57␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- team_X1␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Import␊
- ␊
- ␊
- ␊
- No longer available on datastore.␊
+ ␊
␊
+ ␊
+ ␊
␊
+ ␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2012-09-28_ex145_07x2␊
-
␊
- ␊
- ␊
- ␊
- ␊
- localhost␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2016-04-11 14:57␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- team_X1␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Import␊
- ␊
- ␊
- ␊
- No longer available on datastore.␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Experiment_001␊
-
␊
- ␊
- ␊
- ␊
- ␊
- localhost␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2016-04-11 14:57␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- team_X1␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Import␊
- ␊
- ␊
- ␊
- No longer available on datastore.␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
-
␊
- ␊
- ␊
- ␊
- ␊
-
␊
- ␊
- ␊
+ ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2016-04-11 14:57␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2016-04-11 14:57␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- 2016-04-11 14:57␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
-
␊
- ␊
- ␊
-
␊
- ␊
- | ␊
- | ␊
- ␊
- ␊
- rgb␊
- ␊ - ␊
- localhost␊
+ |
␊
- team_X1␊
+
␊
+ ␊
+ ␊
+ ␊
+ - ␊
+
- ␊ + ␊ + ␊ +
- ␊ + ␊ + 1␊ + ␊ + ␊ +
- ␊ + ␊ + ␊ +
␊
-
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Import␊
- ␊
- ␊
-
␊
- No longer available on datastore.␊
+ ␊
␊
+ ␊
- 2012-06-28_Cortex␊
-
␊ -␊
- ␊
- ␊
- ␊
- ␊
- ␊
+ ␊
␊
- ␊ -
␊
- localhost␊
-
␊
- ␊
- team_X1␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
␊
- ␊
-
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Import␊
- ␊
- ␊
-
␊
+ ␊
␊
- No longer available on datastore.␊
+ ␊
␊
+ ␊
+ ␊
␊
- 2012-09-28_ex145_07x2␊
-
␊ -␊
- ␊
- ␊
- ␊
- ␊
- ␊
-
␊
- ␊ -
␊
- localhost␊
-
␊
- ␊
- team_X1␊
-
␊
- ␊
-
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Import␊
- ␊
- ␊
-
␊
- ␊
- No longer available on datastore.␊
-
␊
- ␊
- Experiment_001␊
-
␊ -␊
- ␊
- ␊
- ␊
- ␊
- ␊
-
␊
- ␊ -
␊
- localhost␊
-
␊
- ␊
- team_X1␊
-
␊
- ␊
-
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- Import␊
- ␊
- ␊
-
␊
- ␊
- No longer available on datastore.␊
-
␊
- - ␊
-
- ␊ - ␊ - ␊ -
- ␊ - ␊ - 1␊ - ␊ - ␊ -
- ␊ - ␊ - ␊ -
␊
-
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
+ ␊
Datasets␊
@@ -1194,8 +810,8 @@ Generated by [AVA](https://ava.li).
␊
␊
- ␊
␊
␊
Datasets␊
@@ -1194,8 +810,8 @@ Generated by [AVA](https://ava.li).
␊
␊
␊
- ␊
- ␊
+ ␊
+ ␊
␊
␊
␊
@@ -1203,10 +819,10 @@ Generated by [AVA](https://ava.li).
␊
␊
␊
- ␊
+ ␊
␊
- ␊
- ␊
+ ␊
+ ␊
␊
␊
␊
- ␊
+ ␊
+ ␊
␊
␊
␊
@@ -1494,8 +1110,8 @@ Generated by [AVA](https://ava.li).
␊
␊
- ␊
- ␊
+ ␊
+ ␊
␊
␊
␊
@@ -1671,615 +1287,322 @@ Generated by [AVA](https://ava.li).
␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- ␊
- rgb␊
-
␊
- ␊
- ␊
- ␊
- ␊
- localhost␊
+ ␊
+
␊
+ ␊
+ ␊
␊
- ␊
- ␊
- ␊
+ ␊
␊
- ␊
- ␊
- ␊
- ␊
- ␊
+ ␊
+ ␊
+ ␊
+ ␊
+
␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ - ␊
+ ␊
+
␊
+ ␊
+ - ␊
+ ␊
+ 1␊
+ ␊
+
␊
+ ␊
+ - ␊
+ ␊
+
␊
+
␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+
␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+ ␊
+
␊
- ␊
- ␊
- ␊
- ␊
-
␊
- ␊
- ␊
+ ␊
+
␊
- ␊
- ␊
-
␊
- ␊
- | ␊
- | ␊
- ␊
- ␊
- rgb␊
- ␊ - ␊
- localhost␊
+ |
- ␊
+
- ␊ + ␊ + ␊ +
- ␊ + ␊ + 1␊ + ␊ + ␊ +
- ␊ + ␊ + ␊ +
- ␊
-
- ␊ - ␊ - ␊ -
- ␊ - ␊ - 1␊ - ␊ - ␊ -
- ␊ - ␊ - ␊ -
␊
- Start Skeleton Tracing␊
- 
␊
- Start Volume Tracing␊
-