[Rqda-commits] r39 - pkg/R

[noreply at r-forge.r-project.org]

Author: wincent
Date: 2008-12-08 08:50:15 +0100 (Mon, 08 Dec 2008)
New Revision: 39

Modified:
   pkg/R/CaseButton.R
   pkg/R/CaseFun.R
Log:


Modified: pkg/R/CaseButton.R
===================================================================
--- pkg/R/CaseButton.R	2008-12-08 07:40:08 UTC (rev 38)
+++ pkg/R/CaseButton.R	2008-12-08 07:50:15 UTC (rev 39)
@@ -308,7 +308,23 @@
 FileofCaseWidgetMenu$"File Memo"$handler <- function(h,...){
         MemoWidget("File",.rqda$.FileofCase,"source")
 }
+FileofCaseWidgetMenu$"Show Uncoded Files Only (sorted)"$handler <- function(h,...){
+if (is_projOpen(env=.rqda,conName="qdacon")) {
+   fid <- GetFileId(condition="case",type="uncoded")
+   FileNameWidgetUpdate(FileNamesWidget=.rqda$.FileofCase,FileId=fid)
+ }
+}
+FileofCaseWidgetMenu$"Show Coded Files Only (sorted)"$handler <- function(h,...){
+if (is_projOpen(env=.rqda,conName="qdacon")) {
+   fid <- GetFileId(condition="case",type="coded")
+   FileNameWidgetUpdate(FileNamesWidget=.rqda$.FileofCase,FileId=fid)
+ }
+}
 FileofCaseWidgetMenu$"Sort by imported time"$handler <- function(h,...){
-        UpdateFileofCaseWidget()
+## UpdateFileofCaseWidget()
+if (is_projOpen(env=.rqda,conName="qdacon")) {
+   fid <- GetFileId(condition="case",type="all")
+   FileNameWidgetUpdate(FileNamesWidget=.rqda$.FileofCase,FileId=fid)
+ }
 }
 

Modified: pkg/R/CaseFun.R
===================================================================
--- pkg/R/CaseFun.R	2008-12-08 07:40:08 UTC (rev 38)
+++ pkg/R/CaseFun.R	2008-12-08 07:50:15 UTC (rev 39)
@@ -96,7 +96,7 @@
                 mark_index <-
                   dbGetQuery(con,sprintf("select selfirst,selend from caselinkage where fid=%i and status==1",currentFid))
                 if (nrow(mark_index)!=0){
-                  ClearMark(W ,0 , max(mark_index$selend))
+                  ClearMark(W ,0 , max(mark_index$selend,clear.fore.col = FALSE, clear.back.col = TRUE))
                   HL(W,index=mark_index,fore.col=NULL,back.col=.rqda$back.col)
                 }
               }