From f55cc836bb313675caed11734d8de69ddd70dfc0 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 7 Apr 2016 11:04:24 +0000
Subject: [PATCH] cleanup X3D options
---
Common/Context.h | 2 +
Common/DefaultOptions.h | 9 ++
Common/Options.cpp | 28 ++++++
Common/Options.h | 4 +
Fltk/fileDialogs.cpp | 131 ++++++++++++++-------------
Post/PView.cpp | 7 +-
Post/PView.h | 25 +-----
Post/PViewData.h | 6 +-
Post/PViewDataGModel.cpp | 41 ++++-----
Post/PViewX3D.cpp | 185 ++++++++++++++++++++++++++-------------
Post/PViewX3D.h | 60 +++++--------
11 files changed, 282 insertions(+), 216 deletions(-)
diff --git a/Common/Context.h b/Common/Context.h
index 5fc86f059e..1d0dfe9642 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -278,6 +278,8 @@ class CTX {
double parameter, parameterFirst, parameterLast, parameterSteps;
int pgfTwoDim, pgfExportAxis, pgfHorizBar;
std::string parameterCommand;
+ int x3dCompatibility, x3dRemoveInnerBorders;
+ double x3dPrecision, x3dTransparency;
} print;
// color options
struct{
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index b0f629d6fd..cbd822f4c0 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1755,6 +1755,15 @@ StringXNumber PrintOptions_Number[] = {
{ F|O, "Text" , opt_print_text , 1. ,
"Print text strings?" },
+ { F|O, "X3dCompatibility" , opt_print_x3d_compatibility, 0. ,
+ "Produce highliy compatible X3D output (no scale bar)" },
+ { F|O, "X3dPrecision" , opt_print_x3d_precision , 1.e-9 ,
+ "Precision of X3D output" },
+ { F|O, "X3dRemoveInnerBorders" , opt_print_x3d_remove_inner_borders , 0. ,
+ "Remove inner borders in X3D output" },
+ { F|O, "X3dTransparency" , opt_print_x3d_transparency , 0. ,
+ "Transparency for X3D output" },
+
{ F|O, "Width" , opt_print_width , -1. ,
"Width of printed image; use (possibly scaled) current width if < 0)" },
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 854257eb66..090971edf0 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -9265,6 +9265,34 @@ double opt_print_parameter_steps(OPT_ARGS_NUM)
return CTX::instance()->print.parameterSteps;
}
+double opt_print_x3d_compatibility(OPT_ARGS_NUM)
+{
+ if(action & GMSH_SET)
+ CTX::instance()->print.x3dCompatibility = (int)val;
+ return CTX::instance()->print.x3dCompatibility;
+}
+
+double opt_print_x3d_transparency(OPT_ARGS_NUM)
+{
+ if(action & GMSH_SET)
+ CTX::instance()->print.x3dTransparency = val;
+ return CTX::instance()->print.x3dTransparency;
+}
+
+double opt_print_x3d_remove_inner_borders(OPT_ARGS_NUM)
+{
+ if(action & GMSH_SET)
+ CTX::instance()->print.x3dRemoveInnerBorders = (int)val;
+ return CTX::instance()->print.x3dRemoveInnerBorders;
+}
+
+double opt_print_x3d_precision(OPT_ARGS_NUM)
+{
+ if(action & GMSH_SET)
+ CTX::instance()->print.x3dPrecision = val;
+ return CTX::instance()->print.x3dPrecision;
+}
+
// Color option routines
#if defined(HAVE_FLTK)
diff --git a/Common/Options.h b/Common/Options.h
index a905474248..53f7896770 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -732,6 +732,10 @@ double opt_print_parameter(OPT_ARGS_NUM);
double opt_print_parameter_first(OPT_ARGS_NUM);
double opt_print_parameter_last(OPT_ARGS_NUM);
double opt_print_parameter_steps(OPT_ARGS_NUM);
+double opt_print_x3d_compatibility(OPT_ARGS_NUM);
+double opt_print_x3d_transparency(OPT_ARGS_NUM);
+double opt_print_x3d_remove_inner_borders(OPT_ARGS_NUM);
+double opt_print_x3d_precision(OPT_ARGS_NUM);
// COLORS
diff --git a/Fltk/fileDialogs.cpp b/Fltk/fileDialogs.cpp
index 2f91a14127..cedc9cbde5 100644
--- a/Fltk/fileDialogs.cpp
+++ b/Fltk/fileDialogs.cpp
@@ -1414,8 +1414,9 @@ int posFileDialog(const char *name)
return 0;
}
-static void _saveAdaptedViews(const std::string &name, int useDefaultName, int which, bool isBinary,
- int adaptLev, double adaptErr, int npart, bool canAppend)
+static void _saveAdaptedViews(const std::string &name, int useDefaultName, int which,
+ bool isBinary, int adaptLev, double adaptErr, int npart,
+ bool canAppend)
{
if(PView::list.empty()){
Msg::Error("No views to save");
@@ -1426,7 +1427,8 @@ static void _saveAdaptedViews(const std::string &name, int useDefaultName, int w
Msg::Info("No or invalid current view: saving View[0]");
iview = 0;
}
- PView::list[iview]->writeAdapt(name, useDefaultName, isBinary, adaptLev, adaptErr, npart);
+ PView::list[iview]->writeAdapt(name, useDefaultName, isBinary, adaptLev,
+ adaptErr, npart);
}
else if(which == 1){
int numVisible = 0;
@@ -1446,7 +1448,7 @@ static void _saveAdaptedViews(const std::string &name, int useDefaultName, int w
os << "_" << i;
fileName += os.str();
}
- PView::list[i]->writeAdapt(fileName, useDefaultName, isBinary, adaptLev, adaptErr,
+ PView::list[i]->writeAdapt(fileName, useDefaultName, isBinary, adaptLev, adaptErr,
npart, first ? false : canAppend);
first = false;
}
@@ -1461,7 +1463,7 @@ static void _saveAdaptedViews(const std::string &name, int useDefaultName, int w
os << "_" << i;
fileName += os.str();
}
- PView::list[i]->writeAdapt(fileName, useDefaultName, isBinary, adaptLev, adaptErr,
+ PView::list[i]->writeAdapt(fileName, useDefaultName, isBinary, adaptLev, adaptErr,
npart, i ? canAppend : false);
}
}
@@ -1477,7 +1479,7 @@ int pvtuAdaptFileDialog(const char *name)
Fl_Check_Button *defautName;
};
static _pvtuAdaptFileDialog *dialog = NULL;
-
+
static Fl_Menu_Item viewmenu[] = {
{"Current", 0, 0, 0},
{"Visible", 0, 0, 0},
@@ -1489,58 +1491,61 @@ int pvtuAdaptFileDialog(const char *name)
{"ASCII", 0, 0, 0},
{0}
};
-
+
int BBB = BB + 9; // labels too long
-
+
if(!dialog){
dialog = new _pvtuAdaptFileDialog;
- int h = 3 * WB + 3 * BH, w = 2 * BBB + 3 * WB, y = WB;
- dialog->window = new Fl_Double_Window(2*w, 2.5*h, "Adaptive View Options"); //FIXME: dimensions of the window
+ int h = 7 * BH + 3 * WB, w = w = 2 * BBB + 3 * WB, y = WB;
+ dialog->window = new Fl_Double_Window(w, h, "Adaptive View Options");
dialog->window->box(GMSH_WINDOW_BOX);
dialog->window->set_modal();
- dialog->c[0] = new Fl_Choice(WB, y, BBB + BBB / 2, BH, "View(s)"); y += BH;
+ dialog->c[0] = new Fl_Choice(WB, y, BB, BH, "View(s)"); y += BH;
dialog->c[0]->menu(viewmenu);
dialog->c[0]->align(FL_ALIGN_RIGHT);
- dialog->c[1] = new Fl_Choice(WB, y, BBB + BBB / 2, BH, "Format"); y += BH;
+ dialog->c[1] = new Fl_Choice(WB, y, BB, BH, "Format"); y += BH;
dialog->c[1]->menu(formatmenu);
dialog->c[1]->align(FL_ALIGN_RIGHT);
-
- dialog->vi[0] = new Fl_Value_Input(WB, y, BBB + BBB / 2, BH, "Adaptive recursion level"); y += BH;
+
+ dialog->vi[0] = new Fl_Value_Input
+ (WB, y, BB, BH, "Recursion level"); y += BH;
dialog->vi[0]->align(FL_ALIGN_RIGHT);
dialog->vi[0]->minimum(0);
dialog->vi[0]->maximum(6);
dialog->vi[0]->step(1);
dialog->vi[0]->value(1);
dialog->vi[0]->when(FL_WHEN_RELEASE);
-
- dialog->vi[1] = new Fl_Value_Input(WB, y, BBB + BBB / 2, BH, "Target error"); y += BH;
+
+ dialog->vi[1] = new Fl_Value_Input
+ (WB, y, BB, BH, "Target error"); y += BH;
dialog->vi[1]->align(FL_ALIGN_RIGHT);
dialog->vi[1]->minimum(-1.e-4);
dialog->vi[1]->maximum(0.1);
dialog->vi[1]->step(1.e-4);
dialog->vi[1]->value(-1.e-4);
dialog->vi[1]->when(FL_WHEN_RELEASE);
-
- dialog->vi[2] = new Fl_Value_Input(WB, y, BBB + BBB / 2, BH, "Number of viz parts"); y += BH;
+
+ dialog->vi[2] = new Fl_Value_Input
+ (WB, y, BB, BH, "Number of parts"); y += BH;
dialog->vi[2]->align(FL_ALIGN_RIGHT);
dialog->vi[2]->minimum(1);
dialog->vi[2]->maximum(262144);
dialog->vi[2]->step(1);
dialog->vi[2]->value(4);
dialog->vi[2]->when(FL_WHEN_RELEASE);
-
- dialog->defautName = new Fl_Check_Button(WB, y, BBB + BBB / 2, BH, "Use default filename (recommended)"); y += BH;
+
+ dialog->defautName = new Fl_Check_Button
+ (WB, y, w - 2 * WB, BH, "Use default filename"); y += BH;
dialog->defautName->value(1);
-
-
+
dialog->ok = new Fl_Return_Button(WB, y + WB, BBB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BBB, y + WB, BBB, BH, "Cancel");
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
-
+
dialog->window->show();
-
+
while(dialog->window->shown()){
Fl::wait();
for (;;) {
@@ -1552,18 +1557,20 @@ int pvtuAdaptFileDialog(const char *name)
case 0: isBinary = true; break;
case 1: isBinary = false; break;
}
-
- // Only one view can currently be saved at a time in a pvtu file set, with a repetition of the topology structure.
- // Views/Fields can then be appended in ParaView using the AppendAttributes filter
- // bool canAppend = (format == 2) ? true : false;
-
+
+ // Only one view can currently be saved at a time in a pvtu file set,
+ // with a repetition of the topology structure. Views/Fields can then
+ // be appended in ParaView using the AppendAttributes filter bool
+ // canAppend = (format == 2) ? true : false;
+
int adaptLev = dialog->vi[0]->value();
double adaptErr = dialog->vi[1]->value();
int npart = dialog->vi[2]->value();
int useDefaultName = dialog->defautName->value();
bool canAppend = false; // Not yet implemented for VTK format here due to a tradeoff
// to limit memory consumption for high levels of adaptation
- _saveAdaptedViews(name, useDefaultName, dialog->c[0]->value(), isBinary, adaptLev, adaptErr, npart, canAppend);
+ _saveAdaptedViews(name, useDefaultName, dialog->c[0]->value(), isBinary,
+ adaptLev, adaptErr, npart, canAppend);
dialog->window->hide();
return 1;
}
@@ -1576,15 +1583,13 @@ int pvtuAdaptFileDialog(const char *name)
return 0;
}
-
int x3dViewFileDialog(const char *name, const char *title, int format)
{
struct _viewFileDialog{
Fl_Window *window;
- Fl_Choice *c[1];
- Fl_Choice *d[1];
+ Fl_Choice *c;
Fl_Value_Input *input[2];
- Fl_Check_Button *e;
+ Fl_Check_Button *e[2];
Fl_Button *ok, *cancel;
};
static _viewFileDialog *dialog = NULL;
@@ -1595,61 +1600,57 @@ int x3dViewFileDialog(const char *name, const char *title, int format)
{"All", 0, 0, 0},
{0}
};
- static Fl_Menu_Item viewmenu2[] = {
- {"Keep", 0, 0, 0},
- {"Remove", 0, 0, 0},
- {0}
- };
int BBB = BB + 9; // labels too long
if(!dialog){
dialog = new _viewFileDialog;
- int h = 7 * WB + 6 * BH, w = 2 * BBB + BBB / 3 + 12 * WB , y = WB;
+ int h = 6 * BH + 3 * WB, w = 2 * BBB + 3 * WB , y = WB;
dialog->window = new Fl_Double_Window(w, h);
dialog->window->box(GMSH_WINDOW_BOX);
dialog->window->set_modal();
- dialog->c[0] = new Fl_Choice(WB, y, BBB + BBB / 2, BH, "View(s)"); y += BH+WB;
- dialog->c[0]->menu(viewmenu);
- dialog->c[0]->align(FL_ALIGN_RIGHT);
- dialog->d[0] = new Fl_Choice(WB, y, BBB + BBB / 2, BH, "Inner Borders"); y += BH+WB;
- dialog->d[0]->menu(viewmenu2);
- dialog->d[0]->align(FL_ALIGN_RIGHT);
- dialog->input[0] = new Fl_Value_Input( WB, y, BBB + BBB / 2, BH, "Log10( Precision )");y += BH+WB;
+ dialog->c = new Fl_Choice(WB, y, BBB + BBB / 2, BH, "View(s)"); y += BH;
+ dialog->c->menu(viewmenu);
+ dialog->c->align(FL_ALIGN_RIGHT);
+ dialog->e[0] = new Fl_Check_Button(WB, y, w - 2 * WB, BH, "Remove inner borders"); y += BH;
+ dialog->e[0]->type(FL_TOGGLE_BUTTON);
+ dialog->input[0] = new Fl_Value_Input(WB, y, BB, BH, "Log10(Precision)"); y += BH;
+ dialog->input[0]->align(FL_ALIGN_RIGHT);
dialog->input[0]->minimum(-16);
dialog->input[0]->maximum(16);
dialog->input[0]->step(.25);
- dialog->input[1] = new Fl_Value_Input( WB, y, BBB + BBB / 2, BH, "Transparency");y += BH+WB;
+ dialog->input[1] = new Fl_Value_Input(WB, y, BB, BH, "Transparency"); y += BH;
+ dialog->input[1]->align(FL_ALIGN_RIGHT);
dialog->input[1]->minimum(0.);
dialog->input[1]->maximum(1.);
dialog->input[1]->step(0.05);
- dialog->e = new Fl_Check_Button (WB, y, w - 2 * WB , BH, "High compatibility (no scale bar)"); y += BH;
- dialog->ok = new Fl_Return_Button( WB , y , BBB, BH, "OK");
- dialog->cancel = new Fl_Button ( 2 * WB + BBB, y , BBB, BH, "Cancel");
+ dialog->e[1] = new Fl_Check_Button(WB, y, w - 2 * WB, BH, "High compatibility (no scale)"); y += BH;
+ dialog->e[1]->type(FL_TOGGLE_BUTTON);
+ dialog->ok = new Fl_Return_Button(WB, y + WB, BBB, BH, "OK");
+ dialog->cancel = new Fl_Button(2 * WB + BBB, y + WB, BBB, BH, "Cancel");
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
dialog->window->label(title);
dialog->window->show();
- dialog->input[0]->value( PView::getPrecisionValue() );
- dialog->input[0]->align(FL_ALIGN_RIGHT);
- dialog->input[1]->value( PView::getTransparencyValue() );
- dialog->input[1]->align(FL_ALIGN_RIGHT);
- dialog->e->type(FL_TOGGLE_BUTTON);
- dialog->e->value(PView::getX3dCompatibility() );
+
+ dialog->input[0]->value(log10(opt_print_x3d_precision(0, GMSH_GET, 0)));
+ dialog->input[1]->value(opt_print_x3d_transparency(0, GMSH_GET, 0));
+ dialog->e[0]->value(opt_print_x3d_remove_inner_borders(0, GMSH_GET, 0));
+ dialog->e[1]->value(opt_print_x3d_compatibility(0, GMSH_GET, 0));
+
while(dialog->window->shown()){
Fl::wait();
for (;;) {
Fl_Widget* o = Fl::readqueue();
if (!o) break;
if (o == dialog->ok) {
- dialog->d[0]->value()==1 ? PView::setInnerBorder(true) : PView::setInnerBorder(false) ;
- dialog->e->value()==1 ? PView::setX3dCompatibility(true) : PView::setX3dCompatibility(false) ;
- PView::setTransparencyValue( dialog->input[1]->value() );
- PView::setPrecisionValue( dialog->input[0]->value() );
-
- _saveViews(name, dialog->c[0]->value(),format, false);
+ opt_print_x3d_precision(0, GMSH_SET|GMSH_GUI, pow(10., dialog->input[0]->value()));
+ opt_print_x3d_transparency(0, GMSH_SET|GMSH_GUI, dialog->input[1]->value());
+ opt_print_x3d_remove_inner_borders(0, GMSH_SET|GMSH_GUI, dialog->e[0]->value());
+ opt_print_x3d_compatibility(0, GMSH_SET|GMSH_GUI, dialog->e[1]->value());
+ _saveViews(name, dialog->c->value(), format, false);
dialog->window->hide();
return 1;
}
@@ -1660,12 +1661,8 @@ int x3dViewFileDialog(const char *name, const char *title, int format)
}
}
return 0;
-
}
-
-
-
int genericViewFileDialog(const char *name, const char *title, int format)
{
struct _viewFileDialog{
diff --git a/Post/PView.cpp b/Post/PView.cpp
index be9e1c2954..8636b6f31b 100644
--- a/Post/PView.cpp
+++ b/Post/PView.cpp
@@ -15,14 +15,10 @@
#include "GmshMessage.h"
int PView::_globalTag = 0;
-bool PView::_removeInnerBorders = false;
-bool PView::_x3dCompatibility = false;
-double PView::_transparency=0.;
-double PView::_precision=pow(10.,-9.);
std::vector<PView*> PView::list;
+
void PView::_init(int tag)
{
- _removeInnerBorders = false;
if(tag >= 0){
_tag = tag;
_globalTag = std::max(_globalTag, _tag) + 1;
@@ -358,4 +354,3 @@ double PView::getMemoryInMb()
mem += getData()->getMemoryInMb();
return mem;
}
-
diff --git a/Post/PView.h b/Post/PView.h
index 06eef510a6..478f77c4e6 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -23,10 +23,6 @@ namespace onelab{ class localNetworkClient; }
class PView{
private:
static int _globalTag;
- // transparency in x3d output
- static double _transparency;
- // merge partitionned model in delete duplicate as common border (for x3d export)
- static bool _removeInnerBorders ;
// unique tag of the view (>= 0)
int _tag;
// index of the view in the current view list
@@ -65,19 +61,8 @@ class PView{
// default destructor
~PView();
- // precision for inner border deletion in x3d output
- static double _precision;
- static bool _x3dCompatibility;
- // get/set global tag
- static double getX3dCompatibility() { return _x3dCompatibility ; }
- static void setX3dCompatibility ( bool br){ _x3dCompatibility = br; }
- static double getTransparencyValue() { return _transparency ; }
- static void setTransparencyValue( double tr){ _transparency = tr; }
- static double getPrecisionValue() { return log10( _precision ) ; }
- static void setPrecisionValue( double pr){ _precision=pow( 10., pr) ; }
- static bool getInnerBorder() { return _removeInnerBorders; }
- static void setInnerBorder(bool tag){ _removeInnerBorders = tag; }
- static int getGlobalTag(){ return _globalTag; }
+ // set/get global tag
+ static int getGlobalTag(){ return _globalTag; }
static void setGlobalTag(int tag){ _globalTag = tag; }
// delete the vertex arrays, used to draw the view efficiently
@@ -90,8 +75,6 @@ class PView{
// get/set the view data
PViewData *getData(bool useAdaptiveIfAvailable=false);
void setData(PViewData *val){ _data = val; }
- // current drawContext
- // drawContext *_ctx;
// get the view tag (unique and immutable)
int getTag(){ return _tag; }
@@ -160,9 +143,6 @@ class PView{
// smoothed normals
smooth_normals *normals;
-
-
-
};
// this is the maximum number of nodes of elements we actually *draw*
@@ -174,5 +154,4 @@ void changeCoordinates(PView *p, int ient, int iele,
bool isElementVisible(PViewOptions *opt, int dim, int numNodes,
double **xyz);
-
#endif
diff --git a/Post/PViewData.h b/Post/PViewData.h
index 085958010d..1723b0e2fd 100644
--- a/Post/PViewData.h
+++ b/Post/PViewData.h
@@ -231,9 +231,9 @@ class PViewData {
static void removeAllInterpolationSchemes();
static void addMatrixToInterpolationScheme(const std::string &name, int type,
fullMatrix<double> &mat);
- static int getSizeInterpolationScheme() {return _interpolationSchemes.size();}
- std::string getInterpolationSchemeName() {return _interpolationSchemeName;}
- void setInterpolationSchemeName(std::string name) {_interpolationSchemeName = name;}
+ static int getSizeInterpolationScheme() { return _interpolationSchemes.size(); }
+ std::string getInterpolationSchemeName() { return _interpolationSchemeName; }
+ void setInterpolationSchemeName(std::string name) { _interpolationSchemeName = name; }
// smooth the data in the view (makes it C0)
virtual void smooth();
diff --git a/Post/PViewDataGModel.cpp b/Post/PViewDataGModel.cpp
index 4d6044ff09..bad1181db3 100644
--- a/Post/PViewDataGModel.cpp
+++ b/Post/PViewDataGModel.cpp
@@ -142,15 +142,15 @@ bool PViewDataGModel::finalize(bool computeMinMax, const std::string &interpolat
interpolationScheme.c_str());
for(interpolationMatrices::iterator it = m.begin(); it != m.end(); it++){
if(it->second.size() == 2){
- // use provided interpolation matrices for field interpolation
- // and use geometrical interpolation matrices from the mesh if
- // the mesh is curved
+ // use provided interpolation matrices for field interpolation and use
+ // geometrical interpolation matrices from the mesh if the mesh is
+ // curved
MElement *e = _getOneElementOfGivenType(model, it->first);
if(e && e->getPolynomialOrder() > 1 && e->getFunctionSpace()){
- if (it->first == TYPE_PYR) { // KH 18/9/2014 very nasty fix since pyramids /= polynomial
+ if (it->first == TYPE_PYR) { // nasty fix since pyramids /= polynomial
const pyramidalBasis *fs = (pyramidalBasis*) e->getFunctionSpace();
setInterpolationMatrices(it->first, *(it->second[0]), *(it->second[1]),
- fs->coefficients, fs->monomials);
+ fs->coefficients, fs->monomials);
}
else {
const polynomialBasis *fs = (polynomialBasis*) e->getFunctionSpace();
@@ -174,40 +174,41 @@ bool PViewDataGModel::finalize(bool computeMinMax, const std::string &interpolat
}
}
- // if we don't have interpolation matrices for a given element
- // type, assume isoparametric elements (except for ElementData,
- // for which we know the interpolation: it's constant)
+ // if we don't have interpolation matrices for a given element type, assume
+ // isoparametric elements (except for ElementData, for which we know the
+ // interpolation: it's constant)
int types[] = {TYPE_PNT, TYPE_LIN, TYPE_TRI, TYPE_QUA, TYPE_TET, TYPE_HEX,
TYPE_PRI,TYPE_PYR, TYPE_POLYG, TYPE_POLYH};
for(unsigned int i = 0; i < sizeof(types) / sizeof(types[0]); i++){
if(!haveInterpolationMatrices(types[i])){
MElement *e = _getOneElementOfGivenType(model, types[i]);
if(e){
-
- const polynomialBasis *fs = dynamic_cast<const polynomialBasis*> (e->getFunctionSpace());
+ const polynomialBasis *fs =
+ dynamic_cast<const polynomialBasis*>(e->getFunctionSpace());
if(fs){
if(e->getPolynomialOrder() > 1){
if(_type == ElementData){
// data is constant per element: force the interpolation matrix
fullMatrix<double> coef(1, 1);
- coef(0, 0) = 1.;
- fullMatrix<double> mono(1, 3);
- mono(0, 0) = 0.;
- mono(0, 1) = 0.;
- mono(0, 2) = 0.;
- setInterpolationMatrices(types[i], coef, mono,
- fs->coefficients, fs->monomials);
- }
+ coef(0, 0) = 1.;
+ fullMatrix<double> mono(1, 3);
+ mono(0, 0) = 0.;
+ mono(0, 1) = 0.;
+ mono(0, 2) = 0.;
+ setInterpolationMatrices(types[i], coef, mono,
+ fs->coefficients, fs->monomials);
+ }
else
setInterpolationMatrices(types[i],
fs->coefficients, fs->monomials,
fs->coefficients, fs->monomials);
- }
+ }
else
setInterpolationMatrices(types[i], fs->coefficients, fs->monomials);
}
else {
- const pyramidalBasis *fs = dynamic_cast<const pyramidalBasis*> (e->getFunctionSpace());
+ const pyramidalBasis *fs =
+ dynamic_cast<const pyramidalBasis*>(e->getFunctionSpace());
if(fs){
if(e->getPolynomialOrder() > 1){
if(_type == ElementData){
diff --git a/Post/PViewX3D.cpp b/Post/PViewX3D.cpp
index 4ed575c05a..3de209bcc2 100644
--- a/Post/PViewX3D.cpp
+++ b/Post/PViewX3D.cpp
@@ -8,6 +8,10 @@
// what is visible in post-processing screen.
// contact : gilles.marckmann@ec-nantes.fr
+#include <iostream>
+#include <limits>
+#include <ctime>
+#include <math.h>
#include "GmshConfig.h"
#include "GmshMessage.h"
#include "PView.h"
@@ -19,29 +23,51 @@
#include "StringUtils.h"
#include "Context.h"
#include "OS.h"
-#include <ctime>
#include "SBoundingBox3d.h"
-#include <math.h>
#include "PViewX3D.h"
-#include <iostream>
using namespace std;
+static bool almostEqual(double x, double y)
+{
+ return std::abs(x-y) < CTX::instance()->print.x3dPrecision;
+}
-bool compare_xmin_triangle (const TriangleToSort* first, const TriangleToSort* second) { return (first->xmin < second->xmin ); }
-bool compare_ymin_triangle (const TriangleToSort* first, const TriangleToSort* second) { return (first->ymin < second->ymin ); }
-bool compare_zmin_triangle (const TriangleToSort* first, const TriangleToSort* second) { return (first->zmin < second->zmin ); }
-bool compare_xmax_triangle (const TriangleToSort* first, const TriangleToSort* second) { return (first->xmax < second->xmax ); }
-bool compare_ymax_triangle (const TriangleToSort* first, const TriangleToSort* second) { return (first->ymax < second->ymax ); }
-bool compare_zmax_triangle (const TriangleToSort* first, const TriangleToSort* second) { return (first->zmax < second->zmax ); }
+bool compare_xmin_triangle(const TriangleToSort* first, const TriangleToSort* second)
+{
+ return (first->xmin < second->xmin);
+}
+bool compare_ymin_triangle(const TriangleToSort* first, const TriangleToSort* second)
+{
+ return (first->ymin < second->ymin);
+}
-bool PView::writeX3D(const std::string &fileName )
+bool compare_zmin_triangle(const TriangleToSort* first, const TriangleToSort* second)
{
+ return (first->zmin < second->zmin);
+}
- // tags duplicated triangles ---------------------
+bool compare_xmax_triangle(const TriangleToSort* first, const TriangleToSort* second)
+{
+ return (first->xmax < second->xmax );
+}
+
+bool compare_ymax_triangle(const TriangleToSort* first, const TriangleToSort* second)
+{
+ return (first->ymax < second->ymax );
+}
+
+bool compare_zmax_triangle(const TriangleToSort* first, const TriangleToSort* second)
+{
+ return (first->zmax < second->zmax );
+}
+
+bool PView::writeX3D(const std::string &fileName )
+{
+ // tags duplicated triangles
int _size=1;
- if ( PView::getInnerBorder() ) {
+ if (!CTX::instance()->print.x3dRemoveInnerBorders) {
for(unsigned int i = 0; i < PView::list.size(); i++){
VertexArray *va =PView::list[i]->va_triangles;
_size += va->getNumVertices()/3;
@@ -49,7 +75,7 @@ bool PView::writeX3D(const std::string &fileName )
}
int _count=0;
std::vector<bool> visible(_size) ;
- if ( PView::getInnerBorder() ) {
+ if (!CTX::instance()->print.x3dRemoveInnerBorders) {
// evaluate bbox of each triangle
std::list< TriangleToSort* > tlist ;
tlist.clear();
@@ -94,8 +120,12 @@ bool PView::writeX3D(const std::string &fileName )
int gip=(*pt)->_globalIndex;
while ( nt != tlist.end() && !found ) {
int gin=(*nt)->_globalIndex;
- if ( ( ( ( abs( (*pt)->xmin - (*nt)->xmin ) < 1.e-9 ) && ( abs( (*pt)->ymin - (*nt)->ymin ) < 1.e-9) ) && ( abs( (*pt)->zmin - (*nt)->zmin ) < 1.e-9 ) )
- && ( ( ( abs( (*pt)->xmax - (*nt)->xmax ) < 1.e-9 ) && ( abs( (*pt)->ymax - (*nt)->ymax ) < 1.e-9) ) && ( abs( (*pt)->zmax - (*nt)->zmax ) < 1.e-9 ) ) ) {
+ if( ( ( ( abs( (*pt)->xmin - (*nt)->xmin ) < 1.e-9 ) &&
+ ( abs( (*pt)->ymin - (*nt)->ymin ) < 1.e-9) ) &&
+ ( abs( (*pt)->zmin - (*nt)->zmin ) < 1.e-9 ) )
+ && ( ( ( abs( (*pt)->xmax - (*nt)->xmax ) < 1.e-9 ) &&
+ ( abs( (*pt)->ymax - (*nt)->ymax ) < 1.e-9) ) &&
+ ( abs( (*pt)->zmax - (*nt)->zmax ) < 1.e-9 ) ) ) {
VertexArray *van = ( (*nt)->_ppv)->va_triangles;
int in=(*nt)->_index;
float *n0 = van->getVertexArray( 3* in );
@@ -104,19 +134,40 @@ bool PView::writeX3D(const std::string &fileName )
if ( almostEqual(p0[0],n0[0]) && almostEqual(p0[1],n0[1]) && almostEqual(p0[2],n0[2]) ){
if ( almostEqual(p1[0],n1[0]) && almostEqual(p1[1],n1[1]) && almostEqual(p1[2],n1[2]) ){
- if ( almostEqual(p2[0],n2[0]) && almostEqual(p2[1],n2[1]) && almostEqual(p2[2],n2[2]) ) { found=true; } }
+ if ( almostEqual(p2[0],n2[0]) && almostEqual(p2[1],n2[1]) && almostEqual(p2[2],n2[2]) ){
+ found=true;
+ }
+ }
else if ( almostEqual(p1[0],n2[0]) && almostEqual(p1[1],n2[1]) && almostEqual(p1[2],n2[2]) ) {
- if ( almostEqual(p2[0],n1[0]) && almostEqual(p2[1],n1[1]) && almostEqual(p2[2],n1[2]) ) { found=true; } } }
+ if ( almostEqual(p2[0],n1[0]) && almostEqual(p2[1],n1[1]) && almostEqual(p2[2],n1[2]) ) {
+ found=true;
+ }
+ }
+ }
else if ( almostEqual(p0[0],n1[0]) && almostEqual(p0[1],n1[1]) && almostEqual(p0[2],n1[2]) ) {
if ( almostEqual(p1[0],n0[0]) && almostEqual(p1[1],n0[1]) && almostEqual(p1[2],n0[2]) ){
- if ( almostEqual(p2[0],n2[0]) && almostEqual(p2[1],n2[1]) && almostEqual(p2[2],n2[2]) ) { found=true; } }
+ if ( almostEqual(p2[0],n2[0]) && almostEqual(p2[1],n2[1]) && almostEqual(p2[2],n2[2]) ) {
+ found=true;
+ }
+ }
else if ( almostEqual(p1[0],n2[0]) && almostEqual(p1[1],n2[1]) && almostEqual(p1[2],n2[2]) ) {
- if ( almostEqual(p2[0],n0[0]) && almostEqual(p2[1],n0[1]) && almostEqual(p2[2],n0[2]) ) { found=true; } } }
+ if ( almostEqual(p2[0],n0[0]) && almostEqual(p2[1],n0[1]) && almostEqual(p2[2],n0[2]) ) {
+ found=true;
+ }
+ }
+ }
else if ( almostEqual(p0[0],n2[0]) && almostEqual(p0[1],n2[1]) && almostEqual(p0[2],n2[2]) ) {
if ( almostEqual(p1[0],n0[0]) && almostEqual(p1[1],n0[1]) && almostEqual(p1[2],n0[2]) ){
- if ( almostEqual(p2[0],n1[0]) && almostEqual(p2[1],n1[1]) && almostEqual(p2[2],n1[2]) ) { found=true; } }
+ if ( almostEqual(p2[0],n1[0]) && almostEqual(p2[1],n1[1]) && almostEqual(p2[2],n1[2]) ) {
+ found=true;
+ }
+ }
else if ( almostEqual(p1[0],n1[0]) && almostEqual(p1[1],n1[1]) && almostEqual(p1[2],n1[2]) ) {
- if ( almostEqual(p2[0],n0[0]) && almostEqual(p2[1],n0[1]) && almostEqual(p2[2],n0[2]) ) { found=true; } } }
+ if ( almostEqual(p2[0],n0[0]) && almostEqual(p2[1],n0[1]) && almostEqual(p2[2],n0[2]) ) {
+ found=true;
+ }
+ }
+ }
if (found){
visible[gip]=false;
@@ -126,19 +177,19 @@ bool PView::writeX3D(const std::string &fileName )
else{
nt++;
}
- } // if ( ( ( abs( (*pt)->xmin-(*nt)->xmin ) ...
+ }
else {
nt = tlist.end();
- } // if ( ( ( abs( (*pt)->xmin-(*nt)->xmin ) ...
- } // while ( nt != tlist.end() && !found ) ...
- } // for ( pt=tlist.begin() ; pt != tlist.end() ; pt++ ) ...
+ }
+ }
+ }
for ( pt=tlist.begin() ; pt != tlist.end() ; pt++) {
- // delete (*pt);
+ // delete (*pt);
}
}
- // end tags duplicated triangles ---------------------
+ // end tags duplicated triangles
- // beginning writing x3d file ---------------------
+ // beginning writing x3d file
time_t rawtime;
struct tm * timeinfo;
time ( &rawtime );
@@ -149,9 +200,10 @@ bool PView::writeX3D(const std::string &fileName )
return false;
}
- // x3 Header ---------------------------------------------------------------------------
+ // x3 Header
fprintf(fp,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- fprintf(fp,"<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D 3.3//EN\" \"http://www.web3d.org/specifications/x3d-3.3.dtd\">\n");
+ fprintf(fp,"<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D 3.3//EN\" "
+ "\"http://www.web3d.org/specifications/x3d-3.3.dtd\">\n");
fprintf(fp,"<X3D profile='Interchange' version='3.3' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' >\n");
fprintf(fp," <head>\n");
fprintf(fp," <meta name='title' content='PView'/> \n");
@@ -159,7 +211,7 @@ bool PView::writeX3D(const std::string &fileName )
fprintf(fp," <meta name='creator' content='gmsh'/> \n");
fprintf(fp," <meta name='created' content=' %s '/>\n", asctime(timeinfo) );
fprintf(fp," </head>\n");
- // Viewport ---------------------------------------------------------------------------
+ // Viewport
SBoundingBox3d bb(0.,0.,0.,0.,0.,0.);
for(std::vector<PView*>::iterator pvit=PView::list.begin() ; pvit < PView::list.end(); pvit++){
PViewData *data = (*pvit)->getData(true);
@@ -174,13 +226,13 @@ bool PView::writeX3D(const std::string &fileName )
fprintf(fp," <Viewpoint description='Book View' orientation='0 0. 1. 0.' position='%g %g %g'/> \n",
_center.x(), _center.y() , _center.z()+_diagonal*1.2 );
fprintf(fp," <Background skyColor='.7 .7 1'/> \n");
- //****************
+
// HUD : Head Up Display
- // here contour/scalebar legends in frame (-.45,-.28, 0.) and (.45, .28,0.) : viewport .9 x .56
+ // here contour/scalebar legends in frame (-.45,-.28, 0.) and (.45, .28,0.) : viewport .9 x .56
double viewportWidth =.9 ;
double viewportHeight =.56 ;
double font_size = 0.02;
- if ( !getX3dCompatibility() ) {
+ if ( !CTX::instance()->print.x3dCompatibility ) {
std::vector<PView*> scales;
for(unsigned int i = 0; i < PView::list.size(); i++){
PViewData *data = PView::list[i]->getData();
@@ -196,11 +248,16 @@ bool PView::writeX3D(const std::string &fileName )
if ( !scales.empty() ){
fprintf(fp," <ProtoDeclare appinfo='Heads-up display (HUD)' name='HeadsUpDisplay'> \n");
fprintf(fp," <ProtoInterface> \n");
- fprintf(fp," <field accessType='inputOutput' appinfo='offset position for HUD' name='screenOffset' type='SFVec3f' value='%g %g %g'/> \n", _center.x(), _center.y() , 5*_center.z()+_diagonal*1.2 );
- fprintf(fp," <field accessType='inputOutput' appinfo='X3D content positioned at HUD offset' name='children' type='MFNode'> \n");
+ fprintf(fp," <field accessType='inputOutput' appinfo='offset position for HUD' "
+ "name='screenOffset' type='SFVec3f' value='%g %g %g'/> \n", _center.x(), _center.y() ,
+ 5*_center.z()+_diagonal*1.2 );
+ fprintf(fp," <field accessType='inputOutput' appinfo='X3D content positioned at HUD offset' "
+ "name='children' type='MFNode'> \n");
fprintf(fp," </field> \n");
- fprintf(fp," <field accessType='outputOnly' appinfo='HUD position update (in world coordinates) relative to original location' name='position_changed' type='SFVec3f'/> \n");
- fprintf(fp," <field accessType='outputOnly' appinfo='HUD orientation update relative to original location' name='orientation_changed' type='SFRotation'/> \n");
+ fprintf(fp," <field accessType='outputOnly' appinfo='HUD position update (in world "
+ "coordinates) relative to original location' name='position_changed' type='SFVec3f'/> \n");
+ fprintf(fp," <field accessType='outputOnly' appinfo='HUD orientation update relative to "
+ "original location' name='orientation_changed' type='SFRotation'/> \n");
fprintf(fp," </ProtoInterface> \n");
fprintf(fp," <ProtoBody> \n");
fprintf(fp," <Group bboxCenter=\"%g %g %g\"> \n", _center.x(), _center.y() , _center.z() );
@@ -222,20 +279,25 @@ bool PView::writeX3D(const std::string &fileName )
fprintf(fp," <connect nodeField='orientation_changed' protoField='orientation_changed'/> \n");
fprintf(fp," </IS> \n");
fprintf(fp," </ProximitySensor> \n");
- fprintf(fp," <ROUTE fromField='orientation_changed' fromNode='HereIAm' toField='rotation' toNode='HudContainer'/> \n");
- fprintf(fp," <ROUTE fromField='position_changed' fromNode='HereIAm' toField='translation' toNode='HudContainer'/> \n");
+ fprintf(fp," <ROUTE fromField='orientation_changed' fromNode='HereIAm' toField='rotation' "
+ "toNode='HudContainer'/> \n");
+ fprintf(fp," <ROUTE fromField='position_changed' fromNode='HereIAm' toField='translation' "
+ "toNode='HudContainer'/> \n");
fprintf(fp," </Group> \n");
fprintf(fp," </ProtoBody> \n");
fprintf(fp," </ProtoDeclare> \n");
// fprintf(fp," <Background skyColor='.7 .7 1'/> \n");
- fprintf(fp," <Viewpoint description='Book View' orientation='0 0. 1. 0.' position='%g %g %g'/> \n", _center.x(), _center.y() , _center.z()+_diagonal*1.2 );
- fprintf(fp," <!-- ProtoDeclare is the \"cookie cutter\" template, ProtoInstance creates an actual occurrence --> \n");
+ fprintf(fp," <Viewpoint description='Book View' orientation='0 0. 1. 0.' position='%g %g %g'/> \n",
+ _center.x(), _center.y() , _center.z()+_diagonal*1.2 );
+ fprintf(fp," <!-- ProtoDeclare is the \"cookie cutter\" template, ProtoInstance creates an actual "
+ "occurrence --> \n");
fprintf(fp," <ProtoInstance DEF='HeadsUpDisplay' name='HeadsUpDisplay'> \n");
- fprintf(fp," <!-- example: upper left-hand corner of screen (x=-2, y=1) and set back z=-5 from user view --> \n");
- fprintf(fp," <fieldValue name='screenOffset' value='%g %g %g'/> \n", _center.x(), _center.y() , _center.z()-.2*_diagonal );
+ fprintf(fp," <!-- example: upper left-hand corner of screen (x=-2, y=1) and set back z=-5 from "
+ "user view --> \n");
+ fprintf(fp," <fieldValue name='screenOffset' value='%g %g %g'/> \n",
+ _center.x(), _center.y() , _center.z()-.2*_diagonal );
fprintf(fp," <fieldValue name='children'> \n");
-
char label[1024];
double maxw = 10.*font_size*3./4.;
const double tic = viewportWidth/100 ;
@@ -307,14 +369,15 @@ bool PView::writeX3D(const std::string &fileName )
}
fprintf(fp," </fieldValue> \n");
fprintf(fp," </ProtoInstance> \n");
- } // if ( !scales.empty() )
- } // if ( !getX3dCompatibility()
+ }
+ }
- // geometrical objects
+ // geometrical objects
VertexArray *va;
PViewData *data;
PViewOptions *opt;
- // points ------------------------NOT TREATED YET-------------------------------
+
+ // points - NOT TREATED YET
/*
for(unsigned int ipv = 0; ipv < PView::list.size(); ipv++){
data = PView::list[ipv]->getData(true);
@@ -342,9 +405,7 @@ bool PView::writeX3D(const std::string &fileName )
}// end loop on PView::list
*/
-
-
- // lines -----------------------------------------------------------------------
+ // lines
int _ind=0;
fprintf(fp," <Shape> \n");
fprintf(fp," <IndexedLineSet coordIndex=' ");
@@ -388,7 +449,7 @@ bool PView::writeX3D(const std::string &fileName )
- //vectors --------------------colored arrow replaced by colored cones-------------------
+ //vectors - colored arrow replaced by colored cones
for(unsigned int ipv = 0; ipv < PView::list.size(); ipv++){
data = PView::list[ipv]->getData(true);
opt = PView::list[ipv]->getOptions();
@@ -423,14 +484,14 @@ bool PView::writeX3D(const std::string &fileName )
}// end for loop on PView::list
- //triangles --------------------------colored triangles -------------------------------
+ //triangles - colored triangles
//count all visible triangles of previous visited PView
_count=0;
_ind=0.;
fprintf(fp," <Transform> \n");
fprintf(fp," <Shape> \n");
fprintf(fp," <Appearance> \n");
- fprintf(fp," <Material transparency='%g' ", PView::getTransparencyValue() );
+ fprintf(fp," <Material transparency='%g' ", CTX::instance()->print.x3dTransparency );
fprintf(fp," ambientIntensity='0.15' diffuseColor='.5 .5 .5' emissiveColor='0 0 0' ");
fprintf(fp," shininess='0.1' specularColor='.1 .1 .1' /> \n");
fprintf(fp," </Appearance> \n");
@@ -442,7 +503,8 @@ bool PView::writeX3D(const std::string &fileName )
if( !data->getDirty() && opt->visible ) {
va=PView::list[ipv]->va_triangles;
for(int ipt = 0; ipt < va->getNumVertices(); ipt += 3){
- if ( (PView::getInnerBorder() && visible[_count] ) || !PView::getInnerBorder() ) {
+ if ( (!CTX::instance()->print.x3dRemoveInnerBorders && visible[_count] ) ||
+ CTX::instance()->print.x3dRemoveInnerBorders ) {
fprintf(fp,"%i %i %i ",_ind,_ind+1,_ind+2);
_ind += 3;
}
@@ -460,7 +522,8 @@ bool PView::writeX3D(const std::string &fileName )
if( !data->getDirty() && opt->visible ) {
va=PView::list[ipv]->va_triangles;
for(int ipt = 0; ipt < va->getNumVertices(); ipt += 3){
- if ( ( PView::getInnerBorder() && visible[_count] ) || !PView::getInnerBorder()) {
+ if ( ( !CTX::instance()->print.x3dRemoveInnerBorders && visible[_count] ) ||
+ CTX::instance()->print.x3dRemoveInnerBorders) {
float *p0 = va->getVertexArray(3 * ipt);
float *p1 = va->getVertexArray(3 * (ipt + 1));
float *p2 = va->getVertexArray(3 * (ipt + 2));
@@ -484,7 +547,8 @@ bool PView::writeX3D(const std::string &fileName )
if( !data->getDirty() && opt->visible ) {
va=PView::list[ipv]->va_triangles;
for(int ipt = 0; ipt < va->getNumVertices(); ipt += 3){
- if ( ( PView::getInnerBorder() && visible[_count] ) || !PView::getInnerBorder() ) {
+ if ( ( !CTX::instance()->print.x3dRemoveInnerBorders && visible[_count] ) ||
+ CTX::instance()->print.x3dRemoveInnerBorders ) {
unsigned char *c0 = va->getColorArray(4 * ipt);
unsigned char *c1 = va->getColorArray(4 * (ipt+1));
unsigned char *c2 = va->getColorArray(4 * (ipt+2));
@@ -512,7 +576,6 @@ bool PView::writeX3D(const std::string &fileName )
fprintf(fp,"</X3D>\n");
fclose(fp);
return true;
-
}
static void writeX3DScale(FILE *fp, PView *p, double xmin, double ymin,
@@ -545,7 +608,6 @@ static void writeX3DScale(FILE *fp, PView *p, double xmin, double ymin,
writeX3DScaleLabel (fp, p, xmin, ymin, width, height, tic, horizontal,font_size);
}
-
static void writeX3DScaleBar(FILE *fp, PView *p, double xmin, double ymin, double width,
double height, double tic, int horizontal)
{
@@ -557,7 +619,8 @@ static void writeX3DScaleBar(FILE *fp, PView *p, double xmin, double ymin, doubl
|| opt->intervalsType == PViewOptions::Discrete
|| opt->intervalsType == PViewOptions::Numeric){
fprintf(fp," <Shape> \n");
- fprintf(fp," <IndexedFaceSet colorPerVertex='true' normalPerVertex='true' coordIndex='0 1 2 3 -1' solid='false' ccw='true' > \n");
+ fprintf(fp," <IndexedFaceSet colorPerVertex='true' normalPerVertex='true' "
+ "coordIndex='0 1 2 3 -1' solid='false' ccw='true' > \n");
fprintf(fp," <Coordinate point='");
if(horizontal){
fprintf(fp,"%e %e %e %e %e %e %e %e %e %e %e %e "
diff --git a/Post/PViewX3D.h b/Post/PViewX3D.h
index eada1ca8e1..e6efd4428a 100644
--- a/Post/PViewX3D.h
+++ b/Post/PViewX3D.h
@@ -11,38 +11,35 @@
#ifndef _PVIEWX3D_H_
#define _PVIEWX3D_H_
-#include <iostream>
-#include <limits>
-
-using namespace std;
-
-static inline void UnsignedChar2rgba(unsigned char *glc,double*rgba){
- rgba[0]=glc[0]/255.;
- rgba[1]=glc[1]/255.;
- rgba[2]=glc[2]/255.;
- rgba[3]=glc[3]/255.;
+static inline void UnsignedChar2rgba(unsigned char *glc, double*rgba)
+{
+ rgba[0] = glc[0]/255.;
+ rgba[1] = glc[1]/255.;
+ rgba[2] = glc[2]/255.;
+ rgba[3] = glc[3]/255.;
}
-static inline void unsignedInt2RGBA(unsigned int &color,double &r,double &g, double &b,double &a)
+static inline void unsignedInt2RGBA(unsigned int &color, double &r, double &g, double &b, double &a)
{
- r = color & 255;
- g = (color >> 8) & 255;
- b = (color >> 16) & 255;
- a = (color >> 24) & 255;
- r =r /255.;
- g =g /255.;
- b =b /255.;
- a =a /255.;
- // cout<< "couleur="<<color<<" / decomposition: "<<" r="<<r<<", g="<<g<<", b="<<b<<", a="<<a<<endl;
- return;
+ r = color & 255;
+ g = (color >> 8) & 255;
+ b = (color >> 16) & 255;
+ a = (color >> 24) & 255;
+ r = r / 255.;
+ g = g / 255.;
+ b = b / 255.;
+ a = a / 255.;
}
-static void writeX3DScale(FILE *fp, PView *p, double xmin, double ymin, double width, double height, double tic, int horizontal,double font_size);
-static void writeX3DScaleBar(FILE *fp, PView *p, double xmin, double ymin, double width, double height, double tic, int horizontal);
-static void writeX3DScaleValues(FILE *fp, PView *p, double xmin, double ymin, double width, double height, double tic, int horizontal,double font_size);
-static void writeX3DScaleLabel (FILE *fp, PView *p, double xmin, double ymin, double width, double height, double tic, int horizontal,double font_size);
-static void writeX3DStringCenter( FILE *fp,char *label,double x, double y, double z,double font_size);
-
+static void writeX3DScale(FILE *fp, PView *p, double xmin, double ymin, double width, double height,
+ double tic, int horizontal, double font_size);
+static void writeX3DScaleBar(FILE *fp, PView *p, double xmin, double ymin, double width, double height,
+ double tic, int horizontal);
+static void writeX3DScaleValues(FILE *fp, PView *p, double xmin, double ymin, double width, double height,
+ double tic, int horizontal, double font_size);
+static void writeX3DScaleLabel(FILE *fp, PView *p, double xmin, double ymin, double width, double height,
+ double tic, int horizontal,double font_size);
+static void writeX3DStringCenter(FILE *fp, char *label, double x, double y, double z, double font_size);
class TriangleToSort{
public:
@@ -53,13 +50,4 @@ class TriangleToSort{
float xmax,ymax,zmax;
};
-
-static bool almostEqual(double x,double y){
- return std::abs(x-y) < PView::_precision ;
-
-}
-
-
-
#endif
-
--
GitLab