GNOME.org
 

dasher r3671 - in trunk: . Data/alphabets Doc/development Doc/user Src/DasherCore Src/DasherCore/LanguageModelling Src/Gtk2

Author: pwelche
Date: Sat Mar 14 18:13:21 2009
New Revision: 3671
URL: http://svn.gnome.org/viewvc/dasher?rev=3671&view=rev

Log:
Fix typos. Correcting automake conditional JOYSTICK is a functional change.



Modified:
   trunk/ChangeLog
   trunk/Data/alphabets/alphabet.dtd
   trunk/Doc/development/geometry.tex
   trunk/Doc/development/releasing.txt
   trunk/Doc/development/speedcontrol.tex
   trunk/Doc/user/dasher.1.in
   trunk/Src/DasherCore/DasherInterfaceBase.h
   trunk/Src/DasherCore/DasherModel.h
   trunk/Src/DasherCore/DasherViewSquare.cpp
   trunk/Src/DasherCore/FileLogger.h
   trunk/Src/DasherCore/FrameRate.h
   trunk/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
   trunk/Src/DasherCore/LanguageModelling/LanguageModel.h
   trunk/Src/Gtk2/Preferences.cpp
   trunk/Src/Gtk2/dasher_editor_internal.h
   trunk/configure.in

Modified: trunk/Data/alphabets/alphabet.dtd
==============================================================================
--- trunk/Data/alphabets/alphabet.dtd	(original)
+++ trunk/Data/alphabets/alphabet.dtd	Sat Mar 14 18:13:21 2009
@@ -17,7 +17,7 @@
 a suitable file encoding and font. Sometimes this is difficult.
 It does not dictate the file format. For example, traditionally Unix
 and Windows use different encodings for some languages. A platform
-should do what what it thinks best given the vague group Dasher
+should do what it thinks best given the vague group Dasher
 has put the alphabet into. If this doesn't work out, the user
 can over-ride the alphabet anyway. -->
 <!ELEMENT encoding EMPTY>

Modified: trunk/Doc/development/geometry.tex
==============================================================================
--- trunk/Doc/development/geometry.tex	(original)
+++ trunk/Doc/development/geometry.tex	Sat Mar 14 18:13:21 2009
@@ -24,7 +24,7 @@
 \item {\bf World Co-ordinates} Specifies the positions of the boxes on the Dasher world - the static sheet into which the user zooms. Co-ordinates are specified relative to the parent box. TODO: How are these stored etc?
 \item {\bf Dasher Co-ordinates} Co-ordinates relative to the idealised Dasher viewport. $x$ co-ordinates are specified right to left\footnote{Dasher Co-ordinates are the same regardless of the display orientation, with the rotation done in the Dasher to screen co-ordinate mapping. In this guide I shall use the left-to-right conventions}, with the origin being to the right of the screen. They are scaled so that the cross-hair is at {\tt m\_DasherOX}. $y$ co-ordinates are specified top to bottom, with the origin being the top of the viewport and scaled so that the bottom of the viewport is at {\tt m\_DasherY}. See Figure \ref{geometry_fig} for a pictorial representation.
 
-World co-ordinates are converted to Dasher co-ordinates by the notion of a root node whose upper and lower extremes have Dasher co-ordinates given by {\tt m\_Rootmin} and {\tt m\_Rootmax} respectively. Children of the root node can be located in Dasher space by recursively taking subintervals of this range. To prevent integer values from getting to large, one of the descendents of the root node is periodically promoted to the root, with the tree above this point being discarded. {\tt m\_Rootmin} and {\tt m\_Rootmax} are scaled appropriately at this point.
+World co-ordinates are converted to Dasher co-ordinates by the notion of a root node whose upper and lower extremes have Dasher co-ordinates given by {\tt m\_Rootmin} and {\tt m\_Rootmax} respectively. Children of the root node can be located in Dasher space by recursively taking subintervals of this range. To prevent integer values from getting too large, one of the descendents of the root node is periodically promoted to the root, with the tree above this point being discarded. {\tt m\_Rootmin} and {\tt m\_Rootmax} are scaled appropriately at this point.
 
 \item {\bf Screen Co-ordinates} These are the actual screen locations. As well as the appropriate scaling and translation, a non linear transformation is also applied in order to reduce the vertical size of the boxes near the top and bottom of the viewport.
 

