added data to library and fixed bug in define o by c data

IDEMSInternational · Jun 24, 2018 · 5571d19 · 5571d19
1 parent cb8928d
commit 5571d19
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -232,8 +232,4 @@ ModelManifest.xml
 /instat/static/InstatObject/R/.RData
 /instat/static/InstatObject/R/examples_R6.R
 /instat/static/InstatObject/R/.Rhistory
-/instat/static/InstatObject/R/examples.R
-
-# Resource files
-*fr-FR.resx
-*fr-FR.xlf
+/instat/static/InstatObject/R/examples.R
diff --git a/instat/dlgDefineOptionsByContext.vb b/instat/dlgDefineOptionsByContext.vb
@@ -139,6 +139,7 @@ Public Class dlgDefineOptionsByContext
         ucrReceiverContext2.SetRCode(clsTypes, bResetControls)
         ucrReceiverContext3.SetRCode(clsTypes, bResetControls)
         ucrReceiverContext4.SetRCode(clsTypes, bResetControls)
+        ucrReceiverContextOther.SetRCode(clsTypes, bResetControls)
         ucrReceiverMeasurement1.SetRCode(clsTypes, bResetControls)
         ucrReceiverMeasurementOther.SetRCode(clsTypes, bResetControls)
         ucrReceiverID1.SetRCode(clsTypes, bResetControls)

diff --git a/instat/instat.vbproj b/instat/instat.vbproj
@@ -5493,6 +5493,9 @@
     <Content Include="static\InstatObject\R\extras\bin\windows\contrib\3.4\zoo_1.8-2.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="static\Library\Options by Context\FUMA.2017.RDS">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">

diff --git a/instat/static/Library/Options by Context/FUMA.2017.RDS b/instat/static/Library/Options by Context/FUMA.2017.RDS