Skip to content

Commit d78a02b

Browse files
AtulinAtulin
committed
1.1 Beta
 - Added channel fill selection - Added layers' preview - Added resolution selection
1 parent ce9682b commit d78a02b

37 files changed

Lines changed: 1048 additions & 153 deletions

‎ChannelMerger/ChannelMerger.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
36+
<PropertyGroup>
37+
<ApplicationIcon>output.ico</ApplicationIcon>
38+
</PropertyGroup>
3639
<ItemGroup>
3740
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
3841
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
@@ -115,6 +118,9 @@
115118
<ItemGroup>
116119
<None Include="App.config" />
117120
</ItemGroup>
121+
<ItemGroup>
122+
<Resource Include="output.ico" />
123+
</ItemGroup>
118124
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119125
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120126
Other similar extension points exist, see Microsoft.Common.targets.

‎ChannelMerger/MainWindow.xaml‎

Lines changed: 73 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,20 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
55
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
6-
Title="MainWindow"
7-
Height="350"
8-
Width="525">
6+
xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
7+
Title="Channel Merger"
8+
Height="350" Width="600"
9+
MinHeight="350" MinWidth="530">
10+
11+
<Controls:MetroWindow.LeftWindowCommands>
12+
<Controls:WindowCommands>
13+
<Button>
14+
<iconPacks:PackIconMaterial Kind="Layers" />
15+
</Button>
16+
</Controls:WindowCommands>
17+
</Controls:MetroWindow.LeftWindowCommands>
18+
19+
<Grid>
920
<Grid Margin="16" Background="White">
1021
<Grid.Effect>
1122
<DropShadowEffect Direction="0" ShadowDepth="0" BlurRadius="10"/>
@@ -15,6 +26,7 @@
1526
<RowDefinition Height="40"/>
1627
<RowDefinition Height="40"/>
1728
<RowDefinition Height="40"/>
29+
<RowDefinition Height="40"/>
1830
<RowDefinition Height="8"/>
1931
<RowDefinition Height="40"/>
2032
<RowDefinition Height="40"/>
@@ -23,9 +35,23 @@
2335
<Grid.ColumnDefinitions>
2436
<ColumnDefinition Width="90"/>
2537
<ColumnDefinition/>
38+
<ColumnDefinition Width="84"/>
39+
<ColumnDefinition Width="40"/>
2640
</Grid.ColumnDefinitions>
2741

28-
<Button Name="redBtn" Tag="r" Grid.Row="0" Grid.Column="0" Margin="4" Click="ChannelBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
42+
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" FontSize="10">RESOLUTION</TextBlock>
43+
<ComboBox Name="ResolutionList" LostFocus="ResolutionList_OnSelected" IsEditable="True" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Margin="6" ToolTip="Select predefined resolution or enter your own">
44+
<ComboBoxItem>64x64</ComboBoxItem>
45+
<ComboBoxItem>128x128</ComboBoxItem>
46+
<ComboBoxItem>256x256</ComboBoxItem>
47+
<ComboBoxItem>512x512</ComboBoxItem>
48+
<ComboBoxItem>1024x1024</ComboBoxItem>
49+
<ComboBoxItem IsSelected="True">2048x2048</ComboBoxItem>
50+
<ComboBoxItem>4096x4096</ComboBoxItem>
51+
<ComboBoxItem>8192x8192</ComboBoxItem>
52+
</ComboBox>
53+
54+
<Button Name="redBtn" Tag="r" Grid.Row="1" Grid.Column="0" Margin="4" Click="ChannelBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
2955
<Grid Margin="8,0,0,0">
3056
<Grid.ColumnDefinitions>
3157
<ColumnDefinition Width="16px"/>
@@ -36,7 +62,7 @@
3662
</Grid>
3763
</Button>
3864

39-
<Button Name="greenBtn" Tag="g" Grid.Row="1" Grid.Column="0" Margin="4" Click="ChannelBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
65+
<Button Name="greenBtn" Tag="g" Grid.Row="2" Grid.Column="0" Margin="4" Click="ChannelBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
4066
<Grid Margin="8,0,0,0">
4167
<Grid.ColumnDefinitions>
4268
<ColumnDefinition Width="16px"/>
@@ -47,7 +73,7 @@
4773
</Grid>
4874
</Button>
4975

