colors of conservation and properties

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2321 5a81b35b-ba03-0410-adc8-b2c5c5119f08

modules/gui/src/sequence/align_properties_painter.cc

@@ -32,26 +32,26 @@ namespace {
 
 QMap<QString,QColor> GetColorMap(){
   QMap<QString,QColor> map;
-  map["G"]=QColor(Qt::gray);
-  map["A"]=QColor(Qt::gray);
-  map["V"]=QColor(Qt::gray);
-  map["L"]=QColor(Qt::gray);
-  map["I"]=QColor(Qt::gray);
-  map["F"]=QColor(255,165,0);
-  map["Y"]=QColor(255,165,0);
-  map["W"]=QColor(255,165,0);
-  map["C"]=QColor(Qt::yellow);
-  map["M"]=QColor(Qt::yellow);
-  map["S"]=QColor(Qt::green);
-  map["T"]=QColor(Qt::green);
-  map["K"]=QColor(Qt::red);
-  map["R"]=QColor(Qt::red);
-  map["H"]=QColor(Qt::red);
-  map["D"]=QColor(Qt::blue);
-  map["E"]=QColor(Qt::blue);
-  map["N"]=QColor(Qt::blue);
-  map["Q"]=QColor(Qt::blue);
-  map["P"]=QColor(Qt::magenta);
+  map["G"]=QColor(175,175,175,100);
+  map["A"]=QColor(175,175,175,100);
+  map["V"]=QColor(175,175,175,100);
+  map["L"]=QColor(175,175,175,100);
+  map["I"]=QColor(175,175,175,100);
+  map["F"]=QColor(255,165,100);
+  map["Y"]=QColor(255,165,100);
+  map["W"]=QColor(255,165,100);
+  map["C"]=QColor(255,255,0,100);
+  map["M"]=QColor(255,255,0,100);
+  map["S"]=QColor(0,255,0,100);
+  map["T"]=QColor(0,255,0,100);
+  map["K"]=QColor(255,0,0,100);
+  map["R"]=QColor(255,0,0,100);
+  map["H"]=QColor(255,0,0,100);
+  map["D"]=QColor(0,0,255,100);
+  map["E"]=QColor(0,0,255,100);
+  map["N"]=QColor(0,0,255,100);
+  map["Q"]=QColor(0,0,255,100);
+  map["P"]=QColor(0,255,255,100);
   return map;
 }
 

modules/gui/src/sequence/alignment_view_object.cc

@@ -69,7 +69,7 @@ QMap<QString,int> GetGroupMap(){
 }
 
 QColor GetColor(int cons){
-  int color = 255 - int((float(cons) / 100) * 255);
+  int color = 255 - int((float(cons) / 100) * 200);
   return QColor(color,color,color);
 }
 
@@ -120,10 +120,10 @@ AlignmentViewObject::AlignmentViewObject(const seq::AlignmentHandle& alignment,
 
     }
     if(element.size()==1){
-      conservation_[j] = GetColor(100);
+      conservation_[j] = QColor(175,175,175);
     }
     else if(group > 0){
-      conservation_[j] = GetColor(70);
+      conservation_[j] = QColor(200,200,200);
     }
     else{
       conservation_[j] = Qt::transparent;
@@ -145,8 +145,8 @@ QVariant AlignmentViewObject::GetData(int row, int column, int role)
 
     if(role == Qt::ForegroundRole){
       if(column -1 < conservation_.size()){
-        return QVariant(GetForeGroundColor(conservation_[column-1]));
-      }
+          return QVariant(Qt::black);
+        }
         return QVariant(Qt::transparent);
     }
 

modules/gui/src/sequence/sequence_viewer.cc

@@ -156,8 +156,7 @@ void SequenceViewerV2::InitActions()
   QAction* menu_action = new QAction(this);
   menu_action->setText("Menubar");
   menu_action->setShortcut(QKeySequence(tr("Ctrl+M")));
-  menu_action->setCheckable(true);
-  menu_action->setToolTip("Display Menubar (Ctrl+M)");
+  menu_action->setToolTip("Display Options (Ctrl+M)");
   menu_action->setIcon(QIcon(icon_path.absolutePath()+QDir::separator()+QString("menubar_icon.png")));
   action_list_.append(menu_action);
   connect(menu_action, SIGNAL(triggered(bool)), this, SLOT(DisplayMenu()));