Skip to content

Commit e35758c

Browse files
author
amanpras
committed
full page scrreenshot enhancement vrt
1 parent 6d1e4c8 commit e35758c

3 files changed

Lines changed: 37 additions & 7 deletions

File tree

Ginger/Ginger/Actions/ActionEditPages/VisualTesting/VRTComparePage.xaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<RowDefinition Height="1*"/>
3434
<RowDefinition Height="1*"/>
3535
<RowDefinition Height="1*"/>
36+
<RowDefinition Height="1*"/>
3637
</Grid.RowDefinitions>
3738

3839
<Label x:Name="xVRTActionLabel" Grid.Row="0" Grid.Column="0" Margin="0,10,0,0" Style="{StaticResource $LabelStyle}" VerticalAlignment="Center" Content="VRT Action:"/>
@@ -85,22 +86,26 @@
8586
<StackPanel x:Name="xBaselineImageRadioButtonPnl" Grid.Row="9" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Width="550" Margin="-25,10,0,0">
8687
<UserControlsLib:UCRadioButtons x:Name="xBaselineImageRadioButton" VerticalAlignment="Center" HorizontalAlignment="Left"/>
8788
</StackPanel>
88-
89+
90+
8991
<Label x:Name="xBaselineImagePath" Style="{StaticResource $LabelStyle}" Grid.Row="10" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" Content="Select Image:"/>
9092
<StackPanel x:Name="VRTCurrentBaselineImagePathTxtBoxPnl" Grid.Row="10" Grid.Column="1">
9193
<Actions:UCValueExpression x:Name="VRTCurrentBaselineImagePathTxtBox" Grid.Row="1" Margin="0,10,0,0"/>
9294
</StackPanel>
9395

94-
<Label x:Name="xPreviewImage" Style="{StaticResource $LabelStyle}" Grid.Row="11" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Top" Content="Preview Image:"/>
95-
<StackPanel x:Name="VRTBaseImageFramePnl" Grid.Row="11" Grid.Column="1">
96+
<Label x:Name="xFullPageScreenshotLabel" Style="{StaticResource $LabelStyle}" Grid.Row="11" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" Content="Full Page Screenshot:"/>
97+
<CheckBox x:Name="xFullPageScreenshotCheckbox" Grid.Row="11" Grid.Column="1" VerticalAlignment="Center" Margin="5,10,0,0" Style="{StaticResource @InputCheckBoxStyle}" ToolTip="Capture the full page screenshot of the active window for baseline and checkpoint comparison"/>
98+
99+
<Label x:Name="xPreviewImage" Style="{StaticResource $LabelStyle}" Grid.Row="12" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Top" Content="Preview Image:"/>
100+
<StackPanel x:Name="VRTBaseImageFramePnl" Grid.Row="12" Grid.Column="1">
96101
<Frame x:Name="VRTBaseImageFrame" Background="White" Height="400" Margin="0,20,5,10"></Frame>
97102
</StackPanel>
98103

99-
<Label x:Name="xPreviewBaselineImage" Style="{StaticResource $LabelStyle}" Grid.Row="12" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Top" Content="Preview Baseline Image:"/>
100-
<StackPanel x:Name="VRTPreviewBaselineImageFramePnl" Grid.Row="12" Grid.Column="1">
104+
<Label x:Name="xPreviewBaselineImage" Style="{StaticResource $LabelStyle}" Grid.Row="13" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Top" Content="Preview Baseline Image:"/>
105+
<StackPanel x:Name="VRTPreviewBaselineImageFramePnl" Grid.Row="13" Grid.Column="1">
101106
<Frame x:Name="VRTPreviewBaselineImageFrame" Background="White" Height="400" Margin="5,20,5,10"></Frame>
102107
</StackPanel>
103108

104-
<Label x:Name="xVRTNote" Style="{StaticResource $LabelStyle}" Width="auto" Grid.Row="13" Grid.ColumnSpan="2" Margin="0,10,0,0" VerticalAlignment="Bottom" Content="Note - Ensure that VRT details are entered in Configurations -> External Integrations -> VRT configurations."/>
109+
<Label x:Name="xVRTNote" Style="{StaticResource $LabelStyle}" Width="auto" Grid.Row="14" Grid.ColumnSpan="2" Margin="0,10,0,0" VerticalAlignment="Bottom" Content="Note - Ensure that VRT details are entered in Configurations -> External Integrations -> VRT configurations."/>
105110
</Grid>
106111
</Page>

