From 689f9603021fa5590bbb41a50e7efa6bd170b40a Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 6 Jul 2011 11:54:57 +0000
Subject: [PATCH] [LMS-2350] dropbox fixes
SVN: 22022
---
.../etc/sanofi-dropbox/dropbox-all-in-one-with-library.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sanofi/dist/etc/sanofi-dropbox/dropbox-all-in-one-with-library.py b/sanofi/dist/etc/sanofi-dropbox/dropbox-all-in-one-with-library.py
index 9dcb36b434e..4b9aab02aa5 100644
--- a/sanofi/dist/etc/sanofi-dropbox/dropbox-all-in-one-with-library.py
+++ b/sanofi/dist/etc/sanofi-dropbox/dropbox-all-in-one-with-library.py
@@ -465,6 +465,8 @@ class MyImageDataSetConfig(SimpleImageDataConfig):
self.setStoreChannelsOnExperimentLevel(STORE_CHANNELS_ON_EXPERIMENT_LEVEL)
self.setOriginalDataStorageFormat(ORIGINAL_DATA_STORAGE_FORMAT)
if GENERATE_THUMBNAILS:
+ self.setGenerateThumbnails(True)
+ self.setUseImageMagicToGenerateThumbnails(True)
self.setAllowedMachineLoadDuringThumbnailsGeneration(ALLOWED_MACHINE_LOAD_DURING_THUMBNAIL_GENERATION)
self.setMaxThumbnailWidthAndHeight(MAX_THUMNAIL_WIDTH_AND_HEIGHT)
@@ -548,10 +550,10 @@ if incoming.isDirectory():
overlaysDir = findDir(incoming, OVERLAYS_DIR_PATTERN)
if overlaysDir is not None:
convertToPng(overlaysDir.getPath(), OVERLAYS_TRANSPARENT_COLOR)
- overlayDatasetConfig = MyImageDataSetConfig(incoming, overlaysDir)
+ overlayDatasetConfig = MyImageDataSetConfig(overlaysDir, overlaysDir)
overlayDatasetConfig.setSegmentationImageDatasetType()
overlayDatasetConfig.setFileFormatType(OVERLAY_IMAGE_FILE_FORMAT)
- overlayDatasetDetails = factory.createImageRegistrationDetails(overlayDatasetConfig, incoming)
+ overlayDatasetDetails = factory.createImageRegistrationDetails(overlayDatasetConfig, overlaysDir)
overlayDataset = transaction.createNewDataSet(overlayDatasetDetails)
overlayDataset.setSample(imageDataSet.getSample())
overlayDataset.setParentDatasets([ imageDataSet.getDataSetCode() ])
--
GitLab