illumination-commit Mailing List for Illumination (Page 3)
Status: Beta
Brought to you by:
tteuling
Menu
▾
▴
illumination-commit — Mailing list for subversion commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(100) |
Aug
(37) |
Sep
(64) |
Oct
(104) |
Nov
(68) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(23) |
Feb
(9) |
Mar
(21) |
Apr
(53) |
May
(113) |
Jun
(35) |
Jul
(107) |
Aug
(224) |
Sep
(74) |
Oct
(93) |
Nov
(115) |
Dec
(111) |
| 2006 |
Jan
(85) |
Feb
(113) |
Mar
(66) |
Apr
(18) |
May
(21) |
Jun
(39) |
Jul
(50) |
Aug
(19) |
Sep
(14) |
Oct
(34) |
Nov
(15) |
Dec
(46) |
| 2007 |
Jan
(86) |
Feb
(65) |
Mar
(42) |
Apr
(21) |
May
(32) |
Jun
(80) |
Jul
(52) |
Aug
(144) |
Sep
(57) |
Oct
(74) |
Nov
(131) |
Dec
(26) |
| 2008 |
Jan
(3) |
Feb
(30) |
Mar
(28) |
Apr
(16) |
May
(37) |
Jun
(65) |
Jul
(58) |
Aug
(71) |
Sep
(54) |
Oct
(123) |
Nov
(94) |
Dec
(84) |
| 2009 |
Jan
(104) |
Feb
(114) |
Mar
(95) |
Apr
(32) |
May
(61) |
Jun
(7) |
Jul
(63) |
Aug
(32) |
Sep
(58) |
Oct
(117) |
Nov
(88) |
Dec
(135) |
| 2010 |
Jan
(91) |
Feb
(62) |
Mar
(31) |
Apr
(4) |
May
(41) |
Jun
(28) |
Jul
(65) |
Aug
(45) |
Sep
(137) |
Oct
(208) |
Nov
(50) |
Dec
(98) |
| 2011 |
Jan
(13) |
Feb
(19) |
Mar
(2) |
Apr
(4) |
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(5) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tte...@us...> - 2011-01-05 21:11:59
|
Revision: 4088
http://illumination.svn.sourceforge.net/illumination/?rev=4088&view=rev
Author: tteuling
Date: 2011-01-05 21:11:53 +0000 (Wed, 05 Jan 2011)
Log Message:
-----------
Fixed icons under maemo5.
Modified Paths:
--------------
trunk/GPSJinni/packaging/maemo/changelog
trunk/GPSJinni/packaging/maemo/gpsjinni.install
Modified: trunk/GPSJinni/packaging/maemo/changelog
===================================================================
--- trunk/GPSJinni/packaging/maemo/changelog 2011-01-05 21:03:14 UTC (rev 4087)
+++ trunk/GPSJinni/packaging/maemo/changelog 2011-01-05 21:11:53 UTC (rev 4088)
@@ -1,3 +1,9 @@
+gpsjinni (0.9.20101221-5) unstable; urgency=low
+
+ * Changed icon size
+
+ -- Tim Teulings <ti...@te...> Sun, 2 Jan 2011 12:28:59 +0100
+
gpsjinni (0.9.20101221-4) unstable; urgency=low
* More icon search path bugfixes
Modified: trunk/GPSJinni/packaging/maemo/gpsjinni.install
===================================================================
--- trunk/GPSJinni/packaging/maemo/gpsjinni.install 2011-01-05 21:03:14 UTC (rev 4087)
+++ trunk/GPSJinni/packaging/maemo/gpsjinni.install 2011-01-05 21:11:53 UTC (rev 4088)
@@ -3,5 +3,5 @@
data/icons/26x26/GPSJinni.png usr/share/icons/hicolor/26x26/apps
data/icons/40x40/GPSJinni.png usr/share/icons/hicolor/40x40/apps
data/icons/64x64/GPSJinni.png usr/share/icons/hicolor/scalable/apps
-data/icons/16x16/*.png /usr/share/gpsjinni/icons
+data/icons/48x48/*.png /usr/share/gpsjinni/icons
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2011-01-05 21:03:20
|
Revision: 4087
http://illumination.svn.sourceforge.net/illumination/?rev=4087&view=rev
Author: tteuling
Date: 2011-01-05 21:03:14 +0000 (Wed, 05 Jan 2011)
Log Message:
-----------
* Fixed copyright comment.
Modified Paths:
--------------
trunk/EightyOne/src/Configuration.cpp
Modified: trunk/EightyOne/src/Configuration.cpp
===================================================================
--- trunk/EightyOne/src/Configuration.cpp 2010-12-21 17:23:03 UTC (rev 4086)
+++ trunk/EightyOne/src/Configuration.cpp 2011-01-05 21:03:14 UTC (rev 4087)
@@ -1,5 +1,5 @@
/*
- EightyxOne - A simple Sudoku solving game
+ EightyOne - A simple Sudoku solving game
Copyright (C) 2006 Tim Teulings
This library is free software; you can redistribute it and/or
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 17:23:10
|
Revision: 4086
http://illumination.svn.sourceforge.net/illumination/?rev=4086&view=rev
Author: tteuling
Date: 2010-12-21 17:23:03 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Added localization for new option.
Modified Paths:
--------------
trunk/Scopa/catalogs/de.xml
trunk/Scopa/src/Scopa.cpp
Modified: trunk/Scopa/catalogs/de.xml
===================================================================
--- trunk/Scopa/catalogs/de.xml 2010-12-21 17:20:06 UTC (rev 4085)
+++ trunk/Scopa/catalogs/de.xml 2010-12-21 17:23:03 UTC (rev 4086)
@@ -6,6 +6,8 @@
<entry key="MENU_GAME_LAST_COMPUTER">Letzter Zug des _Gegners</entry>
<entry key="MENU_GAME_LAST_HUMAN">_Mein letzter Zug</entry>
+ <entry key="OPTION_ONLY_SIMPLEST_COMBO">Nur einfachster Zug erlaubt</entry>
+
<entry key="GAME_NEW">_Neues Spiel</entry>
<entry key="GAME_LAST_COMPUTER">Letzter Zug des _Gegners</entry>
<entry key="GAME_LAST_HUMAN">_Mein letzter Zug</entry>
Modified: trunk/Scopa/src/Scopa.cpp
===================================================================
--- trunk/Scopa/src/Scopa.cpp 2010-12-21 17:20:06 UTC (rev 4085)
+++ trunk/Scopa/src/Scopa.cpp 2010-12-21 17:23:03 UTC (rev 4086)
@@ -887,7 +887,8 @@
{
Lum::Def::PropGroup *props=new Lum::Def::PropGroup();
- props->Boolean(Lum::Def::Boolean(Lum::Def::Desc(L"Allow only simplest take"),
+ props->Boolean(Lum::Def::Boolean(Lum::Def::Desc(_(L"OPTION_ONLY_SIMPLEST_COMBO",
+ L"Only simplest take allowed")),
::allowOnlySimplestCombo));
Lum::Dlg::Properties::Show(this,props);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 17:20:14
|
Revision: 4085
http://illumination.svn.sourceforge.net/illumination/?rev=4085&view=rev
Author: tteuling
Date: 2010-12-21 17:20:06 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Fixed license text (GPL instead of LGPL)
* Added option to defined which takes are allowed.
Modified Paths:
--------------
trunk/Scopa/TODO
trunk/Scopa/src/Card.cpp
trunk/Scopa/src/Card.h
trunk/Scopa/src/ChooseMoveDialog.cpp
trunk/Scopa/src/ChooseMoveDialog.h
trunk/Scopa/src/GameStartDialog.cpp
trunk/Scopa/src/GameStartDialog.h
trunk/Scopa/src/Heap.cpp
trunk/Scopa/src/Heap.h
trunk/Scopa/src/Makefile.am
trunk/Scopa/src/NeuronalNetwork.cpp
trunk/Scopa/src/NeuronalNetwork.h
trunk/Scopa/src/Player.cpp
trunk/Scopa/src/Player.h
trunk/Scopa/src/PlayerGoal.cpp
trunk/Scopa/src/PlayerGoal.h
trunk/Scopa/src/PlayerGreedy.cpp
trunk/Scopa/src/PlayerGreedy.h
trunk/Scopa/src/PlayerHuman.cpp
trunk/Scopa/src/PlayerHuman.h
trunk/Scopa/src/PlayerJudge.cpp
trunk/Scopa/src/PlayerJudge.h
trunk/Scopa/src/PlayerNeuron.cpp
trunk/Scopa/src/PlayerNeuron.h
trunk/Scopa/src/PlayerRandom.cpp
trunk/Scopa/src/PlayerRandom.h
trunk/Scopa/src/Result.cpp
trunk/Scopa/src/Result.h
trunk/Scopa/src/RoundResultDialog.cpp
trunk/Scopa/src/RoundResultDialog.h
trunk/Scopa/src/Scopa.cpp
trunk/Scopa/src/ScopaTest.cpp
trunk/Scopa/src/ShowMoveDialog.cpp
trunk/Scopa/src/ShowMoveDialog.h
trunk/Scopa/src/Table.cpp
trunk/Scopa/src/Table.h
Added Paths:
-----------
trunk/Scopa/src/Configuration.cpp
trunk/Scopa/src/Configuration.h
Modified: trunk/Scopa/TODO
===================================================================
--- trunk/Scopa/TODO 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/TODO 2010-12-21 17:20:06 UTC (rev 4085)
@@ -1,8 +1,4 @@
-* Don't score scopas in the last stroke.
-* Add option to define if only possible takes with minimum cards are allowed
- or if all takes are allowed.
* Play sound on scopa, winning, loosing.
-* Save settings.
* Save current game.
* Add new player implemented using a neural net:
+ Every possible card is an input
Modified: trunk/Scopa/src/Card.cpp
===================================================================
--- trunk/Scopa/src/Card.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Card.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Card.h"
Modified: trunk/Scopa/src/Card.h
===================================================================
--- trunk/Scopa/src/Card.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Card.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <string>
Modified: trunk/Scopa/src/ChooseMoveDialog.cpp
===================================================================
--- trunk/Scopa/src/ChooseMoveDialog.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/ChooseMoveDialog.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "ChooseMoveDialog.h"
Modified: trunk/Scopa/src/ChooseMoveDialog.h
===================================================================
--- trunk/Scopa/src/ChooseMoveDialog.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/ChooseMoveDialog.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <vector>
Added: trunk/Scopa/src/Configuration.cpp
===================================================================
--- trunk/Scopa/src/Configuration.cpp (rev 0)
+++ trunk/Scopa/src/Configuration.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -0,0 +1,97 @@
+/*
+ This file is part of "Scopa" - An italian card game.
+ Copyright (C) 2010 Tim Teulings
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include "Configuration.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <dirent.h>
+
+#include <iostream>
+#include <fstream>
+
+#include <Lum/Base/Path.h>
+#include <Lum/Base/String.h>
+
+#include <Lum/Config/Config.h>
+
+Lum::Model::BooleanRef allowOnlySimplestCombo=new Lum::Model::Boolean(true);
+
+bool LoadConfig()
+{
+ Lum::Config::Node *top;
+ Lum::Config::Node *node;
+ Lum::Config::ErrorList errors;
+ Lum::Base::Path path(Lum::Base::Path::GetApplicationConfigPath());
+
+ top=Lum::Config::LoadConfigFromXMLFile(path.GetPath(),errors);
+
+ if (top==NULL) {
+ return false;
+ }
+
+ if (top->GetName()!=L"Scopa") {
+ std::cerr << "'" << Lum::Base::WStringToString(path.GetPath()) << "' is a valid config file!" << std::endl;
+ delete top;
+ return false;
+ }
+
+ node=top->GetChild(L"allowOnlySimplestCombo");
+ if (node!=NULL) {
+ bool value=allowOnlySimplestCombo->Get();
+
+ node->GetValue(value);
+
+ allowOnlySimplestCombo->Set(value);
+ }
+
+ delete top;
+
+ return true;
+}
+
+bool SaveConfig()
+{
+ Lum::Config::Node *top;
+ Lum::Config::Node *node;
+ Lum::Base::Path path(Lum::Base::Path::GetApplicationConfigPath());
+ bool res;
+
+ top=new Lum::Config::Node(L"Scopa");
+
+ node=new Lum::Config::Node(L"allowOnlySimplestCombo");
+ node->SetValue(allowOnlySimplestCombo->Get());
+ top->Add(node);
+
+ Lum::Base::Status status;
+
+ status=path.CreateDirRecursive();
+
+ if (!status) {
+ std::cerr << "Cannot create config directory '" << Lum::Base::WStringToString(path.GetDir()) << "': " << Lum::Base::WStringToString(status.GetDescription()) << std::endl;
+ return false;
+ }
+
+ res=Lum::Config::SaveConfigToXMLFile(path.GetPath(),top);
+
+ delete top;
+
+ return res;
+}
+
Property changes on: trunk/Scopa/src/Configuration.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Scopa/src/Configuration.h
===================================================================
--- trunk/Scopa/src/Configuration.h (rev 0)
+++ trunk/Scopa/src/Configuration.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -0,0 +1,31 @@
+#ifndef CONFIGURATION_H
+#define CONFIGURATION_H
+
+/*
+ This file is part of "Scopa" - An italian card game.
+ Copyright (C) 2010 Tim Teulings
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <Lum/Model/Boolean.h>
+
+extern Lum::Model::BooleanRef allowOnlySimplestCombo;
+
+extern bool LoadConfig();
+
+extern bool SaveConfig();
+
+#endif
Property changes on: trunk/Scopa/src/Configuration.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/Scopa/src/GameStartDialog.cpp
===================================================================
--- trunk/Scopa/src/GameStartDialog.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/GameStartDialog.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "GameStartDialog.h"
Modified: trunk/Scopa/src/GameStartDialog.h
===================================================================
--- trunk/Scopa/src/GameStartDialog.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/GameStartDialog.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <Lum/Dlg/ActionDialog.h>
Modified: trunk/Scopa/src/Heap.cpp
===================================================================
--- trunk/Scopa/src/Heap.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Heap.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Heap.h"
Modified: trunk/Scopa/src/Heap.h
===================================================================
--- trunk/Scopa/src/Heap.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Heap.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <vector>
Modified: trunk/Scopa/src/Makefile.am
===================================================================
--- trunk/Scopa/src/Makefile.am 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Makefile.am 2010-12-21 17:20:06 UTC (rev 4085)
@@ -24,6 +24,8 @@
PlayerNeuron.cpp \
PlayerRandom.h \
PlayerRandom.cpp \
+ Configuration.h \
+ Configuration.cpp \
ChooseMoveDialog.h \
ChooseMoveDialog.cpp \
GameStartDialog.h \
Modified: trunk/Scopa/src/NeuronalNetwork.cpp
===================================================================
--- trunk/Scopa/src/NeuronalNetwork.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/NeuronalNetwork.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2009 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "NeuronalNetwork.h"
Modified: trunk/Scopa/src/NeuronalNetwork.h
===================================================================
--- trunk/Scopa/src/NeuronalNetwork.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/NeuronalNetwork.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2009 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <vector>
Modified: trunk/Scopa/src/Player.cpp
===================================================================
--- trunk/Scopa/src/Player.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Player.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Player.h"
Modified: trunk/Scopa/src/Player.h
===================================================================
--- trunk/Scopa/src/Player.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Player.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <vector>
Modified: trunk/Scopa/src/PlayerGoal.cpp
===================================================================
--- trunk/Scopa/src/PlayerGoal.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerGoal.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "PlayerGoal.h"
Modified: trunk/Scopa/src/PlayerGoal.h
===================================================================
--- trunk/Scopa/src/PlayerGoal.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerGoal.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Player.h"
Modified: trunk/Scopa/src/PlayerGreedy.cpp
===================================================================
--- trunk/Scopa/src/PlayerGreedy.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerGreedy.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "PlayerGreedy.h"
Modified: trunk/Scopa/src/PlayerGreedy.h
===================================================================
--- trunk/Scopa/src/PlayerGreedy.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerGreedy.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Player.h"
Modified: trunk/Scopa/src/PlayerHuman.cpp
===================================================================
--- trunk/Scopa/src/PlayerHuman.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerHuman.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "PlayerHuman.h"
Modified: trunk/Scopa/src/PlayerHuman.h
===================================================================
--- trunk/Scopa/src/PlayerHuman.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerHuman.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Player.h"
Modified: trunk/Scopa/src/PlayerJudge.cpp
===================================================================
--- trunk/Scopa/src/PlayerJudge.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerJudge.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "PlayerJudge.h"
@@ -120,7 +120,8 @@
const std::vector<Card>& yourCards,
size_t recursion,
size_t maxRecursion,
- bool isme) const
+ bool isme,
+ bool allowOnlySimplestCombo) const
{
int tmpRating;
@@ -207,7 +208,7 @@
int averageRating=0;
- Table::Calculate(newTable,newCombinations,newPoints);
+ Table::Calculate(newTable,newCombinations,newPoints,allowOnlySimplestCombo);
Table::GetSolutionSets(newHand,newTable,newCombinations,newPoints,newSolutions);
for (size_t t=0; t<newSolutions.size(); t++) {
@@ -238,7 +239,8 @@
yourCards,
recursion+1,
maxRecursion,
- !isme);
+ !isme,
+ allowOnlySimplestCombo);
}
else {
newHand=hand;
@@ -254,7 +256,8 @@
newCards,
recursion+1,
maxRecursion,
- !isme);
+ !isme,
+ allowOnlySimplestCombo);
}
@@ -312,7 +315,8 @@
yourCards,
0,
2,
- true);
+ true,
+ table.AllowOnlySimplestCombo());
//std::cout << "Playing " << Lum::Base::WStringToString(solutions[s].yours.GetName()) << " ==> " << tmpRating << std::endl;
Modified: trunk/Scopa/src/PlayerJudge.h
===================================================================
--- trunk/Scopa/src/PlayerJudge.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerJudge.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Player.h"
@@ -41,7 +41,8 @@
const std::vector<Card>& yourCards,
size_t recursion,
size_t maxRecursion,
- bool isme) const;
+ bool isme,
+ bool allowOnlySimplestCombo) const;
public:
JudgePlayer();
Modified: trunk/Scopa/src/PlayerNeuron.cpp
===================================================================
--- trunk/Scopa/src/PlayerNeuron.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerNeuron.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2009 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "PlayerNeuron.h"
Modified: trunk/Scopa/src/PlayerNeuron.h
===================================================================
--- trunk/Scopa/src/PlayerNeuron.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerNeuron.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2009 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Player.h"
Modified: trunk/Scopa/src/PlayerRandom.cpp
===================================================================
--- trunk/Scopa/src/PlayerRandom.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerRandom.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "PlayerRandom.h"
Modified: trunk/Scopa/src/PlayerRandom.h
===================================================================
--- trunk/Scopa/src/PlayerRandom.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/PlayerRandom.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Player.h"
Modified: trunk/Scopa/src/Result.cpp
===================================================================
--- trunk/Scopa/src/Result.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Result.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Result.h"
Modified: trunk/Scopa/src/Result.h
===================================================================
--- trunk/Scopa/src/Result.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Result.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <vector>
Modified: trunk/Scopa/src/RoundResultDialog.cpp
===================================================================
--- trunk/Scopa/src/RoundResultDialog.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/RoundResultDialog.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "RoundResultDialog.h"
Modified: trunk/Scopa/src/RoundResultDialog.h
===================================================================
--- trunk/Scopa/src/RoundResultDialog.h 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/RoundResultDialog.h 2010-12-21 17:20:06 UTC (rev 4085)
@@ -5,19 +5,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <Lum/Dialog.h>
Modified: trunk/Scopa/src/Scopa.cpp
===================================================================
--- trunk/Scopa/src/Scopa.cpp 2010-12-21 16:23:34 UTC (rev 4084)
+++ trunk/Scopa/src/Scopa.cpp 2010-12-21 17:20:06 UTC (rev 4085)
@@ -2,19 +2,19 @@
This file is part of "Scopa" - An italian card game.
Copyright (C) 2007 Tim Teulings
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -25,9 +25,11 @@
#include <Lum/Base/String....
[truncated message content] |
|
From: <tte...@us...> - 2010-12-21 16:23:41
|
Revision: 4084
http://illumination.svn.sourceforge.net/illumination/?rev=4084&view=rev
Author: tteuling
Date: 2010-12-21 16:23:34 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Don't count scopa in last round
* Simplified round result dialog.
Modified Paths:
--------------
trunk/Scopa/catalogs/de.xml
trunk/Scopa/src/RoundResultDialog.cpp
trunk/Scopa/src/Scopa.cpp
trunk/Scopa/src/ScopaTest.cpp
trunk/Scopa/src/Table.cpp
Modified: trunk/Scopa/catalogs/de.xml
===================================================================
--- trunk/Scopa/catalogs/de.xml 2010-12-21 13:13:31 UTC (rev 4083)
+++ trunk/Scopa/catalogs/de.xml 2010-12-21 16:23:34 UTC (rev 4084)
@@ -31,8 +31,6 @@
<entry key="ROUND_RESULT_LABEL_HUMAN">Du</entry>
<entry key="ROUND_RESULT_LABEL_COMPUTER">Computer</entry>
- <entry key="ROUND_RESULT_LABEL_HUMAN_POINTS">Deine Punkte</entry>
- <entry key="ROUND_RESULT_LABEL_COMPUTER_POINTS">Punkte des Computers</entry>
<entry key="ROUND_RESULT_LABEL_SCOPAS">Scopas:</entry>
<entry key="ROUND_RESULT_LABEL_CARDS">Karten:</entry>
<entry key="ROUND_RESULT_LABEL_DENARES">Denares:</entry>
@@ -40,7 +38,6 @@
<entry key="ROUND_RESULT_LABEL_PRIMIERA">Primiera:</entry>
<entry key="ROUND_RESULT_LABEL_ROUND_RESULT">Rundenergebnis:</entry>
<entry key="ROUND_RESULT_LABEL_GAME_RESULT">Spielstand:</entry>
- <entry key="ROUND_RESULT_YES">Ja</entry>
<entry key="GAME_START_LABEL_POINTS">Punkte für den Sieg:</entry>
<entry key="GAME_START_LABEL_PLAYER">Computer Spieler:</entry>
Modified: trunk/Scopa/src/RoundResultDialog.cpp
===================================================================
--- trunk/Scopa/src/RoundResultDialog.cpp 2010-12-21 13:13:31 UTC (rev 4083)
+++ trunk/Scopa/src/RoundResultDialog.cpp 2010-12-21 16:23:34 UTC (rev 4084)
@@ -63,114 +63,84 @@
vert=new Lum::VPanel();
grid=new Lum::Grid();
- grid->SetSize(5,8);
+ grid->SetSize(3,8);
grid->SetSpace(true,true);
// Heading
- grid->SetObject(1,0,new Lum::Text(_(L"ROUND_RESULT_LABEL_HUMAN",L"You")));
- grid->SetObject(2,0,new Lum::Text(_(L"ROUND_RESULT_LABEL_COMPUTER",L"Other")));
- grid->SetObject(3,0,new Lum::Text(_(L"ROUND_RESULT_LABEL_HUMAN_POINTS",L"Points You")));
- grid->SetObject(4,0,new Lum::Text(_(L"ROUND_RESULT_LABEL_COMPUTER_POINTS",L"Points Other")));
+ grid->SetObject(1,0,new Lum::Text(_(L"ROUND_RESULT_LABEL_HUMAN",L"You"),
+ Lum::OS::Font::bold,
+ Lum::Text::centered));
+ grid->SetObject(2,0,new Lum::Text(_(L"ROUND_RESULT_LABEL_COMPUTER",L"Other"),
+ Lum::OS::Font::bold,
+ Lum::Text::centered));
// Scopas
grid->SetObject(0,1,new Lum::Text(_(L"ROUND_RESULT_LABEL_SCOPAS",L"Scopas:")));
if (result[0].GetScopas()>0) {
- grid->SetObject(1,1,GetTableEntry(Lum::Base::NumberToWString(result[0].GetScopas())));
+ grid->SetObject(1,1,GetTableEntry(Lum::Base::NumberToWString(result[0].GetScopas()),true));
}
if (result[1].GetScopas()>0) {
- grid->SetObject(2,1,GetTableEntry(Lum::Base::NumberToWString(result[1].GetScopas())));
+ grid->SetObject(2,1,GetTableEntry(Lum::Base::NumberToWString(result[1].GetScopas()),true));
}
- if (result[0].GetScopas()>0) {
- grid->SetObject(3,1,GetTableEntry(Lum::Base::NumberToWString(result[0].GetScopas()),true));
- }
-
- if (result[1].GetScopas()>0) {
- grid->SetObject(4,1,GetTableEntry(Lum::Base::NumberToWString(result[1].GetScopas()),true));
- }
-
// Cards
grid->SetObject(0,2,new Lum::Text(_(L"ROUND_RESULT_LABEL_CARDS",L"Cards:")));
- grid->SetObject(1,2,GetTableEntry(Lum::Base::NumberToWString(result[0].GetCards())));
- grid->SetObject(2,2,GetTableEntry(Lum::Base::NumberToWString(result[1].GetCards())));
+ grid->SetObject(1,2,GetTableEntry(Lum::Base::NumberToWString(result[0].GetCards()),
+ result[0].GetCards()>result[1].GetCards()));
+ grid->SetObject(2,2,GetTableEntry(Lum::Base::NumberToWString(result[1].GetCards()),
+ result[1].GetCards()>result[0].GetCards()));
- if (result[0].GetCards()>result[1].GetCards()) {
- grid->SetObject(3,2,GetTableEntry(L"1",true));
- }
-
- if (result[1].GetCards()>result[0].GetCards()) {
- grid->SetObject(4,2,GetTableEntry(L"1",true));
- }
-
// Denares
grid->SetObject(0,3,new Lum::Text(_(L"ROUND_RESULT_LABEL_DENARES",L"Denares:")));
- grid->SetObject(1,3,GetTableEntry(Lum::Base::NumberToWString(result[0].GetDenares())));
- grid->SetObject(2,3,GetTableEntry(Lum::Base::NumberToWString(result[1].GetDenares())));
+ grid->SetObject(1,3,GetTableEntry(Lum::Base::NumberToWString(result[0].GetDenares()),
+ result[0].GetDenares()>result[1].GetDenares()));
+ grid->SetObject(2,3,GetTableEntry(Lum::Base::NumberToWString(result[1].GetDenares()),
+ result[1].GetDenares()>result[0].GetDenares()));
- if (result[0].GetDenares()>result[1].GetDenares()) {
- grid->SetObject(3,3,GetTableEntry(L"1",true));
- }
-
- if (result[1].GetDenares()>result[0].GetDenares()) {
- grid->SetObject(4,3,GetTableEntry(L"1",true));
- }
-
// Denare 7
grid->SetObject(0,4,new Lum::Text(_(L"ROUND_RESULT_LABEL_DENARE7",L"Denare 7:")));
if (result[0].HasDenare7()) {
- grid->SetObject(1,4,GetTableEntry(_(L"ROUND_RESULT_YES",L"yes")));
+ grid->SetObject(1,4,GetTableEntry(L"1",true));
}
if (result[1].HasDenare7()) {
- grid->SetObject(2,4,GetTableEntry(_(L"ROUND_RESULT_YES",L"yes")));
+ grid->SetObject(2,4,GetTableEntry(L"1",true));
}
- if (result[0].HasDenare7()) {
- grid->SetObject(3,4,GetTableEntry(L"1",true));
- }
-
- if (result[1].HasDenare7()) {
- grid->SetObject(4,4,GetTableEntry(L"1",true));
- }
-
// Primiera
grid->SetObject(0,5,new Lum::Text(_(L"ROUND_RESULT_LABEL_PRIMIERA",L"Primiera:")));
- grid->SetObject(1,5,GetTableEntry(Lum::Base::NumberToWString(result[0].GetPrimieraPoints())));
- grid->SetObject(2,5,GetTableEntry(Lum::Base::NumberToWString(result[1].GetPrimieraPoints())));
+ grid->SetObject(1,5,GetTableEntry(Lum::Base::NumberToWString(result[0].GetPrimieraPoints()),
+ result[0].GetPrimieraPoints()>result[1].GetPrimieraPoints()));
+ grid->SetObject(2,5,GetTableEntry(Lum::Base::NumberToWString(result[1].GetPrimieraPoints()),
+ result[1].GetPrimieraPoints()>result[0].GetPrimieraPoints()));
- if (result[0].GetPrimieraPoints()>result[1].GetPrimieraPoints()) {
- grid->SetObject(3,5,GetTableEntry(L"1",true));
- }
-
- if (result[1].GetPrimieraPoints()>result[0].GetPrimieraPoints()) {
- grid->SetObject(4,5,GetTableEntry(L"1",true));
- }
-
// Result points for this game
grid->SetObject(0,6,new Lum::Text(_(L"ROUND_RESULT_LABEL_ROUND_RESULT",L"Round result:")));
- grid->SetObject(3,6,GetTableEntry(Lum::Base::NumberToWString(points[0]),true));
- grid->SetObject(4,6,GetTableEntry(Lum::Base::NumberToWString(points[1]),true));
+ grid->SetObject(1,6,GetTableEntry(Lum::Base::NumberToWString(points[0]),points[0]>points[1]));
+ grid->SetObject(2,6,GetTableEntry(Lum::Base::NumberToWString(points[1]),points[1]>points[0]));
// Resulting points over all
grid->SetObject(0,7,new Lum::Text(_(L"ROUND_RESULT_LABEL_GAME_RESULT",L"Over all:")));
- grid->SetObject(3,7,GetTableEntry(Lum::Base::NumberToWString(globalPoints[0]),true));
- grid->SetObject(4,7,GetTableEntry(Lum::Base::NumberToWString(globalPoints[1]),true));
+ grid->SetObject(1,7,GetTableEntry(Lum::Base::NumberToWString(globalPoints[0]),
+ globalPoints[0]>globalPoints[1]));
+ grid->SetObject(2,7,GetTableEntry(Lum::Base::NumberToWString(globalPoints[1]),
+ globalPoints[1]>globalPoints[0]));
vert->Add(grid);
vert->AddSpace();
Modified: trunk/Scopa/src/Scopa.cpp
===================================================================
--- trunk/Scopa/src/Scopa.cpp 2010-12-21 13:13:31 UTC (rev 4083)
+++ trunk/Scopa/src/Scopa.cpp 2010-12-21 16:23:34 UTC (rev 4084)
@@ -102,7 +102,7 @@
size_t globalPoints[2];
std::vector<Result> result;
Heap *heap;
- Table *table;
+ Table table;
std::vector<Move> lastHumanMove;
std::vector<Move> lastComputerMove;
std::vector<Card> currentComputerMove;
@@ -125,7 +125,6 @@
handFadedAction(new Lum::Model::Action()),
tableFadedAction(new Lum::Model::Action()),
heap(new Heap()),
- table(new Table()),
computerPlayer(1),
winningPoints(11)
{
@@ -349,6 +348,7 @@
break;
}
#endif
+
switch (state) {
case stateHumanFading:
handFaded=false;
@@ -375,7 +375,7 @@
break;
}
}
- tableView->SetCards(table->table,true);
+ tableView->SetCards(table.table,true);
}
void UpdateDisplay()
@@ -468,26 +468,26 @@
// The rest of the cards on the table belong to the player that collected the last cards
- if (!table->IsEmpty()) {
+ if (!table.IsEmpty()) {
#if defined(PRINT_DEBUG)
std::cout << "--- Final" << std::endl;
std::cout << "Player " << lastExchange+1 << " gets the rest of the cards on the table:" << std::endl;
- for (size_t i=0; i<table->table.size(); i++) {
- std::cout << "* "<< Lum::Base::WStringToString(table->table[i].GetName()) << std::endl;
+ for (size_t i=0; i<table.table.size(); i++) {
+ std::cout << "* "<< Lum::Base::WStringToString(table.table[i].GetName()) << std::endl;
}
#endif
- result[lastExchange%2].AddToCollected(table->table,false);
+ result[lastExchange%2].AddToCollected(table.table,false);
if (dynamic_cast<HumanPlayer*>(players[lastExchange%2])!=NULL) {
- lastHumanMove[0]=Move(table->table,false);
+ lastHumanMove[0]=Move(table.table,false);
}
else {
- lastComputerMove[0]=Move(table->table,false);
+ lastComputerMove[0]=Move(table.table,false);
}
- table->table.clear();
+ table.table.clear();
UpdateDisplay();
}
@@ -570,7 +570,7 @@
currentComputerMoveMove=0;
std::vector<Card> tmp;
- SolutionSet solution=players[currentPlayer]->PlayCard(*table,currentRound);
+ SolutionSet solution=players[currentPlayer]->PlayCard(table,currentRound);
players[currentPlayer]->hand.erase(players[currentPlayer]->hand.begin()+solution.yoursPos);
@@ -586,7 +586,7 @@
currentComputerMoveMove=solution.solution;
- tmp=table->table;
+ tmp=table.table;
tmp.push_back(solution.yours);
tableView->SetCards(tmp,true);
@@ -597,7 +597,7 @@
Card card=currentComputerMove[0];
std::vector<Card> collected;
- collected=table->PutCard(card,currentComputerMoveMove);
+ collected=table.PutCard(card,currentComputerMoveMove);
if (lastComputerMove.empty()) {
if (collected.empty()) {
@@ -630,7 +630,7 @@
currentRound);
}
- if (table->IsEmpty()) {
+ if (table.IsEmpty() && currentRound!=18) {
#if defined(PRINT_DEBUG)
std::cout << "=>>> SCOPA!" << std::endl;
#endif
@@ -640,7 +640,7 @@
lastExchange=currentPlayer;
}
- result[currentPlayer%2].AddToCollected(collected,table->IsEmpty());
+ result[currentPlayer%2].AddToCollected(collected,table.IsEmpty());
OnPlayerPlayed();
}
@@ -659,10 +659,10 @@
std::cout << "Human player plays " << Lum::Base::WStringToString(card.GetName()) <<std::endl;
#endif
- if (table->HasValueMultipleCollectionSets(card.GetValue())) {
+ if (table.HasValueMultipleCollectionSets(card.GetValue())) {
std::vector<std::vector<Card> > moves;
- table->GetMoves(card.GetValue(),moves);
+ table.GetMoves(card.GetValue(),moves);
#if defined(PRINT_DEBUG)
std::cout << "Card played by human has multiple collection sets!" << std::endl;
@@ -670,7 +670,7 @@
move=GetMove(this,card,moves,images);
}
- collected=table->PutCard(card,move);
+ collected=table.PutCard(card,move);
if (lastHumanMove.empty()) {
if (collected.empty()) {
@@ -703,7 +703,7 @@
currentRound);
}
- if (table->IsEmpty()) {
+ if (table.IsEmpty() && currentRound!=18) {
#if defined(PRINT_DEBUG)
std::cout << "=>>> SCOPA!" << std::endl;
#endif
@@ -714,7 +714,7 @@
}
- result[currentPlayer%2].AddToCollected(collected,table->IsEmpty());
+ result[currentPlayer%2].AddToCollected(collected,table.IsEmpty());
OnPlayerPlayed();
}
@@ -810,7 +810,7 @@
initialCards.push_back(heap->GetCard());
}
- table->Initialize(initialCards);
+ table.Initialize(initialCards);
currentGame++;
currentRound=1;
@@ -922,6 +922,10 @@
public:
bool Initialize()
{
+#if defined(APP_DATADIR)
+ Lum::Manager::FileSystem::Instance()->SetApplicationDataDir(Lum::Base::StringToWString(APP_DATADIR));
+#endif
+
info.SetProgram(Lum::Base::StringToWString(PACKAGE_NAME));
info.SetVersion(Lum::Base::StringToWString(PACKAGE_VERSION));
info.SetDescription(_(L"ABOUT_DESC",L"Play a game of scopa with me..."));
@@ -929,10 +933,6 @@
info.SetContact(L"Tim Teulings <ti...@te...>");
info.SetCopyright(L"(c) 2007, Tim Teulings");
info.SetLicense(L"GNU Public License");
-
-#if defined(APP_DATADIR)
- Lum::Manager::FileSystem::Instance()->SetApplicationDataDir(Lum::Base::StringToWString(APP_DATADIR));
-#endif
srand(time(NULL));
Modified: trunk/Scopa/src/ScopaTest.cpp
===================================================================
--- trunk/Scopa/src/ScopaTest.cpp 2010-12-21 13:13:31 UTC (rev 4083)
+++ trunk/Scopa/src/ScopaTest.cpp 2010-12-21 16:23:34 UTC (rev 4084)
@@ -143,7 +143,7 @@
#endif
#if defined(DEBUG_OUTPUT)
- if (table->IsEmpty()) {
+ if (table->IsEmpty() && currentRound!=18) {
std::cout << "=>>> SCOPA!" << std::endl;
}
#endif
Modified: trunk/Scopa/src/Table.cpp
===================================================================
--- trunk/Scopa/src/Table.cpp 2010-12-21 13:13:31 UTC (rev 4083)
+++ trunk/Scopa/src/Table.cpp 2010-12-21 16:23:34 UTC (rev 4084)
@@ -93,7 +93,8 @@
std::map<size_t,std::vector<size_t> >::const_iterator pv;
pv=points.find(value);
- if (pv!=points.end() && combinations[i].size()>combinations[pv->second[0]].size()) {
+ if (pv!=points.end() &&
+ combinations[i].size()>combinations[pv->second[0]].size()) {
continue;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 13:13:38
|
Revision: 4083
http://illumination.svn.sourceforge.net/illumination/?rev=4083&view=rev
Author: tteuling
Date: 2010-12-21 13:13:31 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Updated/fixed maemo packaging
Modified Paths:
--------------
trunk/GPSJinni/packaging/maemo/changelog
trunk/GPSJinni/packaging/maemo/gpsjinni.install
Modified: trunk/GPSJinni/packaging/maemo/changelog
===================================================================
--- trunk/GPSJinni/packaging/maemo/changelog 2010-12-21 13:13:08 UTC (rev 4082)
+++ trunk/GPSJinni/packaging/maemo/changelog 2010-12-21 13:13:31 UTC (rev 4083)
@@ -1,3 +1,9 @@
+gpsjinni (0.9.20101221-4) unstable; urgency=low
+
+ * More icon search path bugfixes
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 14:07:08 +0100
+
gpsjinni (0.9.20101221-3) unstable; urgency=low
* Fixed lintian bugs.
Modified: trunk/GPSJinni/packaging/maemo/gpsjinni.install
===================================================================
--- trunk/GPSJinni/packaging/maemo/gpsjinni.install 2010-12-21 13:13:08 UTC (rev 4082)
+++ trunk/GPSJinni/packaging/maemo/gpsjinni.install 2010-12-21 13:13:31 UTC (rev 4083)
@@ -3,5 +3,5 @@
data/icons/26x26/GPSJinni.png usr/share/icons/hicolor/26x26/apps
data/icons/40x40/GPSJinni.png usr/share/icons/hicolor/40x40/apps
data/icons/64x64/GPSJinni.png usr/share/icons/hicolor/scalable/apps
-data/icons/16x16/*.png /usr/share/eightyone/icons
+data/icons/16x16/*.png /usr/share/gpsjinni/icons
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 13:13:15
|
Revision: 4082
http://illumination.svn.sourceforge.net/illumination/?rev=4082&view=rev
Author: tteuling
Date: 2010-12-21 13:13:08 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Updated maemo packaging
Modified Paths:
--------------
trunk/TimerJinni/packaging/maemo/changelog
trunk/TimerJinni/packaging/maemo/control
trunk/TimerJinni/packaging/maemo/rules
Modified: trunk/TimerJinni/packaging/maemo/changelog
===================================================================
--- trunk/TimerJinni/packaging/maemo/changelog 2010-12-21 13:12:48 UTC (rev 4081)
+++ trunk/TimerJinni/packaging/maemo/changelog 2010-12-21 13:13:08 UTC (rev 4082)
@@ -1,3 +1,15 @@
+timerjinni (1.3.20101221-2) unstable; urgency=low
+
+ * Fixed lintian bugs
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 14:08:16 +0100
+
+timerjinni (1.3.20101221-1) unstable; urgency=low
+
+ * New timer 'interval'
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 13:45:23 +0100
+
timerjinni (1.2.20101220-1) unstable; urgency=low
* Rebuild against current Illumination.
Modified: trunk/TimerJinni/packaging/maemo/control
===================================================================
--- trunk/TimerJinni/packaging/maemo/control 2010-12-21 13:12:48 UTC (rev 4081)
+++ trunk/TimerJinni/packaging/maemo/control 2010-12-21 13:13:08 UTC (rev 4082)
@@ -1,5 +1,5 @@
Source: timerjinni
-Section: misc
+Section: user/utilities
Priority: optional
Maintainer: Tim Teulings <ti...@te...>
Homepage: http://www.anderenen.de/anderenende/maemo.html
@@ -9,7 +9,7 @@
Package: timerjinni
Section: user/utilities
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Measure time in various ways
Measure time using countdown timer and stop clock (and later
chess clock...)
Modified: trunk/TimerJinni/packaging/maemo/rules
===================================================================
--- trunk/TimerJinni/packaging/maemo/rules 2010-12-21 13:12:48 UTC (rev 4081)
+++ trunk/TimerJinni/packaging/maemo/rules 2010-12-21 13:13:08 UTC (rev 4082)
@@ -31,7 +31,7 @@
dh_testdir
dh_testroot
rm -f configure-stamp build-stamp
- -$(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
install: build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 13:12:59
|
Revision: 4081
http://illumination.svn.sourceforge.net/illumination/?rev=4081&view=rev
Author: tteuling
Date: 2010-12-21 13:12:48 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Updated TODO.
Modified Paths:
--------------
trunk/TimerJinni/TODO
Modified: trunk/TimerJinni/TODO
===================================================================
--- trunk/TimerJinni/TODO 2010-12-21 12:57:42 UTC (rev 4080)
+++ trunk/TimerJinni/TODO 2010-12-21 13:12:48 UTC (rev 4081)
@@ -0,0 +1,4 @@
+* Add chess clock timer.
+* Added timer to meassure pulse interval and pulse length (to measure labour
+ pains)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 12:57:48
|
Revision: 4080
http://illumination.svn.sourceforge.net/illumination/?rev=4080&view=rev
Author: tteuling
Date: 2010-12-21 12:57:42 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
More localization.
Modified Paths:
--------------
trunk/TimerJinni/catalogs/de.xml
trunk/TimerJinni/src/TimerJinni.cpp
Modified: trunk/TimerJinni/catalogs/de.xml
===================================================================
--- trunk/TimerJinni/catalogs/de.xml 2010-12-21 12:40:52 UTC (rev 4079)
+++ trunk/TimerJinni/catalogs/de.xml 2010-12-21 12:57:42 UTC (rev 4080)
@@ -7,7 +7,13 @@
<!-- Main -->
- <entry key="BUTTON_CONFIGURE">_Konfiguriere...</entry>
+ <entry key="MENU_COUNT_DOWN">Countdown</entry>
+ <entry key="MENU_COUNT_UP">Stopuhr</entry>
+ <entry key="MENU_INTERVAL">Intervall</entry>
+ <entry key="MENU_PROHIBIT_BLANKING">Bildschirm bleibt an</entry>
+
+ <!-- Dialog buttons -->
+
<entry key="BUTTON_START">_Start</entry>
<entry key="BUTTON_PAUSE">Pause</entry>
<entry key="BUTTON_LAP">_Zwischenz.</entry>
@@ -17,9 +23,4 @@
<entry key="ERR_CONFIG_SAVE_CAPTION">Fehler beim Abspeichern der Konfiguration...</entry>
<entry key="ERR_CONFIG_SAVE_TEXT">Beim Abspeichern der Konfiguration ist ein Fehler aufgetreten!</entry>
-
- <!--Selector -->
-
- <entry key="LBL_MINUTES">Minuten:</entry>
- <entry key="LBL_SECONDS">Sekunden:</entry>
</illumination-l10n-catalog>
Modified: trunk/TimerJinni/src/TimerJinni.cpp
===================================================================
--- trunk/TimerJinni/src/TimerJinni.cpp 2010-12-21 12:40:52 UTC (rev 4079)
+++ trunk/TimerJinni/src/TimerJinni.cpp 2010-12-21 12:57:42 UTC (rev 4080)
@@ -84,19 +84,22 @@
Lum::Object *countdown=new Countdown();
countdown->SetFlex(true,true);
- multiView.AddView(Lum::Def::MultiView::View(0,Lum::Def::Desc(L"Count down"),
+ multiView.AddView(Lum::Def::MultiView::View(0,Lum::Def::Desc(_(L"MENU_COUNT_DOWN",
+ L"Count down")),
countdown));
Lum::Object *countup=new Countup();
countup->SetFlex(true,true);
- multiView.AddView(Lum::Def::MultiView::View(0,Lum::Def::Desc(L"Count up"),
+ multiView.AddView(Lum::Def::MultiView::View(0,Lum::Def::Desc(_(L"MENU_COUNT_UP",
+ L"Count up")),
countup));
Lum::Object *interval=new Interval();
interval->SetFlex(true,true);
- multiView.AddView(Lum::Def::MultiView::View(0,Lum::Def::Desc(L"Interval"),
+ multiView.AddView(Lum::Def::MultiView::View(0,Lum::Def::Desc(_(L"MENU_INTERVAL",
+ L"Interval")),
interval));
Lum::Def::Menu *preMenu=Lum::Def::Menu::Create();
@@ -106,7 +109,8 @@
->ActionQuit(GetClosedAction())
->End()
->GroupEdit()
- ->Boolean(Lum::Def::Boolean(Lum::Def::Desc(L"Prohibit screen blanking"),
+ ->Boolean(Lum::Def::Boolean(Lum::Def::Desc(_(L"MENU_PROHIBIT_BLANKING",
+ L"Prohibit screen blanking")),
prohibitScreenBlanking))
->End();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 12:40:58
|
Revision: 4079
http://illumination.svn.sourceforge.net/illumination/?rev=4079&view=rev
Author: tteuling
Date: 2010-12-21 12:40:52 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Added impuls timer.
Modified Paths:
--------------
trunk/TimerJinni/ChangeLog
trunk/TimerJinni/catalogs/de.xml
trunk/TimerJinni/configure.ac
trunk/TimerJinni/src/Countup.cpp
trunk/TimerJinni/src/Makefile.am
trunk/TimerJinni/src/TimerJinni.cpp
Added Paths:
-----------
trunk/TimerJinni/src/Interval.cpp
trunk/TimerJinni/src/Interval.h
Modified: trunk/TimerJinni/ChangeLog
===================================================================
--- trunk/TimerJinni/ChangeLog 2010-12-21 12:16:55 UTC (rev 4078)
+++ trunk/TimerJinni/ChangeLog 2010-12-21 12:40:52 UTC (rev 4079)
@@ -1,3 +1,7 @@
+Version 1.3
+
+* Added impulse timer, timing time span between pulses.
+
Version 1.2
* Added switch to prohibit screen blanking
Modified: trunk/TimerJinni/catalogs/de.xml
===================================================================
--- trunk/TimerJinni/catalogs/de.xml 2010-12-21 12:16:55 UTC (rev 4078)
+++ trunk/TimerJinni/catalogs/de.xml 2010-12-21 12:40:52 UTC (rev 4079)
@@ -11,6 +11,7 @@
<entry key="BUTTON_START">_Start</entry>
<entry key="BUTTON_PAUSE">Pause</entry>
<entry key="BUTTON_LAP">_Zwischenz.</entry>
+ <entry key="BUTTON_PULSE">_Impuls</entry>
<entry key="BUTTON_STOP">Sto_pp</entry>
<entry key="BUTTON_RESET">_Reset</entry>
Modified: trunk/TimerJinni/configure.ac
===================================================================
--- trunk/TimerJinni/configure.ac 2010-12-21 12:16:55 UTC (rev 4078)
+++ trunk/TimerJinni/configure.ac 2010-12-21 12:40:52 UTC (rev 4079)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
AC_INIT([TimerJinni],
- [1.2],
+ [1.3],
[ti...@te...],
[timerjinni])
Modified: trunk/TimerJinni/src/Countup.cpp
===================================================================
--- trunk/TimerJinni/src/Countup.cpp 2010-12-21 12:16:55 UTC (rev 4078)
+++ trunk/TimerJinni/src/Countup.cpp 2010-12-21 12:40:52 UTC (rev 4079)
@@ -153,7 +153,7 @@
clock->SetFlex(true,true);
headerModel=new Lum::Model::HeaderImpl();
- headerModel->AddColumn(L"Time",Lum::Base::Size::stdCharWidth,6);
+ headerModel->AddColumn(L"Time",Lum::Base::Size::stdCharWidth,8);
lapTable=new Lum::Table();
lapTable->SetFlex(false,true);
Added: trunk/TimerJinni/src/Interval.cpp
===================================================================
--- trunk/TimerJinni/src/Interval.cpp (rev 0)
+++ trunk/TimerJinni/src/Interval.cpp 2010-12-21 12:40:52 UTC (rev 4079)
@@ -0,0 +1,228 @@
+/*
+ TimerJinni - A general timing application
+ Copyright (C) 2009 Tim Teulings
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include "Interval.h"
+
+#include <Lum/Base/L10N.h>
+#include <Lum/Base/Path.h>
+#include <Lum/Base/String.h>
+
+#include <Lum/Dlg/TimeSpanChooser.h>
+
+#include <Lum/ButtonRow.h>
+#include <Lum/Button.h>
+#include <Lum/Panel.h>
+#include <Lum/Table.h>
+#include <Lum/Toggle.h>
+
+#include <Lum/Manager/Display.h>
+
+#include "Configuration.h"
+
+static const unsigned long REFRESH_TIME_MICRO = 10000;
+
+Interval::Interval()
+ : startAction(new Lum::Model::Action()),
+ paused(new Lum::Model::Boolean(false)),
+ pulseAction(new Lum::Model::Action()),
+ stopAction(new Lum::Model::Action()),
+ timer(new Lum::Model::Action()),
+ laps(new Lum::Model::StringTable()),
+ state(stateUninitialized),
+ clock(new StopWatch())
+{
+ Observe(startAction);
+ Observe(paused);
+ Observe(pulseAction);
+ Observe(stopAction);
+ Observe(timer);
+}
+
+Interval::~Interval()
+{
+ // no code
+}
+
+void Interval::SetValue()
+{
+ if (clock!=NULL) {
+ clock->SetText(TimeSpanToWString(time.GetTime(),
+ time.GetMicroseconds()));
+ }
+}
+
+void Interval::AllowScreenBlanking(bool allow)
+{
+ Lum::Manager::Display *displayManager=Lum::Manager::Display::Instance();
+
+ if (displayManager!=NULL) {
+ displayManager->AllowScreenBlanking(allow);
+ }
+}
+
+void Interval::SetState(State state)
+{
+ if (this->state==state) {
+ return;
+ }
+
+ this->state=state;
+
+ // Visual representation
+
+ switch (state) {
+ case stateUninitialized:
+ assert(false);
+ break;
+ case stateRunning:
+ startAction->Enable();
+ paused->Enable();
+ pulseAction->Enable();
+ stopAction->Enable();
+ AllowScreenBlanking(false);
+ break;
+ case statePaused:
+ startAction->Enable();
+ paused->Enable();
+ pulseAction->Disable();
+ stopAction->Enable();
+ AllowScreenBlanking(false);
+ break;
+ case stateStoped:
+ startAction->Enable();
+ paused->Disable();
+ pulseAction->Disable();
+ stopAction->Disable();
+ AllowScreenBlanking(true);
+ break;
+ }
+
+ // Timer
+
+ switch (state) {
+ case stateUninitialized:
+ assert(false);
+ break;
+ case stateRunning:
+ paused->Set(false);
+ if (time.IsPausing()) {
+ time.Resume();
+ }
+ else {
+ laps->Clear();
+ time.Start();
+ }
+ SetValue();
+ Lum::OS::display->AddTimer(0,REFRESH_TIME_MICRO,timer);
+ break;
+ case statePaused:
+ SetValue();
+ time.Pause();
+ Lum::OS::display->RemoveTimer(timer);
+ break;
+ case stateStoped:
+ SetValue();
+ time.Reset();
+ paused->Set(false);
+ Lum::OS::display->RemoveTimer(timer);
+ break;
+ }
+}
+
+void Interval::CalcSize()
+{
+ Lum::Object *countdown;
+ Lum::Model::HeaderRef headerModel;
+
+ clock->SetFlex(true,true);
+
+ headerModel=new Lum::Model::HeaderImpl();
+ headerModel->AddColumn(L"Time",Lum::Base::Size::stdCharWidth,8);
+
+ lapTable=new Lum::Table();
+ lapTable->SetFlex(false,true);
+ lapTable->SetModel(laps);
+ lapTable->SetHeaderModel(headerModel);
+ lapTable->SetShowHeader(false);
+ lapTable->SetAutoHSize(true);
+
+ countdown=Lum::VPanel::Create(true,true)
+ ->Add(Lum::HPanel::Create(true,true)
+ ->Add(lapTable)
+ ->AddSpace()
+ ->Add(clock))
+ ->AddSpace()
+ ->Add(Lum::ButtonRow::Create(true,false)
+ ->Add(Lum::Button::Create(_(L"BUTTON_START",L"_Start"),startAction,true,true))
+ ->Add(Lum::Toggle::Create(_(L"BUTTON_PAUSE",L"Pause"),paused,true,true))
+ ->Add(Lum::Button::Create(_(L"BUTTON_PULSE",L"_Impuls"),pulseAction,true,true))
+ ->Add(Lum::Button::Create(_(L"BUTTON_STOP",L"Sto_p"),stopAction,true,true)));
+
+ container=countdown;
+
+ SetState(stateStoped);
+
+ Component::CalcSize();
+}
+
+void Interval::Resync(Lum::Base::Model* model, const Lum::Base::ResyncMsg& msg)
+{
+ if (model==startAction &&
+ startAction->IsFinished()) {
+ SetState(stateStoped);
+ SetState(stateRunning);
+ }
+ else if (model==paused) {
+ if (state==stateRunning &&
+ paused->Get()) {
+ SetState(statePaused);
+ }
+ else if (state==statePaused &&
+ !paused->Get()) {
+ SetState(stateRunning);
+ }
+ }
+ else if (model==pulseAction &&
+ pulseAction->IsFinished()) {
+ Lum::Base::SystemTime now;
+
+ laps->Append(TimeSpanToWString(time.GetTime(),time.GetMicroseconds()));
+ time.Reset();
+ time.Start();
+
+ // The update to Adjustment is currently asynchronous in Table,
+ // it is possible that it is not valid (or that ShowLastPage()
+ // works on old values...
+ if (lapTable->GetTableView()->GetVAdjustment()->IsValid()) {
+ lapTable->GetTableView()->GetVAdjustment()->ShowLastPage();
+ }
+ }
+ else if (model==stopAction &&
+ stopAction->IsFinished()) {
+ SetState(stateStoped);
+ }
+ else if (model==timer && timer->IsFinished()) {
+ if (state==stateRunning) {
+ SetValue();
+ Lum::OS::display->AddTimer(0,REFRESH_TIME_MICRO,timer);
+ }
+ }
+
+ Lum::Component::Resync(model,msg);
+}
Property changes on: trunk/TimerJinni/src/Interval.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/TimerJinni/src/Interval.h
===================================================================
--- trunk/TimerJinni/src/Interval.h (rev 0)
+++ trunk/TimerJinni/src/Interval.h 2010-12-21 12:40:52 UTC (rev 4079)
@@ -0,0 +1,74 @@
+#ifndef INTERVAL_H
+#define INTERVAL_H
+
+/*
+ TimerJinni - A general timing application
+ Copyright (C) 2010 Tim Teulings
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <Lum/Audio/PlaySound.h>
+
+#include <Lum/Object.h>
+
+#include <Lum/Model/Action.h>
+#include <Lum/Model/Boolean.h>
+#include <Lum/Model/Number.h>
+#include <Lum/Model/Table.h>
+
+#include <Lum/Table.h>
+
+#include "StopWatch.h"
+
+class Interval : public Lum::Component
+{
+private:
+ enum State {
+ stateUninitialized,
+ statePaused,
+ stateStoped,
+ stateRunning
+ };
+
+private:
+ Lum::Model::ActionRef startAction;
+ Lum::Model::BooleanRef paused;
+ Lum::Model::ActionRef pulseAction;
+ Lum::Model::ActionRef stopAction;
+ Lum::Model::ActionRef timer;
+ Lum::Model::StringTableRef laps;
+
+ Lum::Table* lapTable;
+
+ Lum::Base::Timer time;
+ State state;
+ StopWatch *clock;
+
+private:
+ void SetValue();
+ void AllowScreenBlanking(bool allow);
+ void SetState(State state);
+
+public:
+ Interval();
+ ~Interval();
+
+ void CalcSize();
+
+ void Resync(Lum::Base::Model* model, const Lum::Base::ResyncMsg& msg);
+};
+
+#endif
Property changes on: trunk/TimerJinni/src/Interval.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/TimerJinni/src/Makefile.am
===================================================================
--- trunk/TimerJinni/src/Makefile.am 2010-12-21 12:16:55 UTC (rev 4078)
+++ trunk/TimerJinni/src/Makefile.am 2010-12-21 12:40:52 UTC (rev 4079)
@@ -8,6 +8,8 @@
Countdown.cpp \
Countup.h \
Countup.cpp \
+ Interval.h \
+ Interval.cpp \
TimerJinni.cpp
if HAVE_WINDRES
Modified: trunk/TimerJinni/src/TimerJinni.cpp
===================================================================
--- trunk/TimerJinni/src/TimerJinni.cpp 2010-12-21 12:16:55 UTC (rev 4078)
+++ trunk/TimerJinni/src/TimerJinni.cpp 2010-12-21 12:40:52 UTC (rev 4079)
@@ -44,6 +44,7 @@
#include "Countdown.h"
#include "Countup.h"
+#include "Interval.h"
#include "config.h"
@@ -92,6 +93,12 @@
multiView.AddView(Lum::Def::MultiView::View(0,Lum::Def::Desc(L"Count up"),
countup));
+ Lum::Object *interval=new Interval();
+ interval->SetFlex(true,true);
+
+ multiView.AddView(Lum::Def::MultiView::View(0,Lum::Def::Desc(L"Interval"),
+ interval));
+
Lum::Def::Menu *preMenu=Lum::Def::Menu::Create();
preMenu
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 12:17:02
|
Revision: 4078
http://illumination.svn.sourceforge.net/illumination/?rev=4078&view=rev
Author: tteuling
Date: 2010-12-21 12:16:55 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Fixed configure.ac warning.
Modified Paths:
--------------
trunk/PackageView/configure.ac
Modified: trunk/PackageView/configure.ac
===================================================================
--- trunk/PackageView/configure.ac 2010-12-21 12:16:05 UTC (rev 4077)
+++ trunk/PackageView/configure.ac 2010-12-21 12:16:55 UTC (rev 4078)
@@ -2,7 +2,7 @@
AC_PREREQ(2.56)
AC_INIT([PackageView],
[0.4],
- [Send bugreports to <ti...@te...>],
+ [ti...@te...],
[packageview])
AC_CONFIG_SRCDIR(src/Main.cpp)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 12:16:11
|
Revision: 4077
http://illumination.svn.sourceforge.net/illumination/?rev=4077&view=rev
Author: tteuling
Date: 2010-12-21 12:16:05 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Fixed lintian errors
Modified Paths:
--------------
trunk/WeightJinni/packaging/maemo/changelog
trunk/WeightJinni/packaging/maemo/control
trunk/WeightJinni/packaging/maemo/rules
Modified: trunk/WeightJinni/packaging/maemo/changelog
===================================================================
--- trunk/WeightJinni/packaging/maemo/changelog 2010-12-21 12:15:49 UTC (rev 4076)
+++ trunk/WeightJinni/packaging/maemo/changelog 2010-12-21 12:16:05 UTC (rev 4077)
@@ -1,3 +1,9 @@
+weightjinni (1.10.20101220-2) unstable; urgency=low
+
+ * Improved diagram drawing
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 12:58:22 +0100
+
weightjinni (1.10.20101220-1) unstable; urgency=low
* Rebuild against current Illumination.
Modified: trunk/WeightJinni/packaging/maemo/control
===================================================================
--- trunk/WeightJinni/packaging/maemo/control 2010-12-21 12:15:49 UTC (rev 4076)
+++ trunk/WeightJinni/packaging/maemo/control 2010-12-21 12:16:05 UTC (rev 4077)
@@ -1,5 +1,5 @@
Source: weightjinni
-Section: misc
+Section: user/utilities
Priority: optional
Maintainer: Tim Teulings <ti...@te...>
Homepage: http://www.anderenen.de/anderenende/maemo.html
@@ -9,7 +9,7 @@
Package: weightjinni
Section: user/utilities
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Tool to monitor your weight
A tool to monitor your weight and measure your eating behaviour.
XSBC-Bugtracker: https://sourceforge.net/tracker2/?group_id=112947&atid=663665
Modified: trunk/WeightJinni/packaging/maemo/rules
===================================================================
--- trunk/WeightJinni/packaging/maemo/rules 2010-12-21 12:15:49 UTC (rev 4076)
+++ trunk/WeightJinni/packaging/maemo/rules 2010-12-21 12:16:05 UTC (rev 4077)
@@ -31,7 +31,7 @@
dh_testdir
dh_testroot
rm -f configure-stamp build-stamp
- -$(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
install: build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 12:15:56
|
Revision: 4076
http://illumination.svn.sourceforge.net/illumination/?rev=4076&view=rev
Author: tteuling
Date: 2010-12-21 12:15:49 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Fixed lintian errors
Modified Paths:
--------------
trunk/GPSJinni/packaging/maemo/changelog
trunk/GPSJinni/packaging/maemo/control
trunk/GPSJinni/packaging/maemo/rules
Modified: trunk/GPSJinni/packaging/maemo/changelog
===================================================================
--- trunk/GPSJinni/packaging/maemo/changelog 2010-12-21 12:15:35 UTC (rev 4075)
+++ trunk/GPSJinni/packaging/maemo/changelog 2010-12-21 12:15:49 UTC (rev 4076)
@@ -1,3 +1,10 @@
+gpsjinni (0.9.20101221-3) unstable; urgency=low
+
+ * Fixed lintian bugs.
+ * More icon path fixes.
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 13:13:45 +0100
+
gpsjinni (0.9.20101221-2) unstable; urgency=low
* Fix icon search path.
Modified: trunk/GPSJinni/packaging/maemo/control
===================================================================
--- trunk/GPSJinni/packaging/maemo/control 2010-12-21 12:15:35 UTC (rev 4075)
+++ trunk/GPSJinni/packaging/maemo/control 2010-12-21 12:15:49 UTC (rev 4076)
@@ -1,5 +1,5 @@
Source: gpsjinni
-Section: misc
+Section: user/navigation
Priority: optional
Maintainer: Tim Teulings <ti...@te...>
Homepage: http://www.anderenen.de/anderenende/maemo.html
@@ -9,7 +9,7 @@
Package: gpsjinni
Section: user/navigation
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Display GPS raw data, position, speed, compass, tracking and more.
This application shows raw data from the GPS subsystem
including GPS position, altitude and movement. It further
Modified: trunk/GPSJinni/packaging/maemo/rules
===================================================================
--- trunk/GPSJinni/packaging/maemo/rules 2010-12-21 12:15:35 UTC (rev 4075)
+++ trunk/GPSJinni/packaging/maemo/rules 2010-12-21 12:15:49 UTC (rev 4076)
@@ -31,7 +31,7 @@
dh_testdir
dh_testroot
rm -f configure-stamp build-stamp
- -$(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
install: build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 12:15:41
|
Revision: 4075
http://illumination.svn.sourceforge.net/illumination/?rev=4075&view=rev
Author: tteuling
Date: 2010-12-21 12:15:35 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Fixed lintian errors
Modified Paths:
--------------
trunk/EightyOne/packaging/maemo/changelog
trunk/EightyOne/packaging/maemo/control
trunk/EightyOne/packaging/maemo/rules
Modified: trunk/EightyOne/packaging/maemo/changelog
===================================================================
--- trunk/EightyOne/packaging/maemo/changelog 2010-12-21 12:12:10 UTC (rev 4074)
+++ trunk/EightyOne/packaging/maemo/changelog 2010-12-21 12:15:35 UTC (rev 4075)
@@ -1,3 +1,15 @@
+eightyone (1.11.20101221-4) unstable; urgency=low
+
+ * Readded shlibs:Depends
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 13:02:47 +0100
+
+eightyone (1.11.20101221-3) unstable; urgency=low
+
+ * Removed some lintian errors
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 12:18:21 +0100
+
eightyone (1.11.20101221-2) unstable; urgency=low
* Fore rebuild against newer libillumination
Modified: trunk/EightyOne/packaging/maemo/control
===================================================================
--- trunk/EightyOne/packaging/maemo/control 2010-12-21 12:12:10 UTC (rev 4074)
+++ trunk/EightyOne/packaging/maemo/control 2010-12-21 12:15:35 UTC (rev 4075)
@@ -1,5 +1,5 @@
Source: eightyone
-Section: misc
+Section: user/games
Priority: optional
Maintainer: Tim Teulings <ti...@te...>
Homepage: http://www.anderenen.de/anderenende/maemo.html
@@ -9,7 +9,7 @@
Package: eightyone
Section: user/games
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A Sudoku clone
A simple Sudoku clone written using the Illumination GUI library.
XSBC-Bugtracker: https://sourceforge.net/tracker2/?group_id=112947&atid=663665
Modified: trunk/EightyOne/packaging/maemo/rules
===================================================================
--- trunk/EightyOne/packaging/maemo/rules 2010-12-21 12:12:10 UTC (rev 4074)
+++ trunk/EightyOne/packaging/maemo/rules 2010-12-21 12:15:35 UTC (rev 4075)
@@ -31,7 +31,7 @@
dh_testdir
dh_testroot
rm -f configure-stamp build-stamp
- -$(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
install: build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 12:12:16
|
Revision: 4074
http://illumination.svn.sourceforge.net/illumination/?rev=4074&view=rev
Author: tteuling
Date: 2010-12-21 12:12:10 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Fixed image search path.
Modified Paths:
--------------
trunk/GPSJinni/data/icons/Delete_dark.svg
trunk/GPSJinni/data/icons/Record_dark.svg
trunk/GPSJinni/data/icons/Stop_dark.svg
trunk/GPSJinni/src/GPSJinni.cpp
Modified: trunk/GPSJinni/data/icons/Delete_dark.svg
===================================================================
(Binary files differ)
Modified: trunk/GPSJinni/data/icons/Record_dark.svg
===================================================================
(Binary files differ)
Modified: trunk/GPSJinni/data/icons/Stop_dark.svg
===================================================================
(Binary files differ)
Modified: trunk/GPSJinni/src/GPSJinni.cpp
===================================================================
--- trunk/GPSJinni/src/GPSJinni.cpp 2010-12-21 12:04:51 UTC (rev 4073)
+++ trunk/GPSJinni/src/GPSJinni.cpp 2010-12-21 12:12:10 UTC (rev 4074)
@@ -568,6 +568,8 @@
satellites->SetEmptyText(L"(no satellites found)");
tracks->SetEmptyText(L"(no tracks found)");
+ Lum::Images::loader->SetNormalImagePostfix(L"");
+
// For testsing purposes
/*
for (int i=0; i<20; i++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 12:04:57
|
Revision: 4073
http://illumination.svn.sourceforge.net/illumination/?rev=4073&view=rev
Author: tteuling
Date: 2010-12-21 12:04:51 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Removed prefix for icon path.
Modified Paths:
--------------
trunk/EightyOne/src/Main.cpp
Modified: trunk/EightyOne/src/Main.cpp
===================================================================
--- trunk/EightyOne/src/Main.cpp 2010-12-21 11:58:03 UTC (rev 4072)
+++ trunk/EightyOne/src/Main.cpp 2010-12-21 12:04:51 UTC (rev 4073)
@@ -755,7 +755,6 @@
path.SetDir(L"data");
path.AppendDir(L"icons");
- path.AppendDir(L"16x16");
Lum::Images::loader->AddApplicationSearchPath(path);
return Lum::GUIApplication<MainDialog>::Initialize();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:58:09
|
Revision: 4072
http://illumination.svn.sourceforge.net/illumination/?rev=4072&view=rev
Author: tteuling
Date: 2010-12-21 11:58:03 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Improved diagram drawing (order of drawing, color).
Modified Paths:
--------------
trunk/WeightJinni/src/Diagram.cpp
trunk/WeightJinni/src/Diagram.h
Modified: trunk/WeightJinni/src/Diagram.cpp
===================================================================
--- trunk/WeightJinni/src/Diagram.cpp 2010-12-21 11:13:42 UTC (rev 4071)
+++ trunk/WeightJinni/src/Diagram.cpp 2010-12-21 11:58:03 UTC (rev 4072)
@@ -45,11 +45,11 @@
warnColor(1.0,0.0,0.0,Lum::OS::display->blackColor),
limitColor(1.0,0.0,0.0,Lum::OS::display->blackColor),
valueGoodColor(0.95,0.95,0.95,Lum::OS::display->blackColor),
- valueGoodFrameColor(0.64,0.64,0.64,Lum::OS::display->blackColor),
+ valueGoodFrameColor(0.8,0.8,0.8,Lum::OS::display->blackColor),
valueBadColor(1.0,0.82,0.82,Lum::OS::display->blackColor),
valueBadFrameColor(0.8,0.58,0.58,Lum::OS::display->blackColor),
- scaleColor(0.7,0.7,0.7,Lum::OS::display->blackColor),
- textColor(0.7,0.7,0.7,Lum::OS::display->blackColor),
+ labelColor(0.3,0.3,0.3,Lum::OS::display->blackColor),
+ scaleColor(0.9,0.9,0.9,Lum::OS::display->blackColor),
font(Lum::OS::display->GetFont(Lum::OS::Display::fontScaleFootnote)),
mode(modeFullDay)
{
@@ -147,6 +147,7 @@
{
int xPos=this->x+((hAdjustment->GetTop()-1)/dayWidth)*
dayWidth-(hAdjustment->GetTop()-1);
+ std::map<Lum::Base::Calendar,Day*>::const_iterator startIter;
std::map<Lum::Base::Calendar,Day*>::const_iterator iter;
bool pointsDrawn=false; // We have drawn at least one point
bool pastEnd=false; // We have beenmoved past the visible end
@@ -155,14 +156,14 @@
Lum::Base::Calendar day;
size_t lastWeight=0;
- iter=data.data.lower_bound(start);
- while (iter!=data.data.begin()) {
+ startIter=data.data.lower_bound(start);
+ while (startIter!=data.data.begin()) {
bool hasPoint=false;
- --iter;
+ --startIter;
- for (std::list<Entry>::const_iterator entry=iter->second->entries.begin();
- entry!=iter->second->entries.end();
+ for (std::list<Entry>::const_iterator entry=startIter->second->entries.begin();
+ entry!=startIter->second->entries.end();
++entry) {
if (entry->item.empty()) {
hasPoint=true;
@@ -175,7 +176,7 @@
}
}
- while (iter!=data.data.end() && !finished) {
+ for (iter=startIter; iter!=data.data.end() && !finished; ++iter) {
int days;
Value value=0;
@@ -184,10 +185,6 @@
// diagram borders
//
- if (iter->first>end) {
- pastEnd=true;
- }
-
days=0;
day=start;
if (day<=iter->first) {
@@ -237,8 +234,37 @@
dayWidth,height-TransformValue(value));
draw->PopForeground();
}
+ }
+ pastEnd=false;
+ for (iter=startIter; iter!=data.data.end() && !finished; ++iter) {
+ int days;
+
//
+ // Detect first weight points to the left and right of the
+ // diagram borders
+ //
+
+ if (iter->first>end) {
+ pastEnd=true;
+ }
+
+ days=0;
+ day=start;
+ if (day<=iter->first) {
+ while (day!=iter->first) {
+ day.AddDays(1);
+ days++;
+ }
+ }
+ else {
+ while (day!=iter->first) {
+ day.AddDays(-1);
+ days--;
+ }
+ }
+
+ //
// Draw weight points
//
@@ -278,7 +304,7 @@
lx2=cx;
ly2=cy;
- if (!(lx1<this->x && lx2<this->x) && cx!=px) {
+ if (!(lx1<this->x && lx2<this->x)) {
// Point outside diagram: Interpolate position on left diagram border
if (lx1<this->x) {
lx1=this->x;
@@ -287,8 +313,14 @@
// Point outside diagram: Interpolate position on right diagram border
if (lx2>this->x+(int)this->width-1) {
- lx2=this->x+(int)this->width-1;
- ly2=((lx2-px)*(cy-py))/(cx-px)+py;
+ if (cx!=px) {
+ lx2=this->x+(int)this->width-1;
+ ly2=((lx2-px)*(cy-py))/(cx-px)+py;
+ }
+ else {
+ lx2=this->x+(int)this->width-1;
+ ly2=ly1;
+ }
}
if(lastWeight<minWeight->Get() || lastWeight>maxWeight->Get() ||
@@ -316,40 +348,25 @@
}
}
}
-
- ++iter;
}
}
-void Diagram::PrintHorizontalScale(Lum::OS::DrawInfo* draw,
+void Diagram::PrintHorizontalLabel(Lum::OS::DrawInfo* draw,
size_t dayWidth,
const Lum::Base::Calendar& start)
{
std::wstring tmp;
Lum::Base::Calendar day;
+ draw->PushClip(this->x+weightUnitWidth,this->y,this->width-weightUnitWidth-valueUnitWidth,this->height);
draw->PushFont(font);
+ draw->PushForeground(labelColor);
- draw->PushClip(this->x+weightUnitWidth,this->y,this->width-weightUnitWidth-valueUnitWidth,this->height);
-
day=start;
int xPos=this->x+((hAdjustment->GetTop()-1)/dayWidth)*dayWidth-(hAdjustment->GetTop()-1);
while (xPos<this->x+(int)width) {
-
- draw->PushForeground(scaleColor);
switch (mode) {
case modeFullDay:
- case modeSmallDay:
- draw->DrawLine(xPos+dayWidth-1,this->y,xPos+dayWidth-1,this->y+height-1);
- break;
- default:
- break;
- }
- draw->PopForeground();
-
- draw->PushForeground(textColor);
- switch (mode) {
- case modeFullDay:
tmp=Lum::Base::Calendar::GetWeekDayNameShort(day.GetDayOfWeek());
draw->DrawString(xPos+(dayWidth-font->StringWidth(tmp))/2,this->y+height-3*font->height+font->ascent,tmp);
@@ -376,23 +393,57 @@
}
break;
}
- draw->PopForeground();
day.AddDays(1);
xPos+=dayWidth;
}
+ draw->PopForeground();
+ draw->PopFont();
draw->PopClip();
- draw->PopFont();
}
+void Diagram::PrintVerticalScale(Lum::OS::DrawInfo* draw,
+ size_t dayWidth,
+ const Lum::Base::Calendar& start)
+{
+ Lum::Base::Calendar day;
+
+ draw->PushClip(this->x+weightUnitWidth,
+ this->y,
+ this->width-weightUnitWidth-valueUnitWidth,
+ this->height);
+
+ draw->PushForeground(scaleColor);
+
+ day=start;
+ int xPos=this->x+((hAdjustment->GetTop()-1)/dayWidth)*dayWidth-(hAdjustment->GetTop()-1);
+ while (xPos<this->x+(int)width) {
+ switch (mode) {
+ case modeFullDay:
+ case modeSmallDay:
+ draw->DrawLine(xPos+dayWidth-1,this->y,xPos+dayWidth-1,this->y+height-1);
+ break;
+ default:
+ break;
+ }
+
+ day.AddDays(1);
+ xPos+=dayWidth;
+ }
+
+ draw->PopForeground();
+
+ draw->PopClip();
+}
+
/**
Printing vertial value scale
*/
-void Diagram::PrintVerticalScale(Lum::OS::DrawInfo* draw)
+void Diagram::PrintVerticalLabel(Lum::OS::DrawInfo* draw)
{
- draw->PushForeground(scaleColor);
+ draw->PushForeground(labelColor);
draw->PushFont(font);
size_t step;
@@ -468,19 +519,28 @@
void Diagram::PrintLimits(Lum::OS::DrawInfo* draw)
{
+ // Weigth limits
draw->PushForeground(limitColor);
- draw->DrawLine(this->x,this->y+TransformWeight(maxWeight->Get()),
- this->x+weightUnitWidth-1,this->y+TransformWeight(maxWeight->Get()));
- draw->DrawLine(this->x,this->y+TransformWeight(minWeight->Get()),
- this->x+weightUnitWidth-1,this->y+TransformWeight(minWeight->Get()));
+ draw->DrawLine(this->x,
+ this->y+TransformWeight(maxWeight->Get()),
+ this->x+weightUnitWidth-1,
+ this->y+TransformWeight(maxWeight->Get()));
+ draw->DrawLine(this->x,
+ this->y+TransformWeight(minWeight->Get()),
+ this->x+weightUnitWidth-1,
+ this->y+TransformWeight(minWeight->Get()));
draw->PopForeground();
// Value limits
draw->PushForeground(limitColor);
- draw->DrawLine(this->x+width-1-valueUnitWidth,this->y+TransformValue(maxValue->Get()),
- this->x+width-1,this->y+TransformValue(maxValue->Get()));
- draw->DrawLine(this->x+width-1-valueUnitWidth,this->y+TransformValue(minValue->Get()),
- this->x+width-1,this->y+TransformValue(minValue->Get()));
+ draw->DrawLine(this->x+width-1-valueUnitWidth,
+ this->y+TransformValue(maxValue->Get()),
+ this->x+width-1,
+ this->y+TransformValue(maxValue->Get()));
+ draw->DrawLine(this->x+width-1-valueUnitWidth,
+ this->y+TransformValue(minValue->Get()),
+ this->x+width-1,
+ this->y+TransformValue(minValue->Get()));
draw->PopForeground();
}
@@ -553,10 +613,11 @@
draw->PushClip(this->x,this->y,width,height);
draw->PushClip(x,y,w,h);
+ PrintVerticalScale(draw,dayWidth,start);
PrintData(draw,dayWidth,start,end);
- PrintHorizontalScale(draw,dayWidth,start);
- PrintVerticalScale(draw);
PrintLimits(draw);
+ PrintHorizontalLabel(draw,dayWidth,start);
+ PrintVerticalLabel(draw);
draw->PopClip();
draw->PopClip();
Modified: trunk/WeightJinni/src/Diagram.h
===================================================================
--- trunk/WeightJinni/src/Diagram.h 2010-12-21 11:13:42 UTC (rev 4071)
+++ trunk/WeightJinni/src/Diagram.h 2010-12-21 11:58:03 UTC (rev 4072)
@@ -40,8 +40,8 @@
Lum::OS::ColorRef valueGoodFrameColor;
Lum::OS::ColorRef valueBadColor;
Lum::OS::ColorRef valueBadFrameColor;
+ Lum::OS::ColorRef labelColor;
Lum::OS::ColorRef scaleColor;
- Lum::OS::ColorRef textColor;
Lum::OS::FontRef font;
@@ -65,10 +65,13 @@
size_t dayWidth,
const Lum::Base::Calendar& start,
const Lum::Base::Calendar& end);
- void PrintHorizontalScale(Lum::OS::DrawInfo* draw,
+ void PrintHorizontalLabel(Lum::OS::DrawInfo* draw,
size_t dayWidth,
const Lum::Base::Calendar& start);
- void PrintVerticalScale(Lum::OS::DrawInfo* draw);
+ void PrintVerticalScale(Lum::OS::DrawInfo* draw,
+ size_t dayWidth,
+ const Lum::Base::Calendar& start);
+ void PrintVerticalLabel(Lum::OS::DrawInfo* draw);
void PrintLimits(Lum::OS::DrawInfo* draw);
void SyncGraphWithDate();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:13:47
|
Revision: 4071
http://illumination.svn.sourceforge.net/illumination/?rev=4071&view=rev
Author: tteuling
Date: 2010-12-21 11:13:42 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Updating maemo packaging
Modified Paths:
--------------
trunk/WifiInfo/packaging/maemo/changelog
Modified: trunk/WifiInfo/packaging/maemo/changelog
===================================================================
--- trunk/WifiInfo/packaging/maemo/changelog 2010-12-21 11:13:33 UTC (rev 4070)
+++ trunk/WifiInfo/packaging/maemo/changelog 2010-12-21 11:13:42 UTC (rev 4071)
@@ -1,3 +1,9 @@
+wifiinfo (0.10.20101220-1) unstable; urgency=low
+
+ * Rebuild against current Illumination.
+
+ -- Tim Teulings <ti...@te...> Mon, 20 Dec 2010 19:10:05 +0100
+
wifiinfo (0.10.20101005-2) unstable; urgency=low
* * Increase version to force rebuild against current Illumination
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:13:40
|
Revision: 4070
http://illumination.svn.sourceforge.net/illumination/?rev=4070&view=rev
Author: tteuling
Date: 2010-12-21 11:13:33 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Updating maemo packaging
Modified Paths:
--------------
trunk/WhoAmI/ChangeLog
trunk/WhoAmI/configure.ac
trunk/WhoAmI/packaging/maemo/changelog
Modified: trunk/WhoAmI/ChangeLog
===================================================================
--- trunk/WhoAmI/ChangeLog 2010-12-21 11:13:22 UTC (rev 4069)
+++ trunk/WhoAmI/ChangeLog 2010-12-21 11:13:33 UTC (rev 4070)
@@ -1,3 +1,7 @@
+Version 1.3
+
+* Added portrait mode.
+
Version 1.2
* Added support for NetworkManager connection handling.
Modified: trunk/WhoAmI/configure.ac
===================================================================
--- trunk/WhoAmI/configure.ac 2010-12-21 11:13:22 UTC (rev 4069)
+++ trunk/WhoAmI/configure.ac 2010-12-21 11:13:33 UTC (rev 4070)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
AC_INIT(WhoAmI,
- [1.2],
+ [1.3],
[ti...@te...],
[whoami])
Modified: trunk/WhoAmI/packaging/maemo/changelog
===================================================================
--- trunk/WhoAmI/packaging/maemo/changelog 2010-12-21 11:13:22 UTC (rev 4069)
+++ trunk/WhoAmI/packaging/maemo/changelog 2010-12-21 11:13:33 UTC (rev 4070)
@@ -1,3 +1,15 @@
+whoami (1.3.20101220-2) unstable; urgency=low
+
+ * Fore rebuild against newer libillumination
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 11:58:46 +0100
+
+whoami (1.3.20101220-1) unstable; urgency=low
+
+ * Rebuild against current Illumination.
+
+ -- Tim Teulings <ti...@te...> Mon, 20 Dec 2010 19:09:49 +0100
+
whoami (1.2.20101005-2) unstable; urgency=low
* * Increase version to force rebuild against current Illumination
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:13:28
|
Revision: 4069
http://illumination.svn.sourceforge.net/illumination/?rev=4069&view=rev
Author: tteuling
Date: 2010-12-21 11:13:22 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Updating maemo packaging
Modified Paths:
--------------
trunk/WeightJinni/ChangeLog
trunk/WeightJinni/configure.ac
trunk/WeightJinni/packaging/maemo/changelog
Modified: trunk/WeightJinni/ChangeLog
===================================================================
--- trunk/WeightJinni/ChangeLog 2010-12-21 11:13:11 UTC (rev 4068)
+++ trunk/WeightJinni/ChangeLog 2010-12-21 11:13:22 UTC (rev 4069)
@@ -1,3 +1,7 @@
+Version 1.10
+
+* Fixed crash while diagram drawing.
+
Version 1.9
* Switched to one-column, headerless tables.
Modified: trunk/WeightJinni/configure.ac
===================================================================
--- trunk/WeightJinni/configure.ac 2010-12-21 11:13:11 UTC (rev 4068)
+++ trunk/WeightJinni/configure.ac 2010-12-21 11:13:22 UTC (rev 4069)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
AC_INIT(WeightJinni,
- [1.9],
+ [1.10],
[ti...@te...],
[weightjinni])
Modified: trunk/WeightJinni/packaging/maemo/changelog
===================================================================
--- trunk/WeightJinni/packaging/maemo/changelog 2010-12-21 11:13:11 UTC (rev 4068)
+++ trunk/WeightJinni/packaging/maemo/changelog 2010-12-21 11:13:22 UTC (rev 4069)
@@ -1,3 +1,10 @@
+weightjinni (1.10.20101220-1) unstable; urgency=low
+
+ * Rebuild against current Illumination.
+ * Fixed crash while diagram drawing.
+
+ -- Tim Teulings <ti...@te...> Mon, 20 Dec 2010 19:08:31 +0100
+
weightjinni (1.9.20101005-2) unstable; urgency=low
* * Increase version to force rebuild against current Illumination
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:13:17
|
Revision: 4068
http://illumination.svn.sourceforge.net/illumination/?rev=4068&view=rev
Author: tteuling
Date: 2010-12-21 11:13:11 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Updating maemo packaging
Modified Paths:
--------------
trunk/TimerJinni/packaging/maemo/changelog
trunk/TimerJinni/packaging/maemo/control
Modified: trunk/TimerJinni/packaging/maemo/changelog
===================================================================
--- trunk/TimerJinni/packaging/maemo/changelog 2010-12-21 11:13:00 UTC (rev 4067)
+++ trunk/TimerJinni/packaging/maemo/changelog 2010-12-21 11:13:11 UTC (rev 4068)
@@ -1,3 +1,9 @@
+timerjinni (1.2.20101220-1) unstable; urgency=low
+
+ * Rebuild against current Illumination.
+
+ -- Tim Teulings <ti...@te...> Mon, 20 Dec 2010 19:08:04 +0100
+
timerjinni (1.2.20100518-1) unstable; urgency=low
* Added switch to prohibit screen blanking
Modified: trunk/TimerJinni/packaging/maemo/control
===================================================================
--- trunk/TimerJinni/packaging/maemo/control 2010-12-21 11:13:00 UTC (rev 4067)
+++ trunk/TimerJinni/packaging/maemo/control 2010-12-21 11:13:11 UTC (rev 4068)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Tim Teulings <ti...@te...>
Homepage: http://www.anderenen.de/anderenende/maemo.html
-Build-Depends: debhelper (>= 4.0.0 ), libillumination0-dev
+Build-Depends: debhelper (>= 4.0.0 ), libillumination1-dev
Standards-Version: 3.7.2
Package: timerjinni
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:13:06
|
Revision: 4067
http://illumination.svn.sourceforge.net/illumination/?rev=4067&view=rev
Author: tteuling
Date: 2010-12-21 11:13:00 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Updating maemo packaging
Modified Paths:
--------------
trunk/Scopa/packaging/maemo/changelog
Modified: trunk/Scopa/packaging/maemo/changelog
===================================================================
--- trunk/Scopa/packaging/maemo/changelog 2010-12-21 11:12:52 UTC (rev 4066)
+++ trunk/Scopa/packaging/maemo/changelog 2010-12-21 11:13:00 UTC (rev 4067)
@@ -1,3 +1,9 @@
+scopa (1.2.20101220-1) unstable; urgency=low
+
+ * Rebuild against current Illumination.
+
+ -- Tim Teulings <ti...@te...> Mon, 20 Dec 2010 19:07:49 +0100
+
scopa (1.2.20101005-2) unstable; urgency=low
* * Increase version to force rebuild against current Illumination
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:12:58
|
Revision: 4066
http://illumination.svn.sourceforge.net/illumination/?rev=4066&view=rev
Author: tteuling
Date: 2010-12-21 11:12:52 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Updating maemo packaging
Modified Paths:
--------------
trunk/RulerJinni/ChangeLog
trunk/RulerJinni/configure.ac
trunk/RulerJinni/packaging/maemo/changelog
Modified: trunk/RulerJinni/ChangeLog
===================================================================
--- trunk/RulerJinni/ChangeLog 2010-12-21 11:12:40 UTC (rev 4065)
+++ trunk/RulerJinni/ChangeLog 2010-12-21 11:12:52 UTC (rev 4066)
@@ -0,0 +1,9 @@
+Version 1.1
+
+* Added portrait mode
+
+* Added fullscreen mode (double click beneath ruler)
+
+Version 1.0
+
+* Initial version
Modified: trunk/RulerJinni/configure.ac
===================================================================
--- trunk/RulerJinni/configure.ac 2010-12-21 11:12:40 UTC (rev 4065)
+++ trunk/RulerJinni/configure.ac 2010-12-21 11:12:52 UTC (rev 4066)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
AC_INIT(RulerJinni,
- [1.0],
+ [1.1],
[ti...@te...],
[rulerjinni])
Modified: trunk/RulerJinni/packaging/maemo/changelog
===================================================================
--- trunk/RulerJinni/packaging/maemo/changelog 2010-12-21 11:12:40 UTC (rev 4065)
+++ trunk/RulerJinni/packaging/maemo/changelog 2010-12-21 11:12:52 UTC (rev 4066)
@@ -1,3 +1,15 @@
+rulerjinni (1.1.20101220-2) unstable; urgency=low
+
+ * Fore rebuild against newer libillumination
+
+ -- Tim Teulings <ti...@te...> Tue, 21 Dec 2010 11:58:58 +0100
+
+rulerjinni (1.1.20101220-1) unstable; urgency=low
+
+ * Rebuild against current Illumination.
+
+ -- Tim Teulings <ti...@te...> Mon, 20 Dec 2010 19:07:33 +0100
+
rulerjinni (1.0.20101005-2) unstable; urgency=low
* * Increase version to force rebuild against current Illumination
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:12:46
|
Revision: 4065
http://illumination.svn.sourceforge.net/illumination/?rev=4065&view=rev
Author: tteuling
Date: 2010-12-21 11:12:40 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Updating maemo packaging
Modified Paths:
--------------
trunk/PushIt/packaging/maemo/changelog
Modified: trunk/PushIt/packaging/maemo/changelog
===================================================================
--- trunk/PushIt/packaging/maemo/changelog 2010-12-21 11:12:31 UTC (rev 4064)
+++ trunk/PushIt/packaging/maemo/changelog 2010-12-21 11:12:40 UTC (rev 4065)
@@ -1,3 +1,9 @@
+pushit (0.9.20101220-1) unstable; urgency=low
+
+ * Rebuild against current Illumination.
+
+ -- Tim Teulings <ti...@te...> Mon, 20 Dec 2010 19:06:21 +0100
+
pushit (0.9.20101005-2) unstable; urgency=low
* * Increase version to force rebuild against current Illumination
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tte...@us...> - 2010-12-21 11:12:37
|
Revision: 4064
http://illumination.svn.sourceforge.net/illumination/?rev=4064&view=rev
Author: tteuling
Date: 2010-12-21 11:12:31 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
* Updating maemo packaging
Modified Paths:
--------------
trunk/PID/packaging/maemo/changelog
Modified: trunk/PID/packaging/maemo/changelog
===================================================================
--- trunk/PID/packaging/maemo/changelog 2010-12-21 11:12:23 UTC (rev 4063)
+++ trunk/PID/packaging/maemo/changelog 2010-12-21 11:12:31 UTC (rev 4064)
@@ -1,3 +1,9 @@
+pid (0.2.20101220-1) unstable; urgency=low
+
+ * Rebuild against current Illumination.
+
+ -- Tim Teulings <ti...@te...> Mon, 20 Dec 2010 19:05:54 +0100
+
pid (0.2.20101005-2) unstable; urgency=low
* * Increase version to force rebuild against current Illumination
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|