merge tagsets for Gen2FatherFromGen1Death.NLSY

ref #3
nlsy-links · Oct 15, 2018 · 08b5f74 · 08b5f74
2 parents 04fe1d7 + 0ea3f6a
commit 08b5f74
Show file tree

Hide file tree

Showing 21 changed files with 81,246 additions and 34,926 deletions.
diff --git a/Base79/ImportDataSet.Designer.cs b/Base79/ImportDataSet.Designer.cs
diff --git a/Base79/ImportDataSet.xsd b/Base79/ImportDataSet.xsd
diff --git a/Base79/ImportDataSet.xss b/Base79/ImportDataSet.xss
@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="60" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="46" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:tblLinks2004Gen2" ZOrder="16" X="526" Y="425" Height="172" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:tblGen1Outcomes" ZOrder="15" X="1051" Y="441" Height="305" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -18,10 +18,10 @@
     <Shape ID="DesignTable:tblRosterGen1Assignment" ZOrder="7" X="124" Y="753" Height="305" Width="296" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:tblGen2Links" ZOrder="6" X="48" Y="437" Height="305" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:tblGen1Links" ZOrder="5" X="1317" Y="97" Height="305" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:tblGen2LinksFromGen1" ZOrder="3" X="573" Y="79" Height="305" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:tblGen2FatherFromGen1" ZOrder="2" X="369" Y="102" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:tblGen2FatherFromGen1Death" ZOrder="4" X="518" Y="757" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:tblGen2ImplicitFather" ZOrder="1" X="821" Y="529" Height="305" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:tblGen2LinksFromGen1" ZOrder="4" X="573" Y="79" Height="305" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:tblGen2FatherFromGen1" ZOrder="3" X="369" Y="102" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:tblGen2ImplicitFather" ZOrder="2" X="821" Y="529" Height="305" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:tblGen2FatherFromGen1Death" ZOrder="1" X="583" Y="653" Height="305" Width="221" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
   </Shapes>
   <Connectors />
 </DiagramLayout>
