Сибогатов Ринат #204
Open
Сибогатов Ринат #204
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the-homeless-god
suggested changes
Jan 30, 2024
Comment on lines
18
to
24
| foreach (Section section in document.Sections) | ||
| { | ||
| foreach (Paragraph paragraph in section.Paragraphs) | ||
| { | ||
| words.AddRange(paragraph.Text.Split(' ', StringSplitOptions.RemoveEmptyEntries)); | ||
| } | ||
| } |
|
|
||
| private Size MeasureTextSize(string text, Font font) | ||
| { | ||
| using (var temporaryBitmap = new Bitmap(1, 1)) |
There was a problem hiding this comment.
Как поступить с магическими числами? Почему тут 1? Как это понять?
| _fontName = fontName; | ||
| } | ||
|
|
||
| public void Run(CommandLineOptions options) |
There was a problem hiding this comment.
Слишком много ответственности в функции
|
|
||
| var tagCloudImage = GenerateTagCloud(processedWords, options.FontName, fontColor, highlightColor, options.PercentageToHighLight); | ||
|
|
||
| tagCloudImage.Save(@"..\..\..\output\tagsCloud.png"); |
|
|
||
| switch (fileExtension) | ||
| { | ||
| case ".doc": |
| } | ||
| } | ||
|
|
||
| private Bitmap GenerateTagCloud(IEnumerable<string> words, string fontName, Color fontColor, Color highlightColor, double percentageToHighlight) |
| private CircularCloudLayouter CreateLayouter() | ||
| { | ||
| var center = new Point(_imageSettings.ImageWidth / 2, _imageSettings.ImageHeight / 2); | ||
| var spiral = new Spiral(center, 0.02, 0.04); |
| { | ||
| if (wordFrequencies.TryGetValue(word, out var frequency)) | ||
| { | ||
| return Math.Max(30, 30 + frequency * 2); |
Comment on lines
38
to
45
| //private static void DrawRectangles(IEnumerable<Rectangle> rectangles, Graphics graphics) | ||
| //{ | ||
| // var pen = new Pen(Color.Green); | ||
| // foreach (var rect in rectangles) | ||
| // { | ||
| // graphics.DrawRectangle(pen, rect); | ||
| // } | ||
| //} |
There was a problem hiding this comment.
Для чего хранить закомментированный код?
the-homeless-god
suggested changes
Jan 30, 2024
Comment on lines
7
to
8
| public Point CloudCenter { get; } | ||
| public IList<Rectangle> Rectangles { get; } |
There was a problem hiding this comment.
Почему решил сделать неполные свойства?
Comment on lines
7
to
8
| Color BackgroundColor { get; } | ||
| Color FontColor { get; } |
There was a problem hiding this comment.
Почему решил сделать неполные свойства?
Comment on lines
10
to
11
| int ImageWidth { get; set; } | ||
| int ImageHeight { get; set; } |
There was a problem hiding this comment.
Так как это уже элементы интерфейса Image, то можно опустить слова Image
То есть:
Width
Height
| int ImageWidth { get; set; } | ||
| int ImageHeight { get; set; } | ||
|
|
||
| void UpdateImageSettings(int width, int height); |
There was a problem hiding this comment.
Также и здесь
UpdateSize или SetSize
TagsCloudContainer/Program.cs
Outdated
| using (var serviceProvider = Startup.ConfigureServices()) | ||
| { | ||
| var tagCloudApp = serviceProvider.GetRequiredService<TagCloudApp>(); | ||
| tagCloudApp.Run(o); |
There was a problem hiding this comment.
давай поменяем o на что-то длинное и понятное)
|
|
||
| private void ValidateRectangleSize(Size rectangleSize) | ||
| { | ||
| if (rectangleSize.Width <= 0 || rectangleSize.Height <= 0) |
There was a problem hiding this comment.
для 0 нужно завести константы
|
|
||
| private Point GetUpperLeftCorner(Point rectangleCenter, Size rectangleSize) | ||
| { | ||
| return new Point(rectangleCenter.X - rectangleSize.Width / 2, rectangleCenter.Y - rectangleSize.Height / 2); |
Comment on lines
120
to
149
| /// Расчитывает размер шрифта для заданного слова на основе его частоты встречаемости. | ||
| /// </summary> | ||
| /// <param name="word">Строка, представляющая слово, для которого необходимо определить размер шрифта.</param> | ||
| /// <param name="wordFrequencies">Словарь, содержащий частоту встречаемости каждого слова в тексте.</param> | ||
| /// <returns>Размер шрифта для заданного слова.</returns> | ||
|
|
||
| private const int BaseFontSize = 30; | ||
| private const int FontSizeMultiplier = 2; | ||
| private const int DefaultFontSize = 10; | ||
| private int CalculateWordFontSize(string word, Dictionary<string, int> wordFrequencies) | ||
| { | ||
| if (wordFrequencies.TryGetValue(word, out var frequency)) | ||
| { | ||
| return Math.Max(BaseFontSize, BaseFontSize + frequency * FontSizeMultiplier); | ||
| } | ||
| return DefaultFontSize; | ||
| } | ||
|
|
||
|
|
||
| private Dictionary<string, int> CalculateWordFrequencies(IEnumerable<string> words) | ||
| { | ||
| var wordFrequencies = new Dictionary<string, int>(); | ||
|
|
||
| foreach (var word in words) | ||
| { | ||
| wordFrequencies.TryGetValue(word, out var frequency); | ||
| wordFrequencies[word] = frequency + 1; | ||
| } | ||
|
|
||
| return wordFrequencies; |
There was a problem hiding this comment.
Тянет на отдельный класс, почитай про S в SOLID
|
|
||
| private CircularCloudLayouter CreateLayouter(double angleStep = DefaultAngleStep, double radiusStep = DefaultRadiusStep) | ||
| { | ||
| var center = new Point(_imageSettings.ImageWidth / 2, _imageSettings.ImageHeight / 2); |
There was a problem hiding this comment.
Дублирование кода, уже где-то выше видел использование деления на 2
the-homeless-god
suggested changes
Feb 5, 2024
| int ImageWidth { get; set; } | ||
| int ImageHeight { get; set; } | ||
|
|
||
| void UpdateImageSettings(int width, int height); |
|
|
||
| switch (fileExtension) | ||
| { | ||
| case ".doc": |
| _fontName = fontName; | ||
| } | ||
|
|
||
| public void Run(CommandLineOptions options) |
There was a problem hiding this comment.
Я бы в README добавил описание зачем они нужны
the-homeless-god
suggested changes
Feb 6, 2024
TagsCloudContainer/Readme.md
Outdated
Comment on lines
1
to
18
| # TagsCloudContainer | ||
|
|
||
| ������ ������������ ����� ��������� ��� ��������� ������ ����� �� ����� � ������� ����. ��������� ������������ �������� ������� ����, �������� ������� ������ � ��������� �����, � ����� ���������� ���� ���� � ������� �������� ��� ����������. | ||
|
|
||
| ## ��������� ���������: | ||
|
|
||
| - ��������� ���������������� �������� ������� ����. | ||
| - ����������� ���������� ���� ���� � ������� ��������. | ||
| - ����������� ��������� ����� ��� ����. | ||
| - ����������� ����������� �������� �����, ����, ������. | ||
| - �������� CLI. | ||
| - ����������� ������: \*.doc, \*.docx, \*.txt. | ||
| - ��������� ��������������� ����� ��� ����� ����������������. | ||
| - ������� ������ ��������� � �����������. | ||
|
|
||
| ## ���������� ���� �� ������ | ||
|
|
||
| - ������ ���� ������� ���� ���������, ��������� � ����� 'boring_words.txt' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание проекта:
Проект представляет собой программу для генерации облака тегов из файла с набором слов. Программа осуществляет удаление скучных слов, перечень которых указан в отдельном файле, а также приведение всех слов к нижнему регистру для унификации.
Внесенные изменения:
@the-homeless-god