[Rqda-commits] r71 - pkg pkg/R www
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Mar 22 05:34:44 CET 2009
Author: wincent
Date: 2009-03-22 05:34:44 +0100 (Sun, 22 Mar 2009)
New Revision: 71
Modified:
pkg/ChangeLog
pkg/R/FileButton.R
pkg/R/ProjectFun.R
pkg/R/Variables.R
pkg/R/root_gui.R
www/documentation.html
www/index.html
Log:
Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog 2009-03-21 06:07:18 UTC (rev 70)
+++ pkg/ChangeLog 2009-03-22 04:34:44 UTC (rev 71)
@@ -1,3 +1,6 @@
+2009-03-22
+ * add memo of attributes table.
+
2009-03-21
* Another critical bugfix of CaseAttrFun() and FileAttrFun().
* View variables of case/file.
Modified: pkg/R/FileButton.R
===================================================================
--- pkg/R/FileButton.R 2009-03-21 06:07:18 UTC (rev 70)
+++ pkg/R/FileButton.R 2009-03-22 04:34:44 UTC (rev 71)
@@ -136,7 +136,7 @@
else {
## get the new file names
NewFileName <- ginput("Enter new file name. ",text=selectedFN, icon="info")
- if (NewFileName != "") {
+ if (!is.na(NewFileName)) {
Encoding(NewFileName) <- "UTF-8"
## otherwise, R transform it into local Encoding rather than keep it as UTF-8
## Newfilename <- iconv(codename,from="UTF-8") ## now use UTF-8 for SQLite data set.
Modified: pkg/R/ProjectFun.R
===================================================================
--- pkg/R/ProjectFun.R 2009-03-21 06:07:18 UTC (rev 70)
+++ pkg/R/ProjectFun.R 2009-03-22 04:34:44 UTC (rev 71)
@@ -72,7 +72,7 @@
owner text, date text, memo text)")
if (dbExistsTable(con,"attributes")) dbRemoveTable(con, "attributes")
- dbGetQuery(.rqda$qdacon,"create table attributes (name text, status integer, date text, dateM text, owner text)")
+ dbGetQuery(.rqda$qdacon,"create table attributes (name text, status integer, date text, dateM text, owner text,memo text)")
if (dbExistsTable(con,"caseAttr")) dbRemoveTable(con, "caseAttr")
dbGetQuery(.rqda$qdacon,"create table caseAttr (variable text, value text, caseID integer, date text, dateM text, owner text)")
if (dbExistsTable(con,"fileAttr")) dbRemoveTable(con, "fileAttr")
Modified: pkg/R/Variables.R
===================================================================
--- pkg/R/Variables.R 2009-03-21 06:07:18 UTC (rev 70)
+++ pkg/R/Variables.R 2009-03-22 04:34:44 UTC (rev 71)
@@ -11,7 +11,7 @@
## caseAttr table
dbGetQuery(.rqda$qdacon,"create table fileAttr (variable text, value text, fileID integer, date text, dateM text, owner text)")
## fileAttr table
- dbGetQuery(.rqda$qdacon,"create table attributes (name text, status integer, date text, dateM text, owner text)")
+ dbGetQuery(.rqda$qdacon,"create table attributes (name text, status integer, date text, dateM text, owner text, memo text)")
## attributes table
dbGetQuery(.rqda$qdacon,"update project set databaseversion='0.1.6'")
## reset the version.
@@ -102,6 +102,15 @@
)
}
+AttrMemoButton <- function(label="Memo"){
+ gbutton(label,handler=function(h,...) {
+ if (is_projOpen(env=.rqda,conName="qdacon")) {
+ MemoWidget("Attributes",.rqda$.AttrNamesWidget,"attributes")
+ }
+ }
+ )
+}
+
viewCaseAttr <- function(){
DF <- dbGetQuery(.rqda$qdacon,"select variable,value, caseId from caseAttr")
DF <- reshape(DF,v.name="value",idvar="caseID",direction="wide",timevar="variable")
Modified: pkg/R/root_gui.R
===================================================================
--- pkg/R/root_gui.R 2009-03-21 06:07:18 UTC (rev 70)
+++ pkg/R/root_gui.R 2009-03-22 04:34:44 UTC (rev 71)
@@ -105,6 +105,7 @@
.attr_buttons[1,1] <- AddAttrButton()
.attr_buttons[1,2] <- DeleteAttrButton()
.attr_buttons[1,3] <- RenameAttrButton()
+ .attr_buttons[1,4] <- AttrMemoButton()
######################### GUI for C-cat
#########################
Modified: www/documentation.html
===================================================================
--- www/documentation.html 2009-03-21 06:07:18 UTC (rev 70)
+++ www/documentation.html 2009-03-22 04:34:44 UTC (rev 71)
@@ -22,7 +22,7 @@
<BODY>
<a href="index.html">Homepage of RQDA</a>
-<h1><a href="#user manual">User's Manual</a></h1>
+<h1><a href="#manual">User's Manual</a></h1>
<h1><a href="#tips">Tips<a></h1>
<h1><a href="#faq">FAQ<a></h1>
<hr>
Modified: www/index.html
===================================================================
--- www/index.html 2009-03-21 06:07:18 UTC (rev 70)
+++ www/index.html 2009-03-22 04:34:44 UTC (rev 71)
@@ -39,6 +39,7 @@
<li>Facilitator helps to categorize codes,which is key to theory building. I deliberately avoid using tree-like categorization
<li>Facilitator helps to categorize files
<li>Search files by keywords
+<li> Atrributes of file, which is useful for content analysis
<li>There is a case category and related attributes of cases, which is crucial feature to bridge qualitative and quantitative research
<li>Search information about selected case from the Internet vis popup menu
<li>Temporary delete files and codes
@@ -70,7 +71,7 @@
<li>Launch RQDA by command <I>library(RQDA)</I> from within R. Then you can see the RQDA GUI.
<h1>Documentation</h1>
-<A HREF="documentation.html#user manual" target="_blank">User Manual</A>
+<A HREF="documentation.html#manual" target="_blank">User Manual</A>
<br><A HREF="documentation.html#tips" target="_blank">Tips</A>
<br><A HREF="documentation.html#faq" target="_blank">FAQ</A>
@@ -87,7 +88,7 @@
<p>HUANG Ronggui (2008). RQDA: R-based Qualitative Data Analysis. R package version 0.1.6. http://rqda.r-forge.r-project.org/
<h1>What's new in the latest version?</h1>
-<p>RQDA is now on <A href ="http://cran.r-project.org/web/packages/RQDA/index.html" target="_blank">CRAN</a>(2008-12-26).
+<p>RQDA 0.1-6 is now on <A href ="http://cran.r-project.org/web/packages/RQDA/index.html" target="_blank">CRAN</a> (2008-12-26).
<p>RQDA has been actively developed. You can click <A HREF="ChangeLog.txt">here</A> to see the new features.
<h1>More Informaiton</h1>
More information about the Rqda-commits
mailing list