[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.6, 1.8.2.7 figureeditor.cpp, 1.3.2.3, 1.3.2.4 ima
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.6, 1.8.2.7 figureeditor.cpp, 1.3.2.3, 1.3.2.4 imageitem.cpp, 1.4.2.6, 1.4.2.7 lprofmain-priv.h, 1.6.2.4, 1.6.2.5 lprofmain.cpp, 1.188.2.7, 1.188.2.8 lprofmain.h, 1.52.2.7, 1.52.2.8 lprofmainbase.ui, 1.50.2.3, 1.50.2.4 main.cpp, 1.43.2.2, 1.43.2.3
|
From: Amit K. <ami...@us...> - 2009-07-12 15:09:07
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3010/lprofqt Modified Files: Tag: GSoC-2009 config.cpp figureeditor.cpp imageitem.cpp lprofmain-priv.h lprofmain.cpp lprofmain.h lprofmainbase.ui main.cpp Log Message: Index: main.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/main.cpp,v retrieving revision 1.43.2.2 retrieving revision 1.43.2.3 diff -C2 -d -r1.43.2.2 -r1.43.2.3 *** main.cpp 1 Jul 2009 18:34:02 -0000 1.43.2.2 --- main.cpp 12 Jul 2009 15:09:00 -0000 1.43.2.3 *************** *** 126,131 **** QTranslator translator( 0 ); // QString::fromLocal8Bit translations = ":/translations/lprof_" + (QString::fromLocal8Bit) QTextCodec::locale(); ! //translator.load( QString::fromLocal8Bit("lprof_") + QString::fromLocal8Bit(QTextCodec::locale()), QString::fromLocal8Bit(":/") ); //removed by me===========29june======== ! translator.load( QString::fromLocal8Bit("lprof_") + QLocale::system().name(), QString::fromLocal8Bit(":/") ); //added by me===========28june============ lprofApp -> installTranslator( &translator ); --- 126,130 ---- QTranslator translator( 0 ); // QString::fromLocal8Bit translations = ":/translations/lprof_" + (QString::fromLocal8Bit) QTextCodec::locale(); ! translator.load( QString::fromLocal8Bit("lprof_") + QLocale::system().name(), QString::fromLocal8Bit(":/") ); lprofApp -> installTranslator( &translator ); Index: imageitem.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -C2 -d -r1.4.2.6 -r1.4.2.7 *** imageitem.cpp 1 Jul 2009 18:34:02 -0000 1.4.2.6 --- imageitem.cpp 12 Jul 2009 15:09:00 -0000 1.4.2.7 *************** *** 37,41 **** #include <qmessagebox.h> #include <qfile.h> - //Added by qt3to4: #include <QTranslator> --- 37,40 ---- Index: lprofmain-priv.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.h,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -C2 -d -r1.6.2.4 -r1.6.2.5 *** lprofmain-priv.h 1 Jul 2009 18:34:02 -0000 1.6.2.4 --- lprofmain-priv.h 12 Jul 2009 15:09:00 -0000 1.6.2.5 *************** *** 37,41 **** #include <qassistantclient.h> #include <QTextEdit> - //Added by qt3to4: #include <lcmsprf.h> #include <qtabwidget.h> --- 37,40 ---- Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.188.2.7 retrieving revision 1.188.2.8 diff -C2 -d -r1.188.2.7 -r1.188.2.8 *** lprofmain.cpp 1 Jul 2009 18:34:02 -0000 1.188.2.7 --- lprofmain.cpp 12 Jul 2009 15:09:00 -0000 1.188.2.8 *************** *** 38,47 **** #include <profilechecker.h> #include <qtlcmswidgets.h> - //Added by qt3to4: - #include "lprofmain.h" #include "lprofmain-priv.h" #include "lcmsprf.h" - #include <string.h> #include <stdlib.h> --- 38,44 ---- *************** *** 502,520 **** instType itype; ! QTableWidgetItem *item = ui->listViewPortsInsts -> currentItem (); ! itype = mapCombo2Inst[ui->comboBoxDevice -> currentIndex()]; ! int my_row=item->row (); ! QTableWidgetItem *item2 =ui->listViewPortsInsts->item(my_row,1); if (validateIntrument(item2 -> text(), itype)) { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,2); item3->setText(ui->comboBoxDevice -> currentText()); ! item3 =ui->listViewPortsInsts->item(my_row,3); item3->setText(tr("Device verified")); charInstType.sprintf("%i", itype); ! item3 =ui->listViewPortsInsts->item(my_row,4); item3->setText(charInstType); ! item3=ui->listViewPortsInsts->item(my_row,0); index=item3->text().toInt(&OK) - 1; --- 499,517 ---- instType itype; ! QTableWidgetItem *item = ui->listViewPortsInsts ->currentItem (); ! itype = mapCombo2Inst[ui->comboBoxDevice ->currentIndex()]; ! int currentrow=item->row (); ! QTableWidgetItem *item2 =ui->listViewPortsInsts->item(currentrow,1); if (validateIntrument(item2 -> text(), itype)) { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(currentrow,2); item3->setText(ui->comboBoxDevice -> currentText()); ! item3 =ui->listViewPortsInsts->item(currentrow,3); item3->setText(tr("Device verified")); charInstType.sprintf("%i", itype); ! item3 =ui->listViewPortsInsts->item(currentrow,4); item3->setText(charInstType); ! item3=ui->listViewPortsInsts->item(currentrow,0); index=item3->text().toInt(&OK) - 1; *************** *** 522,526 **** { sys.hdr.instArray[index].inst = itype; ! item3=ui->listViewPortsInsts->item(my_row,1); strcpy(sys.hdr.instArray[index].port, item3 -> text().toLocal8Bit()); } --- 519,523 ---- { sys.hdr.instArray[index].inst = itype; ! item3=ui->listViewPortsInsts->item(currentrow,1); strcpy(sys.hdr.instArray[index].port, item3 -> text().toLocal8Bit()); } *************** *** 539,543 **** else { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(my_row,3); item3->setText( tr("Device failed verification.")); QMessageBox::critical(this, QTranslator::tr("Error installing measurement device."), --- 536,540 ---- else { ! QTableWidgetItem *item3 =ui->listViewPortsInsts->item(currentrow,3); item3->setText( tr("Device failed verification.")); QMessageBox::critical(this, QTranslator::tr("Error installing measurement device."), *************** *** 579,594 **** ui->listViewPortsInsts -> setColumnWidth (3, 350); ui->listViewPortsInsts -> setColumnWidth (4, 0); ! QString str = QString(QLatin1String("p#")) ; ! QTableWidgetItem *item1 = new QTableWidgetItem(str,0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(0,item1); ! str = QString(QLatin1String("Port")); ! item1 = new QTableWidgetItem(str,0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(1,item1); ! str = QString(QLatin1String("Device")); ! item1 = new QTableWidgetItem(str,0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(2,item1); ! str = QString(QLatin1String("Status")); ! item1 = new QTableWidgetItem(str,0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(3,item1); for (int i=0; i < sys.hdr.validPorts; i++) --- 576,589 ---- ui->listViewPortsInsts -> setColumnWidth (3, 350); ui->listViewPortsInsts -> setColumnWidth (4, 0); ! ! QTableWidgetItem *Horizontal = new QTableWidgetItem(QString::fromLocal8Bit("p#"),0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(0,Horizontal); ! Horizontal = new QTableWidgetItem(QString::fromLocal8Bit("Port"),0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(1,Horizontal); ! Horizontal = new QTableWidgetItem(QString::fromLocal8Bit("Device"),0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(2,Horizontal); ! Horizontal = new QTableWidgetItem(QString::fromLocal8Bit("Status"),0); ! ui->listViewPortsInsts->setHorizontalHeaderItem(3,Horizontal); ! for (int i=0; i < sys.hdr.validPorts; i++) *************** *** 1136,1143 **** ui->ComboBoxIntent -> clear(); ! ui->ComboBoxIntent -> insertItem(1000,per); ! ui->ComboBoxIntent -> insertItem(1000,relcolor); ! ui->ComboBoxIntent -> insertItem(1000,sat); ! ui->ComboBoxIntent -> insertItem(1000,Absolute); init_mon(); --- 1131,1138 ---- ui->ComboBoxIntent -> clear(); ! ui->ComboBoxIntent -> insertItem((ui->ComboBoxIntent->count() + 1), per); ! ui->ComboBoxIntent -> insertItem((ui->ComboBoxIntent->count() + 1),relcolor); ! ui->ComboBoxIntent -> insertItem((ui->ComboBoxIntent->count() + 1),sat); ! ui->ComboBoxIntent -> insertItem((ui->ComboBoxIntent->count() + 1),Absolute); init_mon(); Index: figureeditor.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/figureeditor.cpp,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -d -r1.3.2.3 -r1.3.2.4 *** figureeditor.cpp 23 Jun 2009 19:30:36 -0000 1.3.2.3 --- figureeditor.cpp 12 Jul 2009 15:09:00 -0000 1.3.2.4 *************** *** 33,37 **** #include "lprofmain-priv.h" #include "lprofmain.h" - //Added by qt3to4: #include <QResizeEvent> #include <QMouseEvent> --- 33,36 ---- Index: lprofmain.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v retrieving revision 1.52.2.7 retrieving revision 1.52.2.8 diff -C2 -d -r1.52.2.7 -r1.52.2.8 *** lprofmain.h 5 Jul 2009 20:33:17 -0000 1.52.2.7 --- lprofmain.h 12 Jul 2009 15:09:00 -0000 1.52.2.8 *************** *** 39,43 **** #include <qmutex.h> #include <QDialog> - //Added by qt3to4: #include <QTranslator> #include <QPixmap> --- 39,42 ---- Index: config.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/config.cpp,v retrieving revision 1.8.2.6 retrieving revision 1.8.2.7 diff -C2 -d -r1.8.2.6 -r1.8.2.7 *** config.cpp 5 Jul 2009 20:33:17 -0000 1.8.2.6 --- config.cpp 12 Jul 2009 15:09:00 -0000 1.8.2.7 *************** *** 45,49 **** #include <qradiobutton.h> #include <QDesktopWidget> - //Added by qt3to4: #include <QTranslator> #include <QVBoxLayout> --- 45,48 ---- Index: lprofmainbase.ui =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmainbase.ui,v retrieving revision 1.50.2.3 retrieving revision 1.50.2.4 diff -C2 -d -r1.50.2.3 -r1.50.2.4 *** lprofmainbase.ui 1 Jul 2009 18:34:02 -0000 1.50.2.3 --- lprofmainbase.ui 12 Jul 2009 15:09:00 -0000 1.50.2.4 *************** *** 1666,1670 **** </property> <property name="showGrid"> ! <bool>false</bool> </property> <property name="gridStyle"> --- 1666,1670 ---- </property> <property name="showGrid"> ! <bool>true</bool> </property> <property name="gridStyle"> *************** *** 1672,1676 **** </property> <attribute name="horizontalHeaderVisible"> ! <bool>false</bool> </attribute> <attribute name="verticalHeaderVisible"> --- 1672,1676 ---- </property> <attribute name="horizontalHeaderVisible"> ! <bool>true</bool> </attribute> <attribute name="verticalHeaderVisible"> |
