Skip to content
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.

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

GUI FOR AUTOMATED PLOTTING 3 #2545

Closed
wants to merge 6 commits into from

Conversation

Preetam-Das26
Copy link
Collaborator

Purpose of PR?:

Fixes #

Does this PR introduce a breaking change?

If the changes in this PR are manually verified, list down the scenarios covered::

Additional information for reviewer? :
Mention if this PR is part of any design or a continuation of previous PRs

Does this PR results in some Documentation changes?
If yes, include the list of Documentation changes

Checklist:

  • Bug fix. Fixes #
  • New feature (Non-API breaking changes that adds functionality)
  • PR Title follows the convention of <type>: <subject>
  • Commit has unit tests

 * GUI codes for the .py and .ui files

* removed the wms_login files

* config file upload feature updated,other changes done

* added map sections,improvising the functionalities

* resolved failing test cases,modified the update button
update msui mainwindow based on left treewidget, download from operations implemented completely and prcess dialogs added, update msui mainwindow based on left treewidget,
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to become a PR to your GSOC branch.

Later we will merge your GSOC branch to develop.

There are a lot merge conflicts not resoved.

@@ -1,6 +1,8 @@
Changelog
=========

<<<<<<< HEAD
=======
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not looking correct.

@@ -150,13 +150,83 @@ by `pg_dump <https://www.postgresql.org/docs/current/app-pgdump.html>`_ using a
pg_dump -d mscolab -f "/home/mscolab/dump/$timestamp.sql"


<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is also a merge conflct


From v10 onwards MSColab uses `Flask-Migrate <https://flask-migrate.readthedocs.io/en/latest/>` to automatically deal with database migrations.
To upgrade from v8 or v9 a recreation of the database and subsequent copy of existing data is necessary.
To do this follow these steps:

<<<<<<< HEAD
You have to create based on your configuration a migration script and call that afterwards. ::
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

always when you see <<<<<<< HEAD you need to solve the merge conflict

@Preetam-Das26 Preetam-Das26 deleted the gsoc_psd branch October 6, 2024 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants