Menu
▾
▴
[Vapor-cvs] vapor/apps/vaporgui/main main.cpp, 1.25, 1.26 mainform.cpp, 1.81, 1.82 mainform.h, 1.26, 1.27 vizwin.cpp, 1.31, 1.32 vizwin.h, 1.17, 1.18 vizwinmgr.cpp, 1.104, 1.105 vizwinmgr.h, 1.52, 1.53
|
From: Alan N. <ala...@us...> - 2009-12-21 19:33:50
|
Update of /cvsroot/vapor/vapor/apps/vaporgui/main In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25298/main Modified Files: main.cpp mainform.cpp mainform.h vizwin.cpp vizwin.h vizwinmgr.cpp vizwinmgr.h Log Message: Replaced QWorkspace with QMdiArea Index: vizwin.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/main/vizwin.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** vizwin.cpp 16 Dec 2009 20:53:46 -0000 1.31 --- vizwin.cpp 21 Dec 2009 19:33:29 -0000 1.32 *************** *** 85,89 **** * */ ! VizWin::VizWin( QWorkspace* parent, const char* name, Qt::WFlags fl, VizWinMgr* myMgr, QRect* location, int winNum) : Q3MainWindow( (QWidget*)parent, name, fl ) { --- 85,89 ---- * */ ! VizWin::VizWin( MainForm* parent, const char* name, Qt::WFlags fl, VizWinMgr* myMgr, QRect* location, int winNum) : Q3MainWindow( (QWidget*)parent, name, fl ) { *************** *** 840,844 **** bool VizWin::isReallyMaximized() { if (isMaximized() ) return true; ! QWidget* thisCentralWidget = ((Q3MainWindow*)MainForm::getInstance())->centralWidget(); QSize mySize = frameSize(); QSize spaceSize = thisCentralWidget->size(); --- 840,844 ---- bool VizWin::isReallyMaximized() { if (isMaximized() ) return true; ! QWidget* thisCentralWidget = (MainForm::getInstance())->centralWidget(); QSize mySize = frameSize(); QSize spaceSize = thisCentralWidget->size(); Index: vizwinmgr.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/main/vizwinmgr.h,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** vizwinmgr.h 16 Dec 2009 20:53:46 -0000 1.52 --- vizwinmgr.h 21 Dec 2009 19:33:29 -0000 1.53 *************** *** 32,36 **** ! class QWorkspace; class QWidget; class QDesktopWidget; --- 32,36 ---- ! class QMdiArea; class QWidget; class QDesktopWidget; *************** *** 601,605 **** int parsingVizNum, parsingDvrInstance, parsingIsoInstance,parsingFlowInstance, parsingProbeInstance,parsingTwoDDataInstance,parsingTwoDImageInstance; ! QWorkspace* myWorkspace; --- 601,605 ---- int parsingVizNum, parsingDvrInstance, parsingIsoInstance,parsingFlowInstance, parsingProbeInstance,parsingTwoDDataInstance,parsingTwoDImageInstance; ! QMdiArea* myMDIArea; Index: main.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/main/main.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** main.cpp 26 Jun 2008 19:34:53 -0000 1.25 --- main.cpp 21 Dec 2009 19:33:29 -0000 1.26 *************** *** 70,81 **** //The pointsize of 10 works ok on linux and irix, not windows //The weight of 55 is slightly heavier than normal. ! #ifdef WIN32 //default font is OK on windows QFont myFont = a.font(); ! myFont.setPointSize(9); myFont.setWeight(60); a.setFont(myFont); ! #else //Helvetica looks better on X11 platforms QFont myFont(QString("Helvetica"), 10); if (myFont.exactMatch()){ --- 70,83 ---- //The pointsize of 10 works ok on linux and irix, not windows //The weight of 55 is slightly heavier than normal. ! //QT4 #ifdef WIN32 //default font is OK on windows QFont myFont = a.font(); ! myFont.setPointSize(10); myFont.setWeight(60); a.setFont(myFont); ! //#else //Helvetica looks better on X11 platforms + + /* QT4: use default fonts QFont myFont(QString("Helvetica"), 10); if (myFont.exactMatch()){ *************** *** 91,96 **** a.setFont(myFont); } ! #endif QString fileName(""); if (argc > 1) fileName = argv[1]; --- 93,99 ---- a.setFont(myFont); } + */ ! //#endif QString fileName(""); if (argc > 1) fileName = argv[1]; Index: mainform.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/main/mainform.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** mainform.h 17 Dec 2009 22:01:09 -0000 1.26 --- mainform.h 21 Dec 2009 19:33:29 -0000 1.27 *************** *** 53,57 **** class QWidget; class QDesktopWidget; ! class QWorkspace; class Q3DockWindow; class QDockWindow; --- 53,57 ---- class QWidget; class QDesktopWidget; ! class QMdiArea; class Q3DockWindow; class QDockWindow; *************** *** 107,111 **** FlowEventRouter* getFlowTab() {return theFlowTab;} ! QWorkspace* getWorkspace() {return myWorkspace;} //Disable the editUndo/Redo action: void disableUndoRedo(); --- 107,112 ---- FlowEventRouter* getFlowTab() {return theFlowTab;} ! //QT4.6QWorkspace* getWorkspace() {return myWorkspace;} ! QMdiArea* getMDIArea() {return myMDIArea;} //Disable the editUndo/Redo action: void disableUndoRedo(); *************** *** 282,286 **** Params::ParamType currentFrontTab; ! QWorkspace* myWorkspace; TabManager* tabWidget; Q3HBoxLayout* MainFormLayout; --- 283,288 ---- Params::ParamType currentFrontTab; ! //QT4.6QWorkspace* myWorkspace; ! QMdiArea* myMDIArea; TabManager* tabWidget; Q3HBoxLayout* MainFormLayout; Index: vizwin.h =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/main/vizwin.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** vizwin.h 16 Dec 2009 20:53:46 -0000 1.17 --- vizwin.h 21 Dec 2009 19:33:29 -0000 1.18 *************** *** 55,59 **** class QHideEvent; class QRect; - class QWorkspace; class Q3HBoxLayout; --- 55,58 ---- *************** *** 78,82 **** public: ! VizWin( QWorkspace* parent , const char* name , Qt::WFlags fl , VizWinMgr* myMgr, QRect* location , int winNum); ~VizWin(); --- 77,81 ---- public: ! VizWin(MainForm* parent , const char* name , Qt::WFlags fl , VizWinMgr* myMgr, QRect* location , int winNum); ~VizWin(); *************** *** 237,241 **** protected: ! QWorkspace* myParent; int myWindowNum; VizWinMgr* myWinMgr; --- 236,240 ---- protected: ! MainForm* myParent; int myWindowNum; VizWinMgr* myWinMgr; Index: mainform.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/main/mainform.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** mainform.cpp 17 Dec 2009 22:01:09 -0000 1.81 --- mainform.cpp 21 Dec 2009 19:33:29 -0000 1.82 *************** *** 51,55 **** #include <qmessagebox.h> #include <q3vbox.h> ! #include <qworkspace.h> #include <qcolordialog.h> #include <qstatusbar.h> --- 51,55 ---- #include <qmessagebox.h> #include <q3vbox.h> ! #include <QMdiArea> #include <qcolordialog.h> #include <qstatusbar.h> *************** *** 57,61 **** #include <qspinbox.h> #include <qtoolbutton.h> - //Added by qt3to4: #include <QPaintEvent> #include <Q3ActionGroup> --- 57,60 ---- *************** *** 171,179 **** modeStatusWidget = 0; - - //QPixmap* vaporIcon = new QPixmap(vapor_icon___)); setIcon(QPixmap(vapor_icon___)); (void)statusBar(); if ( !name ) setName( "MainForm" ); --- 170,182 ---- modeStatusWidget = 0; setIcon(QPixmap(vapor_icon___)); (void)statusBar(); + //insert my qmdiArea: + myMDIArea = new QMdiArea; + myMDIArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); + myMDIArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + setCentralWidget(myMDIArea); + if ( !name ) setName( "MainForm" ); *************** *** 182,198 **** setBackgroundOrigin( QMainWindow::WindowOrigin ); - Q3VBox* vb = new Q3VBox(this); - //Now insert my qworkspace: - myWorkspace = new QWorkspace(vb); - setCentralWidget(vb); - myWorkspace->setScrollBarsEnabled(true); - createActions(); createMenus(); - // createStatusBar(); //Now let's add a docking tabbed window on the left side. ! tabDockWindow = new QDockWidget(myWorkspace ); addDockWidget(Qt::RightDockWidgetArea, tabDockWindow ); tabDockWindow->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable); --- 185,195 ---- setBackgroundOrigin( QMainWindow::WindowOrigin ); createActions(); createMenus(); + //Now let's add a docking tabbed window on the left side. ! tabDockWindow = new QDockWidget(this ); addDockWidget(Qt::RightDockWidgetArea, tabDockWindow ); tabDockWindow->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable); *************** *** 220,226 **** myVizMgr->createGlobalParams(); - createToolBars(); - Main_Form->adjustSize(); languageChange(); --- 217,222 ---- myVizMgr->createGlobalParams(); + createToolBars(); Main_Form->adjustSize(); languageChange(); *************** *** 245,248 **** --- 241,245 ---- //The last one is in front: renderDVR(); + //Create one initial visualizer: *************** *** 1298,1302 **** } - AnimationEventRouter* myAnimationRouter = myVizMgr->getAnimationRouter(); --- 1295,1298 ---- *************** *** 1304,1308 **** //Create a new parameter class to work with the widget - if (posn < 0){ --- 1300,1303 ---- Index: vizwinmgr.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/main/vizwinmgr.cpp,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** vizwinmgr.cpp 16 Dec 2009 20:53:46 -0000 1.104 --- vizwinmgr.cpp 21 Dec 2009 19:33:29 -0000 1.105 *************** *** 29,33 **** #include <qrect.h> #include <qmessagebox.h> ! #include <qworkspace.h> #include <qlineedit.h> #include <qcombobox.h> --- 29,34 ---- #include <qrect.h> #include <qmessagebox.h> ! //#include <qworkspace.h> ! #include <QMdiArea> #include <qlineedit.h> #include <qcombobox.h> *************** *** 141,145 **** { myMainWindow = MainForm::getInstance(); ! myWorkspace = myMainWindow->getWorkspace(); tabManager = myMainWindow->getTabManager(); previousClass = 0; --- 142,146 ---- { myMainWindow = MainForm::getInstance(); ! myMDIArea = myMainWindow->getMDIArea(); tabManager = myMainWindow->getTabManager(); previousClass = 0; *************** *** 362,366 **** else vizName[useWindowNum] = ((QString("Visualizer No. ")+QString::number(useWindowNum))); emit (newViz(vizName[useWindowNum], useWindowNum)); ! vizWin[useWindowNum] = new VizWin (myWorkspace, vizName[useWindowNum].ascii(), 0/*Qt::WType_TopLevel*/, this, newRect, useWindowNum); vizWin[useWindowNum]->setWindowNum(useWindowNum); --- 363,370 ---- else vizName[useWindowNum] = ((QString("Visualizer No. ")+QString::number(useWindowNum))); emit (newViz(vizName[useWindowNum], useWindowNum)); ! // vizWin[useWindowNum] = new VizWin (myWorkspace, vizName[useWindowNum].ascii(), 0/*Qt::WType_TopLevel*/, this, newRect, useWindowNum); ! vizWin[useWindowNum] = new VizWin (MainForm::getInstance(), vizName[useWindowNum].ascii(), 0/*Qt::WType_TopLevel*/, this, newRect, useWindowNum); ! MainForm::getInstance()->getMDIArea()->addSubWindow(vizWin[useWindowNum]); ! vizWin[useWindowNum]->setWindowNum(useWindowNum); *************** *** 543,547 **** VizWinMgr::cascade(){ Session::getInstance()->blockRecording(); ! myWorkspace->cascade(); //Now size them up to a reasonable size: for (int i = 0; i< MAXVIZWINS; i++){ --- 547,551 ---- VizWinMgr::cascade(){ Session::getInstance()->blockRecording(); ! myMDIArea->cascadeSubWindows(); //Now size them up to a reasonable size: for (int i = 0; i< MAXVIZWINS; i++){ *************** *** 567,571 **** VizWinMgr::fitSpace(){ Session::getInstance()->blockRecording(); ! myWorkspace->tile(); Session::getInstance()->unblockRecording(); } --- 571,575 ---- VizWinMgr::fitSpace(){ Session::getInstance()->blockRecording(); ! myMDIArea->tileSubWindows(); Session::getInstance()->unblockRecording(); } |