Rename qtcad signal flags. Probably need to revisit these, to see if …

…we're using them in the correct way/places.
BRL-CAD · Jun 29, 2023 · af994d3 · af994d3
1 parent 8bf52a1
commit af994d3
Show file tree

Hide file tree

Showing 24 changed files with 107 additions and 107 deletions.
diff --git a/include/qtcad/CMakeLists.txt b/include/qtcad/CMakeLists.txt
@@ -8,22 +8,22 @@ set(qtcad_headers
   QgDockWidget.h
   QgEdit.h
   QgFlowLayout.h
-  QgGeomImport.h
   QgGL.h
+  QgGeomImport.h
   QgKeyVal.h
   QgMeasureFilter.h
   QgModel.h
   QgPolyFilter.h
   QgQuadView.h
   QgSW.h
   QgSelectFilter.h
+  QgSignalFlags.h
   QgToolPalette.h
   QgTreeSelectionModel.h
   QgTreeView.h
   QgUtil.h
   QgView.h
   QgViewCtrl.h
-  SignalFlags.h
   defines.h
   )
 BRLCAD_MANAGE_FILES(qtcad_headers ${INCLUDE_DIR}/brlcad/qtcad)

diff --git a/include/qtcad/SignalFlags.h → include/qtcad/QgSignalFlags.h b/include/qtcad/SignalFlags.h → include/qtcad/QgSignalFlags.h
@@ -1,4 +1,4 @@
-/*                   S I G N A L F L A G S . H
+/*                  Q G S I G N A L F L A G S . H
  * BRL-CAD
  *
  * Copyright (c) 2022-2023 United States Government as represented by
@@ -17,7 +17,7 @@
  * License along with this file; see the file named COPYING for more
  * information.
  */
