padict-cvs Mailing List for PADict

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 763
          http://padict.svn.sourceforge.net/padict/?rev=763&view=rev
Author:   benoitcerrina
Date:     2007-09-18 17:10:22 -0700 (Tue, 18 Sep 2007)

Log Message:
-----------
make the trainer select among words of the current hotlist instead of words of the complete dictionary

Modified Paths:
--------------
    branches/unstable/padict/Trainer/trainer.c

Modified: branches/unstable/padict/Trainer/trainer.c
===================================================================

--- branches/unstable/padict/Trainer/trainer.c	2007-09-07 00:43:59 UTC (rev 762)
+++ branches/unstable/padict/Trainer/trainer.c	2007-09-19 00:10:22 UTC (rev 763)
@@ -199,51 +199,65 @@
 
 void trainer_fetch_record() 
 {
-    UInt16 i;
+  UInt16 i;
+  UInt16 j;
 
-	DATAresultId lId = tdispc->_Id;
+  DATAresultId lId = tdispc->_Id;
 
-    if (tdispc->recorddata)
+  if (tdispc->recorddata)
+  {
+    PDICTfreeRecord(tdispc->recorddata);
+      tdispc->recorddata = 0;
+  }
+  if (tdispc->_Id._Type == data_type_hotlist)
+  {
+    if (!tdispc->randlist) 
+      TrainerRandomize();
+    lId._RecordPosition = tdispc->randlist[tdispc->_Id._RecordPosition];
+  }
+  tdispc->recorddata = DATAgetRecord(&lId, ", ");
+
+  // get fool records...
+  for (i=0;i<3;i++) 
+  {
+    PDICTfreeRecord(tdispc->fooldata[i]);
+    tdispc->fooldata[i]=NULL;
+    while (tdispc->fooldata[i]==NULL) 
     {
-        PDICTfreeRecord(tdispc->recorddata);
-        tdispc->recorddata = 0;
+      // it seems like this fails sometimes, so make sure it's filled correctly...?!
+      if (tdispc->_Id._Type == data_type_hotlist)
+      {
+        j = SysRandom(0) % HLNumRecords();
+        while (j == tdispc->_Id._RecordPosition)
+          j = SysRandom(0) % HLNumRecords();
+        lId._RecordPosition = tdispc->randlist[j];
+        tdispc->fooldata[i] = DATAgetRecord(&lId, ", ");
+      }  
+      else
+      {
+        tdispc->fooldata[i] = PDICTgetRecord(SysRandom(0) % PDICTgetDictNumrows(),", ");
+      }
     }
-    if (tdispc->_Id._Type == data_type_hotlist)
-	{
-        if (!tdispc->randlist) 
-            TrainerRandomize();
-		lId._RecordPosition = tdispc->randlist[tdispc->_Id._RecordPosition];
-	}
-	tdispc->recorddata = DATAgetRecord(&lId, ", ");
+  }
 
+  // shuffle positions
+  for (i=0;i<4;i++) 
+  {
+    tdispc->positions[i]=i;
+  }
+  // swapping positions 16 times is fast and should be enough...
+  for (i=0;i<16;i++) 
+  {
+    UInt16 a,b;
+    UInt8 c;
+    a=SysRandom(0)%4;
+    b=SysRandom(0)%4;
 
-    // get fool records...
-    for (i=0;i<3;i++) {
-        PDICTfreeRecord(tdispc->fooldata[i]);
-        tdispc->fooldata[i]=NULL;
-        while (tdispc->fooldata[i]==NULL) {
-            // it seems like this fails sometimes, so make sure it's filled correctly...?!
-            tdispc->fooldata[i]=PDICTgetRecord(SysRandom(0) % PDICTgetDictNumrows(),", ");
-        }
-    }
+    c=tdispc->positions[a];
 
-    // shuffle positions
-    for (i=0;i<4;i++) {
-        tdispc->positions[i]=i;
-    }
-    // swapping positions 16 times is fast and should be enough...
-    for (i=0;i<16;i++) {
-        UInt16 a,b;
-        UInt8 c;
-        a=SysRandom(0)%4;
-        b=SysRandom(0)%4;
-
-        c=tdispc->positions[a];
-
-        tdispc->positions[a]=tdispc->positions[b];
-        tdispc->positions[b]=c;
-    }
-
+    tdispc->positions[a]=tdispc->positions[b];
+    tdispc->positions[b]=c;
+  }
 }
 
 Boolean trainer_next_record() 
@@ -387,7 +401,7 @@
                 }
 
                 // update category name handle - this is nessesary if we changed the hotlist category again
-                HLRedrawCategory(HLVocab);
+                RESRedrawCategory();
 
                 handled=true;
 
@@ -465,7 +479,7 @@
                 if (HWhasNewFeatureset35())
                     lPreventFlicker = COMWinScreenLock(winLockCopy);
                 FrmDrawForm(frm);
-                HLRedrawCategory(HLVocab);
+                RESRedrawCategory();
                 trainer_UpdateRecordDisplay();
                 if (lPreventFlicker)
                     COMWinScreenUnlock(winLockCopy);
@@ -491,18 +505,18 @@
 
             FrmDrawForm(frm);
 
-            if (HLGetCurCategory(HLVocab)==data_type_browse)
+            if (HLGetCurCategory()==dmAllCategories)
             {
-                //getPrefPointer()->HotlistCategory=data_type_browse;
+                //getPrefPointer()->HotlistCategory=dmAllCategories;
                 tdispc->_Id._Type=data_type_browse;
             } else {
                 // if category is selected, check if there are valid records in category. If not, choose browse mode!
                 // *NEVER* use Search mode!
-                if (HLGetCurCategory(HLVocab)!=data_type_result && HLNumRecords()  )
+                if (HLGetCurCategory()!=dmMySearchCategory && HLNumRecords()  )
                 {
                     tdispc->_Id._Type=data_type_hotlist;
                 } else {
-                    HLSetCurCategory(HLVocab, data_type_browse);
+                    HLSetCurCategory(dmAllCategories);
                     tdispc->_Id._Type=data_type_browse;
                 }
             }
@@ -516,7 +530,7 @@
             }
             CtlSetValue(FrmGetObjectPtr(frm,COMFrmGetObjectIndex(FrmGetActiveForm(), s_checkboxID_disableTrainerKana)), lDisplayKana);
 
-            HLRedrawCategory(HLVocab);
+            RESRedrawCategory();
             trainer_fetch_record();
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2004	Jan	Feb	Mar (13)	Apr (58)	May (82)	Jun (70)	Jul (23)	Aug (226)	Sep (157)	Oct (65)	Nov (34)	Dec (20)
2005	Jan (34)	Feb (92)	Mar (26)	Apr (2)	May	Jun (3)	Jul (28)	Aug (41)	Sep (19)	Oct	Nov	Dec
2006	Jan (1)	Feb	Mar (2)	Apr	May (7)	Jun (2)	Jul (8)	Aug	Sep	Oct	Nov (2)	Dec (3)
2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (3)	Oct	Nov	Dec

padict-cvs Mailing List for PADict

padict-cvs — This list recieves CVS commit messages for PAdict