From 8606805252362caea2274a0fe99ecf46edfef3de Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Wed, 2 Nov 2022 16:49:55 +0100 Subject: [PATCH] Improve Top-ii-Vol dialog box layout And add CEA to copyright --- .../TopIIVolMeshPlug/TopIIVolMeshMonitor.py | 2 +- .../TopIIVolMeshPluginDialog.py | 3 +- .../TopIIVolMeshPluginDialog.ui | 845 ++++++++---------- .../TopIIVolMeshPlugin_plugin.py | 2 +- 4 files changed, 391 insertions(+), 461 deletions(-) diff --git a/src/Tools/TopIIVolMeshPlug/TopIIVolMeshMonitor.py b/src/Tools/TopIIVolMeshPlug/TopIIVolMeshMonitor.py index e3ff5076c..29508910f 100644 --- a/src/Tools/TopIIVolMeshPlug/TopIIVolMeshMonitor.py +++ b/src/Tools/TopIIVolMeshPlug/TopIIVolMeshMonitor.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2013-2022 EDF R&D +# Copyright (C) 2013-2022 CEA/DES, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPluginDialog.py b/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPluginDialog.py index 73b5fc7d2..4e370d04e 100644 --- a/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPluginDialog.py +++ b/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPluginDialog.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2013-2022 EDF R&D +# Copyright (C) 2013-2022 CEA/DES, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -60,7 +60,6 @@ class TopIIVolMeshPluginDialog(Ui_TopIIVolMeshMainFrame,QWidget): self.qleTmpDir.setText(os.path.join('/tmp',getpass.getuser(),'top-ii-vol')) except: self.qleTmpDir.setText('/tmp') - self.resize(800, 500) self.outputMesh = '' def OnQpbHelpClicked(self): diff --git a/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPluginDialog.ui b/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPluginDialog.ui index c148582f6..b046f0eb5 100644 --- a/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPluginDialog.ui +++ b/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPluginDialog.ui @@ -6,469 +6,400 @@ 0 0 - 780 - 411 + 663 + 298 Tetra Mesh from cloud of xyz points mesh generator - - - - 10 - 10 - 761 - 101 - - - - - 10 - - - - Input Mesh - - - - - 10 - 50 - 151 - 31 - - - - - 10 - - - - DEM input file - - - - 18 - 18 - - - - - - - 170 - 50 - 531 - 31 - - - - - 10 - - - - - - - - 10 - 120 - 761 - 231 - - - - Options - - - - - 10 - 30 - 62 - 22 - - - - 0 - - - 999999999 - - - 10 - - - - - - 80 - 30 - 201 - 20 - - - - Number of points in X direction - - - - - - 10 - 70 - 62 - 22 - - - - 0 - - - 999999999 - - - 10 - - - - - - 10 - 110 - 62 - 22 - - - - 0 - - - 999999999 - - - 10 - - - - - - 80 - 70 - 211 - 20 - - - - Number of points in Y direction - - - - - - 80 - 110 - 211 - 20 - - - - Number of points in Z direction - - - - - - 10 - 150 - 62 - 22 - - - - -999999999 - - - 999999999 - - - 0 - - - - - - 80 - 150 - 201 - 20 - - - - Depth in Z direction - - - - - - 630 - 30 - 91 - 21 - - - - - - - - - - 370 - 30 - 151 - 16 - - - - Number of processors - - - - - - 660 - 30 - 101 - 16 - - - - Distributed - - - - - - 370 - 70 - 261 - 16 - - - - Number of partitions in X direction - - - - - - 370 - 110 - 251 - 16 - - - - Number of partitions in Y direction - - - - - - 370 - 150 - 251 - 16 - - - - Number of partitions in Z direction - - - - - - 300 - 30 - 62 - 22 - - - - 0 - - - 999999999 - - - 1 - - - - - - 300 - 70 - 62 - 22 - - - - 0 - - - 999999999 - - - 1 - - - - - - 300 - 110 - 62 - 22 - - - - 0 - - - 999999999 - - - 1 - - - - - - 300 - 150 - 62 - 22 - - - - 0 - - - 999999999 - - - 1 - - - - - - 10 - 200 - 611 - 23 - - - - - - - - - - 10 - 180 - 391 - 16 - - - - Workspace - - - - - - 630 - 70 - 91 - 21 - - - - - - - - - - 660 - 70 - 101 - 16 - - - - Display mesh - - - - - - - 10 - 370 - 761 - 27 - - - - - - - Compute - - - - - - - Close - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 10 - - - - Help - - - - - + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 10 + + + + Input Mesh + + + + + + + 10 + + + + + + + + + 10 + + + + DEM input file + + + + 18 + 18 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Compute + + + + + + + Close + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 10 + + + + Help + + + + + + + + + Options + + + + + + 0 + + + 999999999 + + + 10 + + + + + + + Number of points in X direction + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + Distributed + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 0 + + + 999999999 + + + 1 + + + + + + + Number of processors + + + + + + + Qt::Horizontal + + + + 45 + 20 + + + + + + + + 0 + + + 999999999 + + + 10 + + + + + + + Number of points in Y direction + + + + + + + + + + + + + + Display mesh + + + + + + + 0 + + + 999999999 + + + 1 + + + + + + + Number of partitions in X direction + + + + + + + 0 + + + 999999999 + + + 10 + + + + + + + Number of points in Z direction + + + + + + + 0 + + + 999999999 + + + 1 + + + + + + + Number of partitions in Y direction + + + + + + + -999999999 + + + 999999999 + + + 0 + + + + + + + Depth in Z direction + + + + + + + 0 + + + 999999999 + + + 1 + + + + + + + Number of partitions in Z direction + + + + + + + Workspace + + + + + + + + 0 + 0 + + + + + + + + + + + + + qpbMeshFile + qleMeshFile + qsbXPoints + qsbYPoints + qsbZPoints + qsbDepth + qcbDistributed + qsbNBprocs + qsbXParts + qsbYParts + qsbZParts + qcbDisplayMesh + qleTmpDir + qpbCompute + qpbClose + qpbHelp + diff --git a/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPlugin_plugin.py b/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPlugin_plugin.py index a7da12718..0db8f9d3c 100644 --- a/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPlugin_plugin.py +++ b/src/Tools/TopIIVolMeshPlug/TopIIVolMeshPlugin_plugin.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2013-2022 EDF R&D +# Copyright (C) 2013-2022 CEA/DES, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public