-/** @file SignalFlags.h
+/** @file QgSignalFlags.h
  *
  * Qt uses a signals/slots mechanism to communicate when (for example)
  * application UI elements need to update in response to data changes.
@@ -80,15 +80,15 @@
 
 #include "common.h"
 
-#ifndef QTCAD_SIGNAL_FLAGS_H
+#ifndef QGSIGNALFLAGS_H
 
-#define QTCAD_VIEW_REFRESH  0x00000001  // Potential camera updates, no structural changes
-#define QTCAD_VIEW_DRAWN    0x00000002  // Used when what is drawn in the scene changes
-#define QTCAD_VIEW_SELECT   0x00000004  // Used when what is selected changes
-#define QTCAD_VIEW_MODE     0x00000008  // Used when mode-aware highlighting or drawing changes
-#define QTCAD_VIEW_DB       0x00000010  // Used when .g database content changes
+#define QG_VIEW_REFRESH  0x00000001  // Potential camera updates, no structural changes
+#define QG_VIEW_DRAWN    0x00000002  // Used when what is drawn in the scene changes
+#define QG_VIEW_SELECT   0x00000004  // Used when what is selected changes
+#define QG_VIEW_MODE     0x00000008  // Used when mode-aware highlighting or drawing changes
+#define QG_VIEW_DB       0x00000010  // Used when .g database content changes
 
-#endif // QTCAD_SIGNAL_FLAGS_H
+#endif // QGSIGNALFLAGS_H
 /*
  * Local Variables:
  * tab-width: 8

diff --git a/include/qtcad/QgToolPalette.h b/include/qtcad/QgToolPalette.h
@@ -28,7 +28,7 @@
  * The QgToolPalette widget is what is directly added to application
  * widget hierarchies, and it is that widget's signals and slots which
  * are connected to the top level view updating signal/slot system as
- * articulated in SignalFlags.h.  Individual elements (i.e.tools) are
+ * articulated in QgSignalFlags.h.  Individual elements (i.e.tools) are
  * connected to QgToolPalette, and the implementation specific "guts"
  * of the various tools connect to their parent element.
  *
@@ -48,7 +48,7 @@
 #include <QSplitter>
 #include "qtcad/defines.h"
 #include "qtcad/QgFlowLayout.h"
-#include "qtcad/SignalFlags.h"
+#include "qtcad/QgSignalFlags.h"
 
 class QTCAD_EXPORT QgToolPaletteElement;
 

diff --git a/src/libqtcad/QgMeasureFilter.cpp b/src/libqtcad/QgMeasureFilter.cpp
@@ -34,7 +34,7 @@ extern "C" {
 }
 
 #include "qtcad/QgMeasureFilter.h"
-#include "qtcad/SignalFlags.h"
+#include "qtcad/QgSignalFlags.h"
 
 QMouseEvent *
 QgMeasureFilter::view_sync(QEvent *e)
@@ -127,14 +127,14 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    VSETALL(p1, 0.0);
 	    VSETALL(p2, 0.0);
 	    VSETALL(p3, 0.0);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 	if (mode == 4) {
 	    if (s)
 		bv_obj_put(s);
 	    mode = 0;
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 	if (!mode) {
@@ -155,7 +155,7 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p1, BV_VLIST_LINE_MOVE);
 	    bu_vls_init(&s->s_name);
 	    bu_vls_printf(&s->s_name, "%s", oname.c_str());
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 	if (mode == 1) {
@@ -174,7 +174,7 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p2, BV_VLIST_LINE_DRAW);
 	    VMOVE(p3, mpnt);
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p3, BV_VLIST_LINE_DRAW);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	}
 	return true;
     }
@@ -190,7 +190,7 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p1, BV_VLIST_LINE_MOVE);
 	    VMOVE(p2, mpnt);
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p2, BV_VLIST_LINE_DRAW);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	}
 	if (mode == 3) {
 	    if (!get_point())
@@ -201,7 +201,7 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p2, BV_VLIST_LINE_DRAW);
 	    VMOVE(p3, mpnt);
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p3, BV_VLIST_LINE_DRAW);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	}
 	return true;
     }
@@ -211,7 +211,7 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    mode = 0;
 	    if (s) {
 		bv_obj_put(s);
-		emit view_updated(QTCAD_VIEW_REFRESH);
+		emit view_updated(QG_VIEW_REFRESH);
 	    }
 	    s = NULL;
 	    return true;
@@ -228,7 +228,7 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    if (length_only) {
 		// Angle measurement disabled, starting over
 		mode = 0;
-		emit view_updated(QTCAD_VIEW_REFRESH);
+		emit view_updated(QG_VIEW_REFRESH);
 		return true;
 	    }
 
@@ -237,7 +237,7 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p1, BV_VLIST_LINE_MOVE);
 	    VMOVE(p2, mpnt);
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p2, BV_VLIST_LINE_DRAW);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 	if (mode == 3) {
@@ -249,7 +249,7 @@ QgMeasureFilter::eventFilter(QObject *, QEvent *e)
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p2, BV_VLIST_LINE_DRAW);
 	    VMOVE(p3, mpnt);
 	    BV_ADD_VLIST(s->vlfree, &s->s_vlist, p3, BV_VLIST_LINE_DRAW);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 

diff --git a/src/libqtcad/QgModel.cpp b/src/libqtcad/QgModel.cpp
@@ -58,7 +58,7 @@
 #include "raytrace.h"
 #include "qtcad/QgModel.h"
 #include "qtcad/QgUtil.h"
-#include "qtcad/SignalFlags.h"
+#include "qtcad/QgSignalFlags.h"
 
 struct QgItem_cmp {
     inline bool operator() (const QgItem *i1, const QgItem *i2)
@@ -452,7 +452,7 @@ QgModel::g_update(struct db_i *n_dbip)
 	items->clear();
 	tops_items.clear();
 	emit mdl_changed_db((void *)gedp);
-	emit view_change(QTCAD_VIEW_DRAWN);
+	emit view_change(QG_VIEW_DRAWN);
 	emit layoutChanged();
 	changed_db_flag = 0;
 	endResetModel();
@@ -901,7 +901,7 @@ QgModel::draw(const char *inst_path)
     bu_setenv("GED_TEST_NEW_CMD_FORMS", "1", 1);
     int ret = ged_exec(gedp, 2, argv);
 
-    emit view_change(QTCAD_VIEW_DRAWN);
+    emit view_change(QG_VIEW_DRAWN);
     return ret;
 }
 
@@ -934,7 +934,7 @@ QgModel::erase(const char *inst_path)
     bu_setenv("GED_TEST_NEW_CMD_FORMS", "1", 1);
     int ret = ged_exec(gedp, 2, argv);
 
-    emit view_change(QTCAD_VIEW_DRAWN);
+    emit view_change(QG_VIEW_DRAWN);
     return ret;
 }
 

diff --git a/src/libqtcad/QgPolyFilter.cpp b/src/libqtcad/QgPolyFilter.cpp
@@ -33,7 +33,7 @@ extern "C" {
 }
 
 #include "qtcad/QgPolyFilter.h"
-#include "qtcad/SignalFlags.h"
+#include "qtcad/QgSignalFlags.h"
 
 QMouseEvent *
 QgPolyFilter::view_sync(QEvent *e)
@@ -155,7 +155,7 @@ QPolyCreateFilter::eventFilter(QObject *, QEvent *e)
 	    // It doesn't get a "proper" name until its finalized
 	    bu_vls_printf(&wp->s_name, "_tmp_view_polygon");
 
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 
@@ -170,7 +170,7 @@ QPolyCreateFilter::eventFilter(QObject *, QEvent *e)
 	    wp->s_v->gv_mouse_x = v->gv_mouse_x;
 	    wp->s_v->gv_mouse_y = v->gv_mouse_y;
 	    bv_update_polygon(wp, wp->s_v, BV_POLYGON_UPDATE_PT_APPEND);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 
@@ -216,7 +216,7 @@ QPolyCreateFilter::eventFilter(QObject *, QEvent *e)
 	// with the view's x,y coordinates
 	if (m_e->buttons().testFlag(Qt::LeftButton) && m_e->modifiers() == Qt::NoModifier) {
 	    bv_update_polygon(wp, wp->s_v, BV_POLYGON_UPDATE_DEFAULT);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
     }
@@ -284,7 +284,7 @@ QPolyCreateFilter::finalize(bool)
     if (wp)
 	wp->s_update_callback = NULL;
 
-    emit view_updated(QTCAD_VIEW_REFRESH);
+    emit view_updated(QG_VIEW_REFRESH);
     emit finalized((icnt > 0) ? true : false);
 }
 
@@ -315,7 +315,7 @@ QPolyUpdateFilter::eventFilter(QObject *, QEvent *e)
 	// with the view's x,y coordinates
 	if (m_e->buttons().testFlag(Qt::LeftButton) && m_e->modifiers() == Qt::NoModifier) {
 	    bv_update_polygon(wp, wp->s_v, BV_POLYGON_UPDATE_DEFAULT);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 
@@ -373,7 +373,7 @@ QPolyPointFilter::eventFilter(QObject *, QEvent *e)
     if (m_e->type() == QEvent::MouseButtonPress && m_e->buttons().testFlag(Qt::LeftButton)) {
 	if (vp->curr_point_i < 0) {
 	    bv_update_polygon(wp, wp->s_v, BV_POLYGON_UPDATE_PT_SELECT);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	}
 	return true;
     }
@@ -382,7 +382,7 @@ QPolyPointFilter::eventFilter(QObject *, QEvent *e)
     if (m_e->type() == QEvent::MouseButtonPress && m_e->buttons().testFlag(Qt::RightButton)) {
 	vp->curr_point_i = -1;
 	bv_update_polygon(wp, wp->s_v, BV_POLYGON_UPDATE_PROPS_ONLY);
-	emit view_updated(QTCAD_VIEW_REFRESH);
+	emit view_updated(QG_VIEW_REFRESH);
 	return true;
     }
 
@@ -398,7 +398,7 @@ QPolyPointFilter::eventFilter(QObject *, QEvent *e)
 	}
 	if (m_e->buttons().testFlag(Qt::LeftButton) && m_e->modifiers() == Qt::NoModifier) {
 	    bv_update_polygon(wp, wp->s_v, BV_POLYGON_UPDATE_PT_MOVE);
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	    return true;
 	}
 
@@ -435,7 +435,7 @@ QPolyMoveFilter::eventFilter(QObject *, QEvent *e)
 	    } else {
 		bv_move_polygon(wp);
 	    }
-	    emit view_updated(QTCAD_VIEW_REFRESH);
+	    emit view_updated(QG_VIEW_REFRESH);
 	}
 	return true;
     }

diff --git a/src/libqtcad/QgSelectFilter.cpp b/src/libqtcad/QgSelectFilter.cpp
@@ -36,7 +36,7 @@ extern "C" {
 
 #include <unordered_set>
 #include "qtcad/QgSelectFilter.h"
-#include "qtcad/SignalFlags.h"
+#include "qtcad/QgSignalFlags.h"
 
 // Find the first bbox intersection under the XY view point.
 static struct bv_scene_obj *
@@ -180,7 +180,7 @@ QgSelectBoxFilter::eventFilter(QObject *, QEvent *e)
 	grsp->cdim[0] = v->gv_width;
 	grsp->cdim[1] = v->gv_height;
 	grsp->aspect = (fastf_t)v->gv_s->gv_rect.cdim[X] / v->gv_s->gv_rect.cdim[Y];
-	emit view_updated(QTCAD_VIEW_DRAWN);
+	emit view_updated(QG_VIEW_DRAWN);
 	return true;
     }
 
@@ -193,7 +193,7 @@ QgSelectBoxFilter::eventFilter(QObject *, QEvent *e)
 	grsp->y = ((0.5 - (grsp->cdim[Y] - grsp->pos[Y]) / (fastf_t)grsp->cdim[Y]) / grsp->aspect * 2.0);
 	grsp->width = grsp->dim[X] * 2.0 / (fastf_t)grsp->cdim[X];
 	grsp->height = grsp->dim[Y] * 2.0 / (fastf_t)grsp->cdim[X];
-	emit view_updated(QTCAD_VIEW_DRAWN);
+	emit view_updated(QG_VIEW_DRAWN);
 	return true;
     }
 
@@ -223,7 +223,7 @@ QgSelectBoxFilter::eventFilter(QObject *, QEvent *e)
 	grsp->pos[1] = 0;
 	grsp->dim[0] = 0;
 	grsp->dim[1] = 0;
-	emit view_updated(QTCAD_VIEW_DRAWN);
+	emit view_updated(QG_VIEW_DRAWN);
 	return true;
     }
 

diff --git a/src/libqtcad/QgTreeSelectionModel.cpp b/src/libqtcad/QgTreeSelectionModel.cpp
@@ -31,7 +31,7 @@
 #include "qtcad/QgUtil.h"
 #include "qtcad/QgModel.h"
 #include "qtcad/QgTreeSelectionModel.h"
-#include "qtcad/SignalFlags.h"
+#include "qtcad/QgSignalFlags.h"
 
 void
 QgTreeSelectionModel::clear_all()
@@ -94,9 +94,9 @@ QgTreeSelectionModel::select(const QItemSelection &selection, QItemSelectionMode
     // Done manipulating paths - update metadata
     ss->characterize();
 
-    unsigned long long sflags = QTCAD_VIEW_SELECT;
+    unsigned long long sflags = QG_VIEW_SELECT;
     if (ss->draw_sync())
-	sflags |= QTCAD_VIEW_REFRESH;
+	sflags |= QG_VIEW_REFRESH;
 
     emit treeview->view_changed(sflags);
     emit treeview->m->layoutChanged();
@@ -126,9 +126,9 @@ QgTreeSelectionModel::select(const QModelIndex &index, QItemSelectionModel::Sele
 	// Done manipulating paths - update metadata
 	ss->characterize();
 
-	unsigned long long sflags = QTCAD_VIEW_SELECT;
+	unsigned long long sflags = QG_VIEW_SELECT;
 	if (ss->draw_sync())
-	    sflags |= QTCAD_VIEW_REFRESH;
+	    sflags |= QG_VIEW_REFRESH;
 
 	emit treeview->view_changed(sflags);
 	emit treeview->m->layoutChanged();
@@ -143,9 +143,9 @@ QgTreeSelectionModel::select(const QModelIndex &index, QItemSelectionModel::Sele
 	    ss->deselect_hpath(path_hashes);
 	    // Done manipulating paths - update metadata
 	    ss->characterize();
-	    unsigned long long sflags = QTCAD_VIEW_SELECT;
+	    unsigned long long sflags = QG_VIEW_SELECT;
 	    if (ss->draw_sync())
-		sflags |= QTCAD_VIEW_REFRESH;
+		sflags |= QG_VIEW_REFRESH;
 	    emit treeview->view_changed(sflags);
 	    emit treeview->m->layoutChanged();
 	    return;
@@ -164,9 +164,9 @@ QgTreeSelectionModel::select(const QModelIndex &index, QItemSelectionModel::Sele
     // Done manipulating paths - update metadata
     ss->characterize();
 
-    unsigned long long sflags = QTCAD_VIEW_SELECT;
+    unsigned long long sflags = QG_VIEW_SELECT;
     if (ss->draw_sync())
-	sflags |= QTCAD_VIEW_REFRESH;
+	sflags |= QG_VIEW_REFRESH;
 
     emit treeview->view_changed(sflags);
     emit treeview->m->layoutChanged();