From b30c4e868c784a4c51ecde004d28d164e7cea5f5 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 27 May 2005 21:34:54 +0000
Subject: [PATCH] add num of physical groups in stat window
---
Fltk/GUI.cpp | 4 +++-
Makefile | 6 +++---
Mesh/Generator.cpp | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 36236474a9..e357d195e0 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.439 2005-04-28 14:53:13 geuzaine Exp $
+// $Id: GUI.cpp,v 1.440 2005-05-27 21:34:53 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -3312,6 +3312,7 @@ void GUI::create_statistics_window()
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 2 * BH, IW, BH, "Lines");
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 3 * BH, IW, BH, "Surfaces");
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 4 * BH, IW, BH, "Volumes");
+ stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 5 * BH, IW, BH, "Physical groups");
o->end();
}
{
@@ -3398,6 +3399,7 @@ void GUI::set_statistics()
sprintf(label[num], "%g", s[1]); stat_value[num]->value(label[num]); num++;
sprintf(label[num], "%g", s[2]); stat_value[num]->value(label[num]); num++;
sprintf(label[num], "%g", s[3]); stat_value[num]->value(label[num]); num++;
+ sprintf(label[num], "%g", s[45]); stat_value[num]->value(label[num]); num++;
// mesh
sprintf(label[num], "%g", s[4]); stat_value[num]->value(label[num]); num++;
diff --git a/Makefile b/Makefile
index d3e4d30873..5d5c867a78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.390 2005-03-15 15:37:27 geuzaine Exp $
+# $Id: Makefile,v 1.391 2005-05-27 21:34:53 geuzaine Exp $
#
# Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
#
@@ -22,8 +22,8 @@
include variables
GMSH_MAJOR_VERSION = 1
-GMSH_MINOR_VERSION = 60
-GMSH_PATCH_VERSION = 1
+GMSH_MINOR_VERSION = 61
+GMSH_PATCH_VERSION = 0
GMSH_EXTRA_VERSION = "-cvs"
GMSH_VERSION = ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}${GMSH_EXTRA_VERSION}
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 2c75047b20..063b0ea56d 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,4 +1,4 @@
-// $Id: Generator.cpp,v 1.65 2005-05-21 04:55:59 geuzaine Exp $
+// $Id: Generator.cpp,v 1.66 2005-05-27 21:34:54 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -51,6 +51,7 @@ void GetStatistics(double stat[50])
stat[1] = Tree_Nbr(THEM->Curves);
stat[2] = Tree_Nbr(THEM->Surfaces);
stat[3] = Tree_Nbr(THEM->Volumes);
+ stat[45] = List_Nbr(THEM->PhysicalGroups);
stat[4] = 0.;
if(Tree_Nbr(THEM->Curves)) {
--
GitLab