Merge pull request #1498 from stevekogo/PCA

Fixing PCA and CCA dialogues
IDEMSInternational · Jun 23, 2016 · 941730f · 941730f
2 parents 8eab643 + 819df4b
commit 941730f
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 37 deletions.
diff --git a/instat/dlgCanonicalCorrelationAnalysis.Designer.vb b/instat/dlgCanonicalCorrelationAnalysis.Designer.vb
diff --git a/instat/dlgCanonicalCorrelationAnalysis.vb b/instat/dlgCanonicalCorrelationAnalysis.vb
@@ -64,6 +64,10 @@ Public Class dlgCanonicalCorrelationAnalysis
         End If
     End Sub
 
+    Private Sub ucrSelectorCCA_DataFrameChanged() Handles ucrSelectorCCA.DataFrameChanged
+        AssignName()
+    End Sub
+
     Private Sub ucrBaseCCA_ClickReset(sender As Object, e As EventArgs) Handles ucrBaseCCA.ClickReset
         SetDefaults()
     End Sub
@@ -97,11 +101,11 @@ Public Class dlgCanonicalCorrelationAnalysis
 
     Public Sub AssignName()
         If chkSaveResult.Checked AndAlso ucrResultName.GetText() <> "" Then
-            ucrBaseCCA.clsRsyntax.SetAssignTo(ucrResultName.GetText(), strTempModel:=ucrResultName.GetText())
+            ucrBaseCCA.clsRsyntax.SetAssignTo(ucrResultName.GetText(), strTempModel:=ucrResultName.GetText(), strTempDataframe:=ucrSelectorCCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem)
             ucrBaseCCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
             strModelName = ucrResultName.GetText()
         Else
-            ucrBaseCCA.clsRsyntax.SetAssignTo("last_CCA", strTempModel:="last_CCA")
+            ucrBaseCCA.clsRsyntax.SetAssignTo("last_CCA", strTempModel:="last_CCA", strTempDataframe:=ucrSelectorCCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem)
             ucrBaseCCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
             strModelName = "last_CCA"
         End If

diff --git a/instat/dlgPrincipalComponentAnalysis.Designer.vb b/instat/dlgPrincipalComponentAnalysis.Designer.vb
diff --git a/instat/dlgPrincipalComponentAnalysis.vb b/instat/dlgPrincipalComponentAnalysis.vb
@@ -37,7 +37,7 @@ Public Class dlgPrincipalComponentAnalysis
         ucrReceiverMultiplePCA.Selector = ucrSelectorPCA
         ucrReceiverMultiplePCA.SetDataType("numeric")
         ucrResultName.SetDefaultTypeAsModel()
-        ucrResultName.SetPrefix("PCA")
+
         ucrBasePCA.iHelpTopicID = 187
     End Sub
 
@@ -53,6 +53,7 @@ Public Class dlgPrincipalComponentAnalysis
         ucrResultName.Visible = True
         chkScaleData.Checked = True
         ucrBasePCA.clsRsyntax.AddParameter("graph", "FALSE")
+        ucrResultName.SetName("PCA")
         sdgPrincipalComponentAnalysis.SetDefaults()
         TestOKEnabled()
     End Sub
@@ -66,6 +67,10 @@ Public Class dlgPrincipalComponentAnalysis
         End If
     End Sub
 
+    Private Sub ucrSelectorPCA_DataFrameChanged() Handles ucrSelectorPCA.DataFrameChanged
+        AssignName()
+    End Sub
+
     Private Sub ucrBasePCA_ClickReset(sender As Object, e As EventArgs) Handles ucrBasePCA.ClickReset
         SetDefaults()
     End Sub
@@ -97,7 +102,7 @@ Public Class dlgPrincipalComponentAnalysis
         sdgPrincipalComponentAnalysis.ShowDialog()
     End Sub
 
-    Private Sub ucrResultName_NameChanged() Handles ucrResultName.NameChanged
+    Private Sub ucrResultName_NameChanged()
         AssignName()
     End Sub
 
@@ -112,11 +117,12 @@ Public Class dlgPrincipalComponentAnalysis
 
     Private Sub AssignName()
         If chkSaveResult.Checked AndAlso ucrResultName.GetText() <> "" Then
-            ucrBasePCA.clsRsyntax.SetAssignTo(ucrResultName.GetText(), strTempModel:=ucrResultName.GetText())
+            ucrBasePCA.clsRsyntax.SetAssignTo(ucrResultName.GetText(), strTempModel:=ucrResultName.GetText(), strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem)
             ucrBasePCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
             strModelName = ucrResultName.GetText()
         Else