diff --git a/Base79/Response.cs b/Base79/Response.cs
@@ -19,6 +19,8 @@ public Response( ImportDataSet dsImport, LinksDataSet dsLinks ) {
             if( dsImport.tblGen1Links.Count == 0 ) throw new InvalidOperationException("tblGen1Links must NOT be empty before reading responses from it.");
             if( dsImport.tblGen2Links.Count == 0 ) throw new InvalidOperationException("tblGen2Links must NOT be empty before reading responses from it.");
             if( dsImport.tblGen2LinksFromGen1.Count == 0 ) throw new InvalidOperationException("tblGen2LinksFromGen1 must NOT be empty before reading responses from it.");
+            if( dsImport.tblGen2FatherFromGen1.Count == 0 ) throw new InvalidOperationException("tblGen2FatherFromGen1 must NOT be empty before reading responses from it.");
+            if( dsImport.tblGen2FatherFromGen1Death.Count == 0 ) throw new InvalidOperationException("tblGen2FatherFromGen1Death must NOT be empty before reading responses from it.");
             if( dsImport.tblGen2ImplicitFather.Count == 0 ) throw new InvalidOperationException("tblGen2ImplicitFather must NOT be empty before reading responses from it.");
             if( dsImport.tblGen1Outcomes.Count == 0 ) throw new InvalidOperationException("tblGen1Outcomes must NOT be empty before reading responses from it.");
             if( dsImport.tblGen2OutcomesHeight.Count == 0 ) throw new InvalidOperationException("tblGen2OutcomesHeight must NOT be empty before reading responses from it.");
@@ -41,6 +43,7 @@ public string Go( ) {
             reponseRecordsAddedCount += TranslateExtractSource(ExtractSource.Gen2LinksFromGen1, Sample.Nlsy79Gen1, false, Constants.Gen1PassoverResponses, _dsImport.tblGen2LinksFromGen1);
             reponseRecordsAddedCount += TranslateExtractSource(ExtractSource.Gen2ImplicitFather, Sample.Nlsy79Gen2, false, Constants.Gen2PassoverResponses, _dsImport.tblGen2ImplicitFather);
             reponseRecordsAddedCount += TranslateExtractSource(ExtractSource.Gen2FatherFromGen1, Sample.Nlsy79Gen1, true, Constants.Gen1PassoverResponses, _dsImport.tblGen2FatherFromGen1);
+            reponseRecordsAddedCount += TranslateExtractSource(ExtractSource.Gen2FatherFromGen1Death, Sample.Nlsy79Gen1, true, Constants.Gen1PassoverResponses, _dsImport.tblGen2FatherFromGen1Death);
             reponseRecordsAddedCount += TranslateExtractSource(ExtractSource.Gen1Outcomes, Sample.Nlsy79Gen1, false, Constants.Gen1PassoverResponsesNoNegatives, _dsImport.tblGen1Outcomes);
             reponseRecordsAddedCount += TranslateExtractSource(ExtractSource.Gen2OutcomesHeight, Sample.Nlsy79Gen2, false, Constants.Gen2PassoverResponseNoNegatives, _dsImport.tblGen2OutcomesHeight);
             reponseRecordsAddedCount += TranslateExtractSource(ExtractSource.Gen2OutcomesWeight, Sample.Nlsy79Gen2, false, Constants.Gen2PassoverResponseNoNegatives, _dsImport.tblGen2OutcomesWeight);

diff --git a/LinksGui/Gui79.xaml b/LinksGui/Gui79.xaml
@@ -22,6 +22,7 @@
         <CollectionViewSource x:Key="tblMzManualViewSource" Source="{Binding Path=tblMzManual, Source={StaticResource linksDataSet}}" />
         <CollectionViewSource x:Key="tblLinks2004Gen2ViewSource" Source="{Binding Path=tblLinks2004Gen2, Source={StaticResource importDataSet}}" />
         <CollectionViewSource x:Key="tblGen2FatherFromGen1ViewSource" Source="{Binding Path=tblGen2FatherFromGen1, Source={StaticResource importDataSet}}" />
+        <CollectionViewSource x:Key="tblGen2FatherFromGen1DeathViewSource" Source="{Binding Path=tblGen2FatherFromGen1Death, Source={StaticResource importDataSet}}" />
         <CollectionViewSource x:Key="tblBabyDaddyViewSource" Source="{Binding Path=tblBabyDaddy, Source={StaticResource linksDataSet}}" />
         <CollectionViewSource x:Key="tblFatherOfGen2ViewSource" Source="{Binding Path=tblFatherOfGen2, Source={StaticResource linksDataSet}}" />
         <CollectionViewSource x:Key="tblLinks2004Gen1ViewSource" Source="{Binding Path=tblLinks2004Gen1, Source={StaticResource importDataSet}}" />
@@ -139,6 +140,9 @@
             <TabItem Header="Gen2FatherFromGen1" Name="tabGen2FatherFromGen1" >
                 <DataGrid ItemsSource="{Binding Source={StaticResource tblGen2FatherFromGen1ViewSource}}" />
             </TabItem>
+            <TabItem Header="Gen2FatherFromGen1Death" Name="tabGen2FatherFromGen1Death" >
+                <DataGrid ItemsSource="{Binding Source={StaticResource tblGen2FatherFromGen1DeathViewSource}}" />
+            </TabItem>
             <TabItem Header="Geocode" Name="tabGeocode" >
                 <DataGrid ItemsSource="{Binding Source={StaticResource tblGen1GeocodeSanitizedViewSource}}"/>
             </TabItem>
@@ -176,7 +180,7 @@
         </TabControl>
         <TabControl Name="tabControlBottom"  Grid.Row="3" Background="Transparent" SelectedIndex="{Binding Mode=OneWay, Source={StaticResource tblOutcomeViewSource}}">
             <TabItem Header="Subject" Name="tabSubject" >
-                <DataGrid ItemsSource="{Binding Source={StaticResource tblSubjectViewSource}}"/>
+                <DataGrid ItemsSource="{Binding Source={StaticResource tblSubjectViewSource}}" Margin="-74,-4,74,4"/>
             </TabItem>
             <TabItem Header="RStructure" Name="tabRelated" >
                 <DataGrid ItemsSource="{Binding Source={StaticResource tblRelatedStructureViewSource}}"/>