Skip to content

Commit d4b678b

Browse files
Charles PIGNEROLmpoudot
authored andcommitted
Fixed the management of groups created in the GUI group selectors. By default, a created group is kept on screen. Fixed a bug in the surface copy with offset, where the proposed group names were volumes and not surfaces.
1 parent 01c264f commit d4b678b

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

src/QtComponents/QtGeomEntityCopyByOffsetAction.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ QtGeomEntityCopyByOffsetPanel::QtGeomEntityCopyByOffsetPanel (
6666
layout->addWidget (label);
6767

6868
// Nom groupe :
69-
_namePanel = new QtMgx3DGroupNamePanel (this, "Groupe", mainWindow, 3, QtMgx3DGroupNamePanel::CREATION, "");
69+
_namePanel = new QtMgx3DGroupNamePanel (this, "Groupe", mainWindow, 2, QtMgx3DGroupNamePanel::CREATION, "");
7070
layout->addWidget (_namePanel);
7171
addValidatedField (*_namePanel);
7272

@@ -249,6 +249,10 @@ void QtGeomEntityCopyByOffsetPanel::operationCompleted ( )
249249
COMPLETE_QT_TRY_CATCH_BLOCK (true, this, "Magix 3D")
250250

251251
QtMgx3DOperationPanel::operationCompleted ( );
252+
253+
// Actualisation des groupes (certains peuvent être créés) :
254+
if (0 != _namePanel)
255+
_namePanel->autoUpdate ( );
252256
} // QtGeomEntityCopyByOffsetPanel::operationCompleted
253257

254258

src/QtComponents/QtGeomEntityCopyOperationAction.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,10 @@ void QtGeomEntityCopyOperationPanel::operationCompleted ( )
293293
COMPLETE_QT_TRY_CATCH_BLOCK (true, this, "Magix 3D")
294294

295295
QtMgx3DOperationPanel::operationCompleted ( );
296+
297+
// Actualisation des groupes (certains peuvent être créés) :
298+
if (0 != _namePanel)
299+
_namePanel->autoUpdate ( );
296300
} // QtGeomEntityCopyOperationPanel::operationCompleted
297301

298302

src/QtComponents/QtGeomSurfaceCreationAction.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,20 +289,21 @@ void QtGeomSurfaceCreationPanel::operationCompleted ( )
289289

290290
// Actualisation des groupes : certains peuvent être créés, d'autres
291291
// détruits (ex : "Hors Groupes 3D" :
292-
// if (0 != _namePanel)
293-
// _namePanel->autoUpdate ( );
292+
if (0 != _namePanel)
293+
_namePanel->autoUpdate ( );
294294
} // QtGeomSurfaceCreationPanel::operationCompleted
295295

296296

297297
void QtGeomSurfaceCreationPanel::dimensionsModifiedCallback ( )
298298
{
299299
BEGIN_QT_TRY_CATCH_BLOCK
300300

301+
/* S'agissant de création de surface on reste en dimension 2 !
301302
if (0 != _namePanel)
302303
{
303304
_namePanel->setDimension (getDimension ( ));
304305
_namePanel->autoUpdate ( );
305-
} // if (0 != _namePanel)
306+
} // if (0 != _namePanel) */
306307

307308
COMPLETE_QT_TRY_CATCH_BLOCK (true, this, "Magix 3D")
308309
} // QtGeomSurfaceCreationPanel::dimensionsModifiedCallback

src/QtComponents/QtMgx3DGroupNamePanel.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,10 @@ void QtMgx3DGroupNamePanel::validate ( )
192192
} // QtMgx3DGroupNamePanel::validate
193193

194194

195+
/* Juin 2025 : Il est décidé de laisser affiché le dernier nom de groupe sélectionné dans les panneaux.
196+
* => #define AUTO_UPDATE_OLD_SCHEME 1
197+
*/
198+
#define AUTO_UPDATE_OLD_SCHEME 1
195199
void QtMgx3DGroupNamePanel::autoUpdate ( )
196200
{
197201
CHECK_NULL_PTR_ERROR (_nameComboBox)

0 commit comments

Comments
 (0)