v3.0

Wertoi · Feb 8, 2020 · 7412780 · 7412780
1 parent acbf152
commit 7412780
Show file tree

Hide file tree

Showing 34 changed files with 1,520 additions and 2,703 deletions.
diff --git a/Graphy/App.xaml b/Graphy/App.xaml
diff --git a/Graphy/TextBoxWithUnit.cs → Graphy/CustomControl/TextBoxWithUnit.cs b/Graphy/TextBoxWithUnit.cs → Graphy/CustomControl/TextBoxWithUnit.cs
@@ -13,7 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Graphy
+namespace Graphy.CustomControl
 {
     /// <summary>
     /// Suivez les étapes 1a ou 1b puis 2 pour utiliser ce contrôle personnalisé dans un fichier XAML.
@@ -61,6 +61,5 @@ public string Unit
         public static readonly DependencyProperty UnitProperty =
             DependencyProperty.Register("Unit", typeof(string), typeof(TextBoxWithUnit), new PropertyMetadata(""));
 
-
     }
 }
diff --git a/Graphy/Enum/ViewModelToken.cs b/Graphy/Enum/ViewModelToken.cs
@@ -16,10 +16,7 @@ public enum CatiaToken
 
     public enum FontToken
     {
-        DirectoryNotFound,
-        FileReadingFailed,
-        GenerateNewFont,
-        SupportedCharacterComputed
+        FavoriteFontListChanged
     };
 
     public enum InputDataToken
@@ -39,12 +36,12 @@ public enum ProcessToken
 
     public enum SettingToken
     {
+        UserPreferencesChanged,
         GeneratedFontDirectoryPathChanged,
         ClassicFontDirectoryPathChanged,
         SettingFileReadingFailed,
         SettingFileWritingFailed,
-        LicenceFileReadingFailed,
-        ComputedFontCollectionChanged,
+        LicenceFileReadingFailed
     }
 
     public enum DesignTableToken

diff --git a/Graphy/Graphy.csproj b/Graphy/Graphy.csproj
@@ -93,24 +93,20 @@
     <Compile Include="Model\CatiaDocument\CatiaGenericDocument.cs" />
     <Compile Include="Model\CatiaDocument\CatiaPartDocument.cs" />
     <Compile Include="Model\CatiaFile.cs" />
+    <Compile Include="Model\CatiaShape\CatiaCharacter.cs" />
     <Compile Include="Model\CatiaShape\CatiaContour.cs" />
     <Compile Include="Model\CatiaShape\CatiaGenericShape.cs" />
     <Compile Include="Model\CatiaShape\CatiaSurface.cs" />
-    <Compile Include="Model\Font.cs" />
-    <Compile Include="Model\Generator\FontGenerator.cs" />
-    <Compile Include="Model\Contour.cs" />
-    <Compile Include="Model\DesignTable.cs" />
     <Compile Include="Model\DesignTableParameter.cs" />
     <Compile Include="Model\Generator\IGenerator.cs" />
     <Compile Include="Model\LinkableData.cs" />
     <Compile Include="Model\Generator\SupportedCharGenerator.cs" />
-    <Compile Include="TextBoxWithUnit.cs" />
+    <Compile Include="Model\SelectableFont.cs" />
+    <Compile Include="CustomControl\TextBoxWithUnit.cs" />
     <Compile Include="Enum\ViewModelToken.cs" />
     <Compile Include="Model\Generator\MarkingGenerator.cs" />
     <Compile Include="Model\CatiaEnv.cs" />
-    <Compile Include="Model\CatiaChar.cs" />
     <Compile Include="Model\CatiaShape\CatiaPoint.cs" />
-    <Compile Include="Model\GeneratedFont.cs" />
     <Compile Include="Model\MarkingData.cs" />
     <Compile Include="TranslationSource.cs" />
     <Compile Include="ViewModel\CatiaViewModel.cs" />
@@ -123,8 +119,8 @@
     <Compile Include="View\DesignTableView.xaml.cs">
       <DependentUpon>DesignTableView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\NewFontView.xaml.cs">
-      <DependentUpon>NewFontView.xaml</DependentUpon>
+    <Compile Include="View\FontView.xaml.cs">
+      <DependentUpon>FontView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\SettingView.xaml.cs">
       <DependentUpon>SettingView.xaml</DependentUpon>
@@ -153,7 +149,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\NewFontView.xaml">
+    <Page Include="View\FontView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

diff --git a/Graphy/MainWindow.xaml b/Graphy/MainWindow.xaml
diff --git a/Graphy/MainWindow.xaml.cs b/Graphy/MainWindow.xaml.cs
@@ -26,16 +26,15 @@ public MainWindow()
             InitializeComponent();
         }
 
-        private void StateView_QuitButtonClicked(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
         private void SelectionButton_Click(object sender, RoutedEventArgs e)
         {
             this.WindowState = WindowState.Minimized;
         }
 
+
+
+        // ***** SETTING VIEW MANAGEMENT *****
+
         private void SettingView_BackButtonClicked(object sender, EventArgs e)
         {
             SettingView.Visibility = Visibility.Collapsed;
@@ -46,6 +45,13 @@ private void SettingButton_Click(object sender, RoutedEventArgs e)
             SettingView.Visibility = Visibility.Visible;
         }
 
+        // ***** END OF SETTING VIEW MANAGEMENT *****
+
+
+
+
+        // ***** DESIGN TABLE VIEW MANAGEMENT *****
+
         private void DesignTableView_BackButtonClicked(object sender, EventArgs e)
         {
             DesignTableView.Visibility = Visibility.Collapsed;
@@ -56,14 +62,23 @@ private void DesignTableButton_Click(object sender, RoutedEventArgs e)
             DesignTableView.Visibility = Visibility.Visible;
         }
 
-        private void SettingView_ShowAddNewFont(object sender, EventArgs e)
+        // ***** END OF DESIGN TABLE VIEW MANAGEMENT *****
+
+
+
+
+        // ***** FONT VIEW MANAGEMENT *****
+
+        private void FontView_BackButtonClicked(object sender, EventArgs e)
         {
-            NewFontView.Visibility = Visibility.Visible;
+            FontView.Visibility = Visibility.Collapsed;
         }
 
-        private void NewFontView_BackButtonClicked(object sender, EventArgs e)
+        private void FontButton_Click(object sender, RoutedEventArgs e)
         {
-            NewFontView.Visibility = Visibility.Collapsed;
+            FontView.Visibility = Visibility.Visible;
         }
+
+        // ***** END OF FONT VIEW MANAGEMENT *****
     }
 }
diff --git a/Graphy/Model/CatiaChar.cs b/Graphy/Model/CatiaChar.cs