Fix the new analysis dialog so it starts at a good size on os x

[mussa.git] / qui / mussa_setup_dialog / SequenceSetupFrame.cpp

diff --git a/qui/mussa_setup_dialog/SequenceSetupFrame.cpp b/qui/mussa_setup_dialog/SequenceSetupFrame.cpp
index fd26f26f19028ba7ba89e9732bdaa114eb583493..0e12da4782216ccac868141390b8f0f39c234fa1 100644 (file)
--- a/qui/mussa_setup_dialog/SequenceSetupFrame.cpp
+++ b/qui/mussa_setup_dialog/SequenceSetupFrame.cpp
@@ -1,5 +1,6 @@
 #include <QFrame>
 #include <QList>
+#include <QScrollArea>
 #include <QVBoxLayout>
 
 #include "qui/mussa_setup_dialog/SequenceSetupWidget.hpp"
@@ -9,9 +10,13 @@
 
 SequenceSetupFrame::SequenceSetupFrame(QWidget *parent)
   : QWidget(parent),
-    seqCount(0),
+    sequenceFrame(0),
+    scrollArea(0),
+    seqCount(1),
+    default_directory(QDir::current()),
     sequenceLayout(0)
 {
+
   // frame
   sequenceFrame = new QFrame;
   sequenceFrame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
@@ -20,27 +25,47 @@ SequenceSetupFrame::SequenceSetupFrame(QWidget *parent)
 
   sequenceFrame->setLayout(sequenceLayout);
 
+  //scroll area
+  scrollArea = new QScrollArea;
+  scrollArea->setWidget(sequenceFrame);
+
   QVBoxLayout *mainLayout = new QVBoxLayout;
-  mainLayout->addWidget(sequenceFrame);
+  mainLayout->addWidget(scrollArea);
   setLayout(mainLayout);
 
   //Initialize to one sequence
-  changeSequenceCount(1);
+  changeSequenceCount(2);
+  
+  //scrollArea->resize(sequenceFrame->sizeHint());
+  //sequenceFrame->resize(500,500);
+  //sequenceFrame->resize(scrollArea->size());
+  scrollArea->setWidgetResizable(TRUE);
+  scrollArea->show();
+
 }
 
+QDir SequenceSetupFrame::get_default_dir() const 
+{
+  return default_directory;
+}
 
-//SequenceSetupFrame::SequenceSetupFrame(const SequenceSetupFrame &ssf)
-//  : sequenceFrame(ssf.sequenceFrame),
-//    sequenceLayout(ssf.sequenceLayout),
-//    seqCount(ssf.seqCount)//,
-//    //seqList(0)
-//{
-//}
+void SequenceSetupFrame::set_default_dir(const QDir& d)
+{
+  default_directory = d;
+}
 
 void SequenceSetupFrame::changeSequenceCount(int newSeqCount)
 {
   seqCount = newSeqCount;
   setupSequences(seqCount);
+  resizeInnerFrame();
+}
+
+void SequenceSetupFrame::resizeInnerFrame()
+{
+  QSize box(seqList.front()->sizeHint());
+
+  sequenceFrame->resize(box.width(), box.height() * seqList.size() + 30);
 }
 
 void SequenceSetupFrame::setupSequences(int newSeqCount)
@@ -58,7 +83,7 @@ void SequenceSetupFrame::setupSequences(int newSeqCount)
     SequenceSetupWidget *seq = 0;
     for (int i = 1; i <= numSeqsToAdd; i++)
     {
-      seq = new SequenceSetupWidget;
+      seq = new SequenceSetupWidget(this);
       seqList.push_back(seq);
       sequenceLayout->addWidget(seq);
     } 
@@ -82,7 +107,7 @@ void SequenceSetupFrame::setupSequences(int newSeqCount)
     }
 
   }
-  
+  updateGeometry();  
 }
 
 std::list<SetupInfo *> SequenceSetupFrame::getSetupInfo()
@@ -91,6 +116,7 @@ std::list<SetupInfo *> SequenceSetupFrame::getSetupInfo()
   
   std::list<SetupInfo *> setupInfoList;
 
+  QString seqName;
   QString seqFile;
   QString annotFile;
   int fastaIndex;
@@ -103,7 +129,8 @@ std::list<SetupInfo *> SequenceSetupFrame::getSetupInfo()
   for (int i = 0; i < curSeqCount; i++)
   {
     seq = seqList.back();
-    
+   
+    seqName = seq->getName();
     seqFile = seq->getSeqFile();
     annotFile = seq->getAnnotFile();
     fastaIndex = seq->getFastaIndex();
@@ -113,7 +140,8 @@ std::list<SetupInfo *> SequenceSetupFrame::getSetupInfo()
     seqList.push_front(seq);
     seqList.pop_back();
 
-    setupInfoList.push_back(new SetupInfo(seqFile.toStdString(), 
+    setupInfoList.push_back(new SetupInfo(seqName.toStdString(),
+            seqFile.toStdString(), 
                                          annotFile.toStdString(), 
                                          fastaIndex, start, end));