Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Common/H5Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,7 @@ namespace H5Utils
return nullptr;
}

Dataset<Points> createPointsDataset(mv::CoreInterface* core, bool ask, QString suggestion)
mv::Dataset<Points> createPointsDataset(mv::CoreInterface* core, bool ask, QString suggestion)
{
QString dataSetName = suggestion;

Expand Down Expand Up @@ -1128,7 +1128,7 @@ namespace H5Utils
}

QString datasetName = prefix.isEmpty() ? name : prefix + name;
Dataset<Clusters> clusterDataset = mv::data().createDataset("Cluster", datasetName, parent);
mv::Dataset<Clusters> clusterDataset = mv::data().createDataset("Cluster", datasetName, parent);

clusterDataset->getClusters().reserve(indices.size());

Expand All @@ -1146,7 +1146,7 @@ namespace H5Utils
}

// Notify others that the clusters have changed
events().notifyDatasetDataChanged(clusterDataset);
mv::events().notifyDatasetDataChanged(clusterDataset);
}


Expand Down
4 changes: 2 additions & 2 deletions src/H5ADLoader/H5ADUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace H5AD
{
struct LoaderInfo
{
Dataset<Points> _pointsDataset;
mv::Dataset<Points> _pointsDataset;
std::vector<QString> _originalDimensionNames;
QVariantList _sampleNames;
std::vector<bool> _enabledDimensions;
Expand All @@ -33,7 +33,7 @@ namespace H5AD

bool LoadCategories(H5::Group& group, std::map<std::string, std::vector<QString>>& categories);

DataHierarchyItem* GetDerivedDataset(const QString& name, Dataset<Points>& pointsDataset);
mv::DataHierarchyItem* GetDerivedDataset(const QString& name, mv::Dataset<Points>& pointsDataset);

bool LoadCodedCategories(H5::Group& group, std::map<QString, std::vector<unsigned>>& result);

Expand Down
Loading