Update number of points to uint64

Author: alxvth

src/MappingUtils.cpp

@@ -14,7 +14,7 @@
 #include <utility>
 #include <vector>
 
-std::pair<const mv::LinkedData*, unsigned int> getSelectionMapping(const mv::Dataset<Points>& source, const mv::Dataset<Points>& target, LinkedDataCondition checkMapping) {
+std::pair<const mv::LinkedData*, std::uint64_t> getSelectionMapping(const mv::Dataset<Points>& source, const mv::Dataset<Points>& target, LinkedDataCondition checkMapping) {
     const std::vector<mv::LinkedData>& linkedDatas = source->getLinkedData();
 
     if (linkedDatas.empty())
@@ -34,7 +34,7 @@ std::pair<const mv::LinkedData*, unsigned int> getSelectionMapping(const mv::Dat
     return { nullptr, 0 };
 }
 
-std::pair<const mv::LinkedData*, unsigned int> getSelectionMappingColorsToPositions(const mv::Dataset<Points>& colors, const mv::Dataset<Points>& positions) {
+std::pair<const mv::LinkedData*, std::uint64_t> getSelectionMappingColorsToPositions(const mv::Dataset<Points>& colors, const mv::Dataset<Points>& positions) {
     auto testTargetAndParent = [](const mv::LinkedData& linkedData, const mv::Dataset<Points>& positions) -> bool {
         const mv::Dataset<mv::DatasetImpl> mapTargetData = linkedData.getTargetDataset();
         return mapTargetData == positions || parentHasSameNumPoints(mapTargetData, positions);
@@ -43,7 +43,7 @@ std::pair<const mv::LinkedData*, unsigned int> getSelectionMappingColorsToPositi
     return getSelectionMapping(colors, positions, testTargetAndParent);
 }
 
-std::pair<const mv::LinkedData*, unsigned int> getSelectionMappingPositionsToColors(const mv::Dataset<Points>& positions, const mv::Dataset<Points>& colors) {
+std::pair<const mv::LinkedData*, std::uint64_t> getSelectionMappingPositionsToColors(const mv::Dataset<Points>& positions, const mv::Dataset<Points>& colors) {
     auto testTarget = [](const mv::LinkedData& linkedData, const mv::Dataset<Points>& colors) -> bool {
         return linkedData.getTargetDataset() == colors;
         };
@@ -58,7 +58,7 @@ std::pair<const mv::LinkedData*, unsigned int> getSelectionMappingPositionsToCol
     return { mapping, numTargetPoints };
 }
 
-std::pair<const mv::LinkedData*, unsigned int> getSelectionMappingPositionSourceToColors(const mv::Dataset<Points>& positions, const mv::Dataset<Points>& colors) {
+std::pair<const mv::LinkedData*, std::uint64_t> getSelectionMappingPositionSourceToColors(const mv::Dataset<Points>& positions, const mv::Dataset<Points>& colors) {
     if (!positions->isDerivedData())
         return { nullptr, 0 };
 

src/MappingUtils.h

@@ -39,17 +39,17 @@ using LinkedDataCondition = std::function<bool(const mv::LinkedData& linkedData,
         };
     This function will return the first match of the condition
 */
-std::pair<const mv::LinkedData*, unsigned int> getSelectionMapping(const mv::Dataset<Points>& source, const mv::Dataset<Points>& target, LinkedDataCondition checkMapping);
+std::pair<const mv::LinkedData*, std::uint64_t> getSelectionMapping(const mv::Dataset<Points>& source, const mv::Dataset<Points>& target, LinkedDataCondition checkMapping);
 
 // Returns a mapping (linked data) from colors whose target is positions or whose target's parent has the same number of points as positions
-std::pair<const mv::LinkedData*, unsigned int> getSelectionMappingColorsToPositions(const mv::Dataset<Points>& colors, const mv::Dataset<Points>& positions);
+std::pair<const mv::LinkedData*, std::uint64_t> getSelectionMappingColorsToPositions(const mv::Dataset<Points>& colors, const mv::Dataset<Points>& positions);
 
 // Returns a mapping (linked data) from positions whose target is colors or 
 //  a mapping from positions' parent whose target is colors if the number of data points match 
-std::pair<const mv::LinkedData*, unsigned int> getSelectionMappingPositionsToColors(const mv::Dataset<Points>& positions, const mv::Dataset<Points>& colors);
+std::pair<const mv::LinkedData*, std::uint64_t> getSelectionMappingPositionsToColors(const mv::Dataset<Points>& positions, const mv::Dataset<Points>& colors);
 
 // Returns a mapping (linked data) from positions' source data whose target is colors 
-std::pair<const mv::LinkedData*, unsigned int> getSelectionMappingPositionSourceToColors(const mv::Dataset<Points>& positions, const mv::Dataset<Points>& colors);
+std::pair<const mv::LinkedData*, std::uint64_t> getSelectionMappingPositionSourceToColors(const mv::Dataset<Points>& positions, const mv::Dataset<Points>& colors);
 
 // Check if the mapping is surjective, i.e. hits all elements in the target
 bool checkSurjectiveMapping(const mv::LinkedData& linkedData, const std::uint32_t numPointsInTarget);

src/ScatterplotPlugin.cpp

@@ -846,7 +846,7 @@ void ScatterplotPlugin::loadColors(const Dataset<Clusters>& clusters)
         return;
 
     // Get global indices from the position dataset
-    int totalNumPoints = 0;
+    std::uint64_t totalNumPoints = 0;
     if (_positionDataset->isDerivedData())
         totalNumPoints = _positionSourceDataset->getFullDataset<Points>()->getNumPoints();
     else

src/ScatterplotPlugin.h

@@ -119,7 +119,7 @@ class ScatterplotPlugin : public ViewPlugin
     Dataset<Points>                     _positionDataset;           /** Smart pointer to points dataset for point position */
     Dataset<Points>                     _positionSourceDataset;     /** Smart pointer to source of the points dataset for point position (if any) */
     std::vector<mv::Vector2f>           _positions;                 /** Point positions */
-    unsigned int                        _numPoints;                 /** Number of point positions */
+    std::uint64_t                       _numPoints;                 /** Number of point positions */
     QPointer<SettingsAction>            _settingsAction;            /** Group action for all settings */
     QPointer<HorizontalToolbarAction>   _primaryToolbarAction;      /** Horizontal toolbar for primary content */
     QRectF                              _selectionBoundaries;       /** Boundaries of the selection */