|
From: <dhu...@us...> - 2007-01-24 15:12:57
|
Revision: 247
http://svn.sourceforge.net/qcell/?rev=247&view=rev
Author: dhubleizh
Date: 2007-01-24 07:12:54 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
- removed pending debug from basetools
- tabified dock widgets, to see antyhing clearly there
Modified Paths:
--------------
trunk/qcell/basesources/basetools.cpp
trunk/qcell/visgui/MainWindow.cpp
trunk/qcell/visgui/MainWindow.h
Modified: trunk/qcell/basesources/basetools.cpp
===================================================================
--- trunk/qcell/basesources/basetools.cpp 2007-01-24 14:55:44 UTC (rev 246)
+++ trunk/qcell/basesources/basetools.cpp 2007-01-24 15:12:54 UTC (rev 247)
@@ -125,15 +125,5 @@
void BaseTools::setItem(int row, int column, QTableWidgetItem* item)
{
ui.valueTable->setItem(row, column, item);
- qDebug() << "BaseSize: " << ui.valueTable->baseSize()
- << " FrameSize: " << ui.valueTable->frameSize()
- << " MaximumSize: " << ui.valueTable->maximumSize()
- << " MaximumViewportSize: " << ui.valueTable->maximumViewportSize()
- << " MinimumSize: " << ui.valueTable->minimumSize()
- << " MinimumSizeHint: " << ui.valueTable->minimumSizeHint()
- << " Size: " << ui.valueTable->size()
- << " SizeHint: " << ui.valueTable->sizeHint()
- << " SizeIncrement: " << ui.valueTable->sizeIncrement()
- << " sizePolicy: " << ui.valueTable->sizePolicy();
}
Modified: trunk/qcell/visgui/MainWindow.cpp
===================================================================
--- trunk/qcell/visgui/MainWindow.cpp 2007-01-24 14:55:44 UTC (rev 246)
+++ trunk/qcell/visgui/MainWindow.cpp 2007-01-24 15:12:54 UTC (rev 247)
@@ -58,7 +58,8 @@
dock3D->setWidget(view3DTools);
((QVBoxLayout*)dock3D->layout())->addStretch();
dock3D->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- addDockWidget(Qt::RightDockWidgetArea, dock3D);
+ tabifyDockWidget(baseDock, dock3D);
+// addDockWidget(Qt::RightDockWidgetArea, dock3D);
QAction* v3d_action = dock3D->toggleViewAction();
v3d_action->setText(tr("&3D Tools"));
@@ -84,7 +85,8 @@
dock2D->setWidget(view2DTextTools);
((QVBoxLayout*)dock2D->layout())->addStretch();
dock2D->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- addDockWidget(Qt::RightDockWidgetArea, dock2D);
+// addDockWidget(Qt::RightDockWidgetArea, dock2D);
+ tabifyDockWidget(baseDock, dock2D);
QAction* v2d_action = dock2D->toggleViewAction();
v2d_action->setText(tr("&2D Text Tools"));
@@ -116,7 +118,8 @@
dock1D->setWidget(view1DTextTools);
((QVBoxLayout*)dock1D->layout())->addStretch();
dock1D->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- addDockWidget(Qt::RightDockWidgetArea, dock1D);
+// addDockWidget(Qt::RightDockWidgetArea, dock1D);
+ tabifyDockWidget(baseDock, dock1D);
QAction* v1d_action = dock1D->toggleViewAction();
v1d_action->setText(tr("&1D Text Tools"));
@@ -435,7 +438,7 @@
}
//***************************************************
- *sw->getNeighbourhoodEditor()->getStorage() = neighbourhood->toCalculationData();
+// *sw->getNeighbourhoodEditor()->getStorage() = neighbourhood->toCalculationData();
sw->getNeighbourhoodEditor()->setTranslation(0.0f, 0.0f, -10.0f);
sw->getNeighbourhoodEditor()->setSymbolColor(1, QColor(128, 128, 128));
//***************************************************
Modified: trunk/qcell/visgui/MainWindow.h
===================================================================
--- trunk/qcell/visgui/MainWindow.h 2007-01-24 14:55:44 UTC (rev 246)
+++ trunk/qcell/visgui/MainWindow.h 2007-01-24 15:12:54 UTC (rev 247)
@@ -48,7 +48,6 @@
void unlockGUI();
public:
MainWindow(QWidget* parent = 0);
- void addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockwidget);
private slots:
void on_action_About_activated();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|