Modified: trunk/Doc/development/releasing.txt
==============================================================================
--- trunk/Doc/development/releasing.txt	(original)
+++ trunk/Doc/development/releasing.txt	Sat Mar 14 18:13:21 2009
@@ -4,7 +4,7 @@
 Last Updated 6th Apr 2008 by Phil Cowans.
 
 How to make a Dasher release. Note that most of this only makes sense
-if your're the Dasher maintainer, ie me!:
+if you're the Dasher maintainer, i.e., me!:
 
 1. Check that Dasher builds!
 

Modified: trunk/Doc/development/speedcontrol.tex
==============================================================================
--- trunk/Doc/development/speedcontrol.tex	(original)
+++ trunk/Doc/development/speedcontrol.tex	Sat Mar 14 18:13:21 2009
@@ -65,7 +65,7 @@
 \emph{unable} to play around with the speed slider. This could make using
 Dasher frustrating, so an automatic speed control is a desirable feature.
 
-In order to implement automatic speed contorl for Dasher, why not ask
+In order to implement automatic speed control for Dasher, why not ask
 the question ``how can we tell how well a user is doing'' or perhaps
 ``how can we tell how stressful a user is finding using Dasher''? If
 a user was doing badly or finding the experience stressful we could
@@ -137,7 +137,7 @@
 news\footnote{DJCM}! This means the speed is changing more quickly
 than our measure of user stress adapts and the change will
 ``overshoot''. Making sure that our system avoids this is very
-important. We should aim for $\tau_c \gg \tau_g$. However, if the
+important. We should aim for $\tau_c \gg \tau_v$. However, if the
 speed changes \emph{too slowly}, the system will be of limited use.
 
 \subsection{Misleading Scenarios}\label{item:back} 
@@ -148,7 +148,7 @@
 performance while writing (which hopefully is the majority of the
 time!). Furthermore, movement of the mouse backwards and forwards
 creates annoying spikes in any measure of the variance. Though this
