Ignore:
Timestamp:
May 30, 2007, 6:21:04 PM (17 years ago)
Author:
chou
Message:

correction de qq bugs

Location:
trunk/IPs/systemC/processor/Morpheo/Tools/Viewer
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseP_alloc.cpp

    r21 r33  
    1515  }
    1616
    17  BaseP::BaseP(BaseP *p){
    18    *this=p;
    19   }
     17// BaseP::BaseP(BaseP *p){
     18//    *this=p;
     19//   }
    2020 
    2121};//end bdd
  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_modify.cpp

    r32 r33  
    2828        position_tab=position_tab_init;
    2929      else
    30         for(position_tab=position_tab_init ;level<groups->operator[](position_tab+1).getLevel();position_tab++);
    31       //cout << position_tab << "         " << position_tab_init<<endl;
     30        for(position_tab=position_tab_init ;position_tab+1<groups->size()&&level<groups->operator[](position_tab+1).getLevel();position_tab++);
     31      cout << position_tab << "         " << position_tab_init<<endl;
    3232      //create a new group and add
    3333      for(i=position_tab;i>=position_tab_init;i--)
     
    5555                }
    5656            }
    57           groups->insert(position_tab+1,*g);
    58           listgroup->insert(position_tab+1,g->getName());
     57              groups->insert(position_tab+1,*g);
     58              listgroup->insert(position_tab+1,g->getName());
     59         
    5960          delete g;
    6061         
  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Bdd/src/BaseV_searchComponent.cpp

    r32 r33  
    1313    int tmp=listcomp->indexOf(v,0);
    1414    if(tmp == -1)
    15       return NULL;
     15      return BaseP();
    1616    else
    1717      return pos->operator[](tmp);
  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_file_actions.cpp

    r32 r33  
    1313  QString current2;
    1414  if(!file_open && is_save){//if no file open or if the file opened has been saved -> open other file, else -> ask for saving file
    15     current2 = QFileDialog::getOpenFileName(this,"", "./data");
     15    current2 = QFileDialog::getOpenFileName(this,"", "./data",tr("(*.pos)"));
    1616    this->setDisabled(true);
    1717    /*if a file has been opened*/
     
    7979  repaint();
    8080  display_param();
     81  wparam->close();
     82  this->_parameters();
     83  this->_parameters();
    8184  this->setDisabled(false);
    8285  setMouseTracking(true);
     
    98101      wa->close();
    99102    if(save_as){//if "save as"
    100       current_name = QFileDialog::getSaveFileName(this,"","./data");
     103      current_name = QFileDialog::getSaveFileName(this,"","./data",tr("(*.cfg)"));
    101104      save_as = false;
    102105      parse->save_file(current_name.toStdString(),0);
  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Graphics/src/Graphics_parameters_window.cpp

    r32 r33  
    5050  scpu.append(" \n");
    5151  cpu ->setText(QString::fromStdString(scpu));
    52   cpu->setFixedSize(300,50);
     52  cpu->setFixedSize(350,50);
    5353  pbox->addWidget(cpu);
    5454 
     
    235235  cout << "value : " << v << endl;
    236236  param = obj.section(":",1,1);
    237   //cout << "param : " << param.toStdString() << endl;
     237  cout << "param : " << param.toStdString() << endl;
    238238
    239239  base->modifyValue(group.toStdString(),param.toStdString(),v);
     
    252252  QString obj = QObject::sender()->objectName();
    253253  int v,j;
    254   //cout << "name : " << obj.toStdString() << endl;
     254  cout << "name : " << obj.toStdString() << endl;
    255255  v = i;
    256256  //cout << "value : " << v << endl;
     
    263263    exit(1);
    264264  }
     265 
    265266  wparam->close();
    266267  apply_display = false;
  • trunk/IPs/systemC/processor/Morpheo/Tools/Viewer/Parser/src/Parse_save.cpp

    r32 r33  
    33 * type: 0 ->user save a file
    44 *       1 ->function apply() temporary save
     5 * experimental function !!!
    56 */
    67#include "Tools/Viewer/Parser/include/parser.h"
     
    133134            ts << "     </front_end>" <<endl <<endl;
    134135          }
     136        if((it+1)!=g->end() && (it+1)->getName()=="front_end" && (it)->getName()=="decod")
     137          {
     138            ts << "        </decod_unit>" <<endl <<endl;
     139            ts << "     </front_end>" <<endl <<endl;
     140          }
    135141        if((it+1)!=g->end() && (it+1)->getName()=="execution_loop" && (it)->getName()=="commit")
    136142          ts << "       </out_of_order_engine>" <<endl <<endl;
Note: See TracChangeset for help on using the changeset viewer.