Attachment #152025 for bug #220493




  gtk_idle_add(GraphTab_deleteLater, &deleteLater);
}



sigc::signal1<void, Graph *> Graph::signal_addedPlot(void)
{
  return m_signal_addedPlot;
}

sigc::signal2<void, Graph *, Plot *> Graph::signal_removedPlot(void)
{
  return m_signal_removedPlot;
}

sigc::signal1<void, Graph *> Graph::m_signal_addedPlot;

sigc::signal2<void, Graph *, Plot *> Graph::m_signal_removedPlot;



sigc::signal1<void, Graph *> Graph::signal_changedSameScale(void)
{
  return m_signal_changedSameScale;
}

sigc::signal1<void, Graph *> Graph::m_signal_changedSameScale;


sigc::signal0<void> Graph::signal_backgroundColorChanged(void)
{
  return m_signal_backgroundColorChanged;
}





  bool showGridNumbers;

  inline bool isShowingGrid() { return (showAutoGrid && isSameScale); }
  /************************************************************/

  static sigc::signal1<void, Graph *> signal_changedSameScale(void);
  static sigc::signal1<void, Graph *> signal_addedPlot(void);
  static sigc::signal2<void, Graph *, Plot *> signal_removedPlot(void);
  sigc::signal0<void> signal_backgroundColorChanged(void);

  
  Gdk::Color gridColor, backgroundColor;

  int gridXLineSpace, gridYLineSpace, gridLineWidth;


  void setPickerType(void);

  void setStatusXYValues(gdouble x, gdouble y);
  
  static sigc::signal1<void, Graph *> m_signal_changedSameScale;
  
  static sigc::signal1<void, Graph *> m_signal_addedPlot;
  static sigc::signal2<void, Graph *, Plot *> m_signal_removedPlot;

  sigc::signal0<void> m_signal_backgroundColorChanged;

  
  // used by createPlot(Field *x, Field *y) 
  void checkZoomLevelForNewPlot(Plot *plot);


Lines 758-767 Link Here

(-)quickplot-0.8.13.old/MainWindow.cpp (-1 / +1 lines)
758	d->to= this;	758	d->to= this;
759	d->from = graphsNotebook;	759	d->from = graphsNotebook;
760	gtk_idle_add(copyGraphNotebooks, d);	760	gtk_idle_add(copyGraphNotebooks, d);
761	}	761	}
762		762
763	SigC::Signal1<void, Graph *> GraphsNotebook::signal_tabLabelChanged(void)	763	sigc::signal1<void, Graph *> GraphsNotebook::signal_tabLabelChanged(void)
764	{	764	{
765	return m_signal_tabLabelChanged;	765	return m_signal_tabLabelChanged;
766	}	766	}
767		767




  // to "signal" the View Menu in MainMenuBar.cpp, to add a runtime
  // "show/hide tabs option.  Is there a signal_show_tabs() or like
  // method???  It's not listed.
  void set_show_tabs(bool show_tabs = true);

  sigc::signal1<void, Graph *> signal_tabLabelChanged(void);
  sigc::signal1<void, Graph *> m_signal_tabLabelChanged;
  
private:
  MainWindow *mainWindow;
};


Lines 50-60 Link Here

(-)quickplot-0.8.13.old/PlotConfig.h (-1 / +1 lines)
50	CheckButton showPointsCB;	50	CheckButton showPointsCB;
51	Button pointColorB;	51	Button pointColorB;
52	ValueSlider pointSizeVS;	52	ValueSlider pointSizeVS;
53	// RadioButton style1, style2 etc ...	53	// RadioButton style1, style2 etc ...
54		54
55	SigC::Connection plotChanged_connection;	55	sigc::connection plotChanged_connection;
56		56
57	void setValues(void);	57	void setValues(void);
58		58
59	// slots	59	// slots
60	void on_plotChanged(void);	60	void on_plotChanged(void);




  m_signal_changed.emit();
}

// Emitted when the lineColor, pointColor, lineWidth or pointSize
// changes.
sigc::signal0<void> Plot::signal_changed(void)
{
  return m_signal_changed;
}

// pick a Y value.

  xpick = (X - currentZoomLevel->shiftX)/currentZoomLevel->scaleX;
  ypick = (Y - currentZoomLevel->shiftY)/currentZoomLevel->scaleY;
  m_signal_valueDisplay.emit(xpick, ypick);           
}

