diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 8abd69e6b4627d33041b94ac55c8452d203f8f90..e5752d3177ed6c2246ad1fd9036c020ace18dc3c 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -147,18 +147,18 @@ static PixelBuffer *GetCompositePixelBuffer(GLenum format, GLenum type)
void CreateOutputFile(std::string fileName, int format)
{
-
if(fileName.empty())
fileName = GetDefaultFileName(format);
- int oldformat = CTX::instance()->print.format;
+ int oldFormat = CTX::instance()->print.format;
CTX::instance()->print.format = format;
CTX::instance()->printing = 1;
- bool printEndMessage = true;
if(format != FORMAT_AUTO)
Msg::StatusBar(2, true, "Writing '%s'", fileName.c_str());
+ bool printEndMessage = true;
+
switch (format) {
case FORMAT_AUTO:
@@ -254,14 +254,14 @@ void CreateOutputFile(std::string fileName, int format)
case FORMAT_GEO:
GModel::current()->writeGEO(fileName, CTX::instance()->print.geoLabels);
break;
-#if defined(HAVE_OCC)
+
case FORMAT_BREP:
GModel::current()->writeOCCBREP(fileName);
break;
+
case FORMAT_STEP:
GModel::current()->writeOCCSTEP(fileName);
break;
-#endif
#if defined(HAVE_FLTK)
case FORMAT_PPM:
@@ -278,13 +278,13 @@ void CreateOutputFile(std::string fileName, int format)
break;
}
- int old_gradient = CTX::instance()->bgGradient;
+ int oldGradient = CTX::instance()->bgGradient;
if(format == FORMAT_GIF && CTX::instance()->print.gifTransparent)
CTX::instance()->bgGradient = 0;
PixelBuffer *buffer = GetCompositePixelBuffer(GL_RGB, GL_UNSIGNED_BYTE);
- CTX::instance()->bgGradient = old_gradient;
+ CTX::instance()->bgGradient = oldGradient;
if(format == FORMAT_PPM)
create_ppm(fp, buffer);
@@ -327,7 +327,7 @@ void CreateOutputFile(std::string fileName, int format)
GLint height = FlGui::instance()->getCurrentOpenglWindow()->h();
GLint viewport[4] = {0, 0, width, height};
- int old_gradient = CTX::instance()->bgGradient;
+ int oldGradient = CTX::instance()->bgGradient;
if(!CTX::instance()->print.epsBackground) CTX::instance()->bgGradient = 0;
PixelBuffer buffer(width, height, GL_RGB, GL_FLOAT);
@@ -382,7 +382,7 @@ void CreateOutputFile(std::string fileName, int format)
res = gl2psEndPage();
}
- CTX::instance()->bgGradient = old_gradient;
+ CTX::instance()->bgGradient = oldGradient;
fclose(fp);
}
break;
@@ -427,7 +427,7 @@ void CreateOutputFile(std::string fileName, int format)
if(printEndMessage) Msg::StatusBar(2, true, "Wrote '%s'", fileName.c_str());
- CTX::instance()->print.format = oldformat;
+ CTX::instance()->print.format = oldFormat;
CTX::instance()->printing = 0;
#if defined(HAVE_OPENGL)
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index 5d51ded6e850c8425389113b6715f993695c04d2..7a367f9ed176ed239b1ab7d1b75f958045d1b24a 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -500,7 +500,7 @@ double Msg::GetValue(const char *text, double defaultval)
}
#endif
- printf("%s (default=%.16g) ", text, defaultval);
+ printf("%s (default=%.16g): ", text, defaultval);
char str[256];
char *ret = fgets(str, sizeof(str), stdin);
if(!ret || !strlen(str) || !strcmp(str, "\n"))
@@ -521,24 +521,18 @@ int Msg::GetAnswer(const char *question, int defaultval, const char *zero,
return fl_choice(question, zero, one, two, "");
#endif
- while(1){
- if(two)
- printf("%s\n\n[%s], [%s] or [%s]? (default=%s) ", question, zero, one, two,
- (defaultval == 2) ? two : defaultval ? one : zero);
- else
- printf("%s\n\n[%s] or [%s]? (default=%s) ", question, zero, one,
- defaultval ? one : zero);
- char str[256];
- char *ret = fgets(str, sizeof(str), stdin);
- if(!ret || !strlen(str) || !strcmp(str, "\n"))
- return defaultval;
- else if(!strcmp(str, zero))
- return 0;
- else if(!strcmp(str, one))
- return 1;
- else if(two && !strcmp(str, two))
- return 2;
- }
+ if(two)
+ printf("%s\n\n0=[%s] 1=[%s] 2=[%s] (default=%d): ", question,
+ zero, one, two, defaultval);
+ else
+ printf("%s\n\n0=[%s] 1=[%s] (default=%d): ", question,
+ zero, one, defaultval);
+ char str[256];
+ char *ret = fgets(str, sizeof(str), stdin);
+ if(!ret || !strlen(str) || !strcmp(str, "\n"))
+ return defaultval;
+ else
+ return atoi(ret);
}
void Msg::InitClient(std::string sockname)
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index a7cb9ef7d058fe224260239dea1eeb5e7f4ba8db..2e92767d268bb690304a82195b95a76c0cd32899 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -3,6 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
+#include <sstream>
#include <string.h>
#include "GmshConfig.h"
#include "GmshMessage.h"
@@ -246,23 +247,21 @@ int MergeFile(std::string fileName, bool warnIfMissing)
std::vector<std::string> split = SplitFileName(fileName);
std::string noExt = split[0] + split[1], ext = split[2];
-#if defined(HAVE_FLTK)
- if(FlGui::available()) {
- if(ext == ".gz") {
- // the real solution would be to rewrite all our I/O functions in
- // terms of gzFile, but until then, this is better than nothing
- if(fl_choice("File '%s' is in gzip format.\n\nDo you want to uncompress it?",
- "Cancel", "Uncompress", NULL, fileName.c_str())){
- if(SystemCall(std::string("gunzip -c ") + fileName + " > " + noExt))
- Msg::Error("Failed to uncompress `%s': check directory permissions",
- fileName.c_str());
- SetProjectName(noExt);
- return MergeFile(noExt);
- }
+ if(ext == ".gz") {
+ // the real solution would be to rewrite all our I/O functions in
+ // terms of gzFile, but until then, this is better than nothing
+ std::ostringstream sstream;
+ sstream << "File '"<< fileName << "' is in gzip format.\n\n"
+ << "Do you want to uncompress it?";
+ if(Msg::GetAnswer(sstream.str().c_str(), 0, "Cancel", "Uncompress")){
+ if(SystemCall(std::string("gunzip -c ") + fileName + " > " + noExt))
+ Msg::Error("Failed to uncompress `%s': check directory permissions",
+ fileName.c_str());
+ SetProjectName(noExt);
+ return MergeFile(noExt);
}
}
-#endif
-
+
CTX::instance()->geom.draw = 0; // don't try to draw the model while reading
#if defined(HAVE_POST)