Skip to content

Commit

Permalink
v3.3 release.
Browse files Browse the repository at this point in the history 
Change marking set name.
Add translation for new elements.
  • Loading branch information
@Wertoi
Wertoi committed Nov 14, 2020
1 parent 4122d1b commit 282e870
Show file tree
Hide file tree
Showing 7 changed files with 118 additions and 21 deletions.
8 changes: 4 additions & 4 deletions Graphy/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<TextBlock VerticalAlignment="Center" Margin="0,0,10,0">
<Run Text=">" Foreground="{StaticResource SecondaryColor}" FontWeight="Bold" />
<Run Text="Type de marquage :"/>
<Run Text="{local:Loc MainWindow_MarkingData_MarkingTypeLabel}"/>
</TextBlock>

<RadioButton x:Name="TextRadioButton"
Expand All @@ -116,7 +116,7 @@
<Path Style="{StaticResource TextOptionToggleButtonIcon}"/>
</Canvas>
</Viewbox>
<TextBlock Text="Texte" Style="{StaticResource ToggleButtonWithImageTextBlockStyle}"/>
<TextBlock Text="{local:Loc MainWindow_MarkingData_MarkingTypeText}" Style="{StaticResource ToggleButtonWithImageTextBlockStyle}"/>
</StackPanel>
</RadioButton>

Expand All @@ -128,7 +128,7 @@
<Path Style="{StaticResource IconOptionToggleButtonIcon}"/>
</Canvas>
</Viewbox>
<TextBlock Text="Image" Style="{StaticResource ToggleButtonWithImageTextBlockStyle}"/>
<TextBlock Text="{local:Loc MainWindow_MarkingData_MarkingTypeIcon}" Style="{StaticResource ToggleButtonWithImageTextBlockStyle}"/>
</StackPanel>
</RadioButton>

Expand Down Expand Up @@ -252,7 +252,7 @@


<!--ICON INPUT -->
<TextBlock Grid.Row="2" Grid.Column="0" Text="Icon" Style="{StaticResource LabelFormTextBlock}" />
<TextBlock Grid.Row="2" Grid.Column="0" Text="{local:Loc MainWindow_MarkingData_IconLabel}" Style="{StaticResource LabelFormTextBlock}" />