50-
<Button Name="blueBtn" Tag="b" Grid.Row="2" Grid.Column="0" Margin="4" Click="ChannelBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
76+
<Button Name="blueBtn" Tag="b" Grid.Row="3" Grid.Column="0" Margin="4" Click="ChannelBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
5177
<Grid Margin="8,0,0,0">
5278
<Grid.ColumnDefinitions>
5379
<ColumnDefinition Width="16px"/>
@@ -58,7 +84,7 @@
5884
</Grid>
5985
</Button>
6086

61-
<Button Name="alphaBtn" Tag="a" Grid.Row="3" Grid.Column="0" Margin="4" Click="ChannelBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
87+
<Button Name="alphaBtn" Tag="a" Grid.Row="4" Grid.Column="0" Margin="4" Click="ChannelBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
6288
<Grid Margin="8,0,0,0">
6389
<Grid.ColumnDefinitions>
6490
<ColumnDefinition Width="16px"/>
@@ -69,7 +95,7 @@
6995
</Grid>
7096
</Button>
7197

72-
<Button Name="outBtn" Tag="a" Grid.Row="5" Grid.Column="0" Margin="4" Click="OutputBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
98+
<Button Name="outBtn" Tag="a" Grid.Row="6" Grid.Column="0" Margin="4" Click="OutputBtn_Click" Padding="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center">
7399
<Grid Margin="8,0,0,0">
74100
<Grid.ColumnDefinitions>
75101
<ColumnDefinition Width="16px"/>
@@ -80,22 +106,54 @@
80106
</Grid>
81107
</Button>
82108

83-
<TextBox Name="redPath" IsReadOnly="True" Grid.Row="0" Grid.Column="1" Margin="4" VerticalContentAlignment="Center"></TextBox>
84-
<TextBox Name="greenPath" IsReadOnly="True" Grid.Row="1" Grid.Column="1" Margin="4" VerticalContentAlignment="Center"></TextBox>
85-
<TextBox Name="bluePath" IsReadOnly="True" Grid.Row="2" Grid.Column="1" Margin="4" VerticalContentAlignment="Center"></TextBox>
86-
<TextBox Name="alphaPath" IsReadOnly="True" Grid.Row="3" Grid.Column="1" Margin="4" VerticalContentAlignment="Center"></TextBox>
109+
<TextBox Name="redPath" IsReadOnly="True" Grid.Row="1" Grid.Column="1" Margin="4" VerticalContentAlignment="Center"></TextBox>
110+
<TextBox Name="greenPath" IsReadOnly="True" Grid.Row="2" Grid.Column="1" Margin="4" VerticalContentAlignment="Center"></TextBox>
111+
<TextBox Name="bluePath" IsReadOnly="True" Grid.Row="3" Grid.Column="1" Margin="4" VerticalContentAlignment="Center"></TextBox>
112+
<TextBox Name="alphaPath" IsReadOnly="True" Grid.Row="4" Grid.Column="1" Margin="4" VerticalContentAlignment="Center"></TextBox>
87113

88-
<Grid Grid.Row="5" Grid.Column="1">
114+
<Grid Grid.Row="6" Grid.Column="1">
89115
<Grid.ColumnDefinitions>
90116
<ColumnDefinition Width="3*"/>
91117
<ColumnDefinition/>
92118
</Grid.ColumnDefinitions>
93119
<TextBox Name="outputPath" IsReadOnly="True" Margin="4" VerticalContentAlignment="Center"></TextBox>
94120
<TextBox Name="fileName" Grid.Column="1" Margin="4" Text="result.png" VerticalContentAlignment="Center"></TextBox>
95-
96121
</Grid>
97122

