Skip to content

Commit 320cbcb

Browse files
authored
Merge pull request #32 from mukunku/v2.3.1
V2.3.1
2 parents e98ec76 + 2e9141a commit 320cbcb

File tree

5 files changed

+38
-8
lines changed

5 files changed

+38
-8
lines changed

src/ParquetFileViewer/MainForm.Designer.cs

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ParquetFileViewer/MainForm.cs

+29
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,27 @@ private void userGuideToolStripMenuItem_Click(object sender, EventArgs e)
373373
System.Diagnostics.Process.Start(WikiURL);
374374
}
375375

376+
private void MainGridView_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
377+
{
378+
if (e.RowIndex < 0 || e.ColumnIndex < 0)
379+
return;
380+
381+
if (e.Value == null || e.Value == DBNull.Value)
382+
{
383+
e.Paint(e.CellBounds, DataGridViewPaintParts.All
384+
& ~(DataGridViewPaintParts.ContentForeground));
385+
386+
var font = new Font(e.CellStyle.Font, FontStyle.Italic);
387+
var color = SystemColors.ActiveCaptionText;
388+
if (this.mainGridView.SelectedCells.Contains(((DataGridView)sender)[e.ColumnIndex, e.RowIndex]))
389+
color = Color.White;
390+
391+
TextRenderer.DrawText(e.Graphics, "NULL", font, e.CellBounds, color, TextFormatFlags.Left | TextFormatFlags.VerticalCenter);
392+
393+
e.Handled = true;
394+
}
395+
}
396+
376397
#endregion
377398

378399
private void OpenFieldSelectionDialog()
@@ -668,6 +689,14 @@ private void ReadDataBackgroundWorker_RunWorkerCompleted(object sender, RunWorke
668689
private void mainGridView_DataBindingComplete(object sender, DataGridViewBindingCompleteEventArgs e)
669690
{
670691
this.actualShownRecordCountLabel.Text = this.mainGridView.RowCount.ToString();
692+
693+
foreach(DataGridViewColumn column in ((DataGridView)sender).Columns)
694+
{
695+
if (column is DataGridViewCheckBoxColumn checkboxColumn)
696+
{
697+
checkboxColumn.ThreeState = true; //handle NULLs for bools
698+
}
699+
}
671700
}
672701

673702
private void OpenNewFile(string filePath)

src/ParquetFileViewer/ParquetFileViewer.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<OutputType>WinExe</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>ParquetFileViewer</RootNamespace>
13-
<AssemblyName>ParquetFileViewer</AssemblyName>
13+
<AssemblyName>ParquetViewer</AssemblyName>
1414
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
1616
<TargetFrameworkProfile />
@@ -47,7 +47,7 @@
4747
<HintPath>..\packages\IronSnappy.1.3.0\lib\netstandard2.0\IronSnappy.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Parquet, Version=3.0.0.0, Culture=neutral, PublicKeyToken=d380b3dee6d01926, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Parquet.Net.3.8.3\lib\netstandard2.0\Parquet.dll</HintPath>
50+
<HintPath>..\packages\Parquet.Net.3.8.6\lib\netstandard2.0\Parquet.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -148,10 +148,10 @@
148148
<PropertyGroup>
149149
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
150150
</PropertyGroup>
151-
<Error Condition="!Exists('..\packages\Fody.6.3.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.3.0\build\Fody.targets'))" />
152151
<Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
152+
<Error Condition="!Exists('..\packages\Fody.6.5.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.5.0\build\Fody.targets'))" />
153153
</Target>
154-
<Import Project="..\packages\Fody.6.3.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.3.0\build\Fody.targets')" />
154+
<Import Project="..\packages\Fody.6.5.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.5.0\build\Fody.targets')" />
155155
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
156156
Other similar extension points exist, see Microsoft.Common.targets.
157157
<Target Name="BeforeBuild">

src/ParquetFileViewer/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("2.3.0.*")]
35-
[assembly: AssemblyFileVersion("2.3.0.*")]
34+
[assembly: AssemblyVersion("2.3.1.*")]
35+
[assembly: AssemblyFileVersion("2.3.1.*")]

src/ParquetFileViewer/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Costura.Fody" version="4.1.0" targetFramework="net461" />
4-
<package id="Fody" version="6.3.0" targetFramework="net461" developmentDependency="true" />
4+
<package id="Fody" version="6.5.0" targetFramework="net461" developmentDependency="true" />
55
<package id="IronSnappy" version="1.3.0" targetFramework="net461" />
6-
<package id="Parquet.Net" version="3.8.3" targetFramework="net461" />
6+
<package id="Parquet.Net" version="3.8.6" targetFramework="net461" />
77
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
88
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
99
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />

0 commit comments

Comments
 (0)