added link to app in README

gluc · Jan 10, 2016 · 3784d89 · 3784d89
1 parent 74181a2
commit 3784d89
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 45 deletions.
diff --git a/R/visualize.R b/R/visualize.R
@@ -83,7 +83,6 @@ GetTooltip <- function(x) {
   if (x$isRoot) {
     dm <- GetDecisionMakers(x)
     if (length(dm) > 1) {
-      browser()
       tt <- paste(dm, collapse = ", ")
       tt <- paste0("Decision Makers: ", tt, "\n")
     }
@@ -99,7 +98,8 @@ GetTooltip <- function(x) {
                                         "consistency", 
                                         "priority", 
                                         "preferenceFunction",
-                                        "decision-makers")]
+                                        "decision-makers",
+                                        "score")]
   if (length(myfields) > 0) {
     mylist <- as.list.environment(x)[myfields] 
     props <- as.yaml(mylist)

diff --git a/README.md b/README.md
@@ -26,6 +26,8 @@ The basic workflow with this package is:
 
 For more information, see the package vignette using `vignette("AHP car example")`
 
+There is also a Shiny app that complements that package. You can try it out at http://ipub.com/apps/ahp-app/
+
 # Example
 
 ```{code = R} 

diff --git a/inst/gui/shiny/ui.R b/inst/gui/shiny/ui.R
@@ -8,70 +8,61 @@ library(DiagrammeR)
 # Define UI for application that draws a histogram
 shinyUI(
 
-
-
   navbarPage(
-    useShinyjs(),
-    theme = shinytheme("flatly"),
     "AHP",
     tabPanel(
       "Model", 
 
-
-
       mainPanel(
         fluidPage(
-          actionButton("showUpload", "Load", icon = icon("upload")),
-          downloadButton('downloadFile', 'Save'),
-          br(),
-          uiOutput("uploadFileOutput"),
-          br(),
-
-
-          aceEditor("ace", mode = "yaml", theme = "clouds", value = "define ahp model here")
+          useShinyjs(),
+          fluidRow(
+            column(2, actionButton("showUpload", "Load", icon = icon("upload"))),
+            column(2, downloadButton('downloadFile', 'Save'))
+          ),
+          fluidRow(uiOutput("uploadFileOutput")),
+          fluidRow(aceEditor("ace", mode = "yaml", theme = "clouds", value = "define ahp model here"))
         )
       )
     ),
 
     tabPanel(
       "Visualize", 
-      grVizOutput("visualizeTree"),
+      mainPanel(grVizOutput("visualizeTree")),
       value = "visualizePanel"
     ),
 
     tabPanel(
       "Analyze", 
       mainPanel(
-        fluidPage(
-          sidebarLayout(
-            sidebarPanel(
-              radioButtons(
-                inputId = "ahpmethod", 
-                label = "AHP Priority Calculation Method: ", 
-                choices = c("Eigenvalues", "Mean of Normalized Values", "Geometric Mean"),
-                selected = "Eigenvalues"
-              ),
-
-              radioButtons(
-                inputId = "sort", 
-                label = "Sort Order: ", 
-                choices = c("Total Priority", "Priority", "Original"),
-                selected = "Total Priority"
-              ),
-
-              radioButtons(
-                inputId = "variable", 
-                label = "Variable: ", 
-                choices = c("Total Contribution", "Priority", "Score"),
-                selected = "Total Contribution"
-              ),
+        sidebarLayout(
+          sidebarPanel(
+            radioButtons(
+              inputId = "ahpmethod", 
+              label = "AHP Priority Calculation Method: ", 
+              choices = c("Eigenvalues", "Mean of Normalized Values", "Geometric Mean"),
+              selected = "Eigenvalues"
+            ),
 
-              uiOutput("decisionMaker"),
-              textInput(inputId = "cutoff", label = "Filter by weight contribution: ", value = "0"),
-              textInput(inputId = "level", label = "Filter n levels: ", value = "0")
+            radioButtons(
+              inputId = "sort", 
+              label = "Sort Order: ", 
+              choices = c("Total Priority", "Priority", "Original"),
+              selected = "Total Priority"
             ),
-            mainPanel(formattableOutput("table"))
-          )
+
+            radioButtons(
+              inputId = "variable", 
+              label = "Variable: ", 
+              choices = c("Total Contribution", "Priority", "Score"),
+              selected = "Total Contribution"
+            ),
+
+            uiOutput("decisionMaker"),
+            textInput(inputId = "cutoff", label = "Filter by weight contribution: ", value = "0"),
+            textInput(inputId = "level", label = "Filter n levels: ", value = "0")
+          ),
+          mainPanel(formattableOutput("table"))
         )
       ),
       value = "analysis"
@@ -94,6 +85,8 @@ shinyUI(
         uiOutput("fileFormat")
       )
     ),
+    position = "fixed-top",
+    theme = shinytheme("flatly"),
     id = "navbar"
   )