[dasher] OneStepTowards now returns true.



commit 4a7c9d8d8cbf733b84f17b3a292b3ee3156104f2
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu Jul 2 14:30:14 2009 +0100

    OneStepTowards now returns true.
    (Also corrected class/label typo and added .gitignore)

 .gitignore                           |    4 ++++
 ChangeLog                            |    1 +
 Src/DasherCore/ConversionManager.cpp |    2 +-
 Src/DasherCore/DasherModel.cpp       |    8 ++++----
 4 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7f3a8e6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.make
+*.m4
+Makefile
+Makefile.in
diff --git a/ChangeLog b/ChangeLog
index 6db7146..f0f7ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-07-02  Patrick Welche <prlw1 cam ac uk>
 
 	* White space to keep gcc happy, and typos.
+	* OneStepTowards now returns true.
 
 2009-07-02  Alan Lawrence <acl33 inf phy cam ac uk>
 
diff --git a/Src/DasherCore/ConversionManager.cpp b/Src/DasherCore/ConversionManager.cpp
index 5ac3223..64b28bd 100644
--- a/Src/DasherCore/ConversionManager.cpp
+++ b/Src/DasherCore/ConversionManager.cpp
@@ -477,7 +477,7 @@ void CConversionManager::BuildTree(CDasherNode *pRoot) {
     bool ConversionSuccess = m_pHelper->Convert(strCurrentString, &pStartTemp); 
     
     
- CConversionManager:SConversionData *pRootConversionData = static_cast<CConversionManager::SConversionData *>(pRoot->m_pUserData);
+    SConversionData *pRootConversionData = static_cast<CConversionManager::SConversionData *>(pRoot->m_pUserData);
     
     if(!(pRootConversionData->bisRoot))
       std::cout<<"ERROR IN BUILD TREE"<<std::endl;
diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index 64fe4d8..043d020 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -480,12 +480,12 @@ bool CDasherModel::OneStepTowards(myint miMousex, myint miMousey, unsigned long
 
   myint iNewMin, iNewMax;
   // works out next viewpoint
-    Get_new_root_coords(miMousex, miMousey, iNewMin, iNewMax, iTime);
+  Get_new_root_coords(miMousex, miMousey, iNewMin, iNewMax, iTime);
   
-    if(GetBoolParameter(BP_OLD_STYLE_PUSH))
-      OldPush(miMousex, miMousey);
+  if(GetBoolParameter(BP_OLD_STYLE_PUSH))
+    OldPush(miMousex, miMousey);
 
-  UpdateBounds(iNewMin, iNewMax, iTime, pAdded, pNumDeleted);
+  return UpdateBounds(iNewMin, iNewMax, iTime, pAdded, pNumDeleted);
 }
 
 bool CDasherModel::UpdateBounds(myint iNewMin, myint iNewMax, unsigned long iTime, Dasher::VECTOR_SYMBOL_PROB* pAdded, int* pNumDeleted) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]