Menu
▾
▴
[Vapor-cvs] vapor/apps/vaporgui/guis ColorbarWidget.cpp, 1.5, 1.6 ColorbarWidget.h, 1.4, 1.5 ControlPointEditor.cpp, 1.3, 1.4 ControlPointEditor.h, 1.3, 1.4 DomainWidget.cpp, 1.6, 1.7 OpacityWidget.cpp, 1.7, 1.8 animationeventrouter.cpp, 1.25, 1.26 animationeventrouter.h, 1.9, 1.10 colorpickerframe.cpp, 1.1, 1.2 colorpickerframe.h, 1.2, 1.3 dvreventrouter.cpp, 1.71, 1.72 dvreventrouter.h, 1.25, 1.26 eventrouter.cpp, 1.18, 1.19 floweventrouter.cpp, 1.96, 1.97 floweventrouter.h, 1.37, 1.38 glprobewindow.h, 1.12, 1.13 gltwoDwindow.h, 1.4, 1.5 guis.mk, 1.16, 1.17 instancetable.cpp, 1.3, 1.4 instancetable.h, 1.2, 1.3 isoeventrouter.cpp, 1.54, 1.55 isoeventrouter.h, 1.11, 1.12 loadtfdialog.cpp, 1.4, 1.5 loadtfdialog.h, 1.4, 1.5 mappingframe.cpp, 1.4, 1.5 mappingframe.h, 1.3, 1.4 probeeventrouter.cpp, 1.123, 1.124 probeeventrouter.h, 1.42, 1.43 probeframe.cpp, 1.9, 1.10 probeframe.h, 1.6, 1.7 qthumbwheel.cpp, 1.4, 1.5 qthumbwheel.h, 1.3, 1.4 regioneventrouter.cpp, 1.30, 1.31 regioneventrouter.h, 1.10, 1.11 savetfdialog.cpp, 1.3, 1.4 savetfdialog.h, 1.3, 1.4 seedlisteditor.cpp, 1.2, 1.3 seedlisteditor.h, 1.2, 1.3 twoDdataeventrouter.cpp, 1.24, 1.25 twoDdataeventrouter.h, 1.6, 1.7 twoDeventrouter.cpp, 1.43, 1.44 twoDimageeventrouter.cpp, 1.33, 1.34 twoDimageeventrouter.h, 1.6, 1.7 twodframe.cpp, 1.4, 1.5 twodframe.h, 1.4, 1.5 userpreferences.cpp, 1.27, 1.28 userpreferences.h, 1.8, 1.9 viewpointeventrouter.cpp, 1.34, 1.35 viewpointeventrouter.h, 1.9, 1.10 vizselectcombo.cpp, 1.3, 1.4 vizselectcombo.h, 1.2, 1.3
Update of /cvsroot/vapor/vapor/apps/vaporgui/guis In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16229/apps/vaporgui/guis Modified Files: ColorbarWidget.cpp ColorbarWidget.h ControlPointEditor.cpp ControlPointEditor.h DomainWidget.cpp OpacityWidget.cpp animationeventrouter.cpp animationeventrouter.h colorpickerframe.cpp colorpickerframe.h dvreventrouter.cpp dvreventrouter.h eventrouter.cpp floweventrouter.cpp floweventrouter.h glprobewindow.h gltwoDwindow.h guis.mk instancetable.cpp instancetable.h isoeventrouter.cpp isoeventrouter.h loadtfdialog.cpp loadtfdialog.h mappingframe.cpp mappingframe.h probeeventrouter.cpp probeeventrouter.h probeframe.cpp probeframe.h qthumbwheel.cpp qthumbwheel.h regioneventrouter.cpp regioneventrouter.h savetfdialog.cpp savetfdialog.h seedlisteditor.cpp seedlisteditor.h twoDdataeventrouter.cpp twoDdataeventrouter.h twoDeventrouter.cpp twoDimageeventrouter.cpp twoDimageeventrouter.h twodframe.cpp twodframe.h userpreferences.cpp userpreferences.h viewpointeventrouter.cpp viewpointeventrouter.h vizselectcombo.cpp vizselectcombo.h Log Message: Modifications to use QT4.6. Note: This will build and run on Linux, but has not been ported to other platforms. Index: regioneventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/regioneventrouter.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** regioneventrouter.cpp 11 Dec 2009 17:52:57 -0000 1.30 --- regioneventrouter.cpp 16 Dec 2009 20:53:46 -0000 1.31 *************** *** 34,44 **** #include <qcheckbox.h> #include <qcolordialog.h> ! #include <qbuttongroup.h> ! #include <qfiledialog.h> #include <qlabel.h> ! #include <qlistbox.h> #include "regionparams.h" #include "regiontab.h" - #include "floweventrouter.h" #include "messagereporter.h" #include "mainform.h" --- 34,44 ---- #include <qcheckbox.h> #include <qcolordialog.h> ! #include <q3buttongroup.h> ! #include <q3filedialog.h> #include <qlabel.h> ! #include <q3listbox.h> ! #include "GL/glew.h" #include "regionparams.h" #include "regiontab.h" #include "messagereporter.h" #include "mainform.h" *************** *** 66,74 **** #include "probeeventrouter.h" #include "eventrouter.h" using namespace VAPoR; ! RegionEventRouter::RegionEventRouter(QWidget* parent, const char* name): RegionTab(parent,name), EventRouter() { myParamsType = Params::RegionParamsType; MessageReporter::infoMsg("RegionEventRouter::RegionEventRouter()"); --- 66,76 ---- #include "probeeventrouter.h" #include "eventrouter.h" + #include "floweventrouter.h" using namespace VAPoR; ! RegionEventRouter::RegionEventRouter(QWidget* parent, const char* name): QWidget(parent,name), Ui_RegionTab(), EventRouter() { ! setupUi(this); myParamsType = Params::RegionParamsType; MessageReporter::infoMsg("RegionEventRouter::RegionEventRouter()"); *************** *** 980,984 **** confirmText(false); //Launch a file-open dialog ! QString filename = QFileDialog::getOpenFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", --- 982,986 ---- confirmText(false); //Launch a file-open dialog ! QString filename = Q3FileDialog::getOpenFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", *************** *** 1062,1066 **** } //Launch a file-open dialog ! QString filename = QFileDialog::getSaveFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", --- 1064,1068 ---- } //Launch a file-open dialog ! QString filename = Q3FileDialog::getSaveFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", Index: savetfdialog.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/savetfdialog.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** savetfdialog.cpp 30 Aug 2006 23:18:37 -0000 1.3 --- savetfdialog.cpp 16 Dec 2009 20:53:46 -0000 1.4 *************** *** 24,32 **** #include <qlayout.h> #include <qtooltip.h> ! #include <qwhatsthis.h> #include <qlabel.h> #include <qlineedit.h> #include <qcombobox.h> #include <qmessagebox.h> #include "session.h" #include "params.h" --- 24,35 ---- #include <qlayout.h> #include <qtooltip.h> ! #include <q3whatsthis.h> #include <qlabel.h> #include <qlineedit.h> #include <qcombobox.h> #include <qmessagebox.h> + //Added by qt3to4: + #include <Q3HBoxLayout> + #include <Q3VBoxLayout> #include "session.h" #include "params.h" *************** *** 39,43 **** * TRUE to construct a modal dialog. */ ! SaveTFDialog::SaveTFDialog(RenderParams* params, QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { --- 42,46 ---- * TRUE to construct a modal dialog. */ ! SaveTFDialog::SaveTFDialog(RenderParams* params, QWidget* parent, const char* name, bool modal, Qt::WFlags fl ) : QDialog( parent, name, modal, fl ) { *************** *** 45,52 **** setName( "SaveTFDialog" ); //setFocusPolicy(QWidget::TabFocus); ! SaveTFDialogLayout = new QHBoxLayout( this, 11, 6, "SaveTFDialogLayout"); myParams = params; ! layout24 = new QVBoxLayout( 0, 0, 6, "layout24"); fileSaveButton = new QPushButton( this, "fileSaveButton" ); --- 48,55 ---- setName( "SaveTFDialog" ); //setFocusPolicy(QWidget::TabFocus); ! SaveTFDialogLayout = new Q3HBoxLayout( this, 11, 6, "SaveTFDialogLayout"); myParams = params; ! layout24 = new Q3VBoxLayout( 0, 0, 6, "layout24"); fileSaveButton = new QPushButton( this, "fileSaveButton" ); *************** *** 88,92 **** layout24->addWidget( nameEditLabel); ! savedTFCombo->setInsertionPolicy(QComboBox::NoInsertion); //supply a "new name" edit area savedTFCombo->setEditText(QString("<New Transfer Function Name>")); --- 91,95 ---- layout24->addWidget( nameEditLabel); ! savedTFCombo->setInsertionPolicy(QComboBox::NoInsert); //supply a "new name" edit area savedTFCombo->setEditText(QString("<New Transfer Function Name>")); *************** *** 122,126 **** languageChange(); resize( QSize(389, 166).expandedTo(minimumSizeHint()) ); ! clearWState( WState_Polished ); // signals and slots connections. --- 125,129 ---- languageChange(); resize( QSize(389, 166).expandedTo(minimumSizeHint()) ); ! //clearWState( WState_Polished ); // signals and slots connections. Index: animationeventrouter.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/animationeventrouter.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** animationeventrouter.h 26 Jun 2009 22:37:15 -0000 1.9 --- animationeventrouter.h 16 Dec 2009 20:53:46 -0000 1.10 *************** *** 28,35 **** #include "animationtab.h" ! class QTable; using namespace VetsUtil; --- 28,36 ---- #include "animationtab.h" ! class Q3Table; using namespace VetsUtil; + QT_USE_NAMESPACE *************** *** 39,43 **** class XmlNode; class PanelCommand; ! class AnimationEventRouter : public AnimationTab, public EventRouter { Q_OBJECT --- 40,44 ---- class XmlNode; class PanelCommand; ! class AnimationEventRouter : public QWidget, public Ui_AnimationTab, public EventRouter { Q_OBJECT *************** *** 77,81 **** //Need to do more than Params::guiSetLocal(): ! void guiUpdateTimestepList(QTable* tbl, const char* descr); void populateTimestepTable(); --- 78,82 ---- //Need to do more than Params::guiSetLocal(): ! void guiUpdateTimestepList(Q3Table* tbl, const char* descr); void populateTimestepTable(); Index: userpreferences.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/userpreferences.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** userpreferences.h 26 Aug 2009 22:22:44 -0000 1.8 --- userpreferences.h 16 Dec 2009 20:53:46 -0000 1.9 *************** *** 24,28 **** #include <qwidget.h> ! #include <qscrollview.h> #include <qdialog.h> #include "vapor/XmlNode.h" --- 24,28 ---- #include <qwidget.h> ! #include <q3scrollview.h> #include <qdialog.h> #include "vapor/XmlNode.h" *************** *** 34,40 **** class ScrollContainer; namespace VAPoR{ class PreferencesCommand; ! class UserPreferences : public Preferences, public ParsedXml { Q_OBJECT public: --- 34,41 ---- class ScrollContainer; + QT_USE_NAMESPACE namespace VAPoR{ class PreferencesCommand; ! class UserPreferences : public QDialog, public Ui_Preferences, public ParsedXml { Q_OBJECT public: Index: isoeventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/isoeventrouter.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** isoeventrouter.cpp 11 Dec 2009 17:52:57 -0000 1.54 --- isoeventrouter.cpp 16 Dec 2009 20:53:46 -0000 1.55 *************** *** 32,38 **** #include <qcheckbox.h> #include <qcolordialog.h> ! #include <qbuttongroup.h> ! #include <qfiledialog.h> ! #include <qlistbox.h> #include <qtimer.h> #include <qtooltip.h> --- 32,38 ---- #include <qcheckbox.h> #include <qcolordialog.h> ! #include <q3buttongroup.h> ! #include <q3filedialog.h> ! #include <q3listbox.h> #include <qtimer.h> #include <qtooltip.h> *************** *** 76,80 **** ! IsoEventRouter::IsoEventRouter(QWidget* parent,const char* name): IsoTab(parent, name), EventRouter(){ myParamsType = Params::IsoParamsType; savedCommand = 0; --- 76,81 ---- ! IsoEventRouter::IsoEventRouter(QWidget* parent,const char* name): QWidget(parent, name), Ui_IsoTab(), EventRouter(){ ! setupUi(this); myParamsType = Params::IsoParamsType; savedCommand = 0; Index: savetfdialog.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/savetfdialog.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** savetfdialog.h 30 Aug 2006 23:18:37 -0000 1.3 --- savetfdialog.h 16 Dec 2009 20:53:46 -0000 1.4 *************** *** 23,30 **** #include <qvariant.h> #include <qdialog.h> ! class QVBoxLayout; ! class QHBoxLayout; ! class QGridLayout; class QSpacerItem; class QPushButton; --- 23,35 ---- #include <qvariant.h> #include <qdialog.h> + //Added by qt3to4: + #include <Q3VBoxLayout> + #include <Q3GridLayout> + #include <Q3HBoxLayout> + #include <QLabel> ! class Q3VBoxLayout; ! class Q3HBoxLayout; ! class Q3GridLayout; class QSpacerItem; class QPushButton; *************** *** 41,45 **** public: ! SaveTFDialog( RenderParams*, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SaveTFDialog(); --- 46,50 ---- public: ! SaveTFDialog( RenderParams*, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 ); ~SaveTFDialog(); *************** *** 59,64 **** protected: ! QHBoxLayout* SaveTFDialogLayout; ! QVBoxLayout* layout24; QSpacerItem* spacer28; QSpacerItem* spacer29; --- 64,69 ---- protected: ! Q3HBoxLayout* SaveTFDialogLayout; ! Q3VBoxLayout* layout24; QSpacerItem* spacer28; QSpacerItem* spacer29; Index: probeframe.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/probeframe.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** probeframe.cpp 12 May 2009 20:56:45 -0000 1.9 --- probeframe.cpp 16 Dec 2009 20:53:46 -0000 1.10 *************** *** 21,28 **** #include "probeframe.h" #include "probeparams.h" ! #include <qframe.h> #include <qwidget.h> #include <qgl.h> #include <qlayout.h> #include "glprobewindow.h" #include "glutil.h" --- 21,33 ---- #include "probeframe.h" #include "probeparams.h" ! #include <q3frame.h> #include <qwidget.h> #include <qgl.h> #include <qlayout.h> + //Added by qt3to4: + #include <QPaintEvent> + #include <QResizeEvent> + #include <QMouseEvent> + #include <Q3HBoxLayout> #include "glprobewindow.h" #include "glutil.h" *************** *** 32,39 **** ! ProbeFrame::ProbeFrame( QWidget * parent, const char * name, WFlags f ) : ! QFrame(parent, name, f) { ! setFocusPolicy(QWidget::StrongFocus); // Create our OpenGL widget. QGLFormat fmt; --- 37,44 ---- ! ProbeFrame::ProbeFrame( QWidget * parent, const char * name, Qt::WFlags f ) : ! Q3Frame(parent, name, f) { ! setFocusPolicy(Qt::StrongFocus); // Create our OpenGL widget. QGLFormat fmt; *************** *** 49,53 **** Params::BailOut("Unable to obtain required OpenGL rendering format",__FILE__,__LINE__); } ! QHBoxLayout* flayout = new QHBoxLayout( this, 2, 2, "flayout"); flayout->addWidget( glProbeWindow, 1 ); probeParams = 0; --- 54,58 ---- Params::BailOut("Unable to obtain required OpenGL rendering format",__FILE__,__LINE__); } ! Q3HBoxLayout* flayout = new Q3HBoxLayout( this, 2, 2, "flayout"); flayout->addWidget( glProbeWindow, 1 ); probeParams = 0; Index: floweventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/floweventrouter.cpp,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** floweventrouter.cpp 11 Dec 2009 17:52:57 -0000 1.96 --- floweventrouter.cpp 16 Dec 2009 20:53:46 -0000 1.97 *************** *** 35,42 **** #include <qcheckbox.h> #include <qcolordialog.h> ! #include <qbuttongroup.h> ! #include <qfiledialog.h> #include <qlabel.h> ! #include <qlistbox.h> #include <qtooltip.h> #include "regionparams.h" --- 35,42 ---- #include <qcheckbox.h> #include <qcolordialog.h> ! #include <q3buttongroup.h> ! #include <q3filedialog.h> #include <qlabel.h> ! #include <q3listbox.h> #include <qtooltip.h> #include "regionparams.h" *************** *** 56,60 **** #include <qslider.h> #include <qlabel.h> ! #include <qtable.h> #include <vector> --- 56,60 ---- #include <qslider.h> #include <qlabel.h> ! #include <q3table.h> #include <vector> *************** *** 83,87 **** ! FlowEventRouter::FlowEventRouter(QWidget* parent,const char* name): FlowTab(parent, name), EventRouter(){ myParamsType = Params::FlowParamsType; savedCommand = 0; --- 83,88 ---- ! FlowEventRouter::FlowEventRouter(QWidget* parent,const char* name): QWidget(parent, name), Ui_FlowTab(), EventRouter(){ ! setupUi(this); myParamsType = Params::FlowParamsType; savedCommand = 0; *************** *** 528,535 **** //Set up the timestep sample tables: ! timestepSampleTable1->setSelectionMode(QTable::SingleRow); timestepSampleTable1->setTopMargin(0); timestepSampleTable1->setColumnWidth(0,35); ! timestepSampleTable2->setSelectionMode(QTable::SingleRow); timestepSampleTable2->setTopMargin(0); timestepSampleTable2->setColumnWidth(0,35); --- 529,536 ---- //Set up the timestep sample tables: ! timestepSampleTable1->setSelectionMode(Q3Table::SingleRow); timestepSampleTable1->setTopMargin(0); timestepSampleTable1->setColumnWidth(0,35); ! timestepSampleTable2->setSelectionMode(Q3Table::SingleRow); timestepSampleTable2->setTopMargin(0); timestepSampleTable2->setColumnWidth(0,35); *************** *** 580,584 **** if (fParams->refreshIsAuto()) autoRefreshCheckbox->setPaletteBackgroundColor(QColor(236,233,216)); ! else autoRefreshCheckbox->setPaletteBackgroundColor(QColor(red)); //Always allow at least 4 variables in combo: int numVars = fParams->getNumComboVariables(); --- 581,585 ---- if (fParams->refreshIsAuto()) autoRefreshCheckbox->setPaletteBackgroundColor(QColor(236,233,216)); ! else autoRefreshCheckbox->setPaletteBackgroundColor(QColor(Qt::red)); //Always allow at least 4 variables in combo: int numVars = fParams->getNumComboVariables(); *************** *** 784,788 **** autoRefreshCheckbox->setChecked(fParams->refreshIsAuto()); if (fParams->refreshIsAuto()) autoRefreshCheckbox->setPaletteBackgroundColor(QColor(236,233,216)); ! else autoRefreshCheckbox->setPaletteBackgroundColor(QColor(red)); } } --- 785,789 ---- autoRefreshCheckbox->setChecked(fParams->refreshIsAuto()); if (fParams->refreshIsAuto()) autoRefreshCheckbox->setPaletteBackgroundColor(QColor(236,233,216)); ! else autoRefreshCheckbox->setPaletteBackgroundColor(QColor(Qt::red)); } } *************** *** 1230,1234 **** //Send the contents of the timestepTable to the params. //Assumes that the timestepTable is sorted in ascending order. ! void FlowEventRouter::guiUpdateUnsteadyTimes(QTable* tbl, const char* descr){ confirmText(false); FlowParams* fParams = VizWinMgr::getInstance()->getActiveFlowParams(); --- 1231,1235 ---- //Send the contents of the timestepTable to the params. //Assumes that the timestepTable is sorted in ascending order. ! void FlowEventRouter::guiUpdateUnsteadyTimes(Q3Table* tbl, const char* descr){ confirmText(false); FlowParams* fParams = VizWinMgr::getInstance()->getActiveFlowParams(); *************** *** 2165,2169 **** fParams->setAutoRefresh(autoOn); if (autoOn) autoRefreshCheckbox->setPaletteBackgroundColor(QColor(236,233,216)); ! else autoRefreshCheckbox->setPaletteBackgroundColor(QColor(red)); PanelCommand::captureEnd(cmd, fParams); --- 2166,2170 ---- fParams->setAutoRefresh(autoOn); if (autoOn) autoRefreshCheckbox->setPaletteBackgroundColor(QColor(236,233,216)); ! else autoRefreshCheckbox->setPaletteBackgroundColor(QColor(Qt::red)); PanelCommand::captureEnd(cmd, fParams); *************** *** 2411,2415 **** FlowParams* fParams = VizWinMgr::getActiveFlowParams(); PanelCommand* cmd = PanelCommand::captureStart(fParams, "load seeds from file"); ! QString filename = QFileDialog::getOpenFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", --- 2412,2416 ---- FlowParams* fParams = VizWinMgr::getActiveFlowParams(); PanelCommand* cmd = PanelCommand::captureStart(fParams, "load seeds from file"); ! QString filename = Q3FileDialog::getOpenFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", *************** *** 2458,2462 **** //Launch an open-file dialog ! QString filename = QFileDialog::getSaveFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", --- 2459,2463 ---- //Launch an open-file dialog ! QString filename = Q3FileDialog::getSaveFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", *************** *** 2545,2549 **** //Launch an open-file dialog ! QString filename = QFileDialog::getSaveFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", --- 2546,2550 ---- //Launch an open-file dialog ! QString filename = Q3FileDialog::getSaveFileName( Session::getInstance()->getFlowDirectory().c_str(), "Text files (*.txt)", Index: probeframe.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/probeframe.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** probeframe.h 9 Jun 2009 16:44:02 -0000 1.6 --- probeframe.h 16 Dec 2009 20:53:46 -0000 1.7 *************** *** 24,29 **** #ifndef PROBEFRAME_H #define PROBEFRAME_H ! #include <qframe.h> #include <qwidget.h> #include "glprobewindow.h" class QLabel; --- 24,34 ---- #ifndef PROBEFRAME_H #define PROBEFRAME_H ! #include <q3frame.h> #include <qwidget.h> + //Added by qt3to4: + #include <QPaintEvent> + #include <QResizeEvent> + #include <QMouseEvent> + #include <QLabel> #include "glprobewindow.h" class QLabel; *************** *** 36,43 **** } using namespace VAPoR; ! class ProbeFrame : public QFrame { Q_OBJECT public: ! ProbeFrame( QWidget * parent = 0, const char * name = 0, WFlags f = 0 ); ~ProbeFrame(); void setGLWindow(VAPoR::GLProbeWindow* w){glProbeWindow = w;} --- 41,48 ---- } using namespace VAPoR; ! class ProbeFrame : public Q3Frame { Q_OBJECT public: ! ProbeFrame( QWidget * parent = 0, const char * name = 0, Qt::WFlags f = 0 ); ~ProbeFrame(); void setGLWindow(VAPoR::GLProbeWindow* w){glProbeWindow = w;} Index: colorpickerframe.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/colorpickerframe.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** colorpickerframe.cpp 9 Oct 2008 19:14:51 -0000 1.1 --- colorpickerframe.cpp 16 Dec 2009 20:53:46 -0000 1.2 *************** *** 20,24 **** #include <qwidget.h> ! #include <qframe.h> #include <qimage.h> #include <qpainter.h> --- 20,24 ---- #include <qwidget.h> ! #include <q3frame.h> #include <qimage.h> #include <qpainter.h> *************** *** 26,30 **** #include <qlineedit.h> #include <qapplication.h> ! #include <qdragobject.h> #include <qlayout.h> --- 26,30 ---- #include <qlineedit.h> #include <qapplication.h> ! #include <q3dragobject.h> #include <qlayout.h> *************** *** 33,36 **** --- 33,46 ---- #include <qdrawutil.h> #include <qvalidator.h> + //Added by qt3to4: + #include <Q3HBoxLayout> + #include <Q3PointArray> + #include <QDropEvent> + #include <QDragLeaveEvent> + #include <QPaintEvent> + #include <Q3GridLayout> + #include <QMouseEvent> + #include <Q3VBoxLayout> + #include <QDragEnterEvent> //#include "qgridview.h" //#include "qstyle.h" *************** *** 52,56 **** ColorPicker::ColorPicker(QWidget* parent, const char* name ) ! : QFrame( parent, name ) { hue = 0; sat = 0; --- 62,66 ---- ColorPicker::ColorPicker(QWidget* parent, const char* name ) ! : Q3Frame( parent, name ) { hue = 0; sat = 0; *************** *** 67,71 **** pix = new QPixmap; pix->convertFromImage(img,0); ! setBackgroundMode( NoBackground ); setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); } --- 77,81 ---- pix = new QPixmap; pix->convertFromImage(img,0); ! setBackgroundMode( Qt::NoBackground ); setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); } *************** *** 117,124 **** p->drawPixmap( r.topLeft(), *pix ); QPoint pt = colPt() + r.topLeft(); ! p->setPen( QPen(black) ); ! p->fillRect( pt.x()-9, pt.y(), 20, 2, black ); ! p->fillRect( pt.x(), pt.y()-9, 2, 20, black ); } --- 127,134 ---- p->drawPixmap( r.topLeft(), *pix ); QPoint pt = colPt() + r.topLeft(); ! p->setPen( QPen(Qt::black) ); ! p->fillRect( pt.x()-9, pt.y(), 20, 2, Qt::black ); ! p->fillRect( pt.x(), pt.y()-9, 2, 20, Qt::black ); } *************** *** 144,148 **** return; if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) { ! QColorDrag *drg = new QColorDrag( col, this ); QPixmap pix( 30, 20 ); pix.fill( col ); --- 154,158 ---- return; if ( ( pressPos - e->pos() ).manhattanLength() > QApplication::startDragDistance() ) { ! Q3ColorDrag *drg = new Q3ColorDrag( col, this ); QPixmap pix( 30, 20 ); pix.fill( col ); *************** *** 160,164 **** void ColorShowLabel::dragEnterEvent( QDragEnterEvent *e ) { ! if ( QColorDrag::canDecode( e ) ) e->accept(); else --- 170,174 ---- void ColorShowLabel::dragEnterEvent( QDragEnterEvent *e ) { ! if ( Q3ColorDrag::canDecode( e ) ) e->accept(); else *************** *** 172,177 **** void ColorShowLabel::dropEvent( QDropEvent *e ) { ! if ( QColorDrag::canDecode( e ) ) { ! QColorDrag::decode( e, col ); repaint( FALSE ); emit colorDropped( col.rgb() ); --- 182,187 ---- void ColorShowLabel::dropEvent( QDropEvent *e ) { ! if ( Q3ColorDrag::canDecode( e ) ) { ! Q3ColorDrag::decode( e, col ); repaint( FALSE ); emit colorDropped( col.rgb() ); *************** *** 197,201 **** ColIntValidator *val360 = new ColIntValidator( 0, 360, this ); ! QGridLayout *gl = new QGridLayout( this, 1, 1, 6 ); /* lab = new ColorShowLabel( this ); --- 207,211 ---- ColIntValidator *val360 = new ColIntValidator( 0, 360, this ); ! Q3GridLayout *gl = new Q3GridLayout( this, 1, 1, 6 ); /* lab = new ColorShowLabel( this ); *************** *** 210,214 **** hEd->setValidator( val360 ); QLabel *l = new QLabel( hEd, "Hu&e:", this, "qt_hue_lbl" ); ! l->setAlignment( AlignRight|AlignVCenter ); gl->addWidget( l, 0, 1 ); gl->addWidget( hEd, 0, 2 ); --- 220,224 ---- hEd->setValidator( val360 ); QLabel *l = new QLabel( hEd, "Hu&e:", this, "qt_hue_lbl" ); ! l->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); gl->addWidget( l, 0, 1 ); gl->addWidget( hEd, 0, 2 ); *************** *** 217,221 **** sEd->setValidator( val256 ); l = new QLabel( sEd, "&Sat:", this, "qt_sat_lbl" ); ! l->setAlignment( AlignRight|AlignVCenter ); gl->addWidget( l, 1, 1 ); gl->addWidget( sEd, 1, 2 ); --- 227,231 ---- sEd->setValidator( val256 ); l = new QLabel( sEd, "&Sat:", this, "qt_sat_lbl" ); ! l->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); gl->addWidget( l, 1, 1 ); gl->addWidget( sEd, 1, 2 ); *************** *** 224,228 **** vEd->setValidator( val256 ); l = new QLabel( vEd, "&Val:", this, "qt_val_lbl" ); ! l->setAlignment( AlignRight|AlignVCenter ); gl->addWidget( l, 2, 1 ); gl->addWidget( vEd, 2, 2 ); --- 234,238 ---- vEd->setValidator( val256 ); l = new QLabel( vEd, "&Val:", this, "qt_val_lbl" ); ! l->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); gl->addWidget( l, 2, 1 ); gl->addWidget( vEd, 2, 2 ); *************** *** 231,235 **** rEd->setValidator( val256 ); l = new QLabel( rEd, "&Red:", this, "qt_red_lbl" ); ! l->setAlignment( AlignRight|AlignVCenter ); gl->addWidget( l, 0, 3 ); gl->addWidget( rEd, 0, 4 ); --- 241,245 ---- rEd->setValidator( val256 ); l = new QLabel( rEd, "&Red:", this, "qt_red_lbl" ); ! l->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); gl->addWidget( l, 0, 3 ); gl->addWidget( rEd, 0, 4 ); *************** *** 238,242 **** gEd->setValidator( val256 ); l = new QLabel( gEd, "&Green:", this, "qt_grn_lbl" ); ! l->setAlignment( AlignRight|AlignVCenter ); gl->addWidget( l, 1, 3 ); gl->addWidget( gEd, 1, 4 ); --- 248,252 ---- gEd->setValidator( val256 ); l = new QLabel( gEd, "&Green:", this, "qt_grn_lbl" ); ! l->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); gl->addWidget( l, 1, 3 ); gl->addWidget( gEd, 1, 4 ); *************** *** 245,249 **** bEd->setValidator( val256 ); l = new QLabel( bEd, "Bl&ue:", this, "qt_blue_lbl" ); ! l->setAlignment( AlignRight|AlignVCenter ); gl->addWidget( l, 2, 3 ); gl->addWidget( bEd, 2, 4 ); --- 255,259 ---- bEd->setValidator( val256 ); l = new QLabel( bEd, "Bl&ue:", this, "qt_blue_lbl" ); ! l->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); gl->addWidget( l, 2, 3 ); gl->addWidget( bEd, 2, 4 ); *************** *** 435,439 **** p.setPen( g.foreground() ); p.setBrush( g.foreground() ); ! QPointArray a; int y = val2y(val); a.setPoints( 3, w, y, w+5, y+5, w+5, y-5 ); --- 445,449 ---- p.setPen( g.foreground() ); p.setBrush( g.foreground() ); ! Q3PointArray a; int y = val2y(val); a.setPoints( 3, w, y, w+5, y+5, w+5, y-5 ); *************** *** 453,457 **** { State state = QIntValidator::validate(s,pos); ! if ( state == Valid ) { long int val = s.toLong(); // This is not a general solution, assumes that top() > 0 and --- 463,467 ---- { State state = QIntValidator::validate(s,pos); ! if ( state == QValidator::Intermediate ) { long int val = s.toLong(); // This is not a general solution, assumes that top() > 0 and *************** *** 468,472 **** } ColorPickerFrame::ColorPickerFrame(QWidget* parent, const char* name ) : ! QFrame(parent, name) { --- 478,482 ---- } ColorPickerFrame::ColorPickerFrame(QWidget* parent, const char* name ) : ! Q3Frame(parent, name) { *************** *** 474,488 **** int border = 12; ! QHBoxLayout *topLay = new QHBoxLayout( this, border, 6 ); ! QVBoxLayout *leftLay = new QVBoxLayout( topLay ); ! QVBoxLayout *rightLay = new QVBoxLayout( topLay ); ! QHBoxLayout *pickLay = new QHBoxLayout( rightLay ); ! QVBoxLayout *cLay = new QVBoxLayout( pickLay ); cp = new ColorPicker( this, "qt_colorpicker" ); ! cp->setFrameStyle( QFrame::Panel + QFrame::Sunken ); cLay->addSpacing( lumSpace ); cLay->addWidget( cp ); --- 484,498 ---- int border = 12; ! Q3HBoxLayout *topLay = new Q3HBoxLayout( this, border, 6 ); ! Q3VBoxLayout *leftLay = new Q3VBoxLayout( topLay ); ! Q3VBoxLayout *rightLay = new Q3VBoxLayout( topLay ); ! Q3HBoxLayout *pickLay = new Q3HBoxLayout( rightLay ); ! Q3VBoxLayout *cLay = new Q3VBoxLayout( pickLay ); cp = new ColorPicker( this, "qt_colorpicker" ); ! cp->setFrameStyle( Q3Frame::Panel + Q3Frame::Sunken ); cLay->addSpacing( lumSpace ); cLay->addWidget( cp ); Index: probeeventrouter.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/probeeventrouter.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** probeeventrouter.h 29 Jun 2009 17:36:35 -0000 1.42 --- probeeventrouter.h 16 Dec 2009 20:53:46 -0000 1.43 *************** *** 23,26 **** --- 23,27 ---- #include <qthread.h> #include <qobject.h> + #include "GL/glew.h" #include "params.h" #include "eventrouter.h" *************** *** 37,41 **** class PanelCommand; ! class ProbeEventRouter : public ProbeTab, public EventRouter { Q_OBJECT public: --- 38,42 ---- class PanelCommand; ! class ProbeEventRouter : public QWidget, public Ui_ProbeTab, public EventRouter { Q_OBJECT public: Index: userpreferences.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/userpreferences.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** userpreferences.cpp 11 Dec 2009 17:52:57 -0000 1.27 --- userpreferences.cpp 16 Dec 2009 20:53:46 -0000 1.28 *************** *** 22,25 **** --- 22,26 ---- #include "vizfeatureparams.h" #include "userpreferences.h" + #include "preferences.h" #include "command.h" #include <sys/types.h> *************** *** 40,44 **** #include "messagereporter.h" #include "mainform.h" - #include "preferences.h" #include "session.h" #include "vapor/Version.h" --- 41,44 ---- *************** *** 46,50 **** #include <qtooltip.h> #include <qlineedit.h> ! #include <qfiledialog.h> #include <qpushbutton.h> #include <qmessagebox.h> --- 46,50 ---- #include <qtooltip.h> #include <qlineedit.h> ! #include <q3filedialog.h> #include <qpushbutton.h> #include <qmessagebox.h> *************** *** 52,59 **** #include <qcheckbox.h> #include <qcolordialog.h> ! #include <qscrollview.h> ! #include <qvbox.h> #include <qlayout.h> ! #include <qwhatsthis.h> using namespace VAPoR; --- 52,59 ---- #include <qcheckbox.h> #include <qcolordialog.h> ! #include <q3scrollview.h> ! #include <q3vbox.h> #include <qlayout.h> ! #include <q3whatsthis.h> using namespace VAPoR; *************** *** 117,121 **** //Create a new UserPreferences ! UserPreferences::UserPreferences() : Preferences(){ dialogChanged = false; textChangedFlag = false; --- 117,122 ---- //Create a new UserPreferences ! UserPreferences::UserPreferences() : QDialog(0), Ui_Preferences(){ ! setupUi(this); dialogChanged = false; textChangedFlag = false; *************** *** 193,199 **** featureHolder = new ScrollContainer((QWidget*)MainForm::getInstance(), "Set User Preferences"); ! QScrollView* sv = new QScrollView(featureHolder); ! sv->setHScrollBarMode(QScrollView::Auto); ! sv->setVScrollBarMode(QScrollView::Auto); featureHolder->setScroller(sv); sv->addChild(this); --- 194,200 ---- featureHolder = new ScrollContainer((QWidget*)MainForm::getInstance(), "Set User Preferences"); ! Q3ScrollView* sv = new Q3ScrollView(featureHolder); ! sv->setHScrollBarMode(Q3ScrollView::Auto); ! sv->setVScrollBarMode(Q3ScrollView::Auto); featureHolder->setScroller(sv); sv->addChild(this); *************** *** 364,368 **** if (Session::getInstance()->getPrefSessionDirectory() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefSessionDirectory().c_str(); ! QString s = QFileDialog::getExistingDirectory( dir, this, --- 365,369 ---- if (Session::getInstance()->getPrefSessionDirectory() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefSessionDirectory().c_str(); ! QString s = Q3FileDialog::getExistingDirectory( dir, this, *************** *** 378,382 **** void UserPreferences::chooseAutoSaveFilename(){ //Launch a file-chooser dialog, ! QString s = QFileDialog::getSaveFileName( Session::getInstance()->getAutoSaveSessionFilename().c_str(), "Vapor Saved Sessions (*.vss)", --- 379,383 ---- void UserPreferences::chooseAutoSaveFilename(){ //Launch a file-chooser dialog, ! QString s = Q3FileDialog::getSaveFileName( Session::getInstance()->getAutoSaveSessionFilename().c_str(), "Vapor Saved Sessions (*.vss)", *************** *** 396,400 **** if (Session::getInstance()->getPrefMetadataDir() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefMetadataDir().c_str(); ! QString s = QFileDialog::getExistingDirectory( dir, this, --- 397,401 ---- if (Session::getInstance()->getPrefMetadataDir() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefMetadataDir().c_str(); ! QString s = Q3FileDialog::getExistingDirectory( dir, this, *************** *** 410,414 **** void UserPreferences::chooseLogFilePath(){ //Launch a file-chooser dialog, ! QString s = QFileDialog::getSaveFileName( Session::getInstance()->getLogfileName().c_str(), "Text (*.txt)", --- 411,415 ---- void UserPreferences::chooseLogFilePath(){ //Launch a file-chooser dialog, ! QString s = Q3FileDialog::getSaveFileName( Session::getInstance()->getLogfileName().c_str(), "Text (*.txt)", *************** *** 428,432 **** if (Session::getInstance()->getPrefJpegDirectory() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefJpegDirectory().c_str(); ! QString s = QFileDialog::getExistingDirectory( dir, this, --- 429,433 ---- if (Session::getInstance()->getPrefJpegDirectory() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefJpegDirectory().c_str(); ! QString s = Q3FileDialog::getExistingDirectory( dir, this, *************** *** 445,449 **** if (Session::getInstance()->getPrefTFFilePath() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefTFFilePath().c_str(); ! QString s = QFileDialog::getExistingDirectory( dir, this, --- 446,450 ---- if (Session::getInstance()->getPrefTFFilePath() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefTFFilePath().c_str(); ! QString s = Q3FileDialog::getExistingDirectory( dir, this, *************** *** 462,466 **** if (Session::getInstance()->getPrefFlowDirectory() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefFlowDirectory().c_str(); ! QString s = QFileDialog::getExistingDirectory( dir, this, --- 463,467 ---- if (Session::getInstance()->getPrefFlowDirectory() == ".") dir = QDir::currentDirPath(); else dir = Session::getInstance()->getPrefFlowDirectory().c_str(); ! QString s = Q3FileDialog::getExistingDirectory( dir, this, *************** *** 806,813 **** int rc = QMessageBox::question(0, "Save User Preferences?", "User Preferences have changed.\nDo you want to save them to file?", ! QMessageBox::Yes|QMessageBox::Default,QMessageBox::No,QMessageBox::NoButton); if (rc != QMessageBox::Yes) return; ! QString filename = QFileDialog::getSaveFileName( Session::getPreferencesFile().c_str(), ".*", --- 807,814 ---- int rc = QMessageBox::question(0, "Save User Preferences?", "User Preferences have changed.\nDo you want to save them to file?", ! QMessageBox::Yes|QMessageBox::Default,QMessageBox::No,Qt::NoButton); if (rc != QMessageBox::Yes) return; ! QString filename = Q3FileDialog::getSaveFileName( Session::getPreferencesFile().c_str(), ".*", *************** *** 844,852 **** void UserPreferences:: doHelp(){ ! QWhatsThis::enterWhatsThisMode(); } void UserPreferences:: showAllDefaults(){ ! QScrollView* sv = featureHolder->getScroller(); showAll = !showAll; int h = MainForm::getInstance()->height(); --- 845,853 ---- void UserPreferences:: doHelp(){ ! Q3WhatsThis::enterWhatsThisMode(); } void UserPreferences:: showAllDefaults(){ ! Q3ScrollView* sv = featureHolder->getScroller(); showAll = !showAll; int h = MainForm::getInstance()->height(); Index: DomainWidget.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/DomainWidget.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DomainWidget.cpp 27 Feb 2009 18:58:41 -0000 1.6 --- DomainWidget.cpp 16 Dec 2009 20:53:46 -0000 1.7 *************** *** 11,16 **** --- 11,22 ---- #include <GL/glew.h> + #ifdef Darwin + #include <gl.h> + #include <glu.h> + #else #include <GL/gl.h> #include <GL/glu.h> + #endif + #include "mappingframe.h" Index: twoDeventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/twoDeventrouter.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** twoDeventrouter.cpp 11 Dec 2009 17:52:57 -0000 1.43 --- twoDeventrouter.cpp 16 Dec 2009 20:53:46 -0000 1.44 *************** *** 35,43 **** #include <qcheckbox.h> #include <qcolordialog.h> ! #include <qbuttongroup.h> ! #include <qfiledialog.h> #include <qfileinfo.h> #include <qlabel.h> ! #include <qlistbox.h> #include <qapplication.h> #include <qcursor.h> --- 35,43 ---- #include <qcheckbox.h> #include <qcolordialog.h> ! #include <q3buttongroup.h> ! #include <q3filedialog.h> #include <qfileinfo.h> #include <qlabel.h> ! #include <q3listbox.h> #include <qapplication.h> #include <qcursor.h> Index: eventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/eventrouter.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** eventrouter.cpp 14 Jul 2009 17:37:53 -0000 1.18 --- eventrouter.cpp 16 Dec 2009 20:53:46 -0000 1.19 *************** *** 30,34 **** #include <qmessagebox.h> #include <qfileinfo.h> ! #include <qfiledialog.h> #include "vapor/DataMgr.h" #include "vapor/errorcodes.h" --- 30,34 ---- #include <qmessagebox.h> #include <qfileinfo.h> ! #include <q3filedialog.h> #include "vapor/DataMgr.h" #include "vapor/errorcodes.h" *************** *** 267,271 **** fileSaveTF(RenderParams* rParams){ //Launch a file save dialog, open resulting file ! QString s = QFileDialog::getSaveFileName( Session::getInstance()->getTFFilePath().c_str(), "Vapor Transfer Functions (*.vtf)", --- 267,271 ---- fileSaveTF(RenderParams* rParams){ //Launch a file save dialog, open resulting file ! QString s = Q3FileDialog::getSaveFileName( Session::getInstance()->getTFFilePath().c_str(), "Vapor Transfer Functions (*.vtf)", *************** *** 344,348 **** //Open a file load dialog ! QString s = QFileDialog::getOpenFileName( startPath, "Vapor Transfer Functions (*.vtf)", --- 344,348 ---- //Open a file load dialog ! QString s = Q3FileDialog::getOpenFileName( startPath, "Vapor Transfer Functions (*.vtf)", Index: glprobewindow.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/glprobewindow.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** glprobewindow.h 9 Jun 2009 16:44:02 -0000 1.12 --- glprobewindow.h 16 Dec 2009 20:53:46 -0000 1.13 *************** *** 23,29 **** --- 23,37 ---- #include <GL/glew.h> + #ifdef Darwin + #include <gl.h> + #include <glu.h> + #else #include <GL/gl.h> #include <GL/glu.h> + #endif + #include <qgl.h> + //Added by qt3to4: + #include <QPaintEvent> #include "glwindow.h" #define CURSOR_COLOR 1.f,1.f,1.f Index: qthumbwheel.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/qthumbwheel.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** qthumbwheel.h 7 May 2009 16:38:26 -0000 1.3 --- qthumbwheel.h 16 Dec 2009 20:53:46 -0000 1.4 *************** *** 1,2 **** --- 1,7 ---- + //Added by qt3to4: + #include <QMouseEvent> + #include <QFocusEvent> + #include <QKeyEvent> + #include <QWheelEvent> /**************************************************************************** ** $Id$ *************** *** 47,57 **** #ifndef QT_H ! #include "qframe.h" ! #include "qrangecontrol.h" #endif // QT_H #ifndef QT_NO_THUMBWHEEL ! class QThumbWheel : public QFrame, public QRangeControl { Q_OBJECT --- 52,62 ---- #ifndef QT_H ! #include "q3frame.h" ! #include "q3rangecontrol.h" #endif // QT_H #ifndef QT_NO_THUMBWHEEL ! class QThumbWheel : public Q3Frame, public Q3RangeControl { Q_OBJECT *************** *** 61,66 **** ~QThumbWheel(); ! virtual void setOrientation( Orientation ); ! Orientation orientation() const; virtual void setTracking( bool enable ); bool tracking() const; --- 66,71 ---- ~QThumbWheel(); ! virtual void setOrientation( Qt::Orientation ); ! Qt::Orientation orientation() const; virtual void setTracking( bool enable ); bool tracking() const; *************** *** 99,103 **** int pressedAt; int mousePressedAtValue; ! Orientation orient; uint track : 1; uint mousePressed : 1; --- 104,108 ---- int pressedAt; int mousePressedAtValue; ! Qt::Orientation orient; uint track : 1; uint mousePressed : 1; *************** *** 107,111 **** }; ! inline QThumbWheel::Orientation QThumbWheel::orientation() const { return orient; --- 112,116 ---- }; ! inline Qt::Orientation QThumbWheel::orientation() const { return orient; Index: twoDdataeventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/twoDdataeventrouter.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** twoDdataeventrouter.cpp 11 Dec 2009 17:52:57 -0000 1.24 --- twoDdataeventrouter.cpp 16 Dec 2009 20:53:46 -0000 1.25 *************** *** 35,43 **** #include <qcheckbox.h> #include <qcolordialog.h> ! #include <qbuttongroup.h> ! #include <qfiledialog.h> #include <qfileinfo.h> #include <qlabel.h> ! #include <qlistbox.h> #include <qapplication.h> #include <qcursor.h> --- 35,43 ---- #include <qcheckbox.h> #include <qcolordialog.h> ! #include <q3buttongroup.h> ! #include <q3filedialog.h> #include <qfileinfo.h> #include <qlabel.h> ! #include <q3listbox.h> #include <qapplication.h> #include <qcursor.h> *************** *** 56,60 **** #include "floweventrouter.h" #include "instancetable.h" - #include "qthumbwheel.h" #include <vector> #include <string> --- 56,59 ---- *************** *** 82,86 **** ! TwoDDataEventRouter::TwoDDataEventRouter(QWidget* parent,const char* name): TwoDDataTab(parent, name), TwoDEventRouter(){ myParamsType = Params::TwoDDataParamsType; savedCommand = 0; --- 81,86 ---- ! TwoDDataEventRouter::TwoDDataEventRouter(QWidget* parent,const char* name): QWidget(parent, name), Ui_TwoDDataTab(), TwoDEventRouter(){ ! setupUi(this); myParamsType = Params::TwoDDataParamsType; savedCommand = 0; *************** *** 1659,1663 **** TwoDDataParams* pParams = VizWinMgr::getActiveTwoDDataParams(); if (!pParams->isEnabled()) return; ! QFileDialog fileDialog(Session::getInstance()->getJpegDirectory().c_str(), "Jpeg Images (*.jpg)", this, --- 1659,1663 ---- TwoDDataParams* pParams = VizWinMgr::getActiveTwoDDataParams(); if (!pParams->isEnabled()) return; ! Q3FileDialog fileDialog(Session::getInstance()->getJpegDirectory().c_str(), "Jpeg Images (*.jpg)", this, *************** *** 1665,1669 **** true); //modal //fileDialog.move(pos()); ! fileDialog.setMode(QFileDialog::AnyFile); fileDialog.setCaption("Specify image capture file name"); fileDialog.resize(450,450); --- 1665,1669 ---- true); //modal //fileDialog.move(pos()); ! fileDialog.setMode(Q3FileDialog::AnyFile); fileDialog.setCaption("Specify image capture file name"); fileDialog.resize(450,450); Index: floweventrouter.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/floweventrouter.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** floweventrouter.h 26 Jun 2009 22:37:15 -0000 1.37 --- floweventrouter.h 16 Dec 2009 20:53:46 -0000 1.38 *************** *** 23,26 **** --- 23,27 ---- #include <qobject.h> + #include "GL/glew.h" #include "params.h" #include "eventrouter.h" *************** *** 28,35 **** #include "flowtab.h" - - using namespace VetsUtil; - namespace VAPoR { --- 29,34 ---- #include "flowtab.h" + using namespace VetsUtil; namespace VAPoR { *************** *** 37,41 **** class XmlNode; class PanelCommand; ! class FlowEventRouter : public FlowTab, public EventRouter { Q_OBJECT public: --- 36,40 ---- class XmlNode; class PanelCommand; ! class FlowEventRouter : public QWidget, public Ui_FlowTab, public EventRouter { Q_OBJECT public: *************** *** 171,175 **** protected: bool flowVarsZeroBelow(); //Test if the flow variables are zero below terrain ! void guiUpdateUnsteadyTimes(QTable*, const char*); void populateTimestepTables(); void setXCenter(FlowParams*,int sliderval); --- 170,174 ---- protected: bool flowVarsZeroBelow(); //Test if the flow variables are zero below terrain ! void guiUpdateUnsteadyTimes(Q3Table*, const char*); void populateTimestepTables(); void setXCenter(FlowParams*,int sliderval); Index: guis.mk =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/guis.mk,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** guis.mk 27 Mar 2009 21:34:47 -0000 1.16 --- guis.mk 16 Dec 2009 20:53:46 -0000 1.17 *************** *** 9,13 **** DomainWidget GLWidget OpacityWidget \ qthumbwheel userpreferences \ ! TFLocationTip ControlPointEditor mappingframe ColorbarWidget --- 9,13 ---- DomainWidget GLWidget OpacityWidget \ qthumbwheel userpreferences \ ! ControlPointEditor mappingframe ColorbarWidget Index: ControlPointEditor.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/ControlPointEditor.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ControlPointEditor.cpp 15 Jan 2009 21:20:52 -0000 1.3 --- ControlPointEditor.cpp 16 Dec 2009 20:53:46 -0000 1.4 *************** *** 28,32 **** ControlPointEditor::ControlPointEditor(MappingFrame* parent, OpacityMap *map, int cp) : ! ControlPointEditorBase(parent), _controlPoint(cp), _mapper(parent->mapperFunction()), --- 28,33 ---- ControlPointEditor::ControlPointEditor(MappingFrame* parent, OpacityMap *map, int cp) : ! QDialog(parent), ! Ui_ControlPointEditorBase(), _controlPoint(cp), _mapper(parent->mapperFunction()), *************** *** 34,37 **** --- 35,39 ---- _cmap(NULL) { + setupUi(this); initWidgets(); initConnections(); *************** *** 43,47 **** ControlPointEditor::ControlPointEditor(MappingFrame* parent, VColormap *map, int cp) : ! ControlPointEditorBase(parent), _controlPoint(cp), _mapper(parent->mapperFunction()), --- 45,50 ---- ControlPointEditor::ControlPointEditor(MappingFrame* parent, VColormap *map, int cp) : ! QDialog(parent), ! Ui_ControlPointEditorBase(), _controlPoint(cp), _mapper(parent->mapperFunction()), *************** *** 49,52 **** --- 52,56 ---- _cmap(map) { + setupUi(this); initWidgets(); initConnections(); Index: animationeventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/animationeventrouter.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** animationeventrouter.cpp 11 Dec 2009 17:52:56 -0000 1.25 --- animationeventrouter.cpp 16 Dec 2009 20:53:46 -0000 1.26 *************** *** 34,42 **** #include <qcheckbox.h> #include <qcolordialog.h> ! #include <qbuttongroup.h> ! #include <qfiledialog.h> #include <qlabel.h> ! #include <qlistbox.h> ! #include <qtable.h> #include "animationparams.h" #include "vizwinmgr.h" --- 34,42 ---- #include <qcheckbox.h> #include <qcolordialog.h> ! #include <q3buttongroup.h> ! #include <q3filedialog.h> #include <qlabel.h> ! #include <q3listbox.h> ! #include <q3table.h> #include "animationparams.h" #include "vizwinmgr.h" *************** *** 64,72 **** #include "mainform.h" #include "eventrouter.h" using namespace VAPoR; ! AnimationEventRouter::AnimationEventRouter(QWidget* parent, const char* name) : AnimationTab(parent,name), EventRouter() { myParamsType = Params::AnimationParamsType; MessageReporter::infoMsg("AnimationEventRouter::AnimationEventRouter()"); --- 64,76 ---- #include "mainform.h" #include "eventrouter.h" + #include "ui/animationtab.h" + #include <qglobal.h> using namespace VAPoR; + QT_USE_NAMESPACE ! AnimationEventRouter::AnimationEventRouter(QWidget* parent, const char* name) : QWidget(parent,name), Ui_AnimationTab(), EventRouter() { ! setupUi(this); myParamsType = Params::AnimationParamsType; MessageReporter::infoMsg("AnimationEventRouter::AnimationEventRouter()"); *************** *** 255,259 **** //Set up the timestep sample table: timestepSampleTable->horizontalHeader()->hide(); ! timestepSampleTable->setSelectionMode(QTable::SingleRow); timestepSampleTable->setTopMargin(0); timestepSampleTable->setColumnWidth(0,35); --- 259,263 ---- //Set up the timestep sample table: timestepSampleTable->horizontalHeader()->hide(); ! timestepSampleTable->setSelectionMode(Q3Table::SingleRow); timestepSampleTable->setTopMargin(0); timestepSampleTable->setColumnWidth(0,35); *************** *** 597,601 **** //Send the contents of the timestepTable to the params. //Assumes that the timestepTable is sorted in ascending order. ! void AnimationEventRouter::guiUpdateTimestepList(QTable* tbl, const char* descr){ confirmText(false); AnimationParams* aParams = VizWinMgr::getInstance()->getActiveAnimationParams(); --- 601,605 ---- //Send the contents of the timestepTable to the params. //Assumes that the timestepTable is sorted in ascending order. ! void AnimationEventRouter::guiUpdateTimestepList(Q3Table* tbl, const char* descr){ confirmText(false); AnimationParams* aParams = VizWinMgr::getInstance()->getActiveAnimationParams(); Index: mappingframe.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/mappingframe.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mappingframe.h 11 Dec 2008 21:40:27 -0000 1.3 --- mappingframe.h 16 Dec 2009 20:53:46 -0000 1.4 *************** *** 19,25 **** --- 19,37 ---- #include <GL/glew.h> + #ifdef Darwin + #include <gl.h> + #include <glu.h> + #else #include <GL/gl.h> #include <GL/glu.h> + #endif + #include <qgl.h> + //Added by qt3to4: + #include <QContextMenuEvent> + #include <QPaintEvent> + #include <QLabel> + #include <QMouseEvent> + #include <Q3PopupMenu> #include "glwindow.h" *************** *** 29,33 **** #include <set> ! class QPopupMenu; class QAction; class QLabel; --- 41,45 ---- #include <set> ! class Q3PopupMenu; class QAction; class QLabel; *************** *** 45,49 **** class OpacityMap; class ColorbarWidget; ! class TFLocationTip; }; --- 57,61 ---- class OpacityMap; class ColorbarWidget; ! // class TFLocationTip; }; *************** *** 81,85 **** public: ! MappingFrame(QWidget* parent, const char* name); virtual ~MappingFrame(); --- 93,97 ---- public: ! MappingFrame(QWidget* parent, const char* name = 0); virtual ~MappingFrame(); *************** *** 187,192 **** void addAxisLabel(int x, int y, const QString &text); ! void select(int x, int y, ButtonState); ! void select(int hits, GLuint *selectionBuffer, ButtonState); void deselectWidgets(); --- 199,204 ---- void addAxisLabel(int x, int y, const QString &text); ! void select(int x, int y, Qt::ButtonState); ! void select(int hits, GLuint *selectionBuffer, Qt::ButtonState); void deselectWidgets(); *************** *** 265,273 **** QPoint _contextPoint; ! QPopupMenu *_contextMenu; ! QPopupMenu *_addOpacityWidgetSubMenu; ! QPopupMenu *_histogramScalingSubMenu; ! QPopupMenu *_compTypeSubMenu; ! QPopupMenu *_widgetEnabledSubMenu; QAction *_editOpacityWidgetAction; QAction *_deleteOpacityWidgetAction; --- 277,285 ---- QPoint _contextPoint; ! Q3PopupMenu *_contextMenu; ! Q3PopupMenu *_addOpacityWidgetSubMenu; ! Q3PopupMenu *_histogramScalingSubMenu; ! Q3PopupMenu *_compTypeSubMenu; ! Q3PopupMenu *_widgetEnabledSubMenu; QAction *_editOpacityWidgetAction; QAction *_deleteOpacityWidgetAction; *************** *** 287,291 **** float _isoVal; ! ButtonState _button; float _minX; --- 299,303 ---- float _isoVal; ! Qt::ButtonState _button; float _minX; *************** *** 305,309 **** const int _bottomGap; ! TFLocationTip *_tooltip; std::list<QLabel*> _axisLabels; --- 317,321 ---- const int _bottomGap; ! // TFLocationTip *_tooltip; std::list<QLabel*> _axisLabels; Index: ColorbarWidget.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/ColorbarWidget.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ColorbarWidget.h 15 Jan 2009 21:20:52 -0000 1.4 --- ColorbarWidget.h 16 Dec 2009 20:53:46 -0000 1.5 *************** *** 14,17 **** --- 14,18 ---- #include <qobject.h> + #include <QColor> #include <set> #include <list> Index: loadtfdialog.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/loadtfdialog.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** loadtfdialog.cpp 7 Mar 2007 22:39:04 -0000 1.4 --- loadtfdialog.cpp 16 Dec 2009 20:53:46 -0000 1.5 *************** *** 25,31 **** #include <qlayout.h> #include <qtooltip.h> ! #include <qwhatsthis.h> #include <qlabel.h> #include <qcombobox.h> #include "eventrouter.h" --- 25,34 ---- #include <qlayout.h> #include <qtooltip.h> ! #include <q3whatsthis.h> #include <qlabel.h> #include <qcombobox.h> + //Added by qt3to4: + #include <Q3HBoxLayout> + #include <Q3VBoxLayout> #include "eventrouter.h" *************** *** 39,43 **** * TRUE to construct a modal dialog. */ ! LoadTFDialog::LoadTFDialog(EventRouter* router, QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { --- 42,46 ---- * TRUE to construct a modal dialog. */ ! LoadTFDialog::LoadTFDialog(EventRouter* router, QWidget* parent, const char* name, bool modal, Qt::WFlags fl ) : QDialog( parent, name, modal, fl ) { *************** *** 45,51 **** setName( "LoadTFDialog" ); myRouter = router; ! LoadTFDialogLayout = new QHBoxLayout( this, 11, 6, "LoadTFDialogLayout"); ! layout23 = new QVBoxLayout( 0, 0, 6, "layout23"); fileLoadButton = new QPushButton( this, "fileLoadButton" ); --- 48,54 ---- setName( "LoadTFDialog" ); myRouter = router; ! LoadTFDialogLayout = new Q3HBoxLayout( this, 11, 6, "LoadTFDialogLayout"); ! layout23 = new Q3VBoxLayout( 0, 0, 6, "layout23"); fileLoadButton = new QPushButton( this, "fileLoadButton" ); *************** *** 112,116 **** languageChange(); resize( QSize(389, 167).expandedTo(minimumSizeHint()) ); ! clearWState( WState_Polished ); // signals and slots connections --- 115,119 ---- languageChange(); resize( QSize(389, 167).expandedTo(minimumSizeHint()) ); ! //clearWState( WState_Polished ); // signals and slots connections Index: vizselectcombo.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/vizselectcombo.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vizselectcombo.h 23 Oct 2006 14:41:38 -0000 1.2 --- vizselectcombo.h 16 Dec 2009 20:53:46 -0000 1.3 *************** *** 24,28 **** #include "vizwinmgr.h" ! class QToolBar; namespace VAPoR { --- 24,28 ---- #include "vizwinmgr.h" ! class Q3ToolBar; namespace VAPoR { *************** *** 32,36 **** public: ! VizSelectCombo(QToolBar* parent, VizWinMgr* mgr); protected: //Lookup window num associated with slot --- 32,36 ---- public: ! VizSelectCombo(Q3ToolBar* parent, VizWinMgr* mgr); protected: //Lookup window num associated with slot Index: instancetable.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/instancetable.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** instancetable.h 26 Oct 2006 21:19:38 -0000 1.2 --- instancetable.h 16 Dec 2009 20:53:46 -0000 1.3 *************** *** 21,25 **** #ifndef INSTANCETABLE_H #define INSTANCETABLE_H ! #include <qtable.h> #include <qcheckbox.h> #include "params.h" --- 21,25 ---- #ifndef INSTANCETABLE_H #define INSTANCETABLE_H ! #include <q3table.h> #include <qcheckbox.h> #include "params.h" *************** *** 30,34 **** using namespace VAPoR; class RowCheckBox; ! class InstanceTable : public QTable { Q_OBJECT --- 30,34 ---- using namespace VAPoR; class RowCheckBox; ! class InstanceTable : public Q3Table { Q_OBJECT Index: viewpointeventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/viewpointeventrouter.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** viewpointeventrouter.cpp 26 Aug 2009 22:22:44 -0000 1.34 --- viewpointeventroute... [truncated message content] |