Attachment #886638 for bug #916718

View | Details | Raw Unified | Return to bug 916718
Collapse All | Expand All

Lines 3-9 Link Here

(-)a/src/Editeur.cc (-1 / +1 lines)
3	#include "Input.h"	3	#include "Input.h"
4	#include "Tableur.h"	4	#include "Tableur.h"
5	#include "Python.h"	5	#include "Python.h"
6	Fl_Tabs * xcas_main_tab=0;
7	#ifdef HAVE_LIBMICROPYTHON	6	#ifdef HAVE_LIBMICROPYTHON
8	extern "C" int mp_token(const char * line);	7	extern "C" int mp_token(const char * line);
9	#endif	8	#endif
Lines 27-32 extern "C" int mp_token(const char * line); Link Here
27		26
28		27
29	#ifdef HAVE_LIBFLTK	28	#ifdef HAVE_LIBFLTK
		29	Fl_Tabs * xcas_main_tab=0;
30	#include <FL/fl_ask.H>	30	#include <FL/fl_ask.H>
31	#include <FL/fl_ask.H>	31	#include <FL/fl_ask.H>
32	#include <FL/Fl_Return_Button.H>	32	#include <FL/Fl_Return_Button.H>




	printf("%s\n","Running ./xcas");
	continue;
      }
#ifdef HAVE_LIBFLTK
      if (s=="xcas"){
	giac::gen ge; std::string filename;
	xcas::fltk_view(0,ge,"session.xws",filename,5,contextptr);
	continue;
      }
#endif
      if (s=="giac"){
	python_compat(python_compat(contextptr)&3,contextptr);
	printf("%s\n","Switching to giac interpreter");

#else
      start=clock();
#endif
#ifdef HAVE_LIBFLTK
      xcas::icas_eval(gq,ge,reading_file,filename,contextptr);
#endif
#ifdef __APPLE_
      startc=clock()-startc;
#endif

      // 2-d plot?
      int graph_output=graph_output_type(ge);
      if (reading_file>=2 || graph_output || (giac::ckmatrix(ge,true) &&ge.subtype==giac::_SPREAD__VECT) ){
#ifdef HAVE_LIBFLTK
	if (xcas::fltk_view(gq,ge,"",filename,reading_file,contextptr))
	  cout << "Done";
	else
#endif
	  cout << "Plot cancelled or unable to plot";
      }
      else {

Return to bug 916718

Lines 2166-2176 int main(int ARGC, char *ARGV[]){ Link Here

(-)a/src/icas.cc (+6 lines)
2166	printf("%s\n","Running ./xcas");	2166	printf("%s\n","Running ./xcas");
2167	continue;	2167	continue;
2168	}	2168	}
		2169	#ifdef HAVE_LIBFLTK
2169	if (s=="xcas"){	2170	if (s=="xcas"){
2170	giac::gen ge; std::string filename;	2171	giac::gen ge; std::string filename;
2171	xcas::fltk_view(0,ge,"session.xws",filename,5,contextptr);	2172	xcas::fltk_view(0,ge,"session.xws",filename,5,contextptr);
2172	continue;	2173	continue;
2173	}	2174	}
		2175	#endif
2174	if (s=="giac"){	2176	if (s=="giac"){
2175	python_compat(python_compat(contextptr)&3,contextptr);	2177	python_compat(python_compat(contextptr)&3,contextptr);
2176	printf("%s\n","Switching to giac interpreter");	2178	printf("%s\n","Switching to giac interpreter");
Lines 2251-2257 int main(int ARGC, char *ARGV[]){ Link Here
2251	#else	2253	#else
2252	start=clock();	2254	start=clock();
2253	#endif	2255	#endif
		2256	#ifdef HAVE_LIBFLTK
2254	xcas::icas_eval(gq,ge,reading_file,filename,contextptr);	2257	xcas::icas_eval(gq,ge,reading_file,filename,contextptr);
		2258	#endif
2255	#ifdef __APPLE_	2259	#ifdef __APPLE_
2256	startc=clock()-startc;	2260	startc=clock()-startc;
2257	#endif	2261	#endif
Lines 2265-2273 int main(int ARGC, char *ARGV[]){ Link Here
2265	// 2-d plot?	2269	// 2-d plot?
2266	int graph_output=graph_output_type(ge);	2270	int graph_output=graph_output_type(ge);
2267	if (reading_file>=2 \|\| graph_output \|\| (giac::ckmatrix(ge,true) &&ge.subtype==giac::_SPREAD__VECT) ){	2271	if (reading_file>=2 \|\| graph_output \|\| (giac::ckmatrix(ge,true) &&ge.subtype==giac::_SPREAD__VECT) ){
		2272	#ifdef HAVE_LIBFLTK
2268	if (xcas::fltk_view(gq,ge,"",filename,reading_file,contextptr))	2273	if (xcas::fltk_view(gq,ge,"",filename,reading_file,contextptr))
2269	cout << "Done";	2274	cout << "Done";
2270	else	2275	else
		2276	#endif
2271	cout << "Plot cancelled or unable to plot";	2277	cout << "Plot cancelled or unable to plot";
2272	}	2278	}
2273	else {	2279	else {