Revision: 76171
http://sourceforge.net/p/brlcad/code/76171
Author: starseeker
Date: 2020-06-21 14:58:21 +0000 (Sun, 21 Jun 2020)
Log Message:
-----------
more corrections
Modified Paths:
--------------
brlcad/branches/qtged/src/qged/CMakeLists.txt
brlcad/branches/qtged/src/qged/QAccordionWidget.cxx
brlcad/branches/qtged/src/qged/QAccordionWidget.h
brlcad/branches/qtged/src/qged/TODO
brlcad/branches/qtged/src/qged/cadaccordion.cxx
brlcad/branches/qtged/src/qged/cadaccordion.h
brlcad/branches/qtged/src/qged/cadapp.cxx
brlcad/branches/qtged/src/qged/cadapp.h
brlcad/branches/qtged/src/qged/main_window.cxx
brlcad/branches/qtged/src/qged/main_window.h
Modified: brlcad/branches/qtged/src/qged/CMakeLists.txt
===================================================================
--- brlcad/branches/qtged/src/qged/CMakeLists.txt 2020-06-21 14:53:30 UTC
(rev 76170)
+++ brlcad/branches/qtged/src/qged/CMakeLists.txt 2020-06-21 14:58:21 UTC
(rev 76171)
@@ -66,6 +66,7 @@
add_executable(qged ${qged_srcs} ${moc_srcs} ${cad_qrc})
qt5_use_modules(qged Widgets OpenGL)
target_link_libraries(qged libbu librt libged ${QT_LIBRARIES}
${OPENGL_LIBRARIES})
+ target_compile_definitions(qged PRIVATE BRLCADBUILD HAVE_CONFIG_H)
install(TARGETS qged
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
Modified: brlcad/branches/qtged/src/qged/QAccordionWidget.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/QAccordionWidget.cxx 2020-06-21 14:53:30 UTC
(rev 76170)
+++ brlcad/branches/qtged/src/qged/QAccordionWidget.cxx 2020-06-21 14:58:21 UTC
(rev 76171)
@@ -1,4 +1,4 @@
-/* Q A C C O R D I A N W I D G E T . C X X
+/* Q A C C O R D I O N W I D G E T . C X X
* BRL-CAD
*
* Copyright (c) 2014 United States Government as represented by
@@ -17,9 +17,9 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @file QAccordianWidget.cxx
+/** @file QAccordionWidget.cxx
*
- * Qt Accordian Widget implementation
+ * Qt Accordion Widget implementation
*
*/
@@ -53,9 +53,9 @@
# pragma clang diagnostic pop
#endif
-#include "QAccordianWidget.h"
+#include "QAccordionWidget.h"
-QAccordianObject::QAccordianObject(QWidget *pparent, QWidget *object, QString
header_title) : QWidget(pparent)
+QAccordionObject::QAccordionObject(QWidget *pparent, QWidget *object, QString
header_title) : QWidget(pparent)
{
visible = 1;
title = header_title;
@@ -86,7 +86,7 @@
QObject::connect(toggle, SIGNAL(clicked()), this,
SLOT(toggleVisibility()));
}
-QAccordianObject::~QAccordianObject()
+QAccordionObject::~QAccordionObject()
{
delete toggle;
if (child_object) delete child_object;
@@ -93,7 +93,7 @@
}
void
-QAccordianObject::setWidget(QWidget *object)
+QAccordionObject::setWidget(QWidget *object)
{
if (child_object) {
objlayout->removeWidget(child_object);
@@ -104,7 +104,7 @@
}
QWidget *
-QAccordianObject::getWidget()
+QAccordionObject::getWidget()
{
return child_object;
}
@@ -111,7 +111,7 @@
void
-QAccordianObject::setVisibility(int val)
+QAccordionObject::setVisibility(int val)
{
visible = val;
if (!visible) {
@@ -137,13 +137,13 @@
}
void
-QAccordianObject::toggleVisibility()
+QAccordionObject::toggleVisibility()
{
setVisibility(!visible);
}
-QAccordianWidget::QAccordianWidget(QWidget *pparent) : QWidget(pparent)
+QAccordionWidget::QAccordionWidget(QWidget *pparent) : QWidget(pparent)
{
unique_visibility = 0;
@@ -160,33 +160,33 @@
this->setLayout(mlayout);
}
-QAccordianWidget::~QAccordianWidget()
+QAccordionWidget::~QAccordionWidget()
{
- foreach(QAccordianObject *object, objects) {
+ foreach(QAccordionObject *object, objects) {
delete object;
}
}
void
-QAccordianWidget::addObject(QAccordianObject *object)
+QAccordionWidget::addObject(QAccordionObject *object)
{
splitter->addWidget(object);
object->idx = splitter->count() - 1;
objects.insert(object);
- QObject::connect(object, SIGNAL(made_visible(QAccordianObject *)), this,
SLOT(stateUpdate(QAccordianObject *)));
- QObject::connect(object, SIGNAL(made_hidden(QAccordianObject *)), this,
SLOT(stateUpdate(QAccordianObject *)));
+ QObject::connect(object, SIGNAL(made_visible(QAccordionObject *)), this,
SLOT(stateUpdate(QAccordionObject *)));
+ QObject::connect(object, SIGNAL(made_hidden(QAccordionObject *)), this,
SLOT(stateUpdate(QAccordionObject *)));
size_states.clear();
}
void
-QAccordianWidget::insertObject(int idx, QAccordianObject *object)
+QAccordionWidget::insertObject(int idx, QAccordionObject *object)
{
splitter->insertWidget(idx, object);
object->idx = splitter->count() - 1;
objects.insert(object);
- QObject::connect(object, SIGNAL(made_visible(QAccordianObject *)), this,
SLOT(stateUpdate(QAccordianObject *)));
- QObject::connect(object, SIGNAL(made_hidden(QAccordianObject *)), this,
SLOT(stateUpdate(QAccordianObject *)));
- foreach(QAccordianObject *obj, objects) {
+ QObject::connect(object, SIGNAL(made_visible(QAccordionObject *)), this,
SLOT(stateUpdate(QAccordionObject *)));
+ QObject::connect(object, SIGNAL(made_hidden(QAccordionObject *)), this,
SLOT(stateUpdate(QAccordionObject *)));
+ foreach(QAccordionObject *obj, objects) {
if (obj->idx >= idx)
obj->idx++;
}
@@ -194,7 +194,7 @@
}
void
-QAccordianWidget::deleteObject(QAccordianObject *object)
+QAccordionWidget::deleteObject(QAccordionObject *object)
{
objects.remove(object);
size_states.clear();
@@ -202,7 +202,7 @@
}
void
-QAccordianWidget::setUniqueVisibility(int val)
+QAccordionWidget::setUniqueVisibility(int val)
{
unique_visibility = val;
if (!objects.isEmpty()) {
@@ -215,10 +215,10 @@
}
void
-QAccordianWidget::update_sizes(int, int) {
+QAccordionWidget::update_sizes(int, int) {
QList<int> currentSizes = splitter->sizes();
QString statekey;
- foreach(QAccordianObject *obj, objects) {
+ foreach(QAccordionObject *obj, objects) {
if (obj->visible) {
statekey.append("1");
} else {
@@ -229,18 +229,18 @@
}
void
-QAccordianWidget::stateUpdate(QAccordianObject *new_obj)
+QAccordionWidget::stateUpdate(QAccordionObject *new_obj)
{
if (unique_visibility && new_obj) {
open_object = new_obj;
open_object->setVisibility(1);
- foreach(QAccordianObject *obj, objects) {
+ foreach(QAccordionObject *obj, objects) {
if (obj != open_object)
obj->setVisibility(0);
}
}
QString statekey;
- foreach(QAccordianObject *obj, objects) {
+ foreach(QAccordionObject *obj, objects) {
if (obj->visible) {
statekey.append("1");
} else {
@@ -259,7 +259,7 @@
int sheight = splitter->height();
int scount = splitter->count();
int found_hidden = splitter->count() + 1;
- foreach(QAccordianObject *obj, objects) {
+ foreach(QAccordionObject *obj, objects) {
if (!obj->visible) {
if (obj->idx < found_hidden) found_hidden = obj->idx;
sheight = sheight - obj->toggle->height();
@@ -271,7 +271,7 @@
}
}
}
- foreach(QAccordianObject *obj, objects) {
+ foreach(QAccordionObject *obj, objects) {
if (obj->visible) {
if (obj->idx < found_hidden && obj->idx < new_obj->idx) {
splitter->setStretchFactor(obj->idx, 0);
Modified: brlcad/branches/qtged/src/qged/QAccordionWidget.h
===================================================================
--- brlcad/branches/qtged/src/qged/QAccordionWidget.h 2020-06-21 14:53:30 UTC
(rev 76170)
+++ brlcad/branches/qtged/src/qged/QAccordionWidget.h 2020-06-21 14:58:21 UTC
(rev 76171)
@@ -1,4 +1,4 @@
-/* Q A C C O R D I A N W I D G E T . H
+/* Q A C C O R D I O N W I D G E T . H
* BRL-CAD
*
* Copyright (c) 2014 United States Government as represented by
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @file QAccordianWidget.h
+/** @file QAccordionWidget.h
*
* Provides a structured container into which tool panels or objects can be
* added and then shown or hidden with a controlling button. Can optionally
@@ -61,15 +61,15 @@
# pragma clang diagnostic pop
#endif
-class QAccordianWidget;
+class QAccordionWidget;
-class QAccordianObject : public QWidget
+class QAccordionObject : public QWidget
{
Q_OBJECT
public:
- QAccordianObject(QWidget *pparent = 0, QWidget *object = 0, QString
header_title = QString(""));
- ~QAccordianObject();
+ QAccordionObject(QWidget *pparent = 0, QWidget *object = 0, QString
header_title = QString(""));
+ ~QAccordionObject();
void setWidget(QWidget *object);
QWidget *getWidget();
void setVisibility(int val);
@@ -79,8 +79,8 @@
int idx;
signals:
- void made_visible(QAccordianObject *);
- void made_hidden(QAccordianObject *);
+ void made_visible(QAccordionObject *);
+ void made_hidden(QAccordionObject *);
public slots:
void toggleVisibility();
@@ -90,16 +90,16 @@
QWidget *child_object;
};
-class QAccordianWidget : public QWidget
+class QAccordionWidget : public QWidget
{
Q_OBJECT
public:
- QAccordianWidget(QWidget *pparent = 0);
- ~QAccordianWidget();
- void addObject(QAccordianObject *object);
- void insertObject(int idx, QAccordianObject *object);
- void deleteObject(QAccordianObject *object);
+ QAccordionWidget(QWidget *pparent = 0);
+ ~QAccordionWidget();
+ void addObject(QAccordionObject *object);
+ void insertObject(int idx, QAccordionObject *object);
+ void deleteObject(QAccordionObject *object);
void setUniqueVisibility(int val);
int count();
@@ -106,15 +106,15 @@
public slots:
void update_sizes(int, int);
- void stateUpdate(QAccordianObject *);
+ void stateUpdate(QAccordionObject *);
public:
int unique_visibility;
- QAccordianObject *open_object;
+ QAccordionObject *open_object;
QSplitter *splitter;
private:
- QSet<QAccordianObject *> objects;
+ QSet<QAccordionObject *> objects;
QMap<QString, QList<int> > size_states;
};
Modified: brlcad/branches/qtged/src/qged/TODO
===================================================================
--- brlcad/branches/qtged/src/qged/TODO 2020-06-21 14:53:30 UTC (rev 76170)
+++ brlcad/branches/qtged/src/qged/TODO 2020-06-21 14:58:21 UTC (rev 76171)
@@ -1,19 +1,63 @@
-For editing in this interface, need to have three "tool palette" objects in
the accordian on the right.
+For editing in this interface, need to have three "tool palette" objects in the
+accordion on the right.
-First one will be a view controller, with the available options for view
manipulation and reporting on the current view information. Selecting tools
from that palette puts the GUI in view manipulation (the default) and no
related object highlighting will be present in the tree. This will avoid the
work of identifying and highlighting related tree entities when no actual
editing is taking place, which is when awareness of those relationships is most
important.
+First one will be a view controller, with the available options for view
+manipulation and reporting on the current view information. Selecting tools
+from that palette puts the GUI in view manipulation (the default) and no
+related object highlighting will be present in the tree. This will avoid the
+work of identifying and highlighting related tree entities when no actual
+editing is taking place, which is when awareness of those relationships is most
+important.
-Second will be an instance editor, which will offer controls related to
manipulating a specific instance of an object in a comb. For top level
geometry this accordian object will be hidden, since by definition top level
objects are not part of any comb. For all other cases, the current selection
in the tree will inform the GUI what the parent comb of the current instance
is. This editing panel will not offer any solid editing tools, but only
manipulations possible in the comb "matrix-above-object" feature. The
highlighting, when any tool is selected in this panel, will highlight database
items using not the selected object, but the parent of the selected object -
when an instance is edited but the solid is not, only objects using the parent
comb of the instance will be impacted by changes. This will be the gui
equalivent to MGED's "oed" command, and the qbrlcad implementation of oed will
in fact have the same impact as selecting an object and activating something in
the instance edit panel.
+Second will be an instance editor, which will offer controls related to
+manipulating a specific instance of an object in a comb. For top level
+geometry this accordion object will be hidden, since by definition top level
+objects are not part of any comb. For all other cases, the current selection
+in the tree will inform the GUI what the parent comb of the current instance
+is. This editing panel will not offer any solid editing tools, but only
+manipulations possible in the comb "matrix-above-object" feature. The
+highlighting, when any tool is selected in this panel, will highlight database
+items using not the selected object, but the parent of the selected object -
+when an instance is edited but the solid is not, only objects using the parent
+comb of the instance will be impacted by changes. This will be the gui
+equalivent to MGED's "oed" command, and the qbrlcad implementation of oed will
+in fact have the same impact as selecting an object and activating something in
+the instance edit panel.
-The third will be a primitive editor, which will expose the object parameters
(tree objects a.l.a the l command for combs, and primitive parameters for
solids. When this dialog is active, the "related objects" highlighting will
identify every path that uses the primitive itself, regardless of what its
current parent is in the path. This will be equalivent to MGED's "sed"
command, and the qbrlcad implementation of sed will activate the primitive edit
panel for the specified selection (if no path is given to sed, there will be no
active selection identified in the tree and no instance edit panel show - just
the primitive panel and the "related object" highlighting in the tree. If a
selection of one of the specific instances in the tree view is made by the
user, the instance panel will appear and the highlighting on that selected
instance will change from yellow (related) to the "selected item" highlighting.
+The third will be a primitive editor, which will expose the object parameters
+(tree objects a.l.a the l command for combs, and primitive parameters for
+solids. When this dialog is active, the "related objects" highlighting will
+identify every path that uses the primitive itself, regardless of what its
+current parent is in the path. This will be equalivent to MGED's "sed"
+command, and the qbrlcad implementation of sed will activate the primitive edit
+panel for the specified selection (if no path is given to sed, there will be no
+active selection identified in the tree and no instance edit panel show - just
+the primitive panel and the "related object" highlighting in the tree. If a
+selection of one of the specific instances in the tree view is made by the
+user, the instance panel will appear and the highlighting on that selected
+instance will change from yellow (related) to the "selected item" highlighting.
-For combs, there will be a standard attributes accordian object that offers
the standard attribute keys, even if they are not set. All objects, comb and
primitive, will have a "User attributes" accordian object which will show
non-standard attributes and allow the user to add, delete and edit such
attributes.
+For combs, there will be a standard attributes accordion object that offers the
+standard attribute keys, even if they are not set. All objects, comb and
+primitive, will have a "User attributes" accordion object which will show
+non-standard attributes and allow the user to add, delete and edit such
+attributes.
-The per-solid toolboxes will have most of the custom tools and logic - many
(such as the facetize and brep conversion tools) will be common to most solids,
but some (like bot sync, bot flip, etc.) will be very specific to individual
object types.
+The per-solid toolboxes will have most of the custom tools and logic - many
+(such as the facetize and brep conversion tools) will be common to most solids,
+but some (like bot sync, bot flip, etc.) will be very specific to individual
+object types.
-Will need to think about how to handle multi-object selection - in theory, if
all selected objects are of a single type, a subset of the tool box might be
applicable in "batch" mode - for example, selecting all bots and running sync
on them. Such selections could be achieved with the select command, which is
another command that would benefit from having the option to use search
filters... The way to handle that may be to flag tools in the various
toolboxes as "safe" for multi-selection scenarios... have to think about that.
+Will need to think about how to handle multi-object selection - in theory, if
+all selected objects are of a single type, a subset of the tool box might be
+applicable in "batch" mode - for example, selecting all bots and running sync
+on them. Such selections could be achieved with the select command, which is
+another command that would benefit from having the option to use search
+filters... The way to handle that may be to flag tools in the various
+toolboxes as "safe" for multi-selection scenarios... have to think about that.
The "Esc" character should always return the application to view manipulation
mode.
Modified: brlcad/branches/qtged/src/qged/cadaccordion.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/cadaccordion.cxx 2020-06-21 14:53:30 UTC
(rev 76170)
+++ brlcad/branches/qtged/src/qged/cadaccordion.cxx 2020-06-21 14:58:21 UTC
(rev 76171)
@@ -1,4 +1,4 @@
-#include "cadaccordian.h"
+#include "cadaccordion.h"
#include "cadapp.h"
#include <QPalette>
#include <QColor>
@@ -95,19 +95,19 @@
bool EditStateFilter::eventFilter(QObject *target, QEvent *e)
{
int interaction_mode = ((CADApp *)qApp)->interaction_mode;
- CADAccordian *accordian = ((CADApp *)qApp)->cadaccordian;
+ CADAccordion *accordion = ((CADApp *)qApp)->cadaccordion;
if (e->type() == QEvent::MouseButtonPress) {
QMouseEvent *me = (QMouseEvent *)e;
QWidget *target_widget = static_cast<QWidget *>(target);
- QPoint mpos = target_widget->mapTo(accordian, me->pos());
+ QPoint mpos = target_widget->mapTo(accordion, me->pos());
- for (int i = 0; i < accordian->active_objects.size(); i++) {
- int margin = accordian->splitter->handleWidth()/2;
- QPushButton *obj_toggle = accordian->active_objects.at(i)->toggle;
- QPoint obj_topleft = obj_toggle->mapTo(accordian,
obj_toggle->geometry().topLeft());
+ for (int i = 0; i < accordion->active_objects.size(); i++) {
+ int margin = accordion->splitter->handleWidth()/2;
+ QPushButton *obj_toggle = accordion->active_objects.at(i)->toggle;
+ QPoint obj_topleft = obj_toggle->mapTo(accordion,
obj_toggle->geometry().topLeft());
obj_topleft.setX(obj_topleft.x() - margin);
obj_topleft.setY(obj_topleft.y() - margin);
- QPoint obj_bottomright = obj_toggle->mapTo(accordian,
obj_toggle->geometry().bottomRight());
+ QPoint obj_bottomright = obj_toggle->mapTo(accordion,
obj_toggle->geometry().bottomRight());
obj_bottomright.setX(obj_bottomright.x() + margin);
obj_bottomright.setY(obj_bottomright.y() + margin);
QRect obj_rect(obj_topleft, obj_bottomright);
@@ -116,48 +116,48 @@
}
}
- QPoint view_ctrls_topleft = accordian->view_ctrls->mapTo(accordian,
accordian->view_ctrls->geometry().topLeft());
- QPoint view_ctrls_bottomright = accordian->view_ctrls->mapTo(accordian,
accordian->view_ctrls->geometry().bottomRight());
+ QPoint view_ctrls_topleft = accordion->view_ctrls->mapTo(accordion,
accordion->view_ctrls->geometry().topLeft());
+ QPoint view_ctrls_bottomright = accordion->view_ctrls->mapTo(accordion,
accordion->view_ctrls->geometry().bottomRight());
QRect view_ctrls_rect(view_ctrls_topleft, view_ctrls_bottomright);
- QPoint instance_ctrls_topleft =
accordian->instance_ctrls->mapTo(accordian,
accordian->instance_ctrls->geometry().topLeft());
- QPoint instance_ctrls_bottomright =
accordian->instance_ctrls->mapTo(accordian,
accordian->instance_ctrls->geometry().bottomRight());
+ QPoint instance_ctrls_topleft =
accordion->instance_ctrls->mapTo(accordion,
accordion->instance_ctrls->geometry().topLeft());
+ QPoint instance_ctrls_bottomright =
accordion->instance_ctrls->mapTo(accordion,
accordion->instance_ctrls->geometry().bottomRight());
QRect instance_ctrls_rect(instance_ctrls_topleft,
instance_ctrls_bottomright);
- QPoint primitive_ctrls_topleft =
accordian->primitive_ctrls->mapTo(accordian,
accordian->primitive_ctrls->geometry().topLeft());
- QPoint primitive_ctrls_bottomright =
accordian->primitive_ctrls->mapTo(accordian,
accordian->primitive_ctrls->geometry().bottomRight());
+ QPoint primitive_ctrls_topleft =
accordion->primitive_ctrls->mapTo(accordion,
accordion->primitive_ctrls->geometry().topLeft());
+ QPoint primitive_ctrls_bottomright =
accordion->primitive_ctrls->mapTo(accordion,
accordion->primitive_ctrls->geometry().bottomRight());
QRect primitive_ctrls_rect(primitive_ctrls_topleft,
primitive_ctrls_bottomright);
- QPoint stdpropview_topleft = accordian->stdpropview->mapTo(accordian,
accordian->stdpropview->geometry().topLeft());
- QPoint stdpropview_bottomright =
accordian->stdpropview->mapTo(accordian,
accordian->stdpropview->geometry().bottomRight());
+ QPoint stdpropview_topleft = accordion->stdpropview->mapTo(accordion,
accordion->stdpropview->geometry().topLeft());
+ QPoint stdpropview_bottomright =
accordion->stdpropview->mapTo(accordion,
accordion->stdpropview->geometry().bottomRight());
QRect stdpropview_rect(stdpropview_topleft, stdpropview_bottomright);
- QPoint userpropview_topleft = accordian->userpropview->mapTo(accordian,
accordian->userpropview->geometry().topLeft());
- QPoint userpropview_bottomright =
accordian->userpropview->mapTo(accordian,
accordian->userpropview->geometry().bottomRight());
+ QPoint userpropview_topleft = accordion->userpropview->mapTo(accordion,
accordion->userpropview->geometry().topLeft());
+ QPoint userpropview_bottomright =
accordion->userpropview->mapTo(accordion,
accordion->userpropview->geometry().bottomRight());
QRect userpropview_rect(userpropview_topleft, userpropview_bottomright);
if (view_ctrls_rect.contains(mpos)) {
((CADApp *)qApp)->interaction_mode = 0;
- accordian->highlight_selected(accordian->view_obj);
+ accordion->highlight_selected(accordion->view_obj);
}
if (instance_ctrls_rect.contains(mpos)) {
((CADApp *)qApp)->interaction_mode = 1;
- accordian->highlight_selected(accordian->instance_obj);
+ accordion->highlight_selected(accordion->instance_obj);
}
if (primitive_ctrls_rect.contains(mpos)) {
((CADApp *)qApp)->interaction_mode = 2;
- accordian->highlight_selected(accordian->primitive_obj);
+ accordion->highlight_selected(accordion->primitive_obj);
}
if (stdpropview_rect.contains(mpos)) {
((CADApp *)qApp)->interaction_mode = 2;
- accordian->highlight_selected(accordian->stdprop_obj);
+ accordion->highlight_selected(accordion->stdprop_obj);
}
if (userpropview_rect.contains(mpos)) {
((CADApp *)qApp)->interaction_mode = 2;
- accordian->highlight_selected(accordian->userprop_obj);
+ accordion->highlight_selected(accordion->userprop_obj);
}
CADTreeView *tview = (CADTreeView *)(((CADApp *)qApp)->cadtreeview);
@@ -172,8 +172,8 @@
}
-CADAccordian::CADAccordian(QWidget *pparent)
- : QAccordianWidget(pparent)
+CADAccordion::CADAccordion(QWidget *pparent)
+ : QAccordionWidget(pparent)
{
view_ctrls = new CADViewControls(this);
instance_ctrls = new CADInstanceEdit(this);
@@ -187,19 +187,19 @@
userpropview = new CADAttributesView(this, 0);
userpropview->setModel(userpropmodel);
- view_obj = new QAccordianObject(this, view_ctrls, "View Controls");
+ view_obj = new QAccordionObject(this, view_ctrls, "View Controls");
this->addObject(view_obj);
active_objects.push_back(view_obj);
- instance_obj = new QAccordianObject(this, instance_ctrls, "Instance
Editing");
+ instance_obj = new QAccordionObject(this, instance_ctrls, "Instance
Editing");
this->addObject(instance_obj);
active_objects.push_back(instance_obj);
- primitive_obj = new QAccordianObject(this, primitive_ctrls, "Object
Editing");
+ primitive_obj = new QAccordionObject(this, primitive_ctrls, "Object
Editing");
this->addObject(primitive_obj);
active_objects.push_back(primitive_obj);
- stdprop_obj = new QAccordianObject(this, stdpropview, "Standard
Attributes");
+ stdprop_obj = new QAccordionObject(this, stdpropview, "Standard
Attributes");
this->addObject(stdprop_obj);
active_objects.push_back(stdprop_obj);
- userprop_obj = new QAccordianObject(this, userpropview, "User Attributes");
+ userprop_obj = new QAccordionObject(this, userpropview, "User Attributes");
this->addObject(userprop_obj);
active_objects.push_back(userprop_obj);
@@ -213,7 +213,7 @@
}
void
-CADAccordian::highlight_selected(QAccordianObject *selected)
+CADAccordion::highlight_selected(QAccordionObject *selected)
{
QString highlight_style("background-color: rgb(10,10,200);");
if (view_obj == selected) {
@@ -249,7 +249,7 @@
userprop_obj->toggle->update();
}
-CADAccordian::~CADAccordian()
+CADAccordion::~CADAccordion()
{
delete view_ctrls;
delete instance_ctrls;
Modified: brlcad/branches/qtged/src/qged/cadaccordion.h
===================================================================
--- brlcad/branches/qtged/src/qged/cadaccordion.h 2020-06-21 14:53:30 UTC
(rev 76170)
+++ brlcad/branches/qtged/src/qged/cadaccordion.h 2020-06-21 14:58:21 UTC
(rev 76171)
@@ -3,7 +3,7 @@
#include "cadtreemodel.h"
#include "cadattributes.h"
#include "QToolPalette.h"
-#include "QAccordianWidget.h"
+#include "QAccordionWidget.h"
class CADViewControls : public QWidget
{
@@ -52,37 +52,37 @@
bool eventFilter(QObject *target, QEvent *e);
};
-class CADAccordian : public QAccordianWidget
+class CADAccordion : public QAccordionWidget
{
Q_OBJECT
public:
- CADAccordian(QWidget *pparent);
- ~CADAccordian();
+ CADAccordion(QWidget *pparent);
+ ~CADAccordion();
- void highlight_selected(QAccordianObject *);
+ void highlight_selected(QAccordionObject *);
CADViewControls *view_ctrls;
- QAccordianObject *view_obj;
+ QAccordionObject *view_obj;
CADInstanceEdit *instance_ctrls;
- QAccordianObject *instance_obj;
+ QAccordionObject *instance_obj;
CADPrimitiveEdit *primitive_ctrls;
- QAccordianObject *primitive_obj;
+ QAccordionObject *primitive_obj;
CADAttributesModel *stdpropmodel;
CADAttributesView *stdpropview;
- QAccordianObject *stdprop_obj;
+ QAccordionObject *stdprop_obj;
CADAttributesModel *userpropmodel;
CADAttributesView *userpropview;
- QAccordianObject *userprop_obj;
+ QAccordionObject *userprop_obj;
// Need to create the following
#if 0
CADAttributesModel *globalpropmodel;
CADAttributesView *globalpropview;
- QAccordianObject *globalprop_obj;
+ QAccordionObject *globalprop_obj;
Tools Palette (measurement, nirt, raytracing(maybe), etc.)
Primitive and procedural object creation (would be cool if we could do
a wireframe-follows-mouse thing where each click of the mouse inserted a copy
of the primitive with the current values at the specified point...)
#endif
- QVector<QAccordianObject *> active_objects;
+ QVector<QAccordionObject *> active_objects;
};
#endif /* CADACCORDIAN_H */
Modified: brlcad/branches/qtged/src/qged/cadapp.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/cadapp.cxx 2020-06-21 14:53:30 UTC (rev
76170)
+++ brlcad/branches/qtged/src/qged/cadapp.cxx 2020-06-21 14:58:21 UTC (rev
76171)
@@ -25,7 +25,7 @@
#include "cadapp.h"
#include "cadappexec.h"
-#include "cadaccordian.h"
+#include "cadaccordion.h"
#include <QFileInfo>
#include <QFile>
#include <QPlainTextEdit>
@@ -107,7 +107,7 @@
emit db_change();
interaction_mode = 0;
- cadaccordian->highlight_selected(cadaccordian->view_obj);
+ cadaccordion->highlight_selected(cadaccordion->view_obj);
return 0;
}
Modified: brlcad/branches/qtged/src/qged/cadapp.h
===================================================================
--- brlcad/branches/qtged/src/qged/cadapp.h 2020-06-21 14:53:30 UTC (rev
76170)
+++ brlcad/branches/qtged/src/qged/cadapp.h 2020-06-21 14:58:21 UTC (rev
76171)
@@ -41,7 +41,7 @@
class CADApp;
-class CADAccordian;
+class CADAccordion;
typedef int (*gui_cmd_ptr)(QString *command_string, CADApp *app);
#define GUI_CMD_PTR_NULL ((gui_cmd_ptr)0)
@@ -69,7 +69,7 @@
struct rt_wdb *wdbp();
CADTreeView *cadtreeview;
- CADAccordian *cadaccordian;
+ CADAccordion *cadaccordion;
QModelIndex current_idx;
signals:
Modified: brlcad/branches/qtged/src/qged/main_window.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/main_window.cxx 2020-06-21 14:53:30 UTC
(rev 76170)
+++ brlcad/branches/qtged/src/qged/main_window.cxx 2020-06-21 14:58:21 UTC
(rev 76171)
@@ -25,7 +25,7 @@
#include "main_window.h"
#include "cadapp.h"
-#include "cadaccordian.h"
+#include "cadaccordion.h"
BRLCAD_MainWindow::BRLCAD_MainWindow()
{
@@ -104,7 +104,7 @@
((CADApp *)qApp)->cadtreeview = (CADTreeView *)treeview;
/* Edit panel */
- panel = new CADAccordian(panel_dock);
+ panel = new CADAccordion(panel_dock);
panel_dock->setWidget(panel);
//stdpropview->setMinimumHeight(340);
@@ -112,7 +112,7 @@
//userpropview->setMinimumHeight(340);
QObject::connect(treeview, SIGNAL(clicked(const QModelIndex &)),
panel->userpropmodel, SLOT(refresh(const QModelIndex &)));
- ((CADApp *)qApp)->cadaccordian= (CADAccordian *)panel;
+ ((CADApp *)qApp)->cadaccordion= (CADAccordion *)panel;
/* For testing - don't want uniqueness here, but may need or want it
elsewhere */
//panel->setUniqueVisibility(1);
Modified: brlcad/branches/qtged/src/qged/main_window.h
===================================================================
--- brlcad/branches/qtged/src/qged/main_window.h 2020-06-21 14:53:30 UTC
(rev 76170)
+++ brlcad/branches/qtged/src/qged/main_window.h 2020-06-21 14:58:21 UTC
(rev 76171)
@@ -73,7 +73,7 @@
#include "cadconsole.h"
#include "cadtreemodel.h"
-#include "cadaccordian.h"
+#include "cadaccordion.h"
class BRLCAD_MainWindow : public QMainWindow
{
@@ -100,7 +100,7 @@
CADConsole *console;
CADTreeModel *treemodel;
QTreeView *treeview;
- CADAccordian *panel;
+ CADAccordion *panel;
QString db_file;
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