-may well be a sign that Dasher is running to fast for the user, it may
+may well be a sign that Dasher is running too fast for the user, it may
 also be that they have changed their mind about what to write. We
 don't want to give too much emphasis to this. Furthermore, a user in
 trouble may spend a lot of time `scrolling' vertically. Typically,

Modified: trunk/Doc/user/dasher.1.in
==============================================================================
--- trunk/Doc/user/dasher.1.in	(original)
+++ trunk/Doc/user/dasher.1.in	Sat Mar 14 18:13:21 2009
@@ -69,11 +69,11 @@
 .SH MENUS
 .SS File
 .IP New
-Clear the edit box and associated a random filename with it.
+Clear the edit box and associate a random filename with it.
 .IP Open
 Read a text file into the edit box for further editing.
 .IP Save
-Save the contents of the edit box to it's associated file.
+Save the contents of the edit box to its associated file.
 .IP "Save as"
 Save the contents of the edit box to a selected file.
 .IP "Append to file"

Modified: trunk/Src/DasherCore/DasherInterfaceBase.h
==============================================================================
--- trunk/Src/DasherCore/DasherInterfaceBase.h	(original)
+++ trunk/Src/DasherCore/DasherInterfaceBase.h	Sat Mar 14 18:13:21 2009
@@ -510,9 +510,9 @@
   virtual void ShutdownTimer() = 0;
 
   ///
-  /// Append text to the trainign file - used to store state between
+  /// Append text to the training file - used to store state between
   /// sessions
-  /// @todo Pass file path to the fuction rather than having implementations work it out themselves
+  /// @todo Pass file path to the function rather than having implementations work it out themselves
   ///
   
   virtual void WriteTrainFile(const std::string &strNewText) {

Modified: trunk/Src/DasherCore/DasherModel.h
==============================================================================
--- trunk/Src/DasherCore/DasherModel.h	(original)
+++ trunk/Src/DasherCore/DasherModel.h	Sat Mar 14 18:13:21 2009
@@ -74,7 +74,7 @@
 
   ///
   /// Update the root location - called in response to regular timer
-  /// callbacks, mainly from the tier events of various button
+  /// callbacks, mainly from the timer events of various button
   /// handlers
   /// TODO: Make this a bit more central in the button handler hierarchy
   ///

Modified: trunk/Src/DasherCore/DasherViewSquare.cpp
==============================================================================
--- trunk/Src/DasherCore/DasherViewSquare.cpp	(original)
+++ trunk/Src/DasherCore/DasherViewSquare.cpp	Sat Mar 14 18:13:21 2009
@@ -137,7 +137,7 @@
   //if(iScreenRight > Screen()->GetWidth()) 
   //  iScreenRight=Screen()->GetWidth();
 
-  // Blank the regoin around the root node:
+  // Blank the region around the root node:
   
   if(iRootMin > iDasherMinY)
     DasherDrawRectangle(iDasherMaxX, iDasherMinY, iDasherMinX, iRootMin, 0, 0, Nodes1, false,true, 1);

Modified: trunk/Src/DasherCore/FileLogger.h
==============================================================================
--- trunk/Src/DasherCore/FileLogger.h	(original)
+++ trunk/Src/DasherCore/FileLogger.h	Sat Mar 14 18:13:21 2009
@@ -32,7 +32,7 @@
 // yet been created (it should be intialized to NULL).  Also has versions that
 // automatically indicate the log level without sending a parameter.
 //
-// Note: to use these you must use double open and close paranethesis, this
+// Note: to use these you must use double open and close parentheses, this
 // is due to the variable parameter list that logging can take to do printf
 // style output.  GCC supports variadic macros, but Visual Studio doesn't yet.
 //
@@ -112,13 +112,13 @@
     ~CFileLogger();
 
 
-    void Log(const char* szText, eLogLevel iLogLevel = logNORMAL, ...);         // Logs a string to our file if it meets our exceeds our logging level
+    void Log(const char* szText, eLogLevel iLogLevel = logNORMAL, ...);         // Logs a string to our file if it meets or exceeds our logging level
     void LogDebug(const char* szText, ...);                                     // Logs debug level messages
     void LogNormal(const char* szText, ...);                                    // Logs normal level messages    
     void LogCritical(const char* szText, ...);                                  // Logs critical level messages
 
     // Versions that exists so we can pass in STL strings
-    void Log(const std::string strText, eLogLevel iLogLevel = logNORMAL, ...);        // Logs a string to our file if it meets our exceeds our logging level
+    void Log(const std::string strText, eLogLevel iLogLevel = logNORMAL, ...);        // Logs a string to our file if it meets or exceeds our logging level
     
     void SetFilename(const std::string& strFilename);
     void SetLogLevel(const eLogLevel newLevel);

Modified: trunk/Src/DasherCore/FrameRate.h
==============================================================================
--- trunk/Src/DasherCore/FrameRate.h	(original)
+++ trunk/Src/DasherCore/FrameRate.h	Sat Mar 14 18:13:21 2009
@@ -106,7 +106,7 @@
     }
 
     // Calculate the framerate and reset framerate statistics for next
-    // sampleing period
+    // sampling period
     if(m_iTime2 - m_iTime) {
       m_dFr = m_iFrames * 1000.0 / (m_iTime2 - m_iTime);
       m_iTime = m_iTime2;

Modified: trunk/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
==============================================================================
--- trunk/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp	(original)
+++ trunk/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp	Sat Mar 14 18:13:21 2009
@@ -49,7 +49,7 @@
 	alpha = 14;		// 2: KT-estimator, 1: Laplace estimator, 14 = found by P.A.J. Volf to be 'good' for text
 	MaxNrNodes = 4194304; // Max number of CCTWNodes in the table, trade-off between compression and memory usage. 2^22 = 4M
     TotalNodes = 0; // to keep track of how many nodes are created in the table.
-	MaxFill = 0.9;  // Treshold to decide when to freeze the tree
+	MaxFill = 0.9;  // Threshold to decide when to freeze the tree
 	Failed = 0;		// keep track of how many nodes couldn't be found or created //debug	
 	Frozen = false; // to indicate if there is still room in the array of CCTWNodes	
 	MaxCount = 255; // Maximum value for the counts for count-halving

Modified: trunk/Src/DasherCore/LanguageModelling/LanguageModel.h
==============================================================================
--- trunk/Src/DasherCore/LanguageModelling/LanguageModel.h	(original)
+++ trunk/Src/DasherCore/LanguageModelling/LanguageModel.h	Sat Mar 14 18:13:21 2009
@@ -56,7 +56,7 @@
 
   ///
   /// @name Context manipulation
-  /// Functions for creating, destroying and alteringn contexts
+  /// Functions for creating, destroying and altering contexts
   /// @{
 
   ///

Modified: trunk/Src/Gtk2/Preferences.cpp
==============================================================================
--- trunk/Src/Gtk2/Preferences.cpp	(original)
+++ trunk/Src/Gtk2/Preferences.cpp	Sat Mar 14 18:13:21 2009
@@ -132,7 +132,7 @@
 static void dasher_preferences_dialogue_update_special(DasherPreferencesDialogue *pSelf, int iID);
 static void dasher_preferences_dialogue_refresh_parameter(DasherPreferencesDialogue *pSelf, GtkWidget *pWidget, gpointer pUserData);
 
-/* Special privalte members called via table (see below) */
+/* Special private members called via table (see below) */
 static void dasher_preferences_dialogue_populate_special_speed(DasherPreferencesDialogue *pSelf);
 static void dasher_preferences_dialogue_populate_special_mouse_start(DasherPreferencesDialogue *pSelf);
 static void dasher_preferences_dialogue_populate_special_orientation(DasherPreferencesDialogue *pSelf);

Modified: trunk/Src/Gtk2/dasher_editor_internal.h
==============================================================================
--- trunk/Src/Gtk2/dasher_editor_internal.h	(original)
+++ trunk/Src/Gtk2/dasher_editor_internal.h	Sat Mar 14 18:13:21 2009
@@ -72,7 +72,7 @@
 /* void dasher_editor_internal_handle_start(DasherEditorInternal *pSelf); */
 /* void dasher_editor_internal_handle_control(DasherEditorInternal *pSelf, int iNodeID); */
 
-/* /\* Action related methods - TODO: a lot of this should be moved to dasher_main (eg action on stop etc) - that way we get a better level of abstraction, and can incorporate commands from otehr modules too. Actions should only be externally visible as a list of string commands*\/ */
+/* /\* Action related methods - TODO: a lot of this should be moved to dasher_main (eg action on stop etc) - that way we get a better level of abstraction, and can incorporate commands from other modules too. Actions should only be externally visible as a list of string commands*\/ */
 /* void dasher_editor_internal_action_button(DasherEditorInternal *pSelf, DasherAction *pAction); */
 /* void dasher_editor_internal_actions_start(DasherEditorInternal *pSelf); */
 /* bool dasher_editor_internal_actions_more(DasherEditorInternal *pSelf); */

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Mar 14 18:13:21 2009
@@ -383,7 +383,7 @@
 AM_CONDITIONAL(WITH_MAEMOFULLSCREEN, test x$WITHMAEMOFULLSCREEN = xtrue)
 AM_CONDITIONAL(JAPANESE, test x$WITHJAPANESE = xtrue)
 AM_CONDITIONAL(CHINESE, test x$WITHCHINESE = xtrue)
-AM_CONDITIONAL(JOYSITICK, test x$WITHJOYSTICK = xtrue)
+AM_CONDITIONAL(JOYSTICK, test x$WITHJOYSTICK = xtrue)
 
 AC_SUBST(GTK2_CFLAGS)
 AC_SUBST(GTK2_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]