Attachment #295135 for bug #391667

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




    if (XPageSize != 0. && YPageSize == 0.) {a=XPageSize/16.5*540/720; scale=1.;}
    char as[32];
    sprintf(as, "%f",a);
    actStream->setopt( "a", as); // this necessary to keep labels from looking stretched (plplot bug)
                                 // but plrender -a is also buggy: aspect ratios are not exactly correct 
    xleng=static_cast<PLINT>(floor(scale*540. +0.5));
    yleng=static_cast<PLINT>(floor(scale*720. +0.5));
    // setting this without plrender -a makes the labels stretched (plplot bug)
    actStream->spage( xp, yp, xleng, yleng, xoff, yoff); 

    actStream->setopt( "ori","1"); // portrait (upright)

    // no pause on destruction
    actStream->spause( false);


    // default: black+white (IDL behaviour)
    //actStream->scolor( color); // has no effect
    if (color == 0) { actStream->setopt( "drvopt","text=0,color=0"); } 
    else { actStream->setopt( "drvopt","text=0,color=1");}
    color=0;

    actStream->Init();

Lines 55-61 Link Here

(-)gdl-0.9.1/src/devicesvg.hpp (-1 / +1 lines)
55	// actStream->scmap0( r, g, b, ctSize);	55	// actStream->scmap0( r, g, b, ctSize);
56	actStream->scmap1( r, g, b, ctSize);	56	actStream->scmap1( r, g, b, ctSize);
57		57
58	actStream->SetOpt( "drvopt","text_clipping=1"); // clear drvopt	58	actStream->setopt( "drvopt","text_clipping=1"); // clear drvopt
59		59
60	actStream->Init();	60	actStream->Init();
61		61

Lines 214-223 Link Here

(-)gdl-0.9.1/src/devicewin.hpp (-2 / +2 lines)
214	static char buf[ 256];	214	static char buf[ 256];
215	strncpy( buf, title.c_str(), 255);	215	strncpy( buf, title.c_str(), 255);
216	buf[ 255] = 0;	216	buf[ 255] = 0;
217	winList[ wIx]->SetOpt( "plwindow", buf);	217	winList[ wIx]->setopt( "plwindow", buf);
218		218
219	// we want color (and the driver options need to be overwritten)	219	// we want color (and the driver options need to be overwritten)
220	winList[ wIx]->SetOpt( "drvopt","color=1");	220	winList[ wIx]->setopt( "drvopt","color=1");
221		221
222	// set color map	222	// set color map
223	PLINT r[ctSize], g[ctSize], b[ctSize];	223	PLINT r[ctSize], g[ctSize], b[ctSize];

Lines 431-440 Link Here

(-)gdl-0.9.1/src/devicex.hpp (-2 / +2 lines)
431	static char buf[ 256];	431	static char buf[ 256];
432	strncpy( buf, title.c_str(), 255);	432	strncpy( buf, title.c_str(), 255);
433	buf[ 255] = 0;	433	buf[ 255] = 0;
434	winList[ wIx]->SetOpt( "plwindow", buf);	434	winList[ wIx]->setopt( "plwindow", buf);
435		435
436	// we use our own window handling	436	// we use our own window handling
437	winList[ wIx]->SetOpt( "drvopt","usepth=0");	437	winList[ wIx]->setopt( "drvopt","usepth=0");
438		438
439	// set color map	439	// set color map
440	PLINT r[ctSize], g[ctSize], b[ctSize];	440	PLINT r[ctSize], g[ctSize], b[ctSize];

Lines 129-135 Link Here

(-)gdl-0.9.1/src/devicez.hpp (-1 / +1 lines)
129	{ r[ i] = g[ i] = b[ i] = i;}	129	{ r[ i] = g[ i] = b[ i] = i;}
130	actStream->scmap1( r, g, b, ctSize);	130	actStream->scmap1( r, g, b, ctSize);
131		131
132	actStream->SetOpt( "drvopt","text=0"); // clear drvopt	132	actStream->setopt( "drvopt","text=0"); // clear drvopt
133		133
134	actStream->Init();	134	actStream->Init();
135		135

Lines 201-207 Link Here

(-)gdl-0.9.1/src/gdlgstream.cpp (-2 / +2 lines)
201	// skip conversion if the string is empty	201	// skip conversion if the string is empty
202	if (len == 0) return in;	202	if (len == 0) return in;
203		203
204	const string fonts[] = {	204	const std::string fonts[] = {
205	"#fn", // !0 : unused	205	"#fn", // !0 : unused
206	"#fn", // !1 : unused	206	"#fn", // !1 : unused
207	"#fn", // !2 : unused	207	"#fn", // !2 : unused
Lines 240-246 Link Here
240	int curr_lev = 0; // (incremented with #u, decremented with #d)	240	int curr_lev = 0; // (incremented with #u, decremented with #d)
241	int curr_pos = 0; // (current position in string)	241	int curr_pos = 0; // (current position in string)
242	int save_pos = 0; // (position in string used in !S/!R save/restore)	242	int save_pos = 0; // (position in string used in !S/!R save/restore)
243	string out = string("");	243	std::string out = std::string("");
244		244
245	for (size_t i = 0; i < len; i++) {	245	for (size_t i = 0; i < len; i++) {
246	if (in[i] == '!' && in[i + 1] != '!')	246	if (in[i] == '!' && in[i + 1] != '!')




  {
//   std::cerr << "GDLGStream()" << std::endl;
    if (!checkPlplotDriver(driver))
      ThrowGDLException(std::string("PLplot installation lacks the requested driver: ") + driver);
  }

  virtual ~GDLGStream()


//     devNames = new std::vector<std::string>( numdevs_plus_one - 1);
    for( int i = 0; i < numdevs_plus_one - 1; ++i)
		devNames.push_back(std::string(devnames[ i]));
    
    free(devnames);
}

// for debug
std::vector<std::string> devnamesDbg = devNames;

return std::find( devNames.begin(), devNames.end(), std::string( driver)) != devNames.end();

//     checking if a given driver is in the list
//     bool supported = false;

Return to bug 391667

Lines 50-56 Link Here

(-)gdl-0.9.1/src/gdlgstream.hpp (-3 / +3 lines)
50	{	50	{
51	// std::cerr << "GDLGStream()" << std::endl;	51	// std::cerr << "GDLGStream()" << std::endl;
52	if (!checkPlplotDriver(driver))	52	if (!checkPlplotDriver(driver))
53	ThrowGDLException(string("PLplot installation lacks the requested driver: ") + driver);	53	ThrowGDLException(std::string("PLplot installation lacks the requested driver: ") + driver);
54	}	54	}
55		55
56	virtual ~GDLGStream()	56	virtual ~GDLGStream()
Lines 103-109 Link Here
103		103
104	// devNames = new std::vector<std::string>( numdevs_plus_one - 1);	104	// devNames = new std::vector<std::string>( numdevs_plus_one - 1);
105	for( int i = 0; i < numdevs_plus_one - 1; ++i)	105	for( int i = 0; i < numdevs_plus_one - 1; ++i)
106	devNames.push_back(string(devnames[ i]));	106	devNames.push_back(std::string(devnames[ i]));
107		107
108	free(devnames);	108	free(devnames);
109	}	109	}
Lines 111-117 Link Here
111	// for debug	111	// for debug
112	std::vector<std::string> devnamesDbg = devNames;	112	std::vector<std::string> devnamesDbg = devNames;
113		113
114	return std::find( devNames.begin(), devNames.end(), string( driver)) != devNames.end();	114	return std::find( devNames.begin(), devNames.end(), std::string( driver)) != devNames.end();
115		115
116	// checking if a given driver is in the list	116	// checking if a given driver is in the list
117	// bool supported = false;	117	// bool supported = false;

Lines 60-73 Link Here

(-)gdl-0.9.1/src/deviceps.hpp (-4 / +4 lines)
60	if (XPageSize != 0. && YPageSize == 0.) {a=XPageSize/16.5*540/720; scale=1.;}	60	if (XPageSize != 0. && YPageSize == 0.) {a=XPageSize/16.5*540/720; scale=1.;}
61	char as[32];	61	char as[32];
62	sprintf(as, "%f",a);	62	sprintf(as, "%f",a);
63	actStream->SetOpt( "a", as); // this necessary to keep labels from looking stretched (plplot bug)	63	actStream->setopt( "a", as); // this necessary to keep labels from looking stretched (plplot bug)
64	// but plrender -a is also buggy: aspect ratios are not exactly correct	64	// but plrender -a is also buggy: aspect ratios are not exactly correct
65	xleng=static_cast<PLINT>(floor(scale*540. +0.5));	65	xleng=static_cast<PLINT>(floor(scale*540. +0.5));
66	yleng=static_cast<PLINT>(floor(scale*720. +0.5));	66	yleng=static_cast<PLINT>(floor(scale*720. +0.5));
67	// setting this without plrender -a makes the labels stretched (plplot bug)	67	// setting this without plrender -a makes the labels stretched (plplot bug)
68	actStream->spage( xp, yp, xleng, yleng, xoff, yoff);	68	actStream->spage( xp, yp, xleng, yleng, xoff, yoff);
69		69
70	actStream->SetOpt( "ori","1"); // portrait (upright)	70	actStream->setopt( "ori","1"); // portrait (upright)
71		71
72	// no pause on destruction	72	// no pause on destruction
73	actStream->spause( false);	73	actStream->spause( false);
Lines 84-91 Link Here
84		84
85	// default: black+white (IDL behaviour)	85	// default: black+white (IDL behaviour)
86	//actStream->scolor( color); // has no effect	86	//actStream->scolor( color); // has no effect
87	if (color == 0) { actStream->SetOpt( "drvopt","text=0,color=0"); }	87	if (color == 0) { actStream->setopt( "drvopt","text=0,color=0"); }
88	else { actStream->SetOpt( "drvopt","text=0,color=1");}	88	else { actStream->setopt( "drvopt","text=0,color=1");}
89	color=0;	89	color=0;
90		90
91	actStream->Init();	91	actStream->Init();