[1.46.26]

espeakedit: Change from wxMDI to wxNotebook for prosody and vowel pages.
espeakedit: (linux) change to wxWidgets 2.8.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@292 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2012-09-17 22:32:13 +00:00
parent 736e6deb28
commit e1fd37b94c
13 changed files with 352 additions and 410 deletions
+6 -6
View File
@@ -97,7 +97,7 @@ void FormantDlg::OnSpin(wxSpinEvent& event)
currentcanvas->SetFocus();
}
FormantDlg::FormantDlg(wxWindow *parent) : wxPanel(parent,-1,wxDefaultPosition,wxSize(400,1000))
FormantDlg::FormantDlg(wxWindow *parent) : wxPanel(parent,-1,wxDefaultPosition,wxSize(400,800))
{//=============================================================================================
int ix;
int y;
@@ -395,7 +395,7 @@ void FormantDlg::ShowFrame(SpectSeq *spectseq, int frame, int pk, int field)
{
value.Printf(_T("%3d"),peak->klt_bp);
t_klt_bp[ix]->SetValue(value);
}
}
}
}
@@ -469,12 +469,12 @@ void ByteGraph::DrawSpectrum(wxDC& dc)
numframes = seq->numframes;
if(numframes == 0) return;
GetClientSize(&width,&height);
if(((length = seq->frames[numframes-1]->time)==0) && (numframes>1))
length = seq->frames[numframes-2]->time;
length = length - seq->frames[0]->time;
yscale = height/3000.0;
@@ -518,7 +518,7 @@ void ByteGraph::OnDraw(wxDC &dc)
double xscale, yscale;
if(show_spectrum) DrawSpectrum(dc);
if(npoints==0) return;
GetClientSize(&width,&height);
@@ -559,7 +559,7 @@ void ByteGraph::OnMouse(wxMouseEvent& event)
wxPoint pt(event.GetLogicalPosition(dc));
t0 = t2 = seq->frames[0]->time;
time = (double(pt.x) / spectrum_scale) + t0;
for(ix=1; ix<seq->numframes; ix++)
{
t1=t2;