Commit e9828d66 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[MERGE]

parents 67ebf72e 72ea8ff8
...@@ -186,6 +186,17 @@ private: ...@@ -186,6 +186,17 @@ private:
*/ */
void dendrogramClick( WPickInfo pickInfo ); void dendrogramClick( WPickInfo pickInfo );
/**
* update the output connector on demand, for performance reasons this is not done every time
* a change to the cluster selection is applied
*/
void updateOutDataset();
/**
* helper function to set the label on the in scene buttons depending on which labeling scheme is selected
*/
void setButtonLabels();
/** /**
* An input connector that accepts order 1 datasets. * An input connector that accepts order 1 datasets.
...@@ -316,12 +327,6 @@ private: ...@@ -316,12 +327,6 @@ private:
*/ */
WPropGroup m_groupTriangulation; WPropGroup m_groupTriangulation;
/**
* grouping the properties controlling cluster selection for minimum branch length
*/
WPropGroup m_groupMinBranchLength;
/** /**
* controls the display of the dendrogram overlay * controls the display of the dendrogram overlay
*/ */
...@@ -394,6 +399,36 @@ private: ...@@ -394,6 +399,36 @@ private:
WPropInt m_infoMaxLevel; //!< info property WPropInt m_infoMaxLevel; //!< info property
std::vector< std::vector<size_t> >m_loadedPartitions; //!< set partitions loaded from file std::vector< std::vector<size_t> >m_loadedPartitions; //!< set partitions loaded from file
/**
* updates the output connector on demand, as we don't want to do this every paint command
*/
WPropTrigger m_buttonUpdateOutput;
/**
* A list of cluster selection methods
*/
boost::shared_ptr< WItemSelection > m_clusterSelectionsList;
/**
* Selection property for clusters
*/
WPropSelection m_clusterSelection;
/**
* triggers the cluster selection update
*/
WPropTrigger m_buttonExecuteSelection;
/**
* A list of button labels
*/
boost::shared_ptr< WItemSelection > m_buttonLabelList;
/**
* Selection property for button labels
*/
WPropSelection m_buttonLabelSelection;
}; };
#endif // WMCLUSTERDISPLAYVOXELS_H #endif // WMCLUSTERDISPLAYVOXELS_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment