[avida-cvs] avida CVS commits: /current/source/qt-viewer n_orig_instruction_cpu_widget.cc

[goingssh]

goingssh		Thu Aug 28 13:49:31 2003 EDT

  Modified files:              
    /avida/current/source/qt-viewer	n_orig_instruction_cpu_widget.cc 
  Log:
  commented out all setInsideSpacing functions since these break the viewer on windows
  
Index: avida/current/source/qt-viewer/n_orig_instruction_cpu_widget.cc
diff -u avida/current/source/qt-viewer/n_orig_instruction_cpu_widget.cc:1.18 avida/current/source/qt-viewer/n_orig_instruction_cpu_widget.cc:1.19
--- avida/current/source/qt-viewer/n_orig_instruction_cpu_widget.cc:1.18	Wed Aug 27 03:22:22 2003
+++ avida/current/source/qt-viewer/n_orig_instruction_cpu_widget.cc	Thu Aug 28 13:49:31 2003
@@ -51,6 +51,7 @@
 #endif
 
 #include <fstream>
+#include <iostream>
 
 #include "../main/genotype.hh"
 #include "../cpu/hardware_method.hh"
@@ -69,13 +70,8 @@
 #include "../main/species.hh"
 #endif
 
-
-using namespace std;
-
-
 using namespace std;
 
-
 cLabeledField::cLabeledField(QWidget *parent, const char *name, WFlags f)
 : QWidget(parent, name, f)
 {
@@ -122,8 +118,10 @@
   GenDebug("entered.");
   setTitle("Summary");
   setColumns(1);
-  setInsideSpacing(0);
+  //setInsideSpacing(0);
+
 
+  cout << "stuff\n";
   m_genotype_id = new cLabeledField(this);
   m_genotype_name = new cLabeledField(this);
   m_species_id = new cLabeledField(this);
@@ -316,7 +314,7 @@
   GenDebug("entered.");
   setTitle("Registers");
   setColumns(1);
-  setInsideSpacing(0);
+  //setInsideSpacing(0);
   m_registers.setAutoDelete(TRUE);
   for(int i = 0; i < NUM_REGISTERS; i++){
     cLabeledField *labeled_field = new cLabeledField(this);
@@ -376,7 +374,7 @@
   GenDebug("entered.");
   setTitle("Inputs");
   setColumns(1);
-  setInsideSpacing(0);
+  //setInsideSpacing(0);
   m_inputs.setAutoDelete(TRUE);
   for(int i = 0; i < NUM_REGISTERS; i++){
     cLabeledField *labeled_field = new cLabeledField(this);
@@ -596,7 +594,7 @@
   GenDebug("entered.");
   setTitle("Stacks");
   setColumns(1);
-  setInsideSpacing(0);
+  //setInsideSpacing(0);
   m_stackln1 = new cStackField(this);
   m_stackln2 = new cStackField(this);
   m_stackln1->setTitle("A:");
@@ -757,7 +755,7 @@
 {
   GenDebug("entered.");
     m_component_vbox = new QVBox(this, "<N_Instruction_CPUWidget::m_component_vbox>");
-      m_summary1 = new cSummaryWidget(m_component_vbox);
+     
       QHBox *hbox = new QHBox(m_component_vbox);
         m_registers = new cRegistersWidget(hbox);
         m_inputs = new cInputsWidget(hbox);
@@ -765,13 +763,15 @@
       m_hideshow_binary = new cHideShowBinary(m_component_vbox);
       connect(m_hideshow_binary, SIGNAL(showBinarySig(bool)), this, SLOT(showData2Text(bool)));
       m_hideshow_binary->hideBinary();
+       m_summary1 = new cSummaryWidget(m_component_vbox);
   addTab(m_component_vbox, "CPU");
   //  m_stats_vbox = new QVBox(this, "<N_Instruction_CPUWidget::m_stats_vbox>");
   //    m_summary2 = new cSummaryWidget(m_stats_vbox);
   //addTab(m_stats_vbox, "Stats");
     m_tasks_vbox = new QVBox(this, "<N_Instruction_CPUWidget::m_tasks_vbox>");
-      m_summary3 = new cSummaryWidget(m_tasks_vbox);
+     
       m_tasks = new cTasksWidget(m_tasks_vbox, "<N_Instruction_CPUWidget::m_tasks>");
+       m_summary3 = new cSummaryWidget(m_tasks_vbox);
   addTab(m_tasks_vbox, "Tasks");
   //  m_genotype_vbox = new QVBox(this, "<N_Instruction_CPUWidget::m_genotype_vbox>");
   //    m_summary4 = new cSummaryWidget(m_genotype_vbox);