Revision: 76933
http://sourceforge.net/p/brlcad/code/76933
Author: starseeker
Date: 2020-08-24 22:22:51 +0000 (Mon, 24 Aug 2020)
Log Message:
-----------
dmlp->m_dmp
Modified Paths:
--------------
brlcad/trunk/src/mged/adc.c
brlcad/trunk/src/mged/axes.c
brlcad/trunk/src/mged/buttons.c
brlcad/trunk/src/mged/chgview.c
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/mged/color_scheme.c
brlcad/trunk/src/mged/edsol.c
brlcad/trunk/src/mged/grid.c
brlcad/trunk/src/mged/rect.c
brlcad/trunk/src/mged/set.c
Modified: brlcad/trunk/src/mged/adc.c
===================================================================
--- brlcad/trunk/src/mged/adc.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/adc.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -76,11 +76,11 @@
void
adc_set_dirty_flag(void)
{
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_adc_state == adc_state)
- dmlp->dm_dirty = 1;
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_adc_state == adc_state)
+ m_dmp->dm_dirty = 1;
}
@@ -87,19 +87,19 @@
void
adc_set_scroll(void)
{
- struct mged_dm *dmlp;
- struct mged_dm *save_dmlp;
+ struct mged_dm *m_dmp;
+ struct mged_dm *save_m_dmp;
- save_dmlp = mged_curr_dm;
+ save_m_dmp = mged_curr_dm;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_adc_state == adc_state) {
- set_curr_dm(dmlp);
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_adc_state == adc_state) {
+ set_curr_dm(m_dmp);
set_scroll();
DMP_dirty = 1;
}
- set_curr_dm(save_dmlp);
+ set_curr_dm(save_m_dmp);
}
Modified: brlcad/trunk/src/mged/axes.c
===================================================================
--- brlcad/trunk/src/mged/axes.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/axes.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -85,11 +85,11 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_axes_state == axes_state)
- dmlp->dm_dirty = 1;
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_axes_state == axes_state)
+ m_dmp->dm_dirty = 1;
}
Modified: brlcad/trunk/src/mged/buttons.c
===================================================================
--- brlcad/trunk/src/mged/buttons.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/buttons.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -704,7 +704,7 @@
int
be_accept()
{
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
if (STATE == ST_S_EDIT) {
/* Accept a solid edit */
@@ -740,9 +740,9 @@
return TCL_OK;
}
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_mged_variables->mv_transform == 'e')
- dmlp->dm_mged_variables->mv_transform = 'v';
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_mged_variables->mv_transform == 'e')
+ m_dmp->dm_mged_variables->mv_transform = 'v';
{
struct bu_vls vls = BU_VLS_INIT_ZERO;
@@ -758,7 +758,7 @@
int
be_reject()
{
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
update_views = 1;
@@ -804,9 +804,9 @@
mged_color_soltab();
(void)chg_state(STATE, ST_VIEW, "Edit Reject");
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_mged_variables->mv_transform == 'e')
- dmlp->dm_mged_variables->mv_transform = 'v';
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_mged_variables->mv_transform == 'e')
+ m_dmp->dm_mged_variables->mv_transform = 'v';
{
struct bu_vls vls = BU_VLS_INIT_ZERO;
Modified: brlcad/trunk/src/mged/chgview.c
===================================================================
--- brlcad/trunk/src/mged/chgview.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/chgview.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -246,8 +246,8 @@
{
struct display_list *gdlp;
struct display_list *next_gdlp;
- struct mged_dm *dmlp;
- struct mged_dm *save_dmlp;
+ struct mged_dm *m_dmp;
+ struct mged_dm *save_m_dmp;
struct cmd_list *save_cmd_list;
int ret;
int initial_blank_screen = 1;
@@ -442,12 +442,12 @@
/* update and resize the views */
- save_dmlp = mged_curr_dm;
+ save_m_dmp = mged_curr_dm;
save_cmd_list = curr_cmd_list;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l) {
int non_empty = 0; /* start out empty */
- set_curr_dm(dmlp);
+ set_curr_dm(m_dmp);
if (mged_curr_dm->dm_tie) {
curr_cmd_list = mged_curr_dm->dm_tie;
@@ -487,7 +487,7 @@
}
}
- set_curr_dm(save_dmlp);
+ set_curr_dm(save_m_dmp);
curr_cmd_list = save_cmd_list;
GEDP->ged_gvp = view_state->vs_gvp;
@@ -570,8 +570,8 @@
int
cmd_autoview(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc,
const char *argv[])
{
- struct mged_dm *dmlp;
- struct mged_dm *save_dmlp;
+ struct mged_dm *m_dmp;
+ struct mged_dm *save_m_dmp;
struct cmd_list *save_cmd_list;
if (argc > 2) {
@@ -589,12 +589,12 @@
return TCL_OK;
}
- save_dmlp = mged_curr_dm;
+ save_m_dmp = mged_curr_dm;
save_cmd_list = curr_cmd_list;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l) {
struct view_ring *vrp;
- set_curr_dm(dmlp);
+ set_curr_dm(m_dmp);
if (mged_curr_dm->dm_tie) {
curr_cmd_list = mged_curr_dm->dm_tie;
@@ -626,7 +626,7 @@
vrp->vr_scale = view_state->vs_gvp->gv_scale;
}
}
- set_curr_dm(save_dmlp);
+ set_curr_dm(save_m_dmp);
curr_cmd_list = save_cmd_list;
GEDP->ged_gvp = view_state->vs_gvp;
@@ -2815,7 +2815,7 @@
f_svbase(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc, const
char *argv[])
{
int status;
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
if (argc < 1 || 1 < argc) {
struct bu_vls vls = BU_VLS_INIT_ZERO;
@@ -2833,12 +2833,12 @@
status = mged_svbase();
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l) {
/* if sharing view while faceplate and original gui (i.e. button menu,
sliders) are on */
- if (dmlp->dm_view_state == view_state &&
- dmlp->dm_mged_variables->mv_faceplate &&
- dmlp->dm_mged_variables->mv_orig_gui) {
- dmlp->dm_dirty = 1;
+ if (m_dmp->dm_view_state == view_state &&
+ m_dmp->dm_mged_variables->mv_faceplate &&
+ m_dmp->dm_mged_variables->mv_orig_gui) {
+ m_dmp->dm_dirty = 1;
}
}
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/cmd.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -1828,15 +1828,15 @@
return TCL_ERROR;
/* update and resize the views */
- struct mged_dm *save_dmlp = mged_curr_dm;
+ struct mged_dm *save_m_dmp = mged_curr_dm;
struct cmd_list *save_cmd_list = curr_cmd_list;
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
struct display_list *gdlp;
struct display_list *next_gdlp;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l) {
int non_empty = 0; /* start out empty */
- set_curr_dm(dmlp);
+ set_curr_dm(m_dmp);
if (mged_curr_dm->dm_tie) {
curr_cmd_list = mged_curr_dm->dm_tie;
@@ -1875,7 +1875,7 @@
}
}
- set_curr_dm(save_dmlp);
+ set_curr_dm(save_m_dmp);
curr_cmd_list = save_cmd_list;
GEDP->ged_gvp = view_state->vs_gvp;
Modified: brlcad/trunk/src/mged/color_scheme.c
===================================================================
--- brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:21:14 UTC (rev
76932)
+++ brlcad/trunk/src/mged/color_scheme.c 2020-08-24 22:22:51 UTC (rev
76933)
@@ -243,11 +243,11 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_color_scheme == color_scheme)
- dmlp->dm_dirty = 1;
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_color_scheme == color_scheme)
+ m_dmp->dm_dirty = 1;
}
@@ -286,8 +286,8 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct mged_dm *dmlp;
- struct mged_dm *save_curr_dmlp = mged_curr_dm;
+ struct mged_dm *m_dmp;
+ struct mged_dm *save_curr_m_dmp = mged_curr_dm;
struct bu_vls vls = BU_VLS_INIT_ZERO;
bu_vls_printf(&vls, "dm bg %d %d %d",
@@ -302,16 +302,16 @@
// where we act on all dm instances. set_curr_dm
// should probably be replaced with get_next_dm
struct bview *cbv = GEDP->ged_gvp;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l) {
- if (dmlp->dm_color_scheme == color_scheme) {
- dmlp->dm_dirty = 1;
- set_curr_dm(dmlp);
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l) {
+ if (m_dmp->dm_color_scheme == color_scheme) {
+ m_dmp->dm_dirty = 1;
+ set_curr_dm(m_dmp);
Tcl_Eval(INTERP, bu_vls_addr(&vls));
}
}
bu_vls_free(&vls);
- set_curr_dm(save_curr_dmlp);
+ set_curr_dm(save_curr_m_dmp);
GEDP->ged_gvp = cbv;
}
Modified: brlcad/trunk/src/mged/edsol.c
===================================================================
--- brlcad/trunk/src/mged/edsol.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/edsol.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -750,7 +750,7 @@
set e_axes_pos and curr_e_axes_pos */
{
int i;
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
const short earb8[12][18] = earb8_edit_array;
const short earb7[12][18] = earb7_edit_array;
const short earb6[10][18] = earb6_edit_array;
@@ -920,8 +920,8 @@
MAT_IDN(acc_rot_sol);
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- dmlp->dm_mged_variables->mv_transform = 'e';
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ m_dmp->dm_mged_variables->mv_transform = 'e';
}
}
Modified: brlcad/trunk/src/mged/grid.c
===================================================================
--- brlcad/trunk/src/mged/grid.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/grid.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -77,11 +77,11 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_grid_state == grid_state)
- dmlp->dm_dirty = 1;
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_grid_state == grid_state)
+ m_dmp->dm_dirty = 1;
}
Modified: brlcad/trunk/src/mged/rect.c
===================================================================
--- brlcad/trunk/src/mged/rect.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/rect.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -71,11 +71,11 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_rubber_band == rubber_band)
- dmlp->dm_dirty = 1;
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_rubber_band == rubber_band)
+ m_dmp->dm_dirty = 1;
}
Modified: brlcad/trunk/src/mged/set.c
===================================================================
--- brlcad/trunk/src/mged/set.c 2020-08-24 22:21:14 UTC (rev 76932)
+++ brlcad/trunk/src/mged/set.c 2020-08-24 22:22:51 UTC (rev 76933)
@@ -138,11 +138,11 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct mged_dm *dmlp;
+ struct mged_dm *m_dmp;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_mged_variables == mged_variables)
- dmlp->dm_dirty = 1;
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_mged_variables == mged_variables)
+ m_dmp->dm_dirty = 1;
}
@@ -306,14 +306,14 @@
const char *UNUSED(value),
void *UNUSED(data))
{
- struct mged_dm *dmlp;
- struct mged_dm *save_dmlp;
+ struct mged_dm *m_dmp;
+ struct mged_dm *save_m_dmp;
- save_dmlp = mged_curr_dm;
+ save_m_dmp = mged_curr_dm;
- FOR_ALL_DISPLAYS(dmlp, &active_dm_set.l)
- if (dmlp->dm_mged_variables == save_dmlp->dm_mged_variables) {
- set_curr_dm(dmlp);
+ FOR_ALL_DISPLAYS(m_dmp, &active_dm_set.l)
+ if (m_dmp->dm_mged_variables == save_m_dmp->dm_mged_variables) {
+ set_curr_dm(m_dmp);
if (mged_variables->mv_faceplate && mged_variables->mv_orig_gui) {
if (mged_variables->mv_sliders) /* zero slider variables */
@@ -324,7 +324,7 @@
}
}
- set_curr_dm(save_dmlp);
+ set_curr_dm(save_m_dmp);
}
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
