Changeset 1255 for trunk/source/interfaces
- Timestamp:
- May 20, 2010, 11:47:43 AM (14 years ago)
- Location:
- trunk/source/interfaces
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/History
r1252 r1255 1 $Id: History,v 1.13 2 2010/05/19 07:18:50lgarnier Exp $1 $Id: History,v 1.133 2010/05/20 07:01:03 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 20 May, L. Garnier 21 Co-working tag : intercoms-V09-03-01 22 - G4UIQt: Add some changes in order to register UI in order to access 23 it after 24 - G4Qt: Remove a cycle dependency 25 20 26 19 May, L. Garnier 21 27 - G4UIQt: Fix a warning in Cout during viewer creation -
trunk/source/interfaces/basic/src/G4UIQt.cc
r1252 r1255 25 25 // 26 26 // 27 // $Id: G4UIQt.cc,v 1.3 6 2010/05/19 07:18:50lgarnier Exp $27 // $Id: G4UIQt.cc,v 1.37 2010/05/20 07:01:03 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 125 125 126 126 G4UImanager* UI = G4UImanager::GetUIpointer(); 127 128 // L.Garnier : This statement does not give the good pointer I think129 127 if(UI!=NULL) UI->SetSession(this); 130 128 if(UI!=NULL) UI->SetG4UIWindow(this); 131 132 // if(UI!=NULL) UI->SetG4UIWindow(this);133 134 #ifdef G4DEBUG_INTERFACES_BASIC135 printf("G4UIQt:: recheck Session : this %d UImanager:%d\n",this,UI);136 G4UIQt * uiQt2 = static_cast<G4UIQt*> (UI->GetG4UIWindow());137 printf("G4UIQt:: recheck Session : %d UImanager:%d\n",uiQt2,UI);138 #endif139 129 140 130 // Check if already define in external app QMainWindow … … 168 158 169 159 #ifdef G4DEBUG_INTERFACES_BASIC 170 printf("G4UIQt::Initialise after main window creation +++++++++++ 160 printf("G4UIQt::Initialise after main window creation +++++++++++\n"); 171 161 #endif 172 162 … … 321 311 if(UI!=NULL) UI->SetCoutDestination(this); // TO KEEP 322 312 323 // interactorManager->SetG4UI(this);324 325 313 #if QT_VERSION < 0x040000 326 314 fMainWindow->setCaption( tr( "G4UI Session" )); … … 347 335 printf("G4UIQt::G4UIQt END\n"); 348 336 #endif 349 #ifdef G4DEBUG_INTERFACES_BASIC350 printf("G4UIQt:: this : %d UImanager:%d\n",this,UI);351 #endif352 337 } 353 338 … … 363 348 if(UI!=NULL) { // TO KEEP 364 349 UI->SetSession(NULL); // TO KEEP 365 UI->SetG4UIWindow(NULL); // TO KEEP350 UI->SetG4UIWindow(NULL); 366 351 UI->SetCoutDestination(NULL); // TO KEEP 367 352 } … … 535 520 { 536 521 #ifdef G4DEBUG_INTERFACES_BASIC 537 printf("G4UIQt::AddTabWidget %d %d G4UIQt:%d fMyVSplitter:%d\n",sizeX, sizeY, this,fMyVSplitter);522 printf("G4UIQt::AddTabWidget %d %d\n",sizeX, sizeY); 538 523 #endif 539 524 if (!aWidget) { -
trunk/source/interfaces/common/include/G4Qt.hh
r1252 r1255 25 25 // 26 26 // 27 // $Id: G4Qt.hh,v 1. 5 2010/01/06 14:07:34lgarnier Exp $28 // GEANT4 tag $Name: laurent-QtUI_with_tabs_v1$27 // $Id: G4Qt.hh,v 1.6 2010/05/20 07:01:03 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // To unify Qt event treatment between … … 39 39 #include "G4VInteractorManager.hh" 40 40 41 // class G4UIQt;42 41 class QWidget; 43 42 class QString; … … 60 59 void FlushAndWaitExecution(); 61 60 virtual ~G4Qt(); 62 // bool AddTabWidget(QWidget*,QString,int,int);63 // void SetG4UI(G4UIQt*);64 61 65 62 private: … … 68 65 int argn; 69 66 char** args; 70 // G4UIQt* fG4UI;71 67 }; 72 68 -
trunk/source/interfaces/common/src/G4Qt.cc
r1252 r1255 25 25 // 26 26 // 27 // $Id: G4Qt.cc,v 1.1 6 2010/04/26 15:46:00lgarnier Exp $27 // $Id: G4Qt.cc,v 1.17 2010/05/20 07:01:03 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 38 38 39 39 #include "G4Qt.hh" 40 // #include "G4UIQt.hh"41 40 #include <qwidget.h> 42 41 … … 76 75 ,char* /*a_class */ 77 76 ) 78 // :fG4UI(NULL)79 77 /***************************************************************************/ 80 78 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ … … 207 205 } 208 206 209 // /***************************************************************************/ 210 // void G4Qt::SetG4UI ( 211 // G4UIQt* ui 212 // ) 213 // /***************************************************************************/ 214 // /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ 215 // { 216 // #ifdef G4DEBUG_INTERFACES_COMMON 217 // printf("G4Qt::SetG4UI \n"); 218 // #endif 219 // fG4UI = ui; 220 // } 221 222 // /***************************************************************************/ 223 // bool G4Qt::AddTabWidget ( 224 // QWidget * vis 225 // ,QString name 226 // ,int sizeX 227 // ,int sizeY 228 // ) 229 // /***************************************************************************/ 230 // /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ 231 // { 232 // if (fG4UI != NULL) { 233 // // return fG4UI->AddTabWidget(vis,name,sizeX,sizeY); 234 // } 235 // return false; 236 // } 237 #endif 238 239 207 #endif 208 209
Note: See TracChangeset
for help on using the changeset viewer.