Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
i2MassChroQ
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
A compter du 1er avril, attention à vos pipelines :
Nouvelles limitations de Docker Hub
Show more breadcrumbs
PAPPSO
i2MassChroQ
Commits
b0a021b6
Commit
b0a021b6
authored
7 years ago
by
Langella Olivier
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
ssh://git.renater.fr:2222/xtandempipeline
parents
ed1dad0c
d048fbd1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/rules
+2
-0
2 additions, 0 deletions
debian/rules
src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
+4
-0
4 additions, 0 deletions
src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
src/input/xtandemsaxhandler.cpp
+4
-4
4 additions, 4 deletions
src/input/xtandemsaxhandler.cpp
with
10 additions
and
4 deletions
debian/rules
+
2
−
0
View file @
b0a021b6
...
...
@@ -13,3 +13,5 @@ override_dh_auto_configure:
override_dh_auto_install
:
dh_auto_install
--
DESTDIR
=
$(
DESTDIR
)
This diff is collapsed.
Click to expand it.
src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
+
4
−
0
View file @
b0a021b6
...
...
@@ -103,7 +103,11 @@ void EditTandemPresetDialog::doSelectDir() {
QString
directory
=
QFileDialog
::
getExistingDirectory
(
this
,
tr
(
"Choose preset directory"
),
_preset_directory
);
QFileInfo
my_dir
(
directory
);
if
(
!
directory
.
isEmpty
()
&&
!
directory
.
isNull
())
{
if
(
!
my_dir
.
isWritable
())
{
throw
pappso
::
PappsoException
(
QObject
::
tr
(
"this directory is not writable, check permissions (%1)"
).
arg
(
my_dir
.
absoluteFilePath
()));
}
_preset_directory
=
directory
;
fillPresetComboBox
();
}
...
...
This diff is collapsed.
Click to expand it.
src/input/xtandemsaxhandler.cpp
+
4
−
4
View file @
b0a021b6
...
...
@@ -79,11 +79,11 @@ bool XtandemSaxHandler::startElement(const QString & namespaceURI, const QString
_current_text
.
clear
();
}
catch
(
pappso
::
PappsoException
exception_pappso
)
{
catch
(
pappso
::
PappsoException
&
exception_pappso
)
{
_errorStr
=
QObject
::
tr
(
"ERROR in XtandemSaxHandler::startElement tag %1, PAPPSO exception:
\n
%2"
).
arg
(
qName
).
arg
(
exception_pappso
.
qwhat
());
return
false
;
}
catch
(
std
::
exception
exception_std
)
{
catch
(
std
::
exception
&
exception_std
)
{
_errorStr
=
QObject
::
tr
(
"ERROR in XtandemSaxHandler::startElement tag %1, std exception:
\n
%2"
).
arg
(
qName
).
arg
(
exception_std
.
what
());
return
false
;
}
...
...
@@ -108,11 +108,11 @@ bool XtandemSaxHandler::endElement(const QString & namespaceURI, const QString &
// else if ((_tag_stack.size() > 1) &&
// (_tag_stack[_tag_stack.size() - 2] == "detection_moulon"))
}
catch
(
pappso
::
PappsoException
exception_pappso
)
{
catch
(
pappso
::
PappsoException
&
exception_pappso
)
{
_errorStr
=
QObject
::
tr
(
"ERROR in XtandemSaxHandler::endElement tag %1, PAPPSO exception:
\n
%2"
).
arg
(
qName
).
arg
(
exception_pappso
.
qwhat
());
return
false
;
}
catch
(
std
::
exception
exception_std
)
{
catch
(
std
::
exception
&
exception_std
)
{
_errorStr
=
QObject
::
tr
(
"ERROR in XtandemSaxHandler::endElement tag %1, std exception:
\n
%2"
).
arg
(
qName
).
arg
(
exception_std
.
what
());
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment