pointselector_nearly_building

Author: Jose Alonso Solis Lemus

CemrgApp/Modules/CemrgAppModule/files.cmake

@@ -12,7 +12,7 @@ set(CPP_FILES
     CemrgFourChamberTools.cpp
     CemrgFourChamberCmd.cpp
     CemrgMultilabelSegmentationUtils.cpp
-    #    CemrgMeshPointSelector.cpp
+    CemrgMeshPointSelector.cpp
     CemrgAtrialModellingToolCmd.cpp
 )
 
@@ -33,7 +33,7 @@ set(MOC_H_FILES
   include/CemrgAtrialModellingToolCmd.h
   include/CemrgFourChamberTools.h
   include/CemrgFourChamberCmd.h
-  #  include/CemrgMeshPointSelector.h
+  include/CemrgMeshPointSelector.h
   include/FourChamberCommon.h
 )
 

CemrgApp/Modules/CemrgAppModule/include/CemrgMeshPointSelector.h

@@ -38,51 +38,80 @@ PURPOSE.  See the above copyright notices for more information.
 #include <vtkPolyData.h>
 #include <vtkRegularPolygonSource.h>
 #include <QString>
+#include <QStringList>
 
 // The following header file is generated by CMake and thus it's located in
 // the build directory. It provides an export macro for classes and functions
 // that you want to be part of the public interface of your module.
 #include <MitkCemrgAppModuleExports.h>
 
-class MITKCEMRGAPPMODULE_EXPORT CemrgMeshPointSelector { 
-    public :
-        CemrgMeshPointSelector();
+struct PointLabelData {
+    int index;                        // Index of the point in the list
+    QString pointName;                 // Name of the point
+    int pointLabel;                    // Label assigned to the point
+    bool labelSet;                     // Whether the label is set
+    vtkIdType vtkId;                   // Associated VTK ID
+    std::array<double, 3> coordinates; // Point coordinates (x, y, z)
 
-        void SetAvailableLabels(QStringList names, std::vector<int> labels);
-        bool AllLabelsSet();
+    PointLabelData()
+        : index(-1), pointName(""), pointLabel(-1), labelSet(false), vtkId(-1), coordinates{0.0, 0.0, 0.0} {}
 
-        void AddPointFromSurface(mitk::Surface::Pointer surface, int pickedSeedId);
+    PointLabelData(QString name, int label)
+        : index(-1), pointName(name), pointLabel(label), labelSet(false), vtkId(-1), coordinates({0.0, 0.0, 0.0}) {}
 
-        void AddPoint(double *point, int pickedSeedId);
-        void PushBackLabel(int label);
-        void PushBackLabelFromAvailable(int index);
+    PointLabelData operator =(const PointLabelData& other) {
+        index = other.index;
+        pointName = other.pointName;
+        pointLabel = other.pointLabel;
+        labelSet = other.labelSet;
+        vtkId = other.vtkId;
+        coordinates = other.coordinates;
 
-        int CleanupLastPoint();
-        void Clear();
+        return *this;
+    }
+};
 
-        inline bool IsEmpty() { return seedIds->GetNumberOfIds() == 0; };
-        inline int NumIds() { return seedIds->GetNumberOfIds(); };
-        inline vtkSmartPointer<vtkPolyData> GetLineSeeds() { return lineSeeds; };
+class MITKCEMRGAPPMODULE_EXPORT CemrgMeshPointSelector {
+public:
+    CemrgMeshPointSelector();
 
-        std::string ToString();
+    bool IsEmpty();
+    void SetAvailableLabels(QStringList& names, std::vector<int>& labels);
+    bool AllLabelsSet();
 
-        int FindLabel(QString name);
-        int FindIndex(int label);
-        std::vector<double> FindPoint(int index);
+    int AddPickedIdToLabel(int pickedSeedId, int label);
+    void AddPointFromSurface(mitk::Surface::Pointer surface, int pickedSeedId, int label);
 
-        std::string PrintVtxFile(QString name);
-        std::string PrintCoordTxtFile(QString name);
+    int CleanupLastPoint();
+    int UnsetLastPoint(); // returns las label
+    void Clear();
 
-        void SaveToFile(QString path, Qstring name, QString type = "vtx");
+    inline vtkSmartPointer<vtkPolyData> GetLineSeeds() { return lineSeeds; };
 
-    private :
-        std::vector<int> seedLabels;
-        vtkSmartPointer<vtkIdList> seedIds;
-        vtkSmartPointer<vtkPolyData> lineSeeds;
+    std::string ToString();
 
-        QStringList pointNames;
-        std::vector<int> availableLabels;
-        std::vector<int> labelSet;
+    PointLabelData GetPointData(QString name);
+    inline int FindLabel(QString name);
+    int FindIndex(QString name);
+    std::vector<double> FindPoint(QString name);
 
-        // QStringList saveFiles;
-};
+    std::string PrintManyVtx(QStringList names); 
+    inline std::string PrintVtxFile(QString name) { return PrintManyVtx(QStringList(name)); };
+
+    std::string PrintManyCoordTxt(QStringList names);
+    inline std::string PrintCoordTxtFile(QString name) { return PrintManyCoordTxt(QStringList(name)); }; 
+
+    void SaveToFile(QString path, QStringList names, QString type = "vtx");
+
+    int GetLastLabelIndex();
+
+private:
+
+    // Data members
+    vtkSmartPointer<vtkPolyData> lineSeeds;
+    std::vector<PointLabelData> pointsData; // Consolidated data for points
+
+    // QStringList saveFiles;
+};
+
+#endif // CemrgMeshPointSelector_h