sigc::signal2<void, value_t, value_t> Plot::signal_valueDisplay(void)
{
  return m_signal_valueDisplay;
}






  
  Graph *graph;

  // Emitted when the lineColor, pointColor, lineWidth, pointSize,
  // showLines and showPoints.
  sigc::signal0<void> signal_changed(void);

  
  int emitDisplayValues(int X);
  void emitInterpolatedDisplayValues(int X);
  void emitDisplayValues(int X, int Y);

  sigc::signal2<void, value_t, value_t> signal_valueDisplay(void);
  
  value_t xpick, ypick;

protected:

private:

  bool showPoints, showLines;
  
  sigc::signal0<void> m_signal_changed;

  sigc::signal2<void, value_t, value_t> m_signal_valueDisplay;

  Gdk::Color lineColor, pointColor;

  // Cull and Draw.
  void cullDrawLine(value_t fromX, value_t fromY, value_t toX, value_t toY);




  bool limitSize;
  
  Glib::RefPtr<Gdk::Window> win;
  Glib::RefPtr<Gdk::GC> gc;

  sigc::connection plotChangeConnection, bgConnection;
};



class Row

  
  int row;
  Table *table;
  MainWindow *mainWindow;
  Plot *plot;
  sigc::connection valueDisplay_connection, makePlotConfig_connection;
  
  void add(Widget &w, int col);
  void makePlotConfig(void);
  //void setLabelSize(Entry &l);
  //void afterRealize(void);

  //sigc::connection afterRealizeConnection;
};



class PlotLister : public Window




{
  gtk_idle_add(deleteSLater, &dl);
}


sigc::signal1<void, Source *> Source::signal_addedSource()
{
  return m_signal_addedSource;
}

sigc::signal1<void, Source *> Source::m_signal_addedSource;


sigc::signal1<void, Source *> Source::signal_removedSource()
{
  return m_signal_removedSource;
}

sigc::signal1<void, Source *> Source::m_signal_removedSource;






 
  inline const enum  TYPE getType(void){ return type; }
  inline const char *getTypeString(void){ return TYPE_STRING[type]; }

  static sigc::signal1<void, Source *> signal_addedSource();
  static sigc::signal1<void, Source *> signal_removedSource();

  // Delete this object later.
  void deleteLater(void);

  std::list<CloseSourceMenuItem *> closeSourceMenuItems;
  
  
protected:
  
  static sigc::signal1<void, Source *> m_signal_addedSource;
  static sigc::signal1<void, Source *> m_signal_removedSource;

  inline void setType(enum TYPE t) { type = t; }
  char *fileName, *baseFileName;
  void addCloseMenus(const char *label);





    else
      return false; // no value change
  }
}

sigc::signal0<void> ValueSlider::signal_valueChanged()
{
  return m_signal_valueChanged;
}



    else
      return false; // no value change
  }
}

sigc::signal0<void> DoubleValueSlider::signal_valueChanged()
{
  return m_signal_valueChanged;
}



int LogValueSlider::getValue(void)
{
  return (int) pow(10.0, value);
}

sigc::signal0<void> LogValueSlider::signal_valueChanged()
{
  return m_signal_valueChanged;
}






  int value;
  double maxmax;

public:
  sigc::signal0<void> signal_valueChanged();

private:
  sigc::signal0<void> m_signal_valueChanged;

  bool setScaleToEntry(void);

  bool setEntryToScale(void);


  Entry entry;

  double value, maxmax;

public:
  sigc::signal0<void> signal_valueChanged();

private:
  sigc::signal0<void> m_signal_valueChanged;

  bool setScaleToEntry(void);

  bool setEntryToScale(void);



  // log of getValue()
  double value;

public:
  sigc::signal0<void> signal_valueChanged();

private:
  sigc::signal0<void> m_signal_valueChanged;

  bool setScaleToEntry(void);

  bool setEntryToScale(void);


Return to bug 220493

Lines 1178-1211 Link Here

