ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: scope names in snippet titles

Browse Source 
* added title for snippets
* title displays name of parent scope.
* when new TokenLocationFiles are created in the storage they are now returned as shared_ptr to ensure correct linking in the contained data.
* Storage::getTokenLocationsForLinesInFile() now always returns pairs of start and end locations.
* Adjusted code snippet view to regard the change described above.
This commit is contained in:
malte_langkabel
2015-05-11 12:34:27 +02:00
parent 7d48a873f7
commit 97345cc72f
22 changed files with 667 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/qt/element/QtCodeSnippet.h
+9 -76
View File
@@ -2,108 +2,41 @@
#define QT_CODE_SNIPPET_H
#include <vector>
#include <QPlainTextEdit>
#include <memory>
#include "utility/types.h"
#include "qt/element/QtCodeArea.h"
class QPaintEvent;
class QPushButton;
class QResizeEvent;
class QSize;
class QtCodeFile;
class QtHighlighter;
class QWidget;
class TokenLocation;
class TokenLocationFile;
class QtCodeSnippet: public QPlainTextEdit
class QtCodeSnippet: public QWidget
{
Q_OBJECT
public:
class LineNumberArea: public QWidget
{
public:
LineNumberArea(QtCodeSnippet *codeSnippet);
virtual ~LineNumberArea();
QSize sizeHint() const;
protected:
void paintEvent(QPaintEvent* event);
private:
QtCodeSnippet *m_codeSnippet;
};
QtCodeSnippet(
uint startLineNumber,
const std::string& title,
const std::string& code,
const TokenLocationFile& locationFile,
std::shared_ptr<TokenLocationFile> locationFile,
QtCodeFile* parent
);
virtual ~QtCodeSnippet();
QSize sizeHint() const;
void addMaximizeButton();
void lineNumberAreaPaintEvent(QPaintEvent *event);
int lineNumberDigits() const;
int lineNumberAreaWidth() const;
void updateLineNumberAreaWidthForDigits(int digits);
void updateLineNumberAreaWidthForDigits(int digits);
void update();
protected:
virtual void resizeEvent(QResizeEvent *event);
virtual void showEvent(QShowEvent* event);
virtual void enterEvent(QEvent* event);
virtual void leaveEvent(QEvent* event);
virtual void mouseReleaseEvent(QMouseEvent* event);
virtual void mouseDoubleClickEvent(QMouseEvent* event);
virtual void mouseMoveEvent(QMouseEvent* event);
private slots:
void updateLineNumberAreaWidth(int newBlockCount);
void updateLineNumberArea(const QRect &, int);
void clickedMaximizeButton();
void clearSelection();
private:
struct Annotation
{
int start;
int end;
Id tokenId;
Id locationId;
bool isScope;
};
const Annotation* findAnnotationForPosition(int pos) const;
void createAnnotations(const TokenLocationFile& locationFile);
void annotateText();
bool locationBelongsToSnippet(TokenLocation* location) const;
int toTextEditPosition(int lineNumber, int columnNumber) const;
int startTextEditPosition() const;
int endTextEditPosition() const;
QtCodeFile* m_parent;
QWidget* m_lineNumberArea;
QtHighlighter* m_highlighter;
QPushButton* m_maximizeButton;
const uint m_startLineNumber;
std::vector<Annotation> m_annotations;
const Annotation* m_hoveredAnnotation;
int m_digits;
QtCodeFile* m_parent; // need this?
QPushButton* m_title;
std::shared_ptr<QtCodeArea> m_codeArea;
};
#endif // QT_CODE_SNIPPET_H