Ginger/Ginger/Actions/ActionEditPages/VisualTesting/VRTComparePage.xaml.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public VRTComparePage(GingerCore.Actions.ActVisualTesting mAct)
8888
}
8989
});
9090
GingerCore.GeneralLib.BindingHandler.ObjFieldBinding(xCreateBaselineCheckbox, CheckBox.IsCheckedProperty, mAct, nameof(mAct.CreateBaselineImage));
91+
GingerCore.GeneralLib.BindingHandler.ObjFieldBinding(xFullPageScreenshotCheckbox, CheckBox.IsCheckedProperty, mAct, nameof(mAct.IsFullPageScreenshot));
9192

9293
InitLayout();
9394

@@ -160,6 +161,8 @@ public void InitLayout()
160161
xCreateBaselineCheckbox.Visibility = Visibility.Collapsed;
161162
xPreviewImage.Visibility = Visibility.Collapsed;
162163
xCreateBaselineNote.Visibility = Visibility.Collapsed;
164+
xFullPageScreenshotLabel.Visibility = Visibility.Collapsed;
165+
xFullPageScreenshotCheckbox.Visibility = Visibility.Collapsed;
163166
xPreviewBaselineImage.Visibility = Visibility.Collapsed;
164167
VRTPreviewBaselineImageFramePnl.Visibility = Visibility.Collapsed;
165168
break;
@@ -222,6 +225,16 @@ public void InitLayout()
222225
xBaselineImageRadioButtonPnl.Visibility = Visibility.Visible;
223226
VRTPreviewBaselineImageFramePnl.Visibility = Visibility.Collapsed;
224227
xPreviewBaselineImage.Visibility = Visibility.Collapsed;
228+
if (baselineImageBy == VRTAnalyzer.eBaselineImageBy.ActiveWindow && actionBy == VRTAnalyzer.eActionBy.Window)
229+
{
230+
xFullPageScreenshotLabel.Visibility = Visibility.Visible;
231+
xFullPageScreenshotCheckbox.Visibility = Visibility.Visible;
232+
}
233+
else
234+
{
235+
xFullPageScreenshotLabel.Visibility = Visibility.Collapsed;
236+
xFullPageScreenshotCheckbox.Visibility = Visibility.Collapsed;
237+
}
225238
}
226239
else
227240
{
@@ -231,6 +244,16 @@ public void InitLayout()
231244
VRTBaseImageFramePnl.Visibility = Visibility.Collapsed;
232245
xBaselineImagePath.Visibility = Visibility.Collapsed;
233246
xPreviewImage.Visibility = Visibility.Collapsed;
247+
if (actionBy == VRTAnalyzer.eActionBy.Window)
248+
{
249+
xFullPageScreenshotLabel.Visibility = Visibility.Visible;
250+
xFullPageScreenshotCheckbox.Visibility = Visibility.Visible;
251+
}
252+
else
253+
{
254+
xFullPageScreenshotLabel.Visibility = Visibility.Collapsed;
255+
xFullPageScreenshotCheckbox.Visibility = Visibility.Collapsed;
256+
}
234257
}
235258

236259
break;
@@ -263,6 +286,8 @@ public void InitLayout()
263286
xCreateBaselineCheckbox.Visibility = Visibility.Collapsed;
264287
xPreviewImage.Visibility = Visibility.Collapsed;
265288
xCreateBaselineNote.Visibility = Visibility.Collapsed;
289+
xFullPageScreenshotLabel.Visibility = Visibility.Collapsed;
290+
xFullPageScreenshotCheckbox.Visibility = Visibility.Collapsed;
266291
xPreviewBaselineImage.Visibility = Visibility.Collapsed;
267292
VRTPreviewBaselineImageFramePnl.Visibility = Visibility.Collapsed;
268293
break;

Ginger/GingerCoreNET/ActionsLib/UI/VisualTesting/ActVisualTesting.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public bool IsFullPageScreenshot
181181
{
182182
get
183183
{
184-
bool value = true;
184+
bool value = false;
185185
bool.TryParse(GetOrCreateInputParam(nameof(IsFullPageScreenshot), value.ToString()).Value, out value);
186186
return value;
187187
}

0 commit comments

Comments
 (0)