(-)quickplot-0.8.13.old/Graph.cpp (-7 / +7 lines)
1178	gtk_idle_add(GraphTab_deleteLater, &deleteLater);	1178	gtk_idle_add(GraphTab_deleteLater, &deleteLater);
1179	}	1179	}
1180		1180
1181		1181
1182		1182
1183	SigC::Signal1<void, Graph *> Graph::signal_addedPlot(void)	1183	sigc::signal1<void, Graph *> Graph::signal_addedPlot(void)
1184	{	1184	{
1185	return m_signal_addedPlot;	1185	return m_signal_addedPlot;
1186	}	1186	}
1187		1187
1188	SigC::Signal2<void, Graph , Plot > Graph::signal_removedPlot(void)	1188	sigc::signal2<void, Graph , Plot > Graph::signal_removedPlot(void)
1189	{	1189	{
1190	return m_signal_removedPlot;	1190	return m_signal_removedPlot;
1191	}	1191	}
1192		1192
1193	SigC::Signal1<void, Graph *> Graph::m_signal_addedPlot;	1193	sigc::signal1<void, Graph *> Graph::m_signal_addedPlot;
1194		1194
1195	SigC::Signal2<void, Graph , Plot > Graph::m_signal_removedPlot;	1195	sigc::signal2<void, Graph , Plot > Graph::m_signal_removedPlot;
1196		1196
1197		1197
1198		1198
1199	SigC::Signal1<void, Graph *> Graph::signal_changedSameScale(void)	1199	sigc::signal1<void, Graph *> Graph::signal_changedSameScale(void)
1200	{	1200	{
1201	return m_signal_changedSameScale;	1201	return m_signal_changedSameScale;
1202	}	1202	}
1203		1203
1204	SigC::Signal1<void, Graph *> Graph::m_signal_changedSameScale;	1204	sigc::signal1<void, Graph *> Graph::m_signal_changedSameScale;
1205		1205
1206		1206
1207	SigC::Signal0<void> Graph::signal_backgroundColorChanged(void)	1207	sigc::signal0<void> Graph::signal_backgroundColorChanged(void)
1208	{	1208	{
1209	return m_signal_backgroundColorChanged;	1209	return m_signal_backgroundColorChanged;
1210	}	1210	}
1211		1211

Lines 501-511 Link Here

(-)quickplot-0.8.13.old/Plot.cpp (-2 / +2 lines)
501	m_signal_changed.emit();	501	m_signal_changed.emit();
502	}	502	}
503		503
504	// Emitted when the lineColor, pointColor, lineWidth or pointSize	504	// Emitted when the lineColor, pointColor, lineWidth or pointSize
505	// changes.	505	// changes.
506	SigC::Signal0<void> Plot::signal_changed(void)	506	sigc::signal0<void> Plot::signal_changed(void)
507	{	507	{
508	return m_signal_changed;	508	return m_signal_changed;
509	}	509	}
510		510
511	// pick a Y value.	511	// pick a Y value.
Lines 661-671 Link Here
661	xpick = (X - currentZoomLevel->shiftX)/currentZoomLevel->scaleX;	661	xpick = (X - currentZoomLevel->shiftX)/currentZoomLevel->scaleX;
662	ypick = (Y - currentZoomLevel->shiftY)/currentZoomLevel->scaleY;	662	ypick = (Y - currentZoomLevel->shiftY)/currentZoomLevel->scaleY;
663	m_signal_valueDisplay.emit(xpick, ypick);	663	m_signal_valueDisplay.emit(xpick, ypick);
664	}	664	}
665		665
666	SigC::Signal2<void, value_t, value_t> Plot::signal_valueDisplay(void)	666	sigc::signal2<void, value_t, value_t> Plot::signal_valueDisplay(void)
667	{	667	{
668	return m_signal_valueDisplay;	668	return m_signal_valueDisplay;
669	}	669	}
670		670
671		671

Lines 99-128 Link Here

