[Rqda-commits] r20 - pkg pkg/R pkg/man www
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Nov 25 11:47:09 CET 2008
Author: wincent
Date: 2008-11-25 11:47:09 +0100 (Tue, 25 Nov 2008)
New Revision: 20
Modified:
pkg/ChangeLog
pkg/R/CodeCatButton.R
pkg/R/CodesFun.R
pkg/R/Coding_Buttons.R
pkg/R/FileButton.R
pkg/R/ProjectButton.R
pkg/R/deletion.R
pkg/TODO
pkg/man/RQDA-internal.rd
pkg/man/RQDA-package.Rd
pkg/man/list.deleted.rd
www/index.html
Log:
Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/ChangeLog 2008-11-25 10:47:09 UTC (rev 20)
@@ -1,6 +1,8 @@
+2008-11-25
+ *Take care of the warning from R CMD check
+
2008-11-24
- * Can back to the original file from Retrieval text chunck (Improve the retreival button).
- has a bug: can not scroll to the right position.
+ * Can back to the original file from Retrieved text chunck (by retrieval2 function).
2008-11-23 (as version 0.1.5)
* Add AddTo/DropFrom Buttons for Code-Category.
Modified: pkg/R/CodeCatButton.R
===================================================================
--- pkg/R/CodeCatButton.R 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/R/CodeCatButton.R 2008-11-25 10:47:09 UTC (rev 20)
@@ -64,7 +64,7 @@
tryCatch(dbGetQuery(.rqda$qdacon,sprintf("update treecode set status=0 where catid=='%s'",catid)),error=function(e){})
## should delete all the related codelists
UpdateCodeofCatWidget() ## update the code of cat widget
- } else gmessage("The Category Name is not unique.",con=T)
+ } else gmessage("The Category Name is not unique.",con=TRUE)
}
}
@@ -149,10 +149,10 @@
## Get CodeList already in the category (table treecode): svalue()
CodeOfCat <- svalue(Widget)
if ((NumofSelected <- length(CodeOfCat)) ==0) {
- gmessage("Please select the Codes you want to delete.",con=T)} else
+ gmessage("Please select the Codes you want to delete.",con=TRUE)} else
{
## Give a confirm msg
- del <- gconfirm(sprintf("Delete %i code(s) from this category. Are you sure?",NumofSelected),con=T,icon="question")
+ del <- gconfirm(sprintf("Delete %i code(s) from this category. Are you sure?",NumofSelected),con=TRUE,icon="question")
if (isTRUE(del)){
## set status==0 for those selected CodeList (table treecode)
SelectedCodeCat <- svalue(.rqda$.CodeCatWidget)
Modified: pkg/R/CodesFun.R
===================================================================
--- pkg/R/CodesFun.R 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/R/CodesFun.R 2008-11-25 10:47:09 UTC (rev 20)
@@ -27,7 +27,7 @@
if (nrow(codesName)!=0) {
Encoding(codesName[['name']]) <- "UTF-8"
tryCatch(CodeNamesWidget[] <- codesName[['name']], error=function(e){})
- } else gmessage("Cannot update Code List in the Widget. Project is closed already.\n",con=T)
+ } else gmessage("Cannot update Code List in the Widget. Project is closed already.\n",con=TRUE)
}
}
@@ -103,7 +103,7 @@
currentCid <- dbGetQuery(.rqda$qdacon,sprintf("select id from freecode where name== '%s' ",currentCode))[1,1]
## reliable is more important
retrieval <- dbGetQuery(.rqda$qdacon,sprintf("select cid,fid, selfirst, selend,seltext from coding where status==1 and cid=%i",currentCid))
- if (nrow(retrieval)==0) gmessage("No Coding associated with the selected code.",con=T) else {
+ if (nrow(retrieval)==0) gmessage("No Coding associated with the selected code.",con=TRUE) else {
retrieval <- retrieval[order( retrieval$fid),]
fid <- unique(retrieval$fid)
retrieval$fname <-""
@@ -135,7 +135,7 @@
currentCid <- dbGetQuery(.rqda$qdacon,sprintf("select id from freecode where name== '%s' ",currentCode))[1,1]
## reliable is more important
retrieval <- dbGetQuery(.rqda$qdacon,sprintf("select cid,fid, selfirst, selend,seltext from coding where status==1 and cid=%i order by fid",currentCid))
- if (nrow(retrieval)==0) gmessage("No Coding associated with the selected code.",con=T) else {
+ if (nrow(retrieval)==0) gmessage("No Coding associated with the selected code.",con=TRUE) else {
## retrieval <- retrieval[order( retrieval$fid),]
## use sql to order the fid
fid <- unique(retrieval$fid)
@@ -165,7 +165,7 @@
.rqda$.displayFile at widget@widget$SetEditable(FALSE)
gtkTextViewScrollToIter(.rqda$.displayFile at widget@widget,
.rqda$.displayFile at widget@widget$GetBuffer()$GetIterAtOffset(BeginPosition)$iter,
- 0.001,xal=0,yal=0,use.align=T)## doesn't seem to work.
+ 0.001,xal=0,yal=0,use.align=TRUE)## doesn't seem to work.
}
CallBackFUN
}
Modified: pkg/R/Coding_Buttons.R
===================================================================
--- pkg/R/Coding_Buttons.R 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/R/Coding_Buttons.R 2008-11-25 10:47:09 UTC (rev 20)
@@ -252,7 +252,7 @@
-FreeCode_RenameButton <- function(label="Rename",CodeNamesWidget=.codes_rqda,...)
+FreeCode_RenameButton <- function(label="Rename",CodeNamesWidget=.rqda$.codes_rqda,...)
{
## rename of selected file.
gbutton(label,handler=function(h,...) {
Modified: pkg/R/FileButton.R
===================================================================
--- pkg/R/FileButton.R 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/R/FileButton.R 2008-11-25 10:47:09 UTC (rev 20)
@@ -58,7 +58,7 @@
}
-File_MemoButton <- function(label="F-Memo", container=.files_button,FileWidget=.fnames_rqda,...){
+File_MemoButton <- function(label="F-Memo", container=.rqda$.files_button,FileWidget=.rqda$.fnames_rqda,...){
## memo of selected file.
gbutton(label, contain=container, handler=function(h,...) {
if (is_projOpen(env=.rqda,"qdacon")) {
@@ -102,7 +102,7 @@
-File_RenameButton <- function(label="Rename", container=.files_button,FileWidget=.fnames_rqda,...)
+File_RenameButton <- function(label="Rename", container=.rqda$.files_button,FileWidget=.rqda$.fnames_rqda,...)
{
## rename of selected file.
gbutton(label, contain=container, handler=function(h,...) {
Modified: pkg/R/ProjectButton.R
===================================================================
--- pkg/R/ProjectButton.R 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/R/ProjectButton.R 2008-11-25 10:47:09 UTC (rev 20)
@@ -1,4 +1,4 @@
-NewProjectButton <- function(container=.proj_gui){
+NewProjectButton <- function(container){
gbutton("New Project",container=container,handler=function(h,...){
path=gfile(type="save")
if (path!=""){
@@ -9,7 +9,7 @@
)
}
-OpenProjectButton <- function(container=.proj_gui){
+OpenProjectButton <- function(container){
gbutton("Open Project",container=container,handler=function(h,...){
path <- gfile(type="open",filter=list("rqda"=list(patterns = c("*.rqda")),
"All files" = list(patterns = c("*"))))
@@ -28,7 +28,7 @@
}
-CloseProjectButton <- function(container=.proj_gui){
+CloseProjectButton <- function(container){
gbutton("Close Project",container=container,handler=function(h,...){
close_proj(assignenv=.rqda)
tryCatch(.rqda$.codes_rqda[]<-NULL,error=function(e){})
@@ -41,7 +41,7 @@
}
-ProjectInforButton <- function(container=.proj_gui){
+ProjectInforButton <- function(container){
gbutton("Current Project",container=container,handler=function(h,...){
if (is_projOpen(env=.rqda,conName="qdacon")) {
con <- .rqda$qdacon
@@ -55,7 +55,7 @@
}
-Proj_MemoButton <- function(label="Porject Memo",container=.proj_gui,...){
+Proj_MemoButton <- function(label="Porject Memo",container,...){
#### Each button a separate function -> more easy to debug, and the main function root_gui is shorter.
### The memo in dataset is UTF-8
## label of button
Modified: pkg/R/deletion.R
===================================================================
--- pkg/R/deletion.R 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/R/deletion.R 2008-11-25 10:47:09 UTC (rev 20)
@@ -67,14 +67,13 @@
paste(paste("'",del,"'",sep=""),collapse=",")))
assign("currentFid",integer(0),envir=.rqda)
assign("currentFile",character(0),envir=.rqda)
- fnamesupdate(assignenv=.rqda)
- ## update "currentFid" "currentFile" "files_index"
+ FileNamesUpdate(FileNamesWidget=.rqda$.fnames_rqda)
} else if (type=="code"){
ans <- dbGetQuery(.rqda$qdacon, sprintf("update freecode set status=1 where status=0 AND name in (%s)",
paste(paste("'",del,"'",sep=""),collapse=",")))
assign("currentCid",integer(0),envir=.rqda)
assign("currentCode",character(0),envir=.rqda)
- codesupdate(assignenv=.rqda)
+ CodeNamesUpdate(CodeNamesWidget=.rqda$.codes_rqda)
## update "codes_index" "currentCid" "currentCode"
}
## else if (type=="coding") {
Modified: pkg/TODO
===================================================================
--- pkg/TODO 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/TODO 2008-11-25 10:47:09 UTC (rev 20)
@@ -2,7 +2,7 @@
summary functions for review of coding.
-functions cleaning treecode/codecat table.
+functions cleaning treecode/codecat table. and the previous deletion functions should be modified.
### less important
should add document on the table structure.
Modified: pkg/man/RQDA-internal.rd
===================================================================
--- pkg/man/RQDA-internal.rd 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/man/RQDA-internal.rd 2008-11-25 10:47:09 UTC (rev 20)
@@ -22,8 +22,46 @@
\alias{rqdameta}
\alias{retrieval}
\alias{sindex}
+\alias{AddCase}
+\alias{AddCaseButton}
+\alias{AddCodeButton}
+\alias{AddCodeCatButton}
+\alias{AddTodbTable}
+\alias{AddWebSearchButton}
+\alias{CaseMark_Button}
+\alias{CaseMemoButton}
+\alias{CaseNamesUpdate}
+\alias{CaseNamesWidgetMenu}
+\alias{Case_RenameButton}
+\alias{CloseProjectButton}
+\alias{CodeCatAddToButton}
+\alias{CodeCatDropFromButton}
+\alias{CodeCat_RenameButton}
+\alias{CodeNamesUpdate}
+\alias{DeleteCaseButton}
+\alias{DeleteCodeButton}
+\alias{DeleteCodeCatButton}
+\alias{DeleteFileButton}
+\alias{ExtendButton}
+\alias{FileNamesUpdate}
+\alias{FreeCode_RenameButton}
+\alias{HL_ALLButton}
+\alias{Handler}
+\alias{ImportFile}
+\alias{ImportFileButton}
+\alias{Mark_Button}
+\alias{NewProjectButton}
+\alias{OpenProjectButton}
+\alias{ProjectInforButton}
+\alias{RetrievalButton}
+\alias{Unmark_Button}
+\alias{UpdateCodeofCatWidget}
+\alias{UpdateTableWidget}
+\alias{ViewFileButton}
+\alias{enc}
+\alias{retrieval2}
%% add related alias functions here.
-\title{Internal Grid Functions}
+\title{Internal Functions}
\description{
Internal RQDA functions.
}
Modified: pkg/man/RQDA-package.Rd
===================================================================
--- pkg/man/RQDA-package.Rd 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/man/RQDA-package.Rd 2008-11-25 10:47:09 UTC (rev 20)
@@ -23,6 +23,27 @@
The workhorse function for end-user is the RQDA(), you can use RQDA() to
start the GUI after library(QRDA).
}
+
+\note{
+The basic usage:
+1. Open or create new project.
+2. Import files.
+3. Select a file and open it by click button open.
+4. Add codes.
+5. Select a codes, select text segment in the open file, and press
+button mark. Select the same text segment and click button Unmark, you
+can undo the action.
+6. Do more coding as step 5.
+7. Select a code and click button retrieval to see what text
+segments have been attached to that code.
+
+About memo buttons in the code tab:
+1. C-memo is used to attach memo to a selected code. You can select a code then click C-memo button
+to view/add memo.
+2. C2Memo is used to attach a memo to a coded segments. In the open file, you can see the coded segments
+(highlighted), select one segment, and click C2Memo, you can view/add memo to that coded-segment.
+}
+
\author{
Huang Ronggui
Modified: pkg/man/list.deleted.rd
===================================================================
--- pkg/man/list.deleted.rd 2008-11-24 06:26:10 UTC (rev 19)
+++ pkg/man/list.deleted.rd 2008-11-25 10:47:09 UTC (rev 20)
@@ -6,7 +6,7 @@
\description{
\code{list.deleted} shows the file, code and coding tagged with deletion
mark.
- \code{pdelete} _p_ermanently delete them.
+ \code{pdelete} Permanently delete them.
\code{undelete} let you reuse the temporary tagged as deleted file and code.
}
\usage{
@@ -32,7 +32,7 @@
ones to be deleted permenantly.By \code{undelete}, you can undo the
temporary deleted files and codes. It offers a GUI so you can choose
in the list. For the time being, it is not the true reserve process of
- GUI deletion, as the deletion-tagged _coding_ will not set to the
+ GUI deletion, as the deletion-tagged coding will not set to the
original status.
}
Modified: www/index.html
===================================================================
--- www/index.html 2008-11-24 06:26:10 UTC (rev 19)
+++ www/index.html 2008-11-25 10:47:09 UTC (rev 20)
@@ -30,7 +30,7 @@
a package for Qualitative Data Analysis built upon <A HREF="http://www.r-project.org/">R</A>,
a </SPAN></FONT><FONT FACE="Times New Roman, serif"><SPAN LANG="en-US"><B>free</B></SPAN></FONT><FONT FACE="Times New Roman, serif"><SPAN LANG="en-US">
qualitative analysis software application. It works both on the
-Windows and Linux/<A HREF="http://www.freebsd.org/">FreeBSD</A>
+Windows, Linux/<A HREF="http://www.freebsd.org/">FreeBSD</A> and MacOS
platforms. </SPAN></FONT><STRONG><FONT FACE="Times New Roman, serif"><SPAN LANG="en-US"><SPAN STYLE="font-weight: normal">RQDA</SPAN></SPAN></FONT></STRONG><FONT FACE="Times New Roman, serif"><SPAN LANG="en-US">
</SPAN></FONT><FONT FACE="Times New Roman, serif"><SPAN LANG="en-US"><SPAN STYLE="font-weight: normal">i</SPAN></SPAN></FONT><FONT FACE="Times New Roman, serif"><SPAN LANG="en-US">s
an easy-to-use tool to assist in the analysis of textual data. At the
@@ -74,7 +74,8 @@
download R and install it. For Linux and BSD users, you can download
binary version of R or the sources. For Windows users, you can
download the binary version of R from the <A HREF="http://cran.r-project.org/bin/windows/base/">download
-page</A>. More instruction about installing R is in the <A HREF="http://cran.r-project.org/doc/manuals/R-admin.html">R
+page</A>. For MacOS users, download the binary version of R from the <A HREF="http://cran.r-project.org/bin/macosx/">download
+page</A>, More instruction about installing R is in the <A HREF="http://cran.r-project.org/doc/manuals/R-admin.html">R
Installation and Administration</A> Manual.
<li>Launch R (as usual
More information about the Rqda-commits
mailing list