<TextBox Grid.Row="2" Grid.Column="1" Style="{StaticResource ReadOnlyUnderlignedTextBox}"
Text="{Binding Source={StaticResource Locator}, Path=InputDataViewModel.MarkingData.Icon.Name}" />
Expand Down
5 changes: 4 additions & 1 deletion Graphy/Model/Generator/MarkingGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ public void Run(CatiaPartDocument partDocument, MarkingData markingData, List<Ca

// Creates the marking set
HybridBody markingSet = partDocument.PartDocument.Part.HybridBodies.Add();
markingSet.set_Name("MARKING SET: \"" + markingData.Text.Value + "\"");
if (markingData.IsText)
markingSet.set_Name("MARKING SET: \"" + markingData.Text.Value + "\"");
else
markingSet.set_Name("MARKING SET: \"" + markingData.Icon.Name + "\"");

// Creates the origin axis system to the marking set
partDocument.PartDocument.Part.InWorkObject = markingSet;
Expand Down
48 changes: 48 additions & 0 deletions Graphy/Properties/Resources.en-US.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,4 +363,52 @@
<data name="Settings_Marking_ToleranceFactorLabel" xml:space="preserve">
<value>Tolerance factor</value>
</data>
<data name="DesignTable_Link_CharacterHeightLabel" xml:space="preserve">
<value>Characters height</value>
</data>
<data name="DesignTable_Link_ExtrusionHeightLabel" xml:space="preserve">
<value>Extrusion height</value>
</data>
<data name="DesignTable_Link_TextLabel" xml:space="preserve">
<value>Text</value>
</data>
<data name="DesignTable_PartSelection_SelectAll" xml:space="preserve">
<value>Select all</value>
</data>
<data name="DesignTable_PartSelection_UnselectAll" xml:space="preserve">
<value>Unselect all</value>
</data>
<data name="Icon_Add" xml:space="preserve">
<value>Add an icon</value>
</data>
<data name="Icon_SelectedIcon_Copy" xml:space="preserve">
<value>Copy</value>
</data>
<data name="Icon_SelectedIcon_Draw" xml:space="preserve">
<value>Draw</value>
</data>
<data name="Icon_SelectedIcon_GeometryData" xml:space="preserve">
<value>Geometry data</value>
</data>
<data name="Icon_SelectedIcon_Name" xml:space="preserve">
<value>Name</value>
</data>
<data name="Icon_SelectedIcon_Remove" xml:space="preserve">
<value>Remove</value>
</data>
<data name="Icon_Title" xml:space="preserve">
<value>Icon management</value>
</data>
<data name="MainWindow_MarkingData_IconLabel" xml:space="preserve">
<value>Icon</value>
</data>
<data name="MainWindow_MarkingData_MarkingTypeIcon" xml:space="preserve">
<value>Icon</value>
</data>
<data name="MainWindow_MarkingData_MarkingTypeLabel" xml:space="preserve">
<value>Type of marking:</value>
</data>
<data name="MainWindow_MarkingData_MarkingTypeText" xml:space="preserve">
<value>Text</value>
</data>
</root>
48 changes: 48 additions & 0 deletions Graphy/Properties/Resources.fr-FR.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,4 +363,52 @@
<data name="Settings_Marking_ToleranceFactorLabel" xml:space="preserve">
<value>Facteur de tolérance</value>
</data>
<data name="DesignTable_Link_CharacterHeightLabel" xml:space="preserve">
<value>Hauteur de caractères</value>
</data>
<data name="DesignTable_Link_ExtrusionHeightLabel" xml:space="preserve">
<value>Hauteur d'extrusion</value>
</data>
<data name="DesignTable_Link_TextLabel" xml:space="preserve">
<value>Texte</value>
</data>
<data name="DesignTable_PartSelection_SelectAll" xml:space="preserve">
<value>Tout sélectionner</value>
</data>
<data name="DesignTable_PartSelection_UnselectAll" xml:space="preserve">
<value>Tout dé-selectionner</value>
</data>
<data name="Icon_Add" xml:space="preserve">
<value>Ajouter une image</value>
</data>
<data name="Icon_SelectedIcon_Copy" xml:space="preserve">
<value>Copier</value>
</data>
<data name="Icon_SelectedIcon_Draw" xml:space="preserve">
<value>Dessiner</value>
</data>
<data name="Icon_SelectedIcon_GeometryData" xml:space="preserve">
<value>Données géométriques</value>
</data>
<data name="Icon_SelectedIcon_Name" xml:space="preserve">
<value>Nom</value>
</data>
<data name="Icon_SelectedIcon_Remove" xml:space="preserve">
<value>Supprimer</value>
</data>
<data name="Icon_Title" xml:space="preserve">
<value>Gestion des images</value>
</data>
<data name="MainWindow_MarkingData_IconLabel" xml:space="preserve">
<value>Image</value>
</data>
<data name="MainWindow_MarkingData_MarkingTypeIcon" xml:space="preserve">
<value>Image</value>
</data>
<data name="MainWindow_MarkingData_MarkingTypeLabel" xml:space="preserve">
<value>Type de marquage :</value>
</data>
<data name="MainWindow_MarkingData_MarkingTypeText" xml:space="preserve">
<value>Texte</value>
</data>
</root>
10 changes: 5 additions & 5 deletions Graphy/View/DesignTableView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>

<TextBlock Text="Texte" Style="{StaticResource LabelFormTextBlock}" />
<TextBlock Text="{local:Loc DesignTable_Link_TextLabel}" Style="{StaticResource LabelFormTextBlock}" />
<ComboBox Grid.Column="1"
ItemsSource="{Binding Source={StaticResource Locator}, Path=DesignTableViewModel.ParameterCollection}"
SelectedItem="{Binding Source={StaticResource Locator}, Path=InputDataViewModel.MarkingData.Text.LinkedParameter}" Margin="0,5"
Expand All @@ -130,7 +130,7 @@
</ComboBox.ItemTemplate>
</ComboBox>

<TextBlock Grid.Row="1" Text="Hauteur de caractère" Style="{StaticResource LabelFormTextBlock}" />
<TextBlock Grid.Row="1" Text="{local:Loc DesignTable_Link_CharacterHeightLabel}" Style="{StaticResource LabelFormTextBlock}" />
<ComboBox Grid.Column="1" Grid.Row="1"
ItemsSource="{Binding Source={StaticResource Locator}, Path=DesignTableViewModel.ParameterCollection}"
SelectedItem="{Binding Source={StaticResource Locator}, Path=InputDataViewModel.MarkingData.CharacterHeight.LinkedParameter}" Margin="0,5"
Expand All @@ -152,7 +152,7 @@
</ComboBox.ItemTemplate>
</ComboBox>

<TextBlock Grid.Row="2" Text="Hauteur d'extrusion" Style="{StaticResource LabelFormTextBlock}" />
<TextBlock Grid.Row="2" Text="{local:Loc DesignTable_Link_ExtrusionHeightLabel}" Style="{StaticResource LabelFormTextBlock}" />
<ComboBox Grid.Column="1" Grid.Row="2"
ItemsSource="{Binding Source={StaticResource Locator}, Path=DesignTableViewModel.ParameterCollection}"
SelectedItem="{Binding Source={StaticResource Locator}, Path=InputDataViewModel.MarkingData.ExtrusionHeight.LinkedParameter}" Margin="0,5"
Expand Down Expand Up @@ -233,7 +233,7 @@
</Canvas>
</Viewbox>

<TextBlock Text="Tout sélectionner" VerticalAlignment="Center" Margin="2,0,7,0"/>
<TextBlock Text="{local:Loc DesignTable_PartSelection_SelectAll}" VerticalAlignment="Center" Margin="2,0,7,0"/>

</StackPanel>
</Button>
Expand All @@ -247,7 +247,7 @@
</Canvas>
</Viewbox>

<TextBlock Text="Tout dé-sélectionner" VerticalAlignment="Center" Margin="2,0,7,0"/>
<TextBlock Text="{local:Loc DesignTable_PartSelection_UnselectAll}" VerticalAlignment="Center" Margin="2,0,7,0"/>

</StackPanel>
</Button>
Expand Down
16 changes: 8 additions & 8 deletions Graphy/View/IconView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Graphy.View"
xmlns:local="clr-namespace:Graphy"
xmlns:custom="clr-namespace:Graphy.CustomControl"
mc:Ignorable="d"
d:DesignHeight="600" d:DesignWidth="450">
Expand All @@ -26,7 +26,7 @@
</Viewbox>
</Button>

<TextBlock Text="Gestion des icones" FontSize="22" Foreground="{StaticResource PrimaryColorDark}" VerticalAlignment="Center" Margin="20,0,0,0"/>
<TextBlock Text="{local:Loc Icon_Title}" FontSize="22" Foreground="{StaticResource PrimaryColorDark}" VerticalAlignment="Center" Margin="20,0,0,0"/>
</StackPanel>

<!-- MAIN CONTENT -->
Expand All @@ -48,7 +48,7 @@
</Canvas>
</Viewbox>

<TextBlock Text="Ajouter une icone" Style="{StaticResource LabelFormTextBlock}"/>
<TextBlock Text="{local:Loc Icon_Add}" Style="{StaticResource LabelFormTextBlock}"/>

</StackPanel>
</Button>
Expand Down Expand Up @@ -153,7 +153,7 @@
</Canvas>
</Viewbox>

<TextBlock Text="Draw" Style="{StaticResource LabelFormTextBlock}"/>
<TextBlock Text="{local:Loc Icon_SelectedIcon_Draw}" Style="{StaticResource LabelFormTextBlock}"/>
</StackPanel>
</Button>

Expand All @@ -168,7 +168,7 @@
</Canvas>
</Viewbox>

<TextBlock Text="Copier" Style="{StaticResource LabelFormTextBlock}"/>
<TextBlock Text="{local:Loc Icon_SelectedIcon_Copy}" Style="{StaticResource LabelFormTextBlock}"/>
</StackPanel>
</Button>

Expand All @@ -183,7 +183,7 @@
</Canvas>
</Viewbox>

<TextBlock Text="Supprimer" Style="{StaticResource LabelFormTextBlock}"/>
<TextBlock Text="{local:Loc Icon_SelectedIcon_Remove}" Style="{StaticResource LabelFormTextBlock}"/>
</StackPanel>
</Button>

Expand All @@ -202,11 +202,11 @@
</custom:CartesianCanvas>
</Viewbox>

<TextBlock Text="Name" Foreground="{StaticResource PrimaryColorLight}"/>
<TextBlock Text="{local:Loc Icon_SelectedIcon_Name}" Foreground="{StaticResource PrimaryColorLight}"/>
<TextBox Text="{Binding Source={StaticResource Locator}, Path=IconViewModel.SelectedIcon.Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Style="{StaticResource NormalTextBox}"/>

<TextBlock Text="Geometry Data" Margin="0,20,0,0" Foreground="{StaticResource PrimaryColorLight}"/>
<TextBlock Text="{local:Loc Icon_SelectedIcon_GeometryData}" Margin="0,20,0,0" Foreground="{StaticResource PrimaryColorLight}"/>
<TextBox Text="{Binding Source={StaticResource Locator}, Path=IconViewModel.SelectedIcon.PathData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" Style="{StaticResource NormalTextBox}"/>

Expand Down
4 changes: 1 addition & 3 deletions Graphy/View/SettingView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,7 @@

<Grid Grid.Row="2" Margin="15,0,15,10">
<TextBlock HorizontalAlignment="Left" Foreground="{StaticResource Gray127}">
<Run Text="© Graphy, 2019"/>
<LineBreak/>
<Run Text="By Guillaume Andrieu"/>
<Run Text="© Graphy, 2020"/>
<LineBreak/>
<Run Text="v3.3"/>
</TextBlock>
Expand Down

0 comments on commit 282e870

Please sign in to comment.