(-)quickplot-0.8.13.old/Plot.h (-4 / +4 lines)
99		99
100	Graph *graph;	100	Graph *graph;
101		101
102	// Emitted when the lineColor, pointColor, lineWidth, pointSize,	102	// Emitted when the lineColor, pointColor, lineWidth, pointSize,
103	// showLines and showPoints.	103	// showLines and showPoints.
104	SigC::Signal0<void> signal_changed(void);	104	sigc::signal0<void> signal_changed(void);
105		105
106		106
107	int emitDisplayValues(int X);	107	int emitDisplayValues(int X);
108	void emitInterpolatedDisplayValues(int X);	108	void emitInterpolatedDisplayValues(int X);
109	void emitDisplayValues(int X, int Y);	109	void emitDisplayValues(int X, int Y);
110		110
111	SigC::Signal2<void, value_t, value_t> signal_valueDisplay(void);	111	sigc::signal2<void, value_t, value_t> signal_valueDisplay(void);
112		112
113	value_t xpick, ypick;	113	value_t xpick, ypick;
114		114
115	protected:	115	protected:
116		116
117	private:	117	private:
118		118
119	bool showPoints, showLines;	119	bool showPoints, showLines;
120		120
121	SigC::Signal0<void> m_signal_changed;	121	sigc::signal0<void> m_signal_changed;
122		122
123	SigC::Signal2<void, value_t, value_t> m_signal_valueDisplay;	123	sigc::signal2<void, value_t, value_t> m_signal_valueDisplay;
124		124
125	Gdk::Color lineColor, pointColor;	125	Gdk::Color lineColor, pointColor;
126		126
127	// Cull and Draw.	127	// Cull and Draw.
128	void cullDrawLine(value_t fromX, value_t fromY, value_t toX, value_t toY);	128	void cullDrawLine(value_t fromX, value_t fromY, value_t toX, value_t toY);

Lines 205-224 Link Here

(-)quickplot-0.8.13.old/Source.cpp (-4 / +4 lines)
205	{	205	{
206	gtk_idle_add(deleteSLater, &dl);	206	gtk_idle_add(deleteSLater, &dl);
207	}	207	}
208		208
209		209
210	SigC::Signal1<void, Source *> Source::signal_addedSource()	210	sigc::signal1<void, Source *> Source::signal_addedSource()
211	{	211	{
212	return m_signal_addedSource;	212	return m_signal_addedSource;
213	}	213	}
214		214
215	SigC::Signal1<void, Source *> Source::m_signal_addedSource;	215	sigc::signal1<void, Source *> Source::m_signal_addedSource;
216		216
217		217
218	SigC::Signal1<void, Source *> Source::signal_removedSource()	218	sigc::signal1<void, Source *> Source::signal_removedSource()
219	{	219	{
220	return m_signal_removedSource;	220	return m_signal_removedSource;
221	}	221	}
222		222
223	SigC::Signal1<void, Source *> Source::m_signal_removedSource;	223	sigc::signal1<void, Source *> Source::m_signal_removedSource;
224		224

Lines 66-79 Link Here

(-)quickplot-0.8.13.old/Graph.h (-8 / +8 lines)
66	bool showGridNumbers;	66	bool showGridNumbers;
67		67
68	inline bool isShowingGrid() { return (showAutoGrid && isSameScale); }	68	inline bool isShowingGrid() { return (showAutoGrid && isSameScale); }
69	/************************************************************/	69	/************************************************************/
70		70
71	static SigC::Signal1<void, Graph *> signal_changedSameScale(void);	71	static sigc::signal1<void, Graph *> signal_changedSameScale(void);
72	static SigC::Signal1<void, Graph *> signal_addedPlot(void);	72	static sigc::signal1<void, Graph *> signal_addedPlot(void);
73	static SigC::Signal2<void, Graph , Plot > signal_removedPlot(void);	73	static sigc::signal2<void, Graph , Plot > signal_removedPlot(void);
74	SigC::Signal0<void> signal_backgroundColorChanged(void);	74	sigc::signal0<void> signal_backgroundColorChanged(void);
75		75
76		76
77	Gdk::Color gridColor, backgroundColor;	77	Gdk::Color gridColor, backgroundColor;
78		78
79	int gridXLineSpace, gridYLineSpace, gridLineWidth;	79	int gridXLineSpace, gridYLineSpace, gridLineWidth;
Lines 103-118 Link Here
103		103
104	void setPickerType(void);	104	void setPickerType(void);
105		105
106	void setStatusXYValues(gdouble x, gdouble y);	106	void setStatusXYValues(gdouble x, gdouble y);
107		107
108	static SigC::Signal1<void, Graph *> m_signal_changedSameScale;	108	static sigc::signal1<void, Graph *> m_signal_changedSameScale;
109		109
110	static SigC::Signal1<void, Graph *> m_signal_addedPlot;	110	static sigc::signal1<void, Graph *> m_signal_addedPlot;
111	static SigC::Signal2<void, Graph , Plot > m_signal_removedPlot;	111	static sigc::signal2<void, Graph , Plot > m_signal_removedPlot;
112		112
113	SigC::Signal0<void> m_signal_backgroundColorChanged;	113	sigc::signal0<void> m_signal_backgroundColorChanged;
114		114
115		115
116	// used by createPlot(Field x, Field y)	116	// used by createPlot(Field x, Field y)
117	void checkZoomLevelForNewPlot(Plot *plot);	117	void checkZoomLevelForNewPlot(Plot *plot);
118		118

