Skip to content

Commit 7388a1c

Browse files
committed
Switch to basic task
1 parent 66f8bcb commit 7388a1c

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/ImageCollection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1744,7 +1744,7 @@ void ImageCollection::setMirrorVertical(bool mirrorVertical)
17441744
_mirrorVertical = mirrorVertical;
17451745
}
17461746

1747-
ForegroundTask& ImageCollection::getTask()
1747+
Task& ImageCollection::getTask()
17481748
{
17491749
return _task;
17501750
}

src/ImageCollection.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ class ImageCollection : public TreeItem
541541
*/
542542
void setMirrorVertical(bool mirrorVertical);
543543

544-
mv::ForegroundTask& getTask();
544+
mv::Task& getTask();
545545

546546
public:
547547

@@ -593,22 +593,22 @@ class ImageCollection : public TreeItem
593593
bool containsNans(std::vector<float>& data);
594594

595595
protected:
596-
QString _directory; /** Root directory of the images */
597-
QString _imageFileType; /** Image file type */
598-
QImage::Format _imageFormat; /** Image format */
599-
QSize _sourceSize; /** Size of the source image */
600-
QSize _targetSize; /** Size of the target image */
601-
QString _name; /** The name of the image collection */
602-
QString _datasetName; /** The name of the dataset */
603-
QString _dimensionTag; /** The dimension (TIFF) tag */
604-
bool _toGrayscale; /** Whether to convert the images in the collection to grayscale */
605-
ImageData::Type _type; /** How to load the collection (as image sequence or image stack) */
606-
SubSampling _subsampling; /** Subsampling parameters */
607-
QString _conversion; /** Conversion SHA */
608-
bool _addCoordinatesPoints; /** Add coordinates points */
609-
bool _mirrorHorizontal; /** Mirror horizontally */
610-
bool _mirrorVertical; /** Mirror vertically */
611-
mv::ForegroundTask _task; /** Task for reporting load progress */
596+
QString _directory; /** Root directory of the images */
597+
QString _imageFileType; /** Image file type */
598+
QImage::Format _imageFormat; /** Image format */
599+
QSize _sourceSize; /** Size of the source image */
600+
QSize _targetSize; /** Size of the target image */
601+
QString _name; /** The name of the image collection */
602+
QString _datasetName; /** The name of the dataset */
603+
QString _dimensionTag; /** The dimension (TIFF) tag */
604+
bool _toGrayscale; /** Whether to convert the images in the collection to grayscale */
605+
ImageData::Type _type; /** How to load the collection (as image sequence or image stack) */
606+
SubSampling _subsampling; /** Subsampling parameters */
607+
QString _conversion; /** Conversion SHA */
608+
bool _addCoordinatesPoints; /** Add coordinates points */
609+
bool _mirrorHorizontal; /** Mirror horizontally */
610+
bool _mirrorVertical; /** Mirror vertically */
611+
mv::Task _task; /** Task for reporting load progress */
612612

613613
friend class SubSampling;
614614
};

0 commit comments

Comments
 (0)