Ensure proper colorer range for depth range

resolves #161
asl · Jan 23, 2025 · f9da80a · f9da80a
1 parent 051621a
commit f9da80a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/graph/assemblygraph.cpp b/graph/assemblygraph.cpp
@@ -51,6 +51,7 @@
 
 AssemblyGraph::AssemblyGraph()
         : m_sequencesLoadedFromFasta(NOT_READY)
+        , m_currentScope(graph::Scope::wholeGraph())
 {
     clearGraphInfo();
 }
@@ -534,6 +535,7 @@ bool AssemblyGraph::loadGraphFromFile(const QString& filename) {
 //is not WHOLE_GRAPH.
 void AssemblyGraph::markNodesToDraw(const graph::Scope &scope,
                                     const std::vector<DeBruijnNode *>& startingNodes) {
+    m_currentScope = scope; // store the scope
     if (scope.graphScope() == WHOLE_GRAPH) {
         for (auto &entry : m_deBruijnGraphNodes) {
             //If double mode is off, only positive nodes are drawn.  If it's
@@ -558,6 +560,10 @@ void AssemblyGraph::markNodesToDraw(const graph::Scope &scope,
         edge->determineIfDrawn();
 }
 
+const graph::Scope &AssemblyGraph::currentScope() const {
+    return m_currentScope;
+}
+
 static QStringList removeNullStringsFromList(const QStringList& in) {
     QStringList out;
 

diff --git a/graph/assemblygraph.h b/graph/assemblygraph.h
@@ -201,12 +201,14 @@ class AssemblyGraph : public QObject
     QString getNodeNameFromString(QString string) const;
 
     std::vector<DeBruijnNode *> getNodesInDepthRange(double min, double max) const;
+    const graph::Scope &currentScope() const;
 private:
     std::vector<DeBruijnNode *> getNodesFromListExact(const QStringList& nodesList, std::vector<QString> * nodesNotInGraph) const;
     std::vector<DeBruijnNode *> getNodesFromListPartial(const QStringList& nodesList, std::vector<QString> * nodesNotInGraph) const;
     std::vector<int> makeOverlapCountVector();
     void clearAllCsvData();
     QString getNewNodeName(QString oldNodeName) const;
+    graph::Scope m_currentScope;
 
 signals:
     void setMergeTotalCount(int totalCount);

diff --git a/graph/nodecolorer.cpp b/graph/nodecolorer.cpp
@@ -76,8 +76,13 @@ QColor DepthNodeColorer::get(const GraphicsItemNode *node) {
 
     double lowValue = g_settings->lowDepthValue, highValue = g_settings->highDepthValue;
     if (g_settings->autoDepthValue) {
-        lowValue = m_graph->m_firstQuartileDepth;
-        highValue = m_graph->m_thirdQuartileDepth;
+        if (m_graph->currentScope().graphScope() == DEPTH_RANGE) {
+            lowValue = m_graph->currentScope().minDepth();
+            highValue = m_graph->currentScope().maxDepth();
+        } else {
+            lowValue = m_graph->m_firstQuartileDepth;
+            highValue = m_graph->m_thirdQuartileDepth;
+        }
     }
 
     float fraction = (depth - lowValue) / (highValue - lowValue);