Lines 17-28 Link Here

(-)quickplot-0.8.13.old/MainWindow.h (-2 / +2 lines)
17	// to "signal" the View Menu in MainMenuBar.cpp, to add a runtime	17	// to "signal" the View Menu in MainMenuBar.cpp, to add a runtime
18	// "show/hide tabs option. Is there a signal_show_tabs() or like	18	// "show/hide tabs option. Is there a signal_show_tabs() or like
19	// method??? It's not listed.	19	// method??? It's not listed.
20	void set_show_tabs(bool show_tabs = true);	20	void set_show_tabs(bool show_tabs = true);
21		21
22	SigC::Signal1<void, Graph *> signal_tabLabelChanged(void);	22	sigc::signal1<void, Graph *> signal_tabLabelChanged(void);
23	SigC::Signal1<void, Graph *> m_signal_tabLabelChanged;	23	sigc::signal1<void, Graph *> m_signal_tabLabelChanged;
24		24
25	private:	25	private:
26	MainWindow *mainWindow;	26	MainWindow *mainWindow;
27	};	27	};
28		28

Lines 22-32 Link Here

(-)quickplot-0.8.13.old/PlotLister.h (-3 / +3 lines)
22	bool limitSize;	22	bool limitSize;
23		23
24	Glib::RefPtr<Gdk::Window> win;	24	Glib::RefPtr<Gdk::Window> win;
25	Glib::RefPtr<Gdk::GC> gc;	25	Glib::RefPtr<Gdk::GC> gc;
26		26
27	SigC::Connection plotChangeConnection, bgConnection;	27	sigc::connection plotChangeConnection, bgConnection;
28	};	28	};
29		29
30		30
31		31
32	class Row	32	class Row
Lines 50-67 Link Here
50		50
51	int row;	51	int row;
52	Table *table;	52	Table *table;
53	MainWindow *mainWindow;	53	MainWindow *mainWindow;
54	Plot *plot;	54	Plot *plot;
55	SigC::Connection valueDisplay_connection, makePlotConfig_connection;	55	sigc::connection valueDisplay_connection, makePlotConfig_connection;
56		56
57	void add(Widget &w, int col);	57	void add(Widget &w, int col);
58	void makePlotConfig(void);	58	void makePlotConfig(void);
59	//void setLabelSize(Entry &l);	59	//void setLabelSize(Entry &l);
60	//void afterRealize(void);	60	//void afterRealize(void);
61		61
62	//SigC::Connection afterRealizeConnection;	62	//sigc::connection afterRealizeConnection;
63	};	63	};
64		64
65		65
66		66
67	class PlotLister : public Window	67	class PlotLister : public Window

Lines 48-70 Link Here

(-)quickplot-0.8.13.old/Source.h (-4 / +4 lines)
48		48
49		49
50	inline const enum TYPE getType(void){ return type; }	50	inline const enum TYPE getType(void){ return type; }
51	inline const char *getTypeString(void){ return TYPE_STRING[type]; }	51	inline const char *getTypeString(void){ return TYPE_STRING[type]; }
52		52
53	static SigC::Signal1<void, Source *> signal_addedSource();	53	static sigc::signal1<void, Source *> signal_addedSource();
54	static SigC::Signal1<void, Source *> signal_removedSource();	54	static sigc::signal1<void, Source *> signal_removedSource();
55		55
56	// Delete this object later.	56	// Delete this object later.
57	void deleteLater(void);	57	void deleteLater(void);
58		58
59	std::list<CloseSourceMenuItem *> closeSourceMenuItems;	59	std::list<CloseSourceMenuItem *> closeSourceMenuItems;
60		60
61		61
62	protected:	62	protected:
63		63
64	static SigC::Signal1<void, Source *> m_signal_addedSource;	64	static sigc::signal1<void, Source *> m_signal_addedSource;
65	static SigC::Signal1<void, Source *> m_signal_removedSource;	65	static sigc::signal1<void, Source *> m_signal_removedSource;
66		66
67	inline void setType(enum TYPE t) { type = t; }	67	inline void setType(enum TYPE t) { type = t; }
68	char fileName, baseFileName;	68	char fileName, baseFileName;
69	void addCloseMenus(const char *label);	69	void addCloseMenus(const char *label);
70		70

