chronojump r422 - in trunk: . build/data src/angle src/gui web/data/langs/_ca/Pages web/data/langs/_en/Pages web/data/langs/_es/Pages web/data/langs/_gl/Pages web/data/langs/_pt/Pages web/html_created_no_edit/print
- From: xaviblas svn gnome org
- To: svn-commits-list gnome org
- Subject: chronojump r422 - in trunk: . build/data src/angle src/gui web/data/langs/_ca/Pages web/data/langs/_en/Pages web/data/langs/_es/Pages web/data/langs/_gl/Pages web/data/langs/_pt/Pages web/html_created_no_edit/print
- Date: Tue, 21 Oct 2008 11:12:38 +0000 (UTC)
Author: xaviblas
Date: Tue Oct 21 11:12:38 2008
New Revision: 422
URL: http://svn.gnome.org/viewvc/chronojump?rev=422&view=rev
Log:
0.7.5.4
fixed bug in add multiple, sex cannot be changed (in first calling to that
window it can, but in subsequent calls... not). It was caused to prepare
signal that was not "-=" and then add multiple was called more than one time:
genericWin.Button_accept.Clicked -= new
EventHandler(on_person_add_multiple_prepared);
0.7.5.3
bug fixed: when people destroyed execute window, and event has ended,
it tryes to cancel, there was nothing to cancel, and we entered
endless loop. Fixed.
Modified:
trunk/build/data/chronojump.prg
trunk/build/data/chronojump_mini.prg
trunk/build/data/version.txt
trunk/changelog.txt
trunk/howto_translate.txt
trunk/src/angle/kneeAngle.cpp
trunk/src/gui/chronojump.cs
trunk/src/gui/eventExecute.cs
trunk/version.txt
trunk/web/data/langs/_ca/Pages/construction_contact_platform
trunk/web/data/langs/_en/Pages/construction_contact_platform
trunk/web/data/langs/_es/Pages/construction_contact_platform
trunk/web/data/langs/_gl/Pages/construction_contact_platform
trunk/web/data/langs/_pt/Pages/construction_contact_platform
trunk/web/html_created_no_edit/print/construction_contact_platform.html
trunk/web/html_created_no_edit/print/construction_contact_platform_ca.html
trunk/web/html_created_no_edit/print/construction_contact_platform_es.html
trunk/web/html_created_no_edit/print/construction_contact_platform_gl.html
trunk/web/html_created_no_edit/print/construction_contact_platform_pt.html
Modified: trunk/build/data/chronojump.prg
==============================================================================
Binary files. No diff available.
Modified: trunk/build/data/chronojump_mini.prg
==============================================================================
Binary files. No diff available.
Modified: trunk/build/data/version.txt
==============================================================================
--- trunk/build/data/version.txt (original)
+++ trunk/build/data/version.txt Tue Oct 21 11:12:38 2008
@@ -1 +1 @@
-0.7.5.2
+0.7.5.4
Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt (original)
+++ trunk/changelog.txt Tue Oct 21 11:12:38 2008
@@ -1,5 +1,19 @@
CHRONOJUMP DETAILED CHANGELOG:
+21 oct 2008
+ 0.7.5.4
+ fixed bug in add multiple, sex cannot be changed (in first calling to that
+ window it can, but in subsequent calls... not). It was caused to prepare
+ signal that was not "-=" and then add multiple was called more than one time:
+
+ genericWin.Button_accept.Clicked -= new
+ EventHandler(on_person_add_multiple_prepared);
+
+ 0.7.5.3
+ bug fixed: when people destroyed execute window, and event has ended,
+ it tryes to cancel, there was nothing to cancel, and we entered
+ endless loop. Fixed.
+
4 set 2008
0.7.5.2 (test release with installjammer 1.2.9, trying to fix problem:
no shortcuts and no start menu entries on install in greek xp)
Modified: trunk/howto_translate.txt
==============================================================================
--- trunk/howto_translate.txt (original)
+++ trunk/howto_translate.txt Tue Oct 21 11:12:38 2008
@@ -192,6 +192,20 @@
If they are installed, the best is to change in gdm (in ubuntu only use the UTF-8 locales) for example:
export LANGUAGE="es_ES.UTF-8"
+for dzongkha:
+export LANGUAGE="dz_BT.UTF-8"
+with:
+dpkg -l|grep dzongkha
+ii ttf-dzongkha 0.3-1 TrueType fonts for Dzongkha language
+
+vietnamese:
+export LANGUAGE="vi_VI.UTF-8"
+ohers:
+export LANGUAGE="pt.UTF-8"
+export LANGUAGE="fr_FR.UTF-8"
+...
+
+
if not: sudo dpkg-reconfigure locales
if the code or the glade has changed, remember do 'make'
Modified: trunk/src/angle/kneeAngle.cpp
==============================================================================
--- trunk/src/angle/kneeAngle.cpp (original)
+++ trunk/src/angle/kneeAngle.cpp Tue Oct 21 11:12:38 2008
@@ -265,10 +265,12 @@
cvCvtColor(frame_copy,gray,CV_BGR2GRAY);
//created image like the contour but with holes and more (stores on segmentedValidationHoles)
- cvThreshold(gray,segmentedValidationHoles,30,255,CV_THRESH_BINARY_INV);
+ //recommended 30,255
+ cvThreshold(gray,segmentedValidationHoles,0,255,CV_THRESH_BINARY_INV);
//create the largest contour image (stored on temp)
- cvThreshold(gray,segmented,30,255,CV_THRESH_BINARY_INV);
+ //recommended 30,255
+ cvThreshold(gray,segmented,0,255,CV_THRESH_BINARY_INV);
CvRect maxrect = findLargestContour(segmented, output, showContour);
//search in output all the black places (pants) and
@@ -354,6 +356,8 @@
cvCircle(frame_copy,kneePoint,3, CV_RGB(255,255,0),1,8,0);
+cvLine(frame_copy,cvPoint(0,hipPoint.y),cvPoint(frame_copy->width, hipPoint.y),CV_RGB(255,255,0),1,1);
+cvLine(frame_copy,cvPoint(0,kneePoint.y),cvPoint(frame_copy->width, kneePoint.y),CV_RGB(255,255,0),1,1);
//find width of toe for each photogramme
toePointWidth = FindWidth(output, toePoint, false);
Modified: trunk/src/gui/chronojump.cs
==============================================================================
--- trunk/src/gui/chronojump.cs (original)
+++ trunk/src/gui/chronojump.cs Tue Oct 21 11:12:38 2008
@@ -1750,6 +1750,7 @@
}
private void on_person_add_multiple_prepared (object o, EventArgs args) {
+ genericWin.Button_accept.Clicked -= new EventHandler(on_person_add_multiple_prepared);
personAddMultipleWin = PersonAddMultipleWindow.Show(app1, currentSession, genericWin.SpinSelected);
personAddMultipleWin.Button_accept.Clicked += new EventHandler(on_person_add_multiple_accepted);
}
@@ -2107,6 +2108,8 @@
private void on_cancel_clicked (object o, EventArgs args)
{
+ Console.WriteLine("clicked one");
+
//this will cancel jumps or runs
currentEventExecute.Cancel = true;
Modified: trunk/src/gui/eventExecute.cs
==============================================================================
--- trunk/src/gui/eventExecute.cs (original)
+++ trunk/src/gui/eventExecute.cs Tue Oct 21 11:12:38 2008
@@ -155,6 +155,16 @@
int radio = 8; //radious of the circles
int arcSystemCorrection = 0; //on Windows circles are paint just one pixel left, fix it
int rightMargin = 30; //at the right we write text (on windows we change later)
+
+ /*
+ * when click on destroy window, delete event is raised
+ * if event has ended, then it should normally close the window
+ * if has not ended, then it should cancel it before.
+ * on 0.7.5.2 and before, we always cancel,
+ * and this produces and endless loop when event has ended, because there's nothing to cancel
+ */
+ bool eventHasEnded;
+
//for writing text
Pango.Layout layout;
@@ -198,7 +208,7 @@
EventExecuteWindowBox.hideAllTables();
EventExecuteWindowBox.hideImages();
-
+
EventExecuteWindowBox.initializeVariables (
windowTitle, phasesName, personID, personName, sessionID,
tableName, eventType, pDN, limit, simulated);
@@ -281,6 +291,8 @@
layout.FontDescription = Pango.FontDescription.FromString ("Courier 7");
putNonStandardIcons();
+
+ eventHasEnded = false;
}
private void putNonStandardIcons() {
@@ -1434,6 +1446,7 @@
public void EventEnded() {
hideButtons();
+ eventHasEnded = true;
}
@@ -1599,8 +1612,9 @@
void on_delete_event (object o, DeleteEventArgs args)
{
//if there's an event doing, simulate a cancel
- //if there's not, simulate also
- button_cancel.Click();
+ //see eventHasEnded comments at beginning of this file
+ if(!eventHasEnded)
+ button_cancel.Click();
EventExecuteWindowBox.event_execute.Hide();
EventExecuteWindowBox = null;
Modified: trunk/version.txt
==============================================================================
--- trunk/version.txt (original)
+++ trunk/version.txt Tue Oct 21 11:12:38 2008
@@ -1 +1 @@
-0.7.5.2
+0.7.5.4
Modified: trunk/web/data/langs/_ca/Pages/construction_contact_platform
==============================================================================
--- trunk/web/data/langs/_ca/Pages/construction_contact_platform (original)
+++ trunk/web/data/langs/_ca/Pages/construction_contact_platform Tue Oct 21 11:12:38 2008
@@ -84,4 +84,8 @@
</ul>
<hr width ="50%">
-Accediu a <a href="construction_contact_platform_comments_ca.html">Comentaris sobre la fabricaciÃ</a>.
+<ul>
+<li>Vegeu aquest video que parla de com construir la plataforma de contactes i altres dispositiu: <a href="http://www.vimeo.com/1205809";>Construccià de dispositius de mesura per a Chronojump</a>.
+<li>Consulteu <a href="construction_contact_platform_buy_stuff_es.html">on comprar els components</a> (o actualitzeu aquesta informaciÃ).
+<li>Accediu a <a href="construction_contact_platform_comments_ca.html">Comentaris sobre la fabricaciÃ</a>.
+</ul>
Modified: trunk/web/data/langs/_en/Pages/construction_contact_platform
==============================================================================
--- trunk/web/data/langs/_en/Pages/construction_contact_platform (original)
+++ trunk/web/data/langs/_en/Pages/construction_contact_platform Tue Oct 21 11:12:38 2008
@@ -102,4 +102,8 @@
</ul>
<hr width ="50%">
-Go to <a href="construction_contact_platform_comments_es.html"> Comments on manufacturing</a> (spanish).
+<ul>
+<li>See this video (catalan) that tells how to build contact platform and other dispositives: <a href="http://www.vimeo.com/1205809";>Construccià de dispositius de mesura per a Chronojump</a>.
+<li>Check <a href="construction_contact_platform_buy_stuff.html">where to buy components</a> to create your platform (or update that information).
+<li>Go to <a href="construction_contact_platform_comments_es.html"> Comments on manufacturing</a> (spanish).
+</ul>
Modified: trunk/web/data/langs/_es/Pages/construction_contact_platform
==============================================================================
--- trunk/web/data/langs/_es/Pages/construction_contact_platform (original)
+++ trunk/web/data/langs/_es/Pages/construction_contact_platform Tue Oct 21 11:12:38 2008
@@ -120,6 +120,9 @@
</ul>
<hr width ="50%">
-Acceda a <a href="construction_contact_platform_comments_es.html">Comentarios sobre la fabricaciÃn</a>.
-
+<ul>
+<li>Vea este vÃdeo (en catalÃn) sobre cÃmo construir la plataforma de contactos y otros dispositivos: <a href="http://www.vimeo.com/1205809";>Construccià de dispositius de mesura per a Chronojump</a>.
+<li>Consulte informaciÃn sobre <a href="construction_contact_platform_buy_stuff_es.html">dÃnde comprar componentes</a> (o actualice dicha informaciÃn).
+<li>Acceda a <a href="construction_contact_platform_comments_es.html">Comentarios sobre la fabricaciÃn</a>.
+</ul>
Modified: trunk/web/data/langs/_gl/Pages/construction_contact_platform
==============================================================================
--- trunk/web/data/langs/_gl/Pages/construction_contact_platform (original)
+++ trunk/web/data/langs/_gl/Pages/construction_contact_platform Tue Oct 21 11:12:38 2008
@@ -115,7 +115,11 @@
</ul>
<hr width ="50%">
-Visite <a href="construction_contact_platform_comments_es.html">Comentarios sobre a fabricaciÃn</a> (castelÃn).
+<ul>
+<li>Vea este vÃdeo (en catalÃn) sobre cÃmo construir la plataforma de contactos y otros dispositivos: <a href="http://www.vimeo.com/1205809";>Construccià de dispositius de mesura per a Chronojump</a>. TRADUCIR
+<li>Consulte informaciÃn sobre <a href="construction_contact_platform_buy_stuff_es.html">dÃnde comprar componentes</a> (o actualice dicha informaciÃn). TRADUCIR
+<li>Visite <a href="construction_contact_platform_comments_es.html">Comentarios sobre a fabricaciÃn</a> (castelÃn).
+</ul>
Modified: trunk/web/data/langs/_pt/Pages/construction_contact_platform
==============================================================================
--- trunk/web/data/langs/_pt/Pages/construction_contact_platform (original)
+++ trunk/web/data/langs/_pt/Pages/construction_contact_platform Tue Oct 21 11:12:38 2008
@@ -113,4 +113,8 @@
</ul>
<hr width ="50%">
-Acesse a <a href="construction_contact_platform_comments_es.html">Comentarios sobre a fabricaÃÃo</a> (espanhol).
+<ul>
+<li>See this vide (catalan) that tells how to build contact platform and other dispositives: <a href="http://www.vimeo.com/1205809";>Construccià de dispositius de mesura per a Chronojump</a>. TRANSLATE
+<li>Check <a href="construction_contact_platform_buy_stuff.html">where to buy components</a> to create your platform (or update that information). TRANSLATE
+<li>Acesse a <a href="construction_contact_platform_comments_es.html">Comentarios sobre a fabricaÃÃo</a> (espanhol).
+</ul>
Modified: trunk/web/html_created_no_edit/print/construction_contact_platform.html
==============================================================================
--- trunk/web/html_created_no_edit/print/construction_contact_platform.html (original)
+++ trunk/web/html_created_no_edit/print/construction_contact_platform.html Tue Oct 21 11:12:38 2008
@@ -117,5 +117,9 @@
</ul>
<hr width ="50%">
-Go to <a href="construction_contact_platform_comments_es.html"> Comments on manufacturing</a> (spanish).
+<ul>
+<li>See this video (catalan) that tells how to build contact platform and other dispositives: <a href="http://www.vimeo.com/1205809";>Construcció de dispositius de mesura per a Chronojump</a>.
+<li>Check <a href="construction_contact_platform_buy_stuff.html">where to buy components</a> to create your platform (or update that information).
+<li>Go to <a href="construction_contact_platform_comments_es.html"> Comments on manufacturing</a> (spanish).
+</ul>
</body></html>
\ No newline at end of file
Modified: trunk/web/html_created_no_edit/print/construction_contact_platform_ca.html
==============================================================================
--- trunk/web/html_created_no_edit/print/construction_contact_platform_ca.html (original)
+++ trunk/web/html_created_no_edit/print/construction_contact_platform_ca.html Tue Oct 21 11:12:38 2008
@@ -99,5 +99,9 @@
</ul>
<hr width ="50%">
-Accediu a <a href="construction_contact_platform_comments_ca.html">Comentaris sobre la fabricació</a>.
+<ul>
+<li>Vegeu aquest video que parla de com construir la plataforma de contactes i altres dispositiu: <a href="http://www.vimeo.com/1205809";>Construcció de dispositius de mesura per a Chronojump</a>.
+<li>Consulteu <a href="construction_contact_platform_buy_stuff_es.html">on comprar els components</a> (o actualitzeu aquesta informació).
+<li>Accediu a <a href="construction_contact_platform_comments_ca.html">Comentaris sobre la fabricació</a>.
+</ul>
</body></html>
\ No newline at end of file
Modified: trunk/web/html_created_no_edit/print/construction_contact_platform_es.html
==============================================================================
--- trunk/web/html_created_no_edit/print/construction_contact_platform_es.html (original)
+++ trunk/web/html_created_no_edit/print/construction_contact_platform_es.html Tue Oct 21 11:12:38 2008
@@ -135,7 +135,10 @@
</ul>
<hr width ="50%">
-Acceda a <a href="construction_contact_platform_comments_es.html">Comentarios sobre la fabricación</a>.
-
+<ul>
+<li>Vea este vídeo (en catalán) sobre cómo construir la plataforma de contactos y otros dispositivos: <a href="http://www.vimeo.com/1205809";>Construcció de dispositius de mesura per a Chronojump</a>.
+<li>Consulte información sobre <a href="construction_contact_platform_buy_stuff_es.html">dónde comprar componentes</a> (o actualice dicha información).
+<li>Acceda a <a href="construction_contact_platform_comments_es.html">Comentarios sobre la fabricación</a>.
+</ul>
</body></html>
\ No newline at end of file
Modified: trunk/web/html_created_no_edit/print/construction_contact_platform_gl.html
==============================================================================
--- trunk/web/html_created_no_edit/print/construction_contact_platform_gl.html (original)
+++ trunk/web/html_created_no_edit/print/construction_contact_platform_gl.html Tue Oct 21 11:12:38 2008
@@ -130,7 +130,11 @@
</ul>
<hr width ="50%">
-Visite <a href="construction_contact_platform_comments_es.html">Comentarios sobre a fabricación</a> (castelán).
+<ul>
+<li>Vea este vídeo (en catalán) sobre cómo construir la plataforma de contactos y otros dispositivos: <a href="http://www.vimeo.com/1205809";>Construcció de dispositius de mesura per a Chronojump</a>. TRADUCIR
+<li>Consulte información sobre <a href="construction_contact_platform_buy_stuff_es.html">dónde comprar componentes</a> (o actualice dicha información). TRADUCIR
+<li>Visite <a href="construction_contact_platform_comments_es.html">Comentarios sobre a fabricación</a> (castelán).
+</ul>
Modified: trunk/web/html_created_no_edit/print/construction_contact_platform_pt.html
==============================================================================
--- trunk/web/html_created_no_edit/print/construction_contact_platform_pt.html (original)
+++ trunk/web/html_created_no_edit/print/construction_contact_platform_pt.html Tue Oct 21 11:12:38 2008
@@ -128,5 +128,9 @@
</ul>
<hr width ="50%">
-Acesse a <a href="construction_contact_platform_comments_es.html">Comentarios sobre a fabricação</a> (espanhol).
+<ul>
+<li>See this vide (catalan) that tells how to build contact platform and other dispositives: <a href="http://www.vimeo.com/1205809";>Construcció de dispositius de mesura per a Chronojump</a>. TRANSLATE
+<li>Check <a href="construction_contact_platform_buy_stuff.html">where to buy components</a> to create your platform (or update that information). TRANSLATE
+<li>Acesse a <a href="construction_contact_platform_comments_es.html">Comentarios sobre a fabricação</a> (espanhol).
+</ul>
</body></html>
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