-            ucrBasePCA.clsRsyntax.SetAssignTo("last_PCA", strTempModel:="last_PCA")
+            ucrBasePCA.clsRsyntax.SetAssignTo("last_PCA", strTempModel:="last_PCA", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem)
+            ucrBasePCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
             ucrBasePCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
             strModelName = "last_PCA"
         End If
@@ -125,6 +131,4 @@ Public Class dlgPrincipalComponentAnalysis
     Private Sub ucrBasePCA_clickok(sender As Object, e As EventArgs) Handles ucrBasePCA.ClickOk
         sdgPrincipalComponentAnalysis.PCAOptions()
     End Sub
-
-
 End Class
diff --git a/instat/sdgCanonicalCorrelation.vb b/instat/sdgCanonicalCorrelation.vb
@@ -29,13 +29,15 @@ Public Class sdgCanonicalCorrelation
 
     Private Sub Cancor()
         clsRCanCor.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_from_model")
+        clsRCanCor.AddParameter("data_name", Chr(34) & dlgCanonicalCorrelationAnalysis.ucrSelectorCCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34))
         clsRCanCor.AddParameter("model_name", Chr(34) & dlgCanonicalCorrelationAnalysis.strModelName & Chr(34))
         clsRCanCor.AddParameter("value1", Chr(34) & "cancor" & Chr(34))
         frmMain.clsRLink.RunScript(clsRCanCor.ToScript(), 2)
     End Sub
 
     Private Sub Coef()
         clsRCoef.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_from_model")
+        clsRCoef.AddParameter("data_name", Chr(34) & dlgCanonicalCorrelationAnalysis.ucrSelectorCCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34))
         clsRCoef.AddParameter("model_name", Chr(34) & dlgCanonicalCorrelationAnalysis.strModelName & Chr(34))
         clsRCoef.AddParameter("value1", Chr(34) & "coef" & Chr(34))
         frmMain.clsRLink.RunScript(clsRCoef.ToScript(), 2)
@@ -96,5 +98,4 @@ Public Class sdgCanonicalCorrelation
             clsRGraphics.RemoveParameter("columns")
         End If
     End Sub
-
 End Class
diff --git a/instat/sdgPrincipalComponentAnalysis.vb b/instat/sdgPrincipalComponentAnalysis.vb
@@ -31,13 +31,15 @@ Public Class sdgPrincipalComponentAnalysis
 
     Private Sub EigenValues()
         clsREigenValues.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_from_model")
+        clsREigenValues.AddParameter("data_name", Chr(34) & dlgPrincipalComponentAnalysis.ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34))
         clsREigenValues.AddParameter("model_name", Chr(34) & dlgPrincipalComponentAnalysis.strModelName & Chr(34))
         clsREigenValues.AddParameter("value1", Chr(34) & "eig" & Chr(34))
         frmMain.clsRLink.RunScript(clsREigenValues.ToScript(), 2)
     End Sub
 
     Private Sub EigenVectors()
         clsREigenVectors.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_from_model")
+        clsREigenVectors.AddParameter("data_name", Chr(34) & dlgPrincipalComponentAnalysis.ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34))
         clsREigenVectors.AddParameter("model_name", Chr(34) & dlgPrincipalComponentAnalysis.strModelName & Chr(34))
         clsREigenVectors.AddParameter("value1", Chr(34) & "ind" & Chr(34))
         clsREigenVectors.AddParameter("value2", Chr(34) & "contrib" & Chr(34))
@@ -46,6 +48,7 @@ Public Class sdgPrincipalComponentAnalysis
 
     Private Sub Scores()
         clsRScores.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_from_model")
+        clsRScores.AddParameter("data_name", Chr(34) & dlgPrincipalComponentAnalysis.ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34))
         clsRScores.AddParameter("model_name", Chr(34) & dlgPrincipalComponentAnalysis.strModelName & Chr(34))
         clsRScores.AddParameter("value1", Chr(34) & "ind" & Chr(34))
         clsRScores.AddParameter("value2", Chr(34) & "coord" & Chr(34))

diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R
@@ -424,7 +424,7 @@ instat_object$set("public", "get_objects", function(data_name, object_name, incl
       else out = curr_objects
     }
     else out = self$get_data_objects(data_name)$get_objects(object_name = object_name, type = type)
-    if(as_list) {
+	if(as_list) {
       lst = list()
       lst[[data_name]][[object_name]] <- out
       return(lst)