From 49e8937ed7ae26f3796b443d5df9cbcd38e460a9 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 12 Dec 2006 01:39:15 +0000
Subject: [PATCH] prepa invert_selection + remove some debug prints
---
Fltk/GUI.cpp | 9 +++++++--
Fltk/GUI.h | 3 ++-
Fltk/Opengl.cpp | 3 ++-
Geo/GModelIO_Fourier.cpp | 10 +++++-----
Mesh/meshGFace.cpp | 6 +++---
benchmarks/2d/coin.geo | 25 +++++++++++++++++++++++++
doc/TODO | 11 ++++++++++-
7 files changed, 54 insertions(+), 13 deletions(-)
create mode 100644 benchmarks/2d/coin.geo
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 9854bd847b..e187a55e2c 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.583 2006-12-05 20:24:09 geuzaine Exp $
+// $Id: GUI.cpp,v 1.584 2006-12-12 01:39:15 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -568,6 +568,10 @@ int GUI::global_shortcuts(int event)
quit_selection = 1;
return 0; // trick: do as if we didn't use it
}
+ else if(Fl::test_shortcut('-')) {
+ invert_selection = 1;
+ return 0; // trick: do as if we didn't use it
+ }
else if(Fl::test_shortcut(FL_Escape) ||
Fl::test_shortcut(FL_META + FL_Escape) ||
Fl::test_shortcut(FL_SHIFT + FL_Escape) ||
@@ -851,7 +855,8 @@ GUI::GUI(int argc, char **argv)
// initialize selection bits
selection = ENT_NONE;
- try_selection = quit_selection = end_selection = undo_selection = 0;
+ try_selection = quit_selection = end_selection = 0;
+ undo_selection = invert_selection = 0;
for(int i = 0; i < 4; i++) try_selection_xywh[i] = 0;
// set X display
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 78499526c2..2306e381da 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -322,7 +322,8 @@ public:
void reset_clip_browser();
void update_manip_window(int force=0);
void reset_external_view_list();
- int selection, try_selection, quit_selection, end_selection, undo_selection;
+ int selection, try_selection, quit_selection, end_selection;
+ int undo_selection, invert_selection;
int try_selection_xywh[4];
};
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl.cpp
index a9dc5c38be..4ef2db1d32 100644
--- a/Fltk/Opengl.cpp
+++ b/Fltk/Opengl.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.71 2006-11-27 22:22:10 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.72 2006-12-12 01:39:15 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -205,6 +205,7 @@ char SelectEntity(int type,
WID->quit_selection = 0;
WID->end_selection = 0;
WID->undo_selection = 0;
+ WID->invert_selection = 0;
while(1) {
vertices.clear();
diff --git a/Geo/GModelIO_Fourier.cpp b/Geo/GModelIO_Fourier.cpp
index dc34de80bf..7ff9057d92 100644
--- a/Geo/GModelIO_Fourier.cpp
+++ b/Geo/GModelIO_Fourier.cpp
@@ -90,8 +90,8 @@ public:
double u = i/(double)(M - 1);
double v = j/(double)(N - 1);
GPoint p = gf->point(u, v);
- double pou;
- FM->GetPou(gf->tag(), u, v, pou);
+ double pou=1;
+ //FM->GetPou(gf->tag(), u, v, pou);
gf->mesh_vertices.push_back
(new MDataFaceVertex<double>(p.x(), p.y(), p.z(), gf, u, v, pou));
}
@@ -102,7 +102,7 @@ public:
gf->mesh_vertices[(i + 1) * N + j],
gf->mesh_vertices[(i + 1) * N + (j + 1)],
gf->mesh_vertices[i * N + (j + 1)]);
- if(FM->GetOrientation(gf->tag()) < 0) q->revert();
+ //if(FM->GetOrientation(gf->tag()) < 0) q->revert();
gf->quadrangles.push_back(q);
}
}
@@ -139,8 +139,8 @@ public:
double allPou = 0.;
for(unsigned int i = 0; i < param.size(); i++){
double u2 = param[i].second[0], v2 = param[i].second[1];
- double pou2;
- FM->GetPou(param[i].first->tag(), u2, v2, pou2);
+ double pou2=1;
+ //FM->GetPou(param[i].first->tag(), u2, v2, pou2);
allPou += pou2;
}
if(v->getData()){
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 5c57a060ac..c5e809b173 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGFace.cpp,v 1.39 2006-12-11 20:12:33 remacle Exp $
+// $Id: meshGFace.cpp,v 1.40 2006-12-12 01:39:15 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -1347,9 +1347,9 @@ bool gmsh2DMeshGeneratorPeriodic ( GFace *gf )
// delete the mesh
char name[245];
sprintf(name,"param%d.pos",gf->tag());
- outputScalarField(m->triangles, name,1);
+ //outputScalarField(m->triangles, name,1);
sprintf(name,"real%d.pos",gf->tag());
- outputScalarField(m->triangles, name,0);
+ //outputScalarField(m->triangles, name,0);
delete m;
return true;
diff --git a/benchmarks/2d/coin.geo b/benchmarks/2d/coin.geo
new file mode 100644
index 0000000000..0f596c122b
--- /dev/null
+++ b/benchmarks/2d/coin.geo
@@ -0,0 +1,25 @@
+lc = 0.1;
+
+a = 1.0;
+b = 1.0;
+h = 1.0;
+
+refine = 0.0001;
+
+Point(1) = {0, 0, 0, lc*refine};
+Point(2) = {a, 0, 0, lc} ;
+Point(3) = {0, b, 0, lc} ;
+Point(4) = {a, -h, 0, lc} ;
+Point(5) = {-h, b, 0, lc} ;
+Point(6) = {-h, -h, 0, lc} ;
+
+Line(1) = {1,3} ;
+Line(2) = {3,5} ;
+Line(3) = {5,6} ;
+Line(4) = {6,4} ;
+Line(5) = {4,2} ;
+Line(6) = {2,1} ;
+
+Line Loop(1) = {1,2,3,4,5,6} ;
+Plane Surface(1) = {1};
+
diff --git a/doc/TODO b/doc/TODO
index 38f4ac46e5..c52385f5d8 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,8 @@
-$Id: TODO,v 1.32 2006-12-03 22:11:46 geuzaine Exp $
+$Id: TODO,v 1.33 2006-12-12 01:39:15 geuzaine Exp $
+
+********************************************************************
+
+introduce Right/Left/Alternate for extruded meshes
********************************************************************
@@ -19,6 +23,11 @@ boundary contains quads
********************************************************************
+physical groups->add->line/surface: pressing '-' after/while selecting
+a surface should add it with reverse orientation?
+
+********************************************************************
+
fill transfinite_vertices in meshGFaceExtrude so that we can use
extruded+recombined surfaces to create Transfinite Volumes?
--
GitLab