[brlcad-commits] SF.net SVN: brlcad:[56242] brlcad/trunk/src/libdm/dm-qt.cpp

[vladbogo]

Revision: 56242
          http://sourceforge.net/p/brlcad/code/56242
Author:   vladbogo
Date:     2013-07-26 21:07:26 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
Sanity checks, ws, log calls

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-26 20:49:34 UTC (rev 56241)
+++ brlcad/trunk/src/libdm/dm-qt.cpp    2013-07-26 21:07:26 UTC (rev 56242)
@@ -82,7 +82,7 @@
     privars->painter->setPen(privars->fg);
     privars->painter->setFont(*privars->font);
 
-    bu_log("drawBegin called\n");
+    bu_log("qt_drawBegin called\n");
     return TCL_OK;
 }
 
@@ -91,11 +91,13 @@
 qt_drawEnd(struct dm *dmp)
 {
     struct qt_vars *privars = (struct qt_vars *)dmp->dm_vars.priv_vars;
+
     privars->painter->end();
     delete privars->painter;
     privars->painter = NULL;
     dmp->dm_processEvents(dmp);
 
+    bu_log("qt_drawEnd called\n");
     return TCL_OK;
 }
 
@@ -133,7 +135,11 @@
     sx = dm_Normal2Xx(dmp, x);
     sy = dm_Normal2Xy(dmp, y, use_aspect);
 
+    if (privars->painter == NULL)
+       return TCL_ERROR;
     privars->painter->drawText(sx, sy, str);
+
+    bu_log("qt_drawString2D called\n");
     return TCL_OK;
 }
 
@@ -149,7 +155,11 @@
     sy1 = dm_Normal2Xy(dmp, y_1, 0);
     sy2 = dm_Normal2Xy(dmp, y_2, 0);
 
+    if (privars->painter == NULL)
+       return TCL_ERROR;
     privars->painter->drawLine(sx1, sy1, sx2, sy2);
+
+    bu_log("qt_drawLine2D called\n");
     return TCL_OK;
 }
 
@@ -179,7 +189,11 @@
     sx = dm_Normal2Xx(dmp, x);
     sy = dm_Normal2Xy(dmp, y, 0);
 
+    if (privars->painter == NULL)
+       return TCL_ERROR;
     privars->painter->drawPoint(sx, sy);
+
+    bu_log("qt_drawPoint2D called\n");
     return TCL_OK;
 }
 
@@ -238,8 +252,12 @@
     privars->fg.setRgb(r, g, b);
 
     if (privars->painter != NULL) {
-       privars->painter->setPen(privars->fg);
+       QPen p = privars->painter->pen();
+       p.setColor(privars->fg);
+       privars->painter->setPen(p);
     }
+
+    bu_log("qt_setFGColor called\n");
     return TCL_OK;
 }
 
@@ -255,8 +273,11 @@
     dmp->dm_bg[1] = g;
     dmp->dm_bg[2] = b;
 
+    if(privars->pix == NULL)
+       return TCL_ERROR;
     privars->pix->fill(privars->bg);
 
+    bu_log("qt_setBGColor called\n");
     return TCL_OK;
 }
 
@@ -272,6 +293,8 @@
     if (width <= 1)
        width = 0;
 
+    if (privars->painter == NULL)
+       return TCL_ERROR;
     QPen p = privars->painter->pen();
     p.setWidth(width);
     if (style == DM_DASHED_LINE)
@@ -280,6 +303,7 @@
        p.setStyle(Qt::SolidLine);
     privars->painter->setPen(p);
 
+    bu_log("qt_setLineAttr called\n");
     return TCL_OK;
 }
 
@@ -290,6 +314,8 @@
     dmp->dm_height = height;
     dmp->dm_width = width;
     dmp->dm_aspect = (fastf_t)dmp->dm_width / (fastf_t)dmp->dm_height;
+
+    bu_log("qt_reshape called\n");
 }
 
 
@@ -342,6 +368,7 @@
        }
     }
 
+    bu_log("qt_configureWin called\n");
     return TCL_OK;
 }
 
@@ -742,13 +769,12 @@
     privars->pix = new QPixmap(dmp->dm_width, dmp->dm_height);
 
     privars->win = new QTkMainWindow(privars->pix, window);
-    privars->win->create();
     privars->win->setWidth(dmp->dm_width);
     privars->win->setHeight(dmp->dm_height);
-
     privars->win->show();
 
     privars->font = NULL;
+
     qt_configureWin(dmp, 1);
 
     privars->painter = NULL;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits