[brlcad-commits] SF.net SVN: brlcad:[56062] brlcad/trunk/src/libdm/dm-qt.cpp
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <vla...@us...> - 2013-07-15 19:11:18
|
Revision: 56062 http://sourceforge.net/p/brlcad/code/56062 Author: vladbogo Date: 2013-07-15 19:11:14 +0000 (Mon, 15 Jul 2013) Log Message: ----------- Remove trailing ws and other small cleanups. Modified Paths: -------------- brlcad/trunk/src/libdm/dm-qt.cpp Modified: brlcad/trunk/src/libdm/dm-qt.cpp =================================================================== --- brlcad/trunk/src/libdm/dm-qt.cpp 2013-07-15 18:58:55 UTC (rev 56061) +++ brlcad/trunk/src/libdm/dm-qt.cpp 2013-07-15 19:11:14 UTC (rev 56062) @@ -48,6 +48,9 @@ struct dm_xvars *pubvars = (struct dm_xvars *)dmp->dm_vars.pub_vars; struct qt_vars *privars = (struct qt_vars *)dmp->dm_vars.priv_vars; + privars->win->close(); + delete privars->win; + if (privars->qapp) privars->qapp->quit(); if (pubvars->xtkwin) @@ -210,11 +213,39 @@ } +HIDDEN void +qt_reshape(struct dm *dmp, int width, int height) +{ + dmp->dm_height = height; + dmp->dm_width = width; + dmp->dm_aspect = (fastf_t)dmp->dm_width / (fastf_t)dmp->dm_height; +} + + HIDDEN int -qt_configureWin(struct dm *UNUSED(dmp), int UNUSED(force)) +qt_configureWin(struct dm *dmp, int force) { - bu_log("qt_configureWin not implemented\n"); - return 0; + /* struct dm_xvars *pubvars = (struct dm_xvars *)dmp->dm_vars.pub_vars; */ + struct qt_vars *privars = (struct qt_vars *)dmp->dm_vars.priv_vars; + + int width = privars->win->width(); + int height = privars->win->height(); + + if (!force && + dmp->dm_height == height && + dmp->dm_width == width) + return TCL_OK; + + qt_reshape(dmp, width, height); + + if (dmp->dm_debugLevel) { + bu_log("qt_configureWin_guts()\n"); + bu_log("width = %d, height = %d\n", dmp->dm_width, dmp->dm_height); + } + + /* TODO select font */ + + return TCL_OK; } @@ -313,15 +344,6 @@ } -HIDDEN void -qt_reshape(struct dm *dmp, int width, int height) -{ - dmp->dm_height = height; - dmp->dm_width = width; - dmp->dm_aspect = (fastf_t)dmp->dm_width / (fastf_t)dmp->dm_height; -} - - HIDDEN int qt_makeCurrent(struct dm *UNUSED(dmp)) { @@ -403,33 +425,6 @@ }; -HIDDEN int -qt_configureWin_guts(struct dm *dmp, int force) -{ - /* struct dm_xvars *pubvars = (struct dm_xvars *)dmp->dm_vars.pub_vars; */ - struct qt_vars *privars = (struct qt_vars *)dmp->dm_vars.priv_vars; - - int width = privars->win->width(); - int height = privars->win->height(); - - if (!force && - dmp->dm_height == height && - dmp->dm_width == width) - return TCL_OK; - - qt_reshape(dmp, width, height); - - if (dmp->dm_debugLevel) { - bu_log("qt_configureWin_guts()\n"); - bu_log("width = %d, height = %d\n", dmp->dm_width, dmp->dm_height); - } - - /* TODO select font */ - - return TCL_OK; -} - - QTkMainWindow::QTkMainWindow(WId win) :QWidget() { @@ -587,17 +582,17 @@ privars->win = new QTkMainWindow((WId)pubvars->win); privars->win->resize(dmp->dm_width, dmp->dm_height); - + QPalette *pal = new QPalette(); - pal->setColor(QPalette::Background, Qt::black); + pal->setColor(QPalette::Background, Qt::black); privars->win->setAutoFillBackground(true); privars->win->setPalette(*pal); delete pal; - + privars->win->show(); - - qt_configureWin_guts(dmp, 1); - + + qt_configureWin(dmp, 1); + Tk_SetWindowBackground(pubvars->xtkwin, 0); Tk_MapWindow(pubvars->xtkwin); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |