this.deleteAnnotationLayerIfConfirmed(readableName, layer)}>
+ getDeleteAnnotationLayerDropdownOption = (
+ readableName: string,
+ type: AnnotationLayerType,
+ tracingId: string,
+ layer?: APIDataLayer,
+ ) => (
+ {
: "";
const shouldDelete = await confirmAsync({
title: `Deleting an annotation layer makes its content and history inaccessible. ${fallbackLayerNote}This cannot be undone. Are you sure you want to delete this layer?`,
- okText: `Yes, delete annotation layer “${readableAnnoationLayerName}”`,
+ okText: `Yes, delete annotation layer “${readableAnnotationLayerName}”`,
cancelText: "Cancel",
maskClosable: true,
closable: true,
@@ -495,12 +509,8 @@ class DatasetSettings extends React.PureComponent {
},
});
if (!shouldDelete) return;
+ this.props.deleteAnnotationLayer(tracingId, type, readableAnnotationLayerName);
await Model.ensureSavedState();
- await deleteAnnotationLayer(
- this.props.tracing.annotationId,
- this.props.tracing.annotationType,
- readableAnnoationLayerName,
- );
location.reload();
};
@@ -619,6 +629,8 @@ class DatasetSettings extends React.PureComponent {
const { intensityRange } = layerSettings;
const layer = getLayerByName(dataset, layerName);
const isSegmentation = layer.category === "segmentation";
+ const layerType =
+ layer.category === "segmentation" ? AnnotationLayerEnum.Volume : AnnotationLayerEnum.Skeleton;
const canBeMadeEditable =
isSegmentation && layer.tracingId == null && this.props.controlMode === "TRACE";
const isVolumeTracing = isSegmentation ? layer.tracingId != null : false;
@@ -683,7 +695,12 @@ class DatasetSettings extends React.PureComponent {
? {
label: (
{
}
return (
-
- this.showDownsampleVolumeModal(volumeTracing)}>
- 
-
+
+
);
};
@@ -1167,7 +1175,7 @@ class DatasetSettings extends React.PureComponent {
const readableName = "Skeleton";
const skeletonTracing = enforceSkeletonTracing(tracing);
const isOnlyAnnotationLayer = tracing.annotationLayers.length === 1;
- const { showSkeletons } = skeletonTracing;
+ const { showSkeletons, tracingId } = skeletonTracing;
const activeNodeRadius = getActiveNode(skeletonTracing)?.radius ?? 0;
return (
@@ -1218,7 +1226,13 @@ class DatasetSettings extends React.PureComponent {
}}
>
{showSkeletons ? (
@@ -1292,18 +1306,6 @@ class DatasetSettings extends React.PureComponent this.deleteAnnotationLayerIfConfirmed(readableName, type, tracingId, layer)}
+ >
Delete this annotation layer
);
deleteAnnotationLayerIfConfirmed = async (
- readableAnnoationLayerName: string,
+ readableAnnotationLayerName: string,
+ type: AnnotationLayerType,
+ tracingId: string,
layer?: APIDataLayer,
) => {
const fallbackLayerNote =
@@ -481,7 +495,7 @@ class DatasetSettings extends React.PureComponent
- {this.getDeleteAnnotationLayerDropdownOption(readableName, layer)}
+ {this.getDeleteAnnotationLayerDropdownOption(
+ readableName,
+ layerType,
+ layer.tracingId,
+ layer,
+ )}
),
key: "deleteAnnotationLayer",
@@ -1136,21 +1153,12 @@ class DatasetSettings extends React.PureComponent
- - This annotation does not have volume annotation data in all magnifications. Consequently, - annotation data cannot be rendered at all zoom values. By clicking "Downsample", - WEBKNOSSOS will use the best magnification of the volume data to create all dependent mags. -
-- The following magnifications will be added when clicking "Downsample":{" "} - {magsToDownsample.map((mag) => mag.join("-")).join(", ")}. -
-
- The cause for the missing magnifications can be one of the following:
-
- -
-
- - The annotation was created before WEBKNOSSOS supported multi-magnification volume - tracings. - -
- An old annotation was uploaded which did not include all magnifications. -
- - The annotation was created in a task that was restricted to certain magnifications. - -
- The dataset was mutated to have more magnifications. -
- Note that this action might take a few minutes. Afterwards, the annotation is reloaded. - Also, the version history of the volume data will be reset. -
-
-
- Downsample
-
-
- Statistics}
- {"treeCount" in stats ? (
+ {skeletonStats && "treeCount" in skeletonStats ? (
| - {stats.treeCount} {formatLabel(pluralize("Tree", stats.treeCount))} + {skeletonStats.treeCount} {formatLabel(pluralize("Tree", skeletonStats.treeCount))} | @@ -260,7 +268,7 @@ export function AnnotationStats({ /> | - {stats.segmentCount} {formatLabel(pluralize("Segment", stats.segmentCount))} + {totalSegmentCount} {formatLabel(pluralize("Segment", totalSegmentCount))} |