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.

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

Jump to bottom

Tmp issue 73 #151

Merged
merged 13 commits into from
Jan 28, 2019
Merged

Tmp issue 73 #151

merged 13 commits into from
Jan 28, 2019

Conversation

diptighosalkar
Copy link
Contributor

Implemented Expression block

  1. Created JS for Expression block.
  2. Created file expression-sci-function.sci , contains scilab func needed for set() of Expression block's JS.
  3. Created ajax method to call app route.
  4. Created app route method for calling scilab command and so some manipulation on response data.
  5. Added import parameters code for Expression block.

Fixed appearance of scrollbar on simulation.

sunilshetye
sunilshetye reviewed Jan 22, 2019
View reviewed changes
Copy link
Collaborator

@sunilshetye sunilshetye left a comment

Choose a reason for hiding this comment

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

PEP8 is strict about layout.

After every comma, there should be one space.

Both before and after an operator (like +), there should be a space.

Instead of repeatedly using + for a string, use %

Don't add extra semicolon at the end of the line

SendLog.py Outdated Show resolved Hide resolved
SendLog.py Outdated Show resolved Hide resolved
SendLog.py Outdated Show resolved Hide resolved
SendLog.py Outdated Show resolved Hide resolved
SendLog.py Outdated Show resolved Hide resolved
sunilshetye
sunilshetye reviewed Jan 23, 2019
View reviewed changes
SendLog.py Outdated Show resolved Hide resolved
SendLog.py Outdated Show resolved Hide resolved
SendLog.py Outdated Show resolved Hide resolved
SendLog.py Show resolved Hide resolved
SendLog.py Outdated Show resolved Hide resolved
webapp/dependencies.js Outdated Show resolved Hide resolved
webapp/data_structures/EXPRESSION.js Show resolved Hide resolved
expression-sci-function.sci Outdated Show resolved Hide resolved
webapp/data_structures/EXPRESSION.js Show resolved Hide resolved
webapp/data_structures/EXPRESSION.js Outdated Show resolved Hide resolved
@sunilshetye sunilshetye mentioned this pull request Jan 25, 2019
Closed
@diptighosalkar diptighosalkar force-pushed the TMP-ISSUE-73 branch 3 times, most recently from ba42f1b to e6cb825 Compare January 25, 2019 07:29
sunilshetye
sunilshetye reviewed Jan 25, 2019
View reviewed changes
Copy link
Collaborator

@sunilshetye sunilshetye left a comment

Choose a reason for hiding this comment

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

Looks better now. Some small changes suggested.

expression-sci-function.sci Outdated Show resolved Hide resolved
expression-sci-function.sci Outdated Show resolved Hide resolved
expression-sci-function.sci Outdated Show resolved Hide resolved
webapp/data_structures/EXPRESSION.js Outdated Show resolved Hide resolved
webapp/data_structures/EXPRESSION.js Outdated Show resolved Hide resolved
dipti added 13 commits January 25, 2019 15:57
Created Expression block JS excluding define and set method
85fb2d5
Added define() and set() minus scilab function
4b61476
Created different Scilab function needed
cfbf9f0
Added ajax request func, modified sci function, added app route for a…
7d61c29 
…jax in python and modified block JS
Complete JS and added importparamters of Expression block,Check XMLs,…
edab0dd 
…Fixed bug FOSSEE#150
Fixed path issue-replaced session with diagram
f6d98da
Fixed port display issue and xml issue
bbd7461
Fixed line count issue
e1e2508
Fixed indentation
70658d8
Modified code of scilab function, Expression Block JS, python app rou…
87fb15f 
…te code and added copied file of Expression.sci from scilab source code
travis build issue with one line
c426520
Modified Code
daa0cdc
Modified Code
f1fe3f1
sunilshetye
sunilshetye approved these changes Jan 28, 2019
View reviewed changes
Copy link
Collaborator

@sunilshetye sunilshetye left a comment

Choose a reason for hiding this comment

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

EXPRESSION block code can be merged now.

Scroll bar on the right still appears for some browsers.

@diptighosalkar diptighosalkar merged commit bff9711 into FOSSEE:master Jan 28, 2019
sunilshetye pushed a commit that referenced this pull request Feb 20, 2019
@diptighosalkar
Merge pull request #151 from diptighosalkar/TMP-ISSUE-73
e5cc10c 
Tmp issue 73

Closes #73
sunilshetye pushed a commit that referenced this pull request Mar 25, 2021
@diptighosalkar
Merge pull request #151 from diptighosalkar/TMP-ISSUE-73
cfbb703 
Tmp issue 73

Closes #73
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sunilshetye sunilshetye sunilshetye approved these changes

Assignees

@diptighosalkar diptighosalkar

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@diptighosalkar @sunilshetye