98-
<Button Name="mergeBtn" Grid.Row="6" Grid.Column="1" Margin="4" Click="MergeBtn_Click">Merge</Button>
123+
<ComboBox Name="RedFill" Grid.Column="2" Grid.Row="1" LostFocus="FillSelection_FocusLost" Margin="4" ToolTip="Select what colour will fill the channel if no image is selected">
124+
<ComboBoxItem IsSelected="True">WHITE</ComboBoxItem>
125+
<ComboBoxItem>BLACK</ComboBoxItem>
126+
</ComboBox>
127+
<ComboBox Name="GreenFill" Grid.Column="2" Grid.Row="2" LostFocus="FillSelection_FocusLost" Margin="4" ToolTip="Select what colour will fill the channel if no image is selected">
128+
<ComboBoxItem IsSelected="True">WHITE</ComboBoxItem>
129+
<ComboBoxItem>BLACK</ComboBoxItem>
130+
</ComboBox>
131+
<ComboBox Name="BlueFill" Grid.Column="2" Grid.Row="3" LostFocus="FillSelection_FocusLost" Margin="4" ToolTip="Select what colour will fill the channel if no image is selected">
132+
<ComboBoxItem IsSelected="True">WHITE</ComboBoxItem>
133+
<ComboBoxItem>BLACK</ComboBoxItem>
134+
</ComboBox>
135+
<ComboBox Name="AlphaFill" Grid.Column="2" Grid.Row="4" LostFocus="FillSelection_FocusLost" Margin="4" ToolTip="Select what colour will fill the channel if no image is selected">
136+
<ComboBoxItem IsSelected="True">WHITE</ComboBoxItem>
137+
<ComboBoxItem>BLACK</ComboBoxItem>
138+
</ComboBox>
139+
140+
<Image Name="RedImage" Grid.Row="1" Grid.Column="3" Margin="4" MouseDown="Preview_Click" ToolTip="Click to preview the loaded image"></Image>
141+
<Image Name="GreenImage" Grid.Row="2" Grid.Column="3" Margin="4" MouseDown="Preview_Click" ToolTip="Click to preview the loaded image"></Image>
142+
<Image Name="BlueImage" Grid.Row="3" Grid.Column="3" Margin="4" MouseDown="Preview_Click" ToolTip="Click to preview the loaded image"></Image>
143+
<Image Name="AlphaImage" Grid.Row="4" Grid.Column="3" Margin="4" MouseDown="Preview_Click" ToolTip="Click to preview the loaded image"></Image>
99144

145+
<Button Name="mergeBtn" Grid.Row="7" Grid.Column="1" Margin="4" Click="MergeBtn_Click">Merge</Button>
146+
147+
</Grid>
148+
149+
<simpleChildWindow:ChildWindow Name="PreviewWindow"
150+
HorizontalContentAlignment="Center"
151+
VerticalContentAlignment="Center"
152+
ShowCloseButton="True"
153+
Padding="8"
154+
IsModal="True">
155+
<Image Name="PreviewWindowImage"></Image>
156+
</simpleChildWindow:ChildWindow>
157+
100158
</Grid>
101159
</Controls:MetroWindow>

‎ChannelMerger/MainWindow.xaml.cs‎

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
using System;
22
using System.Windows;
3+
using System.Windows.Controls;
34
using System.Windows.Forms;
5+
using System.Windows.Input;
6+
using System.Windows.Media;
7+
using System.Windows.Media.Imaging;
48
using ImageMagick;
59
using MahApps.Metro.Controls;
610
using MahApps.Metro.Controls.Dialogs;
711
using Button = System.Windows.Controls.Button;
12+
using ComboBox = System.Windows.Controls.ComboBox;
13+
using MouseEventArgs = System.Windows.Input.MouseEventArgs;
814
using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
915

1016

@@ -32,6 +38,7 @@ public MainWindow()
3238
private async void ChannelBtn_Click(object sender, RoutedEventArgs e)
3339
{
3440
string tag = ((Button) sender).Tag.ToString();
41+
ImageSource imageSource = null;
3542

3643
OpenFileDialog file = new OpenFileDialog
3744
{
@@ -47,29 +54,38 @@ private async void ChannelBtn_Click(object sender, RoutedEventArgs e)
4754
await this.ShowMessageAsync("Error!", "This image isn't grayscale!");
4855
return;
4956
}
50-
57+
58+
imageSource = new BitmapImage(new Uri(file.FileName));
5159
}
5260

