Skip to content

VGA as module #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

VGA as module #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d799a3
Move VGA to be a module
pklampros Dec 30, 2020
d31917a
Auto-format
pklampros Dec 30, 2020
4e158cf
Make sure the class-wide version of the angular step-depth act is used
pklampros Dec 30, 2020
e7ade79
Fix the cli parsers
pklampros Dec 30, 2020
aa0f7d7
Update header copyright
pklampros Dec 30, 2020
786d8a0
Forbid changing the angular analysis radius in the CLI
pklampros Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions cliTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ set(cliTest_SRCS
testradiusconverter.cpp
../depthmapXcli/radiusconverter.cpp
testsimpletimer.cpp
testvgaparser.cpp
../depthmapXcli/vgaparser.cpp
testlinkparser.cpp
../depthmapXcli/linkparser.cpp
testagentparser.cpp
Expand All @@ -31,8 +29,6 @@ set(cliTest_SRCS
../depthmapXcli/exportparser.cpp
../depthmapXcli/importparser.cpp
testimportparser.cpp
../depthmapXcli/stepdepthparser.cpp
teststepdepthparser.cpp
../depthmapXcli/segmentparser.cpp
testsegmentparser.cpp
../depthmapXcli/mapconvertparser.cpp
Expand Down
1 change: 0 additions & 1 deletion depthmapX/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ qt5_wrap_ui(UI_HDRS
UI/RenameObjectDlg.ui
UI/PushDialog.ui
UI/PromptReplace.ui
UI/OptionsDlg.ui
UI/NewLayerDlg.ui
UI/MakeOptionsDlg.ui
UI/MakeLayerDlg.ui
Expand Down
30 changes: 0 additions & 30 deletions depthmapX/GraphDoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "mainwindow.h"

#include "dialogs/MakeLayerDlg.h"
#include "dialogs/OptionsDlg.h"
#include "dialogs/AxialAnalysisOptionsDlg.h"
#include "dialogs/SegmentAnalysisDlg.h"
#include "dialogs/GridDialog.h"
Expand Down Expand Up @@ -1729,35 +1728,6 @@ void QGraphDoc::OnToolsUnmakeGraph()
SetRedrawFlag(QGraphDoc::VIEW_ALL, QGraphDoc::REDRAW_GRAPH, QGraphDoc::NEW_DATA );
}

/////////////////////////////////////////////////////////////////////////////

void QGraphDoc::OnToolsRun()
{
if (m_communicator) {
QMessageBox::warning(this, tr("Warning"), tr("Please wait, another task is running"), QMessageBox::Ok, QMessageBox::Ok);
return;
}

// This is easy!
COptionsDlg dlg;

dlg.m_layer_names.push_back("<None>");
for (auto& dataMap: m_meta_graph->getDataMaps()) {
dlg.m_layer_names.push_back(dataMap.getName());
}

if (QDialog::Accepted != dlg.exec()) {
return;
}

// This is easy too... too easy... hmm... crossed-fingers, here goes:
m_communicator = new CMSCommunicator();
CreateWaitDialog(tr("Analysing graph..."));
m_communicator->SetFunction( CMSCommunicator::ANALYSEGRAPH );

m_thread.render(this);
}

void QGraphDoc::OnToolsPD()
{
if (m_communicator) {
Expand Down
1 change: 0 additions & 1 deletion depthmapX/GraphDoc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ public slots:
void OnToolsMakeGraph();
void OnToolsUnmakeGraph();
void OnEditClear();
void OnToolsRun();
void OnEditUndo();
void OnToolsPD();
void OnPushToLayer();
Expand Down
2 changes: 0 additions & 2 deletions depthmapX/dialogs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ target_sources(depthmapX
RenameObjectDlg.h
PushDialog.h
PromptReplace.h
OptionsDlg.h
NewLayerDlg.h
MakeOptionsDlg.h
MakeLayerDlg.h
Expand Down Expand Up @@ -37,7 +36,6 @@ target_sources(depthmapX
RenameObjectDlg.cpp
PushDialog.cpp
PromptReplace.cpp
OptionsDlg.cpp
NewLayerDlg.cpp
MakeOptionsDlg.cpp
MakeLayerDlg.cpp
Expand Down
241 changes: 0 additions & 241 deletions depthmapX/dialogs/OptionsDlg.cpp
View file
Open in desktop

This file was deleted.

Loading