Lines 173-183 Link Here

(-)quickplot-0.8.13.old/ValueSlider.cpp (-3 / +3 lines)
173	else	173	else
174	return false; // no value change	174	return false; // no value change
175	}	175	}
176	}	176	}
177		177
178	SigC::Signal0<void> ValueSlider::signal_valueChanged()	178	sigc::signal0<void> ValueSlider::signal_valueChanged()
179	{	179	{
180	return m_signal_valueChanged;	180	return m_signal_valueChanged;
181	}	181	}
182		182
183		183
Lines 327-337 Link Here
327	else	327	else
328	return false; // no value change	328	return false; // no value change
329	}	329	}
330	}	330	}
331		331
332	SigC::Signal0<void> DoubleValueSlider::signal_valueChanged()	332	sigc::signal0<void> DoubleValueSlider::signal_valueChanged()
333	{	333	{
334	return m_signal_valueChanged;	334	return m_signal_valueChanged;
335	}	335	}
336		336
337		337
Lines 477-486 Link Here
477	int LogValueSlider::getValue(void)	477	int LogValueSlider::getValue(void)
478	{	478	{
479	return (int) pow(10.0, value);	479	return (int) pow(10.0, value);
480	}	480	}
481		481
482	SigC::Signal0<void> LogValueSlider::signal_valueChanged()	482	sigc::signal0<void> LogValueSlider::signal_valueChanged()
483	{	483	{
484	return m_signal_valueChanged;	484	return m_signal_valueChanged;
485	}	485	}
486		486

Lines 18-31 Link Here

(-)quickplot-0.8.13.old/ValueSlider.h (-6 / +6 lines)
18		18
19	int value;	19	int value;
20	double maxmax;	20	double maxmax;
21		21
22	public:	22	public:
23	SigC::Signal0<void> signal_valueChanged();	23	sigc::signal0<void> signal_valueChanged();
24		24
25	private:	25	private:
26	SigC::Signal0<void> m_signal_valueChanged;	26	sigc::signal0<void> m_signal_valueChanged;
27		27
28	bool setScaleToEntry(void);	28	bool setScaleToEntry(void);
29		29
30	bool setEntryToScale(void);	30	bool setEntryToScale(void);
31		31
Lines 51-64 Link Here
51	Entry entry;	51	Entry entry;
52		52
53	double value, maxmax;	53	double value, maxmax;
54		54
55	public:	55	public:
56	SigC::Signal0<void> signal_valueChanged();	56	sigc::signal0<void> signal_valueChanged();
57		57
58	private:	58	private:
59	SigC::Signal0<void> m_signal_valueChanged;	59	sigc::signal0<void> m_signal_valueChanged;
60		60
61	bool setScaleToEntry(void);	61	bool setScaleToEntry(void);
62		62
63	bool setEntryToScale(void);	63	bool setEntryToScale(void);
64		64
Lines 86-99 Link Here
86		86
87	// log of getValue()	87	// log of getValue()
88	double value;	88	double value;
89		89
90	public:	90	public:
91	SigC::Signal0<void> signal_valueChanged();	91	sigc::signal0<void> signal_valueChanged();
92		92
93	private:	93	private:
94	SigC::Signal0<void> m_signal_valueChanged;	94	sigc::signal0<void> m_signal_valueChanged;
95		95
96	bool setScaleToEntry(void);	96	bool setScaleToEntry(void);
97		97
98	bool setEntryToScale(void);	98	bool setEntryToScale(void);
99		99