5361
switch (tag.ToLower())
5462
{
5563
case "r":
5664
_channelPaths[0] = file.FileName;
5765
redPath.Text = file.FileName;
66+
if (imageSource != null)
67+
RedImage.Source = imageSource;
5868
break;
5969

6070
case "g":
6171
_channelPaths[1] = file.FileName;
6272
greenPath.Text = file.FileName;
73+
if (imageSource != null)
74+
GreenImage.Source = imageSource;
6375
break;
6476

6577
case "b":
6678
_channelPaths[2] = file.FileName;
6779
bluePath.Text = file.FileName;
80+
if (imageSource != null)
81+
BlueImage.Source = imageSource;
6882
break;
6983

7084
case "a":
7185
_channelPaths[3] = file.FileName;
7286
alphaPath.Text = file.FileName;
87+
if (imageSource != null)
88+
AlphaImage.Source = imageSource;
7389
break;
7490

7591
default:
@@ -81,11 +97,18 @@ private void MergeBtn_Click(object sender, RoutedEventArgs e)
8197
{
8298
if (String.IsNullOrEmpty(_outputPath)) return;
8399

84-
foreach (string path in _channelPaths)
100+
string[] colours = {
101+
RedFill.Text.ToLower(),
102+
GreenFill.Text.ToLower(),
103+
BlueFill.Text.ToLower(),
104+
AlphaFill.Text.ToLower()
105+
};
106+
107+
for (int i = 0; i < _channelPaths.Length; i++)
85108
{
86-
_channelImages.Add(String.IsNullOrEmpty(path)
87-
? new MagickImage("xc:white", _settings)
88-
: new MagickImage(path));
109+
_channelImages.Add(String.IsNullOrEmpty(_channelPaths[i])
110+
? new MagickImage("xc:"+colours[i], _settings)
111+
: new MagickImage(_channelPaths[i]));
89112
}
90113

91114
_channelImages.MergeChannels(outputPath.Text, fileName.Text);
@@ -105,5 +128,32 @@ private void OutputBtn_Click(object sender, RoutedEventArgs e)
105128
}
106129
outputPath.Text = _outputPath;
107130
}
131+
132+
private void ResolutionList_OnSelected(object sender, EventArgs eventArgs)
133+
{
134+
string[] sDimensions = ResolutionList.Text.Split('x');
135+
int[] dimensions =
136+
{
137+
Int32.Parse(sDimensions[0]),
138+
Int32.Parse(sDimensions[1])
139+
};
140+
141+
_settings.Width = dimensions[0];
142+
_settings.Height = dimensions[1];
143+
}
144+
145+
private void FillSelection_FocusLost(object sender, RoutedEventArgs e)
146+
{
147+
Title = ((ComboBox) sender).Name + ((ComboBox) sender).Text;
148+
}
149+
150+
private void Preview_Click(object sender, MouseButtonEventArgs e)
151+
{
152+
if (((Image) sender).Source != null)
153+
{
154+
PreviewWindow.IsOpen = true;
155+
PreviewWindowImage.Source = ((Image) sender).Source;
156+
}
157+
}
108158
}
109159
}

‎ChannelMerger/bin/Debug/ChannelMerger.exe‎

606 KB
Binary file not shown.

‎ChannelMerger/bin/Debug/ChannelMerger.pdb‎

2 KB
Binary file not shown.

‎ChannelMerger/bin/Release/ChannelMerger.exe‎

605 KB
Binary file not shown.

‎ChannelMerger/bin/Release/ChannelMerger.pdb‎

2 KB
Binary file not shown.

‎ChannelMerger/obj/Debug/ChannelMerger.csproj.CoreCompileInputs.cache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
43afd74fe4458051556a2444522abd682c525bb6
1+
e86e201adffe948e37fa4182502ec48aacd73df3

‎ChannelMerger/obj/Debug/ChannelMerger.csproj.FileListAbsolute.txt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,33 @@ C:\Users\Angius\source\repos\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro
2828
C:\Users\Angius\source\repos\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.SimpleChildWindow.dll
2929
C:\Users\Angius\source\repos\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.SimpleChildWindow.pdb
3030
C:\Users\Angius\source\repos\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.SimpleChildWindow.xml
31+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\ChannelMerger.exe.config
32+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\ChannelMerger.exe
33+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\ChannelMerger.pdb
34+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\ControlzEx.dll
35+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\Magick.NET-Q16-AnyCPU.dll
36+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.dll
37+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.IconPacks.dll
38+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.SimpleChildWindow.dll
39+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\System.Windows.Interactivity.dll
40+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\ControlzEx.pdb
41+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\Magick.NET-Q16-AnyCPU.xml
42+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.pdb
43+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.xml
44+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.IconPacks.pdb
45+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.IconPacks.xml
46+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.SimpleChildWindow.pdb
47+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\bin\Debug\MahApps.Metro.SimpleChildWindow.xml
48+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger.csprojAssemblyReference.cache
49+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\MainWindow.baml
50+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\App.baml
51+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\MainWindow.g.cs
52+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\App.g.cs
53+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger_MarkupCompile.cache
54+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger.g.resources
55+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger.Properties.Resources.resources
56+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger.csproj.GenerateResource.cache
57+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger.csproj.CoreCompileInputs.cache
58+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger.csproj.CopyComplete
59+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger.exe
60+
C:\Users\Angius\Documents\Visual Studio 2017\Projects\ChannelMerger\ChannelMerger\obj\Debug\ChannelMerger.pdb

‎ChannelMerger/obj/Debug/ChannelMerger.csprojAssemblyReference.cache‎

29.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)